Support for a visibility flag and color selection to NPTH holes (b739b2b0) · Commits · Elphel / kicad-source-mirror

common/class_colors_design_settings.cpp

+12 −19

Original line number	Original line	Diff line number	Diff line
	@@ -40,6 +40,7 @@ static const EDA_COLOR_T default_items_color[LAYERSCOLORSBUFFERSIZE] =
	CYAN, // VIA_MICROVIA_VISIBLE		CYAN, // VIA_MICROVIA_VISIBLE
	BROWN, // VIA_BBLIND_VISIBLE		BROWN, // VIA_BBLIND_VISIBLE
	LIGHTGRAY, // VIA_THROUGH_VISIBLE		LIGHTGRAY, // VIA_THROUGH_VISIBLE
			YELLOW, // NON_PLATED_VISIBLE
	LIGHTGRAY, // MOD_TEXT_FR_VISIBLE		LIGHTGRAY, // MOD_TEXT_FR_VISIBLE
	BLUE, // MOD_TEXT_BK_VISIBLE		BLUE, // MOD_TEXT_BK_VISIBLE
	DARKGRAY, // MOD_TEXT_INVISIBLE		DARKGRAY, // MOD_TEXT_INVISIBLE
	@@ -49,18 +50,10 @@ static const EDA_COLOR_T default_items_color[LAYERSCOLORSBUFFERSIZE] =
	LIGHTGRAY, // RATSNEST_VISIBLE		LIGHTGRAY, // RATSNEST_VISIBLE
	DARKGRAY, // GRID_VISIBLE		DARKGRAY, // GRID_VISIBLE
	LIGHTRED, LIGHTGRAY, LIGHTGRAY, LIGHTGRAY,		LIGHTRED, LIGHTGRAY, LIGHTGRAY, LIGHTGRAY,
	LIGHTGRAY, LIGHTGRAY,		LIGHTGRAY, LIGHTGRAY, LIGHTGRAY, LIGHTGRAY,
	LIGHTGRAY, LIGHTGRAY,		LIGHTGRAY, LIGHTGRAY, LIGHTGRAY, LIGHTGRAY,
	LIGHTGRAY, LIGHTGRAY,		LIGHTGRAY, LIGHTGRAY, LIGHTGRAY, LIGHTGRAY,
	LIGHTGRAY, LIGHTGRAY,		LIGHTGRAY, LIGHTGRAY, LIGHTGRAY
	LIGHTGRAY,
	LIGHTGRAY,
	LIGHTGRAY,
	LIGHTGRAY,
	LIGHTGRAY,
	LIGHTGRAY,
	LIGHTGRAY,
	LIGHTGRAY
	};		};

	COLORS_DESIGN_SETTINGS::COLORS_DESIGN_SETTINGS()		COLORS_DESIGN_SETTINGS::COLORS_DESIGN_SETTINGS()

include/layers_id_colors_and_visibility.h

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -196,6 +196,7 @@ enum PCB_VISIBLE
	VIA_MICROVIA_VISIBLE,		VIA_MICROVIA_VISIBLE,
	VIA_BBLIND_VISIBLE,		VIA_BBLIND_VISIBLE,
	VIA_THROUGH_VISIBLE,		VIA_THROUGH_VISIBLE,
			NON_PLATED_VISIBLE,
	MOD_TEXT_FR_VISIBLE,		MOD_TEXT_FR_VISIBLE,
	MOD_TEXT_BK_VISIBLE,		MOD_TEXT_BK_VISIBLE,
	MOD_TEXT_INVISIBLE, ///< text marked as invisible		MOD_TEXT_INVISIBLE, ///< text marked as invisible

