Update schematic connectivity when redoing changes.

Apparently we forgot to handle schematic connectivity changes when redoing
undone changes.  The same connectivity update logic that was added to the
commit object is now used in SCH_EDIT_FRAME::PutDataInPreviousState().

Please note the granularity of connectivity rebuilds on schematic object
property changes is at the object level which is overly aggressive.  This
means that connectivity rebuilds will happen when connectivity changes
that have nothing to do with and objects connectivity are changed.  Until
objects can handle their own connectivity state, this will have to suffice.
This commit is contained in:
Wayne Stambaugh 2024-01-27 12:02:22 -05:00
parent 715a5ee47b
commit 2f0337974b
2 changed files with 59 additions and 25 deletions

View File

@ -27,9 +27,11 @@
#include <tool/tool_manager.h> #include <tool/tool_manager.h>
#include <schematic.h> #include <schematic.h>
#include <sch_bus_entry.h> #include <sch_bus_entry.h>
#include <sch_commit.h>
#include <sch_junction.h> #include <sch_junction.h>
#include <sch_line.h> #include <sch_line.h>
#include <sch_bitmap.h> #include <sch_bitmap.h>
#include <sch_sheet_pin.h>
#include <tools/ee_selection_tool.h> #include <tools/ee_selection_tool.h>
#include <drawing_sheet/ds_proxy_undo_item.h> #include <drawing_sheet/ds_proxy_undo_item.h>
#include <tool/actions.h> #include <tool/actions.h>
@ -263,6 +265,8 @@ void SCH_EDIT_FRAME::PutDataInPreviousState( PICKED_ITEMS_LIST* aList )
std::vector<SCH_ITEM*> bulkAddedItems; std::vector<SCH_ITEM*> bulkAddedItems;
std::vector<SCH_ITEM*> bulkRemovedItems; std::vector<SCH_ITEM*> bulkRemovedItems;
std::vector<SCH_ITEM*> bulkChangedItems; std::vector<SCH_ITEM*> bulkChangedItems;
bool dirtyConnectivity = false;
SCH_CLEANUP_FLAGS connectivityCleanUp = NO_CLEANUP;
// Undo in the reverse order of list creation: (this can allow stacked changes like the // Undo in the reverse order of list creation: (this can allow stacked changes like the
// same item can be changed and deleted in the same complex command). // same item can be changed and deleted in the same complex command).
@ -279,6 +283,44 @@ void SCH_EDIT_FRAME::PutDataInPreviousState( PICKED_ITEMS_LIST* aList )
eda_item->ClearEditFlags(); eda_item->ClearEditFlags();
eda_item->ClearTempFlags(); eda_item->ClearTempFlags();
SCH_ITEM* schItem = dynamic_cast<SCH_ITEM*>( eda_item );
// Set connectable object connectivity status.
if( schItem && schItem->IsConnectable() )
{
schItem->SetConnectivityDirty();
if( schItem->Type() == SCH_SYMBOL_T )
{
SCH_SYMBOL* symbol = static_cast<SCH_SYMBOL*>( schItem );
wxCHECK2( symbol, continue );
for( SCH_PIN* pin : symbol->GetPins() )
pin->SetConnectivityDirty();
}
else if( schItem->Type() == SCH_SHEET_T )
{
SCH_SHEET* sheet = static_cast<SCH_SHEET*>( schItem );
wxCHECK2( sheet, continue );
for( SCH_SHEET_PIN* pin : sheet->GetPins() )
pin->SetConnectivityDirty();
}
m_highlightedConnChanged = true;
dirtyConnectivity = true;
// Do a local clean up if there are any connectable objects in the commit.
if( connectivityCleanUp == NO_CLEANUP )
connectivityCleanUp = LOCAL_CLEANUP;
// Do a full rebauild of the connectivity if there is a sheet in the commit.
if( schItem->Type() == SCH_SHEET_T )
connectivityCleanUp = GLOBAL_CLEANUP;
}
if( status == UNDO_REDO::NEWITEM ) if( status == UNDO_REDO::NEWITEM )
{ {
// If we are removing the current sheet, get out first // If we are removing the current sheet, get out first
@ -288,11 +330,6 @@ void SCH_EDIT_FRAME::PutDataInPreviousState( PICKED_ITEMS_LIST* aList )
GetToolManager()->PostAction( EE_ACTIONS::leaveSheet ); GetToolManager()->PostAction( EE_ACTIONS::leaveSheet );
} }
SCH_ITEM* schItem = static_cast<SCH_ITEM*>( eda_item );
if( schItem && schItem->IsConnectable() )
m_highlightedConnChanged = true;
RemoveFromScreen( eda_item, screen ); RemoveFromScreen( eda_item, screen );
aList->SetPickedItemStatus( UNDO_REDO::DELETED, ii ); aList->SetPickedItemStatus( UNDO_REDO::DELETED, ii );
@ -300,11 +337,6 @@ void SCH_EDIT_FRAME::PutDataInPreviousState( PICKED_ITEMS_LIST* aList )
} }
else if( status == UNDO_REDO::DELETED ) else if( status == UNDO_REDO::DELETED )
{ {
SCH_ITEM* schItem = static_cast<SCH_ITEM*>( eda_item );
if( schItem && schItem->IsConnectable() )
m_highlightedConnChanged = true;
// deleted items are re-inserted on undo // deleted items are re-inserted on undo
AddToScreen( eda_item, screen ); AddToScreen( eda_item, screen );
aList->SetPickedItemStatus( UNDO_REDO::NEWITEM, ii ); aList->SetPickedItemStatus( UNDO_REDO::NEWITEM, ii );
@ -329,9 +361,6 @@ void SCH_EDIT_FRAME::PutDataInPreviousState( PICKED_ITEMS_LIST* aList )
} }
else if( SCH_ITEM* item = dynamic_cast<SCH_ITEM*>( eda_item ) ) else if( SCH_ITEM* item = dynamic_cast<SCH_ITEM*>( eda_item ) )
{ {
if( item->IsConnectable() )
m_highlightedConnChanged = true;
// everything else is modified in place // everything else is modified in place
SCH_ITEM* alt_item = static_cast<SCH_ITEM*>( aList->GetPickedItemLink( ii ) ); SCH_ITEM* alt_item = static_cast<SCH_ITEM*>( aList->GetPickedItemLink( ii ) );
@ -392,6 +421,20 @@ void SCH_EDIT_FRAME::PutDataInPreviousState( PICKED_ITEMS_LIST* aList )
if( bulkChangedItems.size() > 0 ) if( bulkChangedItems.size() > 0 )
Schematic().OnItemsChanged( bulkChangedItems ); Schematic().OnItemsChanged( bulkChangedItems );
if( dirtyConnectivity )
{
SCH_COMMIT localCommit( m_toolManager );
RecalculateConnections( &localCommit, connectivityCleanUp );
// Update the hierarchy navigator when there are sheet changes.
if( connectivityCleanUp == GLOBAL_CLEANUP )
{
SetSheetNumberAndCount();
UpdateHierarchyNavigator();
}
}
} }
@ -414,19 +457,8 @@ void SCH_EDIT_FRAME::RollbackSchematicFromUndo()
delete aItem; delete aItem;
} ); } );
// Only rebuild the hierarchy navigator if there are sheet changes.
bool hasSheets = undo->ContainsItemType( SCH_SHEET_T );
delete undo; delete undo;
if( hasSheets )
{
SetSheetNumberAndCount();
UpdateHierarchyNavigator();
}
TestDanglingEnds();
m_toolManager->GetTool<EE_SELECTION_TOOL>()->RebuildSelection(); m_toolManager->GetTool<EE_SELECTION_TOOL>()->RebuildSelection();
} }

View File

@ -2186,7 +2186,9 @@ int SCH_EDITOR_CONTROL::Paste( const TOOL_EVENT& aEvent )
{ {
// Pushing the commit will update the connectivity. // Pushing the commit will update the connectivity.
commit.Push( _( "Paste" ) ); commit.Push( _( "Paste" ) );
m_frame->UpdateHierarchyNavigator();
if( sheetsPasted )
m_frame->UpdateHierarchyNavigator();
} }
else else
{ {