Browse Source
Pcbnew: Added display a short net name on vias and pads. Also, code cleaning
pull/1/head
Pcbnew: Added display a short net name on vias and pads. Also, code cleaning
pull/1/head
charras
17 years ago
51 changed files with 1145 additions and 919 deletions
-
8change_log.txt
-
3common/basicframe.cpp
-
2common/common_plot_functions.cpp
-
161common/drawtxt.cpp
-
7common/worksheet.cpp
-
2cvpcb/CMakeLists.txt
-
4cvpcb/makefile.include
-
4eeschema/class_drawsheet.cpp
-
5eeschema/class_hierarchical_PIN_sheet.cpp
-
12eeschema/class_pin.cpp
-
15eeschema/class_text-label.cpp
-
4eeschema/classes_body_items.cpp
-
10eeschema/eelayer.cpp
-
6eeschema/eelibs_draw_components.cpp
-
6eeschema/libfield.cpp
-
18eeschema/plot.cpp
-
2eeschema/protos.h
-
4gerbview/trpiste.cpp
-
4include/build_version.h
-
1include/colors.h
-
39include/common.h
-
BINinternat/fr/kicad.mo
-
210internat/fr/kicad.po
-
1pcbnew/CMakeLists.txt
-
2pcbnew/affiche.cpp
-
12pcbnew/class_board.cpp
-
10pcbnew/class_board_item.cpp
-
44pcbnew/class_equipot.cpp
-
48pcbnew/class_equipot.h
-
549pcbnew/class_pad.cpp
-
28pcbnew/class_pad.h
-
466pcbnew/class_pad_draw_functions.cpp
-
2pcbnew/class_text_mod.cpp
-
272pcbnew/class_track.cpp
-
2pcbnew/class_track.h
-
6pcbnew/class_zone.cpp
-
6pcbnew/dialog_copper_zones.cpp
-
6pcbnew/dialog_pad_properties.cpp
-
13pcbnew/export_gencad.cpp
-
2pcbnew/ioascii.cpp
-
1pcbnew/makefile.include
-
2pcbnew/move-drag_pads.cpp
-
6pcbnew/netlist.cpp
-
10pcbnew/ratsnest.cpp
-
2pcbnew/router.cpp
-
2pcbnew/solve.cpp
-
6pcbnew/specctra_export.cpp
-
6pcbnew/surbrill.cpp
-
7pcbnew/tracepcb.cpp
-
22pcbnew/xchgmod.cpp
-
4pcbnew/zones_by_polygon.cpp
@ -0,0 +1,466 @@ |
|||
/*******************************************************/ |
|||
/* class_pad_draw_function.cpp : functionsto draw pads */ |
|||
/*******************************************************/ |
|||
|
|||
#include "fctsys.h"
|
|||
#include "gr_basic.h"
|
|||
|
|||
#include "common.h"
|
|||
#include "pcbnew.h"
|
|||
#include "trigo.h"
|
|||
#include "id.h" // ID_TRACK_BUTT
|
|||
|
|||
|
|||
/*******************************************************************************************/ |
|||
void D_PAD::Draw( WinEDA_DrawPanel* panel, wxDC* DC, int draw_mode, const wxPoint& offset ) |
|||
/*******************************************************************************************/ |
|||
|
|||
/** Draw a pad:
|
|||
* @param DC = device context |
|||
* @param offset = draw offset |
|||
* @param draw_mode = mode: GR_OR, GR_XOR, GR_AND... |
|||
*/ |
|||
{ |
|||
int ii; |
|||
int color = 0; |
|||
int ux0, uy0, |
|||
dx, dx0, dy, dy0, |
|||
rotdx, |
|||
delta_cx, delta_cy, |
|||
xc, yc; |
|||
int angle; |
|||
wxPoint coord[4]; |
|||
int zoom; |
|||
int fillpad = 0; |
|||
wxPoint shape_pos; |
|||
|
|||
if( m_Flags & DO_NOT_DRAW ) |
|||
return; |
|||
|
|||
wxASSERT( panel ); |
|||
|
|||
zoom = panel->GetZoom(); |
|||
|
|||
WinEDA_BasePcbFrame* frame = (WinEDA_BasePcbFrame*) panel->m_Parent; |
|||
PCB_SCREEN* screen = frame->GetScreen(); |
|||
if( frame->m_DisplayPadFill == FILLED ) |
|||
fillpad = 1; |
|||
|
|||
#ifdef PCBNEW
|
|||
if( m_Flags & IS_MOVED ) |
|||
fillpad = 0; |
|||
#endif
|
|||
|
|||
if( m_Masque_Layer & CMP_LAYER ) |
|||
color = g_PadCMPColor; |
|||
|
|||
if( m_Masque_Layer & CUIVRE_LAYER ) |
|||
color |= g_PadCUColor; |
|||
|
|||
if( color == 0 ) /* Not on copper layer */ |
|||
{ |
|||
switch( m_Masque_Layer & ~ALL_CU_LAYERS ) |
|||
{ |
|||
case ADHESIVE_LAYER_CU: |
|||
color = g_DesignSettings.m_LayerColor[ADHESIVE_N_CU]; |
|||
break; |
|||
|
|||
case ADHESIVE_LAYER_CMP: |
|||
color = g_DesignSettings.m_LayerColor[ADHESIVE_N_CMP]; |
|||
break; |
|||
|
|||
case SOLDERPASTE_LAYER_CU: |
|||
color = g_DesignSettings.m_LayerColor[SOLDERPASTE_N_CU]; |
|||
break; |
|||
|
|||
case SOLDERPASTE_LAYER_CMP: |
|||
color = g_DesignSettings.m_LayerColor[SOLDERPASTE_N_CMP]; |
|||
break; |
|||
|
|||
case SILKSCREEN_LAYER_CU: |
|||
color = g_DesignSettings.m_LayerColor[SILKSCREEN_N_CU]; |
|||
break; |
|||
|
|||
case SILKSCREEN_LAYER_CMP: |
|||
color = g_DesignSettings.m_LayerColor[SILKSCREEN_N_CMP]; |
|||
break; |
|||
|
|||
case SOLDERMASK_LAYER_CU: |
|||
color = g_DesignSettings.m_LayerColor[SOLDERMASK_N_CU]; |
|||
break; |
|||
|
|||
case SOLDERMASK_LAYER_CMP: |
|||
color = g_DesignSettings.m_LayerColor[SOLDERMASK_N_CMP]; |
|||
break; |
|||
|
|||
case DRAW_LAYER: |
|||
color = g_DesignSettings.m_LayerColor[DRAW_N]; |
|||
break; |
|||
|
|||
case COMMENT_LAYER: |
|||
color = g_DesignSettings.m_LayerColor[COMMENT_N]; |
|||
break; |
|||
|
|||
case ECO1_LAYER: |
|||
color = g_DesignSettings.m_LayerColor[ECO1_N]; |
|||
break; |
|||
|
|||
case ECO2_LAYER: |
|||
color = g_DesignSettings.m_LayerColor[ECO2_N]; |
|||
break; |
|||
|
|||
case EDGE_LAYER: |
|||
color = g_DesignSettings.m_LayerColor[EDGE_N]; |
|||
break; |
|||
|
|||
default: |
|||
color = DARKGRAY; |
|||
break; |
|||
} |
|||
} |
|||
|
|||
|
|||
// if PAD_SMD pad and high contrast mode
|
|||
if( (m_Attribut==PAD_SMD || m_Attribut==PAD_CONN) && DisplayOpt.ContrastModeDisplay ) |
|||
{ |
|||
// when routing tracks
|
|||
if( frame && frame->m_ID_current_state == ID_TRACK_BUTT ) |
|||
{ |
|||
int routeTop = screen->m_Route_Layer_TOP; |
|||
int routeBot = screen->m_Route_Layer_BOTTOM; |
|||
|
|||
// if routing between copper and component layers,
|
|||
// or the current layer is one of said 2 external copper layers,
|
|||
// then highlight only the current layer.
|
|||
if( ( (1 << routeTop) | (1 << routeBot) ) == (CUIVRE_LAYER | CMP_LAYER) |
|||
|| ( (1 << screen->m_Active_Layer) & (CUIVRE_LAYER | CMP_LAYER) ) ) |
|||
{ |
|||
if( !IsOnLayer( screen->m_Active_Layer ) ) |
|||
{ |
|||
color &= ~MASKCOLOR; |
|||
color |= DARKDARKGRAY; |
|||
} |
|||
} |
|||
// else routing between an internal signal layer and some other layer.
|
|||
// grey out all PAD_SMD pads not on current or the single selected
|
|||
// external layer.
|
|||
else if( !IsOnLayer( screen->m_Active_Layer ) |
|||
&& !IsOnLayer( routeTop ) |
|||
&& !IsOnLayer( routeBot ) ) |
|||
{ |
|||
color &= ~MASKCOLOR; |
|||
color |= DARKDARKGRAY; |
|||
} |
|||
} |
|||
// when not edting tracks, show PAD_SMD components not on active layer as greyed out
|
|||
else |
|||
{ |
|||
if( !IsOnLayer( screen->m_Active_Layer ) ) |
|||
{ |
|||
color &= ~MASKCOLOR; |
|||
color |= DARKDARKGRAY; |
|||
} |
|||
} |
|||
} |
|||
|
|||
if( draw_mode & GR_SURBRILL ) |
|||
{ |
|||
if( draw_mode & GR_AND ) |
|||
color &= ~HIGHT_LIGHT_FLAG; |
|||
else |
|||
color |= HIGHT_LIGHT_FLAG; |
|||
} |
|||
|
|||
if( color & HIGHT_LIGHT_FLAG ) |
|||
color = ColorRefs[color & MASKCOLOR].m_LightColor; |
|||
|
|||
GRSetDrawMode( DC, draw_mode ); /* mode de trace */ |
|||
|
|||
/* calcul du centre des pads en coordonnees Ecran : */ |
|||
shape_pos = ReturnShapePos(); |
|||
ux0 = shape_pos.x - offset.x; |
|||
uy0 = shape_pos.y - offset.y; |
|||
xc = ux0; |
|||
yc = uy0; |
|||
|
|||
/* le trace depend de la rotation de l'empreinte */ |
|||
|
|||
dx = dx0 = m_Size.x >> 1; |
|||
dy = dy0 = m_Size.y >> 1; /* demi dim dx et dy */ |
|||
|
|||
angle = m_Orient; |
|||
|
|||
bool DisplayIsol = DisplayOpt.DisplayPadIsol; |
|||
if( ( m_Masque_Layer & ALL_CU_LAYERS ) == 0 ) |
|||
DisplayIsol = FALSE; |
|||
|
|||
switch( GetShape() ) |
|||
{ |
|||
case PAD_CIRCLE: |
|||
if( fillpad ) |
|||
GRFilledCircle( &panel->m_ClipBox, DC, xc, yc, dx, 0, color, color ); |
|||
else |
|||
GRCircle( &panel->m_ClipBox, DC, xc, yc, dx, 0, color ); |
|||
|
|||
if( DisplayIsol ) |
|||
{ |
|||
GRCircle( &panel->m_ClipBox, |
|||
DC, |
|||
xc, |
|||
yc, |
|||
dx + g_DesignSettings.m_TrackClearence, |
|||
0, |
|||
color ); |
|||
} |
|||
break; |
|||
|
|||
case PAD_OVAL: |
|||
/* calcul de l'entraxe de l'ellipse */ |
|||
if( dx > dy ) /* ellipse horizontale */ |
|||
{ |
|||
delta_cx = dx - dy; |
|||
delta_cy = 0; |
|||
rotdx = m_Size.y; |
|||
} |
|||
else /* ellipse verticale */ |
|||
{ |
|||
delta_cx = 0; |
|||
delta_cy = dy - dx; |
|||
rotdx = m_Size.x; |
|||
} |
|||
RotatePoint( &delta_cx, &delta_cy, angle ); |
|||
|
|||
if( fillpad ) |
|||
{ |
|||
GRFillCSegm( &panel->m_ClipBox, DC, ux0 + delta_cx, uy0 + delta_cy, |
|||
ux0 - delta_cx, uy0 - delta_cy, |
|||
rotdx, color ); |
|||
} |
|||
else |
|||
{ |
|||
GRCSegm( &panel->m_ClipBox, DC, ux0 + delta_cx, uy0 + delta_cy, |
|||
ux0 - delta_cx, uy0 - delta_cy, |
|||
rotdx, color ); |
|||
} |
|||
|
|||
/* Trace de la marge d'isolement */ |
|||
if( DisplayIsol ) |
|||
{ |
|||
rotdx = rotdx + g_DesignSettings.m_TrackClearence + g_DesignSettings.m_TrackClearence; |
|||
|
|||
GRCSegm( &panel->m_ClipBox, DC, ux0 + delta_cx, uy0 + delta_cy, |
|||
ux0 - delta_cx, uy0 - delta_cy, |
|||
rotdx, color ); |
|||
} |
|||
break; |
|||
|
|||
case PAD_RECT: |
|||
case PAD_TRAPEZOID: |
|||
{ |
|||
int ddx, ddy; |
|||
ddx = m_DeltaSize.x >> 1; |
|||
ddy = m_DeltaSize.y >> 1; /* demi dim dx et dy */ |
|||
|
|||
coord[0].x = -dx - ddy; |
|||
coord[0].y = +dy + ddx; |
|||
|
|||
coord[1].x = -dx + ddy; |
|||
coord[1].y = -dy - ddx; |
|||
|
|||
coord[2].x = +dx - ddy; |
|||
coord[2].y = -dy + ddx; |
|||
|
|||
coord[3].x = +dx + ddy; |
|||
coord[3].y = +dy - ddx; |
|||
|
|||
for( ii = 0; ii < 4; ii++ ) |
|||
{ |
|||
RotatePoint( &coord[ii].x, &coord[ii].y, angle ); |
|||
coord[ii].x = coord[ii].x + ux0; |
|||
coord[ii].y = coord[ii].y + uy0; |
|||
} |
|||
|
|||
GRClosedPoly( &panel->m_ClipBox, DC, 4, (int*) coord, fillpad, color, color ); |
|||
|
|||
if( DisplayIsol ) |
|||
{ |
|||
dx += g_DesignSettings.m_TrackClearence; |
|||
dy += g_DesignSettings.m_TrackClearence; |
|||
|
|||
coord[0].x = -dx - ddy; |
|||
coord[0].y = dy + ddx; |
|||
|
|||
coord[1].x = -dx + ddy; |
|||
coord[1].y = -dy - ddx; |
|||
|
|||
coord[2].x = dx - ddy; |
|||
coord[2].y = -dy + ddx; |
|||
|
|||
coord[3].x = dx + ddy; |
|||
coord[3].y = dy - ddx; |
|||
|
|||
for( ii = 0; ii < 4; ii++ ) |
|||
{ |
|||
RotatePoint( &coord[ii].x, &coord[ii].y, angle ); |
|||
coord[ii].x = coord[ii].x + ux0; |
|||
coord[ii].y = coord[ii].y + uy0; |
|||
} |
|||
|
|||
GRClosedPoly( &panel->m_ClipBox, DC, 4, (int*) coord, 0, color, color ); |
|||
} |
|||
} |
|||
break; |
|||
|
|||
|
|||
default: |
|||
break; |
|||
} |
|||
|
|||
/* Draw the pad hole */ |
|||
int cx0 = m_Pos.x - offset.x; |
|||
int cy0 = m_Pos.y - offset.y; |
|||
int hole = m_Drill.x >> 1; |
|||
|
|||
if( fillpad && hole ) |
|||
{ |
|||
bool blackpenstate = false; |
|||
if( g_IsPrinting ) |
|||
{ |
|||
blackpenstate = GetGRForceBlackPenState(); |
|||
GRForceBlackPen( false ); |
|||
color = WHITE; |
|||
} |
|||
else |
|||
color = BLACK; // or DARKGRAY;
|
|||
|
|||
if( draw_mode != GR_XOR ) |
|||
GRSetDrawMode( DC, GR_COPY ); |
|||
else |
|||
GRSetDrawMode( DC, GR_XOR ); |
|||
|
|||
switch( m_DrillShape ) |
|||
{ |
|||
case PAD_CIRCLE: |
|||
if( (hole / zoom) > 1 ) /* draw hole if its size is enought */ |
|||
GRFilledCircle( &panel->m_ClipBox, DC, cx0, cy0, hole, 0, color, color ); |
|||
break; |
|||
|
|||
case PAD_OVAL: |
|||
dx = m_Drill.x >> 1; |
|||
dy = m_Drill.y >> 1; /* demi dim dx et dy */ |
|||
|
|||
/* calcul de l'entraxe de l'ellipse */ |
|||
if( m_Drill.x > m_Drill.y ) /* ellipse horizontale */ |
|||
{ |
|||
delta_cx = dx - dy; delta_cy = 0; |
|||
rotdx = m_Drill.y; |
|||
} |
|||
else /* ellipse verticale */ |
|||
{ |
|||
delta_cx = 0; delta_cy = dy - dx; |
|||
rotdx = m_Drill.x; |
|||
} |
|||
RotatePoint( &delta_cx, &delta_cy, angle ); |
|||
|
|||
GRFillCSegm( &panel->m_ClipBox, DC, ux0 + delta_cx, uy0 + delta_cy, |
|||
ux0 - delta_cx, uy0 - delta_cy, |
|||
rotdx, color ); |
|||
break; |
|||
|
|||
default: |
|||
break; |
|||
} |
|||
|
|||
if( g_IsPrinting ) |
|||
GRForceBlackPen( blackpenstate ); |
|||
} |
|||
|
|||
GRSetDrawMode( DC, draw_mode ); |
|||
|
|||
/* Trace du symbole "No connect" ( / ou \ ou croix en X) si necessaire : */ |
|||
if( m_Netname.IsEmpty() && DisplayOpt.DisplayPadNoConn ) |
|||
{ |
|||
dx0 = MIN( dx0, dy0 ); |
|||
int nc_color = BLUE; |
|||
|
|||
if( m_Masque_Layer & CMP_LAYER ) /* Trace forme \ */ |
|||
GRLine( &panel->m_ClipBox, DC, cx0 - dx0, cy0 - dx0, |
|||
cx0 + dx0, cy0 + dx0, 0, nc_color ); |
|||
|
|||
if( m_Masque_Layer & CUIVRE_LAYER ) /* Trace forme / */ |
|||
GRLine( &panel->m_ClipBox, DC, cx0 + dx0, cy0 - dx0, |
|||
cx0 - dx0, cy0 + dx0, 0, nc_color ); |
|||
} |
|||
|
|||
/* Draw the pad number */ |
|||
if( frame && !frame->m_DisplayPadNum ) |
|||
return; |
|||
|
|||
wxPoint tpos0 = wxPoint( ux0, uy0 ); // Position of the centre of text
|
|||
wxPoint tpos = tpos0; |
|||
wxSize AreaSize; // size of text area, normalized to AreaSize.y < AreaSize.x
|
|||
int len; |
|||
if( GetShape() == PAD_CIRCLE ) |
|||
angle = 0; |
|||
AreaSize = m_Size; |
|||
if( m_Size.y > m_Size.x ) |
|||
{ |
|||
angle += 900; |
|||
AreaSize.x = m_Size.y; |
|||
AreaSize.y = m_Size.x; |
|||
} |
|||
|
|||
if( !m_Netname.IsEmpty() ) // if there is a netname, provides room to display this netname
|
|||
{ |
|||
AreaSize.y /= 2; // Text used only the upper area of the pad. The lower area displays the net name
|
|||
tpos.y -= AreaSize.y / 2; |
|||
} |
|||
|
|||
// Calculate the position of text, that is the middle point of the upper area of the pad
|
|||
RotatePoint( &tpos, wxPoint( ux0, uy0 ), angle ); |
|||
|
|||
/* Draw text with an angle between -90 deg and + 90 deg */ |
|||
int t_angle = angle; |
|||
NORMALIZE_ANGLE_90( t_angle ); |
|||
|
|||
/* Note: in next calculations, texte size is calculated for 3 or more chars.
|
|||
Of course, pads nimbers and nets names can have less than 3 chars. |
|||
but after some tries, i found this is gives the best look |
|||
*/ |
|||
#define MIN_CHAR_COUNT 3
|
|||
wxString buffer; |
|||
ReturnStringPadName( buffer ); |
|||
len = buffer.Len(); |
|||
len = MAX( len, MIN_CHAR_COUNT); |
|||
|
|||
int tsize = min( AreaSize.y, AreaSize.x / len ); |
|||
#define CHAR_SIZE_MIN 5
|
|||
if( (tsize / zoom) >= CHAR_SIZE_MIN ) // Not drawable in size too small.
|
|||
{ |
|||
tsize = (int) (tsize * 0.8); // reserve room for marges and segments thickness
|
|||
|
|||
DrawGraphicText( panel, DC, tpos, |
|||
WHITE, buffer, t_angle, wxSize( tsize, tsize ), |
|||
GR_TEXT_HJUSTIFY_CENTER, GR_TEXT_VJUSTIFY_CENTER, tsize / 8 ); |
|||
} |
|||
|
|||
// display the short netname
|
|||
len = m_ShortNetname.Len(); |
|||
if (len == 0 ) |
|||
return; |
|||
len = MAX( len, MIN_CHAR_COUNT); |
|||
tsize = min( AreaSize.y, AreaSize.x / len ); |
|||
|
|||
if( (tsize / zoom) >= CHAR_SIZE_MIN ) // Not drawable in size too small.
|
|||
{ |
|||
tpos = tpos0; |
|||
tpos.y += AreaSize.y / 2; |
|||
RotatePoint( &tpos, wxPoint( ux0, uy0 ), angle ); |
|||
|
|||
tsize = (int) (tsize * 0.8); // reserve room for marges and segments thickness
|
|||
DrawGraphicText( panel, DC, tpos, |
|||
WHITE, m_ShortNetname, t_angle, wxSize( tsize, tsize ), |
|||
GR_TEXT_HJUSTIFY_CENTER, GR_TEXT_VJUSTIFY_CENTER, tsize / 8 ); |
|||
} |
|||
} |
|||
|
|||
Write
Preview
Loading…
Cancel
Save
Reference in new issue