pcbnew/class_board.cpp

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -637,6 +637,7 @@ EDA_COLOR_T BOARD::GetVisibleElementColor( int aPCB_VISIBLE )

	switch( aPCB_VISIBLE )		switch( aPCB_VISIBLE )
	{		{
			case NON_PLATED_VISIBLE:
	case VIA_THROUGH_VISIBLE:		case VIA_THROUGH_VISIBLE:
	case VIA_MICROVIA_VISIBLE:		case VIA_MICROVIA_VISIBLE:
	case VIA_BBLIND_VISIBLE:		case VIA_BBLIND_VISIBLE:
	@@ -663,6 +664,7 @@ void BOARD::SetVisibleElementColor( int aPCB_VISIBLE, EDA_COLOR_T aColor )
	{		{
	switch( aPCB_VISIBLE )		switch( aPCB_VISIBLE )
	{		{
			case NON_PLATED_VISIBLE:
	case VIA_THROUGH_VISIBLE:		case VIA_THROUGH_VISIBLE:
	case VIA_MICROVIA_VISIBLE:		case VIA_MICROVIA_VISIBLE:
	case VIA_BBLIND_VISIBLE:		case VIA_BBLIND_VISIBLE:

pcbnew/class_pad.cpp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -524,7 +524,7 @@ void D_PAD::GetMsgPanelInfo( std::vector< MSG_PANEL_ITEM>& aList )
	wxString msg = module->GetReference();		wxString msg = module->GetReference();
	aList.push_back( MSG_PANEL_ITEM( _( "Module" ), msg, DARKCYAN ) );		aList.push_back( MSG_PANEL_ITEM( _( "Module" ), msg, DARKCYAN ) );
	ReturnStringPadName( Line );		ReturnStringPadName( Line );
	aList.push_back( MSG_PANEL_ITEM( _( "RefP" ), Line, BROWN ) );		aList.push_back( MSG_PANEL_ITEM( _( "Pad" ), Line, BROWN ) );
	}		}

	aList.push_back( MSG_PANEL_ITEM( _( "Net" ), m_Netname, DARKCYAN ) );		aList.push_back( MSG_PANEL_ITEM( _( "Net" ), m_Netname, DARKCYAN ) );

pcbnew/class_pad_draw_functions.cpp

+18 −16

Original line number	Original line	Diff line number	Diff line
	@@ -79,7 +79,7 @@ void D_PAD::Draw( EDA_DRAW_PANEL* aPanel, wxDC* aDC, GR_DRAWMODE aDraw_mode,
	#ifdef SHOW_PADMASK_REAL_SIZE_AND_COLOR		#ifdef SHOW_PADMASK_REAL_SIZE_AND_COLOR
	int showActualMaskSize = 0; /* Layer number if the actual pad size on mask layer can		int showActualMaskSize = 0; /* Layer number if the actual pad size on mask layer can
	* be displayed i.e. if only one layer is shown for this pad		* be displayed i.e. if only one layer is shown for this pad
	* and this layer is a mask (solder mask or sloder paste		* and this layer is a mask (solder mask or solder paste
	*/		*/
	#endif		#endif

	@@ -229,13 +229,13 @@ void D_PAD::Draw( EDA_DRAW_PANEL* aPanel, wxDC* aDC, GR_DRAWMODE aDraw_mode,
	// layer so we can see pads on paste or solder layer and the size of the		// layer so we can see pads on paste or solder layer and the size of the
	// mask		// mask
	if( ( aDraw_mode & GR_ALLOW_HIGHCONTRAST ) &&		if( ( aDraw_mode & GR_ALLOW_HIGHCONTRAST ) &&
	DisplayOpt.ContrastModeDisplay && screen->m_Active_Layer > LAST_COPPER_LAYER )		DisplayOpt.ContrastModeDisplay && screen->m_Active_Layer >= FIRST_NON_COPPER_LAYER )
	{		{
	if( IsOnLayer( screen->m_Active_Layer ) )		if( IsOnLayer( screen->m_Active_Layer ) )
	{		{
	color = brd->GetLayerColor( screen->m_Active_Layer );		color = brd->GetLayerColor( screen->m_Active_Layer );

	// In hight contrast mode, and if the active layer is the mask		// In high contrast mode, and if the active layer is the mask
	// layer shows the pad size with the mask clearance		// layer shows the pad size with the mask clearance
	switch( screen->m_Active_Layer )		switch( screen->m_Active_Layer )
	{		{
	@@ -268,8 +268,12 @@ void D_PAD::Draw( EDA_DRAW_PANEL* aPanel, wxDC* aDC, GR_DRAWMODE aDraw_mode,
	if( ( m_layerMask & ALL_CU_LAYERS ) == 0 )		if( ( m_layerMask & ALL_CU_LAYERS ) == 0 )
	DisplayIsol = false;		DisplayIsol = false;

	if( GetAttribute() == PAD_HOLE_NOT_PLATED )		if( ( GetAttribute() == PAD_HOLE_NOT_PLATED ) &&
			brd->IsElementVisible( NON_PLATED_VISIBLE ) )
			{
	drawInfo.m_ShowNotPlatedHole = true;		drawInfo.m_ShowNotPlatedHole = true;
			drawInfo.m_NPHoleColor = brd->GetVisibleElementColor( NON_PLATED_VISIBLE );
			}

	drawInfo.m_DrawMode = aDraw_mode;		drawInfo.m_DrawMode = aDraw_mode;
	drawInfo.m_Color = color;		drawInfo.m_Color = color;
	@@ -286,7 +290,7 @@ void D_PAD::Draw( EDA_DRAW_PANEL* aPanel, wxDC* aDC, GR_DRAWMODE aDraw_mode,
	*/		*/
	drawInfo.m_PadClearance = DisplayIsol ? GetClearance() : 0;		drawInfo.m_PadClearance = DisplayIsol ? GetClearance() : 0;

	/* Draw the pad number */		// Draw the pad number
	if( frame && !frame->m_DisplayPadNum )		if( frame && !frame->m_DisplayPadNum )
	drawInfo.m_Display_padnum = false;		drawInfo.m_Display_padnum = false;

	@@ -360,7 +364,7 @@ void D_PAD::DrawShape( EDA_RECT* aClipBox, wxDC* aDC, PAD_DRAWINFO& aDrawInfo )
	seg_width, m_PadSketchModePenSize, aDrawInfo.m_Color );		seg_width, m_PadSketchModePenSize, aDrawInfo.m_Color );
	}		}

	/* Draw the isolation line. */		// Draw the clearance line
	if( aDrawInfo.m_PadClearance )		if( aDrawInfo.m_PadClearance )
	{		{
	seg_width += 2 * aDrawInfo.m_PadClearance;		seg_width += 2 * aDrawInfo.m_PadClearance;
	@@ -392,12 +396,11 @@ void D_PAD::DrawShape( EDA_RECT* aClipBox, wxDC* aDC, PAD_DRAWINFO& aDrawInfo )
	}		}
	break;		break;


	default:		default:
	break;		break;
	}		}

	/* Draw the pad hole */		// Draw the pad hole
	wxPoint holepos = m_Pos - aDrawInfo.m_Offset;		wxPoint holepos = m_Pos - aDrawInfo.m_Offset;
	int hole = m_Drill.x >> 1;		int hole = m_Drill.x >> 1;

	@@ -439,13 +442,13 @@ void D_PAD::DrawShape( EDA_RECT* aClipBox, wxDC* aDC, PAD_DRAWINFO& aDrawInfo )
	halfsize.x = m_Drill.x >> 1;		halfsize.x = m_Drill.x >> 1;
	halfsize.y = m_Drill.y >> 1;		halfsize.y = m_Drill.y >> 1;

	if( m_Drill.x > m_Drill.y ) /* horizontal */		if( m_Drill.x > m_Drill.y ) // horizontal
	{		{
	delta_cx = halfsize.x - halfsize.y;		delta_cx = halfsize.x - halfsize.y;
	delta_cy = 0;		delta_cy = 0;
	seg_width = m_Drill.y;		seg_width = m_Drill.y;
	}		}
	else /* vertical */		else // vertical
	{		{
	delta_cx = 0;		delta_cx = 0;
	delta_cy = halfsize.y - halfsize.x;		delta_cy = halfsize.y - halfsize.x;
	@@ -469,7 +472,7 @@ void D_PAD::DrawShape( EDA_RECT* aClipBox, wxDC* aDC, PAD_DRAWINFO& aDrawInfo )

	GRSetDrawMode( aDC, aDrawInfo.m_DrawMode );		GRSetDrawMode( aDC, aDrawInfo.m_DrawMode );

	/* Draw "No connect" ( / or \ or cross X ) if necessary. : */		// Draw "No connect" ( / or \ or cross X ) if necessary
	if( m_Netname.IsEmpty() && aDrawInfo.m_ShowNCMark )		if( m_Netname.IsEmpty() && aDrawInfo.m_ShowNCMark )
	{		{
	int dx0 = std::min( halfsize.x, halfsize.y );		int dx0 = std::min( halfsize.x, halfsize.y );
	@@ -479,12 +482,12 @@ void D_PAD::DrawShape( EDA_RECT* aClipBox, wxDC* aDC, PAD_DRAWINFO& aDrawInfo )
	GRLine( aClipBox, aDC, holepos.x - dx0, holepos.y - dx0,		GRLine( aClipBox, aDC, holepos.x - dx0, holepos.y - dx0,
	holepos.x + dx0, holepos.y + dx0, 0, nc_color );		holepos.x + dx0, holepos.y + dx0, 0, nc_color );

	if( m_layerMask & LAYER_BACK ) /* Draw / */		if( m_layerMask & LAYER_BACK ) // Draw /
	GRLine( aClipBox, aDC, holepos.x + dx0, holepos.y - dx0,		GRLine( aClipBox, aDC, holepos.x + dx0, holepos.y - dx0,
	holepos.x - dx0, holepos.y + dx0, 0, nc_color );		holepos.x - dx0, holepos.y + dx0, 0, nc_color );
	}		}

	/* Draw the pad number */		// Draw the pad number
	if( !aDrawInfo.m_Display_padnum && !aDrawInfo.m_Display_netname )		if( !aDrawInfo.m_Display_padnum && !aDrawInfo.m_Display_netname )
	return;		return;

	@@ -627,8 +630,7 @@ void D_PAD::BuildPadPolygon( wxPoint aCoord[4], wxSize aInflateValue, int aRotat
	halfsize.x = m_Size.x >> 1;		halfsize.x = m_Size.x >> 1;
	halfsize.y = m_Size.y >> 1;		halfsize.y = m_Size.y >> 1;

	/* For rectangular shapes, inflate is easy		// For rectangular shapes, inflate is easy
	*/
	if( GetShape() == PAD_RECT )		if( GetShape() == PAD_RECT )
	{		{
	halfsize += aInflateValue;		halfsize += aInflateValue;

Admin message