Commit db5d90ce authored by Wayne Stambaugh's avatar Wayne Stambaugh
Browse files

Fix SCH_FIELD get reference designator text bug. (fixes lp:1159401)

parent 2b929702

eeschema/sch_field.cpp

+4 −4
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ EDA_ITEM* SCH_FIELD::Clone() const 
}





const wxString SCH_FIELD::GetText() const

const wxString SCH_FIELD::GetFullyQualifiedText() const

{

    wxString text = m_Text;
@@ -194,7 +194,7 @@ void SCH_FIELD::Draw( EDA_DRAW_PANEL* panel, wxDC* DC, 
            color = ReturnLayerColor( LAYER_FIELDS );

    }



    DrawGraphicText( panel, DC, textpos, color, GetText(), orient, m_Size,

    DrawGraphicText( panel, DC, textpos, color, GetFullyQualifiedText(), orient, m_Size,

                     GR_TEXT_HJUSTIFY_CENTER, GR_TEXT_VJUSTIFY_CENTER,

                     LineWidth, m_Italic, m_Bold );
@@ -387,7 +387,7 @@ void SCH_FIELD::Place( SCH_EDIT_FRAME* frame, wxDC* DC ) 
bool SCH_FIELD::Matches( wxFindReplaceData& aSearchData, void* aAuxData, wxPoint* aFindLocation )

{

    bool match;

    wxString text = GetText();

    wxString text = GetFullyQualifiedText();



    if( ((m_id > VALUE) && !(aSearchData.GetFlags() & FR_SEARCH_ALL_FIELDS))

        || ((m_id == REFERENCE) && !(aSearchData.GetFlags() & FR_REPLACE_REFERENCES)) )
@@ -427,7 +427,7 @@ bool SCH_FIELD::Matches( wxFindReplaceData& aSearchData, void* aAuxData, wxPoint 
bool SCH_FIELD::Replace( wxFindReplaceData& aSearchData, void* aAuxData )

{

    bool isReplaced;

    wxString text = GetText();

    wxString text = GetFullyQualifiedText();



    if( m_id == REFERENCE && aAuxData != NULL )

    {

eeschema/sch_field.h

+5 −4
Original line number Diff line number Diff line
@@ -89,13 +89,14 @@ public: 
    void SetId( int aId ) { m_id = aId; }



    /**

     * Function GetText

     * overrides the default implementation to allow for the part suffix to be added

     * to the reference designator field if the component has multiple parts.

     * Function GetFullyQualifiedText

     * returns the fully qualified field text by allowing for the part suffix to be added

     * to the reference designator field if the component has multiple parts.  For all other

     * fields this is the equivalent of EDA_TEXT::GetText().

     *

     * @return a const wxString object containing the field's string.

     */

    const wxString GetText() const;

    const wxString GetFullyQualifiedText() const;



    void Place( SCH_EDIT_FRAME* frame, wxDC* DC );