AllSpiceMirrors/kicad
7
Fork 0
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-04-11 14:50:11 +00:00
Files Issues Releases Activity

REMOVED: separate color for via net names

Browse Source 
Vias can now use track net name color
This commit is contained in:
Jon Evans 2024-11-16 11:26:59 -05:00
parent 71a0a638a0
commit bc45f1b352
8 changed files with 4 additions and 16 deletions

1
common/layer_id.cpp
View File

@ -198,7 +198,6 @@ wxString LayerName( int aLayer )
case LAYER_CONFLICTS_SHADOW: return _( "Courtyard collision shadow" );
case NETNAMES_LAYER_ID_START: return _( "Track net names" );
case LAYER_PAD_NETNAMES: return _( "Pad net names" );
case LAYER_VIA_NETNAMES: return _( "Via net names" );
default:
wxCHECK_MSG( false, wxEmptyString, wxString::Format( "Unknown layer ID %d", aLayer ) );

1
common/settings/color_settings.cpp
View File

@ -133,7 +133,6 @@ COLOR_SETTINGS::COLOR_SETTINGS( const wxString& aFilename, bool aAbsolutePath )
CLR( "board.page_limits", LAYER_PAGE_LIMITS );
CLR( "board.track_net_names", NETNAMES_LAYER_ID_START );
CLR( "board.pad_net_names", LAYER_PAD_NETNAMES );
CLR( "board.via_net_names", LAYER_VIA_NETNAMES );
CLR( "board.copper.f", F_Cu );
CLR( "board.copper.in1", In1_Cu );

5
include/layer_ids.h
View File

