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

Remove front/back SMD pad color now that we have opacity sliders. 

Fixes https://gitlab.com/kicad/code/kicad/issues/8761
This commit is contained in:
Jeff Young 2021-07-10 10:13:02 +01:00
parent 2fc4ee5c5f
commit 625006ca30
7 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/layer_id.cpp
View File

@ -146,8 +146,8 @@ wxString LayerName( int aLayer )
case LAYER_MOD_TEXT_FR: return _( "Footprint text front" );
case LAYER_MOD_TEXT_BK: return _( "Footprint text back" );
case LAYER_MOD_TEXT_INVISIBLE: return _( "Hidden text" );
case LAYER_PAD_FR: return _( "Pads front" );
case LAYER_PAD_BK: return _( "Pads back" );
case LAYER_PAD_FR: return _( "SMD pads front" );
case LAYER_PAD_BK: return _( "SMD pads back" );
case LAYER_PADS_TH: return _( "Through-hole pads" );
case LAYER_TRACKS: return _( "Tracks" );
case LAYER_VIA_THROUGH: return _( "Through vias" );

4
common/settings/builtin_color_themes.h
View File

@ -85,8 +85,6 @@ static const std::map<int, COLOR4D> s_defaultTheme =
{ LAYER_GRID, CSS_COLOR( 132, 132, 132, 1 ) },
{ LAYER_GRID_AXES, CSS_COLOR( 194, 194, 194, 1 ) },
{ LAYER_NO_CONNECTS, CSS_COLOR( 0, 0, 132, 1 ) },
{ LAYER_PAD_BK, CSS_COLOR( 77, 127, 196, 1 ) },
{ LAYER_PAD_FR, CSS_COLOR( 200, 52, 52, 1 ) },
{ LAYER_PAD_PLATEDHOLES, CSS_COLOR( 194, 194, 0, 1 ) },
{ LAYER_PADS_TH, CSS_COLOR( 227, 183, 46, 1 ) },
{ LAYER_NON_PLATEDHOLES, CSS_COLOR( 26, 196, 210, 1 ) },
@ -230,8 +228,6 @@ static const std::map<int, COLOR4D> s_classicTheme =
{ LAYER_GRID, COLOR4D( DARKGRAY ) },
{ LAYER_GRID_AXES, COLOR4D( BLUE ) },
{ LAYER_NO_CONNECTS, COLOR4D( BLUE ) },
{ LAYER_PAD_BK, COLOR4D( GREEN ) },
{ LAYER_PAD_FR, COLOR4D( RED ) },
{ LAYER_PAD_PLATEDHOLES, COLOR4D( YELLOW ) },
{ LAYER_PADS_TH, COLOR4D( YELLOW ) },
{ LAYER_NON_PLATEDHOLES, COLOR4D( YELLOW ) },

2
common/settings/color_settings.cpp
View File

@ -133,8 +133,6 @@ COLOR_SETTINGS::COLOR_SETTINGS( wxString aFilename ) :
CLR( "board.grid", LAYER_GRID );
CLR( "board.grid_axes", LAYER_GRID_AXES );
CLR( "board.no_connect", LAYER_NO_CONNECTS );
CLR( "board.pad_back", LAYER_PAD_BK );
CLR( "board.pad_front", LAYER_PAD_FR );
CLR( "board.pad_plated_hole", LAYER_PAD_PLATEDHOLES );
CLR( "board.pad_through_hole", LAYER_PADS_TH );
CLR( "board.plated_hole", LAYER_NON_PLATEDHOLES );

2
pcbnew/dialogs/panel_pcbnew_color_settings.cpp
View File

@ -356,6 +356,8 @@ std::set<int> g_excludedLayers =
LAYER_VIA_HOLEWALLS,
LAYER_MOD_FR,
LAYER_MOD_BK,
LAYER_PAD_FR,
LAYER_PAD_BK,
LAYER_MOD_VALUES,
LAYER_MOD_REFERENCES,
LAYER_TRACKS,

2
pcbnew/footprint_editor_settings.cpp
View File

@ -359,8 +359,6 @@ bool FOOTPRINT_EDITOR_SETTINGS::MigrateFromLegacy( wxConfigBase* aCfg )
migrateLegacyColor( f + "Color4DGrid", LAYER_GRID );
migrateLegacyColor( f + "Color4DNoNetPadMarker", LAYER_NO_CONNECTS );
migrateLegacyColor( f + "Color4DNonPlatedEx", LAYER_NON_PLATEDHOLES );
migrateLegacyColor( f + "Color4DPadBackEx", LAYER_PAD_BK );
migrateLegacyColor( f + "Color4DPadFrontEx", LAYER_PAD_FR );
migrateLegacyColor( f + "Color4DPadThruHoleEx", LAYER_PADS_TH );
migrateLegacyColor( f + "Color4DPCBBackground", LAYER_PCB_BACKGROUND );
migrateLegacyColor( f + "Color4DPCBCursor", LAYER_CURSOR );

10
pcbnew/pcb_painter.cpp
View File

@ -109,6 +109,8 @@ void PCB_RENDER_SETTINGS::LoadColors( const COLOR_SETTINGS* aSettings )
m_layerColors[LAYER_PAD_PLATEDHOLES] = aSettings->GetColor( LAYER_PCB_BACKGROUND );
m_layerColors[LAYER_VIA_NETNAMES] = COLOR4D( 0.2, 0.2, 0.2, 0.9 );
m_layerColors[LAYER_PAD_NETNAMES] = COLOR4D( 1.0, 1.0, 1.0, 0.9 );
m_layerColors[LAYER_PAD_FR] = aSettings->GetColor( F_Cu );
m_layerColors[LAYER_PAD_BK] = aSettings->GetColor( B_Cu );
m_layerColors[LAYER_PAD_FR_NETNAMES] = COLOR4D( 1.0, 1.0, 1.0, 0.9 );
m_layerColors[LAYER_PAD_BK_NETNAMES] = COLOR4D( 1.0, 1.0, 1.0, 0.9 );
@ -1272,9 +1274,11 @@ void PCB_PAINTER::draw( const PAD* aPad, int aLayer )
* For other layers, use the pad shape, although one can use an other criteria,
* depending on the non copper layer.
*/
int activeLayer = m_pcbSettings.GetActiveLayer();
bool flashActiveLayer = IsCopperLayer( activeLayer ) ?
aPad->FlashLayer( activeLayer ) : true;
int activeLayer = m_pcbSettings.GetActiveLayer();
bool flashActiveLayer = true;
if( IsCopperLayer( activeLayer ) )
flashActiveLayer = aPad->FlashLayer( activeLayer );
if( flashActiveLayer || aPad->GetDrillSize().x )
{

2
pcbnew/pcbnew_settings.cpp
View File

@ -761,8 +761,6 @@ bool PCBNEW_SETTINGS::MigrateFromLegacy( wxConfigBase* aCfg )
migrateLegacyColor( "Color4DGrid", LAYER_GRID );
migrateLegacyColor( "Color4DNoNetPadMarker", LAYER_NO_CONNECTS );
migrateLegacyColor( "Color4DNonPlatedEx", LAYER_NON_PLATEDHOLES );
migrateLegacyColor( "Color4DPadBackEx", LAYER_PAD_BK );
migrateLegacyColor( "Color4DPadFrontEx", LAYER_PAD_FR );
migrateLegacyColor( "Color4DPadThruHoleEx", LAYER_PADS_TH );
migrateLegacyColor( "Color4DPCBBackground", LAYER_PCB_BACKGROUND );
migrateLegacyColor( "Color4DPCBCursor", LAYER_CURSOR );