more about texts and labels options under eeschema

CHANGELOG.txt

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

bitmaps/makefile.g95

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

common/drawframe.cpp

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

common/drawtxt.cpp

@@ -75,6 +75,7 @@ void DrawGraphicText( WinEDA_DrawPanel* aPanel, wxDC* DC,
         aWidth = -aWidth;
         sketch_mode = TRUE;
     }
+    int thickness = aWidth;
 
     kk = 0;
     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
     if ( pitch > 0 )
-        pitch += ABS(aWidth);
+        pitch += ABS(thickness);
     else
-        pitch -= ABS(aWidth);
+        pitch -= ABS(thickness);
 
     ox = cX = aPos.x;
     oy = cY = aPos.y;
@@ -194,10 +195,10 @@ void DrawGraphicText( WinEDA_DrawPanel* aPanel, wxDC* DC,
     if( (aSize.x / zoom) == 0 )
         return;
 
-    if( ABS( (aSize.x / zoom) ) < 3 )    /* chars trop petits pour etre dessines */
-    {                                   /* le texte est symbolise par une barre */
+    if( ABS( (aSize.x / zoom) ) < 3 )    /* shapes are too small: connot be drawn */
+    {                                   /* insteed the text is drawn as a line */
         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;
         uy0 = cY;

common/makefile.include

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

common/zoom.cpp

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

cvpcb/dialog_display_options.cpp

@@ -261,7 +261,7 @@ void WinEDA_FootprintDisplayOptionsFrame::UpdateObjectSettings(void)
 	DisplayOpt.DisplayPadFill = m_Parent->m_DisplayPadFill =
 		m_IsShowPadFill->GetValue();
 
-	m_Parent->ReDrawPanel();
+	m_Parent->DrawPanel->Refresh();
 ////@end WinEDA_FootprintDisplayOptionsFrame update settings
 }
 

cvpcb/makefile.include

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

eeschema/dialog_edit_label_base.cpp

@@ -31,7 +31,7 @@ DialogLabelEditor_Base::DialogLabelEditor_Base( wxWindow* parent, wxWindowID id,
 	
 	wxString m_TextOrientChoices[] = { _("Right"), _("Up"), _("Left"), _("Down") };
 	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_OptionsSizer->Add( m_TextOrient, 0, wxALL, 5 );
 	

eeschema/dialog_edit_label_base.fbp

@@ -212,7 +212,7 @@
                                         <property name="font"></property>
                                         <property name="hidden">0</property>
                                         <property name="id">wxID_ANY</property>
-                                        <property name="label">wxRadioBox</property>
+                                        <property name="label">Direction</property>
                                         <property name="majorDimension">1</property>
                                         <property name="maximum_size"></property>
                                         <property name="minimum_size"></property>

eeschema/eelayer.cpp

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

eeschema/files-io.cpp

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

eeschema/lib_export.cpp

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

eeschema/libedit.cpp

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

eeschema/libframe.cpp

@@ -351,7 +351,7 @@ void WinEDA_LibeditFrame::Process_Special_Functions( wxCommandEvent& event )
         LibItemToRepeat    = NULL;
         CreateNewLibraryPart();
         GetScreen()->ClearUndoRedoList();
-        ReDrawPanel();
+        DrawPanel->Refresh();
         SetToolbars();
         break;
     }
@@ -368,7 +368,7 @@ void WinEDA_LibeditFrame::Process_Special_Functions( wxCommandEvent& event )
             GetScreen()->ClearUndoRedoList();
             SetToolbars();
         }
-        ReDrawPanel();
+        DrawPanel->Refresh();
         break;
 
     case ID_LIBEDIT_SAVE_CURRENT_PART:
@@ -388,7 +388,7 @@ void WinEDA_LibeditFrame::Process_Special_Functions( wxCommandEvent& event )
         LibItemToRepeat = NULL;
         ImportOnePart();
         GetScreen()->ClearUndoRedoList();
-        ReDrawPanel();
+        DrawPanel->Refresh();
         break;
 
     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 );
         LibItemToRepeat = NULL;
         CurrentConvert  = 1;
-        ReDrawPanel();
+        DrawPanel->Refresh();
         break;
 
     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 );
         LibItemToRepeat = NULL;
         CurrentConvert  = 2;
-        ReDrawPanel();
+        DrawPanel->Refresh();
         break;
 
     case ID_LIBEDIT_VIEW_DOC:
@@ -451,7 +451,7 @@ void WinEDA_LibeditFrame::Process_Special_Functions( wxCommandEvent& event )
             return;
         LibItemToRepeat = NULL;
         CurrentUnit = ii + 1;
-        ReDrawPanel();
+        DrawPanel->Refresh();
     }
         break;
 
@@ -465,7 +465,7 @@ void WinEDA_LibeditFrame::Process_Special_Functions( wxCommandEvent& event )
             CurrentAliasName = m_SelAliasBox->GetValue();
         else
             CurrentAliasName.Empty();
