From 04cdb15cebe410ab3a0a0c28b0aa2e0ee5b61710 Mon Sep 17 00:00:00 2001 From: Maciej Suminski Date: Fri, 20 Sep 2013 17:29:32 +0200 Subject: [PATCH] Changed the way of refreshing canvases (both standard & GAL). --- common/dialogs/dialog_page_settings.cpp | 2 +- common/drawframe.cpp | 4 ++-- common/drawpanel.cpp | 13 ++++++++++ common/zoom.cpp | 15 +++--------- include/class_drawpanel.h | 3 +++ include/view/view.h | 4 ++-- include/wxstruct.h | 6 ----- pcbnew/autorouter/automove.cpp | 2 +- pcbnew/basepcbframe.cpp | 8 +++---- pcbnew/board_undo_redo.cpp | 6 ++--- pcbnew/class_pcb_layer_widget.cpp | 10 ++++---- pcbnew/dialogs/dialog_display_options.cpp | 2 +- pcbnew/dialogs/dialog_drc.cpp | 2 +- pcbnew/dialogs/dialog_general_options.cpp | 24 ++++++------------- pcbnew/dialogs/dialog_global_deletion.cpp | 2 +- .../dialog_global_edit_tracks_and_vias.cpp | 2 +- .../dialog_global_modules_fields_edition.cpp | 2 +- pcbnew/dialogs/dialog_orient_footprints.cpp | 2 +- pcbnew/dialogs/dialog_set_grid.cpp | 2 +- pcbnew/edit.cpp | 16 ++++++------- pcbnew/edit_pcb_text.cpp | 8 +++---- pcbnew/editmod.cpp | 4 ++-- pcbnew/edtxtmod.cpp | 2 +- pcbnew/event_handlers_tracks_vias_sizes.cpp | 2 +- pcbnew/footprint_wizard.cpp | 2 +- pcbnew/footprint_wizard_frame.cpp | 4 ++-- pcbnew/hotkeys_board_editor.cpp | 6 ++--- pcbnew/modedit.cpp | 18 +++++++------- pcbnew/modedit_onclick.cpp | 12 +++++----- pcbnew/modedit_undo_redo.cpp | 4 ++-- pcbnew/modules.cpp | 6 ++--- pcbnew/modview.cpp | 2 +- pcbnew/modview_frame.cpp | 6 ++--- pcbnew/move_or_drag_track.cpp | 2 +- pcbnew/netlist.cpp | 2 +- pcbnew/sel_layer.cpp | 2 +- pcbnew/xchgmod.cpp | 6 ++--- pcbnew/zones_by_polygon.cpp | 2 +- pcbnew/zones_by_polygon_fill_functions.cpp | 2 +- 39 files changed, 105 insertions(+), 114 deletions(-) diff --git a/common/dialogs/dialog_page_settings.cpp b/common/dialogs/dialog_page_settings.cpp index b788ceb16d..9886bd070b 100644 --- a/common/dialogs/dialog_page_settings.cpp +++ b/common/dialogs/dialog_page_settings.cpp @@ -222,7 +222,7 @@ void DIALOG_PAGES_SETTINGS::OnOkClick( wxCommandEvent& event ) if( SavePageSettings() ) { m_screen->SetModify(); - m_parent->RefreshCanvas(); + m_parent->GetCanvas()->Refresh(); if( m_localPrjConfigChanged ) m_parent->SaveProjectSettings( true ); diff --git a/common/drawframe.cpp b/common/drawframe.cpp index 5dbfcbd6be..691c4acd03 100644 --- a/common/drawframe.cpp +++ b/common/drawframe.cpp @@ -234,7 +234,7 @@ void EDA_DRAW_FRAME::OnToggleGridState( wxCommandEvent& aEvent ) m_galCanvas->GetView()->MarkTargetDirty( KiGfx::TARGET_NONCACHED ); } - RefreshCanvas(); + m_canvas->Refresh(); } @@ -394,7 +394,7 @@ void EDA_DRAW_FRAME::OnSelectGrid( wxCommandEvent& event ) m_galCanvas->GetView()->MarkTargetDirty( KiGfx::TARGET_NONCACHED ); } - RefreshCanvas(); + m_canvas->Refresh(); } diff --git a/common/drawpanel.cpp b/common/drawpanel.cpp index aa428d63f1..d733d49584 100644 --- a/common/drawpanel.cpp +++ b/common/drawpanel.cpp @@ -296,6 +296,19 @@ void EDA_DRAW_PANEL::RefreshDrawingRect( const EDA_RECT& aRect, bool aEraseBackg } +void EDA_DRAW_PANEL::Refresh( bool eraseBackground, const wxRect* rect ) +{ + if( GetParent()->IsGalCanvasActive() ) + { + GetParent()->GetGalCanvas()->Refresh(); + } + else + { + wxScrolledWindow::Refresh( eraseBackground, rect ); + } +} + + wxPoint EDA_DRAW_PANEL::GetScreenCenterLogicalPosition() { wxSize size = GetClientSize() / 2; diff --git a/common/zoom.cpp b/common/zoom.cpp index d641eac5da..de9223dfff 100644 --- a/common/zoom.cpp +++ b/common/zoom.cpp @@ -52,7 +52,7 @@ void EDA_DRAW_FRAME::RedrawScreen( const wxPoint& aCenterPoint, bool aWarpPointe if( aWarpPointer ) m_canvas->MoveCursorToCrossHair(); - RefreshCanvas(); + m_canvas->Refresh(); m_canvas->Update(); } @@ -64,20 +64,11 @@ void EDA_DRAW_FRAME::RedrawScreen2( const wxPoint& posBefore ) AdjustScrollBars( newCenter ); - RefreshCanvas(); + m_canvas->Refresh(); m_canvas->Update(); } -void EDA_DRAW_FRAME::RefreshCanvas() -{ - if( m_galCanvasActive ) - m_galCanvas->Refresh(); - else - m_canvas->Refresh(); -} - - void EDA_DRAW_FRAME::Zoom_Automatique( bool aWarpPointer ) { BASE_SCREEN* screen = GetScreen(); @@ -169,7 +160,7 @@ void EDA_DRAW_FRAME::OnZoom( wxCommandEvent& event ) break; case ID_ZOOM_REDRAW: - RefreshCanvas(); + m_canvas->Refresh(); break; case ID_POPUP_ZOOM_CENTER: diff --git a/include/class_drawpanel.h b/include/class_drawpanel.h index 270999ac7e..3a9c3735b7 100644 --- a/include/class_drawpanel.h +++ b/include/class_drawpanel.h @@ -317,6 +317,9 @@ public: */ void RefreshDrawingRect( const EDA_RECT& aRect, bool aEraseBackground = true ); + /// @copydoc wxWindow::Refresh() + virtual void Refresh( bool eraseBackground = true, const wxRect* rect = NULL ); + /** * Function GetScreenCenterLogicalPosition * @return The current screen center position in logical (drawing) units. diff --git a/include/view/view.h b/include/view/view.h index dc6a27691a..b287ce5199 100644 --- a/include/view/view.h +++ b/include/view/view.h @@ -262,8 +262,8 @@ public: /** * Function SetLayerVisible() * Controls the visibility of a particular layer. - * @param aLayer: the layer to show/hide - * @param aVisible: the obvious + * @param aLayer: the layer to show/hide. + * @param aVisible: the obvious. */ inline void SetLayerVisible( int aLayer, bool aVisible = true ) { diff --git a/include/wxstruct.h b/include/wxstruct.h index 68bbf3eec2..bee386d10a 100644 --- a/include/wxstruct.h +++ b/include/wxstruct.h @@ -771,12 +771,6 @@ public: */ void RedrawScreen2( const wxPoint& posBefore ); - /** - * Function RefreshCanvas - * Depending on the current state of GAL - it refreshes the default canvas of the GAL canvas. - */ - void RefreshCanvas(); - /** * Function Zoom_Automatique * redraws the screen with best zoom level and the best centering diff --git a/pcbnew/autorouter/automove.cpp b/pcbnew/autorouter/automove.cpp index ad6856abf6..19d04e5885 100644 --- a/pcbnew/autorouter/automove.cpp +++ b/pcbnew/autorouter/automove.cpp @@ -293,7 +293,7 @@ void PCB_EDIT_FRAME::AutoMoveModulesOnPcb( bool PlaceModulesHorsPcb ) if( newList.GetCount() ) SaveCopyInUndoList( newList, UR_CHANGED ); - RefreshCanvas(); + m_canvas->Refresh(); } diff --git a/pcbnew/basepcbframe.cpp b/pcbnew/basepcbframe.cpp index 4d8f98a42d..be2c8d756e 100644 --- a/pcbnew/basepcbframe.cpp +++ b/pcbnew/basepcbframe.cpp @@ -505,7 +505,7 @@ void PCB_BASE_FRAME::SwitchLayer( wxDC* DC, LAYER_NUM layer ) GetScreen()->m_Active_Layer = layer; if( DisplayOpt.ContrastModeDisplay ) - RefreshCanvas(); + m_canvas->Refresh(); } @@ -529,7 +529,7 @@ void PCB_BASE_FRAME::OnTogglePadDrawMode( wxCommandEvent& aEvent ) settings->LoadDisplayOptions( DisplayOpt ); m_galCanvas->GetView()->RecacheAllItems( true ); - RefreshCanvas(); + m_canvas->Refresh(); } @@ -704,8 +704,8 @@ void PCB_BASE_FRAME::SetToolID( int aId, int aCursor, const wxString& aToolMsg ) // must do this after the tool has been set, otherwise pad::Draw() does // not show proper color when DisplayOpt.ContrastModeDisplay is true. - if( redraw && m_canvas ) - RefreshCanvas(); + if( redraw && m_canvas) + m_canvas->Refresh(); } diff --git a/pcbnew/board_undo_redo.cpp b/pcbnew/board_undo_redo.cpp index 1b132fa1a2..88cfaa49b1 100644 --- a/pcbnew/board_undo_redo.cpp +++ b/pcbnew/board_undo_redo.cpp @@ -367,7 +367,7 @@ void PCB_EDIT_FRAME::SaveCopyInUndoList( BOARD_ITEM* aItem, if( aItem->Type() == PCB_MODULE_T ) if( ((MODULE*)aItem)->GetFlags() & MODULE_to_PLACE ) break; - RefreshCanvas(); + m_canvas->Refresh(); #endif case UR_MOVED: case UR_FLIPPED: @@ -622,7 +622,7 @@ void PCB_EDIT_FRAME::GetBoardFromUndoList( wxCommandEvent& event ) GetScreen()->PushCommandToRedoList( List ); OnModify(); - RefreshCanvas(); + m_canvas->Refresh(); } @@ -650,7 +650,7 @@ void PCB_EDIT_FRAME::GetBoardFromRedoList( wxCommandEvent& event ) GetScreen()->PushCommandToUndoList( List ); OnModify(); - RefreshCanvas(); + m_canvas->Refresh(); } diff --git a/pcbnew/class_pcb_layer_widget.cpp b/pcbnew/class_pcb_layer_widget.cpp index 07b46f4fa9..ee08c4056f 100644 --- a/pcbnew/class_pcb_layer_widget.cpp +++ b/pcbnew/class_pcb_layer_widget.cpp @@ -346,7 +346,7 @@ void PCB_LAYER_WIDGET::OnLayerColorChange( LAYER_NUM aLayer, EDA_COLOR_T aColor { myframe->GetBoard()->SetLayerColor( aLayer, aColor ); myframe->ReCreateLayerBox( NULL ); - myframe->RefreshCanvas(); + myframe->GetCanvas()->Refresh(); } @@ -359,7 +359,7 @@ bool PCB_LAYER_WIDGET::OnLayerSelect( LAYER_NUM aLayer ) if( m_alwaysShowActiveCopperLayer ) OnLayerSelected(); else if( DisplayOpt.ContrastModeDisplay ) - myframe->RefreshCanvas(); + myframe->GetCanvas()->Refresh(); return true; } @@ -401,13 +401,13 @@ void PCB_LAYER_WIDGET::OnLayerVisible( LAYER_NUM aLayer, bool isVisible, bool is } if( isFinal ) - myframe->RefreshCanvas(); + myframe->GetCanvas()->Refresh(); } void PCB_LAYER_WIDGET::OnRenderColorChange( int aId, EDA_COLOR_T aColor ) { myframe->GetBoard()->SetVisibleElementColor( aId, aColor ); - myframe->RefreshCanvas(); + myframe->GetCanvas()->Refresh(); } void PCB_LAYER_WIDGET::OnRenderEnable( int aId, bool isEnabled ) @@ -425,7 +425,7 @@ void PCB_LAYER_WIDGET::OnRenderEnable( int aId, bool isEnabled ) if( myframe->IsGalCanvasActive() ) galCanvas->Refresh(); else - myframe->RefreshCanvas(); + myframe->GetCanvas()->Refresh(); } //----------------------------------------------- diff --git a/pcbnew/dialogs/dialog_display_options.cpp b/pcbnew/dialogs/dialog_display_options.cpp index 4f5fb1cbea..8b44757d90 100644 --- a/pcbnew/dialogs/dialog_display_options.cpp +++ b/pcbnew/dialogs/dialog_display_options.cpp @@ -180,7 +180,7 @@ void DIALOG_DISPLAY_OPTIONS::OnOkClick(wxCommandEvent& event) if( m_Parent->IsGalCanvasActive() ) m_Parent->GetGalCanvas()->Refresh(); else - m_Parent->RefreshCanvas(); + m_Parent->GetCanvas()->Refresh(); EndModal( 1 ); } diff --git a/pcbnew/dialogs/dialog_drc.cpp b/pcbnew/dialogs/dialog_drc.cpp index 0a779540b3..d65d497784 100644 --- a/pcbnew/dialogs/dialog_drc.cpp +++ b/pcbnew/dialogs/dialog_drc.cpp @@ -548,7 +548,7 @@ void DIALOG_DRC_CONTROL::OnUnconnectedSelectionEvent( wxCommandEvent& event ) void DIALOG_DRC_CONTROL::RedrawDrawPanel() { - m_Parent->RefreshCanvas(); + m_Parent->GetCanvas()->Refresh(); } diff --git a/pcbnew/dialogs/dialog_general_options.cpp b/pcbnew/dialogs/dialog_general_options.cpp index 1187cba6b8..f6f21655ac 100644 --- a/pcbnew/dialogs/dialog_general_options.cpp +++ b/pcbnew/dialogs/dialog_general_options.cpp @@ -185,7 +185,7 @@ void PCB_EDIT_FRAME::OnSelectOptionToolbar( wxCommandEvent& event ) if( state && (GetBoard()->m_Status_Pcb & LISTE_RATSNEST_ITEM_OK) == 0 ) Compile_Ratsnest( NULL, true ); - RefreshCanvas(); + m_canvas->Refresh(); break; case ID_TB_OPTIONS_SHOW_MODULE_RATSNEST: @@ -199,36 +199,31 @@ void PCB_EDIT_FRAME::OnSelectOptionToolbar( wxCommandEvent& event ) case ID_TB_OPTIONS_SHOW_ZONES: DisplayOpt.DisplayZonesMode = 0; recache = true; - if( !m_galCanvasActive ) - RefreshCanvas(); + m_canvas->Refresh(); break; case ID_TB_OPTIONS_SHOW_ZONES_DISABLE: DisplayOpt.DisplayZonesMode = 1; recache = true; - if( !m_galCanvasActive ) - RefreshCanvas(); + m_canvas->Refresh(); break; case ID_TB_OPTIONS_SHOW_ZONES_OUTLINES_ONLY: DisplayOpt.DisplayZonesMode = 2; recache = true; - if( !m_galCanvasActive ) - RefreshCanvas(); + m_canvas->Refresh(); break; case ID_TB_OPTIONS_SHOW_VIAS_SKETCH: m_DisplayViaFill = DisplayOpt.DisplayViaFill = !state; recache = true; - if( !m_galCanvasActive ) - RefreshCanvas(); + m_canvas->Refresh(); break; case ID_TB_OPTIONS_SHOW_TRACKS_SKETCH: m_DisplayPcbTrackFill = DisplayOpt.DisplayPcbTrackFill = !state; recache = true; - if( !m_galCanvasActive ) - RefreshCanvas(); + m_canvas->Refresh(); break; case ID_TB_OPTIONS_SHOW_HIGH_CONTRAST_MODE: @@ -239,12 +234,7 @@ void PCB_EDIT_FRAME::OnSelectOptionToolbar( wxCommandEvent& event ) settings->LoadDisplayOptions( DisplayOpt ); setHighContrastLayer( getActiveLayer() ); -// m_galCanvas->GetView()->EnableTopLayer( state ); - - if( m_galCanvasActive ) - m_galCanvas->Refresh(); - else - RefreshCanvas(); + m_canvas->Refresh(); break; } diff --git a/pcbnew/dialogs/dialog_global_deletion.cpp b/pcbnew/dialogs/dialog_global_deletion.cpp index 3048f5b7c0..cce6a7b4b5 100644 --- a/pcbnew/dialogs/dialog_global_deletion.cpp +++ b/pcbnew/dialogs/dialog_global_deletion.cpp @@ -182,7 +182,7 @@ void DIALOG_GLOBAL_DELETION::AcceptPcbDelete( ) m_Parent->Compile_Ratsnest( NULL, true ); } - m_Parent->RefreshCanvas(); + m_Parent->GetCanvas()->Refresh(); m_Parent->OnModify(); EndModal( 1 ); diff --git a/pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp b/pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp index 8fd7b9f040..b5114a0ce8 100644 --- a/pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp +++ b/pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp @@ -206,7 +206,7 @@ void DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS::OnOkClick( wxCommandEvent& event ) EndModal( 1 ); if( change ) - m_Parent->RefreshCanvas(); + m_Parent->GetCanvas()->Refresh(); } diff --git a/pcbnew/dialogs/dialog_global_modules_fields_edition.cpp b/pcbnew/dialogs/dialog_global_modules_fields_edition.cpp index 55fa8efdc7..aa8f2c9186 100644 --- a/pcbnew/dialogs/dialog_global_modules_fields_edition.cpp +++ b/pcbnew/dialogs/dialog_global_modules_fields_edition.cpp @@ -136,7 +136,7 @@ void PCB_EDIT_FRAME::OnResetModuleTextSizes( wxCommandEvent& event ) DIALOG_GLOBAL_MODULES_FIELDS_EDITION dlg(this); dlg.ShowModal(); - RefreshCanvas(); + m_canvas->Refresh(); } void PCB_BASE_FRAME::ResetModuleTextSizes( const wxString & aFilter, bool aRef, diff --git a/pcbnew/dialogs/dialog_orient_footprints.cpp b/pcbnew/dialogs/dialog_orient_footprints.cpp index 20b31aab44..4c6dd832d5 100644 --- a/pcbnew/dialogs/dialog_orient_footprints.cpp +++ b/pcbnew/dialogs/dialog_orient_footprints.cpp @@ -104,7 +104,7 @@ void PCB_EDIT_FRAME::OnOrientFootprints( wxCommandEvent& event ) if( ReOrientModules( text, dlg.GetOrientation(), dlg.ApplyToLockedModules() ) ) { - RefreshCanvas(); + m_canvas->Refresh(); Compile_Ratsnest( NULL, true ); } } diff --git a/pcbnew/dialogs/dialog_set_grid.cpp b/pcbnew/dialogs/dialog_set_grid.cpp index 6b2356704b..d22890b572 100644 --- a/pcbnew/dialogs/dialog_set_grid.cpp +++ b/pcbnew/dialogs/dialog_set_grid.cpp @@ -223,7 +223,7 @@ bool PCB_BASE_FRAME::InvokeDialogGrid() if( GetScreen()->GetGridId() == ID_POPUP_GRID_USER ) GetScreen()->SetGrid( ID_POPUP_GRID_USER ); - RefreshCanvas(); + m_canvas->Refresh(); return true; } diff --git a/pcbnew/edit.cpp b/pcbnew/edit.cpp index 6f3cc20048..a74c844019 100755 --- a/pcbnew/edit.cpp +++ b/pcbnew/edit.cpp @@ -399,7 +399,7 @@ void PCB_EDIT_FRAME::Process_Special_Functions( wxCommandEvent& event ) GetDesignSettings().m_CurrentViaType = v_type; if( DisplayOpt.ContrastModeDisplay ) - RefreshCanvas(); + m_canvas->Refresh(); } break; @@ -572,7 +572,7 @@ void PCB_EDIT_FRAME::Process_Special_Functions( wxCommandEvent& event ) case ID_POPUP_PCB_FILL_ALL_ZONES: m_canvas->MoveCursorToCrossHair(); Fill_All_Zones( this ); - RefreshCanvas(); + m_canvas->Refresh(); SetMsgPanel( GetBoard() ); break; @@ -584,7 +584,7 @@ void PCB_EDIT_FRAME::Process_Special_Functions( wxCommandEvent& event ) TestNetConnection( NULL, zone_container->GetNet() ); OnModify(); SetMsgPanel( GetBoard() ); - RefreshCanvas(); + m_canvas->Refresh(); } SetCurItem( NULL ); break; @@ -604,7 +604,7 @@ void PCB_EDIT_FRAME::Process_Special_Functions( wxCommandEvent& event ) TestForActiveLinksInRatsnest( 0 ); // Recalculate the active ratsnest, i.e. the unconnected links OnModify(); SetMsgPanel( GetBoard() ); - RefreshCanvas(); + m_canvas->Refresh(); break; case ID_POPUP_PCB_FILL_ZONE: @@ -612,7 +612,7 @@ void PCB_EDIT_FRAME::Process_Special_Functions( wxCommandEvent& event ) Fill_Zone( (ZONE_CONTAINER*) GetCurItem() ); TestNetConnection( NULL, ( (ZONE_CONTAINER*) GetCurItem() )->GetNet() ); SetMsgPanel( GetBoard() ); - RefreshCanvas(); + m_canvas->Refresh(); break; case ID_POPUP_PCB_MOVE_TEXTEPCB_REQUEST: @@ -1040,7 +1040,7 @@ void PCB_EDIT_FRAME::Process_Special_Functions( wxCommandEvent& event ) Delete_Drawings_All_Layer( GetCurItem()->GetLayer() ); SetCurItem( NULL ); m_canvas->MoveCursorToCrossHair(); - RefreshCanvas(); + m_canvas->Refresh(); break; case ID_POPUP_PCB_EDIT_DRAWING: @@ -1291,7 +1291,7 @@ void PCB_EDIT_FRAME::SwitchLayer( wxDC* DC, LAYER_NUM layer ) if( Other_Layer_Route( (TRACK*) GetScreen()->GetCurItem(), DC ) ) { if( DisplayOpt.ContrastModeDisplay ) - RefreshCanvas(); + m_canvas->Refresh(); } // if the via was allowed by DRC, then the layer swap has already @@ -1310,7 +1310,7 @@ void PCB_EDIT_FRAME::SwitchLayer( wxDC* DC, LAYER_NUM layer ) setActiveLayer( layer ); if( DisplayOpt.ContrastModeDisplay ) - RefreshCanvas(); + m_canvas->Refresh(); } diff --git a/pcbnew/edit_pcb_text.cpp b/pcbnew/edit_pcb_text.cpp index 26d3edd44d..7c518322e4 100644 --- a/pcbnew/edit_pcb_text.cpp +++ b/pcbnew/edit_pcb_text.cpp @@ -126,7 +126,7 @@ void PCB_EDIT_FRAME::Place_Texte_Pcb( TEXTE_PCB* TextePcb, wxDC* DC ) TextePcb->ClearFlags(); #ifdef USE_WX_OVERLAY - RefreshCanvas(); + m_canvas->Refresh(); #endif } @@ -144,7 +144,7 @@ void PCB_EDIT_FRAME::StartMoveTextePcb( TEXTE_PCB* aTextePcb, wxDC* aDC, bool aE SetMsgPanel( aTextePcb ); #ifdef USE_WX_OVERLAY - RefreshCanvas(); + m_canvas->Refresh(); #endif SetCrossHairPosition( aTextePcb->GetTextPosition() ); @@ -257,7 +257,7 @@ void PCB_EDIT_FRAME::Rotate_Texte_Pcb( TEXTE_PCB* TextePcb, wxDC* DC ) OnModify(); #ifdef USE_WX_OVERLAY - RefreshCanvas(); + m_canvas->Refresh(); #endif } @@ -281,6 +281,6 @@ void PCB_EDIT_FRAME::FlipTextePcb( TEXTE_PCB* aTextePcb, wxDC* aDC ) OnModify(); #ifdef USE_WX_OVERLAY - RefreshCanvas(); + m_canvas->Refresh(); #endif } diff --git a/pcbnew/editmod.cpp b/pcbnew/editmod.cpp index 9f4e01a7f0..1f217d6194 100644 --- a/pcbnew/editmod.cpp +++ b/pcbnew/editmod.cpp @@ -68,7 +68,7 @@ void PCB_EDIT_FRAME::InstallModuleOptionsFrame( MODULE* Module, wxDC* DC ) #ifdef __WXMAC__ // If something edited, push a refresh request if (retvalue == 0 || retvalue == 1) - RefreshCanvas(); + m_canvas->Refresh(); #endif if( retvalue == 2 ) @@ -120,7 +120,7 @@ void FOOTPRINT_EDIT_FRAME::RemoveStruct( EDA_ITEM* Item ) case PCB_MODULE_EDGE_T: Delete_Edge_Module( (EDGE_MODULE*) Item ); - RefreshCanvas(); + m_canvas->Refresh(); break; case PCB_MODULE_T: diff --git a/pcbnew/edtxtmod.cpp b/pcbnew/edtxtmod.cpp index 17d9faa90d..d180cd00cd 100644 --- a/pcbnew/edtxtmod.cpp +++ b/pcbnew/edtxtmod.cpp @@ -349,7 +349,7 @@ void PCB_BASE_FRAME::ResetTextSize( BOARD_ITEM* aItem, wxDC* aDC ) text->SetThickness( newThickness ); if( aDC ) - RefreshCanvas(); + m_canvas->Refresh(); OnModify(); } diff --git a/pcbnew/event_handlers_tracks_vias_sizes.cpp b/pcbnew/event_handlers_tracks_vias_sizes.cpp index 33f975b07c..52428a3834 100644 --- a/pcbnew/event_handlers_tracks_vias_sizes.cpp +++ b/pcbnew/event_handlers_tracks_vias_sizes.cpp @@ -118,5 +118,5 @@ void PCB_EDIT_FRAME::Tracks_and_Vias_Size_Event( wxCommandEvent& event ) }*/ //+hp //Refresh canvas, that we can see changes instantly. I use this because it dont,t throw mouse up-left corner. - RefreshCanvas(); + m_canvas->Refresh(); } diff --git a/pcbnew/footprint_wizard.cpp b/pcbnew/footprint_wizard.cpp index e8e5a53ab0..cf5ed55307 100644 --- a/pcbnew/footprint_wizard.cpp +++ b/pcbnew/footprint_wizard.cpp @@ -120,7 +120,7 @@ void FOOTPRINT_WIZARD_FRAME::ReloadFootprint() DBG(printf( "footprintWizard->GetModule() returns NULL\n" );) } - RefreshCanvas(); + m_canvas->Refresh(); } diff --git a/pcbnew/footprint_wizard_frame.cpp b/pcbnew/footprint_wizard_frame.cpp index efce1ccf90..1804286618 100644 --- a/pcbnew/footprint_wizard_frame.cpp +++ b/pcbnew/footprint_wizard_frame.cpp @@ -409,7 +409,7 @@ void FOOTPRINT_WIZARD_FRAME::ReCreatePageList() ReCreateParameterList(); ReCreateHToolbar(); DisplayWizardInfos(); - RefreshCanvas(); + m_canvas->Refresh(); } @@ -507,7 +507,7 @@ void FOOTPRINT_WIZARD_FRAME::ClickOnPageList( wxCommandEvent& event ) return; ReCreateParameterList(); - RefreshCanvas(); + m_canvas->Refresh(); DisplayWizardInfos(); } diff --git a/pcbnew/hotkeys_board_editor.cpp b/pcbnew/hotkeys_board_editor.cpp index cc72a9af84..61ee1a9c1d 100644 --- a/pcbnew/hotkeys_board_editor.cpp +++ b/pcbnew/hotkeys_board_editor.cpp @@ -366,7 +366,7 @@ void PCB_EDIT_FRAME::OnHotKey( wxDC* aDC, int aHotkeyCode, const wxPoint& aPosit DisplayOpt.DisplayPcbTrackFill ^= 1; DisplayOpt.DisplayPcbTrackFill &= 1; m_DisplayPcbTrackFill = DisplayOpt.DisplayPcbTrackFill; - RefreshCanvas(); + m_canvas->Refresh(); break; case HK_DELETE: @@ -463,7 +463,7 @@ void PCB_EDIT_FRAME::OnHotKey( wxDC* aDC, int aHotkeyCode, const wxPoint& aPosit { Other_Layer_Route( NULL, aDC ); if( DisplayOpt.ContrastModeDisplay ) - RefreshCanvas(); + m_canvas->Refresh(); break; } @@ -546,7 +546,7 @@ void PCB_EDIT_FRAME::OnHotKey( wxDC* aDC, int aHotkeyCode, const wxPoint& aPosit case HK_SWITCH_HIGHCONTRAST_MODE: // switch to high contrast mode and refresh the canvas DisplayOpt.ContrastModeDisplay = !DisplayOpt.ContrastModeDisplay; - RefreshCanvas(); + m_canvas->Refresh(); break; case HK_CANVAS_CAIRO: diff --git a/pcbnew/modedit.cpp b/pcbnew/modedit.cpp index a2623769e8..ca026f9f11 100644 --- a/pcbnew/modedit.cpp +++ b/pcbnew/modedit.cpp @@ -541,7 +541,7 @@ void FOOTPRINT_EDIT_FRAME::Process_Special_Functions( wxCommandEvent& event ) GetScreen()->GetCurItem()->ClearFlags(); if( ret > 0 ) - RefreshCanvas(); + m_canvas->Refresh(); } break; @@ -571,7 +571,7 @@ void FOOTPRINT_EDIT_FRAME::Process_Special_Functions( wxCommandEvent& event ) m_canvas->MoveCursorToCrossHair(); if( ret > 0 ) - RefreshCanvas(); + m_canvas->Refresh(); } break; @@ -660,38 +660,38 @@ void FOOTPRINT_EDIT_FRAME::Process_Special_Functions( wxCommandEvent& event ) m_canvas->MoveCursorToCrossHair(); if( edge ) - RefreshCanvas(); + m_canvas->Refresh(); } break; case ID_POPUP_MODEDIT_EDIT_BODY_ITEM : m_canvas->MoveCursorToCrossHair(); InstallFootprintBodyItemPropertiesDlg( (EDGE_MODULE*) GetScreen()->GetCurItem() ); - RefreshCanvas(); + m_canvas->Refresh(); break; case ID_POPUP_MODEDIT_EDIT_WIDTH_CURRENT_EDGE: m_canvas->MoveCursorToCrossHair(); Edit_Edge_Width( (EDGE_MODULE*) GetScreen()->GetCurItem() ); - RefreshCanvas(); + m_canvas->Refresh(); break; case ID_POPUP_MODEDIT_EDIT_WIDTH_ALL_EDGE: m_canvas->MoveCursorToCrossHair(); Edit_Edge_Width( NULL ); - RefreshCanvas(); + m_canvas->Refresh(); break; case ID_POPUP_MODEDIT_EDIT_LAYER_CURRENT_EDGE: m_canvas->MoveCursorToCrossHair(); Edit_Edge_Layer( (EDGE_MODULE*) GetScreen()->GetCurItem() ); - RefreshCanvas(); + m_canvas->Refresh(); break; case ID_POPUP_MODEDIT_EDIT_LAYER_ALL_EDGE: m_canvas->MoveCursorToCrossHair(); Edit_Edge_Layer( NULL ); - RefreshCanvas(); + m_canvas->Refresh(); break; case ID_POPUP_PCB_DELETE_EDGE: @@ -774,7 +774,7 @@ void FOOTPRINT_EDIT_FRAME::Process_Special_Functions( wxCommandEvent& event ) } if( redraw ) - RefreshCanvas(); + m_canvas->Refresh(); } diff --git a/pcbnew/modedit_onclick.cpp b/pcbnew/modedit_onclick.cpp index 65aa33ead2..7571d66955 100644 --- a/pcbnew/modedit_onclick.cpp +++ b/pcbnew/modedit_onclick.cpp @@ -97,13 +97,13 @@ void FOOTPRINT_EDIT_FRAME::OnLeftClick( wxDC* DC, const wxPoint& MousePos ) { End_Edge_Module( (EDGE_MODULE*) item ); SetCurItem( NULL ); - RefreshCanvas(); + m_canvas->Refresh(); } else if( ( (EDGE_MODULE*) item )->GetShape() == S_ARC ) { End_Edge_Module( (EDGE_MODULE*) item ); SetCurItem( NULL ); - RefreshCanvas(); + m_canvas->Refresh(); } else if( ( (EDGE_MODULE*) item )->GetShape() == S_SEGMENT ) { @@ -149,7 +149,7 @@ void FOOTPRINT_EDIT_FRAME::OnLeftClick( wxDC* DC, const wxPoint& MousePos ) // so deselect the active tool SetToolID( ID_NO_TOOL_SELECTED, m_canvas->GetDefaultCursor(), wxEmptyString ); SetCurItem( NULL ); - RefreshCanvas(); + m_canvas->Refresh(); } break; @@ -435,7 +435,7 @@ void FOOTPRINT_EDIT_FRAME::OnLeftDClick( wxDC* DC, const wxPoint& MousePos ) m_canvas->MoveCursorToCrossHair(); if( ret > 0 ) - RefreshCanvas(); + m_canvas->Refresh(); } break; @@ -447,7 +447,7 @@ void FOOTPRINT_EDIT_FRAME::OnLeftDClick( wxDC* DC, const wxPoint& MousePos ) case PCB_MODULE_EDGE_T : m_canvas->MoveCursorToCrossHair(); InstallFootprintBodyItemPropertiesDlg( (EDGE_MODULE*) item ); - RefreshCanvas(); + m_canvas->Refresh(); break; default: @@ -462,7 +462,7 @@ void FOOTPRINT_EDIT_FRAME::OnLeftDClick( wxDC* DC, const wxPoint& MousePos ) { End_Edge_Module( (EDGE_MODULE*) item ); SetCurItem( NULL ); - RefreshCanvas(); + m_canvas->Refresh(); } break; diff --git a/pcbnew/modedit_undo_redo.cpp b/pcbnew/modedit_undo_redo.cpp index 8d4fea8620..5e1fc518cc 100644 --- a/pcbnew/modedit_undo_redo.cpp +++ b/pcbnew/modedit_undo_redo.cpp @@ -72,7 +72,7 @@ void FOOTPRINT_EDIT_FRAME::GetComponentFromRedoList( wxCommandEvent& event ) SetCurItem( NULL ); OnModify(); - RefreshCanvas(); + m_canvas->Refresh(); } @@ -101,5 +101,5 @@ void FOOTPRINT_EDIT_FRAME::GetComponentFromUndoList( wxCommandEvent& event ) SetCurItem( NULL ); OnModify(); - RefreshCanvas(); + m_canvas->Refresh(); } diff --git a/pcbnew/modules.cpp b/pcbnew/modules.cpp index d8100ceaca..477feacaf6 100644 --- a/pcbnew/modules.cpp +++ b/pcbnew/modules.cpp @@ -285,7 +285,7 @@ bool PCB_EDIT_FRAME::Delete_Module( MODULE* aModule, wxDC* aDC, bool aAskBeforeD // Redraw the full screen to ensure perfect display of board and ratsnest. if( aDC ) - RefreshCanvas(); + m_canvas->Refresh(); return true; } @@ -421,7 +421,7 @@ void PCB_BASE_FRAME::PlaceModule( MODULE* aModule, wxDC* aDC, bool aDoNotRecreat Compile_Ratsnest( aDC, true ); if( aDC ) - RefreshCanvas(); + m_canvas->Refresh(); SetMsgPanel( aModule ); } @@ -490,7 +490,7 @@ void PCB_BASE_FRAME::Rotate_Module( wxDC* DC, MODULE* module, double angle, bool } if( module->GetFlags() == 0 ) // module not in edit: redraw full screen - RefreshCanvas(); + m_canvas->Refresh(); } } diff --git a/pcbnew/modview.cpp b/pcbnew/modview.cpp index bfeed514cc..2fb378ef84 100644 --- a/pcbnew/modview.cpp +++ b/pcbnew/modview.cpp @@ -165,7 +165,7 @@ void FOOTPRINT_VIEWER_FRAME::SelectCurrentFootprint( wxCommandEvent& event ) SetCurItem( NULL ); Zoom_Automatique( false ); - RefreshCanvas(); + m_canvas->Refresh(); Update3D_Frame(); m_FootprintList->SetStringSelection( m_footprintName ); } diff --git a/pcbnew/modview_frame.cpp b/pcbnew/modview_frame.cpp index 52c2d2f57d..b8cf54629f 100644 --- a/pcbnew/modview_frame.cpp +++ b/pcbnew/modview_frame.cpp @@ -411,7 +411,7 @@ void FOOTPRINT_VIEWER_FRAME::ReCreateLibraryList() ReCreateFootprintList(); ReCreateHToolbar(); DisplayLibInfos(); - RefreshCanvas(); + m_canvas->Refresh(); } @@ -477,7 +477,7 @@ void FOOTPRINT_VIEWER_FRAME::ClickOnLibList( wxCommandEvent& event ) m_libraryName = name; ReCreateFootprintList(); - RefreshCanvas(); + m_canvas->Refresh(); DisplayLibInfos(); ReCreateHToolbar(); } @@ -525,7 +525,7 @@ void FOOTPRINT_VIEWER_FRAME::ClickOnFootprintList( wxCommandEvent& event ) DisplayLibInfos(); Zoom_Automatique( false ); - RefreshCanvas(); + m_canvas->Refresh(); Update3D_Frame(); } } diff --git a/pcbnew/move_or_drag_track.cpp b/pcbnew/move_or_drag_track.cpp index ca4374942f..3a5b1bb271 100644 --- a/pcbnew/move_or_drag_track.cpp +++ b/pcbnew/move_or_drag_track.cpp @@ -892,7 +892,7 @@ bool PCB_EDIT_FRAME::PlaceDraggedOrMovedTrackSegment( TRACK* Track, wxDC* DC ) if( current_net_code > 0 ) TestNetConnection( DC, current_net_code ); - RefreshCanvas(); + m_canvas->Refresh(); return true; } diff --git a/pcbnew/netlist.cpp b/pcbnew/netlist.cpp index 4900e3ecae..d0a80154e5 100644 --- a/pcbnew/netlist.cpp +++ b/pcbnew/netlist.cpp @@ -112,7 +112,7 @@ void PCB_EDIT_FRAME::ReadPcbNetlist( const wxString& aNetlistFileName, // Rebuild the board connectivity: Compile_Ratsnest( NULL, true ); SetMsgPanel( GetBoard() ); - RefreshCanvas(); + m_canvas->Refresh(); } diff --git a/pcbnew/sel_layer.cpp b/pcbnew/sel_layer.cpp index e2e524beb2..5e265a26dc 100644 --- a/pcbnew/sel_layer.cpp +++ b/pcbnew/sel_layer.cpp @@ -243,7 +243,7 @@ void PCB_BASE_FRAME::SelectLayerPair() // because the PAD_SMD pads may change color. if( result >= 0 && DisplayOpt.ContrastModeDisplay ) { - RefreshCanvas(); + m_canvas->Refresh(); } } diff --git a/pcbnew/xchgmod.cpp b/pcbnew/xchgmod.cpp index 59f7b46f8c..d40a95a8b6 100644 --- a/pcbnew/xchgmod.cpp +++ b/pcbnew/xchgmod.cpp @@ -281,7 +281,7 @@ void DIALOG_EXCHANGE_MODULE::Change_Current_Module() if( m_Parent->GetBoard()->IsElementVisible( RATSNEST_VISIBLE ) ) m_Parent->Compile_Ratsnest( NULL, true ); - m_Parent->RefreshCanvas(); + m_Parent->GetCanvas()->Refresh(); } if( pickList.GetCount() ) @@ -370,7 +370,7 @@ void DIALOG_EXCHANGE_MODULE::Change_ModuleId( bool aUseValue ) if( m_Parent->GetBoard()->IsElementVisible( RATSNEST_VISIBLE ) ) m_Parent->Compile_Ratsnest( NULL, true ); - m_Parent->RefreshCanvas(); + m_Parent->GetCanvas()->Refresh(); } if( pickList.GetCount() ) @@ -423,7 +423,7 @@ void DIALOG_EXCHANGE_MODULE::Change_ModuleAll() if( m_Parent->GetBoard()->IsElementVisible( RATSNEST_VISIBLE ) ) m_Parent->Compile_Ratsnest( NULL, true ); - m_Parent->RefreshCanvas(); + m_Parent->GetCanvas()->Refresh(); } if( pickList.GetCount() ) diff --git a/pcbnew/zones_by_polygon.cpp b/pcbnew/zones_by_polygon.cpp index e015bf061f..19dcfe5f2a 100644 --- a/pcbnew/zones_by_polygon.cpp +++ b/pcbnew/zones_by_polygon.cpp @@ -333,7 +333,7 @@ void PCB_EDIT_FRAME::End_Move_Zone_Corner_Or_Outlines( wxDC* DC, ZONE_CONTAINER* // Combine zones if possible wxBusyCursor dummy; GetBoard()->OnAreaPolygonModified( &s_AuxiliaryList, aZone ); - RefreshCanvas(); + m_canvas->Refresh(); int ii = GetBoard()->GetAreaIndex( aZone ); // test if aZone exists diff --git a/pcbnew/zones_by_polygon_fill_functions.cpp b/pcbnew/zones_by_polygon_fill_functions.cpp index 2697f03e6e..61324cb6c7 100644 --- a/pcbnew/zones_by_polygon_fill_functions.cpp +++ b/pcbnew/zones_by_polygon_fill_functions.cpp @@ -80,7 +80,7 @@ void PCB_EDIT_FRAME::Delete_OldZone_Fill( SEGZONE* aZone, time_t aTimestamp ) if( modify ) { OnModify(); - RefreshCanvas(); + m_canvas->Refresh(); } }