summaryrefslogtreecommitdiff
path: root/pcbnew/board_undo_redo.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'pcbnew/board_undo_redo.cpp')
-rw-r--r--pcbnew/board_undo_redo.cpp713
1 files changed, 713 insertions, 0 deletions
diff --git a/pcbnew/board_undo_redo.cpp b/pcbnew/board_undo_redo.cpp
new file mode 100644
index 0000000..48bf7eb
--- /dev/null
+++ b/pcbnew/board_undo_redo.cpp
@@ -0,0 +1,713 @@
+/*
+ * This program source code file is part of KiCad, a free EDA CAD application.
+ *
+ * Copyright (C) 2012 Jean-Pierre Charras, jean-pierre.charras@ujf-grenoble.fr
+ * Copyright (C) 2012 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com>
+ * Copyright (C) 1992-2012 KiCad Developers, see AUTHORS.txt for contributors.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, you may find one here:
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * or you may search the http://www.gnu.org website for the version 2 license,
+ * or you may write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include <boost/bind.hpp>
+#include <fctsys.h>
+#include <class_drawpanel.h>
+#include <class_draw_panel_gal.h>
+#include <macros.h>
+
+#include <pcbnew.h>
+#include <wxPcbStruct.h>
+
+#include <class_board.h>
+#include <class_track.h>
+#include <class_drawsegment.h>
+#include <class_pcb_text.h>
+#include <class_mire.h>
+#include <class_module.h>
+#include <class_dimension.h>
+#include <class_zone.h>
+#include <class_edge_mod.h>
+
+#include <ratsnest_data.h>
+
+#include <tools/selection_tool.h>
+#include <tool/tool_manager.h>
+
+/* Functions to undo and redo edit commands.
+ * commands to undo are stored in CurrentScreen->m_UndoList
+ * commands to redo are stored in CurrentScreen->m_RedoList
+ *
+ * m_UndoList and m_RedoList handle a std::vector of PICKED_ITEMS_LIST
+ * Each PICKED_ITEMS_LIST handle a std::vector of pickers (class ITEM_PICKER),
+ * that store the list of schematic items that are concerned by the command to undo or redo
+ * and is created for each command to undo (handle also a command to redo).
+ * each picker has a pointer pointing to an item to undo or redo (in fact: deleted, added or
+ * modified),
+ * and has a pointer to a copy of this item, when this item has been modified
+ * (the old values of parameters are therefore saved)
+ *
+ * there are 3 cases:
+ * - delete item(s) command
+ * - change item(s) command
+ * - add item(s) command
+ * and 3 cases for block:
+ * - move list of items
+ * - mirror (Y) list of items
+ * - Flip list of items
+ *
+ * Undo command
+ * - delete item(s) command:
+ * => deleted items are moved in undo list
+ *
+ * - change item(s) command
+ * => A copy of item(s) is made (a DrawPickedStruct list of wrappers)
+ * the .m_Link member of each wrapper points the modified item.
+ * the .m_Item member of each wrapper points the old copy of this item.
+ *
+ * - add item(s) command
+ * =>A list of item(s) is made. The .m_Item member of each wrapper points the new item.
+ *
+ * Redo command
+ * - delete item(s) old command:
+ * => deleted items are moved in EEDrawList list, and in
+ *
+ * - change item(s) command
+ * => the copy of item(s) is moved in Undo list
+ *
+ * - add item(s) command
+ * => The list of item(s) is used to create a deleted list in undo list(same as a delete
+ * command)
+ *
+ * Some block operations that change items can be undone without memorize items, just the
+ * coordinates of the transform:
+ * move list of items (undo/redo is made by moving with the opposite move vector)
+ * mirror (Y) and flip list of items (undo/redo is made by mirror or flip items)
+ * so they are handled specifically.
+ *
+ */
+
+
+/**
+ * Function TestForExistingItem
+ * test if aItem exists somewhere in lists of items
+ * This is a function used by PutDataInPreviousState to be sure an item was not deleted
+ * since an undo or redo.
+ * This could be possible:
+ * - if a call to SaveCopyInUndoList was forgotten in Pcbnew
+ * - in zones outlines, when a change in one zone merges this zone with an other
+ * This function avoids a Pcbnew crash
+ * Before using this function to test existence of items,
+ * it must be called with aItem = NULL to prepare the list
+ * @param aPcb = board to test
+ * @param aItem = item to find
+ * = NULL to build the list of existing items
+ */
+static bool TestForExistingItem( BOARD* aPcb, BOARD_ITEM* aItem )
+{
+ static std::vector<BOARD_ITEM*> itemsList;
+
+ if( aItem == NULL ) // Build list
+ {
+ // Count items to store in itemsList:
+ int icnt = 0;
+ BOARD_ITEM* item;
+
+ // Count tracks:
+ for( item = aPcb->m_Track; item != NULL; item = item->Next() )
+ icnt++;
+
+ // Count modules:
+ for( item = aPcb->m_Modules; item != NULL; item = item->Next() )
+ icnt++;
+
+ // Count drawings
+ for( item = aPcb->m_Drawings; item != NULL; item = item->Next() )
+ icnt++;
+
+ // Count zones outlines
+ icnt += aPcb->GetAreaCount();
+
+ // Count zones segm (now obsolete):
+ for( item = aPcb->m_Zone; item != NULL; item = item->Next() )
+ icnt++;
+
+ // Build candidate list:
+ itemsList.clear();
+ itemsList.reserve(icnt);
+
+ // Store items in list:
+ // Append tracks:
+ for( item = aPcb->m_Track; item != NULL; item = item->Next() )
+ itemsList.push_back( item );
+
+ // Append modules:
+ for( item = aPcb->m_Modules; item != NULL; item = item->Next() )
+ itemsList.push_back( item );
+
+ // Append drawings
+ for( item = aPcb->m_Drawings; item != NULL; item = item->Next() )
+ itemsList.push_back( item );
+
+ // Append zones outlines
+ for( int ii = 0; ii < aPcb->GetAreaCount(); ii++ )
+ itemsList.push_back( aPcb->GetArea( ii ) );
+
+ // Append zones segm:
+ for( item = aPcb->m_Zone; item != NULL; item = item->Next() )
+ itemsList.push_back( item );
+
+ // Sort list
+ std::sort( itemsList.begin(), itemsList.end() );
+ return false;
+ }
+
+ // search in list:
+ return std::binary_search( itemsList.begin(), itemsList.end(), aItem );
+}
+
+
+void BOARD_ITEM::SwapData( BOARD_ITEM* aImage )
+{
+ if( aImage == NULL )
+ return;
+
+ // Remark: to create images of edited items to undo, we are using Clone method
+ // which can duplication of items foe copy, but does not clone all members
+ // mainly pointers in chain and time stamp, which is set to new, unique value.
+ // So we have to use the current values of these parameters.
+
+ EDA_ITEM * pnext = Next();
+ EDA_ITEM * pback = Back();
+ DHEAD* mylist = m_List;
+ time_t timestamp = GetTimeStamp();
+
+ switch( Type() )
+ {
+ case PCB_MODULE_T:
+ {
+ MODULE* tmp = (MODULE*) aImage->Clone();
+ ( (MODULE*) aImage )->Copy( (MODULE*) this );
+ ( (MODULE*) this )->Copy( tmp );
+ delete tmp;
+ }
+ break;
+
+ case PCB_ZONE_AREA_T:
+ {
+ ZONE_CONTAINER* tmp = (ZONE_CONTAINER*) aImage->Clone();
+ ( (ZONE_CONTAINER*) aImage )->Copy( (ZONE_CONTAINER*) this );
+ ( (ZONE_CONTAINER*) this )->Copy( tmp );
+ delete tmp;
+ }
+ break;
+
+ case PCB_LINE_T:
+ std::swap( *((DRAWSEGMENT*)this), *((DRAWSEGMENT*)aImage) );
+ break;
+
+ case PCB_TRACE_T:
+ case PCB_VIA_T:
+ {
+ TRACK* track = (TRACK*) this;
+ TRACK* image = (TRACK*) aImage;
+
+ std::swap(track->m_Layer, image->m_Layer );
+
+ // swap start, end, width and shape for track and image.
+ wxPoint exchp = track->GetStart();
+ track->SetStart( image->GetStart() );
+ image->SetStart( exchp );
+ exchp = track->GetEnd();
+ track->SetEnd( image->GetEnd() );
+ image->SetEnd( exchp );
+
+ int atmp = track->GetWidth();
+ track->SetWidth( image->GetWidth() );
+ image->SetWidth( atmp );
+
+ if( Type() == PCB_VIA_T )
+ {
+ VIA *via = static_cast<VIA*>( this );
+ VIA *viaimage = static_cast<VIA*>( aImage );
+
+ VIATYPE_T viatmp = via->GetViaType();
+ via->SetViaType( viaimage->GetViaType() );
+ viaimage->SetViaType( viatmp );
+
+ int drilltmp = via->GetDrillValue();
+
+ if( via->IsDrillDefault() )
+ drilltmp = -1;
+
+ int itmp = viaimage->GetDrillValue();
+
+ if( viaimage->IsDrillDefault() )
+ itmp = -1;
+
+ std::swap(itmp, drilltmp );
+
+ if( drilltmp > 0 )
+ via->SetDrill( drilltmp );
+ else
+ via->SetDrillDefault();
+
+ if( itmp > 0 )
+ viaimage->SetDrill( itmp );
+ else
+ viaimage->SetDrillDefault();
+ }
+ }
+ break;
+
+ case PCB_TEXT_T:
+ std::swap( *((TEXTE_PCB*)this), *((TEXTE_PCB*)aImage) );
+ break;
+
+ case PCB_TARGET_T:
+ std::swap( *((PCB_TARGET*)this), *((PCB_TARGET*)aImage) );
+ break;
+
+ case PCB_DIMENSION_T:
+ std::swap( *((DIMENSION*)this), *((DIMENSION*)aImage) );
+ break;
+
+ case PCB_ZONE_T:
+ default:
+ wxLogMessage( wxT( "SwapData() error: unexpected type %d" ), Type() );
+ break;
+ }
+
+ // Restore pointers and time stamp, to be sure they are not broken
+ Pnext = pnext;
+ Pback = pback;
+ m_List = mylist;
+ SetTimeStamp( timestamp );
+}
+
+
+void PCB_EDIT_FRAME::SaveCopyInUndoList( BOARD_ITEM* aItem,
+ UNDO_REDO_T aCommandType,
+ const wxPoint& aTransformPoint )
+{
+ if( aItem == NULL ) // Nothing to save
+ return;
+
+ // For texts belonging to modules, we need to save state of the parent module
+ if( aItem->Type() == PCB_MODULE_TEXT_T )
+ {
+ aItem = aItem->GetParent();
+
+ if( aItem == NULL )
+ return;
+
+ wxASSERT( aItem->Type() == PCB_MODULE_T );
+ aCommandType = UR_CHANGED;
+ }
+
+ PICKED_ITEMS_LIST* commandToUndo = new PICKED_ITEMS_LIST();
+
+ commandToUndo->m_TransformPoint = aTransformPoint;
+
+ ITEM_PICKER itemWrapper( aItem, aCommandType );
+
+ switch( aCommandType )
+ {
+ case UR_CHANGED: // Create a copy of item
+ if( itemWrapper.GetLink() == NULL ) // When not null, the copy is already done
+ itemWrapper.SetLink( aItem->Clone() );
+ commandToUndo->PushItem( itemWrapper );
+ break;
+
+ case UR_NEW:
+ case UR_DELETED:
+#ifdef USE_WX_OVERLAY
+ // Avoid to redraw when autoplacing
+ if( aItem->Type() == PCB_MODULE_T )
+ if( ((MODULE*)aItem)->GetFlags() & MODULE_to_PLACE )
+ break;
+ m_canvas->Refresh();
+#endif
+ case UR_MOVED:
+ case UR_FLIPPED:
+ case UR_ROTATED:
+ case UR_ROTATED_CLOCKWISE:
+ commandToUndo->PushItem( itemWrapper );
+ break;
+
+ default:
+ {
+ wxString msg;
+ msg.Printf( wxT( "SaveCopyInUndoList() error (unknown code %X)" ), aCommandType );
+ wxMessageBox( msg );
+ }
+ break;
+ }
+
+ if( commandToUndo->GetCount() )
+ {
+ /* Save the copy in undo list */
+ GetScreen()->PushCommandToUndoList( commandToUndo );
+
+ /* Clear redo list, because after new save there is no redo to do */
+ GetScreen()->ClearUndoORRedoList( GetScreen()->m_RedoList );
+ }
+ else
+ {
+ delete commandToUndo;
+ }
+}
+
+
+void PCB_EDIT_FRAME::SaveCopyInUndoList( const PICKED_ITEMS_LIST& aItemsList,
+ UNDO_REDO_T aTypeCommand,
+ const wxPoint& aTransformPoint )
+{
+ PICKED_ITEMS_LIST* commandToUndo = new PICKED_ITEMS_LIST();
+
+ commandToUndo->m_TransformPoint = aTransformPoint;
+
+ // Copy picker list:
+ commandToUndo->CopyList( aItemsList );
+
+ // Verify list, and creates data if needed
+ for( unsigned ii = 0; ii < commandToUndo->GetCount(); ii++ )
+ {
+ BOARD_ITEM* item = (BOARD_ITEM*) commandToUndo->GetPickedItem( ii );
+
+ // For texts belonging to modules, we need to save state of the parent module
+ if( item->Type() == PCB_MODULE_TEXT_T || item->Type() == PCB_PAD_T )
+ {
+ item = item->GetParent();
+
+ if( item == NULL )
+ continue;
+
+ wxASSERT( item->Type() == PCB_MODULE_T );
+
+ commandToUndo->SetPickedItem( item, ii );
+ commandToUndo->SetPickedItemStatus( UR_CHANGED, ii );
+ }
+
+ UNDO_REDO_T command = commandToUndo->GetPickedItemStatus( ii );
+
+ if( command == UR_UNSPECIFIED )
+ {
+ command = aTypeCommand;
+ commandToUndo->SetPickedItemStatus( command, ii );
+ }
+
+ wxASSERT( item );
+
+ switch( command )
+ {
+ case UR_CHANGED:
+
+ /* If needed, create a copy of item, and put in undo list
+ * in the picker, as link
+ * If this link is not null, the copy is already done
+ */
+ if( commandToUndo->GetPickedItemLink( ii ) == NULL )
+ commandToUndo->SetPickedItemLink( item->Clone(), ii );
+ break;
+
+ case UR_MOVED:
+ case UR_ROTATED:
+ case UR_ROTATED_CLOCKWISE:
+ case UR_FLIPPED:
+ case UR_NEW:
+ case UR_DELETED:
+ break;
+
+ default:
+ {
+ wxString msg;
+ msg.Printf( wxT( "SaveCopyInUndoList() error (unknown code %X)" ), command );
+ wxMessageBox( msg );
+ }
+
+ break;
+
+ }
+ }
+
+ if( commandToUndo->GetCount() )
+ {
+ /* Save the copy in undo list */
+ GetScreen()->PushCommandToUndoList( commandToUndo );
+
+ /* Clear redo list, because after a new command one cannot redo a command */
+ GetScreen()->ClearUndoORRedoList( GetScreen()->m_RedoList );
+ }
+ else // Should not occur
+ {
+ delete commandToUndo;
+ }
+}
+
+
+void PCB_EDIT_FRAME::PutDataInPreviousState( PICKED_ITEMS_LIST* aList, bool aRedoCommand,
+ bool aRebuildRatsnet )
+{
+ BOARD_ITEM* item;
+ bool not_found = false;
+ bool reBuild_ratsnest = false;
+ KIGFX::VIEW* view = GetGalCanvas()->GetView();
+ RN_DATA* ratsnest = GetBoard()->GetRatsnest();
+
+ // Undo in the reverse order of list creation: (this can allow stacked changes
+ // like the same item can be changes and deleted in the same complex command
+
+ bool build_item_list = true; // if true the list of existing items must be rebuilt
+
+ for( int ii = aList->GetCount() - 1; ii >= 0 ; ii-- )
+ {
+ item = (BOARD_ITEM*) aList->GetPickedItem( ii );
+ wxASSERT( item );
+
+ /* Test for existence of item on board.
+ * It could be deleted, and no more on board:
+ * - if a call to SaveCopyInUndoList was forgotten in Pcbnew
+ * - in zones outlines, when a change in one zone merges this zone with an other
+ * This test avoids a Pcbnew crash
+ * Obviously, this test is not made for deleted items
+ */
+ UNDO_REDO_T status = aList->GetPickedItemStatus( ii );
+
+ if( status != UR_DELETED )
+ {
+ if( build_item_list )
+ // Build list of existing items, for integrity test
+ TestForExistingItem( GetBoard(), NULL );
+
+ build_item_list = false;
+
+ if( !TestForExistingItem( GetBoard(), item ) )
+ {
+ // Remove this non existent item
+ aList->RemovePicker( ii );
+ ii++; // the current item was removed, ii points now the next item
+ // decrement it because it will be incremented later
+ not_found = true;
+ continue;
+ }
+ }
+
+ item->ClearFlags();
+
+ // see if we must rebuild ratsnets and pointers lists
+ switch( item->Type() )
+ {
+ case PCB_MODULE_T:
+ case PCB_ZONE_AREA_T:
+ case PCB_TRACE_T:
+ case PCB_VIA_T:
+ reBuild_ratsnest = true;
+ break;
+
+ default:
+ break;
+ }
+
+ switch( aList->GetPickedItemStatus( ii ) )
+ {
+ case UR_CHANGED: /* Exchange old and new data for each item */
+ {
+ BOARD_ITEM* image = (BOARD_ITEM*) aList->GetPickedItemLink( ii );
+
+ // Remove all pads/drawings/texts, as they become invalid
+ // for the VIEW after SwapData() called for modules
+ 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( image );
+
+ // Update all pads/drawings/texts, as they become invalid
+ // for the VIEW after SwapData() called for modules
+ if( item->Type() == PCB_MODULE_T )
+ {
+ MODULE* newModule = static_cast<MODULE*>( item );
+ newModule->RunOnChildren( boost::bind( &KIGFX::VIEW::Add, view, _1 ) );
+ }
+ view->Add( item );
+ ratsnest->Add( item );
+
+ item->ClearFlags( SELECTED );
+ item->ViewUpdate( KIGFX::VIEW_ITEM::LAYERS );
+ }
+ break;
+
+ case UR_NEW: /* new items are deleted */
+ aList->SetPickedItemStatus( UR_DELETED, ii );
+ GetBoard()->Remove( item );
+
+ if( item->Type() == PCB_MODULE_T )
+ {
+ MODULE* module = static_cast<MODULE*>( item );
+ module->RunOnChildren( boost::bind( &KIGFX::VIEW::Remove, view, _1 ) );
+ }
+ view->Remove( item );
+
+ item->ViewUpdate( KIGFX::VIEW_ITEM::GEOMETRY );
+ break;
+
+ case UR_DELETED: /* deleted items are put in List, as new items */
+ aList->SetPickedItemStatus( UR_NEW, ii );
+ GetBoard()->Add( item );
+
+ if( item->Type() == PCB_MODULE_T )
+ {
+ MODULE* module = static_cast<MODULE*>( item );
+ module->RunOnChildren( boost::bind( &KIGFX::VIEW::Add, view, _1) );
+ }
+ view->Add( item );
+
+ item->ViewUpdate( KIGFX::VIEW_ITEM::GEOMETRY );
+ build_item_list = true;
+ break;
+
+ case UR_MOVED:
+ item->Move( aRedoCommand ? aList->m_TransformPoint : -aList->m_TransformPoint );
+ item->ViewUpdate( KIGFX::VIEW_ITEM::GEOMETRY );
+ ratsnest->Update( item );
+ break;
+
+ case UR_ROTATED:
+ item->Rotate( aList->m_TransformPoint,
+ aRedoCommand ? m_rotationAngle : -m_rotationAngle );
+ item->ViewUpdate( KIGFX::VIEW_ITEM::GEOMETRY );
+ ratsnest->Update( item );
+ break;
+
+ case UR_ROTATED_CLOCKWISE:
+ item->Rotate( aList->m_TransformPoint,
+ aRedoCommand ? -m_rotationAngle : m_rotationAngle );
+ item->ViewUpdate( KIGFX::VIEW_ITEM::GEOMETRY );
+ ratsnest->Update( item );
+ break;
+
+ case UR_FLIPPED:
+ item->Flip( aList->m_TransformPoint );
+ item->ViewUpdate( KIGFX::VIEW_ITEM::LAYERS );
+ ratsnest->Update( item );
+ break;
+
+ default:
+ {
+ wxString msg;
+ msg.Printf( wxT( "PutDataInPreviousState() error (unknown code %X)" ),
+ aList->GetPickedItemStatus( ii ) );
+ wxMessageBox( msg );
+ }
+ break;
+ }
+ }
+
+ if( not_found )
+ wxMessageBox( wxT( "Incomplete undo/redo operation: some items not found" ) );
+
+ // Rebuild pointers and ratsnest that can be changed.
+ if( reBuild_ratsnest && aRebuildRatsnet )
+ {
+ if( IsGalCanvasActive() )
+ ratsnest->Recalculate();
+ else
+ Compile_Ratsnest( NULL, true );
+ }
+}
+
+
+void PCB_EDIT_FRAME::RestoreCopyFromUndoList( wxCommandEvent& aEvent )
+{
+ if( UndoRedoBlocked() )
+ return;
+
+ if( GetScreen()->GetUndoCommandCount() <= 0 )
+ return;
+
+ // Inform tools that undo command was issued
+ TOOL_EVENT event( TC_MESSAGE, TA_UNDO_REDO, AS_GLOBAL );
+ m_toolManager->ProcessEvent( event );
+
+ /* Get the old list */
+ PICKED_ITEMS_LIST* List = GetScreen()->PopCommandFromUndoList();
+
+ /* Undo the command */
+ PutDataInPreviousState( List, false );
+
+ /* Put the old list in RedoList */
+ List->ReversePickersListOrder();
+ GetScreen()->PushCommandToRedoList( List );
+
+ OnModify();
+ m_canvas->Refresh();
+}
+
+
+void PCB_EDIT_FRAME::RestoreCopyFromRedoList( wxCommandEvent& aEvent )
+{
+ if( UndoRedoBlocked() )
+ return;
+
+ if( GetScreen()->GetRedoCommandCount() == 0 )
+ return;
+
+ // Inform tools that redo command was issued
+ TOOL_EVENT event( TC_MESSAGE, TA_UNDO_REDO, AS_GLOBAL );
+ m_toolManager->ProcessEvent( event );
+
+ /* Get the old list */
+ PICKED_ITEMS_LIST* List = GetScreen()->PopCommandFromRedoList();
+
+ /* Redo the command: */
+ PutDataInPreviousState( List, true );
+
+ /* Put the old list in UndoList */
+ List->ReversePickersListOrder();
+ GetScreen()->PushCommandToUndoList( List );
+
+ OnModify();
+ m_canvas->Refresh();
+}
+
+
+void PCB_SCREEN::ClearUndoORRedoList( UNDO_REDO_CONTAINER& aList, int aItemCount )
+{
+ if( aItemCount == 0 )
+ return;
+
+ unsigned icnt = aList.m_CommandsList.size();
+
+ if( aItemCount > 0 )
+ icnt = aItemCount;
+
+ for( unsigned ii = 0; ii < icnt; ii++ )
+ {
+ if( aList.m_CommandsList.size() == 0 )
+ break;
+
+ PICKED_ITEMS_LIST* curr_cmd = aList.m_CommandsList[0];
+ aList.m_CommandsList.erase( aList.m_CommandsList.begin() );
+
+ curr_cmd->ClearListAndDeleteItems();
+ delete curr_cmd; // Delete command
+ }
+}