-        ReDrawPanel();
+        DrawPanel->Refresh();
     }
         break;
 

eeschema/makefile.include

@@ -32,7 +32,6 @@ OBJECTS = eeschema.o\
 	tool_lib.o\
 	tool_sch.o\
 	tool_viewlib.o\
-	drawframe.o\
 	schframe.o\
 	viewlib_frame.o\
 	wxprint.o\
@@ -48,7 +47,6 @@ OBJECTS = eeschema.o\
 	eelayer.o \
 	priorque.o eeconfig.o \
 	affiche.o \
-	zoom.o \
 	getpart.o\
 	netlist.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
 
 
-#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\
 	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)
 	$(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)
 	$(CXX) -c $(EDACPPFLAGS) -o $@ ../share/$*.cpp
 

eeschema/plot.cpp

@@ -252,7 +252,9 @@ void PlotLibPart( SCH_COMPONENT* DrawLibItem )
             t1    = (TransMat[0][0] != 0) ^ (Text->m_Horiz != 0);
             pos = TransformCoordinate( TransMat, Text->m_Pos ) + DrawLibItem->m_Pos;
             SetCurrentLineWidth( -1 );
-                int thickness = Text->m_Width;   // @todo: calcultae the pen tickness
+            int thickness = Text->m_Width;
+			if( thickness == 0 )	//
+				thickness = MAX( g_PlotPSMinimunLineWidth, g_DrawMinimunLineWidth );
             PlotGraphicText( g_PlotFormat, pos, CharColor,
                                  Text->m_Text,
                                  t1 ? TEXT_ORIENT_HORIZ : TEXT_ORIENT_VERT,
@@ -465,8 +467,10 @@ static void PlotTextField( SCH_COMPONENT* DrawLibItem,
             }
     }
 
-    SetCurrentLineWidth( -1 );
-    int thickness = field->m_Width;   // @todo: calculate the pen tickness
+    int thickness = field->m_Width;
+	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.
     if( !IsMulti || (FieldNumber != REFERENCE) )
@@ -651,7 +655,6 @@ void PlotTextStruct( EDA_BaseStruct* Struct )
     if( Size.x == 0 )
         Size = wxSize( DEFAULT_SIZE_TEXT, DEFAULT_SIZE_TEXT );
 
-    SetCurrentLineWidth( -1 );
     if ( Struct->Type() == TYPE_SCH_GLOBALLABEL )
     {
         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 )
     {
@@ -767,6 +773,10 @@ static void PlotSheetLabelStruct( Hierarchical_PIN_Sheet_Struct* Struct )
         side  = GR_TEXT_HJUSTIFY_LEFT;
     }
     int thickness = Struct->m_Width;
+	if( thickness == 0 )
+		thickness = MAX( g_PlotPSMinimunLineWidth, g_DrawMinimunLineWidth );
+    SetCurrentLineWidth( thickness );
+
     bool italic = Struct->m_Italic;
     PlotGraphicText( g_PlotFormat, wxPoint( tposx, posy ), txtcolor,
                      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 )
         SetColorMapPS( ReturnLayerColor( Struct->m_Layer ) );
 
-    SetCurrentLineWidth( -1 );
+    int thickness = MAX( g_PlotPSMinimunLineWidth, g_DrawMinimunLineWidth );
+    SetCurrentLineWidth( thickness );
 
     Move_Plume( Struct->m_Pos, 'U' );
     pos = Struct->m_Pos; pos.x += Struct->m_Size.x;
@@ -850,7 +861,7 @@ void PlotSheetStruct( DrawSheetStruct* Struct )
 
     Plume( 'U' );
 
-    /* Trace des textes : SheetName */
+    /* Draw texts: SheetName */
     Text = Struct->m_SheetName;
     size = wxSize( Struct->m_SheetNameSize, Struct->m_SheetNameSize );
     pos  = Struct->m_Pos; pos.y -= 4;
@@ -858,14 +869,13 @@ void PlotSheetStruct( DrawSheetStruct* Struct )
     if( (g_PlotFormat == PLOT_FORMAT_POST) && g_PlotPSColorOpt )
         SetColorMapPS( ReturnLayerColor( LAYER_SHEETNAME ) );
 
-    int thickness = 0;      //@todo use current pen width
     bool italic = false;
     PlotGraphicText( g_PlotFormat, pos, txtcolor,
                      Text, TEXT_ORIENT_HORIZ, size,
                      GR_TEXT_HJUSTIFY_LEFT, GR_TEXT_VJUSTIFY_BOTTOM,
                     thickness, italic );
 
-    /* Trace des textes : FileName */
+    /*Draw texts : FileName */
     Text = Struct->GetFileName();
     size = wxSize( Struct->m_FileNameSize, Struct->m_FileNameSize );
 
