eeschema: added hierarchical label in setcolor menu (8b5f3056) · Commits · Elphel / kicad-source-mirror

eeschema/eeconfig.h

+11 −2

Original line number	Original line	Diff line number	Diff line
	@@ -110,12 +110,20 @@ static PARAM_CFG_SETCOLOR ColorLayerLLabelCfg
	BLACK /* Default value */		BLACK /* Default value */
	);		);

			static PARAM_CFG_SETCOLOR ColorLayerHierarLabelCfg
			(
			INSETUP,
			wxT( "ColorHlab" ), /* Ident String */
			&g_LayerDescr.LayerColor[LAYER_HIERLABEL], /* Parameter address */
			BROWN /* Default value */
			);

	static PARAM_CFG_SETCOLOR ColorLayerGLabelCfg		static PARAM_CFG_SETCOLOR ColorLayerGLabelCfg
	(		(
	INSETUP,		INSETUP,
	wxT( "ColorGlab" ), /* Ident String */		wxT( "ColorGbllab" ), /* Ident String */
	&g_LayerDescr.LayerColor[LAYER_GLOBLABEL], /* Parameter address */		&g_LayerDescr.LayerColor[LAYER_GLOBLABEL], /* Parameter address */
	BROWN /* Default value */		RED /* Default value */
	);		);

	static PARAM_CFG_SETCOLOR ColorLayerPinFunCfg		static PARAM_CFG_SETCOLOR ColorLayerPinFunCfg
	@@ -485,6 +493,7 @@ PARAM_CFG_BASE* ParamCfgList[] =
	&ColorLayerBusCfg,		&ColorLayerBusCfg,
	&ColorLayerJunctionCfg,		&ColorLayerJunctionCfg,
	&ColorLayerLLabelCfg,		&ColorLayerLLabelCfg,
			&ColorLayerHierarLabelCfg,
	&ColorLayerGLabelCfg,		&ColorLayerGLabelCfg,
	&ColorLayerPinFunCfg,		&ColorLayerPinFunCfg,
	&ColorLayerPinNumCfg,		&ColorLayerPinNumCfg,

eeschema/eelayer.h

+11 −6

Original line number	Original line	Diff line number	Diff line
	@@ -17,7 +17,7 @@ class wxStdDialogButtonSizer;


	// Specify how many elements are contained within laytool_list[]		// Specify how many elements are contained within laytool_list[]
	const int NB_BUTT = 23; // Includes an element associated with the grid		const int NB_BUTT = 24; // Includes an element associated with the grid

	// Specify how many elements are contained within laytool_index[]		// Specify how many elements are contained within laytool_index[]
	const int BUTTON_GROUPS = 5;		const int BUTTON_GROUPS = 5;
	@@ -59,7 +59,6 @@ struct ColorButton
	int* m_Color;		int* m_Color;
	int m_Id;		int m_Id;
	wxBitmapButton* m_Button;		wxBitmapButton* m_Button;
	// int m_State; // (Commented out until when it is actually used.)
	};		};

	struct ButtonIndex		struct ButtonIndex
	@@ -187,10 +186,15 @@ static ColorButton Layer_SheetName_Item =

	static ColorButton Layer_SheetLabel_Item =		static ColorButton Layer_SheetLabel_Item =
	{		{
	_( "SheetLabel" ), // Title		_( "SheetLabel (Pin Sheet)" ), // Title
	ADR( LAYER_SHEETLABEL ) // Adr of optional parameter		ADR( LAYER_SHEETLABEL ) // Adr of optional parameter
	};		};

			static ColorButton Layer_HierarchicalLabel_Item =
			{
			_( "Hierarchical Label" ), // Title
			ADR( LAYER_HIERLABEL ) // Adr of optional parameter
			};

	static ColorButton Layer_Erc_Warning_Item =		static ColorButton Layer_Erc_Warning_Item =
	{		{
	@@ -235,6 +239,7 @@ static ColorButton* laytool_list[NB_BUTT] = {
	&Layer_SheetFileName_Item,		&Layer_SheetFileName_Item,
	&Layer_SheetName_Item,		&Layer_SheetName_Item,
	&Layer_SheetLabel_Item,		&Layer_SheetLabel_Item,
			&Layer_HierarchicalLabel_Item,

	&Layer_Erc_Warning_Item,		&Layer_Erc_Warning_Item,
	&Layer_Erc_Error_Item,		&Layer_Erc_Error_Item,
	@@ -258,19 +263,19 @@ static ButtonIndex MsgDevice_Item =
	static ButtonIndex Msg_Sheets =		static ButtonIndex Msg_Sheets =
	{		{
	_( "Sheets" ), // Title		_( "Sheets" ), // Title
	19 // Index to first bitmap button in group		20 // Index to first bitmap button in group
	};		};

	static ButtonIndex Msg_ErcMarck =		static ButtonIndex Msg_ErcMarck =
	{		{
	_( "Erc Mark" ), // Title		_( "Erc Mark" ), // Title
	21 // Index to first bitmap button in group		22 // Index to first bitmap button in group
	};		};

	static ButtonIndex Msg_Other =		static ButtonIndex Msg_Other =
	{		{
	_( "Other" ), // Title		_( "Other" ), // Title
	22 // Index to first bitmap button in group		23 // Index to first bitmap button in group
	};		};

Admin message