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

Add undo/redo support for Pcbnew auto place, auto move, and auto route features.

This commit is contained in:
Guillaume Simard 2011-12-13 15:42:42 -05:00 committed by Wayne Stambaugh
parent b2c11207e4
commit bced8c9774
3 changed files with 63 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pcbnew/automove.cpp
View File

@ -18,6 +18,7 @@
#include "class_board.h"
#include "class_module.h"
extern BOARD_ITEM* DuplicateStruct( BOARD_ITEM* aItem );
typedef enum {
FIXE_MODULE,
@ -184,6 +185,11 @@ void PCB_EDIT_FRAME::AutoMoveModulesOnPcb( bool PlaceModulesHorsPcb )
int pas_grille = (int) GetScreen()->GetGridSize().x;
double surface;
// Undo: init list
PICKED_ITEMS_LIST newList;
newList.m_Status = UR_CHANGED;
ITEM_PICKER picker( NULL, UR_CHANGED );
if( GetBoard()->m_Modules == NULL )
{
DisplayError( this, _( "No modules found!" ) );
@ -264,6 +270,10 @@ void PCB_EDIT_FRAME::AutoMoveModulesOnPcb( bool PlaceModulesHorsPcb )
continue;
}
// Undo: add copy of old Module to undo
picker.m_Link = DuplicateStruct( Module );
picker.m_PickedItemType = Module->Type();
if( current.x > (Xsize_allowed + start.x) )
{
current.x = start.x;
@ -278,9 +288,17 @@ void PCB_EDIT_FRAME::AutoMoveModulesOnPcb( bool PlaceModulesHorsPcb )
PlaceModule( Module, NULL, true );
// Undo: add new Module to undo
picker.m_PickedItem = Module;
newList.PushItem( picker );
current.x += Module->m_BoundaryBox.GetWidth() + pas_grille;
}
// Undo: commit
if( newList.GetCount() )
SaveCopyInUndoList( newList, UR_CHANGED );
DrawPanel->Refresh();
}

35
pcbnew/autoplac.cpp
View File

@ -109,6 +109,11 @@ void PCB_EDIT_FRAME::AutoPlaceModule( MODULE* Module, int place_mode, wxDC* DC )
float Pas;
int lay_tmp_TOP, lay_tmp_BOTTOM;
// Undo: init list
PICKED_ITEMS_LIST newList;
newList.m_Status = UR_CHANGED;
ITEM_PICKER picker( NULL, UR_CHANGED );
if( GetBoard()->m_Modules == NULL )
return;
@ -175,7 +180,14 @@ void PCB_EDIT_FRAME::AutoPlaceModule( MODULE* Module, int place_mode, wxDC* DC )
{
case PLACE_1_MODULE:
if( ThisModule == Module )
{
// Module will be placed, add to undo.
picker.m_PickedItem = ThisModule;
picker.m_PickedItemType = ThisModule->Type();
newList.PushItem( picker );
Module->m_ModuleStatus |= MODULE_to_PLACE;
}
break;
@ -186,7 +198,14 @@ void PCB_EDIT_FRAME::AutoPlaceModule( MODULE* Module, int place_mode, wxDC* DC )
break;
if( !bbbox.Contains( Module->m_Pos ) )
{
// Module will be placed, add to undo.
picker.m_PickedItem = Module;
picker.m_PickedItemType = Module->Type();
newList.PushItem( picker );
Module->m_ModuleStatus |= MODULE_to_PLACE;
}
break;
@ -196,6 +215,11 @@ void PCB_EDIT_FRAME::AutoPlaceModule( MODULE* Module, int place_mode, wxDC* DC )
if( Module->m_ModuleStatus & MODULE_is_LOCKED )
break;
// Module will be placed, add to undo.
picker.m_PickedItem = Module;
picker.m_PickedItemType = Module->Type();
newList.PushItem( picker );
Module->m_ModuleStatus |= MODULE_to_PLACE;
break;
@ -207,7 +231,14 @@ void PCB_EDIT_FRAME::AutoPlaceModule( MODULE* Module, int place_mode, wxDC* DC )
}
if( !(Module->m_ModuleStatus & MODULE_is_PLACED) )
{
// Module will be placed, add to undo.
picker.m_PickedItem = Module;
picker.m_PickedItemType = Module->Type();
newList.PushItem( picker );
Module->m_ModuleStatus |= MODULE_to_PLACE;
}
break;
}
@ -224,6 +255,10 @@ void PCB_EDIT_FRAME::AutoPlaceModule( MODULE* Module, int place_mode, wxDC* DC )
}
}
// Undo: commit
if( newList.GetCount() )
SaveCopyInUndoList( newList, UR_CHANGED );
activ = 0;
Pas = 100.0;

10
pcbnew/solve.cpp
View File

@ -79,6 +79,8 @@ static RATSNEST_ITEM* pt_cur_ch;
static int Ncurrent; /* measures of progress */
static int s_Clearance; // Clearance value used in autorouter
static PICKED_ITEMS_LIST s_ItemsListPicker;
#define NOSUCCESS 0
#define STOP_FROM_ESC -1
@ -272,6 +274,9 @@ int PCB_EDIT_FRAME::Solve( wxDC* DC, int two_sides )
Ncurrent = 0;
// Prepare the undo command info
s_ItemsListPicker.ClearListAndDeleteItems(); // Should not be necessary, but...
/* go until no more work to do */
GetWork( &row_source, &col_source, &current_net_code,
&row_target, &col_target, &pt_cur_ch ); // First net to route.
@ -375,6 +380,9 @@ int PCB_EDIT_FRAME::Solve( wxDC* DC, int two_sides )
DrawPanel->m_AbortEnable = false;
SaveCopyInUndoList( s_ItemsListPicker, UR_UNSPECIFIED );
s_ItemsListPicker.ClearItemsList(); // s_ItemsListPicker is no more owner of picked items
return SUCCESS;
}
@ -1323,6 +1331,8 @@ static void AddNewTrace( PCB_EDIT_FRAME* pcbframe, wxDC* DC )
while( ( track = g_CurrentTrackList.PopFront() ) != NULL )
{
ITEM_PICKER picker( track, UR_NEW );
s_ItemsListPicker.PushItem( picker );
pcbframe->GetBoard()->m_Track.Insert( track, insertBeforeMe );
}