haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

more about texts and labels options under eeschema

This commit is contained in:
charras 2008-12-20 13:12:57 +00:00
parent bfb53744ff
commit f1eb69a1a3
32 changed files with 578 additions and 580 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.txt
View File

@ -10,8 +10,8 @@ email address.
++All ++All
Cleaning code to draw/plot texts (work in progress): Cleaning code to draw/plot texts (work in progress):
Now only one function is used to draw and plot texts Now only one function is used to draw and plot texts
(easier to maintain and ensure textes have the same size in ploting and drawing) (easier to maintain and ensure texts have the same size in ploting and drawing)
In eeschema, italic and bold texts allowed (in pcbenew, texts thicness is already adjustable) In eeschema, italic and bold texts allowed (in pcbenew, texts thickness is already adjustable)
2008-Dec-18 UPDATE Wayne Stambaugh <stambaughw@verizon.net> 2008-Dec-18 UPDATE Wayne Stambaugh <stambaughw@verizon.net>

4
bitmaps/makefile.g95
View File

@ -10,5 +10,5 @@ libbitmaps.a: $(OBJECTS)
ranlib $@ ranlib $@
clean: clean:
rm -f *.o # rm -f *.o
rm -f *.a " rm -f *.a

2
common/drawframe.cpp
View File

@ -585,7 +585,7 @@ void WinEDA_DrawFrame::OnZoom( int zoom_type )
case ID_POPUP_ZOOM_REDRAW: case ID_POPUP_ZOOM_REDRAW:
case ID_ZOOM_REDRAW_KEY: case ID_ZOOM_REDRAW_KEY:
case ID_ZOOM_REDRAW_BUTT: case ID_ZOOM_REDRAW_BUTT:
ReDrawPanel(); DrawPanel->Refresh();
break; break;
case ID_POPUP_ZOOM_CENTER: case ID_POPUP_ZOOM_CENTER:

15
common/drawtxt.cpp
View File

@ -75,6 +75,7 @@ void DrawGraphicText( WinEDA_DrawPanel* aPanel, wxDC* DC,
aWidth = -aWidth; aWidth = -aWidth;
sketch_mode = TRUE; sketch_mode = TRUE;
} }
int thickness = aWidth;
kk = 0; kk = 0;
ptr = 0; /* ptr = text index */ ptr = 0; /* ptr = text index */
@ -85,9 +86,9 @@ void DrawGraphicText( WinEDA_DrawPanel* aPanel, wxDC* DC,
pitch = (10 * size_h ) / 9; // this is the pitch between chars pitch = (10 * size_h ) / 9; // this is the pitch between chars
if ( pitch > 0 ) if ( pitch > 0 )
pitch += ABS(aWidth); pitch += ABS(thickness);
else else
pitch -= ABS(aWidth); pitch -= ABS(thickness);
ox = cX = aPos.x; ox = cX = aPos.x;
oy = cY = aPos.y; oy = cY = aPos.y;
@ -194,10 +195,10 @@ void DrawGraphicText( WinEDA_DrawPanel* aPanel, wxDC* DC,
if( (aSize.x / zoom) == 0 ) if( (aSize.x / zoom) == 0 )
return; return;
if( ABS( (aSize.x / zoom) ) < 3 ) /* chars trop petits pour etre dessines */ if( ABS( (aSize.x / zoom) ) < 3 ) /* shapes are too small: connot be drawn */
{ /* le texte est symbolise par une barre */ { /* insteed the text is drawn as a line */
dx = (pitch * char_count) / 2; dx = (pitch * char_count) / 2;
dy = size_v / 2; /* Decalage du debut du texte / centre */ dy = size_v / 2; /* line is always centered */
ux0 = cX - dx; ux0 = cX - dx;
uy0 = cY; uy0 = cY;
@ -328,7 +329,7 @@ static void s_Callback_plot(int x0, int y0, int xf, int yf)
MovePenFct( pend, 'D' ); MovePenFct( pend, 'D' );
s_Plotbegin = false; s_Plotbegin = false;
} }
else else
{ {
if ( PenLastPos == pstart ) // this is a next segment in a polyline if ( PenLastPos == pstart ) // this is a next segment in a polyline
@ -341,7 +342,7 @@ static void s_Callback_plot(int x0, int y0, int xf, int yf)
MovePenFct( pend, 'D' ); MovePenFct( pend, 'D' );
} }
} }
PenLastPos = pend; PenLastPos = pend;
} }
/******************************************************************************************/ /******************************************************************************************/

4
common/makefile.include
View File

@ -8,6 +8,7 @@ OBJECTS= \
about_kicad.o\ about_kicad.o\
base_struct.o\ base_struct.o\
basicframe.o\ basicframe.o\
drawframe.o\
confirm.o \ confirm.o \
copy_to_clipboard.o\ copy_to_clipboard.o\
class_drawpickedstruct.o\ class_drawpickedstruct.o\
@ -36,7 +37,8 @@ OBJECTS= \
eda_dde.o\ eda_dde.o\
worksheet.o\ worksheet.o\
base_screen.o\ base_screen.o\
dcsvg.o dcsvg.o\
zoom.o
ifdef KICAD_PYTHON ifdef KICAD_PYTHON
OBJECTS += pyhandler.o OBJECTS += pyhandler.o

2
common/zoom.cpp
View File

