haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix multi-sheet find/replace issues. 

1) When replacing symbol fields, make sure we do it for all sheets
2) Honour "find on current sheet only"

Fixes https://gitlab.com/kicad/code/kicad/issues/9431
This commit is contained in:
Jeff Young 2021-10-20 18:27:30 +01:00
parent 93b25b115b
commit c5e5d8e0d4
1 changed files with 65 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
eeschema/tools/sch_editor_control.cpp
View File

@ -559,27 +559,78 @@ int SCH_EDITOR_CONTROL::ReplaceAndFindNext( const TOOL_EVENT& aEvent )
int SCH_EDITOR_CONTROL::ReplaceAll( const TOOL_EVENT& aEvent ) int SCH_EDITOR_CONTROL::ReplaceAll( const TOOL_EVENT& aEvent )
{ {
wxFindReplaceData& data = m_frame->GetFindReplaceData(); wxFindReplaceData& data = m_frame->GetFindReplaceData();
bool currentSheetOnly = ( data.GetFlags() & FR_CURRENT_SHEET_ONLY ) > 0;
bool modified = false; bool modified = false;
if( data.GetFindString().IsEmpty() ) if( data.GetFindString().IsEmpty() )
return FindAndReplace( ACTIONS::find.MakeEvent() ); return FindAndReplace( ACTIONS::find.MakeEvent() );
SCH_SHEET_LIST schematic = m_frame->Schematic().GetSheets(); auto doReplace =
SCH_SCREENS screens( m_frame->Schematic().Root() ); [&]( SCH_ITEM* aItem, SCH_SHEET_PATH* aSheet, wxFindReplaceData& aData )
for( SCH_SCREEN* screen = screens.GetFirst(); screen; screen = screens.GetNext() )
{
SCH_SHEET_PATH* sheet = schematic.FindSheetForScreen( screen );
for( EDA_ITEM* item = nextMatch( screen, sheet, nullptr, data ); item; )
{
if( item->Replace( data, sheet ) )
{ {
m_frame->UpdateItem( item, false, true ); if( aItem->Replace( aData, aSheet ) )
modified = true; {
} m_frame->UpdateItem( aItem, false, true );
modified = true;
}
};
item = nextMatch( screen, sheet, dynamic_cast<SCH_ITEM*>( item ), data ); if( currentSheetOnly )
{
SCH_SHEET_PATH* currentSheet = &m_frame->GetCurrentSheet();
SCH_ITEM* item = nextMatch( m_frame->GetScreen(), currentSheet, nullptr, data );
while( item )
{
doReplace( item, currentSheet, data );
item = nextMatch( m_frame->GetScreen(), currentSheet, item, data );
}
}
else
{
SCH_SHEET_LIST allSheets = m_frame->Schematic().GetSheets();
SCH_SCREENS screens( m_frame->Schematic().Root() );
for( SCH_SCREEN* screen = screens.GetFirst(); screen; screen = screens.GetNext() )
{
SCH_SHEET_LIST sheets = allSheets.FindAllSheetsForScreen( screen );
for( unsigned ii = 0; ii < sheets.size(); ++ii )
{
SCH_ITEM* item = nextMatch( screen, &sheets[ii], nullptr, data );
while( item )
{
if( ii == 0 )
{
doReplace( item, &sheets[0], data );
}
else if( item->Type() == SCH_FIELD_T )
{
SCH_FIELD* field = static_cast<SCH_FIELD*>( item );
if( field->GetParent() && field->GetParent()->Type() == SCH_SYMBOL_T )
{
switch( field->GetId() )
{
case REFERENCE_FIELD:
case VALUE_FIELD:
case FOOTPRINT_FIELD:
// must be handled for each distinct sheet
doReplace( field, &sheets[ii], data );
break;
default:
// handled in first iteration
break;
}
}
}
item = nextMatch( screen, &sheets[ii], item, data );
}
}
} }
} }