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

Refinement for fix in 5497.

This commit is contained in:
Maciej Suminski 2015-03-10 18:31:23 +01:00
parent 4ad4898254
commit 035b231b62
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pcbnew/pcbframe.cpp
View File

@ -467,6 +467,8 @@ PCB_EDIT_FRAME::~PCB_EDIT_FRAME()
void PCB_EDIT_FRAME::SetBoard( BOARD* aBoard ) void PCB_EDIT_FRAME::SetBoard( BOARD* aBoard )
{ {
bool new_board = ( aBoard != m_Pcb );
PCB_BASE_FRAME::SetBoard( aBoard ); PCB_BASE_FRAME::SetBoard( aBoard );
if( IsGalCanvasActive() ) if( IsGalCanvasActive() )
@ -484,7 +486,9 @@ void PCB_EDIT_FRAME::SetBoard( BOARD* aBoard )
{ {
m_toolManager->SetEnvironment( aBoard, drawPanel->GetView(), m_toolManager->SetEnvironment( aBoard, drawPanel->GetView(),
drawPanel->GetViewControls(), this ); drawPanel->GetViewControls(), this );
m_toolManager->ResetTools( TOOL_BASE::MODEL_RELOAD );
if( new_board )
m_toolManager->ResetTools( TOOL_BASE::MODEL_RELOAD );
} }
} }
} }

13
pcbnew/tools/selection_tool.cpp
View File

@ -88,8 +88,17 @@ SELECTION_TOOL::~SELECTION_TOOL()
void SELECTION_TOOL::Reset( RESET_REASON aReason ) void SELECTION_TOOL::Reset( RESET_REASON aReason )
{ {
// Restore previous properties of selected items and remove them from containers if( aReason == TOOL_BASE::MODEL_RELOAD )
clearSelection(); {
// Remove pointers to the selected items from containers
// without changing their properties (as they are already deleted
// while a new board is loaded)
m_selection.group->Clear();
m_selection.clear();
}
else
// Restore previous properties of selected items and remove them from containers
clearSelection();
m_frame = getEditFrame<PCB_BASE_FRAME>(); m_frame = getEditFrame<PCB_BASE_FRAME>();
m_locked = true; m_locked = true;