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

Implemented BOARD_COMMIT::Revert()

This commit is contained in:
Maciej Suminski 2016-06-21 16:54:14 +02:00
parent 39d5cd2aca
commit 32c4bec31c
1 changed files with 34 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
pcbnew/board_commit.cpp
View File

@ -272,11 +272,10 @@ EDA_ITEM* BOARD_COMMIT::parentObject( EDA_ITEM* aItem ) const
void BOARD_COMMIT::Revert() void BOARD_COMMIT::Revert()
{ {
assert( false ); // the code below has not been tested
PICKED_ITEMS_LIST undoList; PICKED_ITEMS_LIST undoList;
KIGFX::VIEW* view = m_toolMgr->GetView(); KIGFX::VIEW* view = m_toolMgr->GetView();
BOARD* board = (BOARD*) m_toolMgr->GetModel(); BOARD* board = (BOARD*) m_toolMgr->GetModel();
RN_DATA* ratsnest = board->GetRatsnest();
for( COMMIT_LINE& ent : m_changes ) for( COMMIT_LINE& ent : m_changes )
{ {
@ -285,10 +284,7 @@ void BOARD_COMMIT::Revert()
switch( ent.m_type ) switch( ent.m_type )
{ {
case CHT_MODIFY: case CHT_ADD:
{
RN_DATA *ratsnest = board->GetRatsnest();
if( item->Type() == PCB_MODULE_T ) if( item->Type() == PCB_MODULE_T )
{ {
MODULE* oldModule = static_cast<MODULE*>( item ); MODULE* oldModule = static_cast<MODULE*>( item );
@ -296,29 +292,58 @@ void BOARD_COMMIT::Revert()
} }
view->Remove( item ); view->Remove( item );
ratsnest->Remove( static_cast<BOARD_ITEM*>( item ) ); ratsnest->Remove( item );
break;
case CHT_REMOVE:
if( item->Type() == PCB_MODULE_T )
{
MODULE* newModule = static_cast<MODULE*>( item );
newModule->RunOnChildren( boost::bind( &EDA_ITEM::ClearFlags, _1, SELECTED ) );
newModule->RunOnChildren( boost::bind( &KIGFX::VIEW::Add, view, _1 ) );
}
view->Add( item );
ratsnest->Add( item );
break;
case CHT_MODIFY:
{
if( item->Type() == PCB_MODULE_T )
{
MODULE* oldModule = static_cast<MODULE*>( item );
oldModule->RunOnChildren( boost::bind( &KIGFX::VIEW::Remove, view, _1 ) );
}
view->Remove( item );
ratsnest->Remove( item );
item->SwapData( copy ); item->SwapData( copy );
item->ClearFlags( SELECTED );
// Update all pads/drawings/texts, as they become invalid // Update all pads/drawings/texts, as they become invalid
// for the VIEW after SwapData() called for modules // for the VIEW after SwapData() called for modules
if( item->Type() == PCB_MODULE_T ) if( item->Type() == PCB_MODULE_T )
{ {
MODULE* newModule = static_cast<MODULE*>( item ); MODULE* newModule = static_cast<MODULE*>( item );
newModule->RunOnChildren( boost::bind( &EDA_ITEM::ClearFlags, _1, SELECTED ) );
newModule->RunOnChildren( boost::bind( &KIGFX::VIEW::Add, view, _1 ) ); newModule->RunOnChildren( boost::bind( &KIGFX::VIEW::Add, view, _1 ) );
} }
view->Add( item ); view->Add( item );
ratsnest->Add( item ); ratsnest->Add( item );
item->ClearFlags( SELECTED );
delete copy; delete copy;
break; break;
} }
default: default:
assert( false ); // not implemented assert( false );
break; break;
} }
} }
ratsnest->Recalculate();
clear(); clear();
} }