Merge pull request #4923 from Syres916/patch-23

[Gui] Transform Tool, save Translation...
This commit is contained in:
Yorik van Havre
2021-09-01 16:35:40 +02:00
committed by GitHub

View File

@@ -44,18 +44,11 @@
using namespace Gui;
static double radiansToDegrees(const double &radiansIn)
{
return radiansIn * (180.0 / M_PI);
}
static double degreesToRadains(const double &degreesIn)
static double degreesToRadians(const double &degreesIn)
{
return degreesIn * (M_PI / 180.0);
}
static double lastTranslationIncrement = 1.0;
static double lastRotationIncrement = degreesToRadains(15.0);
TaskCSysDragger::TaskCSysDragger(Gui::ViewProviderDocumentObject* vpObjectIn, Gui::SoFCCSysDragger* draggerIn) :
dragger(draggerIn)
@@ -119,7 +112,7 @@ void TaskCSysDragger::onTIncrementSlot(double freshValue)
void TaskCSysDragger::onRIncrementSlot(double freshValue)
{
dragger->rotationIncrement.setValue(degreesToRadains(freshValue));
dragger->rotationIncrement.setValue(degreesToRadians(freshValue));
}
void TaskCSysDragger::open()
@@ -129,16 +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", tSpinBox->rawValue());
hGrp->SetFloat("LastRotationIncrement", rSpinBox->rawValue());
App::DocumentObject* dObject = vpObject.getObject();
if (dObject) {