Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Path: Limit tool angle input in GUI #1269

Closed
wants to merge 1 commit into from
Closed

Path: Limit tool angle input in GUI #1269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
76 changes: 41 additions & 35 deletions src/Mod/Path/Gui/Resources/panels/DlgToolControllerEdit.ui
View file
Open in desktop
Expand Up @@ -22,7 +22,7 @@
<x>0</x>
<y>0</y>
<width>368</width>
<height>441</height>
<height>445</height>
</rect>
</property>
<attribute name="label">
Expand Down Expand Up @@ -75,15 +75,15 @@
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="unit" stdset="0">
<string notr="true">mm/s</string>
</property>
<property name="minimum">
<double>0.000000000000000</double>
</property>
<property name="maximum">
<double>9999999.000000000000000</double>
</property>
<property name="unit" stdset="0">
<string notr="true">mm/s</string>
</property>
</widget>
</item>
<item row="1" column="0">
Expand All @@ -104,15 +104,15 @@
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="unit" stdset="0">
<string notr="true">mm/s</string>
</property>
<property name="minimum">
<double>0.000000000000000</double>
</property>
<property name="maximum">
<double>9999999.000000000000000</double>
</property>
<property name="unit" stdset="0">
<string notr="true">mm/s</string>
</property>
</widget>
</item>
<item row="2" column="0">
Expand All @@ -133,15 +133,15 @@
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="unit" stdset="0">
<string notr="true">mm/s</string>
</property>
<property name="minimum">
<double>0.000000000000000</double>
</property>
<property name="maximum">
<double>9999999.000000000000000</double>
</property>
<property name="unit" stdset="0">
<string notr="true">mm/s</string>
</property>
</widget>
</item>
<item row="3" column="0">
Expand All @@ -162,15 +162,15 @@
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="unit" stdset="0">
<string notr="true">mm/s</string>
</property>
<property name="minimum">
<double>0.000000000000000</double>
</property>
<property name="maximum">
<double>9999999.000000000000000</double>
</property>
<property name="unit" stdset="0">
<string notr="true">mm/s</string>
</property>
</widget>
</item>
</layout>
Expand Down Expand Up @@ -233,7 +233,7 @@
<x>0</x>
<y>0</y>
<width>368</width>
<height>441</height>
<height>445</height>
</rect>
</property>
<attribute name="label">
Expand Down Expand Up @@ -446,7 +446,10 @@
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="text" stdset="0">
<string>0.00</string>
<string>0 mm</string>
</property>
<property name="unit" stdset="0">
<string notr="true">mm</string>
</property>
<property name="minimum">
<double>0.000000000000000</double>
Expand All @@ -457,9 +460,6 @@
<property name="singleStep">
<double>0.125000000000000</double>
</property>
<property name="unit" stdset="0">
<string notr="true">mm</string>
</property>
</widget>
</item>
<item row="8" column="1">
Expand All @@ -474,17 +474,17 @@
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="text" stdset="0">
<string>0.00</string>
<string>0 mm</string>
</property>
<property name="unit" stdset="0">
<string notr="true">mm</string>
</property>
<property name="minimum">
<double>0.000000000000000</double>
</property>
<property name="maximum">
<double>100.000000000000000</double>
</property>
<property name="unit" stdset="0">
<string notr="true">mm</string>
</property>
</widget>
</item>
<item row="12" column="1">
Expand All @@ -499,17 +499,17 @@
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="text" stdset="0">
<string>0.00</string>
<string>0 mm</string>
</property>
<property name="unit" stdset="0">
<string notr="true">mm</string>
</property>
<property name="minimum">
<double>0.000000000000000</double>
</property>
<property name="maximum">
<double>100.000000000000000</double>
</property>
<property name="unit" stdset="0">
<string notr="true">mm</string>
</property>
</widget>
</item>
<item row="14" column="1">
Expand All @@ -524,17 +524,17 @@
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="text" stdset="0">
<string>0.00</string>
<string>0 mm</string>
</property>
<property name="unit" stdset="0">
<string notr="true">mm</string>
</property>
<property name="minimum">
<double>0.000000000000000</double>
</property>
<property name="maximum">
<double>100.000000000000000</double>
</property>
<property name="unit" stdset="0">
<string notr="true">mm</string>
</property>
</widget>
</item>
<item row="18" column="1">
Expand All @@ -549,17 +549,17 @@
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="text" stdset="0">
<string>0.00</string>
<string>0 mm</string>
</property>
<property name="unit" stdset="0">
<string notr="true">mm</string>
</property>
<property name="minimum">
<double>0.000000000000000</double>
</property>
<property name="maximum">
<double>100.000000000000000</double>
</property>
<property name="unit" stdset="0">
<string notr="true">mm</string>
</property>
</widget>
</item>
<item row="16" column="1">
Expand All @@ -576,6 +576,12 @@
<property name="unit" stdset="0">
<string notr="true">°</string>
</property>
<property name="minimum">
<double>0.000000000000000</double>
</property>
<property name="maximum">
<double>90.000000000000000</double>
</property>
</widget>
</item>
</layout>
Expand Down Expand Up @@ -616,7 +622,7 @@
<customwidgets>
<customwidget>
<class>Gui::QuantitySpinBox</class>
<extends>QDoubleSpinBox</extends>
<extends>QWidget</extends>
<header>Gui/QuantitySpinBox.h</header>
</customwidget>
</customwidgets>
Expand Down
28 changes: 17 additions & 11 deletions src/Mod/Path/Gui/Resources/panels/ToolEdit.ui
View file
Open in desktop
Expand Up @@ -212,13 +212,13 @@
<property name="text">
<string>0 mm</string>
</property>
<property name="singleStep" stdset="0">
<property name="singleStep">
<double>0.125000000000000</double>
</property>
<property name="maximum" stdset="0">
<property name="maximum">
<double>100.000000000000000</double>
</property>
<property name="minimum" stdset="0">
<property name="minimum">
<double>0.000000000000000</double>
</property>
<property name="unit" stdset="0">
Expand All @@ -231,10 +231,10 @@
<property name="text">
<string>0 mm</string>
</property>
<property name="maximum" stdset="0">
<property name="maximum">
<double>100.000000000000000</double>
</property>
<property name="minimum" stdset="0">
<property name="minimum">
<double>0.000000000000000</double>
</property>
<property name="unit" stdset="0">
Expand All @@ -247,10 +247,10 @@
<property name="text">
<string>0 mm</string>
</property>
<property name="maximum" stdset="0">
<property name="maximum">
<double>100.000000000000000</double>
</property>
<property name="minimum" stdset="0">
<property name="minimum">
<double>0.000000000000000</double>
</property>
<property name="unit" stdset="0">
Expand All @@ -263,10 +263,10 @@
<property name="text">
<string>0 mm</string>
</property>
<property name="maximum" stdset="0">
<property name="maximum">
<double>100.000000000000000</double>
</property>
<property name="minimum" stdset="0">
<property name="minimum">
<double>0.000000000000000</double>
</property>
<property name="unit" stdset="0">
Expand All @@ -279,10 +279,10 @@
<property name="text">
<string>0 mm</string>
</property>
<property name="maximum" stdset="0">
<property name="maximum">
<double>100.000000000000000</double>
</property>
<property name="minimum" stdset="0">
<property name="minimum">
<double>0.000000000000000</double>
</property>
<property name="unit" stdset="0">
Expand All @@ -292,6 +292,12 @@
</item>
<item row="16" column="1">
<widget class="Gui::InputField" name="CuttingEdgeAngleField">
<property name="maximum">
<double>90.000000000000000</double>
</property>
<property name="minimum">
<double>0.000000000000000</double>
</property>
<property name="unit" stdset="0">
<string notr="true">°</string>
</property>
Expand Down