Gui: if an expression is set for Euler angles in the placement dialog…

… then evaluate the expression instead of determining the angles from the rotation See forum thread: https://forum.freecadweb.org/viewtopic.php?f=3&t=72522
FreeCAD · Oct 26, 2022 · 4d8e615 · 4d8e615
1 parent bcc9c66
commit 4d8e615
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 0 deletions.
diff --git a/src/Gui/Placement.cpp b/src/Gui/Placement.cpp
@@ -658,6 +658,10 @@ void Placement::bindObject()
         ui->yawAngle  ->bind(App::ObjectIdentifier::parse(obj, propertyName + std::string(".Rotation.Yaw")));
         ui->pitchAngle->bind(App::ObjectIdentifier::parse(obj, propertyName + std::string(".Rotation.Pitch")));
         ui->rollAngle ->bind(App::ObjectIdentifier::parse(obj, propertyName + std::string(".Rotation.Roll")));
+
+        ui->yawAngle->evaluateExpression();
+        ui->pitchAngle->evaluateExpression();
+        ui->rollAngle->evaluateExpression();
     }
 }
 

diff --git a/src/Gui/QuantitySpinBox.cpp b/src/Gui/QuantitySpinBox.cpp
@@ -417,6 +417,13 @@ QString Gui::QuantitySpinBox::expressionText() const
     return QString();
 }
 
+void QuantitySpinBox::evaluateExpression()
+{
+    if (isBound() && getExpression()) {
+        showValidExpression(Number::SetIfNumber);
+    }
+}
+
 void Gui::QuantitySpinBox::setNumberExpression(App::NumberExpression* expr)
 {
     lineEdit()->setText(getUserString(expr->getQuantity()));

diff --git a/src/Gui/QuantitySpinBox.h b/src/Gui/QuantitySpinBox.h
@@ -108,6 +108,7 @@ class GuiExport QuantitySpinBox : public QAbstractSpinBox, public ExpressionSpin
 
     /// Gets the expression as a string
     QString expressionText() const;
+    void evaluateExpression();
 
     /// Set the number portion selected
     void selectNumber();