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

Remove "Reset View", which does the same as "Home View". 

Fixes https://gitlab.com/kicad/code/kicad/-/issues/16115
This commit is contained in:
Jeff Young 2023-11-19 11:11:12 +00:00
parent 8dfad68d69
commit f9530d0b3f
5 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
3d-viewer/3d_canvas/eda_3d_canvas.cpp
View File

@ -982,13 +982,6 @@ bool EDA_3D_CANVAS::SetView3D( VIEW3D_TYPE aRequestedView )
return true; return true;
case VIEW3D_TYPE::VIEW3D_RESET:
m_camera.SetInterpolateMode( CAMERA_INTERPOLATION::BEZIER );
m_camera.SetT0_and_T1_current_T();
m_camera.Reset_T1();
request_start_moving_camera( glm::min( glm::max( m_camera.GetZoom(), 0.5f ), 1.125f ) );
return true;
case VIEW3D_TYPE::VIEW3D_RIGHT: case VIEW3D_TYPE::VIEW3D_RIGHT:
m_camera.SetInterpolateMode( CAMERA_INTERPOLATION::BEZIER ); m_camera.SetInterpolateMode( CAMERA_INTERPOLATION::BEZIER );
m_camera.SetT0_and_T1_current_T(); m_camera.SetT0_and_T1_current_T();

1
3d-viewer/3d_enums.h
View File

@ -83,7 +83,6 @@ enum class VIEW3D_TYPE
VIEW3D_RIGHT, VIEW3D_RIGHT,
VIEW3D_FRONT, VIEW3D_FRONT,
VIEW3D_BACK, VIEW3D_BACK,
VIEW3D_RESET,
VIEW3D_FLIP, VIEW3D_FLIP,
// Movement commands // Movement commands

9
3d-viewer/3d_viewer/tools/eda_3d_actions.cpp
View File

@ -152,15 +152,6 @@ TOOL_ACTION EDA_3D_ACTIONS::homeView( TOOL_ACTION_ARGS()
.Flags( AF_NONE ) .Flags( AF_NONE )
.Parameter( VIEW3D_TYPE::VIEW3D_FIT_SCREEN ) ); .Parameter( VIEW3D_TYPE::VIEW3D_FIT_SCREEN ) );
TOOL_ACTION EDA_3D_ACTIONS::resetView( TOOL_ACTION_ARGS()
.Name( "3DViewer.Control.resetView" )
.Scope( AS_ACTIVE )
.DefaultHotkey( 'R' )
.FriendlyName( _( "Reset View" ) )
.Tooltip( _( "Reset view" ) )
.Flags( AF_NONE )
.Parameter( VIEW3D_TYPE::VIEW3D_RESET ) );
TOOL_ACTION EDA_3D_ACTIONS::flipView( TOOL_ACTION_ARGS() TOOL_ACTION EDA_3D_ACTIONS::flipView( TOOL_ACTION_ARGS()
.Name( "3DViewer.Control.flipView" ) .Name( "3DViewer.Control.flipView" )
.Scope( AS_ACTIVE ) .Scope( AS_ACTIVE )

1
3d-viewer/3d_viewer/tools/eda_3d_actions.h
View File

@ -54,7 +54,6 @@ public:
static TOOL_ACTION moveUp; static TOOL_ACTION moveUp;
static TOOL_ACTION moveDown; static TOOL_ACTION moveDown;
static TOOL_ACTION homeView; static TOOL_ACTION homeView;
static TOOL_ACTION resetView;
static TOOL_ACTION flipView; static TOOL_ACTION flipView;
static TOOL_ACTION toggleOrtho; static TOOL_ACTION toggleOrtho;

1
3d-viewer/3d_viewer/tools/eda_3d_controller.cpp
View File

@ -346,7 +346,6 @@ void EDA_3D_CONTROLLER::setTransitions()
Go( &EDA_3D_CONTROLLER::ViewControl, EDA_3D_ACTIONS::viewBack.MakeEvent() ); Go( &EDA_3D_CONTROLLER::ViewControl, EDA_3D_ACTIONS::viewBack.MakeEvent() );
Go( &EDA_3D_CONTROLLER::ViewControl, EDA_3D_ACTIONS::pivotCenter.MakeEvent() ); Go( &EDA_3D_CONTROLLER::ViewControl, EDA_3D_ACTIONS::pivotCenter.MakeEvent() );
Go( &EDA_3D_CONTROLLER::ViewControl, EDA_3D_ACTIONS::homeView.MakeEvent() ); Go( &EDA_3D_CONTROLLER::ViewControl, EDA_3D_ACTIONS::homeView.MakeEvent() );
Go( &EDA_3D_CONTROLLER::ViewControl, EDA_3D_ACTIONS::resetView.MakeEvent() );
Go( &EDA_3D_CONTROLLER::ViewControl, EDA_3D_ACTIONS::flipView.MakeEvent() ); Go( &EDA_3D_CONTROLLER::ViewControl, EDA_3D_ACTIONS::flipView.MakeEvent() );
Go( &EDA_3D_CONTROLLER::RotateView, EDA_3D_ACTIONS::rotateXCW.MakeEvent() ); Go( &EDA_3D_CONTROLLER::RotateView, EDA_3D_ACTIONS::rotateXCW.MakeEvent() );
Go( &EDA_3D_CONTROLLER::RotateView, EDA_3D_ACTIONS::rotateXCCW.MakeEvent() ); Go( &EDA_3D_CONTROLLER::RotateView, EDA_3D_ACTIONS::rotateXCCW.MakeEvent() );