@ -215,7 +215,7 @@ void WinEDA_DrawPanel::Process_Popup_Zoom( wxCommandEvent& event )
void WinEDA_DrawPanel::OnPopupGridSelect( wxCommandEvent& event ) void WinEDA_DrawPanel::OnPopupGridSelect( wxCommandEvent& event )
{ {
GetScreen()->SetGrid( event.GetId() ); GetScreen()->SetGrid( event.GetId() );
m_Parent->ReDrawPanel(); Refresh();
} }
/*************************************************************/ /*************************************************************/

14
cvpcb/dialog_display_options.cpp
View File

@ -1,12 +1,12 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: dialog_display_options.cpp // Name: dialog_display_options.cpp
// Purpose: // Purpose:
// Author: jean-pierre Charras // Author: jean-pierre Charras
// Modified by: // Modified by:
// Created: 17/02/2006 17:47:55 // Created: 17/02/2006 17:47:55
// RCS-ID: // RCS-ID:
// Copyright: License GNU // Copyright: License GNU
// Licence: // Licence:
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Generated by DialogBlocks (unregistered), 17/02/2006 17:47:55 // Generated by DialogBlocks (unregistered), 17/02/2006 17:47:55
@ -130,7 +130,7 @@ bool WinEDA_FootprintDisplayOptionsFrame::Create( wxWindow* parent, wxWindowID i
*/ */
void WinEDA_FootprintDisplayOptionsFrame::CreateControls() void WinEDA_FootprintDisplayOptionsFrame::CreateControls()
{ {
SetFont(*g_DialogFont); SetFont(*g_DialogFont);
////@begin WinEDA_FootprintDisplayOptionsFrame content construction ////@begin WinEDA_FootprintDisplayOptionsFrame content construction
@ -252,7 +252,7 @@ void WinEDA_FootprintDisplayOptionsFrame::UpdateObjectSettings(void)
DisplayOpt.DisplayModEdge = m_Parent->m_DisplayModEdge = DisplayOpt.DisplayModEdge = m_Parent->m_DisplayModEdge =
m_EdgesDisplayOption->GetSelection(); m_EdgesDisplayOption->GetSelection();
DisplayOpt.DisplayModText = m_Parent->m_DisplayModText = DisplayOpt.DisplayModText = m_Parent->m_DisplayModText =
m_TextDisplayOption->GetSelection(); m_TextDisplayOption->GetSelection();
DisplayOpt.DisplayPadNum = m_Parent->m_DisplayPadNum = DisplayOpt.DisplayPadNum = m_Parent->m_DisplayPadNum =
@ -261,7 +261,7 @@ void WinEDA_FootprintDisplayOptionsFrame::UpdateObjectSettings(void)
DisplayOpt.DisplayPadFill = m_Parent->m_DisplayPadFill = DisplayOpt.DisplayPadFill = m_Parent->m_DisplayPadFill =
m_IsShowPadFill->GetValue(); m_IsShowPadFill->GetValue();
m_Parent->ReDrawPanel(); m_Parent->DrawPanel->Refresh();
////@end WinEDA_FootprintDisplayOptionsFrame update settings ////@end WinEDA_FootprintDisplayOptionsFrame update settings
} }

5
cvpcb/makefile.include
View File

@ -20,7 +20,6 @@ OBJECTS = $(TARGET).o \
memoire.o \ memoire.o \
cvframe.o\ cvframe.o\
listboxes.o\ listboxes.o\
drawframe.o\
class_pcb_text.o\ class_pcb_text.o\
class_cotation.o\ class_cotation.o\
class_mire.o\ class_mire.o\
@ -39,7 +38,6 @@ OBJECTS = $(TARGET).o \
autosel.o \ autosel.o \
setvisu.o\ setvisu.o\
dialog_display_options.o\ dialog_display_options.o\
zoom.o \
tracemod.o \ tracemod.o \
classpcb.o \ classpcb.o \
class_drawsegment.o \ class_drawsegment.o \
@ -153,9 +151,6 @@ autosel.o: autosel.cpp
setvisu.o: setvisu.cpp setvisu.o: setvisu.cpp
zoom.o: ../share/zoom.cpp
$(CXX) -c $(EDACPPFLAGS) -o $@ ../share/$*.cpp
tracemod.o: ../pcbnew/tracemod.cpp ../include/gr_basic.h tracemod.o: ../pcbnew/tracemod.cpp ../include/gr_basic.h
$(CXX) -c $(EDACPPFLAGS) -o $@ ../pcbnew/$*.cpp $(CXX) -c $(EDACPPFLAGS) -o $@ ../pcbnew/$*.cpp

2
eeschema/dialog_edit_label_base.cpp
View File

@ -31,7 +31,7 @@ DialogLabelEditor_Base::DialogLabelEditor_Base( wxWindow* parent, wxWindowID id,
wxString m_TextOrientChoices[] = { _("Right"), _("Up"), _("Left"), _("Down") }; wxString m_TextOrientChoices[] = { _("Right"), _("Up"), _("Left"), _("Down") };
int m_TextOrientNChoices = sizeof( m_TextOrientChoices ) / sizeof( wxString ); int m_TextOrientNChoices = sizeof( m_TextOrientChoices ) / sizeof( wxString );
m_TextOrient = new wxRadioBox( this, wxID_ANY, _("wxRadioBox"), wxDefaultPosition, wxDefaultSize, m_TextOrientNChoices, m_TextOrientChoices, 1, wxRA_SPECIFY_COLS ); m_TextOrient = new wxRadioBox( this, wxID_ANY, _("Direction"), wxDefaultPosition, wxDefaultSize, m_TextOrientNChoices, m_TextOrientChoices, 1, wxRA_SPECIFY_COLS );
m_TextOrient->SetSelection( 0 ); m_TextOrient->SetSelection( 0 );
m_OptionsSizer->Add( m_TextOrient, 0, wxALL, 5 ); m_OptionsSizer->Add( m_TextOrient, 0, wxALL, 5 );

2
eeschema/dialog_edit_label_base.fbp
View File

@ -212,7 +212,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">wxRadioBox</property> <property name="label">Direction</property>
<property name="majorDimension">1</property> <property name="majorDimension">1</property>
<property name="maximum_size"></property> <property name="maximum_size"></property>
<property name="minimum_size"></property> <property name="minimum_size"></property>

4
eeschema/eelayer.cpp
View File

@ -370,7 +370,7 @@ void WinEDA_SetColorsFrame::OnOkClick( wxCommandEvent& WXUNUSED (event) )
/**********************************************************************/ /**********************************************************************/
{ {
UpdateLayerSettings(); UpdateLayerSettings();
m_Parent->ReDrawPanel(); m_Parent->DrawPanel->Refresh();
EndModal( 1 ); EndModal( 1 );
} }
@ -388,7 +388,7 @@ void WinEDA_SetColorsFrame::OnApplyClick( wxCommandEvent& WXUNUSED (event) )
/*******************************************************************/ /*******************************************************************/
{ {
UpdateLayerSettings(); UpdateLayerSettings();
m_Parent->ReDrawPanel(); m_Parent->DrawPanel->Refresh();
} }

2
eeschema/files-io.cpp
View File

@ -125,7 +125,7 @@ int WinEDA_SchematicFrame::LoadOneEEProject( const wxString& FileName,
Read_Config( wxEmptyString, TRUE ); Read_Config( wxEmptyString, TRUE );
Zoom_Automatique( TRUE ); Zoom_Automatique( TRUE );
SetSheetNumberAndCount(); SetSheetNumberAndCount();
ReDrawPanel(); DrawPanel->Refresh();
return 1; return 1;
} }

2
eeschema/lib_export.cpp
View File

@ -64,7 +64,7 @@ void WinEDA_LibeditFrame::ImportOnePart()
{ {
ReCreateHToolbar(); ReCreateHToolbar();
DisplayLibInfos(); DisplayLibInfos();
ReDrawPanel(); DrawPanel->Refresh();
} }
} }

