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

Use green soldermask and white silkcreen when unspecified 

Also - unspecify colour of soldermask by default

Fixes https://gitlab.com/kicad/code/kicad/-/issues/9538
This commit is contained in:
Roberto Fernandez Bautista 2021-11-07 15:35:14 +00:00
parent 04a30638f0
commit 7fd669b6a8
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
3d-viewer/3d_canvas/board_adapter.cpp
View File

@ -26,6 +26,7 @@
#include "board_adapter.h" #include "board_adapter.h"
#include <board_design_settings.h> #include <board_design_settings.h>
#include <board_stackup_manager/board_stackup.h> #include <board_stackup_manager/board_stackup.h>
#include <board_stackup_manager/stackup_predefined_prms.h>
#include <3d_rendering/raytracing/shapes2D/polygon_2d.h> #include <3d_rendering/raytracing/shapes2D/polygon_2d.h>
#include <board.h> #include <board.h>
#include <dialogs/dialog_color_picker.h> #include <dialogs/dialog_color_picker.h>
@ -162,6 +163,7 @@ BOARD_ADAPTER::BOARD_ADAPTER() :
#define ADD_COLOR( list, r, g, b, a, name ) \ #define ADD_COLOR( list, r, g, b, a, name ) \
list.push_back( CUSTOM_COLOR_ITEM( r/255.0, g/255.0, b/255.0, a, name ) ) list.push_back( CUSTOM_COLOR_ITEM( r/255.0, g/255.0, b/255.0, a, name ) )
ADD_COLOR( g_SilkscreenColors, 245, 245, 245, 1.0, NotSpecifiedPrm() ); // White
ADD_COLOR( g_SilkscreenColors, 20, 51, 36, 1.0, "Green" ); ADD_COLOR( g_SilkscreenColors, 20, 51, 36, 1.0, "Green" );
ADD_COLOR( g_SilkscreenColors, 181, 19, 21, 1.0, "Red" ); ADD_COLOR( g_SilkscreenColors, 181, 19, 21, 1.0, "Red" );
ADD_COLOR( g_SilkscreenColors, 2, 59, 162, 1.0, "Blue" ); ADD_COLOR( g_SilkscreenColors, 2, 59, 162, 1.0, "Blue" );
@ -170,6 +172,7 @@ BOARD_ADAPTER::BOARD_ADAPTER() :
ADD_COLOR( g_SilkscreenColors, 32, 2, 53, 1.0, "Purple" ); ADD_COLOR( g_SilkscreenColors, 32, 2, 53, 1.0, "Purple" );
ADD_COLOR( g_SilkscreenColors, 194, 195, 0, 1.0, "Yellow" ); ADD_COLOR( g_SilkscreenColors, 194, 195, 0, 1.0, "Yellow" );
ADD_COLOR( g_MaskColors, 20, 51, 36, 0.83, NotSpecifiedPrm() ); // Green
ADD_COLOR( g_MaskColors, 20, 51, 36, 0.83, "Green" ); ADD_COLOR( g_MaskColors, 20, 51, 36, 0.83, "Green" );
ADD_COLOR( g_MaskColors, 91, 168, 12, 0.83, "Light Green" ); ADD_COLOR( g_MaskColors, 91, 168, 12, 0.83, "Light Green" );
ADD_COLOR( g_MaskColors, 13, 104, 11, 0.83, "Saturated Green" ); ADD_COLOR( g_MaskColors, 13, 104, 11, 0.83, "Saturated Green" );

2
pcbnew/board_stackup_manager/board_stackup.cpp
View File

@ -61,7 +61,7 @@ BOARD_STACKUP_ITEM::BOARD_STACKUP_ITEM( BOARD_STACKUP_ITEM_TYPE aType )
case BS_ITEM_TYPE_SOLDERMASK: case BS_ITEM_TYPE_SOLDERMASK:
m_TypeName = "soldermask"; m_TypeName = "soldermask";
m_Color = "Green"; m_Color = NotSpecifiedPrm();
SetMaterial( NotSpecifiedPrm() ); // or other solder mask material name SetMaterial( NotSpecifiedPrm() ); // or other solder mask material name
SetThickness( GetMaskDefaultThickness() ); SetThickness( GetMaskDefaultThickness() );
SetEpsilonR( DEFAULT_EPSILON_R_SOLDERMASK ); SetEpsilonR( DEFAULT_EPSILON_R_SOLDERMASK );