7
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-04-07 23:35:31 +00:00

Pcbnew: Added display a short net name on vias and pads. Also, code cleaning

This commit is contained in:
charras 2008-12-14 19:45:05 +00:00
parent 9dae370c1f
commit 6d856f60a6
51 changed files with 1151 additions and 925 deletions

View File

@ -5,6 +5,14 @@ Started 2007-June-11
Please add newer entries at the top, list the date and your name with
email address.
2008-Dec-14 UPDATE Jean-Pierre Charras <jean-pierre.charras@inpg.fr>
================================================================================
++pcbnew
Display a short net name on vias and pads (if zoom level allows it).
Short net names are net names without hierarchy path
Add m_ShortNetname and change m_Netname to private in classes D_PAD and EQUIPOT
2008-Dec-08 UPDATE Wayne Stambaugh <stambaughw@verizon.net>
================================================================================
++all

View File

@ -138,9 +138,6 @@ void WinEDA_BasicFrame::PrintMsg( const wxString& text )
/******************************************************/
{
SetStatusText( text );
#ifdef DEBUG
printf( "%s\n", (const char*) text.mb_str() );
#endif
}

View File

@ -92,7 +92,7 @@ void PlotWorkSheet( int format_plot, BASE_SCREEN* screen )
int ii, jj, xg, yg, ipas, gxpas, gypas;
wxSize PageSize;
wxPoint pos, ref;
int color;
EDA_Colors color;
Ki_WorkSheetData* WsItem;
int conv_unit = screen->GetInternalUnits() / 1000; /* Scale to convert dimension in 1/1000 in into internal units
* (1/1000 inc for EESchema, 1/10000 for pcbnew */

View File

@ -21,22 +21,23 @@
/* fonctions locales : */
/****************************************************************************/
void DrawGraphicText( WinEDA_DrawPanel* panel, wxDC* DC,
const wxPoint& Pos, int gcolor, const wxString& Text,
int orient, const wxSize& Size, int h_justify, int v_justify, int width )
/*****************************************************************************/
/****************************************************************************************************/
void DrawGraphicText( WinEDA_DrawPanel* aPanel, wxDC* DC,
const wxPoint& aPos, enum EDA_Colors aColor, const wxString& aText,
int aOrient, const wxSize& aSize, int aH_justify, int aV_justify, int aWidth )
/****************************************************************************************************/
/* Draw a graphic text (like module texts)
* Text = text to draw
* Pos = text position (according to h_justify, v_justify)
* Size = text size (size.x or size.y can be < 0 for mirrored texts)
* orient = angle in 0.1 degree
* mode_color = GR_OR, GR_XOR..
* h_justify = horizontal justification (Left, center, right)
* v_justify = vertical justification (bottom, center, top)
* width = line width (pen width) (default = 0)
* if width < 0 : draw segments in sketch mode, width = abs(width)
/** Function DrawGraphicText
* Draw a graphic text (like module texts)
* @param aPanel = the current DrawPanel
* @param aPos = text position (according to aH_justify, aV_justify)
* @param aColor (enum EDA_Colors) = text color
* @param aText = text to draw
* @param aOrient = angle in 0.1 degree
* @param aSize = text size (size.x or size.y can be < 0 for mirrored texts)
* @param aH_justify = horizontal justification (Left, center, right)
* @param aV_justify = vertical justification (bottom, center, top)
* @param aWidth = line aWidth (pen aWidth) (default = 0)
*/
{
int ii, kk, nbchar, AsciiCode, endcar;
@ -52,29 +53,29 @@ void DrawGraphicText( WinEDA_DrawPanel* panel, wxDC* DC,
int coord[100]; // Buffer coordinate used to draw polylines (char shapes)
bool sketch_mode = FALSE;
zoom = panel->GetZoom();
zoom = aPanel->GetZoom();
size_h = Size.x;
size_v = Size.y;
size_h = aSize.x;
size_v = aSize.y;
if( width < 0 )
if( aWidth < 0 )
{
width = -width;
aWidth = -aWidth;
sketch_mode = TRUE;
}
kk = 0;
ptr = 0; /* ptr = text index */
nbchar = Text.Len();
nbchar = aText.Len();
if( nbchar == 0 )
return;
espacement = (10 * size_h ) / 9; // this is the pitch between chars
ox = cX = Pos.x;
oy = cY = Pos.y;
ox = cX = aPos.x;
oy = cY = aPos.y;
/* Do not draw the text if out of draw area! */
if( panel )
if( aPanel )
{
int xm, ym, ll, xc, yc;
int textsize = ABS( espacement );
@ -83,10 +84,10 @@ void DrawGraphicText( WinEDA_DrawPanel* panel, wxDC* DC,
xc = GRMapX( cX );
yc = GRMapY( cY );
x0 = panel->m_ClipBox.GetX() - ll;
y0 = panel->m_ClipBox.GetY() - ll;
xm = panel->m_ClipBox.GetRight() + ll;
ym = panel->m_ClipBox.GetBottom() + ll;
x0 = aPanel->m_ClipBox.GetX() - ll;
y0 = aPanel->m_ClipBox.GetY() - ll;
xm = aPanel->m_ClipBox.GetRight() + ll;
ym = aPanel->m_ClipBox.GetBottom() + ll;
if( xc < x0 )
return;
@ -105,9 +106,9 @@ void DrawGraphicText( WinEDA_DrawPanel* panel, wxDC* DC,
ux0 = uy0 = 0; /* Decalage du centre du texte / coord de ref */
if( (orient == 0) || (orient == 1800) ) /* Horizontal Text */
if( (aOrient == 0) || (aOrient == 1800) ) /* Horizontal Text */
{
switch( h_justify )
switch( aH_justify )
{
case GR_TEXT_HJUSTIFY_CENTER:
break;
@ -121,7 +122,7 @@ void DrawGraphicText( WinEDA_DrawPanel* panel, wxDC* DC,
break;
}
switch( v_justify )
switch( aV_justify )
{
case GR_TEXT_VJUSTIFY_CENTER:
break;
@ -137,7 +138,7 @@ void DrawGraphicText( WinEDA_DrawPanel* panel, wxDC* DC,
}
else /* Vertical Text */
{
switch( h_justify )
switch( aH_justify )
{
case GR_TEXT_HJUSTIFY_CENTER:
break;
@ -151,7 +152,7 @@ void DrawGraphicText( WinEDA_DrawPanel* panel, wxDC* DC,
break;
}
switch( v_justify )
switch( aV_justify )
{
case GR_TEXT_VJUSTIFY_CENTER:
break;
@ -172,10 +173,10 @@ void DrawGraphicText( WinEDA_DrawPanel* panel, wxDC* DC,
ox = cX - dx;
oy = cY + dy;
if( (Size.x / zoom) == 0 )
if( (aSize.x / zoom) == 0 )
return;
if( ABS( (Size.x / zoom) ) < 3 ) /* chars trop petits pour etre dessines */
if( ABS( (aSize.x / zoom) ) < 3 ) /* chars trop petits pour etre dessines */
{ /* le texte est symbolise par une barre */
dx = (espacement * nbchar) / 2;
dy = size_v / 2; /* Decalage du debut du texte / centre */
@ -186,10 +187,10 @@ void DrawGraphicText( WinEDA_DrawPanel* panel, wxDC* DC,
dx += cX;
dy = cY;
RotatePoint( &ux0, &uy0, cX, cY, orient );
RotatePoint( &dx, &dy, cX, cY, orient );
RotatePoint( &ux0, &uy0, cX, cY, aOrient );
RotatePoint( &dx, &dy, cX, cY, aOrient );
GRLine( &panel->m_ClipBox, DC, ux0, uy0, dx, dy, width, gcolor );
GRLine( &aPanel->m_ClipBox, DC, ux0, uy0, dx, dy, aWidth, aColor );
return;
}
@ -204,15 +205,15 @@ void DrawGraphicText( WinEDA_DrawPanel* panel, wxDC* DC,
dx += cX;
dy = cY;
RotatePoint( &ux0, &uy0, cX, cY, orient );
RotatePoint( &dx, &dy, cX, cY, orient );
RotatePoint( &ux0, &uy0, cX, cY, aOrient );
RotatePoint( &dx, &dy, cX, cY, aOrient );
DC->SetTextForeground( wxColour(
ColorRefs[gcolor].r,
ColorRefs[gcolor].g,
ColorRefs[gcolor].b ) );
ColorRefs[aColor].r,
ColorRefs[aColor].g,
ColorRefs[aColor].b ) );
DC->DrawRotatedText( Text, GRMapX( ux0 ), GRMapY( uy0 ), (double) orient / 10.0 );
DC->DrawRotatedText( Text, GRMapX( ux0 ), GRMapY( uy0 ), (double) aOrient / 10.0 );
return;
#endif
@ -220,13 +221,13 @@ void DrawGraphicText( WinEDA_DrawPanel* panel, wxDC* DC,
{
x0 = 0; y0 = 0;
#if defined(wxUSE_UNICODE) && defined(KICAD_CYRILLIC)
AsciiCode = Text.GetChar(ptr) & 0x7FF;
AsciiCode = aText.GetChar(ptr) & 0x7FF;
if ( AsciiCode > 0x40F && AsciiCode < 0x450 ) // big small Cyr
AsciiCode = utf8_to_ascii[AsciiCode - 0x410] & 0xFF;
else
AsciiCode = AsciiCode & 0xFF;
#else
AsciiCode = Text.GetChar( ptr ) & 255;
AsciiCode = aText.GetChar( ptr ) & 0xFF;
#endif
ptcar = graphic_fonte_shape[AsciiCode]; /* ptcar pointe la description
* du caractere a dessiner */
@ -245,20 +246,20 @@ void DrawGraphicText( WinEDA_DrawPanel* panel, wxDC* DC,
case 'U':
if( ii && (plume == 'D' ) )
{
if( width <= 1 )
GRPoly( &panel->m_ClipBox, DC, ii / 2, coord, 0, 0,
gcolor, gcolor );
if( aWidth <= 1 )
GRPoly( &aPanel->m_ClipBox, DC, ii / 2, coord, 0, 0,
aColor, aColor );
else if( sketch_mode )
{
int ik, * coordptr;
coordptr = coord;
for( ik = 0; ik < (ii - 2); ik += 2, coordptr += 2 )
GRCSegm( &panel->m_ClipBox, DC, *coordptr, *(coordptr + 1),
*(coordptr + 2), *(coordptr + 3), width, gcolor );
GRCSegm( &aPanel->m_ClipBox, DC, *coordptr, *(coordptr + 1),
*(coordptr + 2), *(coordptr + 3), aWidth, aColor );
}
else
GRPoly( &panel->m_ClipBox, DC, ii / 2, coord, 0,
width, gcolor, gcolor );
GRPoly( &aPanel->m_ClipBox, DC, ii / 2, coord, 0,
aWidth, aColor, aColor );
}
plume = f_cod; ii = 0;
break;
@ -279,7 +280,7 @@ void DrawGraphicText( WinEDA_DrawPanel* panel, wxDC* DC,
k2 = (k2 * size_h) / 9;
dx = k2 + ox; dy = k1 + oy;
RotatePoint( &dx, &dy, cX, cY, orient );
RotatePoint( &dx, &dy, cX, cY, aOrient );
coord[ii++] = dx;
coord[ii++] = dy;
break;
@ -299,13 +300,21 @@ void DrawGraphicText( WinEDA_DrawPanel* panel, wxDC* DC,
/******************************************************************************************/
void PlotGraphicText( int format_plot, const wxPoint& Pos, int gcolor,
const wxString& Text,
int orient, const wxSize& Size, int h_justify, int v_justify )
void PlotGraphicText( int aFormat_plot, const wxPoint& aPos, enum EDA_Colors aColor,
const wxString& aText,
int aOrient, const wxSize& aSize, int aH_justify, int aV_justify )
/******************************************************************************************/
/*
* id DrawGraphicText, for plot graphic text
/** Function PlotGraphicText
* same as DrawGraphicText, but plot graphic text insteed of draw it
* @param aFormat_plot = plot format (PLOT_FORMAT_POST, PLOT_FORMAT_HPGL, PLOT_FORMAT_GERBER)
* @param aPos = text position (according to aH_justify, aV_justify)
* @param aColor (enum EDA_Colors) = text color
* @param aText = text to draw
* @param aOrient = angle in 0.1 degree
* @param aSize = text size (size.x or size.y can be < 0 for mirrored texts)
* @param aH_justify = horizontal justification (Left, center, right)
* @param aV_justify = vertical justification (bottom, center, top)
*/
{
int kk, nbchar, end, AsciiCode;
@ -319,7 +328,7 @@ void PlotGraphicText( int format_plot, const wxPoint& Pos, int gcolor,
void (*FctPlume)( wxPoint pos, int state );
switch( format_plot )
switch( aFormat_plot )
{
case PLOT_FORMAT_POST:
FctPlume = LineTo_PS;
@ -334,11 +343,11 @@ void PlotGraphicText( int format_plot, const wxPoint& Pos, int gcolor,
return;
}
if( gcolor >= 0 && IsPostScript( format_plot ) )
SetColorMapPS( gcolor );
if( aColor >= 0 && IsPostScript( aFormat_plot ) )
SetColorMapPS( aColor );
size_h = Size.x;
size_v = Size.y;
size_h = aSize.x;
size_v = aSize.y;
if( size_h == 0 )
size_h = DEFAULT_SIZE_TEXT;
if( size_v == 0 )
@ -348,11 +357,11 @@ void PlotGraphicText( int format_plot, const wxPoint& Pos, int gcolor,
ptr = 0; /* ptr = text index */
/* calcul de la position du debut des textes: ox et oy */
nbchar = Text.Len();
nbchar = aText.Len();
espacement = (10 * size_h ) / 9;
ox = cX = Pos.x;
oy = cY = Pos.y;
ox = cX = aPos.x;
oy = cY = aPos.y;
/* Calcul du cadrage du texte */
dx = (espacement * nbchar) / 2;
@ -360,9 +369,9 @@ void PlotGraphicText( int format_plot, const wxPoint& Pos, int gcolor,
ux0 = uy0 = 0; /* Decalage du centre du texte / ccord de ref */
if( (orient == 0) || (orient == 1800) ) /* Texte Horizontal */
if( (aOrient == 0) || (aOrient == 1800) ) /* Texte Horizontal */
{
switch( h_justify )
switch( aH_justify )
{
case GR_TEXT_HJUSTIFY_CENTER:
break;
@ -376,7 +385,7 @@ void PlotGraphicText( int format_plot, const wxPoint& Pos, int gcolor,
break;
}
switch( v_justify )
switch( aV_justify )
{
case GR_TEXT_VJUSTIFY_CENTER:
break;
@ -392,7 +401,7 @@ void PlotGraphicText( int format_plot, const wxPoint& Pos, int gcolor,
}
else /* Texte Vertical */
{
switch( h_justify )
switch( aH_justify )
{
case GR_TEXT_HJUSTIFY_CENTER:
break;
@ -406,7 +415,7 @@ void PlotGraphicText( int format_plot, const wxPoint& Pos, int gcolor,
break;
}
switch( v_justify )
switch( aV_justify )
{
case GR_TEXT_VJUSTIFY_CENTER:
break;
@ -432,13 +441,13 @@ void PlotGraphicText( int format_plot, const wxPoint& Pos, int gcolor,
while( kk++ < nbchar )
{
#if defined(wxUSE_UNICODE) && defined(KICAD_CYRILLIC)
AsciiCode = Text.GetChar(ptr) & 0x7FF;
AsciiCode = aText.GetChar(ptr) & 0x7FF;
if ( AsciiCode > 0x40F && AsciiCode < 0x450 ) // big small Cyr
AsciiCode = utf8_to_ascii[AsciiCode - 0x410] & 0xFF;
else
AsciiCode = AsciiCode & 0xFF;
#else
AsciiCode = Text.GetChar( ptr ) & 0xFF;
AsciiCode = aText.GetChar( ptr ) & 0xFF;
#endif
ptcar = graphic_fonte_shape[AsciiCode]; /* ptcar pointe la description
* du caractere a dessiner */
@ -469,7 +478,7 @@ void PlotGraphicText( int format_plot, const wxPoint& Pos, int gcolor,
dx = k2 + ox;
dy = k1 + oy;
RotatePoint( &dx, &dy, orient );
RotatePoint( &dx, &dy, aOrient );
FctPlume( wxPoint( cX + dx, cY + dy ), plume );
x0 = k2;

View File

@ -26,7 +26,8 @@ void WinEDA_DrawFrame::TraceWorkSheet( wxDC* DC, BASE_SCREEN* screen, int line_w
Ki_PageDescr* Sheet = screen->m_CurrentSheetDesc;
int ii, jj, xg, yg, ipas, gxpas, gypas;
wxPoint pos;
int refx, refy, Color;
int refx, refy;
EDA_Colors Color;
wxString Line;
Ki_WorkSheetData* WsItem;
int scale = m_InternalUnits / 1000;
@ -240,8 +241,8 @@ void WinEDA_DrawFrame::TraceWorkSheet( wxDC* DC, BASE_SCREEN* screen, int line_w
break;
case WS_UPPER_SEGMENT:
case WS_LEFT_SEGMENT:
WS_MostUpperLine.m_Posy =
WS_MostUpperLine.m_Endy =
WS_MostUpperLine.m_Posy =
WS_MostUpperLine.m_Endy =
WS_MostLeftLine.m_Posy = STAMP_OY;
pos.y = (refy - WsItem->m_Posy)* scale;
case WS_SEGMENT:

View File

@ -16,7 +16,6 @@ set(CVPCB_SRCS
dialog_display_options.cpp
displayframe.cpp
genequiv.cpp
# genorcad.cpp
init.cpp
listboxes.cpp
listlib.cpp
@ -41,6 +40,7 @@ set(CVPCB_EXTRA_SRCS
../pcbnew/class_mire.cpp
../pcbnew/class_module.cpp
../pcbnew/class_pad.cpp
../pcbnew/class_pad_draw_functions.cpp
../pcbnew/class_pcb_text.cpp
../pcbnew/class_text_mod.cpp
../pcbnew/class_track.cpp

View File

@ -46,6 +46,7 @@ OBJECTS = $(TARGET).o \
class_board.o \
class_module.o \
class_pad.o \
class_pad_draw_functions.o\
class_text_mod.o \
class_edge_mod.o \
class_equipot.o \
@ -104,6 +105,9 @@ class_track.o: ../pcbnew/class_track.cpp
class_pad.o: ../pcbnew/class_pad.cpp
$(CXX) -c $(EDACPPFLAGS) -o $@ ../pcbnew/$*.cpp
class_pad_draw_functions.o: ../pcbnew/class_pad_draw_functions.cpp
$(CXX) -c $(EDACPPFLAGS) -o $@ ../pcbnew/$*.cpp
class_module.o: ../pcbnew/class_module.cpp
$(CXX) -c $(EDACPPFLAGS) -o $@ ../pcbnew/$*.cpp

View File

@ -316,7 +316,7 @@ void DrawSheetStruct::Draw( WinEDA_DrawPanel* panel, wxDC* DC,
Text = wxT( "Sheet: " ) + m_SheetName;
DrawGraphicText( panel, DC,
wxPoint( pos.x, pos.y - 8 ), txtcolor,
wxPoint( pos.x, pos.y - 8 ), (EDA_Colors) txtcolor,
Text, TEXT_ORIENT_HORIZ, wxSize( m_SheetNameSize, m_SheetNameSize ),
GR_TEXT_HJUSTIFY_LEFT, GR_TEXT_VJUSTIFY_BOTTOM, LineWidth );
@ -328,7 +328,7 @@ void DrawSheetStruct::Draw( WinEDA_DrawPanel* panel, wxDC* DC,
Text = wxT( "File: " ) + m_FileName;
DrawGraphicText( panel, DC,
wxPoint( pos.x, pos.y + m_Size.y + 4 ),
txtcolor,
(EDA_Colors) txtcolor,
Text, TEXT_ORIENT_HORIZ, wxSize( m_FileNameSize, m_FileNameSize ),
GR_TEXT_HJUSTIFY_LEFT, GR_TEXT_VJUSTIFY_TOP, LineWidth );

View File

@ -72,14 +72,15 @@ void Hierarchical_PIN_Sheet_Struct::Draw( WinEDA_DrawPanel* panel, wxDC* DC, con
/********************************************************************************************/
/* Routine de dessin des Labels type hierarchie */
{
int side, txtcolor;
int side;
EDA_Colors txtcolor;
int posx, tposx, posy, size2;
wxSize size;
int NbSegm, coord[20];
int LineWidth = g_DrawMinimunLineWidth;
if( Color >= 0 )
txtcolor = Color;
txtcolor = (EDA_Colors)Color;
else
txtcolor = ReturnLayerColor( m_Layer );
GRSetDrawMode( DC, DrawMode );

View File

@ -244,7 +244,7 @@ void LibDrawPin::DrawPinTexts( WinEDA_DrawPanel* panel,
wxString PinText;
int PinTextBarPos[256];
int PinTextBarCount;
int NameColor, NumColor;
EDA_Colors NameColor, NumColor;
int PinTxtLen;
wxSize PinNameSize( m_PinNameSize, m_PinNameSize );
@ -257,8 +257,8 @@ void LibDrawPin::DrawPinTexts( WinEDA_DrawPanel* panel,
/* Get the num and name colors */
if( (Color < 0) && (m_Selected & IS_SELECTED) )
Color = g_ItemSelectetColor;
NameColor = Color == -1 ? ReturnLayerColor( LAYER_PINNAM ) : Color;
NumColor = Color == -1 ? ReturnLayerColor( LAYER_PINNUM ) : Color;
NameColor = (EDA_Colors) (Color == -1 ? ReturnLayerColor( LAYER_PINNAM ) : Color);
NumColor = (EDA_Colors) (Color == -1 ? ReturnLayerColor( LAYER_PINNUM ) : Color);
/* Create the pin num string */
ReturnPinStringNum( StringPinNum );
@ -563,7 +563,7 @@ void LibDrawPin::PlotPinTexts( wxPoint& pin_pos,
wxString PinText;
int PinTextBarPos[256];
int PinTextBarCount;
int NameColor, NumColor;
EDA_Colors NameColor, NumColor;
int PinTxtLen = 0;
wxSize PinNameSize = wxSize( m_PinNameSize, m_PinNameSize );
wxSize PinNumSize = wxSize( m_PinNumSize, m_PinNumSize );
@ -571,8 +571,8 @@ void LibDrawPin::PlotPinTexts( wxPoint& pin_pos,
&& g_PlotPSColorOpt;
/* Get the num and name colors */
NameColor = plot_color ? ReturnLayerColor( LAYER_PINNAM ) : -1;
NumColor = plot_color ? ReturnLayerColor( LAYER_PINNUM ) : -1;
NameColor = (EDA_Colors) (plot_color ? ReturnLayerColor( LAYER_PINNAM ) : -1);
NumColor = (EDA_Colors) (plot_color ? ReturnLayerColor( LAYER_PINNUM ) : -1);
/* Create the pin num string */
ReturnPinStringNum( StringPinNum );

View File

@ -123,11 +123,11 @@ void SCH_TEXT::Draw( WinEDA_DrawPanel* panel, wxDC* DC, const wxPoint& offset,
/* Texts type Comment (text on layer "NOTE") have 4 directions, and the Text origin is the first letter
*/
{
int color;
EDA_Colors color;
int width = MAX( m_Width, g_DrawMinimunLineWidth );
if( Color >= 0 )
color = Color;
color = (EDA_Colors)Color;
else
color = ReturnLayerColor( m_Layer );
GRSetDrawMode( DC, DrawMode );
@ -331,13 +331,14 @@ void SCH_HIERLABEL::Draw( WinEDA_DrawPanel* panel, wxDC* DC, const wxPoint& offs
*/
{
int Poly[40];
int ii, color;
int ii;
EDA_Colors color;
wxPoint AnchorPos = m_Pos + offset;;
int width = MAX( m_Width, g_DrawMinimunLineWidth );
if( Color >= 0 )
color = Color;
color = (EDA_Colors)Color;
else
color = ReturnLayerColor( m_Layer );
@ -464,13 +465,15 @@ void SCH_GLOBALLABEL::Draw( WinEDA_DrawPanel* panel, wxDC* DC, const wxPoint& dr
*/
{
int Poly[20];
int offset, color, HalfSize;
int offset;
EDA_Colors color;
int HalfSize;
wxPoint AnchorPos = m_Pos + draw_offset;;
int width = MAX( m_Width, g_DrawMinimunLineWidth );
if( Color >= 0 )
color = Color;
color = (EDA_Colors)Color;
else
color = ReturnLayerColor( m_Layer );

View File

@ -161,7 +161,7 @@ void LibDrawText::Draw( WinEDA_DrawPanel* aPanel, wxDC* aDC, const wxPoint& aOff
* transformation matrix causes xy axes to be flipped. */
int t1 = (aTransformMatrix[0][0] != 0) ^ (m_Horiz != 0);
DrawGraphicText( aPanel, aDC, pos1, color, m_Text,
DrawGraphicText( aPanel, aDC, pos1, (EDA_Colors) color, m_Text,
t1 ? TEXT_ORIENT_HORIZ : TEXT_ORIENT_VERT,
m_Size,
GR_TEXT_HJUSTIFY_CENTER, GR_TEXT_VJUSTIFY_CENTER, linewidth );
@ -337,7 +337,7 @@ void LibDrawField::Draw( WinEDA_DrawPanel* aPanel, wxDC* aDC, const wxPoint& aOf
wxString* text = aData ? (wxString*) aData : &m_Text;
GRSetDrawMode( aDC, aDrawMode );
DrawGraphicText( aPanel, aDC, text_pos,
color, text->GetData(),
(EDA_Colors) color, text->GetData(),
m_Orient ? TEXT_ORIENT_VERT : TEXT_ORIENT_HORIZ,
m_Size,
m_HJustify, m_VJustify, linewidth );

View File

@ -418,12 +418,12 @@ void SeedLayers()
}
/*******************************/
int ReturnLayerColor( int Layer )
/*******************************/
/***************************************/
EDA_Colors ReturnLayerColor( int Layer )
/****************************************/
{
if( g_LayerDescr.Flags == 0 )
return g_LayerDescr.LayerColor[Layer];
return (EDA_Colors) g_LayerDescr.LayerColor[Layer];
else
return g_LayerDescr.CommonColor;
return (EDA_Colors) g_LayerDescr.CommonColor;
}

View File

@ -249,8 +249,8 @@ void SCH_CMP_FIELD::Draw( WinEDA_DrawPanel* panel,
* DrawMode: mode de trace
*/
{
int orient, color;
int orient;
EDA_Colors color;
wxPoint pos; /* Position des textes */
SCH_COMPONENT* DrawLibItem = (SCH_COMPONENT*) m_Parent;
int hjustify, vjustify;
@ -304,7 +304,7 @@ void SCH_CMP_FIELD::Draw( WinEDA_DrawPanel* panel,
if( !m_AddExtraText || (m_FieldId != REFERENCE) )
{
DrawGraphicText( panel, DC, pos, color, m_Text.GetData(),
DrawGraphicText( panel, DC, pos, color, m_Text,
orient ? TEXT_ORIENT_VERT : TEXT_ORIENT_HORIZ,
m_Size,
hjustify, vjustify, LineWidth );

View File

@ -131,7 +131,7 @@ static void ShowMoveField( WinEDA_DrawPanel* panel, wxDC* DC, bool erase )
void WinEDA_LibeditFrame::PlaceField( wxDC* DC, LibDrawField* Field )
/*******************************************************************/
{
int color;
EDA_Colors color;
if( Field == NULL )
return;
@ -183,7 +183,7 @@ void WinEDA_LibeditFrame::EditField( wxDC* DC, LibDrawField* Field )
{
wxString Text;
wxString title;
int color;
EDA_Colors color;
int LineWidth = MAX( Field->m_Width, g_DrawMinimunLineWidth );
if( Field == NULL )
@ -253,7 +253,7 @@ void WinEDA_LibeditFrame::RotateField( wxDC* DC, LibDrawField* Field )
* sinon Modif du champ pointe par la souris
*/
{
int color;
EDA_Colors color;
if( Field == NULL )
return;

View File

@ -183,7 +183,7 @@ void PlotLibPart( SCH_COMPONENT* DrawLibItem )
LibEDA_BaseStruct* DEntry;
EDA_LibComponentStruct* Entry;
int TransMat[2][2], Multi, convert;
int CharColor = -1;
EDA_Colors CharColor = UNSPECIFIED_COLOR;
wxPoint pos;
bool draw_bgfill = false;
@ -377,7 +377,8 @@ static void PlotTextField( SCH_COMPONENT* DrawLibItem,
wxPoint textpos; /* Position des textes */
SCH_CMP_FIELD* field = DrawLibItem->GetField( FieldNumber );
int hjustify, vjustify;
int orient, color = -1;
int orient;
EDA_Colors color = UNSPECIFIED_COLOR;
if( (g_PlotFormat == PLOT_FORMAT_POST) && g_PlotPSColorOpt )
color = ReturnLayerColor( field->GetLayer() );
@ -454,7 +455,7 @@ static void PlotPinSymbol( const wxPoint & pos, int len, int orient, int Shape )
*/
{
int MapX1, MapY1, x1, y1;
int color;
EDA_Colors color = UNSPECIFIED_COLOR;
color = ReturnLayerColor( LAYER_PIN );
@ -567,7 +568,7 @@ void PlotTextStruct( EDA_BaseStruct* Struct )
int pX, pY, Shape = 0, Orient = 0, offset;
wxSize Size;
wxString Text;
int color = -1;
EDA_Colors color = UNSPECIFIED_COLOR;
switch( Struct->Type() )
{
@ -680,12 +681,13 @@ void PlotTextStruct( EDA_BaseStruct* Struct )
}
/***********************************************************/
/***********************************************************************/
static void PlotSheetLabelStruct( Hierarchical_PIN_Sheet_Struct* Struct )
/***********************************************************/
/***********************************************************************/
/* Routine de dessin des Sheet Labels type hierarchie */
{
int side, txtcolor = -1;
int side;
EDA_Colors txtcolor = UNSPECIFIED_COLOR;
int posx, tposx, posy, size, size2;
int coord[16];
@ -760,7 +762,7 @@ void PlotSheetStruct( DrawSheetStruct* Struct )
/* Routine de dessin du bloc type hierarchie */
{
Hierarchical_PIN_Sheet_Struct* SheetLabelStruct;
int txtcolor = -1;
EDA_Colors txtcolor = UNSPECIFIED_COLOR;
wxSize size;
wxString Text;
wxPoint pos;

View File

@ -197,7 +197,7 @@ void RedrawOneStruct(WinEDA_DrawPanel * panel, wxDC * DC, SCH_ITEM *Struct, int
/* EELAYER.CPP */
/**************/
void SeedLayers();
int ReturnLayerColor(int Layer);
EDA_Colors ReturnLayerColor(int Layer);
void DisplayColorSetupFrame(WinEDA_DrawFrame * parent, const wxPoint & pos);
/*************/

View File

@ -21,7 +21,7 @@ void Draw_Track_Buffer( WinEDA_DrawPanel* panel, wxDC* DC, BOARD* Pcb, int draw_
int printmasklayer )
/***************************************************************************************************/
/* Function to draw the tracks (i.e Sports or lines) in gerbview
/* Function to draw the tracks (i.e Spots or lines) in gerbview
* Polygons are not handled here (there are in Pcb->m_Zone)
* @param DC = device context to draw
* @param Pcb = Board to draw (only Pcb->m_Track is used)
@ -266,7 +266,7 @@ void Affiche_DCodes_Pistes( WinEDA_DrawPanel* panel, wxDC* DC, BOARD* Pcb, int d
}
DrawGraphicText( panel, DC,
pos, g_DCodesColor, Line,
pos, (EDA_Colors) g_DCodesColor, Line,
orient, wxSize( width, width ),
GR_TEXT_HJUSTIFY_CENTER, GR_TEXT_VJUSTIFY_CENTER );
}

View File

@ -9,7 +9,7 @@ COMMON_GLOBL wxString g_BuildVersion
# include "config.h"
(wxT(KICAD_SVN_VERSION))
# else
(wxT("(20081124-unstable)")) /* main program version */
(wxT("(20081214-unstable)")) /* main program version */
# endif
#endif
;
@ -20,7 +20,7 @@ COMMON_GLOBL wxString g_BuildAboutVersion
# include "config.h"
(wxT(KICAD_ABOUT_VERSION))
# else
(wxT("(20081124-unstable)")) /* svn date & rev (normally overridden) */
(wxT("(20081214-unstable)")) /* svn date & rev (normally overridden) */
# endif
#endif
;

View File

@ -46,6 +46,7 @@ static inline int GetAlpha( int aColor )
enum EDA_Colors
{
UNSPECIFIED_COLOR = -1,
BLACK = 0,
BLUE,
GREEN,

View File

@ -427,14 +427,37 @@ double round( double aNumber );
/**************/
/* DRAWTXT.CPP */
/**************/
void DrawGraphicText( WinEDA_DrawPanel* panel, wxDC* DC, const wxPoint& pos,
int mode_color, const wxString& Text,
int orient, const wxSize& char_size,
int h_justify, int v_justify, int width = 0 );
/** Function DrawGraphicText
* Draw a graphic text (like module texts)
* @param aPanel = the current DrawPanel
* @param aPos = text position (according to h_justify, v_justify)
* @param aColor (enum EDA_Colors) = text color
* @param aText = text to draw
* @param aOrient = angle in 0.1 degree
* @param aSize = text size (size.x or size.y can be < 0 for mirrored texts)
* @param aH_justify = horizontal justification (Left, center, right)
* @param aV_justify = vertical justification (bottom, center, top)
* @param aWidth = line width (pen width) (default = 0)
* if width < 0 : draw segments in sketch mode, width = abs(width)
*/
void DrawGraphicText( WinEDA_DrawPanel* aPanel, wxDC* aDC,
const wxPoint& aPos, enum EDA_Colors aColor, const wxString& aText,
int aOrient, const wxSize& aSize, int aH_justify, int aV_justify, int aWidth = 0);
void PlotGraphicText( int format_plot, const wxPoint& Pos, int gcolor,
const wxString& Text,
int orient, const wxSize& Size, int h_justify, int v_justify );
/** Function PlotGraphicText
* same as DrawGraphicText, but plot graphic text insteed of draw it
* @param aFormat_plot = plot format (PLOT_FORMAT_POST, PLOT_FORMAT_HPGL, PLOT_FORMAT_GERBER)
* @param aPos = text position (according to aH_justify, aV_justify)
* @param aColor (enum EDA_Colors) = text color
* @param aText = text to draw
* @param aOrient = angle in 0.1 degree
* @param aSize = text size (size.x or size.y can be < 0 for mirrored texts)
* @param aH_justify = horizontal justification (Left, center, right)
* @param aV_justify = vertical justification (bottom, center, top)
*/
void PlotGraphicText( int aFormat_plot, const wxPoint& aPos, enum EDA_Colors aColor,
const wxString& aText,
int aOrient, const wxSize& aSize, int aH_justify, int aV_justify );
/***************/
/* CONFIRM.CPP */

Binary file not shown.

View File

@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: kicad\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2008-12-11 17:20+0100\n"
"PO-Revision-Date: 2008-12-11 18:52+0100\n"
"POT-Creation-Date: 2008-12-12 22:29+0100\n"
"PO-Revision-Date: 2008-12-12 22:31+0100\n"
"Last-Translator: \n"
"Language-Team: kicad team <jean-pierre.charras@ujf-grenoble.fr>\n"
"MIME-Version: 1.0\n"
@ -24,7 +24,7 @@ msgstr ""
#: pcbnew/clean.cpp:180
msgid "Delete unconnected tracks:"
msgstr "Suppression Pistes non connectées"
msgstr "Suppression Pistes non connectées:"
#: pcbnew/clean.cpp:197
msgid "ViaDef"
@ -1618,34 +1618,26 @@ msgid "Enable Auto Delete old Track"
msgstr "Autoriser l'effacement automatique des pistes"
#: pcbnew/pcbframe.cpp:457
msgid "Do not Show Zones"
msgstr "Ne pas montrer Zones"
#: pcbnew/pcbframe.cpp:457
msgid "Show Zones"
msgstr "Montrer Zones"
#: pcbnew/pcbframe.cpp:463
msgid "Show Pads Sketch mode"
msgstr "Afficher pastilles en contour"
#: pcbnew/pcbframe.cpp:464
#: pcbnew/pcbframe.cpp:458
msgid "Show pads filled mode"
msgstr "Afficher pastilles en mode plein"
#: pcbnew/pcbframe.cpp:470
#: pcbnew/pcbframe.cpp:464
msgid "Show Tracks Sketch mode"
msgstr "Afficher pistes en contour"
#: pcbnew/pcbframe.cpp:471
#: pcbnew/pcbframe.cpp:465
msgid "Show Tracks filled mode"
msgstr "Afficher pistes en mode plein"
#: pcbnew/pcbframe.cpp:477
#: pcbnew/pcbframe.cpp:471
msgid "Normal Contrast Mode Display"
msgstr "Mode d'affichage Contraste normal"
#: pcbnew/pcbframe.cpp:478
#: pcbnew/pcbframe.cpp:472
msgid "Hight Contrast Mode Display"
msgstr "Mode d'affichage Haut Contraste"
@ -2457,15 +2449,27 @@ msgstr "Montrer le chevelu du module pendant déplacement"
msgid "Enable Auto Del Track"
msgstr "Autoriser l'effacement automatique des pistes"
#: pcbnew/tool_pcb.cpp:379
#: pcbnew/tool_pcb.cpp:374
msgid "Show filled areas in zones"
msgstr "Afficher les surfaces remplies dans les zones"
#: pcbnew/tool_pcb.cpp:377
msgid "Do not show filled areas in zones"
msgstr "Ne pas fficher les surfaces remplies dans les zones"
#: pcbnew/tool_pcb.cpp:380
msgid "Show outlines of filled areas only in zones"
msgstr "Afficher uniquement les contours des surfaces remplies dans les zones"
#: pcbnew/tool_pcb.cpp:385
msgid "Show Pads Sketch"
msgstr "Afficher pastilles en contour"
#: pcbnew/tool_pcb.cpp:383
#: pcbnew/tool_pcb.cpp:389
msgid "Show Tracks Sketch"
msgstr "Afficher Pistes en Contour"
#: pcbnew/tool_pcb.cpp:398
#: pcbnew/tool_pcb.cpp:404
msgid ""
"Display/remove auxiliary vertical toolbar (tools for micro wave applications)\n"
" This is a experimental feature (under development)"
@ -2473,79 +2477,79 @@ msgstr ""
"Affiche/supprime le toolbar vertical auxiliaire (outils pour applications micro-ondes)\n"
"C'est un outil expérimental (en cours de développement)"
#: pcbnew/tool_pcb.cpp:428
#: pcbnew/tool_pcb.cpp:434
msgid "Net highlight"
msgstr "Surbrillance des équipotentielles"
#: pcbnew/tool_pcb.cpp:433
#: pcbnew/tool_pcb.cpp:439
msgid "Display local ratsnest (pad or module)"
msgstr "Afficher le chevelu local (pastilles ou modules)"
#: pcbnew/tool_pcb.cpp:439
#: pcbnew/tool_pcb.cpp:445
msgid "Add modules"
msgstr "Addition de Modules"
#: pcbnew/tool_pcb.cpp:443
#: pcbnew/tool_pcb.cpp:449
msgid "Add tracks and vias"
msgstr "Ajouter pistes et vias"
#: pcbnew/tool_pcb.cpp:447
#: pcbnew/tool_pcb.cpp:453
msgid "Add zones"
msgstr "Addition de Zones"
#: pcbnew/tool_pcb.cpp:452
#: pcbnew/tool_pcb.cpp:458
msgid "Add graphic line or polygon"
msgstr "Addition de lignes ou polygones graphiques"
#: pcbnew/tool_pcb.cpp:456
#: pcbnew/tool_pcb.cpp:462
msgid "Add graphic circle"
msgstr "Addition de graphiques (Cercle)"
#: pcbnew/tool_pcb.cpp:460
#: pcbnew/tool_pcb.cpp:466
msgid "Add graphic arc"
msgstr "Addition de graphiques (Arc de Cercle)"
#: pcbnew/tool_pcb.cpp:464
#: pcbnew/tool_pcb.cpp:470
msgid "Add text"
msgstr "Ajout de Texte"
#: pcbnew/tool_pcb.cpp:469
#: pcbnew/tool_pcb.cpp:475
msgid "Add dimension"
msgstr "Ajout des cotes"
#: pcbnew/tool_pcb.cpp:473
#: pcbnew/tool_pcb.cpp:479
msgid "Add layer alignment target"
msgstr "Ajouter Mire de superposition"
#: pcbnew/tool_pcb.cpp:478
#: pcbnew/tool_pcb.cpp:484
msgid "Delete items"
msgstr "Suppression d'éléments"
#: pcbnew/tool_pcb.cpp:483
#: pcbnew/tool_pcb.cpp:489
msgid "Offset adjust for drill and place files"
msgstr "Ajuste offset pour fichier de perçage et placement"
#: pcbnew/tool_pcb.cpp:511
#: pcbnew/tool_pcb.cpp:517
msgid "Create line of specified length for microwave applications"
msgstr "Creation de lignes de longueur spécifiée (pour applications micro-ondes)"
#: pcbnew/tool_pcb.cpp:517
#: pcbnew/tool_pcb.cpp:523
msgid "Create gap of specified length for microwave applications"
msgstr "Creation de gaps de longueur spécifiée (pour applications micro-ondes)"
#: pcbnew/tool_pcb.cpp:525
#: pcbnew/tool_pcb.cpp:531
msgid "Create stub of specified length for microwave applications"
msgstr "Creation de stub de longueur spécifiée (pour applications micro-ondes)"
#: pcbnew/tool_pcb.cpp:531
#: pcbnew/tool_pcb.cpp:537
msgid "Create stub (arc) of specified length for microwave applications"
msgstr "Creation de stub (arc) de longueur spécifiée (pour applications micro-ondes)"
#: pcbnew/tool_pcb.cpp:538
#: pcbnew/tool_pcb.cpp:544
msgid "Create a polynomial shape for microwave applications"
msgstr "Creation de formes polynomiales (pour applications micro-ondes)"
#: pcbnew/tool_pcb.cpp:579
#: pcbnew/tool_pcb.cpp:585
msgid ""
"Auto track width: when starting on an existing track use its width\n"
"otherwise, use current width setting"
@ -2553,19 +2557,19 @@ msgstr ""
"Largeur de piste automatique: si on démarre sur une piste existante, utiliser sa largeur\n"
" sinon utiliser la largeur courante"
#: pcbnew/tool_pcb.cpp:604
#: pcbnew/tool_pcb.cpp:610
msgid "Auto"
msgstr "Auto"
#: pcbnew/tool_pcb.cpp:608
#: pcbnew/tool_pcb.cpp:614
msgid "Zoom "
msgstr "Zoom "
#: pcbnew/tool_pcb.cpp:643
#: pcbnew/tool_pcb.cpp:649
msgid "User Grid"
msgstr "Grille perso"
#: pcbnew/tool_pcb.cpp:759
#: pcbnew/tool_pcb.cpp:765
msgid "+/- to switch"
msgstr "+/- pour commuter"
@ -3392,7 +3396,7 @@ msgstr "Grille %.1f"
msgid "Grid %.3f"
msgstr "Grille %.3f"
#: pcbnew/dialog_copper_zones.cpp:288
#: pcbnew/dialog_copper_zones.cpp:285
msgid ""
"Error :\n"
"you must choose a copper min thickness value bigger than 0.001 inch or 0.00254 mm)"
@ -3400,7 +3404,7 @@ msgstr ""
"Erreur :\n"
"vous devez choisir une valeur pour l'épaisseur de cuivre dans les freins thermiques plus grande que 0,001 pouce (ou 0,00254 mm)"
#: pcbnew/dialog_copper_zones.cpp:313
#: pcbnew/dialog_copper_zones.cpp:308
msgid ""
"Error :\n"
"you must choose a copper bridge value for thermal reliefs bigger than the min zone thickness"
@ -3408,11 +3412,11 @@ msgstr ""
"Erreur :\n"
"vous devez choisir une valeur pour l'épaisseur de cuivre dans les freins thermiques plus grande que l'épaisseur de cuivre minimum des zones"
#: pcbnew/dialog_copper_zones.cpp:325
#: pcbnew/dialog_copper_zones.cpp:320
msgid "Error : you must choose a layer"
msgstr "Erreur. Vous devez choisir une couche"
#: pcbnew/dialog_copper_zones.cpp:337
#: pcbnew/dialog_copper_zones.cpp:332
msgid "Error : you must choose a net name"
msgstr "Erreur. Vous devez choisir une équipotentielle"
@ -4072,7 +4076,7 @@ msgid "Pen Number"
msgstr "Numéro de plume"
#: pcbnew/dialog_gendrill.cpp:239
#: pcbnew/dialog_general_options.cpp:376
#: pcbnew/dialog_general_options.cpp:385
msgid "Options:"
msgstr "Options :"
@ -4282,96 +4286,96 @@ msgstr "Larg. piste: %s Diam Vias : %s"
msgid "Drc error, cancelled"
msgstr "Erreur DRC, annulation"
#: pcbnew/dialog_general_options.cpp:288
#: pcbnew/dialog_general_options.cpp:297
msgid "No Display"
msgstr "Pas d'affichage"
#: pcbnew/dialog_general_options.cpp:291
#: pcbnew/dialog_general_options.cpp:300
msgid "Display Polar Coord"
msgstr "Affichage coord Polaires"
#: pcbnew/dialog_general_options.cpp:300
#: pcbnew/dialog_general_options.cpp:309
msgid "millimeters"
msgstr "millimètres"
#: pcbnew/dialog_general_options.cpp:302
#: pcbnew/dialog_general_options.cpp:311
msgid "Units"
msgstr "Unités"
#: pcbnew/dialog_general_options.cpp:309
#: pcbnew/dialog_general_options.cpp:318
msgid "Small"
msgstr "Petit"
#: pcbnew/dialog_general_options.cpp:310
#: pcbnew/dialog_general_options.cpp:319
msgid "Big"
msgstr "Grand"
#: pcbnew/dialog_general_options.cpp:312
#: pcbnew/dialog_general_options.cpp:321
msgid "Cursor"
msgstr "Curseur"
#: pcbnew/dialog_general_options.cpp:324
#: pcbnew/dialog_general_options.cpp:333
msgid "Number of Layers:"
msgstr "Nombre de Couches:"
#: pcbnew/dialog_general_options.cpp:340
#: pcbnew/dialog_general_options.cpp:349
msgid "Max Links:"
msgstr "Liens max:"
#: pcbnew/dialog_general_options.cpp:356
#: pcbnew/dialog_general_options.cpp:365
msgid "Auto Save (minuts):"
msgstr "Sauveg. Auto (min)"
#: pcbnew/dialog_general_options.cpp:385
#: pcbnew/dialog_general_options.cpp:394
msgid "Drc ON"
msgstr "Drc ACTIVE"
#: pcbnew/dialog_general_options.cpp:394
#: pcbnew/dialog_general_options.cpp:403
msgid "Show Ratsnest"
msgstr "Montrer le chevelu général"
#: pcbnew/dialog_general_options.cpp:401
#: pcbnew/dialog_general_options.cpp:410
msgid "Show Mod Ratsnest"
msgstr "Montrer le chevelu du module"
#: pcbnew/dialog_general_options.cpp:408
#: pcbnew/dialog_general_options.cpp:417
msgid "Tracks Auto Del"
msgstr "Auto Supp. Pistes"
#: pcbnew/dialog_general_options.cpp:415
#: pcbnew/dialog_general_options.cpp:424
msgid "Track only 45 degrees"
msgstr "Piste à 45° seulement"
#: pcbnew/dialog_general_options.cpp:422
#: pcbnew/dialog_general_options.cpp:431
msgid "Segments 45 Only"
msgstr "Segments 45 seulement"
#: pcbnew/dialog_general_options.cpp:429
#: pcbnew/dialog_general_options.cpp:438
msgid "Auto PAN"
msgstr "Auto PAN"
#: pcbnew/dialog_general_options.cpp:437
#: pcbnew/dialog_general_options.cpp:446
msgid "Double Segm Track"
msgstr "2 segments pour piste"
#: pcbnew/dialog_general_options.cpp:450
#: pcbnew/dialog_general_options.cpp:465
#: pcbnew/dialog_general_options.cpp:459
#: pcbnew/dialog_general_options.cpp:474
msgid "When creating tracks"
msgstr "En creation de pistes"
#: pcbnew/dialog_general_options.cpp:453
#: pcbnew/dialog_general_options.cpp:462
msgid "Magnetic Pads"
msgstr " Pads magnétiques"
#: pcbnew/dialog_general_options.cpp:460
#: pcbnew/dialog_general_options.cpp:469
msgid "control the capture of the pcb cursor when the mouse cursor enters a pad area"
msgstr "Contrôle la capture du curseur pcb quand le curseuir souris est sur un pad"
#: pcbnew/dialog_general_options.cpp:468
#: pcbnew/dialog_general_options.cpp:477
msgid "Magnetic Tracks"
msgstr "Pistes Magnétiques"
#: pcbnew/dialog_general_options.cpp:475
#: pcbnew/dialog_general_options.cpp:484
msgid "control the capture of the pcb cursor when the mouse cursor enters a track"
msgstr "Contrôle la capture du curseur pcb quand le curseuir souris est sur une piste"
@ -4533,60 +4537,48 @@ msgid "Others Options:"
msgstr "Autres Options:"
#: pcbnew/dialog_copper_zones_base.cpp:118
msgid "Show filled areas in sketch mode"
msgstr "Afficher les surfaces remplies en mode contour"
#: pcbnew/dialog_copper_zones_base.cpp:120
msgid ""
"If enabled, filled areas in is this zone will be displayed as non filled polygons.\n"
"If disabled, filled areas in is this zone will be displayed as \"solid\" areas (normal mode)."
msgstr ""
"Si activé, les surfaces remplies dans cette zone seront affichées comme des polygones non remplis.\n"
"Si désactivé, les surfaces remplies dans cette zone seront affichées comme des surfaces \"solides\"."
#: pcbnew/dialog_copper_zones_base.cpp:124
msgid "Zone clearance value"
msgstr "Valeur isolation zone"
#: pcbnew/dialog_copper_zones_base.cpp:131
#: pcbnew/dialog_copper_zones_base.cpp:125
msgid "Zone min thickness value"
msgstr "Valeur épaisseur min pour zone"
#: pcbnew/dialog_copper_zones_base.cpp:136
#: pcbnew/dialog_copper_zones_base.cpp:130
msgid "Value of minimun thickness of filled areas"
msgstr "Valeur de l'épaisseur minimum des zones remplies"
#: pcbnew/dialog_copper_zones_base.cpp:156
#: pcbnew/dialog_copper_zones_base.cpp:150
msgid "Export Setup to others zones"
msgstr "Exporter options vers autres zones"
#: pcbnew/dialog_copper_zones_base.cpp:157
#: pcbnew/dialog_copper_zones_base.cpp:152
msgid "Export this zone setup to all others copper zones"
msgstr "Exporter ces options vers les autres zones de cuivre"
#: pcbnew/dialog_copper_zones_base.cpp:161
#: pcbnew/dialog_copper_zones_base.cpp:156
#: pcbnew/dialog_pad_properties_base.cpp:91
#: pcbnew/zone_filling_deprecated_algorithm.cpp:310
msgid "Ok"
msgstr "Ok"
#: pcbnew/dialog_copper_zones_base.cpp:172
#: pcbnew/dialog_copper_zones_base.cpp:171
msgid "Nets Display Options:"
msgstr "Options d'Affichage des Nets"
#: pcbnew/dialog_copper_zones_base.cpp:174
#: pcbnew/dialog_copper_zones_base.cpp:173
msgid "Alphabetic"
msgstr "Alphabetique"
#: pcbnew/dialog_copper_zones_base.cpp:174
#: pcbnew/dialog_copper_zones_base.cpp:173
msgid "Advanced"
msgstr "Avancé"
#: pcbnew/dialog_copper_zones_base.cpp:176
#: pcbnew/dialog_copper_zones_base.cpp:175
msgid "Net sorting:"
msgstr "Tri des Equipotentielles:"
#: pcbnew/dialog_copper_zones_base.cpp:178
#: pcbnew/dialog_copper_zones_base.cpp:177
msgid ""
"Nets can be sorted:\n"
"By alphabetic order\n"
@ -4596,11 +4588,11 @@ msgstr ""
"Paur ordre alphabétique\n"
"Par nombre de pads dans les équipotentielles (avancé)"
#: pcbnew/dialog_copper_zones_base.cpp:182
#: pcbnew/dialog_copper_zones_base.cpp:181
msgid "Filter"
msgstr "Filtre"
#: pcbnew/dialog_copper_zones_base.cpp:187
#: pcbnew/dialog_copper_zones_base.cpp:186
msgid ""
"Pattern in advanced mode, to filter net names in list\n"
"Net names matching this pattern are not displayed"
@ -6402,11 +6394,11 @@ msgstr "Ajout Composant"
msgid "Add Wire"
msgstr "Ajouter Fils"
#: eeschema/libarch.cpp:66
#: eeschema/libarch.cpp:68
msgid "Failed to create archive lib file "
msgstr "Impossible de créer le fichier librairie archive "
#: eeschema/libarch.cpp:73
#: eeschema/libarch.cpp:75
msgid "Failed to create doc lib file "
msgstr "Impossible de créer le fichier lib document"
@ -6511,7 +6503,7 @@ msgstr "Oriente Composant"
msgid "Footprint "
msgstr "Empreinte: "
#: eeschema/onrightclick.cpp:322
#: eeschema/onrightclick.cpp:323
#, c-format
msgid "Unit %d %c"
msgstr "Unité %d %c"
@ -10426,15 +10418,15 @@ msgstr "Texte Module invisible"
msgid "Anchors"
msgstr "Ancres"
#: pcbnew/set_color.h:432
#: pcbnew/set_color.h:423
msgid "Show Noconnect"
msgstr "Montrer Non Conn"
#: pcbnew/set_color.h:441
#: pcbnew/set_color.h:432
msgid "Show Modules Cmp"
msgstr "Afficher Modules Cmp"
#: pcbnew/set_color.h:450
#: pcbnew/set_color.h:441
msgid "Show Modules Cu"
msgstr "Afficher Modules Cu"
@ -10474,7 +10466,7 @@ msgstr "Type Err(%d): <b>%s</b><ul><li> %s: %s </li><li> %s: %s </li></ul>"
msgid "ErrType(%d): <b>%s</b><ul><li> %s: %s </li></ul>"
msgstr "ErrType(%d): <b>%s</b><ul><li> %s: %s </li></ul>"
#: pcbnew/dialog_copper_zones_base.h:101
#: pcbnew/dialog_copper_zones_base.h:99
msgid "Fill Zones Options"
msgstr "Options de Remplissage de Zone"
@ -10798,6 +10790,20 @@ msgstr "Imprimer"
msgid "Create SVG file"
msgstr "Créer Fichier SVG"
#~ msgid "Do not Show Zones"
#~ msgstr "Ne pas montrer Zones"
#~ msgid "Show Zones"
#~ msgstr "Montrer Zones"
#~ msgid ""
#~ "If enabled, filled areas in is this zone will be displayed as non filled "
#~ "polygons.\n"
#~ "If disabled, filled areas in is this zone will be displayed as \"solid\" "
#~ "areas (normal mode)."
#~ msgstr ""
#~ "Si activé, les surfaces remplies dans cette zone seront affichées comme "
#~ "des polygones non remplis.\n"
#~ "Si désactivé, les surfaces remplies dans cette zone seront affichées "
#~ "comme des surfaces \"solides\"."
#~ msgid "grid user"
#~ msgstr "grille user"

View File

@ -28,6 +28,7 @@ set(PCBNEW_SRCS
class_mire.cpp
class_module.cpp
class_pad.cpp
class_pad_draw_functions.cpp
classpcb.cpp
class_pcb_text.cpp
class_text_mod.cpp

View File

@ -32,7 +32,7 @@ void Affiche_Infos_Equipot( int netcode, WinEDA_BasePcbFrame* frame )
equipot = frame->m_Pcb->FindNet( netcode );
if( equipot )
Affiche_1_Parametre( frame, 1, _( "Net Name" ), equipot->m_Netname, RED );
Affiche_1_Parametre( frame, 1, _( "Net Name" ), equipot->GetNetname(), RED );
else
Affiche_1_Parametre( frame, 1, _( "No Net (not connected)" ), wxEmptyString, RED );

Some files were not shown because too many files have changed in this diff Show More