Isaac's next color/layer work step (b4fe26a3) · Commits · Elphel / kicad-source-mirror

3d-viewer/3d_draw.cpp

+25 −14

Original line number	Diff line number	Diff line
		@@ -316,12 +316,14 @@ void Pcb3D_GLCanvas::Draw3D_Track( TRACK* track )
		{
		double zpos;
		int layer = track->GetLayer();
		int color = g_Parm_3D_Visu.m_BoardSettings->m_LayerColor[layer];
		double ox, oy, fx, fy;
		double w;

		if( color & ITEM_NOT_SHOW )
		if( g_Parm_3D_Visu.m_BoardSettings->IsLayerVisible( layer ) == false )
		return;

		int color = g_Parm_3D_Visu.m_BoardSettings->m_LayerColor[layer];

		if( layer == LAST_COPPER_LAYER )
		layer = g_Parm_3D_Visu.m_Layers - 1;
		zpos = g_Parm_3D_Visu.m_LayerZcoord[layer];
		@@ -363,11 +365,17 @@ void Pcb3D_GLCanvas::Draw3D_Via( SEGVIA* via )
		{
		zpos = g_Parm_3D_Visu.m_LayerZcoord[layer];
		if( layer < g_Parm_3D_Visu.m_Layers - 1 )
		{
		if( g_Parm_3D_Visu.m_BoardSettings->IsLayerVisible( layer ) == false )
		continue;
		color = g_Parm_3D_Visu.m_BoardSettings->m_LayerColor[layer];
		}
		else
		color = g_Parm_3D_Visu.m_BoardSettings->m_LayerColor[CMP_N];
		if( color & ITEM_NOT_SHOW )
		{
		if( g_Parm_3D_Visu.m_BoardSettings->IsLayerVisible( CMP_N ) == false )
		continue;
		color = g_Parm_3D_Visu.m_BoardSettings->m_LayerColor[CMP_N];
		}

		SetGLColor( color );

		@@ -394,14 +402,16 @@ void Pcb3D_GLCanvas::Draw3D_Via( SEGVIA* via )
		void Pcb3D_GLCanvas::Draw3D_DrawSegment( DRAWSEGMENT* segment )
		/*************************************************************/
		{
		int layer;
		double x, y, xf, yf;
		double zpos, w;
		int color = g_Parm_3D_Visu.m_BoardSettings->m_LayerColor[segment->GetLayer()];

		if( color & ITEM_NOT_SHOW )
		int layer = segment->GetLayer();

		if( g_Parm_3D_Visu.m_BoardSettings->IsLayerVisible( layer ) == false )
		return;

		int color = g_Parm_3D_Visu.m_BoardSettings->m_LayerColor[layer];

		SetGLColor( color );
		w = segment->m_Width * g_Parm_3D_Visu.m_BoardScale;
		x = segment->m_Start.x * g_Parm_3D_Visu.m_BoardScale;
		@@ -409,7 +419,7 @@ void Pcb3D_GLCanvas::Draw3D_DrawSegment( DRAWSEGMENT* segment )
		xf = segment->m_End.x * g_Parm_3D_Visu.m_BoardScale;
		yf = segment->m_End.y * g_Parm_3D_Visu.m_BoardScale;

		if( segment->GetLayer() == EDGE_N )
		if( layer == EDGE_N )
		{
		for( layer = 0; layer < g_Parm_3D_Visu.m_Layers; layer++ )
		{
		@@ -434,7 +444,6 @@ void Pcb3D_GLCanvas::Draw3D_DrawSegment( DRAWSEGMENT* segment )
		}
		else
		{
		layer = segment->GetLayer();
		glNormal3f( 0.0, 0.0, Get3DLayerSide( layer ) );
		zpos = g_Parm_3D_Visu.m_LayerZcoord[layer];
		if( Get3DLayerEnable( layer ) )
		@@ -623,11 +632,13 @@ void EDGE_MODULE::Draw3D( Pcb3D_GLCanvas* glcanvas )
		wxString s;
		int dx, dy;
		double scale, x, y, fx, fy, w, zpos;
		int color = g_Parm_3D_Visu.m_BoardSettings->m_LayerColor[m_Layer];

		if( color & ITEM_NOT_SHOW )
		if( g_Parm_3D_Visu.m_BoardSettings->IsLayerVisible( m_Layer ) == false )
		return;

		int color = g_Parm_3D_Visu.m_BoardSettings->m_LayerColor[m_Layer];


		SetGLColor( color );
		glNormal3f( 0.0, 0.0, (m_Layer == COPPER_LAYER_N) ? -1.0 : 1.0 );
		scale = g_Parm_3D_Visu.m_BoardScale;
		@@ -737,7 +748,7 @@ void D_PAD::Draw3D( Pcb3D_GLCanvas* glcanvas )
		if( (layer > FIRST_COPPER_LAYER) && (layer < LAST_COPPER_LAYER) && !Both )
		continue;
		color = g_Parm_3D_Visu.m_BoardSettings->m_LayerColor[layer];
		if( color & ITEM_NOT_SHOW )
		if( g_Parm_3D_Visu.m_BoardSettings->IsLayerVisible( layer ) == false )
		continue;

		SetGLColor( color );
		@@ -787,7 +798,7 @@ void D_PAD::Draw3D( Pcb3D_GLCanvas* glcanvas )
		continue;
		color = g_Parm_3D_Visu.m_BoardSettings->m_LayerColor[layer];
		glNormal3f( 0.0, 0.0, (layer == COPPER_LAYER_N) ? -1.0 : 1.0 );
		if( color & ITEM_NOT_SHOW )
		if( g_Parm_3D_Visu.m_BoardSettings->IsLayerVisible( layer ) == false )
		continue;

		SetGLColor( color );
		@@ -862,7 +873,7 @@ void D_PAD::Draw3D( Pcb3D_GLCanvas* glcanvas )
		continue;
		color = g_Parm_3D_Visu.m_BoardSettings->m_LayerColor[layer];
		glNormal3f( 0.0, 0.0, (layer == COPPER_LAYER_N) ? -1.0 : 1.0 );
		if( color & ITEM_NOT_SHOW )
		if( g_Parm_3D_Visu.m_BoardSettings->IsLayerVisible( layer ) == false )
		continue;

		SetGLColor( color );

gerbview/gerbview_config.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -338,7 +338,8 @@ static PARAM_CFG_SETCOLOR ColorpcbGrilleCfg
		(
		INSETUP,
		wxT("CoPcbGr"), /* identification */
		&g_DesignSettings.m_PcbGridColor, /* Adresse du parametre */
		//@@IMB: Wrong object &g_DesignSettings.m_PcbGridColor, /* Adresse du parametre */
		&g_GridColor, //@@IMB: This is the real variable.
		DARKGRAY /* Valeur par defaut */
		);

gerbview/set_color.cpp

+19 −20

Original line number	Diff line number	Diff line
		@@ -213,10 +213,10 @@ void WinEDA_SetColorsFrame::CreateControls()

		if( laytool_list[lyr]->m_NoDisplayIsColor )
		{
		if( *laytool_list[lyr]->m_Color & ITEM_NOT_SHOW )
		CheckBox->SetValue( FALSE );
		else
		if( g_DesignSettings.IsLayerVisible( lyr ))
		CheckBox->SetValue( TRUE );
		else
		CheckBox->SetValue( FALSE );
		}
		else
		CheckBox->SetValue( *laytool_list[lyr]->m_NoDisplay );
		@@ -427,24 +427,23 @@ void WinEDA_SetColorsFrame::SetColor(wxCommandEvent& event)
		void WinEDA_SetColorsFrame::UpdateLayerSettings()
		/******************************************************************/
		{
		for( int lyr = 0; lyr < NB_BUTT; lyr++ )
		for( int lyr = 0; lyr < NB_BUTT - 2; lyr++ )
		{
		if( laytool_list[lyr]->m_NoDisplayIsColor )
		{
		if( laytool_list[lyr]->m_CheckBox->GetValue() )
		*laytool_list[lyr]->m_Color = CurrentColor[lyr] & ~ITEM_NOT_SHOW;
		else
		*laytool_list[lyr]->m_Color = CurrentColor[lyr] \| ITEM_NOT_SHOW;
		g_DesignSettings.SetLayerVisibility( lyr, laytool_list[lyr]->m_CheckBox->GetValue() );
		*laytool_list[lyr]->m_Color = CurrentColor[lyr];
		}
		else
		{

		// (As a bitmap button and a checkbox have been provided for every
		// layer, it is not necessary to check whether each of those items
		// actually has been provided for each of those layers.)
		*laytool_list[lyr]->m_Color = CurrentColor[lyr];
		*laytool_list[lyr]->m_NoDisplay = laytool_list[lyr]->m_CheckBox->GetValue();
		}
		}


		g_GridColor = CurrentColor[32];
		s_showGrid = laytool_list[32]->m_CheckBox->GetValue();

		g_DCodesColor = CurrentColor[33];
		DisplayOpt.DisplayPadNum = laytool_list[33]->m_CheckBox->GetValue();

		// Additional command required for updating visibility of grid.
		m_Parent->m_Draw_Grid = s_showGrid;
		}

gerbview/set_color.h

+32 −32

Original line number	Diff line number	Diff line
		@@ -85,112 +85,112 @@ static ColorButton Layer_1_Butt=
		{
		_("Layer 1"), // Title
		ADR(0), // Address of optional parameter
		TRUE // Toggle ITEM_NOT_SHOW bit of the color variable
		TRUE // Toggle ITEMNOTSHOW bit of the color variable
		};

		static ColorButton Layer_2_Butt=
		{
		_("Layer 2"), // Title
		ADR(1), // Address of optional parameter
		TRUE // Toggle ITEM_NOT_SHOW bit of the color variable
		TRUE // Toggle ITEMNOTSHOW bit of the color variable
		};

		static ColorButton Layer_3_Butt=
		{
		_("Layer 3"), // Title
		ADR(2), // Address of optional parameter
		TRUE // Toggle ITEM_NOT_SHOW bit of the color variable
		TRUE // Toggle ITEMNOTSHOW bit of the color variable
		};

		static ColorButton Layer_4_Butt=
		{
		_("Layer 4"), // Title
		ADR(3), // Address of optional parameter
		TRUE // Toggle ITEM_NOT_SHOW bit of the color variable
		TRUE // Toggle ITEMNOTSHOW bit of the color variable
		};

		static ColorButton Layer_5_Butt=
		{
		_("Layer 5"), // Title
		ADR(4), // Address of optional parameter
		TRUE // Toggle ITEM_NOT_SHOW bit of the color variable
		TRUE // Toggle ITEMNOTSHOW bit of the color variable
		};

		static ColorButton Layer_6_Butt=
		{
		_("Layer 6"), // Title
		ADR(5), // Address of optional parameter
		TRUE // Toggle ITEM_NOT_SHOW bit of the color variable
		TRUE // Toggle ITEMNOTSHOW bit of the color variable
		};

		static ColorButton Layer_7_Butt=
		{
		_("Layer 7"), // Title
		ADR(6), // Address of optional parameter
		TRUE // Toggle ITEM_NOT_SHOW bit of the color variable
		TRUE // Toggle ITEMNOTSHOW bit of the color variable
		};

		static ColorButton Layer_8_Butt=
		{
		_("Layer 8"), // Title
		ADR(7), // Address of optional parameter
		TRUE // Toggle ITEM_NOT_SHOW bit of the color variable
		TRUE // Toggle ITEMNOTSHOW bit of the color variable
		};

		static ColorButton Layer_9_Butt=
		{
		_("Layer 9"), // Title
		ADR(8), // Address of optional parameter
		TRUE // Toggle ITEM_NOT_SHOW bit of the color variable
		TRUE // Toggle ITEMNOTSHOW bit of the color variable
		};

		static ColorButton Layer_10_Butt=
		{
		_("Layer 10"), // Title
		ADR(9), // Address of optional parameter
		TRUE // Toggle ITEM_NOT_SHOW bit of the color variable
		TRUE // Toggle ITEMNOTSHOW bit of the color variable
		};

		static ColorButton Layer_11_Butt=
		{
		_("Layer 11"), // Title
		ADR(10), // Address of optional parameter
		TRUE // Toggle ITEM_NOT_SHOW bit of the color variable
		TRUE // Toggle ITEMNOTSHOW bit of the color variable
		};

		static ColorButton Layer_12_Butt=
		{
		_("Layer 12"), // Title
		ADR(11), // Address of optional parameter
		TRUE // Toggle ITEM_NOT_SHOW bit of the color variable
		TRUE // Toggle ITEMNOTSHOW bit of the color variable
		};

		static ColorButton Layer_13_Butt=
		{
		_("Layer 13"), // Title
		ADR(12), // Address of optional parameter
		TRUE // Toggle ITEM_NOT_SHOW bit of the color variable
		TRUE // Toggle ITEMNOTSHOW bit of the color variable
		};

		static ColorButton Layer_14_Butt=
		{
		_("Layer 14"), // Title
		ADR(13), // Address of optional parameter
		TRUE // Toggle ITEM_NOT_SHOW bit of the color variable
		TRUE // Toggle ITEMNOTSHOW bit of the color variable
		};

		static ColorButton Layer_15_Butt=
		{
		_("Layer 15"), // Title
		ADR(14), // Address of optional parameter
		TRUE // Toggle ITEM_NOT_SHOW bit of the color variable
		TRUE // Toggle ITEMNOTSHOW bit of the color variable
		};

		static ColorButton Layer_16_Butt=
		{
		_("Layer 16"), // Title
		ADR(15), // Address of optional parameter
		TRUE // Toggle ITEM_NOT_SHOW bit of the color variable
		TRUE // Toggle ITEMNOTSHOW bit of the color variable
		};


		@@ -204,112 +204,112 @@ static ColorButton Layer_17_Butt=
		{
		_("Layer 17"), // Title
		ADR(16), // Address of optional parameter
		TRUE // Toggle ITEM_NOT_SHOW bit of the color variable
		TRUE // Toggle ITEMNOTSHOW bit of the color variable
		};

		static ColorButton Layer_18_Butt=
		{
		_("Layer 18"), // Title
		ADR(17), // Address of optional parameter
		TRUE // Toggle ITEM_NOT_SHOW bit of the color variable
		TRUE // Toggle ITEMNOTSHOW bit of the color variable
		};

		static ColorButton Layer_19_Butt=
		{
		_("Layer 19"), // Title
		ADR(18), // Address of optional parameter
		TRUE // Toggle ITEM_NOT_SHOW bit of the color variable
		TRUE // Toggle ITEMNOTSHOW bit of the color variable
		};

		static ColorButton Layer_20_Butt=
		{
		_("Layer 20"), // Title
		ADR(19), // Address of optional parameter
		TRUE // Toggle ITEM_NOT_SHOW bit of the color variable
		TRUE // Toggle ITEMNOTSHOW bit of the color variable
		};

		static ColorButton Layer_21_Butt=
		{
		_("Layer 21"), // Title
		ADR(20), // Address of optional parameter
		TRUE // Toggle ITEM_NOT_SHOW bit of the color variable
		TRUE // Toggle ITEMNOTSHOW bit of the color variable
		};

		static ColorButton Layer_22_Butt=
		{
		_("Layer 22"), // Title
		ADR(21), // Address of optional parameter
		TRUE // Toggle ITEM_NOT_SHOW bit of the color variable
		TRUE // Toggle ITEMNOTSHOW bit of the color variable
		};

		static ColorButton Layer_23_Butt=
		{
		_("Layer 23"), // Title
		ADR(22), // Address of optional parameter
		TRUE // Toggle ITEM_NOT_SHOW bit of the color variable
		TRUE // Toggle ITEMNOTSHOW bit of the color variable
		};

		static ColorButton Layer_24_Butt=
		{
		_("Layer 24"), // Title
		ADR(23), // Address of optional parameter
		TRUE // Toggle ITEM_NOT_SHOW bit of the color variable
		TRUE // Toggle ITEMNOTSHOW bit of the color variable
		};

		static ColorButton Layer_25_Butt=
		{
		_("Layer 25"), // Title
		ADR(24), // Address of optional parameter
		TRUE // Toggle ITEM_NOT_SHOW bit of the color variable
		TRUE // Toggle ITEMNOTSHOW bit of the color variable
		};

		static ColorButton Layer_26_Butt=
		{
		_("Layer 26"), // Title
		ADR(25), // Address of optional parameter
		TRUE // Toggle ITEM_NOT_SHOW bit of the color variable
		TRUE // Toggle ITEMNOTSHOW bit of the color variable
		};

		static ColorButton Layer_27_Butt=
		{
		_("Layer 27"), // Title
		ADR(26), // Address of optional parameter
		TRUE // Toggle ITEM_NOT_SHOW bit of the color variable
		TRUE // Toggle ITEMNOTSHOW bit of the color variable
		};

		static ColorButton Layer_28_Butt=
		{
		_("Layer 28"), // Title
		ADR(27), // Address of optional parameter
		TRUE // Toggle ITEM_NOT_SHOW bit of the color variable
		TRUE // Toggle ITEMNOTSHOW bit of the color variable
		};

		static ColorButton Layer_29_Butt=
		{
		_("Layer 29"), // Title
		ADR(28), // Address of optional parameter
		TRUE // Toggle ITEM_NOT_SHOW bit of the color variable
		TRUE // Toggle ITEMNOTSHOW bit of the color variable
		};

		static ColorButton Layer_30_Butt=
		{
		_("Layer 30"), // Title
		ADR(29), // Address of optional parameter
		TRUE // Toggle ITEM_NOT_SHOW bit of the color variable
		TRUE // Toggle ITEMNOTSHOW bit of the color variable
		};

		static ColorButton Layer_31_Butt=
		{
		_("Layer 31"), // Title
		ADR(30), // Address of optional parameter
		TRUE // Toggle ITEM_NOT_SHOW bit of the color variable
		TRUE // Toggle ITEMNOTSHOW bit of the color variable
		};

		static ColorButton Layer_32_Butt=
		{
		_("Layer 32"), // Title
		ADR(31), // Address of optional parameter
		TRUE // Toggle ITEM_NOT_SHOW bit of the color variable
		TRUE // Toggle ITEMNOTSHOW bit of the color variable
		};

gerbview/trpiste.cpp

+3 −2

Original line number	Diff line number	Diff line
		@@ -78,10 +78,11 @@ void Trace_Segment( WinEDA_DrawPanel* panel, wxDC* DC, TRACK* track, int draw_mo
		}
		else
		{
		color = g_DesignSettings.m_LayerColor[track->GetLayer()];
		if( color & ITEM_NOT_SHOW )
		if( g_DesignSettings.IsLayerVisible( track->GetLayer() ) == false )
		return;

		color = g_DesignSettings.m_LayerColor[track->GetLayer()];

		if( draw_mode & GR_SURBRILL )
		{
		if( draw_mode & GR_AND )

Admin message