New color palette (db09deed) · Commits · Elphel / kicad-source-mirror

common/common.cpp

+30 −24

Original line number	Original line	Diff line number	Diff line
	@@ -76,30 +76,36 @@ bool IsGOST()
	*/		*/
	const StructColors g_ColorRefs[NBCOLORS] =		const StructColors g_ColorRefs[NBCOLORS] =
	{		{
	{ 0, 0, 0, BLACK, wxT( "BLACK" ), DARKDARKGRAY },		{ 0, 0, 0, BLACK, wxT( "Black" ), DARKDARKGRAY },
	{ 192, 0, 0, BLUE, wxT( "BLUE" ), LIGHTBLUE },		{ 72, 72, 72, DARKDARKGRAY, wxT( "Gray 1" ), DARKGRAY },
	{ 0, 160, 0, GREEN, wxT( "GREEN" ), LIGHTGREEN },		{ 132, 132, 132, DARKGRAY, wxT( "Gray 2" ), LIGHTGRAY },
	{ 160, 160, 0, CYAN, wxT( "CYAN" ), LIGHTCYAN },		{ 194, 194, 194, LIGHTGRAY, wxT( "Gray 3" ), WHITE },
	{ 0, 0, 160, RED, wxT( "RED" ), LIGHTRED },		{ 255, 255, 255, WHITE, wxT( "White" ), WHITE },
	{ 160, 0, 160, MAGENTA, wxT( "MAGENTA" ), LIGHTMAGENTA },		{ 194, 255, 255, LIGHTYELLOW, wxT( "L.Yellow" ), WHITE },
	{ 0, 128, 128, BROWN, wxT( "BROWN" ), YELLOW },		{ 72, 0, 0, DARKBLUE, wxT( "Blue 1" ), BLUE },
	{ 192, 192, 192, LIGHTGRAY, wxT( "GRAY" ), WHITE },		{ 0, 72, 0, DARKGREEN, wxT( "Green 1" ), GREEN },
	{ 128, 128, 128, DARKGRAY, wxT( "DARKGRAY" ), LIGHTGRAY },		{ 72, 72, 0, DARKCYAN, wxT( "Cyan 1" ), CYAN },
	{ 255, 0, 0, LIGHTBLUE, wxT( "LIGHTBLUE" ), LIGHTBLUE },		{ 0, 0, 72, DARKRED, wxT( "Red 1" ), RED },
	{ 0, 255, 0, LIGHTGREEN, wxT( "LIGHTGREEN" ), LIGHTGREEN },		{ 72, 0, 72, DARKMAGENTA, wxT( "Magenta 1" ), MAGENTA },
	{ 255, 255, 0, LIGHTCYAN, wxT( "LIGHTCYAN" ), LIGHTCYAN },		{ 0, 72, 72, DARKBROWN, wxT( "Brown 1" ), BROWN },
	{ 0, 0, 255, LIGHTRED, wxT( "LIGHTRED" ), LIGHTRED },		{ 132, 0, 0, BLUE, wxT( "Blue 2" ), LIGHTBLUE },
	{ 255, 0, 255, LIGHTMAGENTA, wxT( "LIGHTMAGENTA" ), LIGHTMAGENTA },		{ 0, 132, 0, GREEN, wxT( "Green 2" ), LIGHTGREEN },
	{ 0, 255, 255, YELLOW, wxT( "YELLOW" ), YELLOW },		{ 132, 132, 0, CYAN, wxT( "Cyan 2" ), LIGHTCYAN },
	{ 255, 255, 255, WHITE, wxT( "WHITE" ), WHITE },		{ 0, 0, 132, RED, wxT( "Red 2" ), LIGHTRED },
	{ 64, 64, 64, DARKDARKGRAY, wxT( "DARKDARKGRAY" ), DARKGRAY },		{ 132, 0, 132, MAGENTA, wxT( "Magenta 2" ), LIGHTMAGENTA },
	{ 64, 0, 0, DARKBLUE, wxT( "DARKBLUE" ), BLUE },		{ 0, 132, 132, BROWN, wxT( "Brown 2" ), YELLOW },
	{ 0, 64, 0, DARKGREEN, wxT( "DARKGREEN" ), GREEN },		{ 194, 0, 0, LIGHTBLUE, wxT( "Blue 3" ), PUREBLUE, },
	{ 64, 64, 0, DARKCYAN, wxT( "DARKCYAN" ), CYAN },		{ 0, 194, 0, LIGHTGREEN, wxT( "Green 3" ), PUREGREEN },
	{ 0, 0, 80, DARKRED, wxT( "DARKRED" ), RED },		{ 194, 194, 0, LIGHTCYAN, wxT( "Cyan 3" ), PURECYAN },
	{ 64, 0, 64, DARKMAGENTA, wxT( "DARKMAGENTA" ), MAGENTA },		{ 0, 0, 194, LIGHTRED, wxT( "Red 3" ), PURERED },
	{ 0, 64, 64, DARKBROWN, wxT( "DARKBROWN" ), BROWN },		{ 194, 0, 194, LIGHTMAGENTA, wxT( "Magenta 3" ), PUREMAGENTA },
	{ 128, 255, 255, LIGHTYELLOW, wxT( "LIGHTYELLOW" ), LIGHTYELLOW }		{ 0, 194, 194, YELLOW, wxT( "Yellow 3" ), PUREYELLOW },
			{ 255, 0, 0, PUREBLUE, wxT( "Blue 4" ), WHITE },
			{ 0, 255, 0, PUREGREEN, wxT( "Green 4" ), WHITE },
			{ 255, 255, 0, PURECYAN, wxT( "Cyan 4" ), WHITE },
			{ 0, 0, 255, PURERED, wxT( "Red 4" ), WHITE },
			{ 255, 0, 255, PUREMAGENTA, wxT( "Magenta 4" ), WHITE },
			{ 0, 255, 255, PUREYELLOW, wxT( "Yellow 4" ), WHITE },
	};		};

