Fem: Enable expression for the mesh boundary layer task panel

src/Mod/Fem/Gui/Resources/ui/MeshBoundaryLayer.ui

@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>386</width>
+    <width>300</width>
     <height>500</height>
    </rect>
   </property>
@@ -28,76 +28,61 @@
      <layout class="QVBoxLayout" name="verticalLayout_5">
       <item>
        <layout class="QFormLayout" name="formLayout_1">
-        <property name="fieldGrowthPolicy">
-         <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
-        </property>
-        <item row="1" column="0">
+        <item row="0" column="0">
          <widget class="QLabel" name="l_layers">
           <property name="text">
            <string>Max Layers</string>
           </property>
          </widget>
         </item>
-        <item row="2" column="1">
-         <widget class="Gui::InputField" name="bl_min_thickness">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="text">
-           <string>0 mm</string>
-          </property>
-          <property name="alignment">
-           <set>Qt::AlignRight|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="min_thickness" stdset="0">
-           <size>
-            <width>80</width>
-            <height>20</height>
-           </size>
-          </property>
-          <property name="decimals" stdset="0">
-           <number>2</number>
-          </property>
-          <property name="value" stdset="0">
-           <double>1.000000000000000</double>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="1">
-         <widget class="QSpinBox" name="bl_number_of_layers">
+        <item row="0" column="1">
+         <widget class="Gui::IntSpinBox" name="isb_number_of_layers">
           <property name="value">
            <number>3</number>
           </property>
+          <property name="alignment">
+           <set>Qt::AlignLeft|Qt::AlignTrailing|Qt::AlignVCenter</set>
+          </property>
          </widget>
         </item>
-        <item row="2" column="0">
+        <item row="1" column="0">
          <widget class="QLabel" name="l_thickness">
           <property name="text">
            <string>Min/1st thickness</string>
           </property>
          </widget>
         </item>
-        <item row="3" column="0">
+        <item row="1" column="1">
+         <widget class="Gui::QuantitySpinBox" name="qsb_min_thickness">
+          <property name="unit" stdset="0">
+           <string>mm</string>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignLeft|Qt::AlignTrailing|Qt::AlignVCenter</set>
+          </property>
+          <property name="singleStep">
+           <double>1.000000000000000</double>
+          </property>
+          <property name="minimum">
+           <double>0.000000000000000</double>
+          </property>
+          <property name="value" stdset="0">
+           <double>0.0000000000000</double>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="0">
          <widget class="QLabel" name="l_growth_rate">
           <property name="text">
            <string>Growth ratio</string>
           </property>
          </widget>
         </item>
-        <item row="3" column="1">
-         <widget class="QDoubleSpinBox" name="bl_growth_rate">
+        <item row="2" column="1">
+         <widget class="Gui::DoubleSpinBox" name="dsb_growth_rate">
+          <property name="alignment">
+           <set>Qt::AlignLeft|Qt::AlignTrailing|Qt::AlignVCenter</set>
+          </property>
           <property name="minimum">
            <double>0.100000000000000</double>
           </property>
@@ -108,7 +93,7 @@
            <double>0.100000000000000</double>
           </property>
           <property name="value">
-           <double>1.300000000000000</double>
+           <double>1.000000000000000</double>
           </property>
          </widget>
         </item>
@@ -117,26 +102,23 @@
      </layout>
     </widget>
    </item>
-   <item>
-    <spacer name="verticalSpacer_2">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>40</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
-   <class>Gui::InputField</class>
-   <extends>QLineEdit</extends>
-   <header>Gui/InputField.h</header>
+   <class>Gui::QuantitySpinBox</class>
+   <extends>QWidget</extends>
+   <header>Gui/QuantitySpinBox.h</header>
+  </customwidget>
+  <customwidget>
+   <class>Gui::DoubleSpinBox</class>
+   <extends>QWidget</extends>
+   <header>Gui/SpinBox.h</header>
+  </customwidget>
+  <customwidget>
+   <class>Gui::IntSpinBox</class>
+   <extends>QWidget</extends>
+   <header>Gui/SpinBox.h</header>
   </customwidget>
  </customwidgets>
  <resources/>

src/Mod/Fem/femtaskpanels/task_mesh_boundarylayer.py

@@ -47,64 +47,75 @@ 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/MeshBoundaryLayer.ui"
         )
         QtCore.QObject.connect(
-            self.parameterWidget.bl_number_of_layers,
+            self.parameter_widget.isb_number_of_layers,
             QtCore.SIGNAL("valueChanged(int)"),
-            self.bl_number_of_layers_changed,
+            self.number_of_layers_changed,
         )
         QtCore.QObject.connect(
-            self.parameterWidget.bl_min_thickness,
+            self.parameter_widget.qsb_min_thickness,
             QtCore.SIGNAL("valueChanged(Base::Quantity)"),
-            self.bl_min_thickness_changed,
+            self.min_thickness_changed,
         )
         # be careful of signal signature for QDoubleSpinbox
         QtCore.QObject.connect(
-            self.parameterWidget.bl_growth_rate,
+            self.parameter_widget.dsb_growth_rate,
             QtCore.SIGNAL("valueChanged(double)"),
-            self.bl_growth_rate_changed,
+            self.growth_rate_changed,
         )
         self.init_parameter_widget()
 
         # geometry selection widget
         # start with Solid in list!
-        self.selectionWidget = selection_widgets.GeometryElementsSelection(
+        self.selection_widget = selection_widgets.GeometryElementsSelection(
             obj.References, ["Solid", "Face", "Edge", "Vertex"], True, False
         )
 
         # 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.set_mesh_boundarylayer_props()
-        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.bl_min_thickness = self.obj.MinimumThickness
-        self.bl_number_of_layers = self.obj.NumberOfLayers
-        self.bl_growth_rate = self.obj.GrowthRate
-        self.parameterWidget.bl_min_thickness.setText(self.bl_min_thickness.UserString)
-        self.parameterWidget.bl_number_of_layers.setValue(self.bl_number_of_layers)
-        self.parameterWidget.bl_growth_rate.setValue(self.bl_growth_rate)
+        self.min_thickness = self.obj.MinimumThickness
+        self.number_of_layers = self.obj.NumberOfLayers
+        self.growth_rate = self.obj.GrowthRate
+        FreeCADGui.ExpressionBinding(self.parameter_widget.qsb_min_thickness).bind(
+            self.obj, "MinimumThickness"
+        )
+        self.parameter_widget.qsb_min_thickness.setProperty("value", self.min_thickness)
+
+        FreeCADGui.ExpressionBinding(self.parameter_widget.dsb_growth_rate).bind(
+            self.obj, "GrowthRate"
+        )
+        self.parameter_widget.dsb_growth_rate.setProperty("value", self.growth_rate)
+
+        FreeCADGui.ExpressionBinding(self.parameter_widget.isb_number_of_layers).bind(
+            self.obj, "NumberOfLayers"
+        )
+        self.parameter_widget.isb_number_of_layers.setProperty("value", self.number_of_layers)
 
     def set_mesh_boundarylayer_props(self):
-        self.obj.MinimumThickness = self.bl_min_thickness
-        self.obj.NumberOfLayers = self.bl_number_of_layers
-        self.obj.GrowthRate = self.bl_growth_rate
+        self.obj.MinimumThickness = self.min_thickness
+        self.obj.NumberOfLayers = self.number_of_layers
+        self.obj.GrowthRate = self.growth_rate
 
-    def bl_min_thickness_changed(self, base_quantity_value):
-        self.bl_min_thickness = base_quantity_value
+    def min_thickness_changed(self, base_quantity_value):
+        self.min_thickness = base_quantity_value
 
-    def bl_number_of_layers_changed(self, value):
-        self.bl_number_of_layers = value
+    def number_of_layers_changed(self, value):
+        self.number_of_layers = value
 
-    def bl_growth_rate_changed(self, value):
-        self.bl_growth_rate = value
+    def growth_rate_changed(self, value):
+        self.growth_rate = value