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

pcbnew: When using '+' and '-' hotkeys, skip non-visible layers 

CHANGED: pcbnew: When using '+' and '-' hotkeys, skip non-visible layers

Fixes https://gitlab.com/kicad/code/kicad/issues/3443
This commit is contained in:
Fabien Corona 2019-12-29 23:37:25 +00:00 committed by Ian McInerney
parent 07db846ed4
commit 496f3d49e4
1 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
pcbnew/tools/pcbnew_control.cpp
View File

@ -327,19 +327,21 @@ int PCBNEW_CONTROL::LayerSwitch( const TOOL_EVENT& aEvent )
int PCBNEW_CONTROL::LayerNext( const TOOL_EVENT& aEvent ) int PCBNEW_CONTROL::LayerNext( const TOOL_EVENT& aEvent )
{ {
PCB_BASE_FRAME* editFrame = m_frame; PCB_BASE_FRAME* editFrame = m_frame;
BOARD* brd = board();
LAYER_NUM layer = editFrame->GetActiveLayer(); LAYER_NUM layer = editFrame->GetActiveLayer();
LAYER_NUM startLayer = layer;
if( layer < F_Cu || layer > B_Cu ) if( layer < F_Cu || layer > B_Cu )
return 0; return 0;
int layerCount = board()->GetCopperLayerCount(); while( startLayer != ++layer )
{
if( brd->IsLayerVisible( static_cast<PCB_LAYER_ID>( layer ) ) && IsCopperLayer( layer ) )
break;
if( layer == layerCount - 2 || layerCount < 2 ) if( layer >= B_Cu )
layer = B_Cu; layer = F_Cu - 1;
else if( layer == B_Cu ) }
layer = F_Cu;
else
++layer;
wxCHECK( IsCopperLayer( layer ), 0 ); wxCHECK( IsCopperLayer( layer ), 0 );
editFrame->SwitchLayer( NULL, ToLAYER_ID( layer ) ); editFrame->SwitchLayer( NULL, ToLAYER_ID( layer ) );
@ -351,19 +353,22 @@ int PCBNEW_CONTROL::LayerNext( const TOOL_EVENT& aEvent )
int PCBNEW_CONTROL::LayerPrev( const TOOL_EVENT& aEvent ) int PCBNEW_CONTROL::LayerPrev( const TOOL_EVENT& aEvent )
{ {
PCB_BASE_FRAME* editFrame = m_frame; PCB_BASE_FRAME* editFrame = m_frame;
BOARD* brd = board();
LAYER_NUM layer = editFrame->GetActiveLayer(); LAYER_NUM layer = editFrame->GetActiveLayer();
LAYER_NUM startLayer = layer;
if( layer < F_Cu || layer > B_Cu ) if( layer < F_Cu || layer > B_Cu )
return 0; return 0;
int layerCount = board()->GetCopperLayerCount(); while( startLayer != --layer )
{
if( brd->IsLayerVisible( static_cast<PCB_LAYER_ID>( layer ) ) && IsCopperLayer( layer ) )
break;
if( layer <= F_Cu )
layer = B_Cu + 1;
}
if( layer == F_Cu || layerCount < 2 )
layer = B_Cu;
else if( layer == B_Cu )
layer = layerCount - 2;
else
--layer;
wxCHECK( IsCopperLayer( layer ), 0 ); wxCHECK( IsCopperLayer( layer ), 0 );
editFrame->SwitchLayer( NULL, ToLAYER_ID( layer ) ); editFrame->SwitchLayer( NULL, ToLAYER_ID( layer ) );