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) {