From be3fb31ea950f838177b84d9c945ccb2080361ce Mon Sep 17 00:00:00 2001 From: Syres916 <46537884+Syres916@users.noreply.github.com> Date: Fri, 16 Jul 2021 14:30:56 +0100 Subject: [PATCH 1/3] [Gui] Transform Tool, save Translation... ..and Rotation Increments in user config file. See discussion https://forum.freecadweb.org/viewtopic.php?f=8&t=60195 --- src/Gui/TaskCSysDragger.cpp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/Gui/TaskCSysDragger.cpp b/src/Gui/TaskCSysDragger.cpp index 2e90a3f509..03c00db0bc 100644 --- a/src/Gui/TaskCSysDragger.cpp +++ b/src/Gui/TaskCSysDragger.cpp @@ -49,13 +49,13 @@ static double radiansToDegrees(const double &radiansIn) return radiansIn * (180.0 / M_PI); } -static double degreesToRadains(const double °reesIn) +static double degreesToRadians(const double °reesIn) { return degreesIn * (M_PI / 180.0); } static double lastTranslationIncrement = 1.0; -static double lastRotationIncrement = degreesToRadains(15.0); +static double lastRotationIncrement = degreesToRadians(15.0); TaskCSysDragger::TaskCSysDragger(Gui::ViewProviderDocumentObject* vpObjectIn, Gui::SoFCCSysDragger* draggerIn) : dragger(draggerIn) @@ -77,6 +77,10 @@ TaskCSysDragger::~TaskCSysDragger() void TaskCSysDragger::setupGui() { + ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/View"); + lastTranslationIncrement = hGrp->GetFloat("LastTranslationIncrement", 1.0); + lastRotationIncrement = degreesToRadians(hGrp->GetFloat("LastRotationIncrement", 15.0)); + Gui::TaskView::TaskBox *incrementsBox = new Gui::TaskView::TaskBox( Gui::BitmapFactory().pixmap("button_valid"), tr("Increments"), true, 0); @@ -119,7 +123,7 @@ void TaskCSysDragger::onTIncrementSlot(double freshValue) void TaskCSysDragger::onRIncrementSlot(double freshValue) { - dragger->rotationIncrement.setValue(degreesToRadains(freshValue)); + dragger->rotationIncrement.setValue(degreesToRadians(freshValue)); } void TaskCSysDragger::open() @@ -139,6 +143,9 @@ bool TaskCSysDragger::accept() { lastTranslationIncrement = dragger->translationIncrement.getValue(); lastRotationIncrement = dragger->rotationIncrement.getValue(); + ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/View"); + hGrp->SetFloat("LastTranslationIncrement", lastTranslationIncrement); + hGrp->SetFloat("LastRotationIncrement", radiansToDegrees(lastRotationIncrement)); App::DocumentObject* dObject = vpObject.getObject(); if (dObject) { From 202f0286d8bb73d08cc57db3c47866a7c2587d8b Mon Sep 17 00:00:00 2001 From: Syres916 <46537884+Syres916@users.noreply.github.com> Date: Mon, 19 Jul 2021 16:17:11 +0100 Subject: [PATCH 2/3] [Gui] Transform Tool change parameter... ...location --- src/Gui/TaskCSysDragger.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Gui/TaskCSysDragger.cpp b/src/Gui/TaskCSysDragger.cpp index 03c00db0bc..d84a62f0e4 100644 --- a/src/Gui/TaskCSysDragger.cpp +++ b/src/Gui/TaskCSysDragger.cpp @@ -77,7 +77,7 @@ TaskCSysDragger::~TaskCSysDragger() void TaskCSysDragger::setupGui() { - ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/View"); + ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/History/Dragger"); lastTranslationIncrement = hGrp->GetFloat("LastTranslationIncrement", 1.0); lastRotationIncrement = degreesToRadians(hGrp->GetFloat("LastRotationIncrement", 15.0)); @@ -143,7 +143,7 @@ bool TaskCSysDragger::accept() { lastTranslationIncrement = dragger->translationIncrement.getValue(); lastRotationIncrement = dragger->rotationIncrement.getValue(); - ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/View"); + ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/History/Dragger"); hGrp->SetFloat("LastTranslationIncrement", lastTranslationIncrement); hGrp->SetFloat("LastRotationIncrement", radiansToDegrees(lastRotationIncrement)); From 998e462fcfce55872c6e6699b18537dfbd4ecf5e Mon Sep 17 00:00:00 2001 From: Syres916 <46537884+Syres916@users.noreply.github.com> Date: Tue, 20 Jul 2021 07:53:33 +0100 Subject: [PATCH 3/3] [Gui] Transform Tool simplify changes as per... ...@0penBrain's feedback --- src/Gui/TaskCSysDragger.cpp | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/src/Gui/TaskCSysDragger.cpp b/src/Gui/TaskCSysDragger.cpp index d84a62f0e4..26f2f2b142 100644 --- a/src/Gui/TaskCSysDragger.cpp +++ b/src/Gui/TaskCSysDragger.cpp @@ -44,18 +44,11 @@ using namespace Gui; -static double radiansToDegrees(const double &radiansIn) -{ - return radiansIn * (180.0 / M_PI); -} - static double degreesToRadians(const double °reesIn) { return degreesIn * (M_PI / 180.0); } -static double lastTranslationIncrement = 1.0; -static double lastRotationIncrement = degreesToRadians(15.0); TaskCSysDragger::TaskCSysDragger(Gui::ViewProviderDocumentObject* vpObjectIn, Gui::SoFCCSysDragger* draggerIn) : dragger(draggerIn) @@ -77,10 +70,6 @@ TaskCSysDragger::~TaskCSysDragger() void TaskCSysDragger::setupGui() { - ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/History/Dragger"); - lastTranslationIncrement = hGrp->GetFloat("LastTranslationIncrement", 1.0); - lastRotationIncrement = degreesToRadians(hGrp->GetFloat("LastRotationIncrement", 15.0)); - Gui::TaskView::TaskBox *incrementsBox = new Gui::TaskView::TaskBox( Gui::BitmapFactory().pixmap("button_valid"), tr("Increments"), true, 0); @@ -133,19 +122,20 @@ void TaskCSysDragger::open() Gui::Application::Instance->commandManager().getCommandByName("Std_PerspectiveCamera")->setEnabled(false); // dragger->translationIncrement.setValue(lastTranslationIncrement); // dragger->rotationIncrement.setValue(lastRotationIncrement); + ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/History/Dragger"); + double lastTranslationIncrement = hGrp->GetFloat("LastTranslationIncrement", 1.0); + double lastRotationIncrement = hGrp->GetFloat("LastRotationIncrement", 15.0); tSpinBox->setValue(lastTranslationIncrement); - rSpinBox->setValue(radiansToDegrees(lastRotationIncrement)); + rSpinBox->setValue(lastRotationIncrement); Gui::TaskView::TaskDialog::open(); } bool TaskCSysDragger::accept() { - lastTranslationIncrement = dragger->translationIncrement.getValue(); - lastRotationIncrement = dragger->rotationIncrement.getValue(); ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/History/Dragger"); - hGrp->SetFloat("LastTranslationIncrement", lastTranslationIncrement); - hGrp->SetFloat("LastRotationIncrement", radiansToDegrees(lastRotationIncrement)); + hGrp->SetFloat("LastTranslationIncrement", tSpinBox->rawValue()); + hGrp->SetFloat("LastRotationIncrement", rSpinBox->rawValue()); App::DocumentObject* dObject = vpObject.getObject(); if (dObject) {