realAscot/kicad-source
1
0
Fork 0
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-09-14 02:03:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Pcbnew: fix some switch copper layers issues:

Browse Source 
- fix PCB_CONTROL::LayerNext() and PCB_CONTROL::LayerPrev() (hotkeys + and -)
- fix PCB_EDIT_FRAME::SwitchLayer( PCB_LAYER_ID layer )
- fix PCB_BASE_FRAME::SwitchLayer( PCB_LAYER_ID layer )

-PNS router SwitchLayer is still broken and can crash.
This commit is contained in:
jean-pierre charras 2024-10-03 18:27:48 +02:00
parent 90e2dc78b1
commit ef3193fe97
3 changed files with 67 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pcbnew/edit.cpp
View File

@ -106,7 +106,7 @@ void PCB_EDIT_FRAME::SwitchLayer( PCB_LAYER_ID layer )
// also capable of being selected.
else
{
if( layer != B_Cu && layer != F_Cu && layer >= GetBoard()->GetCopperLayerCount() - 1 )
if( layer != B_Cu && layer != F_Cu && layer >= GetBoard()->GetCopperLayerCount()*2 )
return;
}
}

2
pcbnew/pcb_base_frame.cpp
View File

@ -736,7 +736,7 @@ void PCB_BASE_FRAME::SwitchLayer( PCB_LAYER_ID layer )
// layers are also capable of being selected.
else
{
if( layer != B_Cu && layer != F_Cu && layer >= ( m_pcb->GetCopperLayerCount() - 1 ) )
if( layer != B_Cu && layer != F_Cu && layer >= m_pcb->GetCopperLayerCount()*2 )
return;
}
}

83
pcbnew/tools/pcb_control.cpp
View File

@ -416,16 +416,41 @@ int PCB_CONTROL::LayerNext( const TOOL_EVENT& aEvent )
{
PCB_BASE_FRAME* editFrame = m_frame;
BOARD* brd = board();
int layer = editFrame->GetActiveLayer();
int startLayer = layer;
PCB_LAYER_ID layer = editFrame->GetActiveLayer();
bool wraparound = false;
while( startLayer != ++layer )
if( !IsCopperLayer( layer ) )
{
if( brd->IsLayerVisible( static_cast<PCB_LAYER_ID>( layer ) ) && IsCopperLayer( layer ) )
editFrame->SwitchLayer( B_Cu );
return 0;
}
LSET cuMask = LSET::AllCuMask( brd->GetCopperLayerCount() );
LSEQ layerStack = cuMask.UIOrder();
int ii = 0;
// Find the active layer in list
for( ; ii < (int)layerStack.size(); ii++ )
{
if( layer == layerStack[ii] )
break;
}
// Find the next visible layer in list
for( ; ii < (int)layerStack.size(); ii++ )
{
int jj = ii+1;
if( jj >= (int)layerStack.size() )
jj = 0;
layer = layerStack[jj];
if( brd->IsLayerVisible( layer ) )
break;
if( layer >= B_Cu )
if( jj == 0 ) // the end of list is reached. Try from the beginning
{
if( wraparound )
{
@ -435,13 +460,13 @@ int PCB_CONTROL::LayerNext( const TOOL_EVENT& aEvent )
else
{
wraparound = true;
layer = F_Cu - 1;
ii = -1;
}
}
}
wxCHECK( IsCopperLayer( layer ), 0 );
editFrame->SwitchLayer( ToLAYER_ID( layer ) );
editFrame->SwitchLayer( layer );
return 0;
}
@ -451,19 +476,41 @@ int PCB_CONTROL::LayerPrev( const TOOL_EVENT& aEvent )
{
PCB_BASE_FRAME* editFrame = m_frame;
BOARD* brd = board();
int layer = editFrame->GetActiveLayer();
int startLayer = layer;
PCB_LAYER_ID layer = editFrame->GetActiveLayer();
bool wraparound = false;
while( startLayer != --layer )
if( !IsCopperLayer( layer ) )
{
if( IsCopperLayer( layer ) // also test for valid layer id (layer >= F_Cu)
&& brd->IsLayerVisible( static_cast<PCB_LAYER_ID>( layer ) ) )
{
break;
}
editFrame->SwitchLayer( F_Cu );
return 0;
}
if( layer <= F_Cu )
LSET cuMask = LSET::AllCuMask( brd->GetCopperLayerCount() );
LSEQ layerStack = cuMask.UIOrder();
int ii = 0;
// Find the active layer in list
for( ; ii < (int)layerStack.size(); ii++ )
{
if( layer == layerStack[ii] )
break;
}
// Find the previous visible layer in list
for( ; ii >= 0; ii-- )
{
int jj = ii - 1;
if( jj < 0 )
jj = (int)layerStack.size() - 1;
layer = layerStack[jj];
if( brd->IsLayerVisible( layer ) )
break;
if( ii == 0 ) // the start of list is reached. Try from the last
{
if( wraparound )
{
@ -473,13 +520,13 @@ int PCB_CONTROL::LayerPrev( const TOOL_EVENT& aEvent )
else
{
wraparound = true;
layer = B_Cu + 1;
ii = 1;
}
}
}
wxCHECK( IsCopperLayer( layer ), 0 );
editFrame->SwitchLayer( ToLAYER_ID( layer ) );
editFrame->SwitchLayer( layer );
return 0;
}