@@ -879,7 +889,7 @@ void PlotSheetStruct( DrawSheetStruct* Struct )
                      GR_TEXT_HJUSTIFY_LEFT, GR_TEXT_VJUSTIFY_TOP,
                     thickness, italic );
 
-    /* Trace des textes : SheetLabel */
+    /* Draw texts : SheetLabel */
     SheetLabelStruct = Struct->m_Label;
     if( (g_PlotFormat == PLOT_FORMAT_POST) && g_PlotPSColorOpt )
         SetColorMapPS( ReturnLayerColor( Struct->m_Layer ) );

eeschema/read_from_file_schematic_items_descriptions.cpp

@@ -33,7 +33,7 @@ SCH_ITEM* ReadTextDescr( FILE * aFile,
     char      Name1[256];
     char      Name2[256];
     char      Name3[256];
-    int       width = 0, size = 0, orient = 0;
+    int       thickness = 0, size = 0, orient = 0;
     wxPoint   pos;
 
     char*     SLine = aLine;
@@ -45,7 +45,7 @@ SCH_ITEM* ReadTextDescr( FILE * aFile,
 
     Name1[0] = 0; Name2[0] = 0; Name3[0] = 0;
     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 )
     {
@@ -75,7 +75,11 @@ SCH_ITEM* ReadTextDescr( FILE * aFile,
 
         TextStruct->m_Size.x = TextStruct->m_Size.y = size;
         TextStruct->m_Orient = orient;
-        TextStruct->m_Width  = width;
+		if ( isdigit(Name3[0]) )
+		{
+			thickness = atol(Name3);
+			TextStruct->m_Width  = thickness;
+		}
         Struct = TextStruct;
         if( stricmp( Name2, "Italic" ) == 0 )
             TextStruct->m_Italic = 1;
@@ -88,7 +92,7 @@ SCH_ITEM* ReadTextDescr( FILE * aFile,
         TextStruct->m_Size.x = TextStruct->m_Size.y = size;
         TextStruct->m_Orient = orient;
         TextStruct->m_Shape  = NET_INPUT;
-        TextStruct->m_Width  = width;
+        TextStruct->m_Width  = thickness;
 
         if( stricmp( Name2, SheetLabelType[NET_OUTPUT] ) == 0 )
             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_Orient = orient;
         TextStruct->m_Shape  = NET_INPUT;
-        TextStruct->m_Width  = width;
+        TextStruct->m_Width  = thickness;
 
         if( stricmp( Name2, SheetLabelType[NET_OUTPUT] ) == 0 )
             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_Orient = orient;
-        TextStruct->m_Width  = width;
+		if ( isdigit(Name3[0]) )
+		{
+			thickness = atol(Name3);
+			TextStruct->m_Width  = thickness;
+		}
 
         if( strnicmp( Name2, "Italic", 6 ) == 0 )
             TextStruct->m_Italic = 1;

eeschema/symbdraw.cpp

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

eeschema/tool_sch.cpp

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

eeschema/viewlib_frame.cpp

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

eeschema/viewlibs.cpp

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

gerbview/makefile.include

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

gerbview/set_color.cpp

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

pcbnew/basepcbframe.cpp

@@ -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
     // not show proper color when DisplayOpt.ContrastModeDisplay is true.
-    if( redraw )
-        ReDrawPanel();
+    if( redraw && DrawPanel)
+        DrawPanel->Refresh();
 }
 
 void WinEDA_BasePcbFrame::Affiche_Status_Box()

pcbnew/initpcb.cpp

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

pcbnew/makefile.include

@@ -61,7 +61,6 @@ OBJECTS=	$(TARGET).o classpcb.o\
 		class_board.o\
 		class_zone.o\
         class_zone_setting.o\
-		drawframe.o\
 		track.o \
 		set_color.o \
 		set_grid.o \
@@ -77,7 +76,6 @@ OBJECTS=	$(TARGET).o classpcb.o\
 		locate.o \
 		modules.o \
 		loadcmp.o \
-		zoom.o\
 		dialog_setup_libs.o \
 		dialog_general_options.o \
         dialog_orient_footprints.o\
@@ -137,9 +135,6 @@ OBJECTS=	$(TARGET).o classpcb.o\
 setpage.o: ../share/setpage.cpp
 	$(CXX) -c $(EDACPPFLAGS) -o $@ ../share/$*.cpp
 
-drawframe.o: ../share/drawframe.cpp
-	$(CXX) -c $(EDACPPFLAGS) -o $@ ../share/$*.cpp
-
 menubarpcb.o: menubarpcb.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
 
-zoom.o: ../share/zoom.cpp
-	$(CXX) -c $(EDACPPFLAGS) -o $@ ../share/$*.cpp
-
 affiche.o: affiche.cpp
 
 tr_modif.o: tr_modif.cpp

pcbnew/sel_layer.cpp

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

pcbnew/set_color.cpp

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

share/setpage.cpp

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