@ -165,7 +165,6 @@ enum NETNAMES_LAYER_ID: int
LAYER_PAD_FR_NETNAMES,
LAYER_PAD_BK_NETNAMES,
LAYER_PAD_NETNAMES,
LAYER_VIA_NETNAMES,
NETNAMES_LAYER_ID_END
};
@ -695,10 +694,8 @@ KICOMMON_API PCB_LAYER_ID FlipLayer( PCB_LAYER_ID aLayerId, int aCopperLayersCou
*/
inline int GetNetnameLayer( int aLayer )
{
if( IsCopperLayer( aLayer ) )
if( IsCopperLayer( aLayer ) || IsViaPadLayer( aLayer ) )
return NETNAMES_LAYER_INDEX( aLayer );
else if( IsViaPadLayer( aLayer ) )
return LAYER_VIA_NETNAMES;
// Fallback
return Cmts_User;

1
pcbnew/dialogs/panel_pcbnew_color_settings.cpp
View File

@ -722,7 +722,6 @@ PANEL_PCBNEW_COLOR_SETTINGS::PANEL_PCBNEW_COLOR_SETTINGS( wxWindow* aParent, BOA
m_validLayers.push_back( LAYER_DRC_EXCLUSION );
m_validLayers.push_back( NETNAMES_LAYER_ID_START );
m_validLayers.push_back( LAYER_PAD_NETNAMES );
m_validLayers.push_back( LAYER_VIA_NETNAMES );
// NOTE: Main board layers are added by createSwatches()

1
pcbnew/padstack.cpp
View File

@ -913,7 +913,6 @@ PCB_LAYER_ID PADSTACK::EffectiveLayerFor( PCB_LAYER_ID aLayer ) const
// For these, just give the front copper geometry, it doesn't matter.
case LAYER_PAD_NETNAMES:
case LAYER_VIA_NETNAMES:
case LAYER_PADS:
case LAYER_PAD_PLATEDHOLES:
case LAYER_VIA_HOLES:

8
pcbnew/pcb_draw_panel_gal.cpp
View File

@ -75,7 +75,7 @@ const int GAL_LAYER_ORDER[] =
LAYER_DRC_ERROR, LAYER_DRC_WARNING, LAYER_DRC_EXCLUSION, LAYER_MARKER_SHADOWS,
LAYER_DRC_SHAPE1, LAYER_DRC_SHAPE2,
LAYER_PAD_NETNAMES, LAYER_VIA_NETNAMES,
LAYER_PAD_NETNAMES,
Dwgs_User, ZONE_LAYER_FOR( Dwgs_User ),
Cmts_User, ZONE_LAYER_FOR( Cmts_User ),
Eco1_User, ZONE_LAYER_FOR( Eco1_User ),
@ -359,7 +359,7 @@ void PCB_DRAW_PANEL_GAL::SetHighContrastLayer( PCB_LAYER_ID aLayer )
// should be done in some other way I guess..
int layers[] = {
LAYER_CONFLICTS_SHADOW,
GetNetnameLayer( aLayer ), LAYER_VIA_NETNAMES,
GetNetnameLayer( aLayer ),
LAYER_PAD_FR_NETNAMES, LAYER_PAD_BK_NETNAMES, LAYER_PAD_NETNAMES,
ZONE_LAYER_FOR( aLayer ),
BITMAP_LAYER_FOR( aLayer ),
@ -403,7 +403,6 @@ void PCB_DRAW_PANEL_GAL::SetTopLayer( PCB_LAYER_ID aLayer )
const std::vector<int> layers = {
LAYER_VIA_THROUGH, LAYER_VIA_BBLIND, LAYER_VIA_MICROVIA, LAYER_VIA_HOLES,
LAYER_VIA_HOLEWALLS,
LAYER_VIA_NETNAMES,
LAYER_PAD_PLATEDHOLES, LAYER_PAD_HOLEWALLS, LAYER_NON_PLATEDHOLES,
LAYER_PAD_NETNAMES,
LAYER_SELECT_OVERLAY, LAYER_GP_OVERLAY,
@ -459,8 +458,6 @@ void PCB_DRAW_PANEL_GAL::SetTopLayer( PCB_LAYER_ID aLayer )
// of layer ordering...
m_view->SetLayerOrder( LAYER_PAD_NETNAMES,
m_view->GetLayerOrder( LAYER_MARKER_SHADOWS ) + 3 );
m_view->SetLayerOrder( LAYER_VIA_NETNAMES,
m_view->GetLayerOrder( LAYER_MARKER_SHADOWS ) + 4 );
}
}
@ -684,7 +681,6 @@ void PCB_DRAW_PANEL_GAL::setDefaultLayerDeps()
m_view->SetLayerDisplayOnly( LAYER_CONFLICTS_SHADOW );
// Some more required layers settings
m_view->SetRequired( LAYER_VIA_NETNAMES, LAYER_VIAS );
m_view->SetRequired( LAYER_PAD_NETNAMES, LAYER_PADS );
// Holes can be independent of their host objects (cf: printing drill marks)

1
pcbnew/pcb_painter.cpp
View File

@ -150,7 +150,6 @@ void PCB_RENDER_SETTINGS::LoadColors( const COLOR_SETTINGS* aSettings )
// Colors for layers that aren't theme-able
m_layerColors[LAYER_PAD_PLATEDHOLES] = aSettings->GetColor( LAYER_PCB_BACKGROUND );
m_layerColors[LAYER_VIA_NETNAMES] = aSettings->GetColor( LAYER_VIA_NETNAMES );
m_layerColors[LAYER_PAD_NETNAMES] = aSettings->GetColor( LAYER_PAD_NETNAMES );
// Netnames for copper layers

2
pcbnew/pcb_track.cpp
View File

@ -1427,7 +1427,7 @@ void PCB_VIA::ViewGetLayers( int aLayers[], int& aCount ) const
aLayers[0] = LAYER_VIA_HOLES;
aLayers[1] = LAYER_VIA_HOLEWALLS;
aLayers[2] = LAYER_VIA_NETNAMES;
aLayers[2] = LAYER_PAD_NETNAMES; // To avoid layer ordering issues
aCount = 3;
LAYER_RANGE layers( Padstack().Drill().start, Padstack().Drill().end, MAX_CU_LAYERS );