2
eeschema/libedit.cpp
View File

@ -117,7 +117,7 @@ EDA_LibComponentStruct *LibEntry = NULL;
LoadOneLibraryPartAux(LibEntry, CurrentLib); LoadOneLibraryPartAux(LibEntry, CurrentLib);
ReCreateHToolbar(); ReCreateHToolbar();
Zoom_Automatique(FALSE); Zoom_Automatique(FALSE);
ReDrawPanel(); DrawPanel->Refresh();
return TRUE; return TRUE;
} }

14
eeschema/libframe.cpp
View File

@ -351,7 +351,7 @@ void WinEDA_LibeditFrame::Process_Special_Functions( wxCommandEvent& event )
LibItemToRepeat = NULL; LibItemToRepeat = NULL;
CreateNewLibraryPart(); CreateNewLibraryPart();
GetScreen()->ClearUndoRedoList(); GetScreen()->ClearUndoRedoList();
ReDrawPanel(); DrawPanel->Refresh();
SetToolbars(); SetToolbars();
break; break;
} }
@ -368,7 +368,7 @@ void WinEDA_LibeditFrame::Process_Special_Functions( wxCommandEvent& event )
GetScreen()->ClearUndoRedoList(); GetScreen()->ClearUndoRedoList();
SetToolbars(); SetToolbars();
} }
ReDrawPanel(); DrawPanel->Refresh();
break; break;
case ID_LIBEDIT_SAVE_CURRENT_PART: case ID_LIBEDIT_SAVE_CURRENT_PART:
@ -388,7 +388,7 @@ void WinEDA_LibeditFrame::Process_Special_Functions( wxCommandEvent& event )
LibItemToRepeat = NULL; LibItemToRepeat = NULL;
ImportOnePart(); ImportOnePart();
GetScreen()->ClearUndoRedoList(); GetScreen()->ClearUndoRedoList();
ReDrawPanel(); DrawPanel->Refresh();
break; break;
case ID_LIBEDIT_EXPORT_PART: case ID_LIBEDIT_EXPORT_PART:
@ -410,7 +410,7 @@ void WinEDA_LibeditFrame::Process_Special_Functions( wxCommandEvent& event )
m_HToolBar->ToggleTool( ID_DE_MORGAN_CONVERT_BUTT, FALSE ); m_HToolBar->ToggleTool( ID_DE_MORGAN_CONVERT_BUTT, FALSE );
LibItemToRepeat = NULL; LibItemToRepeat = NULL;
CurrentConvert = 1; CurrentConvert = 1;
ReDrawPanel(); DrawPanel->Refresh();
break; break;
case ID_DE_MORGAN_CONVERT_BUTT: case ID_DE_MORGAN_CONVERT_BUTT:
@ -418,7 +418,7 @@ void WinEDA_LibeditFrame::Process_Special_Functions( wxCommandEvent& event )
m_HToolBar->ToggleTool( ID_DE_MORGAN_CONVERT_BUTT, TRUE ); m_HToolBar->ToggleTool( ID_DE_MORGAN_CONVERT_BUTT, TRUE );
LibItemToRepeat = NULL; LibItemToRepeat = NULL;
CurrentConvert = 2; CurrentConvert = 2;
ReDrawPanel(); DrawPanel->Refresh();
break; break;
case ID_LIBEDIT_VIEW_DOC: case ID_LIBEDIT_VIEW_DOC:
@ -451,7 +451,7 @@ void WinEDA_LibeditFrame::Process_Special_Functions( wxCommandEvent& event )
return; return;
LibItemToRepeat = NULL; LibItemToRepeat = NULL;
CurrentUnit = ii + 1; CurrentUnit = ii + 1;
ReDrawPanel(); DrawPanel->Refresh();
} }
break; break;
@ -465,7 +465,7 @@ void WinEDA_LibeditFrame::Process_Special_Functions( wxCommandEvent& event )
CurrentAliasName = m_SelAliasBox->GetValue(); CurrentAliasName = m_SelAliasBox->GetValue();
else else
CurrentAliasName.Empty(); CurrentAliasName.Empty();
ReDrawPanel(); DrawPanel->Refresh();
} }
break; break;

14
eeschema/makefile.include
View File

@ -32,7 +32,6 @@ OBJECTS = eeschema.o\
tool_lib.o\ tool_lib.o\
tool_sch.o\ tool_sch.o\
tool_viewlib.o\ tool_viewlib.o\
drawframe.o\
schframe.o\ schframe.o\
viewlib_frame.o\ viewlib_frame.o\
wxprint.o\ wxprint.o\
@ -48,7 +47,6 @@ OBJECTS = eeschema.o\
eelayer.o \ eelayer.o \
priorque.o eeconfig.o \ priorque.o eeconfig.o \
affiche.o \ affiche.o \
zoom.o \
getpart.o\ getpart.o\
netlist.o\ netlist.o\
netlist_control.o\ netlist_control.o\
@ -103,9 +101,6 @@ eeschema.o: eeschema.cpp program.h general.h $(DEPEND)
read_from_file_schematic_items_descriptions.o: read_from_file_schematic_items_descriptions.cpp read_from_file_schematic_items_descriptions.o: read_from_file_schematic_items_descriptions.cpp
#edit_component_in_lib.o: edit_component_in_lib.cpp\
# dialog_edit_component_in_lib.cpp dialog_edit_component_in_lib.h $(DEPEND)
edit_component_in_schematic.o: edit_component_in_schematic.cpp\ edit_component_in_schematic.o: edit_component_in_schematic.cpp\
dialog_edit_component_in_schematic.cpp dialog_edit_component_in_schematic.h $(DEPEND) dialog_edit_component_in_schematic.cpp dialog_edit_component_in_schematic.h $(DEPEND)
@ -150,15 +145,6 @@ setpage.o: ../share/setpage.cpp $(DEPEND)
svg_print.o: ../share/svg_print.cpp ../share/svg_print.h $(DEPEND) svg_print.o: ../share/svg_print.cpp ../share/svg_print.h $(DEPEND)
$(CXX) -c $(EDACPPFLAGS) -o $@ ../share/$*.cpp $(CXX) -c $(EDACPPFLAGS) -o $@ ../share/$*.cpp
zoom.o: ../share/zoom.cpp $(DEPEND)
$(CXX) -c $(EDACPPFLAGS) -o $@ ../share/$*.cpp
treeprj.o: ../share/treeprj.cpp $(DEPEND)
$(CXX) -c $(EDACPPFLAGS) -o $@ ../share/$*.cpp
mdiframe.o: ../share/mdiframe.cpp $(DEPEND)
$(CXX) -c $(EDACPPFLAGS) -o $@ ../share/$*.cpp
buildmnu.o: ../share/buildmnu.cpp $(DEPEND) buildmnu.o: ../share/buildmnu.cpp $(DEPEND)
$(CXX) -c $(EDACPPFLAGS) -o $@ ../share/$*.cpp $(CXX) -c $(EDACPPFLAGS) -o $@ ../share/$*.cpp

42
eeschema/plot.cpp
View File

