Skip to content

K
kicad-source-mirror
Commit a04588db authored by charras's avatar charras
Browse files
Options

Changes in minimum pen size parameters used to draw or plot or print items. 

Now uses only an unique default pen size for plot/print and draw items (see changelog)
parent bc77f8ac
Show whitespace changes
Inline Side-by-side
Showing with 700 additions and 638 deletions
CHANGELOG.txt
View file @ a04588db
...@@ -4,6 +4,21 @@ KiCad ChangeLog 2009 ...@@ -4,6 +4,21 @@ KiCad ChangeLog 2009
Please add newer entries at the top, list the date and your name with Please add newer entries at the top, list the date and your name with
email address. email address.
2009-may-30 UPDATE Jean-Pierre Charras <jean-pierre.charras@gipsa-lab.inpg.fr>
================================================================================
++Eeschema:
Changes about thickness of lines in draw/plot functions.
Now there is only one thickness parameter for plot and print.
This is now the default thickness value,
used for items that have a line thickness = 0,
and NOT the minimum thickness.
reasons:
- Obviously, differents parameters to draw and plot and bad.
(what you plot is NOT what you see)
- small texts are not readable with an minimum thickness value
that could be good for others items.
2009-may-30 UPDATE Jean-Pierre Charras <jean-pierre.charras@gipsa-lab.inpg.fr> 2009-may-30 UPDATE Jean-Pierre Charras <jean-pierre.charras@gipsa-lab.inpg.fr>
================================================================================ ================================================================================
++All: ++All:
......
common/about_kicad.cpp
View file @ a04588db
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
#include "appl_wxstruct.h" #include "appl_wxstruct.h"
#define BUILD_VERSION wxT("(20090525-unstable)") #define BUILD_VERSION wxT("(20090602-unstable)")
wxString g_BuildVersion wxString g_BuildVersion
......
common/common_plot_functions.cpp
View file @ a04588db
...@@ -236,8 +236,10 @@ void WinEDA_DrawFrame::PlotWorkSheet( int format_plot, BASE_SCREEN* screen ) ...@@ -236,8 +236,10 @@ void WinEDA_DrawFrame::PlotWorkSheet( int format_plot, BASE_SCREEN* screen )
gypas = ( yg - ref.y) / ipas; gypas = ( yg - ref.y) / ipas;
for( ii = ref.y + gypas, jj = 0; ipas > 0; ii += gypas, jj++, ipas-- ) for( ii = ref.y + gypas, jj = 0; ipas > 0; ii += gypas, jj++, ipas-- )
{ {
msg.Empty(); if( jj < 26 )
msg.Append('A' + jj); msg.Printf( wxT( "%c" ), jj + 'A' );
else // I hope 52 identifiers are enought...
msg.Printf( wxT( "%c" ), 'a' + jj - 26 );
if( ii < yg - PAS_REF / 2 ) if( ii < yg - PAS_REF / 2 )
{ {
pos.x = ref.x * conv_unit; pos.y = ii * conv_unit; pos.x = ref.x * conv_unit; pos.y = ii * conv_unit;
......
common/drawtxt.cpp
View file @ a04588db
...@@ -260,6 +260,11 @@ void DrawGraphicText( WinEDA_DrawPanel* aPanel, ...@@ -260,6 +260,11 @@ void DrawGraphicText( WinEDA_DrawPanel* aPanel,
aWidth = -aWidth; aWidth = -aWidth;
sketch_mode = true; sketch_mode = true;
} }
#ifdef CLIP_PEN // made by draw and plot functions
aWidth = Clamp_Text_PenSize( aWidth, aSize, aBold );
#endif
if( size_h < 0 ) // text is mirrored using size.x < 0 (mirror / Y axis) if( size_h < 0 ) // text is mirrored using size.x < 0 (mirror / Y axis)
italic_reverse = true; italic_reverse = true;
...@@ -555,6 +560,13 @@ void PlotGraphicText( int aFormat_plot, ...@@ -555,6 +560,13 @@ void PlotGraphicText( int aFormat_plot,
if( aWidth == 0 && aBold ) // Use default values if aWidth == 0 if( aWidth == 0 && aBold ) // Use default values if aWidth == 0
aWidth = GetPenSizeForBold( MIN( aSize.x, aSize.y ) ); aWidth = GetPenSizeForBold( MIN( aSize.x, aSize.y ) );
#ifdef CLIP_PEN // made by draw and plot functions
if ( aWidth >= 0 )
aWidth = Clamp_Text_PenSize( aWidth, aSize, aBold );
else
aWidth = - Clamp_Text_PenSize( -aWidth, aSize, aBold );
#endif
// Initialise the actual function used to plot lines: // Initialise the actual function used to plot lines:
switch( aFormat_plot ) switch( aFormat_plot )
{ {
......
common/worksheet.cpp
View file @ a04588db
...@@ -1070,10 +1070,9 @@ void WinEDA_DrawFrame::TraceWorkSheet( wxDC* DC, BASE_SCREEN* screen, int line_w ...@@ -1070,10 +1070,9 @@ void WinEDA_DrawFrame::TraceWorkSheet( wxDC* DC, BASE_SCREEN* screen, int line_w
gypas = ( yg - refy) / ipas; gypas = ( yg - refy) / ipas;
for( ii = refy + gypas, jj = 0; ipas > 0; ii += gypas, jj++, ipas-- ) for( ii = refy + gypas, jj = 0; ipas > 0; ii += gypas, jj++, ipas-- )
{ {
Line.Empty();
if( jj < 26 ) if( jj < 26 )
Line.Printf( wxT( "%c" ), jj + 'A' ); Line.Printf( wxT( "%c" ), jj + 'A' );
else else // I hope 52 identifiers are enought...
Line.Printf( wxT( "%c" ), 'a' + jj - 26 ); Line.Printf( wxT( "%c" ), 'a' + jj - 26 );
if( ii < yg - PAS_REF / 2 ) if( ii < yg - PAS_REF / 2 )
{ {
......
eeschema/class_drawsheet.cpp
View file @ a04588db
...@@ -305,7 +305,7 @@ void DrawSheetStruct::Draw( WinEDA_DrawPanel* aPanel, wxDC* aDC, ...@@ -305,7 +305,7 @@ void DrawSheetStruct::Draw( WinEDA_DrawPanel* aPanel, wxDC* aDC,
wxString Text; wxString Text;
int color; int color;
wxPoint pos = m_Pos + aOffset; wxPoint pos = m_Pos + aOffset;
int LineWidth = g_DrawMinimunLineWidth; int LineWidth = g_DrawDefaultLineThickness;
if( aColor >= 0 ) if( aColor >= 0 )
color = aColor; color = aColor;
......
eeschema/class_hierarchical_PIN_sheet.cpp
View file @ a04588db
...@@ -69,7 +69,7 @@ void Hierarchical_PIN_Sheet_Struct::Draw( WinEDA_DrawPanel* panel, wxDC* DC, con ...@@ -69,7 +69,7 @@ void Hierarchical_PIN_Sheet_Struct::Draw( WinEDA_DrawPanel* panel, wxDC* DC, con
static std::vector <wxPoint> Poly; static std::vector <wxPoint> Poly;
int LineWidth = g_DrawMinimunLineWidth; int LineWidth = g_DrawDefaultLineThickness;
if( Color >= 0 ) if( Color >= 0 )
txtcolor = (EDA_Colors) Color; txtcolor = (EDA_Colors) Color;
......
eeschema/class_libentry_fields.cpp
View file @ a04588db
...@@ -207,7 +207,9 @@ void LibDrawField::Draw( WinEDA_DrawPanel* aPanel, wxDC* aDC, ...@@ -207,7 +207,9 @@ void LibDrawField::Draw( WinEDA_DrawPanel* aPanel, wxDC* aDC,
wxPoint text_pos; wxPoint text_pos;
int color = aColor; int color = aColor;
int linewidth = MAX( m_Width, g_DrawMinimunLineWidth ); int linewidth = (m_Width == 0) ? g_DrawDefaultLineThickness : m_Width;
linewidth = Clamp_Text_PenSize( linewidth, m_Size, m_Bold );
if( aColor < 0 ) // Used normal color or selected color if( aColor < 0 ) // Used normal color or selected color
{ {
......
eeschema/class_pin.cpp
View file @ a04588db
...@@ -284,7 +284,7 @@ void LibDrawPin::DrawPinSymbol( WinEDA_DrawPanel* aPanel, ...@@ -284,7 +284,7 @@ void LibDrawPin::DrawPinSymbol( WinEDA_DrawPanel* aPanel,
{ {
int MapX1, MapY1, x1, y1; int MapX1, MapY1, x1, y1;
int color; int color;
int width = MAX( m_Width, g_DrawMinimunLineWidth ); int width = (m_Width == 0) ? g_DrawDefaultLineThickness : m_Width;
int posX = aPinPos.x, posY = aPinPos.y, len = m_PinLen; int posX = aPinPos.x, posY = aPinPos.y, len = m_PinLen;
BASE_SCREEN* screen = aPanel->GetScreen(); BASE_SCREEN* screen = aPanel->GetScreen();
...@@ -460,7 +460,10 @@ void LibDrawPin::DrawPinTexts( WinEDA_DrawPanel* panel, ...@@ -460,7 +460,10 @@ void LibDrawPin::DrawPinTexts( WinEDA_DrawPanel* panel,
wxSize PinNameSize( m_PinNameSize, m_PinNameSize ); wxSize PinNameSize( m_PinNameSize, m_PinNameSize );
wxSize PinNumSize( m_PinNumSize, m_PinNumSize ); wxSize PinNumSize( m_PinNumSize, m_PinNumSize );
int LineWidth = g_DrawMinimunLineWidth; int nameLineWidth = g_DrawDefaultLineThickness;
nameLineWidth = Clamp_Text_PenSize( nameLineWidth, m_PinNameSize, false );
int numLineWidth = g_DrawDefaultLineThickness;
numLineWidth = Clamp_Text_PenSize( numLineWidth, m_PinNumSize, false );
GRSetDrawMode( DC, DrawMode ); GRSetDrawMode( DC, DrawMode );
...@@ -508,7 +511,7 @@ void LibDrawPin::DrawPinTexts( WinEDA_DrawPanel* panel, ...@@ -508,7 +511,7 @@ void LibDrawPin::DrawPinTexts( WinEDA_DrawPanel* panel,
TEXT_ORIENT_HORIZ, TEXT_ORIENT_HORIZ,
PinNameSize, PinNameSize,
GR_TEXT_HJUSTIFY_LEFT, GR_TEXT_HJUSTIFY_LEFT,
GR_TEXT_VJUSTIFY_CENTER, LineWidth, GR_TEXT_VJUSTIFY_CENTER, nameLineWidth,
false, false ); false, false );
} }
else // Orient == PIN_LEFT else // Orient == PIN_LEFT
...@@ -519,7 +522,7 @@ void LibDrawPin::DrawPinTexts( WinEDA_DrawPanel* panel, ...@@ -519,7 +522,7 @@ void LibDrawPin::DrawPinTexts( WinEDA_DrawPanel* panel,
TEXT_ORIENT_HORIZ, TEXT_ORIENT_HORIZ,
PinNameSize, PinNameSize,
GR_TEXT_HJUSTIFY_RIGHT, GR_TEXT_HJUSTIFY_RIGHT,
GR_TEXT_VJUSTIFY_CENTER, LineWidth, GR_TEXT_VJUSTIFY_CENTER, nameLineWidth,
false, false ); false, false );
} }
} }
...@@ -532,7 +535,8 @@ void LibDrawPin::DrawPinTexts( WinEDA_DrawPanel* panel, ...@@ -532,7 +535,8 @@ void LibDrawPin::DrawPinTexts( WinEDA_DrawPanel* panel,
StringPinNum, StringPinNum,
TEXT_ORIENT_HORIZ, PinNumSize, TEXT_ORIENT_HORIZ, PinNumSize,
GR_TEXT_HJUSTIFY_CENTER, GR_TEXT_HJUSTIFY_CENTER,
GR_TEXT_VJUSTIFY_BOTTOM, LineWidth, false, false, false ); GR_TEXT_VJUSTIFY_BOTTOM, numLineWidth,
false, false );
} }
} }
else /* Its a vertical line. */ else /* Its a vertical line. */
...@@ -547,7 +551,7 @@ void LibDrawPin::DrawPinTexts( WinEDA_DrawPanel* panel, ...@@ -547,7 +551,7 @@ void LibDrawPin::DrawPinTexts( WinEDA_DrawPanel* panel,
m_PinName, m_PinName,
TEXT_ORIENT_VERT, PinNameSize, TEXT_ORIENT_VERT, PinNameSize,
GR_TEXT_HJUSTIFY_RIGHT, GR_TEXT_HJUSTIFY_RIGHT,
GR_TEXT_VJUSTIFY_CENTER, LineWidth, GR_TEXT_VJUSTIFY_CENTER, nameLineWidth,
false, false ); false, false );
if( DrawPinNum ) if( DrawPinNum )
DrawGraphicText( panel, DC, DrawGraphicText( panel, DC,
...@@ -556,7 +560,8 @@ void LibDrawPin::DrawPinTexts( WinEDA_DrawPanel* panel, ...@@ -556,7 +560,8 @@ void LibDrawPin::DrawPinTexts( WinEDA_DrawPanel* panel,
StringPinNum, StringPinNum,
TEXT_ORIENT_VERT, PinNumSize, TEXT_ORIENT_VERT, PinNumSize,
GR_TEXT_HJUSTIFY_CENTER, GR_TEXT_HJUSTIFY_CENTER,
GR_TEXT_VJUSTIFY_BOTTOM, LineWidth, false, false, false ); GR_TEXT_VJUSTIFY_BOTTOM, numLineWidth,
false, false);
} }
else /* PIN_UP */ else /* PIN_UP */
{ {
...@@ -567,7 +572,7 @@ void LibDrawPin::DrawPinTexts( WinEDA_DrawPanel* panel, ...@@ -567,7 +572,7 @@ void LibDrawPin::DrawPinTexts( WinEDA_DrawPanel* panel,
m_PinName, m_PinName,
TEXT_ORIENT_VERT, PinNameSize, TEXT_ORIENT_VERT, PinNameSize,
GR_TEXT_HJUSTIFY_LEFT, GR_TEXT_HJUSTIFY_LEFT,
GR_TEXT_VJUSTIFY_CENTER, LineWidth, GR_TEXT_VJUSTIFY_CENTER, nameLineWidth,
false, false ); false, false );
if( DrawPinNum ) if( DrawPinNum )
DrawGraphicText( panel, DC, DrawGraphicText( panel, DC,
...@@ -576,8 +581,8 @@ void LibDrawPin::DrawPinTexts( WinEDA_DrawPanel* panel, ...@@ -576,8 +581,8 @@ void LibDrawPin::DrawPinTexts( WinEDA_DrawPanel* panel,
StringPinNum, StringPinNum,
TEXT_ORIENT_VERT, PinNumSize, TEXT_ORIENT_VERT, PinNumSize,
GR_TEXT_HJUSTIFY_CENTER, GR_TEXT_HJUSTIFY_CENTER,
GR_TEXT_VJUSTIFY_BOTTOM, LineWidth, GR_TEXT_VJUSTIFY_BOTTOM, numLineWidth,
false, false, false); false, false);
} }
} }
} }
...@@ -594,7 +599,7 @@ void LibDrawPin::DrawPinTexts( WinEDA_DrawPanel* panel, ...@@ -594,7 +599,7 @@ void LibDrawPin::DrawPinTexts( WinEDA_DrawPanel* panel,
NameColor, m_PinName, NameColor, m_PinName,
TEXT_ORIENT_HORIZ, PinNameSize, TEXT_ORIENT_HORIZ, PinNameSize,
GR_TEXT_HJUSTIFY_CENTER, GR_TEXT_HJUSTIFY_CENTER,
GR_TEXT_VJUSTIFY_BOTTOM, LineWidth, GR_TEXT_VJUSTIFY_BOTTOM, nameLineWidth,
false, false ); false, false );
} }
if( DrawPinNum ) if( DrawPinNum )
...@@ -605,8 +610,8 @@ void LibDrawPin::DrawPinTexts( WinEDA_DrawPanel* panel, ...@@ -605,8 +610,8 @@ void LibDrawPin::DrawPinTexts( WinEDA_DrawPanel* panel,
NumColor, StringPinNum, NumColor, StringPinNum,
TEXT_ORIENT_HORIZ, PinNumSize, TEXT_ORIENT_HORIZ, PinNumSize,
GR_TEXT_HJUSTIFY_CENTER, GR_TEXT_HJUSTIFY_CENTER,
GR_TEXT_VJUSTIFY_TOP, GR_TEXT_VJUSTIFY_TOP, numLineWidth,
LineWidth, false, false, false ); false, false);
} }
} }
else /* Its a vertical line. */ else /* Its a vertical line. */
...@@ -619,7 +624,8 @@ void LibDrawPin::DrawPinTexts( WinEDA_DrawPanel* panel, ...@@ -619,7 +624,8 @@ void LibDrawPin::DrawPinTexts( WinEDA_DrawPanel* panel,
NameColor, m_PinName, NameColor, m_PinName,
TEXT_ORIENT_VERT, PinNameSize, TEXT_ORIENT_VERT, PinNameSize,
GR_TEXT_HJUSTIFY_CENTER, GR_TEXT_HJUSTIFY_CENTER,
GR_TEXT_VJUSTIFY_BOTTOM, LineWidth, false, false ); GR_TEXT_VJUSTIFY_BOTTOM, nameLineWidth,
false, false );
} }
if( DrawPinNum ) if( DrawPinNum )
...@@ -630,7 +636,8 @@ void LibDrawPin::DrawPinTexts( WinEDA_DrawPanel* panel, ...@@ -630,7 +636,8 @@ void LibDrawPin::DrawPinTexts( WinEDA_DrawPanel* panel,
NumColor, StringPinNum, NumColor, StringPinNum,
TEXT_ORIENT_VERT, PinNumSize, TEXT_ORIENT_VERT, PinNumSize,
GR_TEXT_HJUSTIFY_CENTER, GR_TEXT_HJUSTIFY_CENTER,
GR_TEXT_VJUSTIFY_TOP, LineWidth, false, false, false ); GR_TEXT_VJUSTIFY_TOP, numLineWidth,
false, false );
} }
} }
} }
......
eeschema/class_sch_cmp_field.cpp
View file @ a04588db
...@@ -59,7 +59,10 @@ void SCH_CMP_FIELD::Draw( WinEDA_DrawPanel* panel, wxDC* DC, ...@@ -59,7 +59,10 @@ void SCH_CMP_FIELD::Draw( WinEDA_DrawPanel* panel, wxDC* DC,
SCH_COMPONENT* DrawLibItem = (SCH_COMPONENT*) m_Parent; SCH_COMPONENT* DrawLibItem = (SCH_COMPONENT*) m_Parent;
GRTextHorizJustifyType hjustify; GRTextHorizJustifyType hjustify;
GRTextVertJustifyType vjustify; GRTextVertJustifyType vjustify;
int LineWidth = MAX( m_Width, g_DrawMinimunLineWidth ); int LineWidth = (m_Width == 0) ? g_DrawDefaultLineThickness : m_Width;
// Clip pen size for small texts:
LineWidth = Clamp_Text_PenSize( LineWidth, m_Size, m_Bold );
if( ( m_Attributs & TEXT_NO_VISIBLE ) || IsVoid() ) if( ( m_Attributs & TEXT_NO_VISIBLE ) || IsVoid() )
return; return;
...@@ -236,7 +239,6 @@ EDA_Rect SCH_CMP_FIELD::GetBoundaryBox() const ...@@ -236,7 +239,6 @@ EDA_Rect SCH_CMP_FIELD::GetBoundaryBox() const
{ {
EDA_Rect BoundaryBox; EDA_Rect BoundaryBox;
int hjustify, vjustify; int hjustify, vjustify;
int textlen;
int orient; int orient;
int dx, dy, x1, y1, x2, y2; int dx, dy, x1, y1, x2, y2;
...@@ -318,6 +320,10 @@ EDA_Rect SCH_CMP_FIELD::GetBoundaryBox() const ...@@ -318,6 +320,10 @@ EDA_Rect SCH_CMP_FIELD::GetBoundaryBox() const
BoundaryBox.SetWidth( dx ); BoundaryBox.SetWidth( dx );
BoundaryBox.SetHeight( dy ); BoundaryBox.SetHeight( dy );
// Take thickness in account:
int linewidth = (m_Width == 0) ? g_DrawDefaultLineThickness : m_Width;
BoundaryBox.Inflate( linewidth,linewidth );
return BoundaryBox; return BoundaryBox;
} }
......
eeschema/class_schematic_items.cpp
View file @ a04588db
...@@ -40,7 +40,6 @@ DrawBusEntryStruct::DrawBusEntryStruct( const wxPoint& pos, int shape, int id ) ...@@ -40,7 +40,6 @@ DrawBusEntryStruct::DrawBusEntryStruct( const wxPoint& pos, int shape, int id )
if( id == BUS_TO_BUS ) if( id == BUS_TO_BUS )
{ {
m_Layer = LAYER_BUS; m_Layer = LAYER_BUS;
m_Width = 1;
} }
if( shape == '/' ) if( shape == '/' )
...@@ -106,7 +105,7 @@ EDA_Rect DrawBusEntryStruct::GetBoundingBox() ...@@ -106,7 +105,7 @@ EDA_Rect DrawBusEntryStruct::GetBoundingBox()
EDA_Rect box( wxPoint( m_Pos.x, m_Pos.y ), wxSize( dx, dy ) ); EDA_Rect box( wxPoint( m_Pos.x, m_Pos.y ), wxSize( dx, dy ) );
box.Normalize(); box.Normalize();
int width = MAX( m_Width, g_DrawMinimunLineWidth ); int width = (m_Width == 0) ? g_DrawDefaultLineThickness : m_Width;
box.Inflate( width / 2, width / 2 ); box.Inflate( width / 2, width / 2 );
return box; return box;
...@@ -117,7 +116,7 @@ void DrawBusEntryStruct::Draw( WinEDA_DrawPanel* panel, wxDC* DC, ...@@ -117,7 +116,7 @@ void DrawBusEntryStruct::Draw( WinEDA_DrawPanel* panel, wxDC* DC,
const wxPoint& offset, int DrawMode, int Color ) const wxPoint& offset, int DrawMode, int Color )
{ {
int color; int color;
int width = MAX( m_Width, g_DrawMinimunLineWidth ); int width = (m_Width == 0) ? g_DrawDefaultLineThickness : m_Width;
if( Color >= 0 ) if( Color >= 0 )
color = Color; color = Color;
...@@ -125,8 +124,11 @@ void DrawBusEntryStruct::Draw( WinEDA_DrawPanel* panel, wxDC* DC, ...@@ -125,8 +124,11 @@ void DrawBusEntryStruct::Draw( WinEDA_DrawPanel* panel, wxDC* DC,
color = ReturnLayerColor( m_Layer ); color = ReturnLayerColor( m_Layer );
GRSetDrawMode( DC, DrawMode ); GRSetDrawMode( DC, DrawMode );
if( m_Layer == LAYER_BUS ) if( m_Layer == LAYER_BUS ) // TODO: find a better way to handle bus thickness
width *= 3; {
width = wxRound(width * 1.3);
width = MAX(width, 3);
}
GRLine( &panel->m_ClipBox, DC, m_Pos.x + offset.x, m_Pos.y + offset.y, GRLine( &panel->m_ClipBox, DC, m_Pos.x + offset.x, m_Pos.y + offset.y,
m_End().x + offset.x, m_End().y + offset.y, width, color ); m_End().x + offset.x, m_End().y + offset.y, width, color );
...@@ -272,7 +274,7 @@ EDA_Rect DrawNoConnectStruct::GetBoundingBox() ...@@ -272,7 +274,7 @@ EDA_Rect DrawNoConnectStruct::GetBoundingBox()
*/ */
bool DrawNoConnectStruct::HitTest( const wxPoint& aPosRef ) bool DrawNoConnectStruct::HitTest( const wxPoint& aPosRef )
{ {
int width = g_DrawMinimunLineWidth; int width = g_DrawDefaultLineThickness;
int delta = ( DRAWNOCONNECT_SIZE + width) / 2; int delta = ( DRAWNOCONNECT_SIZE + width) / 2;
wxPoint dist = aPosRef - m_Pos; wxPoint dist = aPosRef - m_Pos;
...@@ -306,7 +308,7 @@ void DrawNoConnectStruct::Draw( WinEDA_DrawPanel* panel, wxDC* DC, ...@@ -306,7 +308,7 @@ void DrawNoConnectStruct::Draw( WinEDA_DrawPanel* panel, wxDC* DC,
{ {
const int DELTA = (DRAWNOCONNECT_SIZE / 2); const int DELTA = (DRAWNOCONNECT_SIZE / 2);
int pX, pY, color; int pX, pY, color;
int width = g_DrawMinimunLineWidth; int width = g_DrawDefaultLineThickness;
pX = m_Pos.x + offset.x; pY = m_Pos.y + offset.y; pX = m_Pos.x + offset.x; pY = m_Pos.y + offset.y;
...@@ -462,23 +464,21 @@ EDA_DrawLineStruct::EDA_DrawLineStruct( const wxPoint& pos, int layer ) : ...@@ -462,23 +464,21 @@ EDA_DrawLineStruct::EDA_DrawLineStruct( const wxPoint& pos, int layer ) :
{ {
m_Start = pos; m_Start = pos;
m_End = pos; m_End = pos;
m_Width = 0; // Default thickness used
m_StartIsDangling = m_EndIsDangling = FALSE; m_StartIsDangling = m_EndIsDangling = FALSE;
switch( layer ) switch( layer )
{ {
default: default:
m_Layer = LAYER_NOTES; /* Mettre ds Notes */ m_Layer = LAYER_NOTES; /* Mettre ds Notes */
m_Width = GR_NORM_WIDTH;
break; break;
case LAYER_WIRE: case LAYER_WIRE:
m_Layer = LAYER_WIRE; m_Layer = LAYER_WIRE;
m_Width = GR_NORM_WIDTH;
break; break;
case LAYER_BUS: case LAYER_BUS:
m_Layer = LAYER_BUS; m_Layer = LAYER_BUS;
m_Width = GR_THICK_WIDTH;
break; break;
} }
} }
...@@ -563,8 +563,6 @@ bool EDA_DrawLineStruct::Save( FILE* aFile ) const ...@@ -563,8 +563,6 @@ bool EDA_DrawLineStruct::Save( FILE* aFile ) const
layer = "Wire"; layer = "Wire";
if( GetLayer() == LAYER_BUS ) if( GetLayer() == LAYER_BUS )
layer = "Bus"; layer = "Bus";
if( m_Width != GR_NORM_WIDTH )
layer = "Bus";
if( fprintf( aFile, "Wire %s %s\n", layer, width ) == EOF ) if( fprintf( aFile, "Wire %s %s\n", layer, width ) == EOF )
{ {
success = false; success = false;
...@@ -583,7 +581,7 @@ void EDA_DrawLineStruct::Draw( WinEDA_DrawPanel* panel, wxDC* DC, ...@@ -583,7 +581,7 @@ void EDA_DrawLineStruct::Draw( WinEDA_DrawPanel* panel, wxDC* DC,
const wxPoint& offset, int DrawMode, int Color ) const wxPoint& offset, int DrawMode, int Color )
{ {
int color; int color;
int width = MAX( m_Width, g_DrawMinimunLineWidth ); int width = (m_Width == 0) ? g_DrawDefaultLineThickness : m_Width;
if( Color >= 0 ) if( Color >= 0 )
color = Color; color = Color;
...@@ -593,8 +591,11 @@ void EDA_DrawLineStruct::Draw( WinEDA_DrawPanel* panel, wxDC* DC, ...@@ -593,8 +591,11 @@ void EDA_DrawLineStruct::Draw( WinEDA_DrawPanel* panel, wxDC* DC,
GRSetDrawMode( DC, DrawMode ); GRSetDrawMode( DC, DrawMode );
// FIXME: Not compatable with new zoom. // FIXME: Not compatable with new zoom.
if( (m_Layer == LAYER_BUS) && panel->GetScreen()->Scale( width ) <= 1 ) if( m_Layer == LAYER_BUS)
width *= 3; {
width = wxRound(width * 1.4);
width = MAX(width, 3);
}
if( m_Layer == LAYER_NOTES ) if( m_Layer == LAYER_NOTES )
GRDashedLine( &panel->m_ClipBox, DC, m_Start.x + offset.x, GRDashedLine( &panel->m_ClipBox, DC, m_Start.x + offset.x,
...@@ -620,7 +621,7 @@ void EDA_DrawLineStruct::Draw( WinEDA_DrawPanel* panel, wxDC* DC, ...@@ -620,7 +621,7 @@ void EDA_DrawLineStruct::Draw( WinEDA_DrawPanel* panel, wxDC* DC,
DrawPolylineStruct::DrawPolylineStruct( int layer ) : DrawPolylineStruct::DrawPolylineStruct( int layer ) :
SCH_ITEM( NULL, DRAW_POLYLINE_STRUCT_TYPE ) SCH_ITEM( NULL, DRAW_POLYLINE_STRUCT_TYPE )
{ {
m_Width = GR_NORM_WIDTH; m_Width = 0;
switch( layer ) switch( layer )
{ {
...@@ -630,12 +631,8 @@ DrawPolylineStruct::DrawPolylineStruct( int layer ) : ...@@ -630,12 +631,8 @@ DrawPolylineStruct::DrawPolylineStruct( int layer ) :
case LAYER_WIRE: case LAYER_WIRE:
case LAYER_NOTES: case LAYER_NOTES:
m_Layer = layer;
break;
case LAYER_BUS: case LAYER_BUS:
m_Layer = layer; m_Layer = layer;
m_Width = GR_THICK_WIDTH;
break; break;
} }
} }
...@@ -671,8 +668,6 @@ bool DrawPolylineStruct::Save( FILE* aFile ) const ...@@ -671,8 +668,6 @@ bool DrawPolylineStruct::Save( FILE* aFile ) const
layer = "Wire"; layer = "Wire";
if( GetLayer() == LAYER_BUS ) if( GetLayer() == LAYER_BUS )
layer = "Bus"; layer = "Bus";
if( m_Width != GR_NORM_WIDTH )
width = "Bus";
if( fprintf( aFile, "Poly %s %s %d\n", if( fprintf( aFile, "Poly %s %s %d\n",
width, layer, GetCornerCount() ) == EOF ) width, layer, GetCornerCount() ) == EOF )
{ {
...@@ -696,7 +691,7 @@ void DrawPolylineStruct::Draw( WinEDA_DrawPanel* panel, wxDC* DC, ...@@ -696,7 +691,7 @@ void DrawPolylineStruct::Draw( WinEDA_DrawPanel* panel, wxDC* DC,
const wxPoint& offset, int DrawMode, int Color ) const wxPoint& offset, int DrawMode, int Color )
{ {
int color; int color;
int width = MAX( m_Width, g_DrawMinimunLineWidth ); int width = (m_Width == 0) ? g_DrawDefaultLineThickness : m_Width;
if( Color >= 0 ) if( Color >= 0 )
color = Color; color = Color;
......
eeschema/class_text-label.cpp
View file @ a04588db
...@@ -195,7 +195,7 @@ wxPoint SCH_HIERLABEL::GetSchematicTextOffset() ...@@ -195,7 +195,7 @@ wxPoint SCH_HIERLABEL::GetSchematicTextOffset()
{ {
wxPoint text_offset; wxPoint text_offset;
int width = MAX( m_Width, g_DrawMinimunLineWidth ); int width = MAX( m_Width, g_DrawDefaultLineThickness );
int ii = m_Size.x + TXTMARGE + width; int ii = m_Size.x + TXTMARGE + width;
...@@ -230,7 +230,9 @@ wxPoint SCH_HIERLABEL::GetSchematicTextOffset() ...@@ -230,7 +230,9 @@ wxPoint SCH_HIERLABEL::GetSchematicTextOffset()
wxPoint SCH_GLOBALLABEL::GetSchematicTextOffset() wxPoint SCH_GLOBALLABEL::GetSchematicTextOffset()
{ {
wxPoint text_offset; wxPoint text_offset;
int width = MAX( m_Width, g_DrawMinimunLineWidth ); int width = (m_Width == 0) ? g_DrawDefaultLineThickness : m_Width;
width = Clamp_Text_PenSize( width, m_Size, m_Bold );
int HalfSize = m_Size.x / 2; int HalfSize = m_Size.x / 2;
int offset = width; int offset = width;
...@@ -473,7 +475,9 @@ void SCH_TEXT::Draw( WinEDA_DrawPanel* panel, wxDC* DC, const wxPoint& aOffset, ...@@ -473,7 +475,9 @@ void SCH_TEXT::Draw( WinEDA_DrawPanel* panel, wxDC* DC, const wxPoint& aOffset,
*/ */
{ {
EDA_Colors color; EDA_Colors color;
int width = MAX( m_Width, g_DrawMinimunLineWidth ); int linewidth = (m_Width == 0) ? g_DrawDefaultLineThickness : m_Width;
linewidth = Clamp_Text_PenSize( linewidth, m_Size, m_Bold );
if( Color >= 0 ) if( Color >= 0 )
color = (EDA_Colors) Color; color = (EDA_Colors) Color;
...@@ -483,9 +487,9 @@ void SCH_TEXT::Draw( WinEDA_DrawPanel* panel, wxDC* DC, const wxPoint& aOffset, ...@@ -483,9 +487,9 @@ void SCH_TEXT::Draw( WinEDA_DrawPanel* panel, wxDC* DC, const wxPoint& aOffset,
wxPoint text_offset = aOffset + GetSchematicTextOffset(); wxPoint text_offset = aOffset + GetSchematicTextOffset();
EXCHG( width, m_Width ); // Set the minimum width EXCHG( linewidth, m_Width ); // Set the minimum width
EDA_TextStruct::Draw( panel, DC, text_offset, color, DrawMode, FILLED, UNSPECIFIED_COLOR ); EDA_TextStruct::Draw( panel, DC, text_offset, color, DrawMode, FILLED, UNSPECIFIED_COLOR );
EXCHG( width, m_Width ); // set initial value EXCHG( linewidth, m_Width ); // set initial value
if( m_IsDangling ) if( m_IsDangling )
DrawDanglingSymbol( panel, DC, m_Pos + aOffset, color ); DrawDanglingSymbol( panel, DC, m_Pos + aOffset, color );
} }
...@@ -714,7 +718,8 @@ void SCH_HIERLABEL::Draw( WinEDA_DrawPanel* panel, wxDC* DC, const wxPoint& offs ...@@ -714,7 +718,8 @@ void SCH_HIERLABEL::Draw( WinEDA_DrawPanel* panel, wxDC* DC, const wxPoint& offs
{ {
static std::vector <wxPoint> Poly; static std::vector <wxPoint> Poly;
EDA_Colors color; EDA_Colors color;
int width = MAX( m_Width, g_DrawMinimunLineWidth ); int linewidth = (m_Width == 0) ? g_DrawDefaultLineThickness : m_Width;
linewidth = Clamp_Text_PenSize( linewidth, m_Size, m_Bold );
if( Color >= 0 ) if( Color >= 0 )
color = (EDA_Colors) Color; color = (EDA_Colors) Color;
...@@ -723,13 +728,13 @@ void SCH_HIERLABEL::Draw( WinEDA_DrawPanel* panel, wxDC* DC, const wxPoint& offs ...@@ -723,13 +728,13 @@ void SCH_HIERLABEL::Draw( WinEDA_DrawPanel* panel, wxDC* DC, const wxPoint& offs
GRSetDrawMode( DC, DrawMode ); GRSetDrawMode( DC, DrawMode );
EXCHG( width, m_Width ); // Set the minimum width EXCHG( linewidth, m_Width ); // Set the minimum width
wxPoint text_offset = offset + GetSchematicTextOffset(); wxPoint text_offset = offset + GetSchematicTextOffset();
EDA_TextStruct::Draw( panel, DC, text_offset, color, DrawMode, FILLED, UNSPECIFIED_COLOR ); EDA_TextStruct::Draw( panel, DC, text_offset, color, DrawMode, FILLED, UNSPECIFIED_COLOR );
EXCHG( width, m_Width ); // set initial value EXCHG( linewidth, m_Width ); // set initial value
CreateGraphicShape( Poly, m_Pos + offset ); CreateGraphicShape( Poly, m_Pos + offset );
GRPoly( &panel->m_ClipBox, DC, Poly.size(), &Poly[0], 0, width, color, color ); GRPoly( &panel->m_ClipBox, DC, Poly.size(), &Poly[0], 0, linewidth, color, color );
if( m_IsDangling ) if( m_IsDangling )
DrawDanglingSymbol( panel, DC, m_Pos + offset, color ); DrawDanglingSymbol( panel, DC, m_Pos + offset, color );
...@@ -773,7 +778,7 @@ EDA_Rect SCH_HIERLABEL::GetBoundingBox() ...@@ -773,7 +778,7 @@ EDA_Rect SCH_HIERLABEL::GetBoundingBox()
y = m_Pos.y; y = m_Pos.y;
dx = dy = 0; dx = dy = 0;
int width = MAX( m_Width, g_DrawMinimunLineWidth ); int width = (m_Width == 0) ? g_DrawDefaultLineThickness : m_Width;
height = m_Size.y + width + 2 * TXTMARGE; height = m_Size.y + width + 2 * TXTMARGE;
length = LenSize( m_Text ) length = LenSize( m_Text )
+ height // add height for triangular shapes + height // add height for triangular shapes
...@@ -836,13 +841,14 @@ void SCH_GLOBALLABEL::Draw( WinEDA_DrawPanel* panel, wxDC* DC, const wxPoint& aO ...@@ -836,13 +841,14 @@ void SCH_GLOBALLABEL::Draw( WinEDA_DrawPanel* panel, wxDC* DC, const wxPoint& aO
GRSetDrawMode( DC, DrawMode ); GRSetDrawMode( DC, DrawMode );
int width = MAX( m_Width, g_DrawMinimunLineWidth ); int linewidth = (m_Width == 0) ? g_DrawDefaultLineThickness : m_Width;
EXCHG( width, m_Width ); // Set the minimum width linewidth = Clamp_Text_PenSize( linewidth, m_Size, m_Bold );
EXCHG( linewidth, m_Width ); // Set the minimum width
EDA_TextStruct::Draw( panel, DC, text_offset, color, DrawMode, FILLED, UNSPECIFIED_COLOR ); EDA_TextStruct::Draw( panel, DC, text_offset, color, DrawMode, FILLED, UNSPECIFIED_COLOR );
EXCHG( width, m_Width ); // set initial value EXCHG( linewidth, m_Width ); // set initial value
CreateGraphicShape( Poly, m_Pos + aOffset ); CreateGraphicShape( Poly, m_Pos + aOffset );
GRPoly( &panel->m_ClipBox, DC, Poly.size(), &Poly[0], 0, width, color, color ); GRPoly( &panel->m_ClipBox, DC, Poly.size(), &Poly[0], 0, linewidth, color, color );
if( m_IsDangling ) if( m_IsDangling )
DrawDanglingSymbol( panel, DC, m_Pos + aOffset, color ); DrawDanglingSymbol( panel, DC, m_Pos + aOffset, color );
...@@ -857,15 +863,17 @@ void SCH_GLOBALLABEL::Draw( WinEDA_DrawPanel* panel, wxDC* DC, const wxPoint& aO ...@@ -857,15 +863,17 @@ void SCH_GLOBALLABEL::Draw( WinEDA_DrawPanel* panel, wxDC* DC, const wxPoint& aO
void SCH_GLOBALLABEL::CreateGraphicShape( std::vector <wxPoint>& aCorner_list, const wxPoint& Pos ) void SCH_GLOBALLABEL::CreateGraphicShape( std::vector <wxPoint>& aCorner_list, const wxPoint& Pos )
{ {
int HalfSize = m_Size.y / 2; int HalfSize = m_Size.y / 2;
int width = MAX( m_Width, g_DrawMinimunLineWidth ); int linewidth = (m_Width == 0) ? g_DrawDefaultLineThickness : m_Width;
linewidth = Clamp_Text_PenSize( linewidth, m_Size, m_Bold );
aCorner_list.clear(); aCorner_list.clear();
int symb_len = LenSize( m_Text ) + (TXTMARGE * 2); int symb_len = LenSize( m_Text ) + (TXTMARGE * 2);
// Create outline shape : 6 points // Create outline shape : 6 points
int x = symb_len + width + 3; int x = symb_len + linewidth + 3;
int y = wxRound( (double)HalfSize * 1.5 + (double)width + 3.0 ); // 50% more for negation bar int y = wxRound( (double) HalfSize * 1.5 + (double) linewidth + 3.0 ); // 50% more for negation bar
aCorner_list.push_back( wxPoint( 0, 0 ) ); // Starting point (anchor) aCorner_list.push_back( wxPoint( 0, 0 ) ); // Starting point (anchor)
aCorner_list.push_back( wxPoint( 0, -y ) ); // Up aCorner_list.push_back( wxPoint( 0, -y ) ); // Up
aCorner_list.push_back( wxPoint( -x, -y ) ); // left Up aCorner_list.push_back( wxPoint( -x, -y ) ); // left Up
...@@ -941,7 +949,7 @@ EDA_Rect SCH_GLOBALLABEL::GetBoundingBox() ...@@ -941,7 +949,7 @@ EDA_Rect SCH_GLOBALLABEL::GetBoundingBox()
y = m_Pos.y; y = m_Pos.y;
dx = dy = 0; dx = dy = 0;
int width = MAX( m_Width, g_DrawMinimunLineWidth ); int width = (m_Width == 0) ? g_DrawDefaultLineThickness : m_Width;
height = ( (m_Size.y * 15) / 10 ) + width + 2 * TXTMARGE; height = ( (m_Size.y * 15) / 10 ) + width + 2 * TXTMARGE;
length = length =
LenSize( m_Text ) // text X size LenSize( m_Text ) // text X size
...@@ -993,7 +1001,7 @@ EDA_Rect SCH_TEXT::GetBoundingBox() ...@@ -993,7 +1001,7 @@ EDA_Rect SCH_TEXT::GetBoundingBox()
x = m_Pos.x; x = m_Pos.x;
y = m_Pos.y; y = m_Pos.y;
int width = MAX( m_Width, g_DrawMinimunLineWidth ); int width = (m_Width == 0) ? g_DrawDefaultLineThickness : m_Width;
length = LenSize( m_Text ); length = LenSize( m_Text );
height = m_Size.y + width; height = m_Size.y + width;
dx = dy = 0; dx = dy = 0;
......
eeschema/classes_body_items.cpp
View file @ a04588db
...@@ -197,7 +197,7 @@ void LibDrawArc::Draw( WinEDA_DrawPanel* aPanel, wxDC* aDC, ...@@ -197,7 +197,7 @@ void LibDrawArc::Draw( WinEDA_DrawPanel* aPanel, wxDC* aDC,
wxPoint pos1, pos2, posc; wxPoint pos1, pos2, posc;
int color = ReturnLayerColor( LAYER_DEVICE ); int color = ReturnLayerColor( LAYER_DEVICE );
int linewidth = MAX( m_Width, g_DrawMinimunLineWidth ); int linewidth = (m_Width == 0) ? g_DrawDefaultLineThickness : m_Width;
if( aColor < 0 ) // Used normal color or selected color if( aColor < 0 ) // Used normal color or selected color
{ {
...@@ -398,7 +398,7 @@ void LibDrawCircle::Draw( WinEDA_DrawPanel* aPanel, wxDC* aDC, ...@@ -398,7 +398,7 @@ void LibDrawCircle::Draw( WinEDA_DrawPanel* aPanel, wxDC* aDC,
wxPoint pos1; wxPoint pos1;
int color = ReturnLayerColor( LAYER_DEVICE ); int color = ReturnLayerColor( LAYER_DEVICE );
int linewidth = MAX( m_Width, g_DrawMinimunLineWidth ); int linewidth = (m_Width == 0) ? g_DrawDefaultLineThickness : m_Width;
if( aColor < 0 ) // Used normal color or selected color if( aColor < 0 ) // Used normal color or selected color
{ {
...@@ -550,7 +550,9 @@ void LibDrawText::Draw( WinEDA_DrawPanel* aPanel, wxDC* aDC, ...@@ -550,7 +550,9 @@ void LibDrawText::Draw( WinEDA_DrawPanel* aPanel, wxDC* aDC,
wxPoint pos1, pos2; wxPoint pos1, pos2;
int color = ReturnLayerColor( LAYER_DEVICE ); int color = ReturnLayerColor( LAYER_DEVICE );
int linewidth = MAX( m_Width, g_DrawMinimunLineWidth ); int linewidth = (m_Width == 0) ? g_DrawDefaultLineThickness : m_Width;
// Clip pen size for small texts:
linewidth = Clamp_Text_PenSize( linewidth, m_Size, m_Bold );
if( aColor < 0 ) // Used normal color or selected color if( aColor < 0 ) // Used normal color or selected color
{ {
...@@ -649,7 +651,7 @@ void LibDrawSquare::Draw( WinEDA_DrawPanel* aPanel, wxDC* aDC, ...@@ -649,7 +651,7 @@ void LibDrawSquare::Draw( WinEDA_DrawPanel* aPanel, wxDC* aDC,
wxPoint pos1, pos2; wxPoint pos1, pos2;
int color = ReturnLayerColor( LAYER_DEVICE ); int color = ReturnLayerColor( LAYER_DEVICE );
int linewidth = MAX( m_Width, g_DrawMinimunLineWidth ); int linewidth = (m_Width == 0) ? g_DrawDefaultLineThickness : m_Width;
if( aColor < 0 ) // Used normal color or selected color if( aColor < 0 ) // Used normal color or selected color
{ {
...@@ -744,7 +746,7 @@ void LibDrawSegment::Draw( WinEDA_DrawPanel* aPanel, wxDC* aDC, ...@@ -744,7 +746,7 @@ void LibDrawSegment::Draw( WinEDA_DrawPanel* aPanel, wxDC* aDC,
wxPoint pos1, pos2; wxPoint pos1, pos2;
int color = ReturnLayerColor( LAYER_DEVICE ); int color = ReturnLayerColor( LAYER_DEVICE );
int linewidth = MAX( m_Width, g_DrawMinimunLineWidth ); int linewidth = (m_Width == 0) ? g_DrawDefaultLineThickness : m_Width;
if( aColor < 0 ) // Used normal color or selected color if( aColor < 0 ) // Used normal color or selected color
{ {
...@@ -894,7 +896,7 @@ void LibDrawPolyline::Draw( WinEDA_DrawPanel* aPanel, wxDC* aDC, ...@@ -894,7 +896,7 @@ void LibDrawPolyline::Draw( WinEDA_DrawPanel* aPanel, wxDC* aDC,
wxPoint pos1; wxPoint pos1;
int color = ReturnLayerColor( LAYER_DEVICE ); int color = ReturnLayerColor( LAYER_DEVICE );
int linewidth = MAX( m_Width, g_DrawMinimunLineWidth ); int linewidth = (m_Width == 0) ? g_DrawDefaultLineThickness : m_Width;
// Buffer used to store current corners coordinates for drawings // Buffer used to store current corners coordinates for drawings
static wxPoint* Buf_Poly_Drawings = NULL; static wxPoint* Buf_Poly_Drawings = NULL;
......
eeschema/dialog_SVG_print.cpp
View file @ a04588db
...@@ -94,7 +94,7 @@ void DIALOG_SVG_PRINT::OnInitDialog( wxInitDialogEvent& event ) ...@@ -94,7 +94,7 @@ void DIALOG_SVG_PRINT::OnInitDialog( wxInitDialogEvent& event )
AddUnitSymbol(* m_TextPenWidth, g_UnitMetric ); AddUnitSymbol(* m_TextPenWidth, g_UnitMetric );
m_DialogPenWidth->SetValue( m_DialogPenWidth->SetValue(
ReturnStringFromValue(g_UnitMetric, g_PlotLine_Width, m_Parent->m_InternalUnits ) ); ReturnStringFromValue(g_UnitMetric, g_DrawDefaultLineThickness, m_Parent->m_InternalUnits ) );
m_Print_Sheet_Ref->SetValue( s_Print_Frame_Ref ); m_Print_Sheet_Ref->SetValue( s_Print_Frame_Ref );
if (GetSizer()) if (GetSizer())
{ {
...@@ -107,20 +107,20 @@ void DIALOG_SVG_PRINT::OnInitDialog( wxInitDialogEvent& event ) ...@@ -107,20 +107,20 @@ void DIALOG_SVG_PRINT::OnInitDialog( wxInitDialogEvent& event )
void DIALOG_SVG_PRINT::SetPenWidth() void DIALOG_SVG_PRINT::SetPenWidth()
/********************************************/ /********************************************/
{ {
g_PlotLine_Width = ReturnValueFromTextCtrl( *m_DialogPenWidth, m_Parent->m_InternalUnits ); g_DrawDefaultLineThickness = ReturnValueFromTextCtrl( *m_DialogPenWidth, m_Parent->m_InternalUnits );
if( g_PlotLine_Width > WIDTH_MAX_VALUE ) if( g_DrawDefaultLineThickness > WIDTH_MAX_VALUE )
{ {
g_PlotLine_Width = WIDTH_MAX_VALUE; g_DrawDefaultLineThickness = WIDTH_MAX_VALUE;
} }
if( g_PlotLine_Width < WIDTH_MIN_VALUE ) if( g_DrawDefaultLineThickness < WIDTH_MIN_VALUE )
{ {
g_PlotLine_Width = WIDTH_MIN_VALUE; g_DrawDefaultLineThickness = WIDTH_MIN_VALUE;
} }
m_DialogPenWidth->SetValue( m_DialogPenWidth->SetValue(
ReturnStringFromValue(g_UnitMetric, g_PlotLine_Width, m_Parent->m_InternalUnits ) ); ReturnStringFromValue(g_UnitMetric, g_DrawDefaultLineThickness, m_Parent->m_InternalUnits ) );
} }
...@@ -235,8 +235,8 @@ bool DIALOG_SVG_PRINT::DrawPage( const wxString& FullFileName, BASE_SCREEN* scre ...@@ -235,8 +235,8 @@ bool DIALOG_SVG_PRINT::DrawPage( const wxString& FullFileName, BASE_SCREEN* scre
EDA_Rect tmp = panel->m_ClipBox; EDA_Rect tmp = panel->m_ClipBox;
GRResetPenAndBrush( &dc ); GRResetPenAndBrush( &dc );
g_PlotLine_Width = ReturnValueFromTextCtrl( *m_DialogPenWidth, m_Parent->m_InternalUnits ); g_DrawDefaultLineThickness = ReturnValueFromTextCtrl( *m_DialogPenWidth, m_Parent->m_InternalUnits );
SetPenMinWidth( g_PlotLine_Width ); SetPenMinWidth( g_DrawDefaultLineThickness );
GRForceBlackPen( m_ModeColorOption->GetSelection() == 0 ? FALSE : true ); GRForceBlackPen( m_ModeColorOption->GetSelection() == 0 ? FALSE : true );
......
eeschema/dialog_SVG_print_base.cpp
View file @ a04588db
...@@ -22,19 +22,19 @@ DIALOG_SVG_PRINT_base::DIALOG_SVG_PRINT_base( wxWindow* parent, wxWindowID id, c ...@@ -22,19 +22,19 @@ DIALOG_SVG_PRINT_base::DIALOG_SVG_PRINT_base( wxWindow* parent, wxWindowID id, c
wxStaticBoxSizer* sbOptionsSizer; wxStaticBoxSizer* sbOptionsSizer;
sbOptionsSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Print SVG options:") ), wxVERTICAL ); sbOptionsSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Print SVG options:") ), wxVERTICAL );
m_TextPenWidth = new wxStaticText( this, wxID_ANY, _("Pen width mini"), wxDefaultPosition, wxDefaultSize, 0 ); m_TextPenWidth = new wxStaticText( this, wxID_ANY, _("Default Pen Size"), wxDefaultPosition, wxDefaultSize, 0 );
m_TextPenWidth->Wrap( -1 ); m_TextPenWidth->Wrap( -1 );
sbOptionsSizer->Add( m_TextPenWidth, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); sbOptionsSizer->Add( m_TextPenWidth, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
m_DialogPenWidth = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_DialogPenWidth = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
m_DialogPenWidth->SetToolTip( _("Selection of the minimum pen thickness used to draw items.") ); m_DialogPenWidth->SetToolTip( _("Selection of the default pen thickness used to draw items, when their thickness is set to 0.") );
sbOptionsSizer->Add( m_DialogPenWidth, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); sbOptionsSizer->Add( m_DialogPenWidth, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
wxString m_ModeColorOptionChoices[] = { _("Color"), _("Black and White") }; wxString m_ModeColorOptionChoices[] = { _("Color"), _("Black and White") };
int m_ModeColorOptionNChoices = sizeof( m_ModeColorOptionChoices ) / sizeof( wxString ); int m_ModeColorOptionNChoices = sizeof( m_ModeColorOptionChoices ) / sizeof( wxString );
m_ModeColorOption = new wxRadioBox( this, wxID_ANY, _("Print mode"), wxDefaultPosition, wxDefaultSize, m_ModeColorOptionNChoices, m_ModeColorOptionChoices, 1, wxRA_SPECIFY_COLS ); m_ModeColorOption = new wxRadioBox( this, wxID_ANY, _("Print mode"), wxDefaultPosition, wxDefaultSize, m_ModeColorOptionNChoices, m_ModeColorOptionChoices, 1, wxRA_SPECIFY_COLS );
m_ModeColorOption->SetSelection( 0 ); m_ModeColorOption->SetSelection( 1 );
m_ModeColorOption->SetToolTip( _("Choose if you wand to draw the sheet like it appears on screen,\nor in black and white mode, better to print it when using black and white printers") ); m_ModeColorOption->SetToolTip( _("Choose if you wand to draw the sheet like it appears on screen,\nor in black and white mode, better to print it when using black and white printers") );
sbOptionsSizer->Add( m_ModeColorOption, 0, wxALL|wxEXPAND, 5 ); sbOptionsSizer->Add( m_ModeColorOption, 0, wxALL|wxEXPAND, 5 );
......
eeschema/dialog_SVG_print_base.fbp
View file @ a04588db
...@@ -108,7 +108,7 @@ ...@@ -108,7 +108,7 @@
<property name="font"></property> <property name="font"></property>
<property name="hidden">0</property> <property name="hidden">0</property>
<property name="id">wxID_ANY</property> <property name="id">wxID_ANY</property>
<property name="label">Pen width mini</property> <property name="label">Default Pen Size</property>
<property name="maximum_size"></property> <property name="maximum_size"></property>
<property name="minimum_size"></property> <property name="minimum_size"></property>
<property name="name">m_TextPenWidth</property> <property name="name">m_TextPenWidth</property>
...@@ -168,7 +168,7 @@ ...@@ -168,7 +168,7 @@
<property name="size"></property> <property name="size"></property>
<property name="style"></property> <property name="style"></property>
<property name="subclass"></property> <property name="subclass"></property>
<property name="tooltip">Selection of the minimum pen thickness used to draw items.</property> <property name="tooltip">Selection of the default pen thickness used to draw items, when their thickness is set to 0.</property>
<property name="value"></property> <property name="value"></property>
<property name="window_extra_style"></property> <property name="window_extra_style"></property>
<property name="window_name"></property> <property name="window_name"></property>
...@@ -222,7 +222,7 @@ ...@@ -222,7 +222,7 @@
<property name="name">m_ModeColorOption</property> <property name="name">m_ModeColorOption</property>
<property name="permission">protected</property> <property name="permission">protected</property>
<property name="pos"></property> <property name="pos"></property>
<property name="selection">0</property> <property name="selection">1</property>
<property name="size"></property> <property name="size"></property>
<property name="style">wxRA_SPECIFY_COLS</property> <property name="style">wxRA_SPECIFY_COLS</property>
<property name="subclass"></property> <property name="subclass"></property>
......
eeschema/dialog_options.cpp
View file @ a04588db
...@@ -308,7 +308,7 @@ void WinEDA_SetOptionsFrame::CreateControls() ...@@ -308,7 +308,7 @@ void WinEDA_SetOptionsFrame::CreateControls()
m_DefaultDrawLineWidthCtrl = new WinEDA_ValueCtrl( this, _( m_DefaultDrawLineWidthCtrl = new WinEDA_ValueCtrl( this, _(
"Default Line Width" ), "Default Line Width" ),
g_DrawMinimunLineWidth, g_DrawDefaultLineThickness,
g_UnitMetric, m_DrawOptionsSizer, g_UnitMetric, m_DrawOptionsSizer,
EESCHEMA_INTERNAL_UNIT ); EESCHEMA_INTERNAL_UNIT );
...@@ -393,11 +393,11 @@ void WinEDA_SetOptionsFrame::Accept( wxCommandEvent& event ) ...@@ -393,11 +393,11 @@ void WinEDA_SetOptionsFrame::Accept( wxCommandEvent& event )
wxRealPoint grid; wxRealPoint grid;
wxString msg; wxString msg;
g_DrawMinimunLineWidth = m_DefaultDrawLineWidthCtrl->GetValue(); g_DrawDefaultLineThickness = m_DefaultDrawLineWidthCtrl->GetValue();
if( g_DrawMinimunLineWidth < 0 ) if( g_DrawDefaultLineThickness < 0 )
g_DrawMinimunLineWidth = 0; g_DrawDefaultLineThickness = 0;
if( g_DrawMinimunLineWidth > 100 ) if( g_DrawDefaultLineThickness > 100 )
g_DrawMinimunLineWidth = 100; g_DrawDefaultLineThickness = 100;
g_DefaultTextLabelSize = m_DefaultLabelSizeCtrl->GetValue(); g_DefaultTextLabelSize = m_DefaultLabelSizeCtrl->GetValue();
if( g_DefaultTextLabelSize < 0 ) if( g_DefaultTextLabelSize < 0 )
......
eeschema/dialog_print_using_printer.cpp
View file @ a04588db
...@@ -137,9 +137,9 @@ void DIALOG_PRINT_USING_PRINTER::OnInitDialog( wxInitDialogEvent& event ) ...@@ -137,9 +137,9 @@ void DIALOG_PRINT_USING_PRINTER::OnInitDialog( wxInitDialogEvent& event )
m_Config->Read( PRINTMODECOLOR_KEY, &s_Print_Black_and_White ); m_Config->Read( PRINTMODECOLOR_KEY, &s_Print_Black_and_White );
} }
AddUnitSymbol(* m_TextPenWidth, g_UnitMetric ); AddUnitSymbol(* m_TextPenWidth, g_DrawDefaultLineThickness );
m_DialogPenWidth->SetValue( m_DialogPenWidth->SetValue(
ReturnStringFromValue(g_UnitMetric, g_PlotLine_Width, m_Parent->m_InternalUnits ) ); ReturnStringFromValue(g_UnitMetric, g_DrawDefaultLineThickness, m_Parent->m_InternalUnits ) );
m_Print_Sheet_Ref->SetValue( s_Print_Frame_Ref ); m_Print_Sheet_Ref->SetValue( s_Print_Frame_Ref );
m_ModeColorOption->SetSelection( s_Print_Black_and_White ? 1 : 0); m_ModeColorOption->SetSelection( s_Print_Black_and_White ? 1 : 0);
...@@ -177,20 +177,20 @@ void DIALOG_PRINT_USING_PRINTER::SetPenWidth() ...@@ -177,20 +177,20 @@ void DIALOG_PRINT_USING_PRINTER::SetPenWidth()
* NOTE: g_PlotLine_Width is in internal units * NOTE: g_PlotLine_Width is in internal units
*/ */
{ {
g_PlotLine_Width = ReturnValueFromTextCtrl( *m_DialogPenWidth, m_Parent->m_InternalUnits ); g_DrawDefaultLineThickness = ReturnValueFromTextCtrl( *m_DialogPenWidth, m_Parent->m_InternalUnits );
if( g_PlotLine_Width > WIDTH_MAX_VALUE ) if( g_DrawDefaultLineThickness > WIDTH_MAX_VALUE )
{ {
g_PlotLine_Width = WIDTH_MAX_VALUE; g_DrawDefaultLineThickness = WIDTH_MAX_VALUE;
} }
if( g_PlotLine_Width < WIDTH_MIN_VALUE ) if( g_DrawDefaultLineThickness < WIDTH_MIN_VALUE )
{ {
g_PlotLine_Width = WIDTH_MIN_VALUE; g_DrawDefaultLineThickness = WIDTH_MIN_VALUE;
} }
m_DialogPenWidth->SetValue( m_DialogPenWidth->SetValue(
ReturnStringFromValue(g_UnitMetric, g_PlotLine_Width, m_Parent->m_InternalUnits ) ); ReturnStringFromValue(g_UnitMetric, g_DrawDefaultLineThickness, m_Parent->m_InternalUnits ) );
} }
...@@ -442,18 +442,8 @@ void EDA_Printout::DrawPage() ...@@ -442,18 +442,8 @@ void EDA_Printout::DrawPage()
GRForceBlackPen( true ); GRForceBlackPen( true );
/* set Pen min width */ /* set Pen min width (not used now) */
double ftmp, xdcscale, ydcscale; SetPenMinWidth( 1 );
// g_PlotLine_Width is in internal units ( 1/1000 inch), and must be converted in pixels
ftmp = (float) g_PlotLine_Width * 25.4 / EESCHEMA_INTERNAL_UNIT; // ftmp est en mm
ftmp *= (float) PlotAreaSize.x / PageSize_in_mm.x; /* ftmp is in pixels */
/* because the pen size will be scaled by the dc scale, we modify the size
* in order to keep the requested value */
dc->GetUserScale( &xdcscale, &ydcscale );
ftmp /= xdcscale;
SetPenMinWidth( wxRound( ftmp ) );
WinEDA_DrawPanel* panel = m_Parent->DrawPanel; WinEDA_DrawPanel* panel = m_Parent->DrawPanel;
BASE_SCREEN* screen = panel->GetScreen(); BASE_SCREEN* screen = panel->GetScreen();
......
eeschema/dialog_print_using_printer_base.cpp
View file @ a04588db
...@@ -22,12 +22,12 @@ DIALOG_PRINT_USING_PRINTER_base::DIALOG_PRINT_USING_PRINTER_base( wxWindow* pare ...@@ -22,12 +22,12 @@ DIALOG_PRINT_USING_PRINTER_base::DIALOG_PRINT_USING_PRINTER_base( wxWindow* pare
wxStaticBoxSizer* sbOptionsSizer; wxStaticBoxSizer* sbOptionsSizer;
sbOptionsSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Options:") ), wxVERTICAL ); sbOptionsSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Options:") ), wxVERTICAL );
m_TextPenWidth = new wxStaticText( this, wxID_ANY, _("Pen Width Mini"), wxDefaultPosition, wxDefaultSize, 0 ); m_TextPenWidth = new wxStaticText( this, wxID_ANY, _("Default Pen Size"), wxDefaultPosition, wxDefaultSize, 0 );
m_TextPenWidth->Wrap( -1 ); m_TextPenWidth->Wrap( -1 );
sbOptionsSizer->Add( m_TextPenWidth, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); sbOptionsSizer->Add( m_TextPenWidth, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
m_DialogPenWidth = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_DialogPenWidth = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
m_DialogPenWidth->SetToolTip( _("Selection of the minimum pen thickness used to draw items.") ); m_DialogPenWidth->SetToolTip( _("Selection of the default pen thickness used to draw items, when their thickness is set to 0.") );
m_DialogPenWidth->SetMinSize( wxSize( 200,-1 ) ); m_DialogPenWidth->SetMinSize( wxSize( 200,-1 ) );
sbOptionsSizer->Add( m_DialogPenWidth, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); sbOptionsSizer->Add( m_DialogPenWidth, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
......
eeschema/dialog_print_using_printer_base.fbp
View file @ a04588db
...@@ -108,7 +108,7 @@ ...@@ -108,7 +108,7 @@
<property name="font"></property> <property name="font"></property>
<property name="hidden">0</property> <property name="hidden">0</property>
<property name="id">wxID_ANY</property> <property name="id">wxID_ANY</property>
<property name="label">Pen Width Mini</property> <property name="label">Default Pen Size</property>
<property name="maximum_size"></property> <property name="maximum_size"></property>
<property name="minimum_size"></property> <property name="minimum_size"></property>
<property name="name">m_TextPenWidth</property> <property name="name">m_TextPenWidth</property>
...@@ -168,7 +168,7 @@ ...@@ -168,7 +168,7 @@
<property name="size"></property> <property name="size"></property>
<property name="style"></property> <property name="style"></property>
<property name="subclass"></property> <property name="subclass"></property>
<property name="tooltip">Selection of the minimum pen thickness used to draw items.</property> <property name="tooltip">Selection of the default pen thickness used to draw items, when their thickness is set to 0.</property>
<property name="value"></property> <property name="value"></property>
<property name="window_extra_style"></property> <property name="window_extra_style"></property>
<property name="window_name"></property> <property name="window_name"></property>
......
eeschema/eeconfig.cpp
View file @ a04588db
...@@ -298,8 +298,7 @@ void WinEDA_SchematicFrame::SaveProjectFile( wxWindow* displayframe ) ...@@ -298,8 +298,7 @@ void WinEDA_SchematicFrame::SaveProjectFile( wxWindow* displayframe )
} }
static const wxString MinDrawLineWidthEntry( wxT( "MinimunDrawLineWidth" ) ); static const wxString DefaultDrawLineWidthEntry( wxT( "DefaultDrawLineWidth" ) );
static const wxString PlotLineWidthEntry( wxT( "PlotLineWidth" ) );
static const wxString ShowHiddenPinsEntry( wxT( "ShowHiddenPins" ) ); static const wxString ShowHiddenPinsEntry( wxT( "ShowHiddenPins" ) );
static const wxString HorzVertLinesOnlyEntry( wxT( "HorizVertLinesOnly" ) ); static const wxString HorzVertLinesOnlyEntry( wxT( "HorizVertLinesOnly" ) );
...@@ -424,8 +423,7 @@ void WinEDA_SchematicFrame::LoadSettings() ...@@ -424,8 +423,7 @@ void WinEDA_SchematicFrame::LoadSettings()
wxGetApp().ReadCurrentSetupValues( GetConfigurationSettings() ); wxGetApp().ReadCurrentSetupValues( GetConfigurationSettings() );
g_DrawMinimunLineWidth = cfg->Read( MinDrawLineWidthEntry, (long) 0 ); g_DrawDefaultLineThickness = cfg->Read( DefaultDrawLineWidthEntry, (long) 6 );
g_PlotLine_Width = cfg->Read( PlotLineWidthEntry, (long) 4 );
cfg->Read( ShowHiddenPinsEntry, &m_ShowAllPins, false ); cfg->Read( ShowHiddenPinsEntry, &m_ShowAllPins, false );
cfg->Read( HorzVertLinesOnlyEntry, &g_HVLines, true ); cfg->Read( HorzVertLinesOnlyEntry, &g_HVLines, true );
} }
...@@ -444,8 +442,7 @@ void WinEDA_SchematicFrame::SaveSettings() ...@@ -444,8 +442,7 @@ void WinEDA_SchematicFrame::SaveSettings()
wxGetApp().SaveCurrentSetupValues( GetConfigurationSettings() ); wxGetApp().SaveCurrentSetupValues( GetConfigurationSettings() );
cfg->Write( MinDrawLineWidthEntry, (long) g_DrawMinimunLineWidth ); cfg->Write( DefaultDrawLineWidthEntry, (long) g_DrawDefaultLineThickness );
cfg->Write( PlotLineWidthEntry, (long) g_PlotLine_Width );
cfg->Write( ShowHiddenPinsEntry, m_ShowAllPins ); cfg->Write( ShowHiddenPinsEntry, m_ShowAllPins );
cfg->Write( HorzVertLinesOnlyEntry, g_HVLines ); cfg->Write( HorzVertLinesOnlyEntry, g_HVLines );
} }
eeschema/eeredraw.cpp
View file @ a04588db
...@@ -75,7 +75,7 @@ void WinEDA_SchematicFrame::RedrawActiveWindow( wxDC* DC, bool EraseBg ) ...@@ -75,7 +75,7 @@ void WinEDA_SchematicFrame::RedrawActiveWindow( wxDC* DC, bool EraseBg )
RedrawStructList( DrawPanel, DC, GetScreen()->EEDrawList, RedrawStructList( DrawPanel, DC, GetScreen()->EEDrawList,
GR_DEFAULT_DRAWMODE ); GR_DEFAULT_DRAWMODE );
TraceWorkSheet( DC, GetScreen(), g_DrawMinimunLineWidth ); TraceWorkSheet( DC, GetScreen(), g_DrawDefaultLineThickness );
DrawPanel->CursorOn( DC ); // reaffichage curseur DrawPanel->CursorOn( DC ); // reaffichage curseur
if( DrawPanel->ManageCurseur ) if( DrawPanel->ManageCurseur )
...@@ -121,7 +121,7 @@ void WinEDA_DrawPanel::PrintPage( wxDC* DC, bool Print_Sheet_Ref, ...@@ -121,7 +121,7 @@ void WinEDA_DrawPanel::PrintPage( wxDC* DC, bool Print_Sheet_Ref,
RedrawStructList( this, DC, ActiveScreen->EEDrawList, GR_COPY ); RedrawStructList( this, DC, ActiveScreen->EEDrawList, GR_COPY );
if( Print_Sheet_Ref ) if( Print_Sheet_Ref )
m_Parent->TraceWorkSheet( DC, ActiveScreen, g_DrawMinimunLineWidth ); m_Parent->TraceWorkSheet( DC, ActiveScreen, g_DrawDefaultLineThickness );
wxEndBusyCursor(); wxEndBusyCursor();
} }
...@@ -188,7 +188,7 @@ void DrawStructsInGhost( WinEDA_DrawPanel* panel, wxDC* DC, ...@@ -188,7 +188,7 @@ void DrawStructsInGhost( WinEDA_DrawPanel* panel, wxDC* DC,
SCH_ITEM* DrawStruct, int dx, int dy ) SCH_ITEM* DrawStruct, int dx, int dy )
{ {
int DrawMode = g_XorMode; int DrawMode = g_XorMode;
int width = g_DrawMinimunLineWidth; int width = g_DrawDefaultLineThickness;
GRSetDrawMode( DC, DrawMode ); GRSetDrawMode( DC, DrawMode );
......
eeschema/eeschema.cpp
View file @ a04588db
...@@ -67,8 +67,8 @@ bool g_FlDrawSpecificConvert = TRUE; ...@@ -67,8 +67,8 @@ bool g_FlDrawSpecificConvert = TRUE;
int g_PlotFormat; /* flag = TYPE_HPGL, TYPE_PS... */ int g_PlotFormat; /* flag = TYPE_HPGL, TYPE_PS... */
int g_PlotMargin; /* Marge pour traces du cartouche */ int g_PlotMargin; /* Marge pour traces du cartouche */
float g_PlotScaleX; double g_PlotScaleX;
float g_PlotScaleY; /* coeff d'echelle de trace en unites table tracante */ double g_PlotScaleY; /* coeff d'echelle de trace en unites table tracante */
HPGL_Pen_Descr_Struct g_HPGL_Pen_Descr; HPGL_Pen_Descr_Struct g_HPGL_Pen_Descr;
...@@ -88,12 +88,18 @@ wxString g_NetListerCommandLine; // ligne de commande pour l'appel au simulat ...@@ -88,12 +88,18 @@ wxString g_NetListerCommandLine; // ligne de commande pour l'appel au simulat
LayerStruct g_LayerDescr; /* couleurs des couches */ LayerStruct g_LayerDescr; /* couleurs des couches */
/* bool: TRUE si edition des pins pin a pin au lieu */ bool g_EditPinByPinIsOn = false; /* true to do not synchronize pins edition
bool g_EditPinByPinIsOn = FALSE; * when they are at the same location */
int g_LibSymbolDefaultLineWidth = 0; /* default line width (in EESCHEMA units)
* used when creating a new graphic item in libedit.
* 0 = use default line thicknes
*/
int g_DrawDefaultLineThickness = 6; /* Default line (in EESCHEMA units) thickness
* used to draw/plot items having a default thickness line value (i.e. = 0 ).
* 0 = single pixel line width
*/
int g_LibSymbolDefaultLineWidth; /* default line width (in EESCHEMA units) used when creating a new graphic item in libedit : 0 = default */
int g_DrawMinimunLineWidth; /* Minimum line (in EESCHEMA units) thickness used to draw items on screen; 0 = single pixel line width */
int g_PlotLine_Width; /* Minimum line (in EESCHEMA units) thickness used to Plot/Print items */
// Color to draw selected items // Color to draw selected items
int g_ItemSelectetColor = BROWN; int g_ItemSelectetColor = BROWN;
// Color to draw items flagged invisible, in libedit (they are insisible in eeschema // Color to draw items flagged invisible, in libedit (they are insisible in eeschema
......
eeschema/general.h
View file @ a04588db
...@@ -108,8 +108,8 @@ extern SCH_ITEM* g_ItemToUndoCopy; /* copy of last modified schematic item ...@@ -108,8 +108,8 @@ extern SCH_ITEM* g_ItemToUndoCopy; /* copy of last modified schematic item
* before it is modified (used for undo managing to restore old values ) */ * before it is modified (used for undo managing to restore old values ) */
extern bool g_LastSearchIsMarker; // True if last seach is a marker serach extern bool g_LastSearchIsMarker; // True if last seach is a marker serach
// False for a schematic item search // False for a schematic item search
// Used for hotkey next search // Used for hotkey next search
/* Block operation (copy, paste) */ /* Block operation (copy, paste) */
extern SCH_ITEM* g_BlockSaveDataList; // List of items to paste (Created by Block Save) extern SCH_ITEM* g_BlockSaveDataList; // List of items to paste (Created by Block Save)
...@@ -154,7 +154,7 @@ extern bool g_FlDrawSpecificConvert; ...@@ -154,7 +154,7 @@ extern bool g_FlDrawSpecificConvert;
extern int g_PlotFormat; /* flag = TYPE_HPGL, TYPE_PS... */ extern int g_PlotFormat; /* flag = TYPE_HPGL, TYPE_PS... */
extern int g_PlotMargin; /* Marge pour traces du cartouche */ extern int g_PlotMargin; /* Marge pour traces du cartouche */
extern float g_PlotScaleX, g_PlotScaleY; /* coeff d'echelle de trace en unites table tracante */ extern double g_PlotScaleX, g_PlotScaleY; /* coeff d'echelle de trace en unites table tracante */
/* For HPGL plotting: Pen caract : */ /* For HPGL plotting: Pen caract : */
...@@ -166,9 +166,7 @@ struct HPGL_Pen_Descr_Struct ...@@ -166,9 +166,7 @@ struct HPGL_Pen_Descr_Struct
}; };
extern HPGL_Pen_Descr_Struct g_HPGL_Pen_Descr; extern HPGL_Pen_Descr_Struct g_HPGL_Pen_Descr;
/* Ecrans usuels */ /* First and main (root) screen */
//extern SCH_SCREEN * ScreenSch;
extern DrawSheetStruct* g_RootSheet; extern DrawSheetStruct* g_RootSheet;
extern SCH_SCREEN* g_ScreenLib; extern SCH_SCREEN* g_ScreenLib;
...@@ -193,15 +191,21 @@ extern wxString g_NetListerCommandLine; // ligne de commande pour l'appel au ...@@ -193,15 +191,21 @@ extern wxString g_NetListerCommandLine; // ligne de commande pour l'appel au
extern LayerStruct g_LayerDescr; /* couleurs des couches */ extern LayerStruct g_LayerDescr; /* couleurs des couches */
/* bool: TRUE si edition des pins pin a pin au lieu */ extern bool g_EditPinByPinIsOn; /* true to do not synchronize pins edition
extern bool g_EditPinByPinIsOn; * when they are at the same location */
extern int g_LibSymbolDefaultLineWidth; /* default line width (in EESCHEMA units) used when creating a new graphic item in libedit : 0 = default */ extern int g_LibSymbolDefaultLineWidth; /* default line width (in EESCHEMA units)
extern int g_DrawMinimunLineWidth; /* Minimum line (in EESCHEMA units) thickness used to draw items on screen; 0 = single pixel line width */ * used when creating a new graphic item in libedit.
extern int g_PlotLine_Width; /* Minimum line (in EESCHEMA units) thickness used to Plot/Print items */ * 0 = use default line thicknes
*/
extern int g_DrawDefaultLineThickness; /* Default line (in EESCHEMA units) thickness
* used to draw/plot items having a default thickness line value (i.e. = 0 ).
* 0 = single pixel line width
*/
// Color to draw selected items // Color to draw selected items
extern int g_ItemSelectetColor; extern int g_ItemSelectetColor;
// Color to draw items flagged invisible, in libedit (they are insisible in eeschema // Color to draw items flagged invisible, in libedit (they are insisible in eeschema
extern int g_InvisibleItemColor; extern int g_InvisibleItemColor;
......
eeschema/libfield.cpp
View file @ a04588db
...@@ -192,7 +192,8 @@ void WinEDA_LibeditFrame::PlaceField( wxDC* DC, LibDrawField* Field ) ...@@ -192,7 +192,8 @@ void WinEDA_LibeditFrame::PlaceField( wxDC* DC, LibDrawField* Field )
color = DARKGRAY; color = DARKGRAY;
Field->m_Pos.x = GetScreen()->m_Curseur.x; Field->m_Pos.x = GetScreen()->m_Curseur.x;
Field->m_Pos.y = -GetScreen()->m_Curseur.y; Field->m_Pos.y = -GetScreen()->m_Curseur.y;
int LineWidth = MAX( Field->m_Width, g_DrawMinimunLineWidth ); int linewidth = (Field->m_Width == 0) ? g_DrawDefaultLineThickness : Field->m_Width;
linewidth = Clamp_Text_PenSize( linewidth, Field->m_Size, Field->m_Bold );
DrawPanel->CursorOff( DC ); DrawPanel->CursorOff( DC );
GRSetDrawMode( DC, GR_DEFAULT_DRAWMODE ); GRSetDrawMode( DC, GR_DEFAULT_DRAWMODE );
...@@ -200,8 +201,8 @@ void WinEDA_LibeditFrame::PlaceField( wxDC* DC, LibDrawField* Field ) ...@@ -200,8 +201,8 @@ void WinEDA_LibeditFrame::PlaceField( wxDC* DC, LibDrawField* Field )
color, ReturnFieldFullText( Field ), color, ReturnFieldFullText( Field ),
Field->m_Orient ? TEXT_ORIENT_VERT : TEXT_ORIENT_HORIZ, Field->m_Orient ? TEXT_ORIENT_VERT : TEXT_ORIENT_HORIZ,
Field->m_Size, Field->m_Size,
Field->m_HJustify, Field->m_VJustify, LineWidth, Field->m_HJustify, Field->m_VJustify, linewidth,
Field->m_Italic, Field->m_Bold, false); Field->m_Italic, Field->m_Bold);
DrawPanel->CursorOn( DC ); DrawPanel->CursorOn( DC );
...@@ -219,7 +220,8 @@ void WinEDA_LibeditFrame::EditField( wxDC* DC, LibDrawField* Field ) ...@@ -219,7 +220,8 @@ void WinEDA_LibeditFrame::EditField( wxDC* DC, LibDrawField* Field )
wxString Text; wxString Text;
wxString title; wxString title;
EDA_Colors color; EDA_Colors color;
int LineWidth = MAX( Field->m_Width, g_DrawMinimunLineWidth ); int linewidth = (Field->m_Width == 0) ? g_DrawDefaultLineThickness : Field->m_Width;
linewidth = Clamp_Text_PenSize( linewidth, Field->m_Size, Field->m_Bold );
if( Field == NULL ) if( Field == NULL )
return; return;
...@@ -273,8 +275,8 @@ void WinEDA_LibeditFrame::EditField( wxDC* DC, LibDrawField* Field ) ...@@ -273,8 +275,8 @@ void WinEDA_LibeditFrame::EditField( wxDC* DC, LibDrawField* Field )
color, ReturnFieldFullText( Field ), color, ReturnFieldFullText( Field ),
Field->m_Orient ? TEXT_ORIENT_VERT : TEXT_ORIENT_HORIZ, Field->m_Orient ? TEXT_ORIENT_VERT : TEXT_ORIENT_HORIZ,
Field->m_Size, Field->m_Size,
Field->m_HJustify, Field->m_VJustify, LineWidth, Field->m_HJustify, Field->m_VJustify, linewidth,
Field->m_Italic, Field->m_Bold, false); Field->m_Italic, Field->m_Bold);
if( !Text.IsEmpty() ) if( !Text.IsEmpty() )
{ {
...@@ -291,8 +293,8 @@ void WinEDA_LibeditFrame::EditField( wxDC* DC, LibDrawField* Field ) ...@@ -291,8 +293,8 @@ void WinEDA_LibeditFrame::EditField( wxDC* DC, LibDrawField* Field )
color, ReturnFieldFullText( Field ), color, ReturnFieldFullText( Field ),
Field->m_Orient ? TEXT_ORIENT_VERT : TEXT_ORIENT_HORIZ, Field->m_Orient ? TEXT_ORIENT_VERT : TEXT_ORIENT_HORIZ,
Field->m_Size, Field->m_Size,
Field->m_HJustify, Field->m_VJustify, LineWidth, Field->m_HJustify, Field->m_VJustify, linewidth,
Field->m_Italic, Field->m_Bold, false); Field->m_Italic, Field->m_Bold);
GetScreen()->SetModify(); GetScreen()->SetModify();
...@@ -338,13 +340,14 @@ void WinEDA_LibeditFrame::RotateField( wxDC* DC, LibDrawField* Field ) ...@@ -338,13 +340,14 @@ void WinEDA_LibeditFrame::RotateField( wxDC* DC, LibDrawField* Field )
DrawPanel->CursorOff( DC ); DrawPanel->CursorOff( DC );
GRSetDrawMode( DC, g_XorMode ); GRSetDrawMode( DC, g_XorMode );
int LineWidth = MAX( Field->m_Width, g_DrawMinimunLineWidth ); int linewidth = (Field->m_Width == 0) ? g_DrawDefaultLineThickness : Field->m_Width;
linewidth = Clamp_Text_PenSize( linewidth, Field->m_Size, Field->m_Bold );
DrawGraphicText( DrawPanel, DC, wxPoint( Field->m_Pos.x, -Field->m_Pos.y ), DrawGraphicText( DrawPanel, DC, wxPoint( Field->m_Pos.x, -Field->m_Pos.y ),
color, ReturnFieldFullText( Field ), color, ReturnFieldFullText( Field ),
Field->m_Orient ? TEXT_ORIENT_VERT : TEXT_ORIENT_HORIZ, Field->m_Orient ? TEXT_ORIENT_VERT : TEXT_ORIENT_HORIZ,
Field->m_Size, Field->m_Size,
Field->m_HJustify, Field->m_VJustify, LineWidth, Field->m_HJustify, Field->m_VJustify, linewidth,
Field->m_Italic, Field->m_Bold, false); Field->m_Italic, Field->m_Bold);
if( Field->m_Orient ) if( Field->m_Orient )
Field->m_Orient = 0; Field->m_Orient = 0;
...@@ -358,8 +361,8 @@ void WinEDA_LibeditFrame::RotateField( wxDC* DC, LibDrawField* Field ) ...@@ -358,8 +361,8 @@ void WinEDA_LibeditFrame::RotateField( wxDC* DC, LibDrawField* Field )
color, ReturnFieldFullText( Field ), color, ReturnFieldFullText( Field ),
Field->m_Orient ? TEXT_ORIENT_VERT : TEXT_ORIENT_HORIZ, Field->m_Orient ? TEXT_ORIENT_VERT : TEXT_ORIENT_HORIZ,
Field->m_Size, Field->m_Size,
Field->m_HJustify, Field->m_VJustify, LineWidth, Field->m_HJustify, Field->m_VJustify, linewidth,
Field->m_Italic, Field->m_Bold, false); Field->m_Italic, Field->m_Bold);
DrawPanel->CursorOn( DC ); DrawPanel->CursorOn( DC );
} }
......
eeschema/plot.cpp
View file @ a04588db
...@@ -272,9 +272,9 @@ void PlotLibPart( SCH_COMPONENT* DrawLibItem ) ...@@ -272,9 +272,9 @@ void PlotLibPart( SCH_COMPONENT* DrawLibItem )
t1 = (TransMat[0][0] != 0) ^ (Text->m_Orient != 0); t1 = (TransMat[0][0] != 0) ^ (Text->m_Orient != 0);
pos = TransformCoordinate( TransMat, Text->m_Pos ) + DrawLibItem->m_Pos; pos = TransformCoordinate( TransMat, Text->m_Pos ) + DrawLibItem->m_Pos;
SetCurrentLineWidth( -1 ); SetCurrentLineWidth( -1 );
int thickness = Text->m_Width; int thickness = (Text->m_Width == 0) ? g_DrawDefaultLineThickness : Text->m_Width;
if( thickness == 0 ) // thickness = Clamp_Text_PenSize( thickness, Text->m_Size, Text->m_Bold );
thickness = MAX( g_PlotLine_Width, g_DrawMinimunLineWidth );
PlotGraphicText( g_PlotFormat, pos, CharColor, PlotGraphicText( g_PlotFormat, pos, CharColor,
Text->m_Text, Text->m_Text,
t1 ? TEXT_ORIENT_HORIZ : TEXT_ORIENT_VERT, t1 ? TEXT_ORIENT_HORIZ : TEXT_ORIENT_VERT,
...@@ -315,7 +315,7 @@ void PlotLibPart( SCH_COMPONENT* DrawLibItem ) ...@@ -315,7 +315,7 @@ void PlotLibPart( SCH_COMPONENT* DrawLibItem )
/* Dessin de la pin et du symbole special associe */ /* Dessin de la pin et du symbole special associe */
PlotPinSymbol( pos, Pin->m_PinLen, orient, Pin->m_PinShape ); PlotPinSymbol( pos, Pin->m_PinLen, orient, Pin->m_PinShape );
int thickness = MAX( g_PlotLine_Width, g_DrawMinimunLineWidth );; int thickness = g_DrawDefaultLineThickness;
Pin->PlotPinTexts( pos, orient, Pin->PlotPinTexts( pos, orient,
Entry->m_TextInside, Entry->m_TextInside,
Entry->m_DrawPinNum, Entry->m_DrawPinName, Entry->m_DrawPinNum, Entry->m_DrawPinName,
...@@ -496,9 +496,8 @@ static void PlotTextField( SCH_COMPONENT* DrawLibItem, ...@@ -496,9 +496,8 @@ static void PlotTextField( SCH_COMPONENT* DrawLibItem,
} }
int thickness = field->m_Width; int thickness = (field->m_Width == 0) ? g_DrawDefaultLineThickness : field->m_Width;
if( thickness == 0 ) thickness = Clamp_Text_PenSize( thickness, field->m_Size, field->m_Bold );
thickness = MAX( g_PlotLine_Width, g_DrawMinimunLineWidth );
SetCurrentLineWidth( thickness ); SetCurrentLineWidth( thickness );
if( !IsMulti || (FieldNumber != REFERENCE) ) if( !IsMulti || (FieldNumber != REFERENCE) )
...@@ -666,9 +665,8 @@ void PlotTextStruct( EDA_BaseStruct* Struct ) ...@@ -666,9 +665,8 @@ void PlotTextStruct( EDA_BaseStruct* Struct )
if( (g_PlotFormat == PLOT_FORMAT_POST) && g_PlotPSColorOpt ) if( (g_PlotFormat == PLOT_FORMAT_POST) && g_PlotPSColorOpt )
color = ReturnLayerColor( schText->m_Layer ); color = ReturnLayerColor( schText->m_Layer );
wxPoint textpos = schText->m_Pos + schText->GetSchematicTextOffset(); wxPoint textpos = schText->m_Pos + schText->GetSchematicTextOffset();
int thickness = schText->m_Width; int thickness = (schText->m_Width == 0) ? g_DrawDefaultLineThickness : schText->m_Width;
if( thickness == 0 ) thickness = Clamp_Text_PenSize( thickness, schText->m_Size, schText->m_Bold );
thickness = MAX( g_PlotLine_Width, g_DrawMinimunLineWidth );
SetCurrentLineWidth( thickness ); SetCurrentLineWidth( thickness );
...@@ -743,9 +741,9 @@ static void Plot_Hierarchical_PIN_Sheet( Hierarchical_PIN_Sheet_Struct* aHierarc ...@@ -743,9 +741,9 @@ static void Plot_Hierarchical_PIN_Sheet( Hierarchical_PIN_Sheet_Struct* aHierarc
tposx = posx + size + (size / 8); tposx = posx + size + (size / 8);
side = GR_TEXT_HJUSTIFY_LEFT; side = GR_TEXT_HJUSTIFY_LEFT;
} }
int thickness = aHierarchical_PIN->m_Width;
if( thickness == 0 ) int thickness = (aHierarchical_PIN->m_Width == 0) ? g_DrawDefaultLineThickness : aHierarchical_PIN->m_Width;
thickness = MAX( g_PlotLine_Width, g_DrawMinimunLineWidth ); thickness = Clamp_Text_PenSize( thickness, aHierarchical_PIN->m_Size, aHierarchical_PIN->m_Bold );
SetCurrentLineWidth( thickness ); SetCurrentLineWidth( thickness );
PlotGraphicText( g_PlotFormat, wxPoint( tposx, posy ), txtcolor, PlotGraphicText( g_PlotFormat, wxPoint( tposx, posy ), txtcolor,
...@@ -774,7 +772,7 @@ void PlotSheetStruct( DrawSheetStruct* Struct ) ...@@ -774,7 +772,7 @@ void PlotSheetStruct( DrawSheetStruct* Struct )
if( (g_PlotFormat == PLOT_FORMAT_POST) && g_PlotPSColorOpt ) if( (g_PlotFormat == PLOT_FORMAT_POST) && g_PlotPSColorOpt )
SetColorMapPS( ReturnLayerColor( Struct->m_Layer ) ); SetColorMapPS( ReturnLayerColor( Struct->m_Layer ) );
int thickness = MAX( g_PlotLine_Width, g_DrawMinimunLineWidth ); int thickness = g_DrawDefaultLineThickness;
SetCurrentLineWidth( thickness ); SetCurrentLineWidth( thickness );
Move_Plume( Struct->m_Pos, 'U' ); Move_Plume( Struct->m_Pos, 'U' );
...@@ -795,6 +793,8 @@ void PlotSheetStruct( DrawSheetStruct* Struct ) ...@@ -795,6 +793,8 @@ void PlotSheetStruct( DrawSheetStruct* Struct )
Text = Struct->m_SheetName; Text = Struct->m_SheetName;
size = wxSize( Struct->m_SheetNameSize, Struct->m_SheetNameSize ); size = wxSize( Struct->m_SheetNameSize, Struct->m_SheetNameSize );
pos = Struct->m_Pos; pos.y -= 4; pos = Struct->m_Pos; pos.y -= 4;
thickness = g_DrawDefaultLineThickness;
thickness = Clamp_Text_PenSize( thickness, size, false );
if( (g_PlotFormat == PLOT_FORMAT_POST) && g_PlotPSColorOpt ) if( (g_PlotFormat == PLOT_FORMAT_POST) && g_PlotPSColorOpt )
SetColorMapPS( ReturnLayerColor( LAYER_SHEETNAME ) ); SetColorMapPS( ReturnLayerColor( LAYER_SHEETNAME ) );
...@@ -808,6 +808,8 @@ void PlotSheetStruct( DrawSheetStruct* Struct ) ...@@ -808,6 +808,8 @@ void PlotSheetStruct( DrawSheetStruct* Struct )
/*Draw texts : FileName */ /*Draw texts : FileName */
Text = Struct->GetFileName(); Text = Struct->GetFileName();
size = wxSize( Struct->m_FileNameSize, Struct->m_FileNameSize ); size = wxSize( Struct->m_FileNameSize, Struct->m_FileNameSize );
thickness = g_DrawDefaultLineThickness;
thickness = Clamp_Text_PenSize( thickness, size, false );
if( (g_PlotFormat == PLOT_FORMAT_POST) && g_PlotPSColorOpt ) if( (g_PlotFormat == PLOT_FORMAT_POST) && g_PlotPSColorOpt )
SetColorMapPS( ReturnLayerColor( LAYER_SHEETFILENAME ) ); SetColorMapPS( ReturnLayerColor( LAYER_SHEETFILENAME ) );
......
eeschema/plotps.cpp
View file @ a04588db
...@@ -230,7 +230,7 @@ void WinEDA_PlotPSFrame::CreateControls() ...@@ -230,7 +230,7 @@ void WinEDA_PlotPSFrame::CreateControls()
SetFocus(); // make the ESC work SetFocus(); // make the ESC work
m_DefaultLineSizeCtrl = new WinEDA_ValueCtrl( this, _( m_DefaultLineSizeCtrl = new WinEDA_ValueCtrl( this, _(
"Default Line Width" ), "Default Line Width" ),
g_PlotLine_Width, g_DrawDefaultLineThickness,
g_UnitMetric, m_DefaultLineSizeCtrlSizer, g_UnitMetric, m_DefaultLineSizeCtrlSizer,
EESCHEMA_INTERNAL_UNIT ); EESCHEMA_INTERNAL_UNIT );
} }
...@@ -320,9 +320,9 @@ void WinEDA_PlotPSFrame::InitOptVars() ...@@ -320,9 +320,9 @@ void WinEDA_PlotPSFrame::InitOptVars()
Plot_Sheet_Ref = m_Plot_Sheet_Ref->GetValue(); Plot_Sheet_Ref = m_Plot_Sheet_Ref->GetValue();
g_PlotPSColorOpt = m_PlotPSColorOption->GetSelection(); g_PlotPSColorOpt = m_PlotPSColorOption->GetSelection();
PS_SizeSelect = m_SizeOption->GetSelection(); PS_SizeSelect = m_SizeOption->GetSelection();
g_PlotLine_Width = m_DefaultLineSizeCtrl->GetValue(); g_DrawDefaultLineThickness = m_DefaultLineSizeCtrl->GetValue();
if( g_PlotLine_Width < 1 ) if( g_DrawDefaultLineThickness < 1 )
g_PlotLine_Width = 1; g_DrawDefaultLineThickness = 1;
} }
...@@ -436,7 +436,7 @@ void WinEDA_PlotPSFrame::PlotOneSheetPS( const wxString& FileName, ...@@ -436,7 +436,7 @@ void WinEDA_PlotPSFrame::PlotOneSheetPS( const wxString& FileName,
m_MsgBox->AppendText( Line ); m_MsgBox->AppendText( Line );
InitPlotParametresPS( plot_offset, sheet, g_PlotScaleX, g_PlotScaleY ); InitPlotParametresPS( plot_offset, sheet, g_PlotScaleX, g_PlotScaleY );
SetDefaultLineWidthPS( g_PlotLine_Width ); SetDefaultLineWidthPS( g_DrawDefaultLineThickness );
/* Init : */ /* Init : */
PrintHeaderPS( PlotOutput, wxT( "EESchema-PS" ), FileName, 1, BBox, wxLANDSCAPE ); PrintHeaderPS( PlotOutput, wxT( "EESchema-PS" ), FileName, 1, BBox, wxLANDSCAPE );
...@@ -478,7 +478,7 @@ void WinEDA_PlotPSFrame::PlotOneSheetPS( const wxString& FileName, ...@@ -478,7 +478,7 @@ void WinEDA_PlotPSFrame::PlotOneSheetPS( const wxString& FileName,
switch( layer ) switch( layer )
{ {
case LAYER_NOTES: /* Trace en pointilles */ case LAYER_NOTES: /* Trace en pointilles */
SetCurrentLineWidth( -1 ); SetCurrentLineWidth( g_DrawDefaultLineThickness );
fprintf( PlotOutput, "[50 50] 0 setdash\n" ); fprintf( PlotOutput, "[50 50] 0 setdash\n" );
Move_Plume( StartPos, 'U' ); Move_Plume( StartPos, 'U' );
Move_Plume( EndPos, 'D' ); Move_Plume( EndPos, 'D' );
...@@ -488,16 +488,20 @@ void WinEDA_PlotPSFrame::PlotOneSheetPS( const wxString& FileName, ...@@ -488,16 +488,20 @@ void WinEDA_PlotPSFrame::PlotOneSheetPS( const wxString& FileName,
case LAYER_BUS: /* Trait large */ case LAYER_BUS: /* Trait large */
{ {
fprintf( PlotOutput, "%d setlinewidth\n", g_PlotLine_Width * 3 ); int thickness = wxRound( g_DrawDefaultLineThickness * 1.4 );
if ( thickness < 3 ) thickness = 3;
SetCurrentLineWidth( thickness );
fprintf( PlotOutput, "%d setlinewidth\n", thickness );
Move_Plume( StartPos, 'U' ); Move_Plume( StartPos, 'U' );
Move_Plume( EndPos, 'D' ); Move_Plume( EndPos, 'D' );
Plume( 'Z' ); Plume( 'Z' );
fprintf( PlotOutput, "%d setlinewidth\n", g_PlotLine_Width ); SetCurrentLineWidth( g_DrawDefaultLineThickness );
fprintf( PlotOutput, "%d setlinewidth\n", g_DrawDefaultLineThickness );
} }
break; break;
default: default:
SetCurrentLineWidth( -1 ); SetCurrentLineWidth( g_DrawDefaultLineThickness );
Move_Plume( StartPos, 'U' ); Move_Plume( StartPos, 'U' );
Move_Plume( EndPos, 'D' ); Move_Plume( EndPos, 'D' );
Plume( 'Z' ); Plume( 'Z' );
......
include/gr_basic.h
View file @ a04588db
...@@ -38,11 +38,6 @@ typedef enum { /* Line styles for Get/SetLineStyle. */ ...@@ -38,11 +38,6 @@ typedef enum { /* Line styles for Get/SetLineStyle. */
GR_DASHED_LINE = 3 GR_DASHED_LINE = 3
} GRLineStypeType; } GRLineStypeType;
typedef enum { /* Line widths for Get/SetLineStyle. */
GR_NORM_WIDTH = 1,
GR_THICK_WIDTH = 3
} GRLineWidthType;
/*******************************************************/ /*******************************************************/
/* Prototypage des fonctions definies dans gr_basic.cc */ /* Prototypage des fonctions definies dans gr_basic.cc */
......
internat/fr/kicad.mo
View file @ a04588db
No preview for this file type
internat/fr/kicad.po
View file @ a04588db
...@@ -2,8 +2,8 @@ msgid "" ...@@ -2,8 +2,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: kicad\n" "Project-Id-Version: kicad\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-05-30 18:52+0100\n" "POT-Creation-Date: 2009-06-02 10:18+0100\n"
"PO-Revision-Date: 2009-05-30 18:56+0100\n" "PO-Revision-Date: 2009-06-02 10:21+0100\n"
"Last-Translator: \n" "Last-Translator: \n"
"Language-Team: kicad team <jean-pierre.charras@ujf-grenoble.fr>\n" "Language-Team: kicad team <jean-pierre.charras@ujf-grenoble.fr>\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
...@@ -47,6 +47,7 @@ msgid "Browse Libs modules" ...@@ -47,6 +47,7 @@ msgid "Browse Libs modules"
msgstr "Liste modules" msgstr "Liste modules"
#: pcbnew/xchgmod.cpp:144 #: pcbnew/xchgmod.cpp:144
#: pcbnew/pcbplot.cpp:312
msgid "Close" msgid "Close"
msgstr "Fermer" msgstr "Fermer"
...@@ -107,37 +108,246 @@ msgstr "Sauver Fichier Composant" ...@@ -107,37 +108,246 @@ msgstr "Sauver Fichier Composant"
msgid "Unable to create file " msgid "Unable to create file "
msgstr "Impossible de créer le fichier " msgstr "Impossible de créer le fichier "
#: pcbnew/autoplac.cpp:105 #: pcbnew/pcbplot.cpp:153
msgid "Footprints NOT LOCKED will be moved" #: pcbnew/pcbplot.cpp:302
msgstr "Les modules NON FIXES vont être déplacés" msgid "Plot"
msgstr "Tracer"
#: pcbnew/autoplac.cpp:110 #: pcbnew/pcbplot.cpp:200
msgid "Footprints NOT PLACED will be moved" msgid "Plot Format"
msgstr "Les modules NON PLACES vont être déplacés" msgstr "Format de tracé"
#: pcbnew/autoplac.cpp:402 #: pcbnew/pcbplot.cpp:215
msgid "No edge PCB, Unknown board size!" msgid "HPGL Options:"
msgstr "Pas de contour PCB, la taille du PCB est inconnue!" msgstr "Options HPGL:"
#: pcbnew/autoplac.cpp:423 #: pcbnew/pcbplot.cpp:220
msgid "Cols" msgid "Pen Size"
msgstr "Cols" msgstr "Diam Plume"
#: pcbnew/autoplac.cpp:425 #: pcbnew/pcbplot.cpp:227
msgid "Lines" msgid "Pen Speed (cm/s)"
msgstr "Lignes" msgstr "Vitesse Plume ( cm/s )"
#: pcbnew/autoplac.cpp:427 #: pcbnew/pcbplot.cpp:231
msgid "Cells." msgid "Set pen speed in cm/s"
msgstr "Cells." msgstr "Ajuster Vitesse plume en centimètres par seconde"
#: pcbnew/autoplac.cpp:488 #: pcbnew/pcbplot.cpp:233
msgid "Loop" msgid "Pen ovr"
msgstr "Itération" msgstr "Recouvrement"
#: pcbnew/autoplac.cpp:642 #: pcbnew/pcbplot.cpp:239
msgid "Ok to abort ?" msgid "Set plot overlay for filling"
msgstr "Ok pour arrêter ?" msgstr "Ajuste recouvrement des tracés pour les remplissages"
#: pcbnew/pcbplot.cpp:241
msgid "Lines Width"
msgstr "Epaiss. Lignes"
#: pcbnew/pcbplot.cpp:247
msgid "Set lines width used to plot in sketch mode and plot pads outlines on silk screen layers"
msgstr "Ajuste l'épaisseur des lignes utilisées pour tracer en mode contour et pour les contours des pads sur les couches de sérigraphie"
#: pcbnew/pcbplot.cpp:252
msgid "Absolute"
msgstr "Absolu"
#: pcbnew/pcbplot.cpp:252
msgid "Auxiliary axis"
msgstr "Axe Auxiliaire"
#: pcbnew/pcbplot.cpp:255
msgid "Plot Origin"
msgstr "Origine des Coord de Tracé"
#: pcbnew/pcbplot.cpp:283
msgid "X scale adjust"
msgstr "Ajustage Echelle X"
#: pcbnew/pcbplot.cpp:286
msgid "Set X scale adjust for exact scale plotting"
msgstr "Ajuster échelle X pour traçage à l'échelle exacte"
#: pcbnew/pcbplot.cpp:290
msgid "Y scale adjust"
msgstr "Ajustage Echelle Y"
#: pcbnew/pcbplot.cpp:293
msgid "Set Y scale adjust for exact scale plotting"
msgstr "Ajuster échelle Y pour traçage à l'échelle exacte"
#: pcbnew/pcbplot.cpp:296
msgid "Plot negative"
msgstr "Tracé en Négatif"
#: pcbnew/pcbplot.cpp:305
msgid "Save Options"
msgstr "Sauver Options"
#: pcbnew/pcbplot.cpp:309
msgid "Generate drill file"
msgstr "Créer Fichier de perçage"
#: pcbnew/pcbplot.cpp:358
msgid "Exclude Edges_Pcb layer"
msgstr "Exclure Couche Contours PCB"
#: pcbnew/pcbplot.cpp:362
msgid "Exclude contents of Edges_Pcb layer from all other layers"
msgstr "Exclure les tracés contour PCB des autres couches"
#: pcbnew/pcbplot.cpp:369
msgid "Print sheet ref"
msgstr "Imprimer cartouche"
#: pcbnew/pcbplot.cpp:380
msgid "Print pads on silkscreen"
msgstr "Pads sur Sérigraphie"
#: pcbnew/pcbplot.cpp:387
msgid "Enable/disable print/plot pads on silkscreen layers"
msgstr "Active/désactive tracé des pastilles sur les couches de sérigraphie"
#: pcbnew/pcbplot.cpp:391
msgid "Always print pads"
msgstr "Toujours tracer pads"
#: pcbnew/pcbplot.cpp:396
msgid "Force print/plot pads on ALL layers"
msgstr "Force le tracé des pastilles sur TOUTES les couches"
#: pcbnew/pcbplot.cpp:401
msgid "Print module value"
msgstr "Imprimer Valeur Module"
#: pcbnew/pcbplot.cpp:405
msgid "Enable/disable print/plot module value on silkscreen layers"
msgstr "Active/désactive le tracé des textes valeurs des modules sur couches de sérigraphie"
#: pcbnew/pcbplot.cpp:409
msgid "Print module reference"
msgstr "Imprimer Référence Module"
#: pcbnew/pcbplot.cpp:413
msgid "Enable/disable print/plot module reference on silkscreen layers"
msgstr "Active/désactive le tracé des textes référence des modules sur couches de sérigraphie"
#: pcbnew/pcbplot.cpp:417
msgid "Print other module texts"
msgstr "Imprimer autres textes module"
#: pcbnew/pcbplot.cpp:421
msgid "Enable/disable print/plot module field texts on silkscreen layers"
msgstr "Active/désactive le tracé des textes des champs des modules sur couches de sérigraphie"
#: pcbnew/pcbplot.cpp:426
msgid "Force print invisible texts"
msgstr "Force tracé textes invisibles"
#: pcbnew/pcbplot.cpp:430
msgid "Force print/plot module invisible texts on silkscreen layers"
msgstr "Force le tracé des textes invisibles sur couches de sérigraphie"
#: pcbnew/pcbplot.cpp:435
msgid "No drill mark"
msgstr "Pas de marque"
#: pcbnew/pcbplot.cpp:436
msgid "Small mark"
msgstr "Petite marque"
#: pcbnew/pcbplot.cpp:437
msgid "Real drill"
msgstr "Perçage réel"
#: pcbnew/pcbplot.cpp:441
msgid "Pads Drill Opt"
msgstr "Options Perçage Pads"
#: pcbnew/pcbplot.cpp:450
msgid "Auto scale"
msgstr "Ech. auto"
#: pcbnew/pcbplot.cpp:451
msgid "Scale 1"
msgstr "Echelle 1"
#: pcbnew/pcbplot.cpp:452
msgid "Scale 1.5"
msgstr "Echelle 1,5"
#: pcbnew/pcbplot.cpp:453
msgid "Scale 2"
msgstr "Echelle 2"
#: pcbnew/pcbplot.cpp:454
msgid "Scale 3"
msgstr "Echelle 3"
#: pcbnew/pcbplot.cpp:458
msgid "Scale Opt"
msgstr "Echelle"
#: pcbnew/pcbplot.cpp:465
msgid "Line"
msgstr "Ligne"
#: pcbnew/pcbplot.cpp:465
msgid "Filled"
msgstr "Plein"
#: pcbnew/pcbplot.cpp:466
msgid "Sketch"
msgstr "Contour"
#: pcbnew/pcbplot.cpp:468
msgid "Plot Mode"
msgstr "Mode de Tracé"
#: pcbnew/pcbplot.cpp:476
msgid "Plot mirror"
msgstr "Tracé Miroir"
#: pcbnew/pcbplot.cpp:482
msgid "Vias on mask"
msgstr "Vias sur masque"
#: pcbnew/pcbplot.cpp:486
msgid "Print/plot vias on mask layers. They are in this case not protected"
msgstr "Trace vias sur vernis épargne. Elles seront non protégées"
#: pcbnew/pcbplot.cpp:490
msgid "Org = Centre"
msgstr "Org = Centre"
#: pcbnew/pcbplot.cpp:493
msgid "Draw origin ( 0,0 ) in sheet center"
msgstr "Origine des tracés au centre de la feuille"
#: pcbnew/pcbplot.cpp:707
msgid "Adobe post script files (.ps)|*.ps"
msgstr "Fichiers Adobe post script (.ps)|*.ps"
#: pcbnew/pcbplot.cpp:714
msgid "GERBER photo plot files (.pho)|*.pho"
msgstr "Fichiers phottraçage GERBER (.pho)|*.pho"
#: pcbnew/pcbplot.cpp:719
msgid "HPGL plot files (.plt)|*.plt"
msgstr "Fichiers Tracé HPGL (.plt)|*.plt"
#: pcbnew/pcbplot.cpp:726
msgid "Warning: Scale option set to a very small value"
msgstr "Attention: option d'échelle ajustée à une valeur très petite"
#: pcbnew/pcbplot.cpp:729
msgid "Warning: Scale option set to a very large value"
msgstr "Attention: option d'échelle ajustée à une valeur très grande"
#: pcbnew/pcbplot.cpp:771
msgid "No layer selected"
msgstr "Pas de couche sélectionnée"
#: pcbnew/via_edit.cpp:54 #: pcbnew/via_edit.cpp:54
msgid "Incorrect value for Via drill. No via drill change" msgid "Incorrect value for Via drill. No via drill change"
...@@ -377,10 +587,6 @@ msgstr "3:2" ...@@ -377,10 +587,6 @@ msgstr "3:2"
msgid "3:3" msgid "3:3"
msgstr "3:3" msgstr "3:3"
#: pcbnew/gendrill.cpp:745
msgid "HPGL plot files (.plt)|*.plt"
msgstr "Fichiers Tracé HPGL (.plt)|*.plt"
#: pcbnew/gendrill.cpp:750 #: pcbnew/gendrill.cpp:750
msgid "PostScript files (.ps)|*.ps" msgid "PostScript files (.ps)|*.ps"
msgstr "Fichiers PostScript (.ps)|*.ps" msgstr "Fichiers PostScript (.ps)|*.ps"
...@@ -931,339 +1137,102 @@ msgstr "Utilisateur" ...@@ -931,339 +1137,102 @@ msgstr "Utilisateur"
msgid "Orientation (in 0.1 degrees)" msgid "Orientation (in 0.1 degrees)"
msgstr "Orientation (en 0.1 degrés)" msgstr "Orientation (en 0.1 degrés)"
#: pcbnew/dialog_edit_module.cpp:307 #: pcbnew/dialog_edit_module.cpp:307
msgid "Normal+Insert" msgid "Normal+Insert"
msgstr "Normal+Insert" msgstr "Normal+Insert"
#: pcbnew/dialog_edit_module.cpp:307
msgid "Virtual"
msgstr "Virtuel"
#: pcbnew/dialog_edit_module.cpp:308
msgid "Attributes"
msgstr "Attributs"
#: pcbnew/dialog_edit_module.cpp:311
msgid "Use this attribute for most non smd components"
msgstr "Utiliser cet attribut pour la plupart des composants"
#: pcbnew/dialog_edit_module.cpp:313
msgid ""
"Use this attribute for smd components.\n"
"Only components with this option are put in the footprint position list file"
msgstr ""
"Uiliser cet attribut pour les composants CMS.\n"
"Seuls les composants avec cette option sont mis dans le fichier de position des composants"
#: pcbnew/dialog_edit_module.cpp:315
msgid "Use this attribute for \"virtual\" components drawn on board (like a old ISA PC bus connector)"
msgstr "Uiliser cet attribut pour les composants \"virtuels\" directement dessinés sur le PCB (tel que les vieux connecteurs ISA de PC)"
#: pcbnew/dialog_edit_module.cpp:339
msgid "Free"
msgstr "Libre"
#: pcbnew/dialog_edit_module.cpp:339
msgid "Locked"
msgstr "Verrouillé"
#: pcbnew/dialog_edit_module.cpp:341
msgid "Move and Auto Place"
msgstr "Déplacement et Placement Automatique"
#: pcbnew/dialog_edit_module.cpp:346
msgid "Enable hotkey move commands and Auto Placement"
msgstr "Autoriser les commandes clavier de déplacement et l'auto placement"
#: pcbnew/dialog_edit_module.cpp:347
msgid "Disable hotkey move commands and Auto Placement"
msgstr "Interdire les commandes clavier de déplacement et l'auto placement"
#: pcbnew/dialog_edit_module.cpp:351
msgid "Rotation 90 degree"
msgstr "Rotation 90 degrés"
#: pcbnew/dialog_edit_module.cpp:359
msgid "Rotation 180 degree"
msgstr "Rotation 180 degrés"
#: pcbnew/dialog_edit_module.cpp:395
msgid "3D Shape Name"
msgstr "3D forme"
#: pcbnew/dialog_edit_module.cpp:412
msgid "Browse"
msgstr "Examiner"
#: pcbnew/dialog_edit_module.cpp:415
msgid "Add 3D Shape"
msgstr "Ajout Forme 3D"
#: pcbnew/dialog_edit_module.cpp:420
msgid "Remove 3D Shape"
msgstr "Suppr. Forme 3D:"
#: pcbnew/dialog_edit_module.cpp:425
msgid "Shape Scale:"
msgstr "Echelle de la forme:"
#: pcbnew/dialog_edit_module.cpp:432
msgid "Shape Offset:"
msgstr "Offset forme:"
#: pcbnew/dialog_edit_module.cpp:441
msgid "Shape Rotation:"
msgstr "Rot de la forme"
#: pcbnew/dialog_edit_module.cpp:481
msgid "3D Shape:"
msgstr "Forme 3D:"
#: pcbnew/dialog_edit_module.cpp:808
msgid "Reference or Value cannot be deleted"
msgstr "Référence ou Valeur ne peut être effacée"
#: pcbnew/dialog_edit_module.cpp:812
#, c-format
msgid "Delete [%s]"
msgstr "Supprimer [%s]"
#: pcbnew/pcbplot.cpp:151
#: pcbnew/pcbplot.cpp:286
msgid "Plot"
msgstr "Tracer"
#: pcbnew/pcbplot.cpp:201
msgid "Plot Format"
msgstr "Format de tracé"
#: pcbnew/pcbplot.cpp:215
msgid "HPGL Options:"
msgstr "Options HPGL:"
#: pcbnew/pcbplot.cpp:219
msgid "Pen Size"
msgstr "Diam Plume"
#: pcbnew/pcbplot.cpp:224
msgid "Pen Speed (cm/s)"
msgstr "Vitesse Plume ( cm/s )"
#: pcbnew/pcbplot.cpp:228
msgid "Set pen speed in cm/s"
msgstr "Ajuster Vitesse plume en centimètres par seconde"
#: pcbnew/pcbplot.cpp:230
msgid "Pen ovr"
msgstr "Recouvrement"
#: pcbnew/pcbplot.cpp:234
msgid "Set plot overlay for filling"
msgstr "Ajuste recouvrement des tracés pour les remplissages"
#: pcbnew/pcbplot.cpp:236
msgid "Lines Width"
msgstr "Epaiss. Lignes"
#: pcbnew/pcbplot.cpp:240
msgid "Set lines width used to plot in sketch mode and plot pads outlines on silk screen layers"
msgstr "Ajuste l'épaisseur des lignes utilisées pour tracer en mode contour et pour les contours des pads sur les couches de sérigraphie"
#: pcbnew/pcbplot.cpp:244
msgid "Absolute"
msgstr "Absolu"
#: pcbnew/pcbplot.cpp:244
msgid "Auxiliary axis"
msgstr "Axe Auxiliaire"
#: pcbnew/pcbplot.cpp:247
msgid "Plot Origin"
msgstr "Origine des Coord de Tracé"
#: pcbnew/pcbplot.cpp:271
msgid "X scale adjust"
msgstr "Ajustage Echelle X"
#: pcbnew/pcbplot.cpp:273
msgid "Set X scale adjust for exact scale plotting"
msgstr "Ajuster échelle X pour traçage à l'échelle exacte"
#: pcbnew/pcbplot.cpp:276
msgid "Y scale adjust"
msgstr "Ajustage Echelle Y"
#: pcbnew/pcbplot.cpp:278
msgid "Set Y scale adjust for exact scale plotting"
msgstr "Ajuster échelle Y pour traçage à l'échelle exacte"
#: pcbnew/pcbplot.cpp:280
msgid "Plot negative"
msgstr "Tracé en Négatif"
#: pcbnew/pcbplot.cpp:289
msgid "Save Options"
msgstr "Sauver Options"
#: pcbnew/pcbplot.cpp:292
msgid "Generate drill file"
msgstr "Créer Fichier de perçage"
#: pcbnew/pcbplot.cpp:338
msgid "Exclude Edges_Pcb layer"
msgstr "Exclure Couche Contours PCB"
#: pcbnew/pcbplot.cpp:342
msgid "Exclude contents of Edges_Pcb layer from all other layers"
msgstr "Exclure les tracés contour PCB des autres couches"
#: pcbnew/pcbplot.cpp:348
msgid "Print sheet ref"
msgstr "Imprimer cartouche"
#: pcbnew/pcbplot.cpp:358
msgid "Print pads on silkscreen"
msgstr "Pads sur Sérigraphie"
#: pcbnew/pcbplot.cpp:363
msgid "Enable/disable print/plot pads on silkscreen layers"
msgstr "Active/désactive tracé des pastilles sur les couches de sérigraphie"
#: pcbnew/pcbplot.cpp:367
msgid "Always print pads"
msgstr "Toujours tracer pads"
#: pcbnew/pcbplot.cpp:371
msgid "Force print/plot pads on ALL layers"
msgstr "Force le tracé des pastilles sur TOUTES les couches"
#: pcbnew/pcbplot.cpp:375
msgid "Print module value"
msgstr "Imprimer Valeur Module"
#: pcbnew/pcbplot.cpp:379
msgid "Enable/disable print/plot module value on silkscreen layers"
msgstr "Active/désactive le tracé des textes valeurs des modules sur couches de sérigraphie"
#: pcbnew/pcbplot.cpp:382
msgid "Print module reference"
msgstr "Imprimer Référence Module"
#: pcbnew/pcbplot.cpp:386
msgid "Enable/disable print/plot module reference on silkscreen layers"
msgstr "Active/désactive le tracé des textes référence des modules sur couches de sérigraphie"
#: pcbnew/pcbplot.cpp:390
msgid "Print other module texts"
msgstr "Imprimer autres textes module"
#: pcbnew/pcbplot.cpp:394
msgid "Enable/disable print/plot module field texts on silkscreen layers"
msgstr "Active/désactive le tracé des textes des champs des modules sur couches de sérigraphie"
#: pcbnew/pcbplot.cpp:399
msgid "Force print invisible texts"
msgstr "Force tracé textes invisibles"
#: pcbnew/pcbplot.cpp:403
msgid "Force print/plot module invisible texts on silkscreen layers"
msgstr "Force le tracé des textes invisibles sur couches de sérigraphie"
#: pcbnew/pcbplot.cpp:407
msgid "No drill mark"
msgstr "Pas de marque"
#: pcbnew/pcbplot.cpp:407
msgid "Small mark"
msgstr "Petite marque"
#: pcbnew/pcbplot.cpp:407
msgid "Real drill"
msgstr "Perçage réel"
#: pcbnew/pcbplot.cpp:409 #: pcbnew/dialog_edit_module.cpp:307
msgid "Pads Drill Opt" msgid "Virtual"
msgstr "Options Perçage Pads" msgstr "Virtuel"
#: pcbnew/pcbplot.cpp:416 #: pcbnew/dialog_edit_module.cpp:308
msgid "Auto scale" msgid "Attributes"
msgstr "Ech. auto" msgstr "Attributs"
#: pcbnew/pcbplot.cpp:416 #: pcbnew/dialog_edit_module.cpp:311
msgid "Scale 1" msgid "Use this attribute for most non smd components"
msgstr "Echelle 1" msgstr "Utiliser cet attribut pour la plupart des composants"
#: pcbnew/pcbplot.cpp:416 #: pcbnew/dialog_edit_module.cpp:313
msgid "Scale 1.5" msgid ""
msgstr "Echelle 1,5" "Use this attribute for smd components.\n"
"Only components with this option are put in the footprint position list file"
msgstr ""
"Uiliser cet attribut pour les composants CMS.\n"
"Seuls les composants avec cette option sont mis dans le fichier de position des composants"
#: pcbnew/pcbplot.cpp:416 #: pcbnew/dialog_edit_module.cpp:315
msgid "Scale 2" msgid "Use this attribute for \"virtual\" components drawn on board (like a old ISA PC bus connector)"
msgstr "Echelle 2" msgstr "Uiliser cet attribut pour les composants \"virtuels\" directement dessinés sur le PCB (tel que les vieux connecteurs ISA de PC)"
#: pcbnew/pcbplot.cpp:416 #: pcbnew/dialog_edit_module.cpp:339
msgid "Scale 3" msgid "Free"
msgstr "Echelle 3" msgstr "Libre"
#: pcbnew/pcbplot.cpp:419 #: pcbnew/dialog_edit_module.cpp:339
msgid "Scale Opt" msgid "Locked"
msgstr "Echelle" msgstr "Verrouillé"
#: pcbnew/pcbplot.cpp:425 #: pcbnew/dialog_edit_module.cpp:341
msgid "Line" msgid "Move and Auto Place"
msgstr "Ligne" msgstr "Déplacement et Placement Automatique"
#: pcbnew/pcbplot.cpp:425 #: pcbnew/dialog_edit_module.cpp:346
msgid "Filled" msgid "Enable hotkey move commands and Auto Placement"
msgstr "Plein" msgstr "Autoriser les commandes clavier de déplacement et l'auto placement"
#: pcbnew/pcbplot.cpp:425 #: pcbnew/dialog_edit_module.cpp:347
msgid "Sketch" msgid "Disable hotkey move commands and Auto Placement"
msgstr "Contour" msgstr "Interdire les commandes clavier de déplacement et l'auto placement"
#: pcbnew/pcbplot.cpp:427 #: pcbnew/dialog_edit_module.cpp:351
msgid "Plot Mode" msgid "Rotation 90 degree"
msgstr "Mode de Tracé" msgstr "Rotation 90 degrés"
#: pcbnew/pcbplot.cpp:435 #: pcbnew/dialog_edit_module.cpp:359
msgid "Plot mirror" msgid "Rotation 180 degree"
msgstr "Tracé Miroir" msgstr "Rotation 180 degrés"
#: pcbnew/pcbplot.cpp:441 #: pcbnew/dialog_edit_module.cpp:395
msgid "Vias on mask" msgid "3D Shape Name"
msgstr "Vias sur masque" msgstr "3D forme"
#: pcbnew/pcbplot.cpp:445 #: pcbnew/dialog_edit_module.cpp:412
msgid "Print/plot vias on mask layers. They are in this case not protected" msgid "Browse"
msgstr "Trace vias sur vernis épargne. Elles seront non protégées" msgstr "Examiner"
#: pcbnew/pcbplot.cpp:449 #: pcbnew/dialog_edit_module.cpp:415
msgid "Org = Centre" msgid "Add 3D Shape"
msgstr "Org = Centre" msgstr "Ajout Forme 3D"
#: pcbnew/pcbplot.cpp:452 #: pcbnew/dialog_edit_module.cpp:420
msgid "Draw origin ( 0,0 ) in sheet center" msgid "Remove 3D Shape"
msgstr "Origine des tracés au centre de la feuille" msgstr "Suppr. Forme 3D:"
#: pcbnew/pcbplot.cpp:679 #: pcbnew/dialog_edit_module.cpp:425
msgid "Adobe post script files (.ps)|*.ps" msgid "Shape Scale:"
msgstr "Fichiers Adobe post script (.ps)|*.ps" msgstr "Echelle de la forme:"
#: pcbnew/pcbplot.cpp:686 #: pcbnew/dialog_edit_module.cpp:432
msgid "GERBER photo plot files (.pho)|*.pho" msgid "Shape Offset:"
msgstr "Fichiers phottraçage GERBER (.pho)|*.pho" msgstr "Offset forme:"
#: pcbnew/pcbplot.cpp:697 #: pcbnew/dialog_edit_module.cpp:441
msgid "Warning: Scale option set to a very small value" msgid "Shape Rotation:"
msgstr "Attention: option d'échelle ajustée à une valeur très petite" msgstr "Rot de la forme"
#: pcbnew/pcbplot.cpp:699 #: pcbnew/dialog_edit_module.cpp:481
msgid "Warning: Scale option set to a very large value" msgid "3D Shape:"
msgstr "Attention: option d'échelle ajustée à une valeur très grande" msgstr "Forme 3D:"
#: pcbnew/pcbplot.cpp:739 #: pcbnew/dialog_edit_module.cpp:808
msgid "No layer selected" msgid "Reference or Value cannot be deleted"
msgstr "Pas de couche sélectionnée" msgstr "Référence ou Valeur ne peut être effacée"
#: pcbnew/dialog_edit_module.cpp:812
#, c-format
msgid "Delete [%s]"
msgstr "Supprimer [%s]"
#: pcbnew/move_or_drag_track.cpp:829 #: pcbnew/move_or_drag_track.cpp:829
msgid "Unable to drag this segment: too many segments connected" msgid "Unable to drag this segment: too many segments connected"
...@@ -2524,6 +2493,38 @@ msgstr "Angle" ...@@ -2524,6 +2493,38 @@ msgstr "Angle"
msgid "Segment" msgid "Segment"
msgstr "Segment" msgstr "Segment"
#: pcbnew/autoplac.cpp:105
msgid "Footprints NOT LOCKED will be moved"
msgstr "Les modules NON FIXES vont être déplacés"
#: pcbnew/autoplac.cpp:110
msgid "Footprints NOT PLACED will be moved"
msgstr "Les modules NON PLACES vont être déplacés"
#: pcbnew/autoplac.cpp:403
msgid "No edge PCB, Unknown board size!"
msgstr "Pas de contour PCB, la taille du PCB est inconnue!"
#: pcbnew/autoplac.cpp:424
msgid "Cols"
msgstr "Cols"
#: pcbnew/autoplac.cpp:426
msgid "Lines"
msgstr "Lignes"
#: pcbnew/autoplac.cpp:428
msgid "Cells."
msgstr "Cells."
#: pcbnew/autoplac.cpp:489
msgid "Loop"
msgstr "Itération"
#: pcbnew/autoplac.cpp:643
msgid "Ok to abort ?"
msgstr "Ok pour arrêter ?"
#: pcbnew/gen_drill_report_files.cpp:392 #: pcbnew/gen_drill_report_files.cpp:392
msgid "" msgid ""
" Drill map: Too many diameter values to draw to draw one symbol per drill value (max 13)\n" " Drill map: Too many diameter values to draw to draw one symbol per drill value (max 13)\n"
...@@ -6149,7 +6150,7 @@ msgstr "Erreur en création de " ...@@ -6149,7 +6150,7 @@ msgstr "Erreur en création de "
msgid "Failed to create file " msgid "Failed to create file "
msgstr "Impossible de créer le fichier " msgstr "Impossible de créer le fichier "
#: eeschema/eeschema.cpp:146 #: eeschema/eeschema.cpp:152
msgid "Eeschema is already running, Continue?" msgid "Eeschema is already running, Continue?"
msgstr "Eeschema est en cours d'exécution. Continuer ?" msgstr "Eeschema est en cours d'exécution. Continuer ?"
...@@ -6301,11 +6302,11 @@ msgstr "Force affichage des pins invisibles" ...@@ -6301,11 +6302,11 @@ msgstr "Force affichage des pins invisibles"
msgid "HV orientation for Wires and Bus" msgid "HV orientation for Wires and Bus"
msgstr "Force direction H, V et X pour les fils et bus" msgstr "Force direction H, V et X pour les fils et bus"
#: eeschema/libfield.cpp:248 #: eeschema/libfield.cpp:250
msgid "Edit field" msgid "Edit field"
msgstr "Editer Champ" msgstr "Editer Champ"
#: eeschema/libfield.cpp:265 #: eeschema/libfield.cpp:267
msgid "" msgid ""
"This name is an existing alias of the component\n" "This name is an existing alias of the component\n"
"Aborting" "Aborting"
...@@ -6313,7 +6314,7 @@ msgstr "" ...@@ -6313,7 +6314,7 @@ msgstr ""
"Ce nom est celui d'un alias existant du composant\n" "Ce nom est celui d'un alias existant du composant\n"
"Abandon." "Abandon."
#: eeschema/libfield.cpp:285 #: eeschema/libfield.cpp:287
msgid "No new text: no change" msgid "No new text: no change"
msgstr "Pas de nouveau texte: pas de changements" msgstr "Pas de nouveau texte: pas de changements"
...@@ -6656,7 +6657,6 @@ msgid "Footprint " ...@@ -6656,7 +6657,6 @@ msgid "Footprint "
msgstr "Empreinte: " msgstr "Empreinte: "
#: eeschema/onrightclick.cpp:301 #: eeschema/onrightclick.cpp:301
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:73
msgid "Convert" msgid "Convert"
msgstr "Convert" msgstr "Convert"
...@@ -6666,7 +6666,6 @@ msgid "Unit %d %c" ...@@ -6666,7 +6666,6 @@ msgid "Unit %d %c"
msgstr "Unité %d %c" msgstr "Unité %d %c"
#: eeschema/onrightclick.cpp:314 #: eeschema/onrightclick.cpp:314
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:26
msgid "Unit" msgid "Unit"
msgstr "Unité" msgstr "Unité"
...@@ -7302,6 +7301,46 @@ msgstr "Exporter le symbole" ...@@ -7302,6 +7301,46 @@ msgstr "Exporter le symbole"
msgid "Save Symbol in [%s]" msgid "Save Symbol in [%s]"
msgstr "Symbole sauvé en [%s]" msgstr "Symbole sauvé en [%s]"
#: eeschema/class_pin.cpp:29
msgid "Pin"
msgstr "Pin"
#: eeschema/class_pin.cpp:991
msgid "PinName"
msgstr "Nom Pin"
#: eeschema/class_pin.cpp:1000
msgid "PinNum"
msgstr "Num Pin"
#: eeschema/class_pin.cpp:1004
msgid "PinType"
msgstr "Type Pin"
#: eeschema/class_pin.cpp:1010
msgid "no"
msgstr "non"
#: eeschema/class_pin.cpp:1012
msgid "yes"
msgstr "oui"
#: eeschema/class_pin.cpp:1024
msgid "Up"
msgstr "Haut"
#: eeschema/class_pin.cpp:1028
msgid "Down"
msgstr "Bas"
#: eeschema/class_pin.cpp:1032
msgid "Left"
msgstr "Gauche"
#: eeschema/class_pin.cpp:1036
msgid "Right"
msgstr "Droite"
#: eeschema/plotps.cpp:177 #: eeschema/plotps.cpp:177
msgid "Page Size A4" msgid "Page Size A4"
msgstr "Feuille A4" msgstr "Feuille A4"
...@@ -7475,6 +7514,8 @@ msgstr "" ...@@ -7475,6 +7514,8 @@ msgstr ""
"Pour les portes, ceci est la conversion \"De Morgan\"" "Pour les portes, ceci est la conversion \"De Morgan\""
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:79 #: eeschema/dialog_edit_component_in_schematic_fbp.cpp:79
#: eeschema/dialog_create_component.cpp:178
#: eeschema/dialog_edit_component_in_lib.cpp:160
msgid "Parts are locked" msgid "Parts are locked"
msgstr "Les parts sont verrouillées" msgstr "Les parts sont verrouillées"
...@@ -7515,10 +7556,12 @@ msgid "Check if you want this field's text rotated 90 degrees" ...@@ -7515,10 +7556,12 @@ msgid "Check if you want this field's text rotated 90 degrees"
msgstr "Activer si vous voulez avoir le texte de ce champ tourné à 90°" msgstr "Activer si vous voulez avoir le texte de ce champ tourné à 90°"
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:134 #: eeschema/dialog_edit_component_in_schematic_fbp.cpp:134
#: eeschema/dialog_edit_label_base.cpp:43
msgid "Bold" msgid "Bold"
msgstr "Gras" msgstr "Gras"
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:134 #: eeschema/dialog_edit_component_in_schematic_fbp.cpp:134
#: eeschema/dialog_edit_label_base.cpp:43
msgid "Bold Italic" msgid "Bold Italic"
msgstr "Gras Italique" msgstr "Gras Italique"
...@@ -7872,22 +7915,6 @@ msgstr "Vous devez fournir un nom pour ce composant" ...@@ -7872,22 +7915,6 @@ msgstr "Vous devez fournir un nom pour ce composant"
msgid "Enter the text to be used within the schematic" msgid "Enter the text to be used within the schematic"
msgstr "Enter le texte qui doit être utilisé dans la schématique" msgstr "Enter le texte qui doit être utilisé dans la schématique"
#: eeschema/dialog_edit_label_base.cpp:37
msgid "Right"
msgstr "Droite"
#: eeschema/dialog_edit_label_base.cpp:37
msgid "Up"
msgstr "Haut"
#: eeschema/dialog_edit_label_base.cpp:37
msgid "Left"
msgstr "Gauche"
#: eeschema/dialog_edit_label_base.cpp:37
msgid "Down"
msgstr "Bas"
#: eeschema/dialog_edit_label_base.cpp:39 #: eeschema/dialog_edit_label_base.cpp:39
msgid "Direction" msgid "Direction"
msgstr "Direction" msgstr "Direction"
...@@ -8043,14 +8070,6 @@ msgstr "Non Défini" ...@@ -8043,14 +8070,6 @@ msgstr "Non Défini"
msgid "All" msgid "All"
msgstr "Tout" msgstr "Tout"
#: eeschema/classes_body_items.cpp:77
msgid "no"
msgstr "non"
#: eeschema/classes_body_items.cpp:79
msgid "yes"
msgstr "oui"
#: eeschema/classes_body_items.cpp:132 #: eeschema/classes_body_items.cpp:132
#, c-format #, c-format
msgid "arc only had %d parameters of the required 8" msgid "arc only had %d parameters of the required 8"
...@@ -8058,17 +8077,17 @@ msgstr "l'arc a seulement %d paramètres sur les 8 requis" ...@@ -8058,17 +8077,17 @@ msgstr "l'arc a seulement %d paramètres sur les 8 requis"
#: eeschema/classes_body_items.cpp:331 #: eeschema/classes_body_items.cpp:331
#: eeschema/classes_body_items.cpp:451 #: eeschema/classes_body_items.cpp:451
#: eeschema/classes_body_items.cpp:585 #: eeschema/classes_body_items.cpp:587
#: eeschema/classes_body_items.cpp:691 #: eeschema/classes_body_items.cpp:693
#: eeschema/classes_body_items.cpp:775 #: eeschema/classes_body_items.cpp:777
#: eeschema/classes_body_items.cpp:1012 #: eeschema/classes_body_items.cpp:1014
msgid "Line width" msgid "Line width"
msgstr "Epaisseur ligne" msgstr "Epaisseur ligne"
#: eeschema/classes_body_items.cpp:336 #: eeschema/classes_body_items.cpp:336
#: eeschema/classes_body_items.cpp:460 #: eeschema/classes_body_items.cpp:460
#: eeschema/classes_body_items.cpp:780 #: eeschema/classes_body_items.cpp:782
#: eeschema/classes_body_items.cpp:1017 #: eeschema/classes_body_items.cpp:1019
msgid "Bounding box" msgid "Bounding box"
msgstr "Rectange dencadrement" msgstr "Rectange dencadrement"
...@@ -8086,35 +8105,35 @@ msgstr "Rayon" ...@@ -8086,35 +8105,35 @@ msgstr "Rayon"
msgid "text only had %d parameters of the required 8" msgid "text only had %d parameters of the required 8"
msgstr "le texte a seulement %d paramètres sur les 8 requis" msgstr "le texte a seulement %d paramètres sur les 8 requis"
#: eeschema/classes_body_items.cpp:593 #: eeschema/classes_body_items.cpp:595
msgid "Rectangle" msgid "Rectangle"
msgstr "Rectangle" msgstr "Rectangle"
#: eeschema/classes_body_items.cpp:616 #: eeschema/classes_body_items.cpp:618
#, c-format #, c-format
msgid "rectangle only had %d parameters of the required 7" msgid "rectangle only had %d parameters of the required 7"
msgstr "le rectangle a seulement %d paramètres sur les 7 requis" msgstr "le rectangle a seulement %d paramètres sur les 7 requis"
#: eeschema/classes_body_items.cpp:789 #: eeschema/classes_body_items.cpp:791
msgid "PolyLine" msgid "PolyLine"
msgstr "PolyLigne" msgstr "PolyLigne"
#: eeschema/classes_body_items.cpp:821 #: eeschema/classes_body_items.cpp:823
#, c-format #, c-format
msgid "polyline only had %d parameters of the required 4" msgid "polyline only had %d parameters of the required 4"
msgstr "la polyligne a seulement %d paramètres sur les 4 requis" msgstr "la polyligne a seulement %d paramètres sur les 4 requis"
#: eeschema/classes_body_items.cpp:826 #: eeschema/classes_body_items.cpp:828
#, c-format #, c-format
msgid "polyline count parameter %d is invalid" msgid "polyline count parameter %d is invalid"
msgstr "le nombre de paramètes (%d) de la polyligne est mauvais" msgstr "le nombre de paramètes (%d) de la polyligne est mauvais"
#: eeschema/classes_body_items.cpp:842 #: eeschema/classes_body_items.cpp:844
#, c-format #, c-format
msgid "polyline point %d X position not defined" msgid "polyline point %d X position not defined"
msgstr "la position X du point %d de la polyligne n'est pas définie" msgstr "la position X du point %d de la polyligne n'est pas définie"
#: eeschema/classes_body_items.cpp:849 #: eeschema/classes_body_items.cpp:851
#, c-format #, c-format
msgid "polyline point %d Y position not defined" msgid "polyline point %d Y position not defined"
msgstr "la position Y du point %d de la polyligne n'est pas définie" msgstr "la position Y du point %d de la polyligne n'est pas définie"
...@@ -8470,23 +8489,7 @@ msgstr "" ...@@ -8470,23 +8489,7 @@ msgstr ""
msgid "User defined search path" msgid "User defined search path"
msgstr "Chemin de recherche défini par l'utilisateur" msgstr "Chemin de recherche défini par l'utilisateur"
#: eeschema/class_pin.cpp:29 #: eeschema/class_libentry_fields.cpp:345
msgid "Pin"
msgstr "Pin"
#: eeschema/class_pin.cpp:984
msgid "PinName"
msgstr "Nom Pin"
#: eeschema/class_pin.cpp:993
msgid "PinNum"
msgstr "Num Pin"
#: eeschema/class_pin.cpp:997
msgid "PinType"
msgstr "Type Pin"
#: eeschema/class_libentry_fields.cpp:343
msgid "Datasheet" msgid "Datasheet"
msgstr "Documentation" msgstr "Documentation"
...@@ -8831,6 +8834,16 @@ msgstr "RefLib" ...@@ -8831,6 +8834,16 @@ msgstr "RefLib"
msgid "Lib" msgid "Lib"
msgstr "Lib" msgstr "Lib"
#: eeschema/dialog_SVG_print_base.cpp:25
#: eeschema/dialog_print_using_printer_base.cpp:25
msgid "Default Pen Size"
msgstr "Dimension Plume par Défaut"
#: eeschema/dialog_SVG_print_base.cpp:30
#: eeschema/dialog_print_using_printer_base.cpp:30
msgid "Selection of the default pen thickness used to draw items, when their thickness is set to 0."
msgstr "Valeur de la dimension de la plume utilisée par défaut pour tracer les éléments, lorsque leur épaisseur est à 0."
#: eeschema/dialog_SVG_print_base.cpp:53 #: eeschema/dialog_SVG_print_base.cpp:53
msgid "Print Current" msgid "Print Current"
msgstr "Imprimer Page Courante" msgstr "Imprimer Page Courante"
...@@ -9372,16 +9385,6 @@ msgstr " <%s>ne semble pas être une librairie de composants de Kicad valide." ...@@ -9372,16 +9385,6 @@ msgstr " <%s>ne semble pas être une librairie de composants de Kicad valide."
msgid "<%s> is an old version component file." msgid "<%s> is an old version component file."
msgstr "<%s> est un fichier composant de version ancienne." msgstr "<%s> est un fichier composant de version ancienne."
#: cvpcb/loadcmp.cpp:73
#, c-format
msgid "<%s> is not a valid Kicad PCB foot print library."
msgstr "<%s> in'est pas un fichier de module PCB Kicad valide."
#: cvpcb/loadcmp.cpp:136
#, c-format
msgid "Module %s not found"
msgstr "Module %s non trouvé"
#: cvpcb/genorcad.cpp:141 #: cvpcb/genorcad.cpp:141
#, c-format #, c-format
msgid "%s %s pin %s : Different Nets" msgid "%s %s pin %s : Different Nets"
...@@ -9402,6 +9405,16 @@ msgstr "Modules (Tous): %d" ...@@ -9402,6 +9405,16 @@ msgstr "Modules (Tous): %d"
msgid "Footprints (filtered): %d" msgid "Footprints (filtered): %d"
msgstr "Modules (filtrés): %d" msgstr "Modules (filtrés): %d"
#: cvpcb/loadcmp.cpp:74
#, c-format
msgid "<%s> is not a valid Kicad PCB foot print library."
msgstr "<%s> in'est pas un fichier de module PCB Kicad valide."
#: cvpcb/loadcmp.cpp:137
#, c-format
msgid "Module %s not found"
msgstr "Module %s non trouvé"
#: cvpcb/autosel.cpp:93 #: cvpcb/autosel.cpp:93
#, c-format #, c-format
msgid "Footprint alias library file <%s> could not be found in the default search paths." msgid "Footprint alias library file <%s> could not be found in the default search paths."
...@@ -9939,18 +9952,6 @@ msgstr "Exécuter le Script Python" ...@@ -9939,18 +9952,6 @@ msgstr "Exécuter le Script Python"
msgid "Ok to delete block ?" msgid "Ok to delete block ?"
msgstr "Ok pour effacer le bloc" msgstr "Ok pour effacer le bloc"
#: gerbview/export_to_pcbnew.cpp:44
msgid "None of the Gerber layers contain any data"
msgstr "Aucune couche Gerber ne contient des données"
#: gerbview/export_to_pcbnew.cpp:55
msgid "Board file name:"
msgstr "Nom Fichier C.I.:"
#: gerbview/export_to_pcbnew.cpp:72
msgid "Ok to change the existing file ?"
msgstr "D'accord pour changer le fichier existant ?"
#: gerbview/gerberframe.cpp:183 #: gerbview/gerberframe.cpp:183
msgid "Layer modified, Continue ?" msgid "Layer modified, Continue ?"
msgstr "Couche modifiée, Continuer ?" msgstr "Couche modifiée, Continuer ?"
...@@ -9995,11 +9996,11 @@ msgstr "Fichiers Gerber (.gbr .gbx .lgr .ger .pho)| \t\t\t*.gbr;*.GBR;*.gbx;*.GB ...@@ -9995,11 +9996,11 @@ msgstr "Fichiers Gerber (.gbr .gbx .lgr .ger .pho)| \t\t\t*.gbr;*.GBR;*.gbx;*.GB
#: gerbview/files.cpp:142 #: gerbview/files.cpp:142
msgid "Top layer (*.GTL)|*.GTL;*.gtl|" msgid "Top layer (*.GTL)|*.GTL;*.gtl|"
msgstr "" msgstr "Couche composant"
#: gerbview/files.cpp:143 #: gerbview/files.cpp:143
msgid "Bottom layer (*.GBL)|*.GBL;*.gbl|" msgid "Bottom layer (*.GBL)|*.GBL;*.gbl|"
msgstr "" msgstr "Couche cuivre"
#: gerbview/files.cpp:144 #: gerbview/files.cpp:144
msgid "Bottom solder resist (*.GBS)|*.GBS;*.gbs|" msgid "Bottom solder resist (*.GBS)|*.GBS;*.gbs|"
...@@ -10140,6 +10141,18 @@ msgstr "Couche " ...@@ -10140,6 +10141,18 @@ msgstr "Couche "
msgid "Do not export" msgid "Do not export"
msgstr "Ne pas exporter" msgstr "Ne pas exporter"
#: gerbview/export_to_pcbnew.cpp:44
msgid "None of the Gerber layers contain any data"
msgstr "Aucune couche Gerber ne contient des données"
#: gerbview/export_to_pcbnew.cpp:55
msgid "Board file name:"
msgstr "Nom Fichier C.I.:"
#: gerbview/export_to_pcbnew.cpp:72
msgid "Ok to change the existing file ?"
msgstr "D'accord pour changer le fichier existant ?"
#: gerbview/onrightclick.cpp:54 #: gerbview/onrightclick.cpp:54
msgid "Copy Block (shift mouse)" msgid "Copy Block (shift mouse)"
msgstr "Copie Bloc (shift souris)" msgstr "Copie Bloc (shift souris)"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment