From cb7b90fb883aee7710eac9980eec6725cdba37d9 Mon Sep 17 00:00:00 2001
From: marioalexis <mario.passaglia@gmail.com>
Date: Tue, 8 Oct 2024 16:55:58 -0300
Subject: [PATCH] Fem: Enable expression for the element geometry 2D task panel

---
 .../Fem/Gui/Resources/ui/ElementGeometry2D.ui | 49 ++++++-------------
 .../femtaskpanels/task_element_geometry2D.py  | 19 ++++---
 2 files changed, 25 insertions(+), 43 deletions(-)

diff --git a/src/Mod/Fem/Gui/Resources/ui/ElementGeometry2D.ui b/src/Mod/Fem/Gui/Resources/ui/ElementGeometry2D.ui
index ff1f0ac438..ff687edf8a 100644
--- a/src/Mod/Fem/Gui/Resources/ui/ElementGeometry2D.ui
+++ b/src/Mod/Fem/Gui/Resources/ui/ElementGeometry2D.ui
@@ -31,50 +31,29 @@
         <property name="fieldGrowthPolicy">
          <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
         </property>
-        <item row="1" column="1">
-         <widget class="Gui::InputField" name="if_thickness">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="minimumSize">
-           <size>
-            <width>80</width>
-            <height>20</height>
-           </size>
-          </property>
-          <property name="layoutDirection">
-           <enum>Qt::LeftToRight</enum>
-          </property>
+        <item row="0" column="0">
+         <widget class="QLabel" name="l_thickness">
           <property name="text">
-           <string>0 mm</string>
+           <string>Thickness:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="1">
+         <widget class="Gui::QuantitySpinBox" name="qsb_thickness">
+          <property name="unit" stdset="0">
+           <string>mm</string>
           </property>
           <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           <set>Qt::AlignLeft|Qt::AlignTrailing|Qt::AlignVCenter</set>
           </property>
           <property name="singleStep">
            <double>1.000000000000000</double>
           </property>
-          <property name="maximum">
-           <double>1000000000.000000000000000</double>
-          </property>
-          <property name="unit" stdset="0">
-           <string notr="true">mm</string>
-          </property>
-          <property name="decimals" stdset="0">
-           <number>2</number>
-          </property>
-          <property name="value" stdset="0">
+          <property name="minimum">
            <double>0.000000000000000</double>
           </property>
-         </widget>
-        </item>
-        <item row="1" column="0">
-         <widget class="QLabel" name="l_thickness">
-          <property name="text">
-           <string>Thickness:</string>
+          <property name="value" stdset="0">
+           <double>0.0000000000000</double>
           </property>
          </widget>
         </item>
diff --git a/src/Mod/Fem/femtaskpanels/task_element_geometry2D.py b/src/Mod/Fem/femtaskpanels/task_element_geometry2D.py
index db3cb77084..48f4733419 100644
--- a/src/Mod/Fem/femtaskpanels/task_element_geometry2D.py
+++ b/src/Mod/Fem/femtaskpanels/task_element_geometry2D.py
@@ -47,37 +47,40 @@ class _TaskPanel(base_femtaskpanel._BaseTaskPanel):
         super().__init__(obj)
 
         # parameter widget
-        self.parameterWidget = FreeCADGui.PySideUic.loadUi(
+        self.parameter_widget = FreeCADGui.PySideUic.loadUi(
             FreeCAD.getHomePath() + "Mod/Fem/Resources/ui/ElementGeometry2D.ui"
         )
         QtCore.QObject.connect(
-            self.parameterWidget.if_thickness,
+            self.parameter_widget.qsb_thickness,
             QtCore.SIGNAL("valueChanged(Base::Quantity)"),
             self.thickness_changed,
         )
         self.init_parameter_widget()
 
         # geometry selection widget
-        self.selectionWidget = selection_widgets.GeometryElementsSelection(
+        self.selection_widget = selection_widgets.GeometryElementsSelection(
             obj.References, ["Face"], False, True
         )
 
         # form made from param and selection widget
-        self.form = [self.parameterWidget, self.selectionWidget]
+        self.form = [self.parameter_widget, self.selection_widget]
 
     def accept(self):
         self.obj.Thickness = self.thickness
-        self.obj.References = self.selectionWidget.references
-        self.selectionWidget.finish_selection()
+        self.obj.References = self.selection_widget.references
+        self.selection_widget.finish_selection()
         return super().accept()
 
     def reject(self):
-        self.selectionWidget.finish_selection()
+        self.selection_widget.finish_selection()
         return super().reject()
 
     def init_parameter_widget(self):
         self.thickness = self.obj.Thickness
-        self.parameterWidget.if_thickness.setText(self.thickness.UserString)
+        FreeCADGui.ExpressionBinding(self.parameter_widget.qsb_thickness).bind(
+            self.obj, "Thickness"
+        )
+        self.parameter_widget.qsb_thickness.setProperty("value", self.thickness)
 
     def thickness_changed(self, base_quantity_value):
         self.thickness = base_quantity_value