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

Allow SCH_COMMIT to operate without a frame. 

We'll want this at some point (presumably) for plugins.
This commit is contained in:
Jeff Young 2023-06-10 18:35:59 +01:00
parent 111d0a2c14
commit 5aa51bc967
1 changed files with 65 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

107
eeschema/sch_commit.cpp
View File

@ -119,7 +119,6 @@ void SCH_COMMIT::pushLibEdit( const wxString& aMessage, int aCommitFlags )
{ {
KIGFX::VIEW* view = m_toolMgr->GetView(); KIGFX::VIEW* view = m_toolMgr->GetView();
SYMBOL_EDIT_FRAME* sym_frame = static_cast<SYMBOL_EDIT_FRAME*>( m_toolMgr->GetToolHolder() ); SYMBOL_EDIT_FRAME* sym_frame = static_cast<SYMBOL_EDIT_FRAME*>( m_toolMgr->GetToolHolder() );
LIB_SYMBOL* symbol = sym_frame->GetCurSymbol();
bool selectedModified = false; bool selectedModified = false;
if( Empty() ) if( Empty() )
@ -127,19 +126,21 @@ void SCH_COMMIT::pushLibEdit( const wxString& aMessage, int aCommitFlags )
for( COMMIT_LINE& ent : m_changes ) for( COMMIT_LINE& ent : m_changes )
{ {
// In the symbol editor everything should have been commited as a changed symbol. LIB_SYMBOL* symbol = dynamic_cast<LIB_SYMBOL*>( ent.m_item );
wxASSERT( ent.m_item == symbol );
wxASSERT( ent.m_type == CHT_MODIFY ); // In the symbol editor everything should have been commited as a change to the symbol
// itself.
wxCHECK2( symbol && ent.m_type == CHT_MODIFY, continue );
if( ent.m_item->IsSelected() ) if( ent.m_item->IsSelected() )
selectedModified = true; selectedModified = true;
symbol->RunOnChildren( symbol->RunOnChildren(
[&selectedModified]( LIB_ITEM* aItem ) [&selectedModified]( LIB_ITEM* aItem )
{ {
if( aItem->HasFlag( IS_MODIFIED_CHILD ) ) if( aItem->HasFlag( IS_MODIFIED_CHILD ) )
selectedModified = true; selectedModified = true;
} ); } );
if( view ) if( view )
{ {
@ -154,16 +155,18 @@ void SCH_COMMIT::pushLibEdit( const wxString& aMessage, int aCommitFlags )
if( !( aCommitFlags & SKIP_UNDO ) ) if( !( aCommitFlags & SKIP_UNDO ) )
{ {
if( ent.m_copy ) if( sym_frame && ent.m_copy )
{ {
sym_frame->SaveCopyInUndoList( aMessage, ent.m_copy ); sym_frame->SaveCopyInUndoList( aMessage, ent.m_copy );
ent.m_copy = nullptr; ent.m_copy = nullptr; // we've transferred ownership to the undo stack
} }
} }
else
if( ent.m_copy )
{ {
// if no undo entry is needed, the copy would create a memory leak // if no undo entry was needed, the copy would create a memory leak
delete ent.m_copy; delete ent.m_copy;
ent.m_copy = nullptr;
} }
} }
@ -173,7 +176,10 @@ void SCH_COMMIT::pushLibEdit( const wxString& aMessage, int aCommitFlags )
m_toolMgr->ProcessEvent( EVENTS::SelectedItemsModified ); m_toolMgr->ProcessEvent( EVENTS::SelectedItemsModified );
if( !( aCommitFlags & SKIP_SET_DIRTY ) ) if( !( aCommitFlags & SKIP_SET_DIRTY ) )
sym_frame->OnModify(); {
if( sym_frame )
sym_frame->OnModify();
}
clear(); clear();
} }
@ -189,29 +195,36 @@ void SCH_COMMIT::pushSchEdit( const wxString& aMessage, int aCommitFlags )
EE_SELECTION_TOOL* selTool = m_toolMgr->GetTool<EE_SELECTION_TOOL>(); EE_SELECTION_TOOL* selTool = m_toolMgr->GetTool<EE_SELECTION_TOOL>();
bool itemsDeselected = false; bool itemsDeselected = false;
bool selectedModified = false; bool selectedModified = false;
bool dirtyConnectivity = false;
if( Empty() ) if( Empty() )
return; return;
undoList.SetDescription( aMessage ); undoList.SetDescription( aMessage );
SCHEMATIC& schematic = static_cast<SCH_EDIT_FRAME*>( m_toolMgr->GetToolHolder() )->Schematic(); SCHEMATIC* schematic = nullptr;
std::vector<SCH_ITEM*> bulkAddedItems; std::vector<SCH_ITEM*> bulkAddedItems;
std::vector<SCH_ITEM*> bulkRemovedItems; std::vector<SCH_ITEM*> bulkRemovedItems;
std::vector<SCH_ITEM*> itemsChanged; std::vector<SCH_ITEM*> itemsChanged;
for( COMMIT_LINE& ent : m_changes ) for( COMMIT_LINE& ent : m_changes )
{ {
int changeType = ent.m_type & CHT_TYPE; int changeType = ent.m_type & CHT_TYPE;
int changeFlags = ent.m_type & CHT_FLAGS; int changeFlags = ent.m_type & CHT_FLAGS;
SCH_ITEM* schItem = static_cast<SCH_ITEM*>( ent.m_item ); SCH_ITEM* schItem = dynamic_cast<SCH_ITEM*>( ent.m_item );
SCH_SCREEN* screen = static_cast<SCH_SCREEN*>( ent.m_screen ); SCH_SCREEN* screen = dynamic_cast<SCH_SCREEN*>( ent.m_screen );
wxASSERT( ent.m_item ); wxCHECK2( schItem && screen, continue );
if( ent.m_item->IsSelected() ) if( !schematic )
schematic = schItem->Schematic();
if( schItem->IsSelected() )
selectedModified = true; selectedModified = true;
if( !( aCommitFlags & SKIP_CONNECTIVITY ) )
dirtyConnectivity = true;
switch( changeType ) switch( changeType )
{ {
case CHT_ADD: case CHT_ADD:
@ -222,7 +235,7 @@ void SCH_COMMIT::pushSchEdit( const wxString& aMessage, int aCommitFlags )
if( !( changeFlags & CHT_DONE ) ) if( !( changeFlags & CHT_DONE ) )
{ {
if( !schItem->GetParent() ) if( !schItem->GetParent() )
frame->GetScreen()->Append( schItem ); screen->Append( schItem );
if( view ) if( view )
view->Add( schItem ); view->Add( schItem );
@ -254,7 +267,7 @@ void SCH_COMMIT::pushSchEdit( const wxString& aMessage, int aCommitFlags )
if( !( changeFlags & CHT_DONE ) ) if( !( changeFlags & CHT_DONE ) )
{ {
frame->GetScreen()->Remove( schItem ); screen->Remove( schItem );
if( view ) if( view )
view->Remove( schItem ); view->Remove( schItem );
@ -273,6 +286,7 @@ void SCH_COMMIT::pushSchEdit( const wxString& aMessage, int aCommitFlags )
wxASSERT( ent.m_copy ); wxASSERT( ent.m_copy );
itemWrapper.SetLink( ent.m_copy ); itemWrapper.SetLink( ent.m_copy );
undoList.PushItem( itemWrapper ); undoList.PushItem( itemWrapper );
ent.m_copy = nullptr; // We've transferred ownership to the undo list
} }
if( view ) if( view )
@ -280,9 +294,12 @@ void SCH_COMMIT::pushSchEdit( const wxString& aMessage, int aCommitFlags )
itemsChanged.push_back( schItem ); itemsChanged.push_back( schItem );
// if no undo entry is needed, the copy would create a memory leak if( ent.m_copy )
if( aCommitFlags & SKIP_UNDO ) {
// if no undo entry is needed, the copy would create a memory leak
delete ent.m_copy; delete ent.m_copy;
ent.m_copy = nullptr;
}
break; break;
} }
@ -293,19 +310,22 @@ void SCH_COMMIT::pushSchEdit( const wxString& aMessage, int aCommitFlags )
} }
} }
if( bulkAddedItems.size() > 0 ) if( schematic )
schematic.OnItemsAdded( bulkAddedItems );
if( bulkRemovedItems.size() > 0 )
schematic.OnItemsRemoved( bulkRemovedItems );
if( itemsChanged.size() > 0 )
schematic.OnItemsChanged( itemsChanged );
if( !( aCommitFlags & SKIP_UNDO ) && frame )
{ {
frame->SaveCopyInUndoList( undoList, UNDO_REDO::UNSPECIFIED, aCommitFlags & APPEND_UNDO, if( bulkAddedItems.size() > 0 )
( aCommitFlags & SKIP_CONNECTIVITY ) == 0 ); schematic->OnItemsAdded( bulkAddedItems );
if( bulkRemovedItems.size() > 0 )
schematic->OnItemsRemoved( bulkRemovedItems );
if( itemsChanged.size() > 0 )
schematic->OnItemsChanged( itemsChanged );
}
if( !( aCommitFlags & SKIP_UNDO ) )
{
if( frame )
frame->SaveCopyInUndoList( undoList, UNDO_REDO::UNSPECIFIED, false, dirtyConnectivity );
} }
m_toolMgr->PostEvent( { TC_MESSAGE, TA_MODEL_CHANGE, AS_GLOBAL } ); m_toolMgr->PostEvent( { TC_MESSAGE, TA_MODEL_CHANGE, AS_GLOBAL } );
@ -316,8 +336,11 @@ void SCH_COMMIT::pushSchEdit( const wxString& aMessage, int aCommitFlags )
if( selectedModified ) if( selectedModified )
m_toolMgr->ProcessEvent( EVENTS::SelectedItemsModified ); m_toolMgr->ProcessEvent( EVENTS::SelectedItemsModified );
if( frame && !( aCommitFlags & SKIP_SET_DIRTY ) ) if( !( aCommitFlags & SKIP_SET_DIRTY ) )
frame->OnModify(); {
if( frame )
frame->OnModify();
}
clear(); clear();
} }