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

std-ize layer lists 

Cleanup of list work to use std models.
This commit is contained in:
Seth Hillbrand 2019-02-03 09:42:04 +01:00
parent 313ebb9dff
commit a8e920bdef
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pcbnew/pcb_draw_panel_gal.cpp
View File

@ -270,41 +270,39 @@ void PCB_DRAW_PANEL_GAL::SetTopLayer( PCB_LAYER_ID aLayer )
m_view->SetTopLayer( aLayer ); m_view->SetTopLayer( aLayer );
// Layers that should always have on-top attribute enabled // Layers that should always have on-top attribute enabled
const LAYER_NUM layers[] = { const std::vector<LAYER_NUM> layers = {
LAYER_VIA_THROUGH, LAYER_VIAS_HOLES, LAYER_VIAS_NETNAMES, LAYER_VIA_THROUGH, LAYER_VIAS_HOLES, LAYER_VIAS_NETNAMES,
LAYER_PADS_TH, LAYER_PADS_PLATEDHOLES, LAYER_PADS_NETNAMES, LAYER_PADS_TH, LAYER_PADS_PLATEDHOLES, LAYER_PADS_NETNAMES,
LAYER_NON_PLATEDHOLES, LAYER_SELECT_OVERLAY, LAYER_GP_OVERLAY, LAYER_NON_PLATEDHOLES, LAYER_SELECT_OVERLAY, LAYER_GP_OVERLAY,
LAYER_RATSNEST, LAYER_DRC LAYER_RATSNEST, LAYER_DRC
}; };
for( unsigned int i = 0; i < sizeof( layers ) / sizeof( LAYER_NUM ); ++i ) for( auto layer : layers )
m_view->SetTopLayer( layers[i] ); m_view->SetTopLayer( layer );
// Extra layers that are brought to the top if a F.* or B.* is selected // Extra layers that are brought to the top if a F.* or B.* is selected
const LAYER_NUM frontLayers[] = { const std::vector<LAYER_NUM> frontLayers = {
F_Cu, F_Adhes, F_Paste, F_SilkS, F_Mask, F_CrtYd, F_Fab, LAYER_PAD_FR, F_Cu, F_Adhes, F_Paste, F_SilkS, F_Mask, F_CrtYd, F_Fab, LAYER_PAD_FR,
LAYER_PAD_FR_NETNAMES, NETNAMES_LAYER_INDEX( F_Cu ), -1 LAYER_PAD_FR_NETNAMES, NETNAMES_LAYER_INDEX( F_Cu )
}; };
const LAYER_NUM backLayers[] = { const std::vector<LAYER_NUM> backLayers = {
B_Cu, B_Adhes, B_Paste, B_SilkS, B_Mask, B_CrtYd, B_Fab, LAYER_PAD_BK, B_Cu, B_Adhes, B_Paste, B_SilkS, B_Mask, B_CrtYd, B_Fab, LAYER_PAD_BK,
LAYER_PAD_BK_NETNAMES, NETNAMES_LAYER_INDEX( B_Cu ), -1 LAYER_PAD_BK_NETNAMES, NETNAMES_LAYER_INDEX( B_Cu )
}; };
const LAYER_NUM* extraLayers = NULL; const std::vector<LAYER_NUM>* extraLayers = NULL;
// Bring a few more extra layers to the top depending on the selected board side // Bring a few more extra layers to the top depending on the selected board side
if( IsFrontLayer( aLayer ) ) if( IsFrontLayer( aLayer ) )
extraLayers = frontLayers; extraLayers = &frontLayers;
else if( IsBackLayer( aLayer ) ) else if( IsBackLayer( aLayer ) )
extraLayers = backLayers; extraLayers = &backLayers;
if( extraLayers ) if( extraLayers )
{ {
const LAYER_NUM* l = extraLayers; for( auto layer : *extraLayers )
m_view->SetTopLayer( layer );
while( *l >= 0 )
m_view->SetTopLayer( *l++ );
// Move the active layer to the top // Move the active layer to the top
if( !IsCopperLayer( aLayer ) ) if( !IsCopperLayer( aLayer ) )