Skip to content

Commit

Permalink
[FEM] fix unit handling of filter functions
Browse files Browse the repository at this point in the history 
- the function properties use already units but the dialogs were unitless
  • Loading branch information
@donovaly
donovaly committed Jun 11, 2022
1 parent 9dc93b8 commit 9b5aabe
Show file tree
Hide file tree
Showing 3 changed files with 236 additions and 259 deletions.
248 changes: 107 additions & 141 deletions src/Mod/Fem/Gui/PlaneWidget.ui
View file
Expand Up @@ -6,194 +6,160 @@
<rect>
<x>0</x>
<y>0</y>
<width>287</width>
<height>84</height>
<width>280</width>
<height>85</height>
</rect>
</property>
<property name="windowTitle">
<string>Form</string>
</property>
<layout class="QFormLayout" name="formLayout">
<property name="verticalSpacing">
<number>2</number>
</property>
<property name="leftMargin">
<number>6</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Origin</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="0" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_2">
<property name="spacing">
<number>2</number>
</property>
<item>
<widget class="QDoubleSpinBox" name="originX">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>70</width>
<height>0</height>
</size>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="1">
<widget class="QLabel" name="label_7">
<property name="text">
<string>x</string>
</property>
<property name="minimum">
<double>-999999999.000000000000000</double>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
<property name="maximum">
<double>999999999.000000000000000</double>
</widget>
</item>
<item row="0" column="2">
<widget class="QLabel" name="label_8">
<property name="text">
<string>y</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item>
<widget class="QDoubleSpinBox" name="originY">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>70</width>
<height>0</height>
</size>
<item row="0" column="3">
<widget class="QLabel" name="label_9">
<property name="text">
<string>z</string>
</property>
<property name="minimum">
<double>-999999999.000000000000000</double>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
<property name="maximum">
<double>999999999.000000000000000</double>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Origin</string>
</property>
<property name="value">
<double>0.000000000000000</double>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item>
<widget class="QDoubleSpinBox" name="originZ">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<item row="1" column="1">
<widget class="Gui::PrefQuantitySpinBox" name="originX">
<property name="maximumSize">
<size>
<width>70</width>
<height>0</height>
<width>95</width>
<height>16777215</height>
</size>
</property>
<property name="minimum">
<double>-999999999.000000000000000</double>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="maximum">
<double>999999999.000000000000000</double>
</widget>
</item>
<item row="1" column="2">
<widget class="Gui::PrefQuantitySpinBox" name="originY">
<property name="maximumSize">
<size>
<width>95</width>
<height>16777215</height>
</size>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
</layout>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Normal</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="1" column="1">
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="spacing">
<number>2</number>
</property>
<item>
<widget class="QDoubleSpinBox" name="normalX">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<item row="1" column="3">
<widget class="Gui::PrefQuantitySpinBox" name="originZ">
<property name="maximumSize">
<size>
<width>70</width>
<height>0</height>
<width>95</width>
<height>16777215</height>
</size>
</property>
<property name="minimum">
<double>-999999999.000000000000000</double>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Normal</string>
</property>
<property name="maximum">
<double>999999999.000000000000000</double>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item>
<widget class="QDoubleSpinBox" name="normalY">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<item row="2" column="1">
<widget class="Gui::PrefQuantitySpinBox" name="normalX">
<property name="maximumSize">
<size>
<width>70</width>
<height>0</height>
<width>95</width>
<height>16777215</height>
</size>
</property>
<property name="minimum">
<double>-999999999.000000000000000</double>
</property>
<property name="maximum">
<double>999999999.000000000000000</double>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item>
<widget class="QDoubleSpinBox" name="normalZ">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<item row="2" column="2">
<widget class="Gui::PrefQuantitySpinBox" name="normalY">
<property name="maximumSize">
<size>
<width>70</width>
<height>0</height>
<width>95</width>
<height>16777215</height>
</size>
</property>
<property name="minimum">
<double>-999999999.000000000000000</double>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="2" column="3">
<widget class="Gui::PrefQuantitySpinBox" name="normalZ">
<property name="maximumSize">
<size>
<width>95</width>
<height>16777215</height>
</size>
</property>
<property name="maximum">
<double>999999999.000000000000000</double>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
<customwidgets>
<customwidget>
<class>Gui::QuantitySpinBox</class>
<extends>QWidget</extends>
<header>Gui/QuantitySpinBox.h</header>
</customwidget>
<customwidget>
<class>Gui::PrefQuantitySpinBox</class>
<extends>Gui::QuantitySpinBox</extends>
<header>Gui/PrefWidgets.h</header>
</customwidget>
</customwidgets>
<resources/>
<connections/>
</ui>

0 comments on commit 9b5aabe

Please sign in to comment.