From bc45f1b35236ceeb9afc2584ff7563bfe4a6c26b Mon Sep 17 00:00:00 2001 From: Jon Evans Date: Sat, 16 Nov 2024 11:26:59 -0500 Subject: [PATCH] REMOVED: separate color for via net names Vias can now use track net name color --- common/layer_id.cpp | 1 - common/settings/color_settings.cpp | 1 - include/layer_ids.h | 5 +---- pcbnew/dialogs/panel_pcbnew_color_settings.cpp | 1 - pcbnew/padstack.cpp | 1 - pcbnew/pcb_draw_panel_gal.cpp | 8 ++------ pcbnew/pcb_painter.cpp | 1 - pcbnew/pcb_track.cpp | 2 +- 8 files changed, 4 insertions(+), 16 deletions(-) diff --git a/common/layer_id.cpp b/common/layer_id.cpp index 2496638d62..d415179490 100644 --- a/common/layer_id.cpp +++ b/common/layer_id.cpp @@ -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 ) ); diff --git a/common/settings/color_settings.cpp b/common/settings/color_settings.cpp index 649fe9fa08..9d88fd3cdb 100644 --- a/common/settings/color_settings.cpp +++ b/common/settings/color_settings.cpp @@ -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 ); diff --git a/include/layer_ids.h b/include/layer_ids.h index 2b4ea960d0..a7a3156881 100644 --- a/include/layer_ids.h +++ b/include/layer_ids.h @@ -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; diff --git a/pcbnew/dialogs/panel_pcbnew_color_settings.cpp b/pcbnew/dialogs/panel_pcbnew_color_settings.cpp index e5bbcac065..cdea2fc2a2 100644 --- a/pcbnew/dialogs/panel_pcbnew_color_settings.cpp +++ b/pcbnew/dialogs/panel_pcbnew_color_settings.cpp @@ -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() diff --git a/pcbnew/padstack.cpp b/pcbnew/padstack.cpp index a4305779c8..e3ad3a143f 100644 --- a/pcbnew/padstack.cpp +++ b/pcbnew/padstack.cpp @@ -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: diff --git a/pcbnew/pcb_draw_panel_gal.cpp b/pcbnew/pcb_draw_panel_gal.cpp index 6b46d30583..4da3a559fa 100644 --- a/pcbnew/pcb_draw_panel_gal.cpp +++ b/pcbnew/pcb_draw_panel_gal.cpp @@ -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 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) diff --git a/pcbnew/pcb_painter.cpp b/pcbnew/pcb_painter.cpp index 74023edf3d..3822cc4ea2 100644 --- a/pcbnew/pcb_painter.cpp +++ b/pcbnew/pcb_painter.cpp @@ -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 diff --git a/pcbnew/pcb_track.cpp b/pcbnew/pcb_track.cpp index 5ae65cd29e..0fb64fb2bb 100644 --- a/pcbnew/pcb_track.cpp +++ b/pcbnew/pcb_track.cpp @@ -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 );