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

Added possibility to disable undo entries creation in COMMIT/BOARD_COMMIT

This commit is contained in:
Tomasz Włostowski 2017-03-03 13:41:41 +01:00
parent 49c7400ca9
commit 9e73c3117e
3 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/commit.h
View File

@ -127,7 +127,7 @@ public:
COMMIT& Stage( const PICKED_ITEMS_LIST& aItems, UNDO_REDO_T aModFlag = UR_UNSPECIFIED ); COMMIT& Stage( const PICKED_ITEMS_LIST& aItems, UNDO_REDO_T aModFlag = UR_UNSPECIFIED );
///> Executes the changes. ///> Executes the changes.
virtual void Push( const wxString& aMessage = wxT( "A commit" ) ) = 0; virtual void Push( const wxString& aMessage = wxT( "A commit" ), bool aCreateUndoEntry = true ) = 0;
///> Revertes the commit by restoring the modifed items state. ///> Revertes the commit by restoring the modifed items state.
virtual void Revert() = 0; virtual void Revert() = 0;

24
pcbnew/board_commit.cpp
View File

@ -53,7 +53,7 @@ BOARD_COMMIT::~BOARD_COMMIT()
} }
void BOARD_COMMIT::Push( const wxString& aMessage ) void BOARD_COMMIT::Push( const wxString& aMessage, bool aCreateUndoEntry)
{ {
// Objects potentially interested in changes: // Objects potentially interested in changes:
PICKED_ITEMS_LIST undoList; PICKED_ITEMS_LIST undoList;
@ -91,10 +91,13 @@ void BOARD_COMMIT::Push( const wxString& aMessage )
assert( ent.m_item->Type() == PCB_MODULE_T ); assert( ent.m_item->Type() == PCB_MODULE_T );
assert( ent.m_copy->Type() == PCB_MODULE_T ); assert( ent.m_copy->Type() == PCB_MODULE_T );
ITEM_PICKER itemWrapper( ent.m_item, UR_CHANGED ); if( aCreateUndoEntry )
itemWrapper.SetLink( ent.m_copy ); {
undoList.PushItem( itemWrapper ); ITEM_PICKER itemWrapper( ent.m_item, UR_CHANGED );
frame->SaveCopyInUndoList( undoList, UR_CHANGED ); itemWrapper.SetLink( ent.m_copy );
undoList.PushItem( itemWrapper );
frame->SaveCopyInUndoList( undoList, UR_CHANGED );
}
savedModules.insert( ent.m_item ); savedModules.insert( ent.m_item );
static_cast<MODULE*>( ent.m_item )->SetLastEditTime(); static_cast<MODULE*>( ent.m_item )->SetLastEditTime();
@ -107,7 +110,10 @@ void BOARD_COMMIT::Push( const wxString& aMessage )
{ {
if( !m_editModules ) if( !m_editModules )
{ {
undoList.PushItem( ITEM_PICKER( boardItem, UR_NEW ) ); if( aCreateUndoEntry )
{
undoList.PushItem( ITEM_PICKER( boardItem, UR_NEW ) );
}
if( !( changeFlags & CHT_DONE ) ) if( !( changeFlags & CHT_DONE ) )
board->Add( boardItem ); board->Add( boardItem );
@ -135,7 +141,7 @@ void BOARD_COMMIT::Push( const wxString& aMessage )
case CHT_REMOVE: case CHT_REMOVE:
{ {
if( !m_editModules ) if( !m_editModules && aCreateUndoEntry )
{ {
undoList.PushItem( ITEM_PICKER( boardItem, UR_DELETED ) ); undoList.PushItem( ITEM_PICKER( boardItem, UR_DELETED ) );
} }
@ -241,7 +247,7 @@ void BOARD_COMMIT::Push( const wxString& aMessage )
case CHT_MODIFY: case CHT_MODIFY:
{ {
if( !m_editModules ) if( !m_editModules && aCreateUndoEntry )
{ {
ITEM_PICKER itemWrapper( boardItem, UR_CHANGED ); ITEM_PICKER itemWrapper( boardItem, UR_CHANGED );
assert( ent.m_copy ); assert( ent.m_copy );
@ -266,7 +272,7 @@ void BOARD_COMMIT::Push( const wxString& aMessage )
} }
} }
if( !m_editModules ) if( !m_editModules && aCreateUndoEntry )
frame->SaveCopyInUndoList( undoList, UR_UNSPECIFIED ); frame->SaveCopyInUndoList( undoList, UR_UNSPECIFIED );
if( TOOL_MANAGER* toolMgr = frame->GetToolManager() ) if( TOOL_MANAGER* toolMgr = frame->GetToolManager() )

2
pcbnew/board_commit.h
View File

@ -40,7 +40,7 @@ public:
BOARD_COMMIT( PCB_BASE_FRAME* aFrame ); BOARD_COMMIT( PCB_BASE_FRAME* aFrame );
virtual ~BOARD_COMMIT(); virtual ~BOARD_COMMIT();
virtual void Push( const wxString& aMessage = wxT( "A commit" ) ) override; virtual void Push( const wxString& aMessage = wxT( "A commit" ), bool aCreateUndoEntry = true ) override;
virtual void Revert() override; virtual void Revert() override;
private: private: