From 6ca7934681d46722e64c08959f397c4ee9df9ba7 Mon Sep 17 00:00:00 2001 From: Leonardo Zide Date: Sat, 11 Nov 2017 12:46:56 -0800 Subject: [PATCH] Removed axis lock option. --- common/lc_commands.cpp | 28 ------------------- common/lc_commands.h | 4 --- common/lc_mainwindow.cpp | 58 --------------------------------------- common/lc_mainwindow.h | 21 -------------- common/lc_model.cpp | 20 ++------------ common/lc_model.h | 1 - leocad.qrc | 1 - resources/edit_lock.png | Bin 3434 -> 0 bytes 8 files changed, 2 insertions(+), 131 deletions(-) delete mode 100644 resources/edit_lock.png diff --git a/common/lc_commands.cpp b/common/lc_commands.cpp index 61e9e9f9..734b1369 100644 --- a/common/lc_commands.cpp +++ b/common/lc_commands.cpp @@ -262,34 +262,6 @@ lcCommand gCommands[LC_NUM_COMMANDS] = QT_TRANSLATE_NOOP("Status", "Select pieces by color"), QT_TRANSLATE_NOOP("Shortcut", "") }, - // LC_EDIT_LOCK_X - { - QT_TRANSLATE_NOOP("Action", "Edit.Lock.LockX"), - QT_TRANSLATE_NOOP("Menu", "Lock X"), - QT_TRANSLATE_NOOP("Status", "Prevents movement and rotation along the X axis"), - QT_TRANSLATE_NOOP("Shortcut", "") - }, - // LC_EDIT_LOCK_Y - { - QT_TRANSLATE_NOOP("Action", "Edit.Lock.LockY"), - QT_TRANSLATE_NOOP("Menu", "Lock Y"), - QT_TRANSLATE_NOOP("Status", "Prevents movement and rotation along the Y axis"), - QT_TRANSLATE_NOOP("Shortcut", "") - }, - // LC_EDIT_LOCK_Z - { - QT_TRANSLATE_NOOP("Action", "Edit.Lock.LockZ"), - QT_TRANSLATE_NOOP("Menu", "Lock Z"), - QT_TRANSLATE_NOOP("Status", "Prevents movement and rotation along the Z axis"), - QT_TRANSLATE_NOOP("Shortcut", "") - }, - // LC_EDIT_LOCK_NONE - { - QT_TRANSLATE_NOOP("Action", "Edit.Lock.None"), - QT_TRANSLATE_NOOP("Menu", "Unlock All"), - QT_TRANSLATE_NOOP("Status", "Allows movement and rotation in all directions"), - QT_TRANSLATE_NOOP("Shortcut", "") - }, // LC_EDIT_TRANSFORM_RELATIVE { QT_TRANSLATE_NOOP("Action", "Edit.TransformRelative"), diff --git a/common/lc_commands.h b/common/lc_commands.h index 720c018e..f3467ecf 100644 --- a/common/lc_commands.h +++ b/common/lc_commands.h @@ -41,10 +41,6 @@ enum lcCommandId LC_EDIT_SELECT_INVERT, LC_EDIT_SELECT_BY_NAME, LC_EDIT_SELECT_BY_COLOR, - LC_EDIT_LOCK_X, - LC_EDIT_LOCK_Y, - LC_EDIT_LOCK_Z, - LC_EDIT_LOCK_NONE, LC_EDIT_TRANSFORM_RELATIVE, LC_EDIT_SNAP_MOVE_TOGGLE, LC_EDIT_SNAP_MOVE_XY0, diff --git a/common/lc_mainwindow.cpp b/common/lc_mainwindow.cpp index a458a492..2b2a7992 100644 --- a/common/lc_mainwindow.cpp +++ b/common/lc_mainwindow.cpp @@ -66,9 +66,6 @@ lcMainWindow::lcMainWindow() mMoveXYSnapIndex = 4; mMoveZSnapIndex = 3; mAngleSnapIndex = 5; - mLockX = false; - mLockY = false; - mLockZ = false; mRelativeTransform = true; mCurrentPieceInfo = nullptr; @@ -276,9 +273,6 @@ void lcMainWindow::CreateActions() mActions[LC_HELP_HOMEPAGE]->setIcon(QIcon(":/resources/help_homepage.png")); mActions[LC_HELP_EMAIL]->setIcon(QIcon(":/resources/help_email.png")); - mActions[LC_EDIT_LOCK_X]->setCheckable(true); - mActions[LC_EDIT_LOCK_Y]->setCheckable(true); - mActions[LC_EDIT_LOCK_Z]->setCheckable(true); mActions[LC_EDIT_TRANSFORM_RELATIVE]->setCheckable(true); mActions[LC_EDIT_SNAP_MOVE_TOGGLE]->setCheckable(true); mActions[LC_EDIT_SNAP_ANGLE_TOGGLE]->setCheckable(true); @@ -518,17 +512,6 @@ void lcMainWindow::CreateMenus() void lcMainWindow::CreateToolBars() { - QMenu* LockMenu = new QMenu(tr("Lock Menu"), this); - LockMenu->addAction(mActions[LC_EDIT_LOCK_X]); - LockMenu->addAction(mActions[LC_EDIT_LOCK_Y]); - LockMenu->addAction(mActions[LC_EDIT_LOCK_Z]); - LockMenu->addAction(mActions[LC_EDIT_LOCK_NONE]); - - QAction* LockAction = new QAction(tr("Lock Menu"), this); - LockAction->setStatusTip(tr("Toggle mouse movement on specific axes")); - LockAction->setIcon(QIcon(":/resources/edit_lock.png")); - LockAction->setMenu(LockMenu); - QMenu* SnapXYMenu = new QMenu(tr("Snap XY"), this); for (int actionIdx = LC_EDIT_SNAP_MOVE_XY0; actionIdx <= LC_EDIT_SNAP_MOVE_XY9; actionIdx++) SnapXYMenu->addAction(mActions[actionIdx]); @@ -574,12 +557,10 @@ void lcMainWindow::CreateToolBars() mStandardToolBar->addAction(mActions[LC_EDIT_PASTE]); mStandardToolBar->addSeparator(); mStandardToolBar->addAction(mActions[LC_EDIT_TRANSFORM_RELATIVE]); - mStandardToolBar->addAction(LockAction); mStandardToolBar->addAction(MoveAction); mStandardToolBar->addAction(AngleAction); mStandardToolBar->addSeparator(); mStandardToolBar->addAction(mActions[LC_EDIT_TRANSFORM]); - ((QToolButton*)mStandardToolBar->widgetForAction(LockAction))->setPopupMode(QToolButton::InstantPopup); ((QToolButton*)mStandardToolBar->widgetForAction(MoveAction))->setPopupMode(QToolButton::InstantPopup); ((QToolButton*)mStandardToolBar->widgetForAction(AngleAction))->setPopupMode(QToolButton::InstantPopup); ((QToolButton*)mStandardToolBar->widgetForAction(mActions[LC_EDIT_TRANSFORM]))->setPopupMode(QToolButton::InstantPopup); @@ -1234,24 +1215,6 @@ void lcMainWindow::SetAngleSnapIndex(int Index) UpdateSnap(); } -void lcMainWindow::SetLockX(bool LockX) -{ - mLockX = LockX; - UpdateLockSnap(); -} - -void lcMainWindow::SetLockY(bool LockY) -{ - mLockY = LockY; - UpdateLockSnap(); -} - -void lcMainWindow::SetLockZ(bool LockZ) -{ - mLockZ = LockZ; - UpdateLockSnap(); -} - void lcMainWindow::SetRelativeTransform(bool RelativeTransform) { mRelativeTransform = RelativeTransform; @@ -1590,9 +1553,6 @@ void lcMainWindow::SetAddKeys(bool AddKeys) void lcMainWindow::UpdateLockSnap() { mActions[LC_EDIT_TRANSFORM_RELATIVE]->setChecked(GetRelativeTransform()); - mActions[LC_EDIT_LOCK_X]->setChecked(GetLockX()); - mActions[LC_EDIT_LOCK_Y]->setChecked(GetLockY()); - mActions[LC_EDIT_LOCK_Z]->setChecked(GetLockZ()); } void lcMainWindow::UpdateSnap() @@ -2514,24 +2474,6 @@ void lcMainWindow::HandleCommand(lcCommandId CommandId) SetRelativeTransform(!GetRelativeTransform()); break; - case LC_EDIT_LOCK_X: - SetLockX(!GetLockX()); - break; - - case LC_EDIT_LOCK_Y: - SetLockY(!GetLockY()); - break; - - case LC_EDIT_LOCK_Z: - SetLockZ(!GetLockZ()); - break; - - case LC_EDIT_LOCK_NONE: - SetLockX(false); - SetLockY(false); - SetLockZ(false); - break; - case LC_EDIT_SNAP_MOVE_TOGGLE: SetMoveSnapEnabled(!mMoveSnapEnabled); break; diff --git a/common/lc_mainwindow.h b/common/lc_mainwindow.h index e1719132..e49de0cd 100644 --- a/common/lc_mainwindow.h +++ b/common/lc_mainwindow.h @@ -157,21 +157,6 @@ public: return mAngleSnapEnabled ? QString::number(GetAngleSnap()) : tr("None"); } - bool GetLockX() const - { - return mLockX; - } - - bool GetLockY() const - { - return mLockY; - } - - bool GetLockZ() const - { - return mLockZ; - } - bool GetRelativeTransform() const { return mRelativeTransform; @@ -251,9 +236,6 @@ public: void SetMoveXYSnapIndex(int Index); void SetMoveZSnapIndex(int Index); void SetAngleSnapIndex(int Index); - void SetLockX(bool LockX); - void SetLockY(bool LockY); - void SetLockZ(bool LockZ); void SetRelativeTransform(bool RelativeTransform); void SetCurrentPieceInfo(PieceInfo* Info); void SetShadingMode(lcShadingMode ShadingMode); @@ -352,9 +334,6 @@ protected: int mMoveXYSnapIndex; int mMoveZSnapIndex; int mAngleSnapIndex; - bool mLockX; - bool mLockY; - bool mLockZ; bool mRelativeTransform; PieceInfo* mCurrentPieceInfo; diff --git a/common/lc_model.cpp b/common/lc_model.cpp index 60bfce93..984e14d4 100644 --- a/common/lc_model.cpp +++ b/common/lc_model.cpp @@ -1928,22 +1928,6 @@ void lcModel::RemoveEmptyGroups() while (Removed); } -lcVector3 lcModel::LockVector(const lcVector3& Vector) const -{ - lcVector3 NewVector(Vector); - - if (gMainWindow->GetLockX()) - NewVector[0] = 0; - - if (gMainWindow->GetLockY()) - NewVector[1] = 0; - - if (gMainWindow->GetLockZ()) - NewVector[2] = 0; - - return NewVector; -} - lcVector3 lcModel::SnapPosition(const lcVector3& Distance) const { lcVector3 NewDistance(Distance); @@ -3736,7 +3720,7 @@ void lcModel::UpdateCameraTool(const lcVector3& Position) void lcModel::UpdateMoveTool(const lcVector3& Distance, bool AlternateButtonDrag) { - lcVector3 PieceDistance = LockVector(SnapPosition(Distance) - SnapPosition(mMouseToolDistance)); + lcVector3 PieceDistance = SnapPosition(Distance) - SnapPosition(mMouseToolDistance); lcVector3 ObjectDistance = Distance - mMouseToolDistance; MoveSelectedObjects(PieceDistance, ObjectDistance, true, AlternateButtonDrag, true, false); @@ -3748,7 +3732,7 @@ void lcModel::UpdateMoveTool(const lcVector3& Distance, bool AlternateButtonDrag void lcModel::UpdateRotateTool(const lcVector3& Angles, bool AlternateButtonDrag) { - lcVector3 Delta = LockVector(SnapRotation(Angles) - SnapRotation(mMouseToolDistance)); + lcVector3 Delta = SnapRotation(Angles) - SnapRotation(mMouseToolDistance); RotateSelectedPieces(Delta, true, AlternateButtonDrag, false, false); mMouseToolDistance = Angles; diff --git a/common/lc_model.h b/common/lc_model.h index 0d1e5a3e..5db35a16 100644 --- a/common/lc_model.h +++ b/common/lc_model.h @@ -266,7 +266,6 @@ public: void UndoAction(); void RedoAction(); - lcVector3 LockVector(const lcVector3& Vector) const; lcVector3 SnapPosition(const lcVector3& Delta) const; lcVector3 SnapRotation(const lcVector3& Delta) const; lcMatrix33 GetRelativeRotation() const; diff --git a/leocad.qrc b/leocad.qrc index 0e1b35ff..fa8ff916 100644 --- a/leocad.qrc +++ b/leocad.qrc @@ -57,7 +57,6 @@ resources/edit_copy.png resources/edit_cut.png resources/edit_find.png - resources/edit_lock.png resources/edit_paste.png resources/edit_redo.png resources/edit_snap_angle.png diff --git a/resources/edit_lock.png b/resources/edit_lock.png deleted file mode 100644 index a4cd3f1a2fe864c855198f58341a7cc3cdbfffe6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3434 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 M07*qoM6N<$f)|!(Gynhq