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

Try to fix Bug #1100876< Modes (track/footprint) not available.> 

It could be a race condition when setting the tools state on and off in PCB_EDIT_FRAME::OnSelectAutoPlaceMode( wxCommandEvent& aEvent ) on some Linux/wxWidgets versions
(does not happen on my computer)
This commit is contained in:
jean-pierre charras 2013-01-18 15:12:57 +01:00
parent 5aaa55c898
commit 129f93b8d3
3 changed files with 58 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
pcbnew/pcbframe.cpp
View File

@ -826,13 +826,42 @@ void PCB_EDIT_FRAME::ScriptingConsoleEnableDisable( wxCommandEvent& aEvent )
void PCB_EDIT_FRAME::OnSelectAutoPlaceMode( wxCommandEvent& aEvent ) void PCB_EDIT_FRAME::OnSelectAutoPlaceMode( wxCommandEvent& aEvent )
{ {
if( aEvent.IsChecked() ) // Automatic placement of modules and tracks is a mutually exclusive operation so
// clear the other tool if one of the two is selected.
// Be careful: this event function is called both by the
// ID_TOOLBARH_PCB_MODE_MODULE and the ID_TOOLBARH_PCB_MODE_TRACKS tool
// Therefore we should avoid a race condition when deselecting one of these tools
// inside this function (seems happen on some Linux/wxWidgets versions)
// when the other tool is selected
int previous_state = m_autoPlaceModeId;
switch( aEvent.GetId() )
{ {
m_autoPlaceModeId = aEvent.GetId(); case ID_TOOLBARH_PCB_MODE_MODULE:
} if( aEvent.IsChecked() )
else {
{ m_autoPlaceModeId = ID_TOOLBARH_PCB_MODE_MODULE;
m_autoPlaceModeId = 0;
} if( previous_state == ID_TOOLBARH_PCB_MODE_TRACKS )
m_mainToolBar->ToggleTool( ID_TOOLBARH_PCB_MODE_TRACKS, false );
}
else if( m_autoPlaceModeId == ID_TOOLBARH_PCB_MODE_MODULE )
// Deselect m_autoPlaceModeId only if it was selected by this tool
m_autoPlaceModeId = 0;
break;
case ID_TOOLBARH_PCB_MODE_TRACKS:
if( aEvent.IsChecked() )
{
m_autoPlaceModeId = ID_TOOLBARH_PCB_MODE_TRACKS;
if( previous_state == ID_TOOLBARH_PCB_MODE_MODULE )
m_mainToolBar->ToggleTool( ID_TOOLBARH_PCB_MODE_MODULE, false );
}
else if( m_autoPlaceModeId == ID_TOOLBARH_PCB_MODE_TRACKS )
// Deselect m_autoPlaceModeId only if it was selected by this tool
m_autoPlaceModeId = 0;
break;
}
} }

10
pcbnew/tool_pcb.cpp
View File

@ -59,7 +59,9 @@
/* Data to build the layer pair indicator button */ /* Data to build the layer pair indicator button */
static wxBitmap* LayerPairBitmap = NULL; static wxBitmap* LayerPairBitmap = NULL;
static const char s_BitmapLayerIcon[24][24] = { #define BM_LAYERICON_SIZE 24
static const char s_BitmapLayerIcon[BM_LAYERICON_SIZE][BM_LAYERICON_SIZE] =
{
// 0 = draw pixel with active layer color // 0 = draw pixel with active layer color
// 1 = draw pixel with top layer color (top/bottom layer used inautoroute and place via) // 1 = draw pixel with top layer color (top/bottom layer used inautoroute and place via)
// 2 = draw pixel with bottom layer color // 2 = draw pixel with bottom layer color
@ -155,9 +157,9 @@ void PCB_EDIT_FRAME::PrepareLayerIndicator()
wxPen pen; wxPen pen;
int buttonColor = -1; int buttonColor = -1;
for( ii = 0; ii < 24; ii++ ) for( ii = 0; ii < BM_LAYERICON_SIZE; ii++ )
{ {
for( jj = 0; jj < 24; jj++ ) for( jj = 0; jj < BM_LAYERICON_SIZE; jj++ )
{ {
if( s_BitmapLayerIcon[ii][jj] != buttonColor ) if( s_BitmapLayerIcon[ii][jj] != buttonColor )
{ {
@ -305,7 +307,7 @@ void PCB_EDIT_FRAME::ReCreateHToolbar()
m_mainToolBar->AddTool( ID_TOOLBARH_PCB_SCRIPTING_CONSOLE, wxEmptyString, m_mainToolBar->AddTool( ID_TOOLBARH_PCB_SCRIPTING_CONSOLE, wxEmptyString,
KiBitmap( book_xpm ), KiBitmap( book_xpm ),
_( "Show/Hide the Scripting console" ) ); _( "Show/Hide the Scripting console" ) );
m_mainToolBar->AddSeparator(); m_mainToolBar->AddSeparator();
#endif #endif
// after adding the buttons to the toolbar, must call Realize() to reflect the changes // after adding the buttons to the toolbar, must call Realize() to reflect the changes

22
pcbnew/toolbars_update_user_interface.cpp
View File

@ -206,15 +206,25 @@ void PCB_EDIT_FRAME::OnUpdateVerticalToolbar( wxUpdateUIEvent& aEvent )
void PCB_EDIT_FRAME::OnUpdateAutoPlaceTracksMode( wxUpdateUIEvent& aEvent ) void PCB_EDIT_FRAME::OnUpdateAutoPlaceTracksMode( wxUpdateUIEvent& aEvent )
{ {
// Automatic placement of modules and tracks is a mutually exclusive operation so // Automatic placement of modules and tracks is a mutually exclusive operation
// clear the other tool if one of the two is selected. // So this tool is activated only if
aEvent.Check( m_autoPlaceModeId == ID_TOOLBARH_PCB_MODE_TRACKS ); // m_autoPlaceModeId == ID_TOOLBARH_PCB_MODE_TRACKS.
// To avoid creating erroneous events (seems happen on some Linux/wxWidgets versions)
// the tool state is changed only when it is incorrect
bool state = m_autoPlaceModeId == ID_TOOLBARH_PCB_MODE_TRACKS;
if( aEvent.IsChecked() != state )
aEvent.Check( state );
} }
void PCB_EDIT_FRAME::OnUpdateAutoPlaceModulesMode( wxUpdateUIEvent& aEvent ) void PCB_EDIT_FRAME::OnUpdateAutoPlaceModulesMode( wxUpdateUIEvent& aEvent )
{ {
// Automatic placement of modules and tracks is a mutually exclusive operation so // Automatic placement of modules and tracks is a mutually exclusive operation,
// clear the other tool if one of the two is selected. // So this tool is activated only if
aEvent.Check( m_autoPlaceModeId == ID_TOOLBARH_PCB_MODE_MODULE ); // m_autoPlaceModeId == ID_TOOLBARH_PCB_MODE_MODULE.
// To avoid creating erroneous events (seems happen on some Linux/wxWidgets versions)
// the tool state is changed only when it is incorrect
bool state = m_autoPlaceModeId == ID_TOOLBARH_PCB_MODE_MODULE;
if( aEvent.IsChecked() != state )
aEvent.Check( state );
} }