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

Check visibility when switching layer in router tool 

When routing and using layerNext (hotkey '+') to switch to next layer,
it will skip invisible layer, when click BUT_LEFT, the new line should
be in the same layer (visible layer)

Fixes https://gitlab.com/kicad/code/kicad/-/issues/14480
This commit is contained in:
Yang Hongbo 2023-04-04 11:52:33 +08:00 committed by Seth Hillbrand
parent 20d2568f0c
commit fe1b1becef
1 changed files with 47 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
pcbnew/router/router_tool.cpp
View File

@ -896,6 +896,7 @@ int ROUTER_TOOL::handleLayerSwitch( const TOOL_EVENT& aEvent, bool aForceVia )
LSEQ layers = LSET( board()->GetEnabledLayers() & LSET::AllCuMask() ).Seq(); LSEQ layers = LSET( board()->GetEnabledLayers() & LSET::AllCuMask() ).Seq();
PCB_LAYER_ID currentLayer = (PCB_LAYER_ID) m_router->GetCurrentLayer(); PCB_LAYER_ID currentLayer = (PCB_LAYER_ID) m_router->GetCurrentLayer();
PCB_LAYER_ID targetLayer = UNDEFINED_LAYER; PCB_LAYER_ID targetLayer = UNDEFINED_LAYER;
BOARD* brd = board();
if( aEvent.IsAction( &PCB_ACTIONS::layerNext ) ) if( aEvent.IsAction( &PCB_ACTIONS::layerNext ) )
{ {
@ -903,6 +904,7 @@ int ROUTER_TOOL::handleLayerSwitch( const TOOL_EVENT& aEvent, bool aForceVia )
m_lastTargetLayer = currentLayer; m_lastTargetLayer = currentLayer;
size_t idx = 0; size_t idx = 0;
size_t target_idx = 0;
for( size_t i = 0; i < layers.size(); i++ ) for( size_t i = 0; i < layers.size(); i++ )
{ {
@ -913,8 +915,29 @@ int ROUTER_TOOL::handleLayerSwitch( const TOOL_EVENT& aEvent, bool aForceVia )
} }
} }
idx = ( idx + 1 ) % layers.size(); target_idx = ( idx + 1 ) % layers.size();
targetLayer = layers[idx]; // issue: #14480
// idx + 1 layer may be invisible, switches to next visible layer
for( size_t i = 0; i < layers.size() - 1; i++ )
{
if( brd->IsLayerVisible( static_cast<PCB_LAYER_ID>( layers[target_idx] ) ) )
{
targetLayer = layers[target_idx];
break;
}
target_idx += 1;
if( target_idx >= layers.size() )
{
target_idx = 0;
}
}
if( targetLayer == UNDEFINED_LAYER )
{
// if there is no visible layers
return 0;
}
} }
else if( aEvent.IsAction( &PCB_ACTIONS::layerPrev ) ) else if( aEvent.IsAction( &PCB_ACTIONS::layerPrev ) )
{ {
@ -922,6 +945,7 @@ int ROUTER_TOOL::handleLayerSwitch( const TOOL_EVENT& aEvent, bool aForceVia )
m_lastTargetLayer = currentLayer; m_lastTargetLayer = currentLayer;
size_t idx = 0; size_t idx = 0;
size_t target_idx = 0;
for( size_t i = 0; i < layers.size(); i++ ) for( size_t i = 0; i < layers.size(); i++ )
{ {
@ -932,8 +956,27 @@ int ROUTER_TOOL::handleLayerSwitch( const TOOL_EVENT& aEvent, bool aForceVia )
} }
} }
idx = ( idx > 0 ) ? ( idx - 1 ) : ( layers.size() - 1 ); target_idx = ( idx > 0 ) ? ( idx - 1 ) : ( layers.size() - 1 );
targetLayer = layers[idx];
for( size_t i = 0; i < layers.size() - 1; i++ )
{
if( brd->IsLayerVisible( static_cast<PCB_LAYER_ID>( layers[target_idx] ) ) )
{
targetLayer = layers[target_idx];
break;
}
if( target_idx > 0 )
target_idx -= 1;
else
target_idx = layers.size() - 1;
}
if( targetLayer == UNDEFINED_LAYER )
{
// if there is no visible layers
return 0;
}
} }
else else
{ {