commit 99d997cd8865eb4dd69f10f691909e407287e923 Author: Chris Pavlina Date: Wed Nov 18 09:58:34 2015 -0500 Fix bug 1517101 - find-and-replace replace value lags by one cycle diff --git a/eeschema/find.cpp b/eeschema/find.cpp index 5f40218..d3a29e7 100644 --- a/eeschema/find.cpp +++ b/eeschema/find.cpp @@ -368,6 +368,7 @@ void SCH_EDIT_FRAME::OnFindReplace( wxFindDialogEvent& aEvent ) searchCriteria.SetFlags( aEvent.GetFlags() ); searchCriteria.SetFindString( aEvent.GetFindString() ); searchCriteria.SetReplaceString( aEvent.GetReplaceString() ); + m_foundItems.SetReplaceString( aEvent.GetReplaceString() ); if( IsSearchCacheObsolete( searchCriteria ) ) { diff --git a/eeschema/sch_collectors.cpp b/eeschema/sch_collectors.cpp index 7fb47ed..04e6b10 100644 --- a/eeschema/sch_collectors.cpp +++ b/eeschema/sch_collectors.cpp @@ -503,6 +503,12 @@ SEARCH_RESULT SCH_FIND_COLLECTOR::Inspect( EDA_ITEM* aItem, const void* aTestDat } +void SCH_FIND_COLLECTOR::SetReplaceString( const wxString &aReplaceString ) +{ + m_findReplaceData.SetReplaceString( aReplaceString ); +} + + void SCH_FIND_COLLECTOR::Collect( SCH_FIND_REPLACE_DATA& aFindReplaceData, SCH_SHEET_PATH* aSheetPath ) { diff --git a/eeschema/sch_collectors.h b/eeschema/sch_collectors.h index a564521..81f19a5 100644 --- a/eeschema/sch_collectors.h +++ b/eeschema/sch_collectors.h @@ -353,6 +353,11 @@ public: SEARCH_RESULT Inspect( EDA_ITEM* aItem, const void* aTestData = NULL ); /** + * Update the replace string without changing anything else. + */ + void SetReplaceString( const wxString &aReplaceString ); + + /** * Function Collect * scans \a aSheetPath using this class's Inspector method for items matching * \a aFindReplaceData.