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

Hook up a few more 3D commands missed in last commit. 

Fixes https://gitlab.com/kicad/code/kicad/issues/4074
This commit is contained in:
Jeff Young 2020-03-21 01:29:06 +00:00
parent 55e56c6cc1
commit 103b0c18de
4 changed files with 11 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -872,36 +872,7 @@ bool EDA_3D_CANVAS::SetView3D( int aKeycode )
return true; return true;
case '+': case ID_VIEW3D_RESET:
case '-':
break;
case 't':
case 'T':
m_settings.SetFlag( FL_MODULE_ATTRIBUTES_NORMAL,
!m_settings.GetFlag( FL_MODULE_ATTRIBUTES_NORMAL ) );
ReloadRequest();
handled = true;
break;
case 's':
case 'S':
m_settings.SetFlag( FL_MODULE_ATTRIBUTES_NORMAL_INSERT,
!m_settings.GetFlag( FL_MODULE_ATTRIBUTES_NORMAL_INSERT ) );
ReloadRequest();
handled = true;
break;
case 'v':
case 'V':
m_settings.SetFlag( FL_MODULE_ATTRIBUTES_VIRTUAL,
!m_settings.GetFlag( FL_MODULE_ATTRIBUTES_VIRTUAL ) );
ReloadRequest();
handled = true;
break;
case 'r':
case 'R':
m_settings.CameraGet().SetInterpolateMode( CAMERA_INTERPOLATION::BEZIER ); m_settings.CameraGet().SetInterpolateMode( CAMERA_INTERPOLATION::BEZIER );
m_settings.CameraGet().SetT0_and_T1_current_T(); m_settings.CameraGet().SetT0_and_T1_current_T();
m_settings.CameraGet().Reset_T1(); m_settings.CameraGet().Reset_T1();

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

@ -40,7 +40,8 @@ TOOL_ACTION EDA_3D_ACTIONS::controlActivate( "3DViewer.Control", AS_GLOBAL,
TOOL_ACTION EDA_3D_ACTIONS::pivotCenter( "3DViewer.Control.pivotCenter", TOOL_ACTION EDA_3D_ACTIONS::pivotCenter( "3DViewer.Control.pivotCenter",
AS_ACTIVE, AS_ACTIVE,
' ', "", ' ', "",
"Center pivot rotation (Middle mouse click)" ); _( "Center pivot rotation" ), _( "Center pivot rotation (middle mouse click)" ),
nullptr, AF_NONE, (void*) WXK_SPACE );
TOOL_ACTION EDA_3D_ACTIONS::rotateXCW( "3DViewer.Control.rotateXclockwise", TOOL_ACTION EDA_3D_ACTIONS::rotateXCW( "3DViewer.Control.rotateXclockwise",
AS_GLOBAL, 0, "", AS_GLOBAL, 0, "",
@ -99,12 +100,14 @@ TOOL_ACTION EDA_3D_ACTIONS::moveDown( "3DViewer.Control.moveDown",
TOOL_ACTION EDA_3D_ACTIONS::homeView( "3DViewer.Control.homeView", TOOL_ACTION EDA_3D_ACTIONS::homeView( "3DViewer.Control.homeView",
AS_ACTIVE, AS_ACTIVE,
WXK_HOME, "", WXK_HOME, "",
"Home view" ); _( "Home view" ), _( "Home view" ),
nullptr, AF_NONE, (void*) WXK_HOME );
TOOL_ACTION EDA_3D_ACTIONS::resetView( "3DViewer.Control.resetView", TOOL_ACTION EDA_3D_ACTIONS::resetView( "3DViewer.Control.resetView",
AS_ACTIVE, AS_ACTIVE,
'R', "", 'R', "",
"Reset view" ); _( "Reset view" ), _( "Reset view" ),
nullptr, AF_NONE, (void*) ID_VIEW3D_RESET );
TOOL_ACTION EDA_3D_ACTIONS::toggleOrtho( "3DViewer.Control.toggleOrtho", TOOL_ACTION EDA_3D_ACTIONS::toggleOrtho( "3DViewer.Control.toggleOrtho",
AS_GLOBAL, 0, "", AS_GLOBAL, 0, "",

3
3d-viewer/3d_viewer/tools/3d_viewer_control.cpp
View File

@ -264,6 +264,9 @@ void EDA_3D_VIEWER_CONTROL::setTransitions()
Go( &EDA_3D_VIEWER_CONTROL::ViewControl, EDA_3D_ACTIONS::viewRight.MakeEvent() ); Go( &EDA_3D_VIEWER_CONTROL::ViewControl, EDA_3D_ACTIONS::viewRight.MakeEvent() );
Go( &EDA_3D_VIEWER_CONTROL::ViewControl, EDA_3D_ACTIONS::viewFront.MakeEvent() ); Go( &EDA_3D_VIEWER_CONTROL::ViewControl, EDA_3D_ACTIONS::viewFront.MakeEvent() );
Go( &EDA_3D_VIEWER_CONTROL::ViewControl, EDA_3D_ACTIONS::viewBack.MakeEvent() ); Go( &EDA_3D_VIEWER_CONTROL::ViewControl, EDA_3D_ACTIONS::viewBack.MakeEvent() );
Go( &EDA_3D_VIEWER_CONTROL::ViewControl, EDA_3D_ACTIONS::pivotCenter.MakeEvent() );
Go( &EDA_3D_VIEWER_CONTROL::ViewControl, EDA_3D_ACTIONS::homeView.MakeEvent() );
Go( &EDA_3D_VIEWER_CONTROL::ViewControl, EDA_3D_ACTIONS::resetView.MakeEvent() );
Go( &EDA_3D_VIEWER_CONTROL::RotateView, EDA_3D_ACTIONS::rotateXCW.MakeEvent() ); Go( &EDA_3D_VIEWER_CONTROL::RotateView, EDA_3D_ACTIONS::rotateXCW.MakeEvent() );
Go( &EDA_3D_VIEWER_CONTROL::RotateView, EDA_3D_ACTIONS::rotateXCCW.MakeEvent() ); Go( &EDA_3D_VIEWER_CONTROL::RotateView, EDA_3D_ACTIONS::rotateXCCW.MakeEvent() );
Go( &EDA_3D_VIEWER_CONTROL::RotateView, EDA_3D_ACTIONS::rotateYCW.MakeEvent() ); Go( &EDA_3D_VIEWER_CONTROL::RotateView, EDA_3D_ACTIONS::rotateYCW.MakeEvent() );

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

@ -30,6 +30,7 @@ enum id_3dview_frm
ID_VIEW3D_RIGHT, ID_VIEW3D_RIGHT,
ID_VIEW3D_FRONT, ID_VIEW3D_FRONT,
ID_VIEW3D_BACK, ID_VIEW3D_BACK,
ID_VIEW3D_RESET,
ID_TOOL_SCREENCOPY_TOCLIBBOARD, ID_TOOL_SCREENCOPY_TOCLIBBOARD,
ID_MENU3D_COLOR, ID_MENU3D_COLOR,
ID_MENU3D_BGCOLOR, ID_MENU3D_BGCOLOR,