@ -245,15 +245,17 @@ void PlotLibPart( SCH_COMPONENT* DrawLibItem )
case COMPONENT_GRAPHIC_TEXT_DRAW_TYPE: case COMPONENT_GRAPHIC_TEXT_DRAW_TYPE:
{ {
LibDrawText* Text = (LibDrawText*) DEntry; LibDrawText* Text = (LibDrawText*) DEntry;
/* The text orientation may need to be flipped if the /* The text orientation may need to be flipped if the
* transformation matrix causes xy axes to be flipped. */ * transformation matrix causes xy axes to be flipped. */
t1 = (TransMat[0][0] != 0) ^ (Text->m_Horiz != 0); t1 = (TransMat[0][0] != 0) ^ (Text->m_Horiz != 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; // @todo: calcultae the pen tickness int thickness = Text->m_Width;
PlotGraphicText( g_PlotFormat, pos, CharColor, if( thickness == 0 ) //
thickness = MAX( g_PlotPSMinimunLineWidth, g_DrawMinimunLineWidth );
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,
Text->m_Size, Text->m_Size,
@ -465,8 +467,10 @@ static void PlotTextField( SCH_COMPONENT* DrawLibItem,
} }
} }
SetCurrentLineWidth( -1 ); int thickness = field->m_Width;
int thickness = field->m_Width; // @todo: calculate the pen tickness if( thickness == 0 )
thickness = MAX( g_PlotPSMinimunLineWidth, g_DrawMinimunLineWidth );
SetCurrentLineWidth( thickness );
//@todo not sure what to do here in terms of plotting components that may have multiple REFERENCE entries. //@todo not sure what to do here in terms of plotting components that may have multiple REFERENCE entries.
if( !IsMulti || (FieldNumber != REFERENCE) ) if( !IsMulti || (FieldNumber != REFERENCE) )
@ -651,7 +655,6 @@ void PlotTextStruct( EDA_BaseStruct* Struct )
if( Size.x == 0 ) if( Size.x == 0 )
Size = wxSize( DEFAULT_SIZE_TEXT, DEFAULT_SIZE_TEXT ); Size = wxSize( DEFAULT_SIZE_TEXT, DEFAULT_SIZE_TEXT );
SetCurrentLineWidth( -1 );
if ( Struct->Type() == TYPE_SCH_GLOBALLABEL ) if ( Struct->Type() == TYPE_SCH_GLOBALLABEL )
{ {
offset = ( (SCH_GLOBALLABEL*) Struct )->m_Width; offset = ( (SCH_GLOBALLABEL*) Struct )->m_Width;
@ -672,6 +675,9 @@ void PlotTextStruct( EDA_BaseStruct* Struct )
} }
} }
if( thickness == 0 )
thickness = MAX( g_PlotPSMinimunLineWidth, g_DrawMinimunLineWidth );
SetCurrentLineWidth( thickness );
switch( Orient ) switch( Orient )
{ {
@ -767,6 +773,10 @@ static void PlotSheetLabelStruct( Hierarchical_PIN_Sheet_Struct* Struct )
side = GR_TEXT_HJUSTIFY_LEFT; side = GR_TEXT_HJUSTIFY_LEFT;
} }
int thickness = Struct->m_Width; int thickness = Struct->m_Width;
if( thickness == 0 )
thickness = MAX( g_PlotPSMinimunLineWidth, g_DrawMinimunLineWidth );
SetCurrentLineWidth( thickness );
bool italic = Struct->m_Italic; bool italic = Struct->m_Italic;
PlotGraphicText( g_PlotFormat, wxPoint( tposx, posy ), txtcolor, PlotGraphicText( g_PlotFormat, wxPoint( tposx, posy ), txtcolor,
Struct->m_Text, TEXT_ORIENT_HORIZ, wxSize( size, size ), Struct->m_Text, TEXT_ORIENT_HORIZ, wxSize( size, size ),
@ -834,7 +844,8 @@ 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 ) );
SetCurrentLineWidth( -1 ); int thickness = MAX( g_PlotPSMinimunLineWidth, g_DrawMinimunLineWidth );
SetCurrentLineWidth( thickness );
Move_Plume( Struct->m_Pos, 'U' ); Move_Plume( Struct->m_Pos, 'U' );
pos = Struct->m_Pos; pos.x += Struct->m_Size.x; pos = Struct->m_Pos; pos.x += Struct->m_Size.x;
@ -850,7 +861,7 @@ void PlotSheetStruct( DrawSheetStruct* Struct )
Plume( 'U' ); Plume( 'U' );
/* Trace des textes : SheetName */ /* Draw texts: SheetName */
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;
@ -858,14 +869,13 @@ void PlotSheetStruct( DrawSheetStruct* Struct )
if( (g_PlotFormat == PLOT_FORMAT_POST) && g_PlotPSColorOpt ) if( (g_PlotFormat == PLOT_FORMAT_POST) && g_PlotPSColorOpt )
SetColorMapPS( ReturnLayerColor( LAYER_SHEETNAME ) ); SetColorMapPS( ReturnLayerColor( LAYER_SHEETNAME ) );
int thickness = 0; //@todo use current pen width
bool italic = false; bool italic = false;
PlotGraphicText( g_PlotFormat, pos, txtcolor, PlotGraphicText( g_PlotFormat, pos, txtcolor,
Text, TEXT_ORIENT_HORIZ, size, Text, TEXT_ORIENT_HORIZ, size,
GR_TEXT_HJUSTIFY_LEFT, GR_TEXT_VJUSTIFY_BOTTOM, GR_TEXT_HJUSTIFY_LEFT, GR_TEXT_VJUSTIFY_BOTTOM,
thickness, italic ); thickness, italic );
/* Trace des textes : 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 );
@ -879,7 +889,7 @@ void PlotSheetStruct( DrawSheetStruct* Struct )
GR_TEXT_HJUSTIFY_LEFT, GR_TEXT_VJUSTIFY_TOP, GR_TEXT_HJUSTIFY_LEFT, GR_TEXT_VJUSTIFY_TOP,
thickness, italic ); thickness, italic );
/* Trace des textes : SheetLabel */ /* Draw texts : SheetLabel */
SheetLabelStruct = Struct->m_Label; SheetLabelStruct = Struct->m_Label;
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 ) );

20
eeschema/read_from_file_schematic_items_descriptions.cpp
View File

