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

pcbnew/swig/pcbnew_action_plugins.cpp: fix crash due to broken detection of deleted items after running a script. 

the old way was not compatible with the current management if board item lists.
The crash was probably due to double deletions.
Note also the management of undo command in pcbnew_action_plugins needs serious optimization.

Fixes: lp:1844880
https://bugs.launchpad.net/kicad/+bug/1844880
This commit is contained in:
jean-pierre charras 2019-09-23 14:07:45 +02:00
parent 529461ef5b
commit 840c77fa9c
1 changed files with 26 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
pcbnew/swig/pcbnew_action_plugins.cpp
View File

@ -211,14 +211,13 @@ void PCB_EDIT_FRAME::OnActionPluginButton( wxCommandEvent& aEvent )
void PCB_EDIT_FRAME::RunActionPlugin( ACTION_PLUGIN* aActionPlugin )
{
PICKED_ITEMS_LIST itemsList;
BOARD* currentPcb = GetBoard();
bool fromEmpty = false;
itemsList.m_Status = UR_CHANGED;
OnModify();
// Append tracks:
for( auto item : currentPcb->Tracks() )
{
@ -275,9 +274,26 @@ void PCB_EDIT_FRAME::RunActionPlugin( ACTION_PLUGIN* aActionPlugin )
}
// Try do discover what was modified
PICKED_ITEMS_LIST deletedItemsList;
// The list of existing items after running the action script
std::set<BOARD_ITEM*> currItemList;
// Append tracks:
for( auto item : currentPcb->Tracks() )
currItemList.insert( item );
// Append modules:
for( auto item : currentPcb->Modules() )
currItemList.insert( item );
// Append drawings
for( auto item : currentPcb->Drawings() )
currItemList.insert( item );
// Append zones outlines
for( int ii = 0; ii < currentPcb->GetAreaCount(); ii++ )
currItemList.insert( currentPcb->GetArea( ii ) );
// Found deleted modules
for( unsigned int i = 0; i < oldBuffer->GetCount(); i++ )
{
@ -286,49 +302,8 @@ void PCB_EDIT_FRAME::RunActionPlugin( ACTION_PLUGIN* aActionPlugin )
wxASSERT( item );
switch( item->Type() )
{
case PCB_NETINFO_T:
case PCB_MARKER_T:
case PCB_MODULE_T:
case PCB_TRACE_T:
case PCB_VIA_T:
case PCB_LINE_T:
case PCB_TEXT_T:
case PCB_DIMENSION_T:
case PCB_TARGET_T:
// If item has a list it's mean that the element is on the board
if( item->GetList() == NULL )
{
deletedItemsList.PushItem( picker );
}
break;
case PCB_ZONE_AREA_T:
{
bool zoneFound = false;
for( int ii = 0; ii < currentPcb->GetAreaCount(); ii++ )
zoneFound |= currentPcb->GetArea( ii ) == item;
if( !zoneFound )
{
deletedItemsList.PushItem( picker );
}
break;
}
default:
wxString msg;
msg.Printf( _( "(PCB_EDIT_FRAME::OnActionPlugin) needs work: "
"BOARD_ITEM type (%d) not handled" ),
item->Type() );
wxFAIL_MSG( msg );
break;
}
if( currItemList.find( item ) == currItemList.end() )
deletedItemsList.PushItem( picker );
}
// Mark deleted elements in undolist
@ -375,8 +350,11 @@ void PCB_EDIT_FRAME::RunActionPlugin( ACTION_PLUGIN* aActionPlugin )
}
}
GetScreen()->PushCommandToUndoList( oldBuffer );
if( oldBuffer->GetCount() )
{
OnModify();
GetScreen()->PushCommandToUndoList( oldBuffer );
}
ActivateGalCanvas();
}