change prefUnit spin box to Quantity spin box

shaise · Dec 4, 2024 · 2ce9600 · 2ce9600
1 parent f584135
commit 2ce9600
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 33 deletions.
diff --git a/Resources/panels/BendOnLinePanel.ui b/Resources/panels/BendOnLinePanel.ui
@@ -89,10 +89,10 @@
        </widget>
       </item>
       <item row="0" column="1">
-       <widget class="Gui::PrefUnitSpinBox" name="unitBendRadius" native="true"/>
+       <widget class="Gui::QuantitySpinBox" name="unitBendRadius" native="true"/>
       </item>
       <item row="1" column="1">
-       <widget class="Gui::PrefUnitSpinBox" name="unitBendAngle" native="true"/>
+       <widget class="Gui::QuantitySpinBox" name="unitBendAngle" native="true"/>
       </item>
       <item row="1" column="0">
        <widget class="QLabel" name="label_5">
@@ -125,11 +125,6 @@
    <extends>QWidget</extends>
    <header>Gui/QuantitySpinBox.h</header>
   </customwidget>
-  <customwidget>
-   <class>Gui::PrefUnitSpinBox</class>
-   <extends>Gui::QuantitySpinBox</extends>
-   <header>Gui/PrefWidgets.h</header>
-  </customwidget>
  </customwidgets>
  <resources/>
  <connections/>

diff --git a/Resources/panels/CornerReliefPanel.ui b/Resources/panels/CornerReliefPanel.ui
@@ -173,7 +173,7 @@
           </widget>
          </item>
          <item row="1" column="1">
-          <widget class="Gui::PrefUnitSpinBox" name="unitXOffset" native="true">
+          <widget class="Gui::QuantitySpinBox" name="unitXOffset" native="true">
            <property name="sizePolicy">
             <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
              <horstretch>0</horstretch>
@@ -196,7 +196,7 @@
           </widget>
          </item>
          <item row="2" column="1">
-          <widget class="Gui::PrefUnitSpinBox" name="unitYOffset" native="true">
+          <widget class="Gui::QuantitySpinBox" name="unitYOffset" native="true">
            <property name="sizePolicy">
             <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
              <horstretch>0</horstretch>
@@ -282,7 +282,7 @@
           </widget>
          </item>
          <item>
-          <widget class="Gui::PrefUnitSpinBox" name="unitReliefSize" native="true">
+          <widget class="Gui::QuantitySpinBox" name="unitReliefSize" native="true">
            <property name="sizePolicy">
             <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
              <horstretch>0</horstretch>
@@ -398,11 +398,6 @@
    <extends>QWidget</extends>
    <header>Gui/QuantitySpinBox.h</header>
   </customwidget>
-  <customwidget>
-   <class>Gui::PrefUnitSpinBox</class>
-   <extends>Gui::QuantitySpinBox</extends>
-   <header>Gui/PrefWidgets.h</header>
-  </customwidget>
   <customwidget>
    <class>Gui::DoubleSpinBox</class>
    <extends>QWidget</extends>

diff --git a/Resources/panels/ExtrudedCutoutPanel.ui b/Resources/panels/ExtrudedCutoutPanel.ui
@@ -199,7 +199,7 @@
           </widget>
          </item>
          <item>
-          <widget class="Gui::PrefUnitSpinBox" name="unitLengthA" native="true">
+          <widget class="Gui::QuantitySpinBox" name="unitLengthA" native="true">
            <property name="sizePolicy">
             <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
              <horstretch>0</horstretch>
@@ -240,7 +240,7 @@
           </widget>
          </item>
          <item>
-          <widget class="Gui::PrefUnitSpinBox" name="unitLengthB" native="true">
+          <widget class="Gui::QuantitySpinBox" name="unitLengthB" native="true">
            <property name="sizePolicy">
             <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
              <horstretch>0</horstretch>
@@ -352,11 +352,6 @@
    <extends>QWidget</extends>
    <header>Gui/QuantitySpinBox.h</header>
   </customwidget>
-  <customwidget>
-   <class>Gui::PrefUnitSpinBox</class>
-   <extends>Gui::QuantitySpinBox</extends>
-   <header>Gui/PrefWidgets.h</header>
-  </customwidget>
   <customwidget>
    <class>Gui::IntSpinBox</class>
    <extends>QWidget</extends>

diff --git a/Resources/panels/StampPanel.ui b/Resources/panels/StampPanel.ui
@@ -76,7 +76,7 @@
        </widget>
       </item>
       <item row="0" column="1">
-       <widget class="Gui::PrefUnitSpinBox" name="unitOffsetX"/>
+       <widget class="Gui::QuantitySpinBox" name="unitOffsetX"/>
       </item>
       <item row="1" column="0">
        <widget class="QLabel" name="label_5">
@@ -86,7 +86,7 @@
        </widget>
       </item>
       <item row="1" column="1">
-       <widget class="Gui::PrefUnitSpinBox" name="unitOffsetY"/>
+       <widget class="Gui::QuantitySpinBox" name="unitOffsetY"/>
       </item>
       <item row="2" column="0">
        <widget class="QLabel" name="label_3">
@@ -96,7 +96,7 @@
        </widget>
       </item>
       <item row="2" column="1">
-       <widget class="Gui::PrefUnitSpinBox" name="unitOffsetZ"/>
+       <widget class="Gui::QuantitySpinBox" name="unitOffsetZ"/>
       </item>
       <item row="3" column="0">
        <widget class="QLabel" name="label_4">
@@ -106,7 +106,7 @@
        </widget>
       </item>
       <item row="3" column="1">
-       <widget class="Gui::PrefUnitSpinBox" name="unitAngle"/>
+       <widget class="Gui::QuantitySpinBox" name="unitAngle"/>
       </item>
      </layout>
     </widget>
@@ -128,7 +128,7 @@
        </widget>
       </item>
       <item row="0" column="3">
-       <widget class="Gui::PrefUnitSpinBox" name="unitThickness"/>
+       <widget class="Gui::QuantitySpinBox" name="unitThickness"/>
       </item>
      </layout>
     </widget>
@@ -154,11 +154,6 @@
    <extends>QWidget</extends>
    <header>Gui/QuantitySpinBox.h</header>
   </customwidget>
-  <customwidget>
-   <class>Gui::PrefUnitSpinBox</class>
-   <extends>Gui::QuantitySpinBox</extends>
-   <header>Gui/PrefWidgets.h</header>
-  </customwidget>
  </customwidgets>
  <resources/>
  <connections/>

diff --git a/SheetMetalTools.py b/SheetMetalTools.py
@@ -211,14 +211,21 @@ def taskSingleSelectionChanged(button):
 
     def _taskUpdateValue(value, obj, objvar, callback):
         setattr(obj, objvar, value)
-        obj.Document.recompute()
+        try:  # avoid intermitant changes
+            obj.Document.recompute()
+        except:
+            pass
         if callback is not None:
             callback(value)
+
+    def _taskEditFinished(obj):
+        obj.Document.recompute()
 
     def taskConnectSpin(task, formvar, objvar, callback = None):
         formvar.setProperty("value", getattr(task.obj, objvar))
         Gui.ExpressionBinding(formvar).bind(task.obj, objvar)
         formvar.valueChanged.connect(lambda value: _taskUpdateValue(value, task.obj, objvar, callback))
+        formvar.editingFinished.connect(lambda: _taskEditFinished(task.obj))
 
     def taskConnectCheck(task, formvar, objvar, callback = None):
         formvar.setChecked(getattr(task.obj, objvar))