common/common_plotDXF_functions.cpp

+30 −24

Original line number	Original line	Diff line number	Diff line
	@@ -171,30 +171,36 @@ bool DXF_PLOTTER::StartPlot()
	const char *name;		const char *name;
	int color;		int color;
	} dxf_layer[NBCOLORS] = {		} dxf_layer[NBCOLORS] = {
	{ "BLACK", 250 },		{ "BLACK", 7 }, // In DXF, color 7 is both white and black!
	{ "BLUE", 5 },		{ "GRAY1", 251 },
	{ "GREEN", 3 },		{ "GRAY2", 8 },
	{ "CYAN", 4 },		{ "GRAY3", 9 },
	{ "RED", 1 },
	{ "MAGENTA", 6 },
	{ "BROWN", 54 },
	{ "LIGHTGRAY", 9 },
	{ "DARKGRAY", 8 },
	{ "LIGHTBLUE", 171 },
	{ "LIGHTGREEN", 91 },
	{ "LIGHTCYAN", 131 },
	{ "LIGHTRED", 11 },
	{ "LIGHTMAGENTA", 221 },
	{ "YELLOW", 2 },
	{ "WHITE", 7 },		{ "WHITE", 7 },
	{ "DARKDARKGRAY", 251 },		{ "LYELLOW", 51 },
	{ "DARKBLUE", 178 },		{ "BLUE1", 178 },
	{ "DARKGREEN", 98 },		{ "GREEN1", 98 },
	{ "DARKCYAN", 138 },		{ "CYAN1", 138 },
	{ "DARKRED", 18 },		{ "RED1", 18 },
	{ "DARKMAGENTA", 228 },		{ "MAGENTA1", 228 },
	{ "DARKBROWN", 58 },		{ "BROWN1", 58 },
	{ "LIGHTYELLOW", 51 },		{ "BLUE2", 5 },
			{ "GREEN2", 3 },
			{ "CYAN2", 4 },
			{ "RED2", 1 },
			{ "MAGENTA2", 6 },
			{ "BROWN2", 54 },
			{ "BLUE3", 171 },
			{ "GREEN3", 91 },
			{ "CYAN3", 131 },
			{ "RED3", 11 },
			{ "MAGENTA3", 221 },
			{ "YELLOW3", 2 },
			{ "BLUE4", 5 },
			{ "GREEN4", 3 },
			{ "CYAN4", 4 },
			{ "RED4", 1 },
			{ "MAGENTA4", 6 },
			{ "YELLOW4", 2 }
	};		};

	for( EDA_COLOR_T i = BLACK; i < NBCOLORS; ++i )		for( EDA_COLOR_T i = BLACK; i < NBCOLORS; ++i )