@ -33,7 +33,7 @@ SCH_ITEM* ReadTextDescr( FILE * aFile,
char Name1[256]; char Name1[256];
char Name2[256]; char Name2[256];
char Name3[256]; char Name3[256];
int width = 0, size = 0, orient = 0; int thickness = 0, size = 0, orient = 0;
wxPoint pos; wxPoint pos;
char* SLine = aLine; char* SLine = aLine;
@ -45,7 +45,7 @@ SCH_ITEM* ReadTextDescr( FILE * aFile,
Name1[0] = 0; Name2[0] = 0; Name3[0] = 0; Name1[0] = 0; Name2[0] = 0; Name3[0] = 0;
int ii = sscanf( SLine, "%s %d %d %d %d %s %s %d", int ii = sscanf( SLine, "%s %d %d %d %d %s %s %d",
Name1, &pos.x, &pos.y, &orient, &size, Name2, Name3, &width ); Name1, &pos.x, &pos.y, &orient, &size, Name2, Name3, &thickness );
if( ii < 4 ) if( ii < 4 )
{ {
@ -75,7 +75,11 @@ SCH_ITEM* ReadTextDescr( FILE * aFile,
TextStruct->m_Size.x = TextStruct->m_Size.y = size; TextStruct->m_Size.x = TextStruct->m_Size.y = size;
TextStruct->m_Orient = orient; TextStruct->m_Orient = orient;
TextStruct->m_Width = width; if ( isdigit(Name3[0]) )
{
thickness = atol(Name3);
TextStruct->m_Width = thickness;
}
Struct = TextStruct; Struct = TextStruct;
if( stricmp( Name2, "Italic" ) == 0 ) if( stricmp( Name2, "Italic" ) == 0 )
TextStruct->m_Italic = 1; TextStruct->m_Italic = 1;
@ -88,7 +92,7 @@ SCH_ITEM* ReadTextDescr( FILE * aFile,
TextStruct->m_Size.x = TextStruct->m_Size.y = size; TextStruct->m_Size.x = TextStruct->m_Size.y = size;
TextStruct->m_Orient = orient; TextStruct->m_Orient = orient;
TextStruct->m_Shape = NET_INPUT; TextStruct->m_Shape = NET_INPUT;
TextStruct->m_Width = width; TextStruct->m_Width = thickness;
if( stricmp( Name2, SheetLabelType[NET_OUTPUT] ) == 0 ) if( stricmp( Name2, SheetLabelType[NET_OUTPUT] ) == 0 )
TextStruct->m_Shape = NET_OUTPUT; TextStruct->m_Shape = NET_OUTPUT;
@ -109,7 +113,7 @@ SCH_ITEM* ReadTextDescr( FILE * aFile,
TextStruct->m_Size.x = TextStruct->m_Size.y = size; TextStruct->m_Size.x = TextStruct->m_Size.y = size;
TextStruct->m_Orient = orient; TextStruct->m_Orient = orient;
TextStruct->m_Shape = NET_INPUT; TextStruct->m_Shape = NET_INPUT;
TextStruct->m_Width = width; TextStruct->m_Width = thickness;
if( stricmp( Name2, SheetLabelType[NET_OUTPUT] ) == 0 ) if( stricmp( Name2, SheetLabelType[NET_OUTPUT] ) == 0 )
TextStruct->m_Shape = NET_OUTPUT; TextStruct->m_Shape = NET_OUTPUT;
@ -129,7 +133,11 @@ SCH_ITEM* ReadTextDescr( FILE * aFile,
TextStruct->m_Size.x = TextStruct->m_Size.y = size; TextStruct->m_Size.x = TextStruct->m_Size.y = size;
TextStruct->m_Orient = orient; TextStruct->m_Orient = orient;
TextStruct->m_Width = width; if ( isdigit(Name3[0]) )
{
thickness = atol(Name3);
TextStruct->m_Width = thickness;
}
if( strnicmp( Name2, "Italic", 6 ) == 0 ) if( strnicmp( Name2, "Italic", 6 ) == 0 )
TextStruct->m_Italic = 1; TextStruct->m_Italic = 1;

2
eeschema/symbdraw.cpp
View File

@ -126,7 +126,7 @@ bodygraphics_PropertiesAccept( wxCommandEvent& event )
if( CurrentDrawItem ) if( CurrentDrawItem )
CurrentDrawItem->Display_Infos_DrawEntry( m_Parent ); CurrentDrawItem->Display_Infos_DrawEntry( m_Parent );
m_Parent->ReDrawPanel(); m_Parent->DrawPanel->Refresh();
} }

2
eeschema/tool_sch.cpp
View File

@ -293,7 +293,7 @@ void WinEDA_SchematicFrame::OnSelectOptionToolbar( wxCommandEvent& event )
{ {
case ID_TB_OPTIONS_SHOW_GRID: case ID_TB_OPTIONS_SHOW_GRID:
g_ShowGrid = m_Draw_Grid = m_OptionsToolBar->GetToolState( id ); g_ShowGrid = m_Draw_Grid = m_OptionsToolBar->GetToolState( id );
ReDrawPanel(); DrawPanel->Refresh();
break; break;
case ID_TB_OPTIONS_SELECT_UNIT_MM: case ID_TB_OPTIONS_SELECT_UNIT_MM:

6
eeschema/viewlib_frame.cpp
View File

@ -242,7 +242,7 @@ void WinEDA_ViewlibFrame::ReCreateListLib()
ReCreateListCmp(); ReCreateListCmp();
ReCreateHToolbar(); ReCreateHToolbar();
DisplayLibInfos(); DisplayLibInfos();
ReDrawPanel(); DrawPanel->Refresh();
} }
@ -283,7 +283,7 @@ void WinEDA_ViewlibFrame::ClickOnLibList( wxCommandEvent& event )
return; return;
g_CurrentViewLibraryName = name; g_CurrentViewLibraryName = name;
ReCreateListCmp(); ReCreateListCmp();
ReDrawPanel(); DrawPanel->Refresh();
DisplayLibInfos(); DisplayLibInfos();
ReCreateHToolbar(); ReCreateHToolbar();
} }
@ -305,7 +305,7 @@ void WinEDA_ViewlibFrame::ClickOnCmpList( wxCommandEvent& event )
g_ViewConvert = 1; g_ViewConvert = 1;
Zoom_Automatique( FALSE ); Zoom_Automatique( FALSE );
ReCreateHToolbar(); ReCreateHToolbar();
ReDrawPanel(); DrawPanel->Refresh();
} }

8
eeschema/viewlibs.cpp
View File

@ -63,21 +63,21 @@ wxPoint pos;
m_HToolBar->ToggleTool(ID_LIBVIEW_DE_MORGAN_NORMAL_BUTT, TRUE); m_HToolBar->ToggleTool(ID_LIBVIEW_DE_MORGAN_NORMAL_BUTT, TRUE);
m_HToolBar->ToggleTool(ID_LIBVIEW_DE_MORGAN_CONVERT_BUTT, FALSE); m_HToolBar->ToggleTool(ID_LIBVIEW_DE_MORGAN_CONVERT_BUTT, FALSE);
g_ViewConvert = 1; g_ViewConvert = 1;
ReDrawPanel(); DrawPanel->Refresh();
break; break;
case ID_LIBVIEW_DE_MORGAN_CONVERT_BUTT: case ID_LIBVIEW_DE_MORGAN_CONVERT_BUTT:
m_HToolBar->ToggleTool(ID_LIBVIEW_DE_MORGAN_NORMAL_BUTT, FALSE); m_HToolBar->ToggleTool(ID_LIBVIEW_DE_MORGAN_NORMAL_BUTT, FALSE);
m_HToolBar->ToggleTool(ID_LIBVIEW_DE_MORGAN_CONVERT_BUTT, TRUE); m_HToolBar->ToggleTool(ID_LIBVIEW_DE_MORGAN_CONVERT_BUTT, TRUE);
g_ViewConvert = 2; g_ViewConvert = 2;
ReDrawPanel(); DrawPanel->Refresh();
break; break;
case ID_LIBVIEW_SELECT_PART_NUMBER: case ID_LIBVIEW_SELECT_PART_NUMBER:
ii = SelpartBox->GetChoice(); ii = SelpartBox->GetChoice();
if ( ii < 0 ) return; if ( ii < 0 ) return;
g_ViewUnit = ii + 1; g_ViewUnit = ii + 1;
ReDrawPanel(); DrawPanel->Refresh();
break; break;
default: default:
@ -143,7 +143,7 @@ LibraryStruct * Lib;
if ( m_LibList ) if ( m_LibList )
{ {
ReCreateListCmp(); ReCreateListCmp();
ReDrawPanel(); DrawPanel->Refresh();
DisplayLibInfos(); DisplayLibInfos();
ReCreateHToolbar(); ReCreateHToolbar();
int id = m_LibList->FindString(g_CurrentViewLibraryName.GetData()); int id = m_LibList->FindString(g_CurrentViewLibraryName.GetData());

5
gerbview/makefile.include
View File

@ -27,7 +27,6 @@ OBJECTS= \
class_track.o \ class_track.o \
class_drc_item.o \ class_drc_item.o \
class_board_connected_item.o\ class_board_connected_item.o\
drawframe.o\
set_color.o \ set_color.o \
gerbview_config.o \ gerbview_config.o \
class_marker.o \ class_marker.o \
@ -35,7 +34,6 @@ OBJECTS= \
tracepcb.o \ tracepcb.o \
class_pcb_text.o\ class_pcb_text.o\
trpiste.o \ trpiste.o \
zoom.o\
reglage.o \ reglage.o \
options.o \ options.o \
initpcb.o\ initpcb.o\
@ -106,8 +104,5 @@ collectors.o: ../pcbnew/collectors.cpp
class_track.o: ../pcbnew/class_track.cpp class_track.o: ../pcbnew/class_track.cpp
$(CXX) -c $(EDACPPFLAGS) -o $@ ../pcbnew/$*.cpp $(CXX) -c $(EDACPPFLAGS) -o $@ ../pcbnew/$*.cpp
zoom.o: ../share/zoom.cpp
$(CXX) -c $(EDACPPFLAGS) -o $@ ../share/$*.cpp
undelete.o: ../pcbnew/undelete.cpp undelete.o: ../pcbnew/undelete.cpp
$(CXX) -c $(EDACPPFLAGS) -o $@ ../pcbnew/$*.cpp $(CXX) -c $(EDACPPFLAGS) -o $@ ../pcbnew/$*.cpp

4
gerbview/set_color.cpp
View File

@ -370,7 +370,7 @@ void WinEDA_SetColorsFrame::OnOkClick(wxCommandEvent& WXUNUSED(event))
/*******************************************************************/ /*******************************************************************/
{ {
UpdateLayerSettings(); UpdateLayerSettings();
m_Parent->ReDrawPanel(); m_Parent->DrawPanel->Refresh();
EndModal( 1 ); EndModal( 1 );
} }
@ -388,7 +388,7 @@ void WinEDA_SetColorsFrame::OnApplyClick(wxCommandEvent& WXUNUSED(event))
/*******************************************************************/ /*******************************************************************/
{ {
UpdateLayerSettings(); UpdateLayerSettings();
m_Parent->ReDrawPanel(); m_Parent->DrawPanel->Refresh();
} }

BIN
internat/fr/kicad.mo
View File

Binary file not shown.

954
internat/fr/kicad.po
View File

File diff suppressed because it is too large Load Diff

4
pcbnew/basepcbframe.cpp
View File

@ -359,8 +359,8 @@ void WinEDA_BasePcbFrame::SetToolID( int id, int new_cursor_id,
// must do this after the tool has been set, otherwise pad::Draw() does // must do this after the tool has been set, otherwise pad::Draw() does
// not show proper color when DisplayOpt.ContrastModeDisplay is true. // not show proper color when DisplayOpt.ContrastModeDisplay is true.
if( redraw ) if( redraw && DrawPanel)
ReDrawPanel(); DrawPanel->Refresh();
} }
void WinEDA_BasePcbFrame::Affiche_Status_Box() void WinEDA_BasePcbFrame::Affiche_Status_Box()

2
pcbnew/initpcb.cpp
View File

@ -99,7 +99,7 @@ void WinEDA_PcbGlobalDeleteFrame::AcceptPcbDelete( wxCommandEvent& event )
if( redraw ) if( redraw )
{ {
m_Parent->SetCurItem( NULL ); m_Parent->SetCurItem( NULL );
m_Parent->ReDrawPanel(); m_Parent->DrawPanel->Refresh();
} }
EndModal( 1 ); EndModal( 1 );

8
pcbnew/makefile.include
View File

@ -61,7 +61,6 @@ OBJECTS= $(TARGET).o classpcb.o\
class_board.o\ class_board.o\
class_zone.o\ class_zone.o\
class_zone_setting.o\ class_zone_setting.o\
drawframe.o\
track.o \ track.o \
set_color.o \ set_color.o \
set_grid.o \ set_grid.o \
@ -77,7 +76,6 @@ OBJECTS= $(TARGET).o classpcb.o\
locate.o \ locate.o \
modules.o \ modules.o \
loadcmp.o \ loadcmp.o \
zoom.o\
dialog_setup_libs.o \ dialog_setup_libs.o \
dialog_general_options.o \ dialog_general_options.o \
dialog_orient_footprints.o\ dialog_orient_footprints.o\
@ -137,9 +135,6 @@ OBJECTS= $(TARGET).o classpcb.o\
setpage.o: ../share/setpage.cpp setpage.o: ../share/setpage.cpp
$(CXX) -c $(EDACPPFLAGS) -o $@ ../share/$*.cpp $(CXX) -c $(EDACPPFLAGS) -o $@ ../share/$*.cpp
drawframe.o: ../share/drawframe.cpp
$(CXX) -c $(EDACPPFLAGS) -o $@ ../share/$*.cpp
menubarpcb.o: menubarpcb.cpp menubarpcb.o: menubarpcb.cpp
dialog_general_options.o: dialog_general_options.cpp dialog_track_options.cpp dialog_display_options.cpp\ dialog_general_options.o: dialog_general_options.cpp dialog_track_options.cpp dialog_display_options.cpp\
@ -215,9 +210,6 @@ automove.o: automove.cpp autorout.h
loadcmp.o: loadcmp.cpp loadcmp.o: loadcmp.cpp
zoom.o: ../share/zoom.cpp
$(CXX) -c $(EDACPPFLAGS) -o $@ ../share/$*.cpp
affiche.o: affiche.cpp affiche.o: affiche.cpp
tr_modif.o: tr_modif.cpp tr_modif.o: tr_modif.cpp

2
pcbnew/sel_layer.cpp
View File

@ -254,7 +254,7 @@ void WinEDA_BasePcbFrame::SelectLayerPair()
// because the PAD_SMD pads may change color. // because the PAD_SMD pads may change color.
if( result >= 0 && DisplayOpt.ContrastModeDisplay ) if( result >= 0 && DisplayOpt.ContrastModeDisplay )
{ {
ReDrawPanel(); DrawPanel->Refresh();
} }
} }

4
pcbnew/set_color.cpp
View File

@ -398,7 +398,7 @@ void WinEDA_SetColorsFrame::OnOkClick( wxCommandEvent& WXUNUSED (event) )
/**********************************************************************/ /**********************************************************************/
{ {
UpdateLayerSettings(); UpdateLayerSettings();
m_Parent->ReDrawPanel(); m_Parent->DrawPanel->Refresh();
EndModal( 1 ); EndModal( 1 );
} }
@ -416,7 +416,7 @@ void WinEDA_SetColorsFrame::OnApplyClick(wxCommandEvent& WXUNUSED(event))
/*******************************************************************/ /*******************************************************************/
{ {
UpdateLayerSettings(); UpdateLayerSettings();
m_Parent->ReDrawPanel(); m_Parent->DrawPanel->Refresh();
} }

3
share/setpage.cpp
View File

@ -70,7 +70,8 @@ void WinEDA_DrawFrame::Process_PageSettings(wxCommandEvent& event)
{ {
WinEDA_SetPageFrame frame(this); WinEDA_SetPageFrame frame(this);
frame.ShowModal(); frame.ShowModal();
ReDrawPanel(); if ( DrawPanel )
DrawPanel->Refresh();
} }
/*! /*!