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

Minor code simplification in BOARD_COMMIT

This commit is contained in:
Maciej Suminski 2016-12-07 16:50:23 +01:00
parent 54c5f6bbb0
commit e37488f145
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pcbnew/board_commit.cpp
View File

@ -70,6 +70,7 @@ void BOARD_COMMIT::Push( const wxString& aMessage )
{ {
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;
bool done = changeFlags & CHT_DONE;
BOARD_ITEM* boardItem = static_cast<BOARD_ITEM*>( ent.m_item ); BOARD_ITEM* boardItem = static_cast<BOARD_ITEM*>( ent.m_item );
// Module items need to be saved in the undo buffer before modification // Module items need to be saved in the undo buffer before modification
@ -109,7 +110,7 @@ void BOARD_COMMIT::Push( const wxString& aMessage )
{ {
undoList.PushItem( ITEM_PICKER( boardItem, UR_NEW ) ); undoList.PushItem( ITEM_PICKER( boardItem, UR_NEW ) );
if( !( changeFlags & CHT_DONE ) ) if( !done )
board->Add( boardItem ); board->Add( boardItem );
//ratsnest->Add( boardItem ); // TODO currently done by BOARD::Add() //ratsnest->Add( boardItem ); // TODO currently done by BOARD::Add()
@ -125,7 +126,7 @@ void BOARD_COMMIT::Push( const wxString& aMessage )
// modules inside modules are not supported yet // modules inside modules are not supported yet
assert( boardItem->Type() != PCB_MODULE_T ); assert( boardItem->Type() != PCB_MODULE_T );
if( !( changeFlags & CHT_DONE ) ) if( !done )
board->m_Modules->Add( boardItem ); board->m_Modules->Add( boardItem );
} }
@ -136,9 +137,7 @@ void BOARD_COMMIT::Push( const wxString& aMessage )
case CHT_REMOVE: case CHT_REMOVE:
{ {
if( !m_editModules ) if( !m_editModules )
{
undoList.PushItem( ITEM_PICKER( boardItem, UR_DELETED ) ); undoList.PushItem( ITEM_PICKER( boardItem, UR_DELETED ) );
}
switch( boardItem->Type() ) switch( boardItem->Type() )
{ {
@ -182,7 +181,7 @@ void BOARD_COMMIT::Push( const wxString& aMessage )
{ {
view->Remove( boardItem ); view->Remove( boardItem );
if( !( changeFlags & CHT_DONE ) ) if( !done )
{ {
MODULE* module = static_cast<MODULE*>( boardItem->GetParent() ); MODULE* module = static_cast<MODULE*>( boardItem->GetParent() );
assert( module && module->Type() == PCB_MODULE_T ); assert( module && module->Type() == PCB_MODULE_T );
@ -207,7 +206,7 @@ void BOARD_COMMIT::Push( const wxString& aMessage )
case PCB_ZONE_AREA_T: case PCB_ZONE_AREA_T:
view->Remove( boardItem ); view->Remove( boardItem );
if( !( changeFlags & CHT_DONE ) ) if( !done )
board->Remove( boardItem ); board->Remove( boardItem );
//ratsnest->Remove( boardItem ); // currently done by BOARD::Remove() //ratsnest->Remove( boardItem ); // currently done by BOARD::Remove()
@ -224,7 +223,7 @@ void BOARD_COMMIT::Push( const wxString& aMessage )
view->Remove( module ); view->Remove( module );
if( !( changeFlags & CHT_DONE ) ) if( !done )
board->Remove( module ); board->Remove( module );
// Clear flags to indicate, that the ratsnest, list of nets & pads are not valid anymore // Clear flags to indicate, that the ratsnest, list of nets & pads are not valid anymore