common/selcolor.cpp

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -139,15 +139,15 @@ void WinEDA_SelColorFrame::Init_Dialog( int aOldColor )

	for( ii = 0; ii < NBCOLORS; ++ii )		for( ii = 0; ii < NBCOLORS; ++ii )
	{		{
	// Provide a separate column for every eight buttons (and their		// Provide a separate column for every six buttons (and their
	// associated text strings), so provide a FlexGrid Sizer with		// associated text strings), so provide a FlexGrid Sizer with
	// eight rows and two columns.		// eight rows and two columns.
	if( ii % 8 == 0 )		if( ii % 6 == 0 )
	{		{
	FlexColumnBoxSizer = new wxFlexGridSizer( 8, 2, 0, 0 );		FlexColumnBoxSizer = new wxFlexGridSizer( 6, 2, 0, 0 );

	// Specify that all of the rows can be expanded.		// Specify that all of the rows can be expanded.
	for( int ii = 0; ii < 8; ii++ )		for( int ii = 0; ii < 6; ii++ )
	{		{
	FlexColumnBoxSizer->AddGrowableRow( ii );		FlexColumnBoxSizer->AddGrowableRow( ii );
	}		}

include/colors.h

+18 −12

Original line number	Original line	Diff line number	Diff line
	@@ -14,32 +14,38 @@ enum EDA_COLOR_T
	{		{
	UNSPECIFIED_COLOR = -1,		UNSPECIFIED_COLOR = -1,
	BLACK = 0,		BLACK = 0,
			DARKDARKGRAY,
			DARKGRAY,
			LIGHTGRAY,
			WHITE,
			LIGHTYELLOW,
			DARKBLUE,
			DARKGREEN,
			DARKCYAN,
			DARKRED,
			DARKMAGENTA,
			DARKBROWN,
	BLUE,		BLUE,
	GREEN,		GREEN,
	CYAN,		CYAN,
	RED,		RED,
	MAGENTA,		MAGENTA,
	BROWN,		BROWN,
	LIGHTGRAY,
	DARKGRAY,
	LIGHTBLUE,		LIGHTBLUE,
	LIGHTGREEN,		LIGHTGREEN,
	LIGHTCYAN,		LIGHTCYAN,
	LIGHTRED,		LIGHTRED,
	LIGHTMAGENTA,		LIGHTMAGENTA,
	YELLOW,		YELLOW,
	WHITE,		PUREBLUE,
	DARKDARKGRAY,		PUREGREEN,
	DARKBLUE,		PURECYAN,
	DARKGREEN,		PURERED,
	DARKCYAN,		PUREMAGENTA,
	DARKRED,		PUREYELLOW,
	DARKMAGENTA,
	DARKBROWN,
	LIGHTYELLOW,
	NBCOLORS, ///< Number of colors		NBCOLORS, ///< Number of colors
	HIGHLIGHT_FLAG = ( 1<<19 ),		HIGHLIGHT_FLAG = ( 1<<19 ),
	MASKCOLOR = 31 ///< mask for color index into ColorRefs[]		MASKCOLOR = 31 ///< mask for color index into g_ColorRefs[]
	};		};

	/// Checked cast. Use only when necessary (usually I/O)		/// Checked cast. Use only when necessary (usually I/O)

Admin message