diff --git a/gerbview/events_called_functions.cpp b/gerbview/events_called_functions.cpp index 3708c96f8c..46ae0cee36 100644 --- a/gerbview/events_called_functions.cpp +++ b/gerbview/events_called_functions.cpp @@ -65,10 +65,6 @@ BEGIN_EVENT_TABLE( GERBVIEW_FRAME, EDA_DRAW_FRAME ) EVT_SELECT_DCODE( ID_TOOLBARH_GERBER_SELECT_ACTIVE_DCODE, GERBVIEW_FRAME::OnSelectActiveDCode ) - // Option toolbar - EVT_TOOL_RANGE( ID_TB_OPTIONS_SHOW_GBR_MODE_0, ID_TB_OPTIONS_SHOW_GBR_MODE_2, - GERBVIEW_FRAME::OnSelectDisplayMode ) - // Auxiliary horizontal toolbar EVT_CHOICE( ID_GBR_AUX_TOOLBAR_PCB_CMP_CHOICE, GERBVIEW_FRAME::OnSelectHighlightChoice ) EVT_CHOICE( ID_GBR_AUX_TOOLBAR_PCB_NET_CHOICE, GERBVIEW_FRAME::OnSelectHighlightChoice ) @@ -81,8 +77,6 @@ BEGIN_EVENT_TABLE( GERBVIEW_FRAME, EDA_DRAW_FRAME ) EVT_UPDATE_UI( ID_TOOLBARH_GERBER_SELECT_ACTIVE_DCODE, GERBVIEW_FRAME::OnUpdateSelectDCode ) EVT_UPDATE_UI( ID_TOOLBARH_GERBVIEW_SELECT_ACTIVE_LAYER, GERBVIEW_FRAME::OnUpdateLayerSelectBox ) - EVT_UPDATE_UI_RANGE( ID_TB_OPTIONS_SHOW_GBR_MODE_0, ID_TB_OPTIONS_SHOW_GBR_MODE_2, - GERBVIEW_FRAME::OnUpdateDrawMode ) // Drop files event EVT_DROP_FILES( GERBVIEW_FRAME::OnDropFiles ) @@ -151,19 +145,6 @@ void GERBVIEW_FRAME::OnSelectActiveLayer( wxCommandEvent& event ) } -void GERBVIEW_FRAME::OnSelectDisplayMode( wxCommandEvent& event ) -{ - switch( event.GetId() ) - { - case ID_TB_OPTIONS_SHOW_GBR_MODE_0: SetDisplayMode( 0 ); break; - case ID_TB_OPTIONS_SHOW_GBR_MODE_1: SetDisplayMode( 1 ); break; - case ID_TB_OPTIONS_SHOW_GBR_MODE_2: SetDisplayMode( 2 ); break; - } - - GetCanvas()->Refresh(); -} - - void GERBVIEW_FRAME::OnQuit( wxCommandEvent& event ) { Close( true ); diff --git a/gerbview/gerbview_frame.cpp b/gerbview/gerbview_frame.cpp index 176d248d61..cef9f759d2 100644 --- a/gerbview/gerbview_frame.cpp +++ b/gerbview/gerbview_frame.cpp @@ -85,7 +85,6 @@ GERBVIEW_FRAME::GERBVIEW_FRAME( KIWAY* aKiway, wxWindow* aParent ) m_netText = nullptr; m_apertText = nullptr; m_dcodeText = nullptr; - m_displayMode = 0; m_aboutTitle = _HKI( "KiCad Gerber Viewer" ); SHAPE_POLY_SET dummy; // A ugly trick to force the linker to include diff --git a/gerbview/gerbview_frame.h b/gerbview/gerbview_frame.h index 96ab216473..522d4b3d57 100644 --- a/gerbview/gerbview_frame.h +++ b/gerbview/gerbview_frame.h @@ -94,20 +94,6 @@ public: /// Updates the GAL with display settings changes void ApplyDisplaySettingsToGAL(); - /** - * @return 0 for fast mode (not fully compatible with negative objects) - * 1 for exact mode, write mode - * 2 for exact mode, OR mode (transparency mode) - */ - int GetDisplayMode() { return m_displayMode; } - - /** - * @param aMode = 0 for fast mode - * 1 for exact mode, write mode - * 2 for exact mode, OR mode (transparency mode) - */ - void SetDisplayMode( int aMode ) { m_displayMode = aMode; } - /** * Test whether a given element category is visible. Keep this as an inline function. * @@ -532,16 +518,6 @@ protected: // user. private: - int m_displayMode; // Gerber images ("layers" in Gerbview) can be drawn: - // - in fast mode (write mode) but if there are negative - // items only the last image is correctly drawn (no - // problem to see only one image or when no negative items) - // - in "exact" mode (but slower) in write mode: - // last image covers previous images - // - in "exact" mode (also slower) in OR mode - // (transparency mode) - // m_displayMode = 0, 1 or 2 - bool m_show_layer_manager_tools; GBR_LAYOUT* m_gerberLayout; diff --git a/gerbview/toolbars_gerber.cpp b/gerbview/toolbars_gerber.cpp index 3b20605980..5a1d106e89 100644 --- a/gerbview/toolbars_gerber.cpp +++ b/gerbview/toolbars_gerber.cpp @@ -471,18 +471,6 @@ void GERBVIEW_FRAME::updateAperAttributesSelectBox() } -void GERBVIEW_FRAME::OnUpdateDrawMode( wxUpdateUIEvent& aEvent ) -{ - switch( aEvent.GetId() ) - { - case ID_TB_OPTIONS_SHOW_GBR_MODE_0: aEvent.Check( GetDisplayMode() == 0 ); break; - case ID_TB_OPTIONS_SHOW_GBR_MODE_1: aEvent.Check( GetDisplayMode() == 1 ); break; - case ID_TB_OPTIONS_SHOW_GBR_MODE_2: aEvent.Check( GetDisplayMode() == 2 ); break; - default: break; - } -} - - void GERBVIEW_FRAME::OnUpdateSelectDCode( wxUpdateUIEvent& aEvent ) { if( !m_DCodeSelector )