Skip to content

Commit

Permalink
Merge pull request #3938 from sliptonic/feature/dragknifepanel
Browse files Browse the repository at this point in the history
[PATH]  Task panel for dragknife and axismap dressups.  fixes #2840
  • Loading branch information
sliptonic committed Oct 12, 2020
2 parents f82532d + 6f941c3 commit 63a244f
Show file tree
Hide file tree
Showing 8 changed files with 391 additions and 75 deletions.
2 changes: 2 additions & 0 deletions src/Mod/Path/Gui/Resources/Path.qrc
Expand Up @@ -83,6 +83,7 @@
<file>icons/edge-join-round-not.svg</file>
<file>icons/edge-join-round.svg</file>
<file>icons/preferences-path.svg</file>
<file>panels/AxisMapEdit.ui</file>
<file>panels/DlgJobChooser.ui</file>
<file>panels/DlgJobCreate.ui</file>
<file>panels/DlgJobModelSelect.ui</file>
Expand All @@ -94,6 +95,7 @@
<file>panels/DlgToolEdit.ui</file>
<file>panels/DogboneEdit.ui</file>
<file>panels/DressupPathBoundary.ui</file>
<file>panels/DragKnifeEdit.ui</file>
<file>panels/HoldingTagsEdit.ui</file>
<file>panels/PageBaseGeometryEdit.ui</file>
<file>panels/PageBaseHoleGeometryEdit.ui</file>
Expand Down
105 changes: 105 additions & 0 deletions src/Mod/Path/Gui/Resources/panels/AxisMapEdit.ui
@@ -0,0 +1,105 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>TaskPanel</class>
<widget class="QWidget" name="TaskPanel">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>376</width>
<height>387</height>
</rect>
</property>
<property name="windowTitle">
<string>AxisMap Dressup</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="3" column="2">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>275</height>
</size>
</property>
</spacer>
</item>
<item row="0" column="0">
<widget class="QLabel" name="lblRadius">
<property name="text">
<string>Radius</string>
</property>
</widget>
</item>
<item row="0" column="2" colspan="2">
<widget class="Gui::QuantitySpinBox" name="radius">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The radius of the wrapped axis&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="unit" stdset="0">
<string notr="true">mm</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="lblAxisMapInput">
<property name="text">
<string>Axis Mapping</string>
</property>
</widget>
</item>
<item row="1" column="2" colspan="2">
<widget class="QComboBox" name="axisMapInput">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The input mapping axis. Coordinates of the first axis will be mapped to the second.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="currentIndex">
<number>1</number>
</property>
<item>
<property name="text">
<string>X-&gt;A</string>
</property>
</item>
<item>
<property name="text">
<string>Y-&gt;A</string>
</property>
</item>
<item>
<property name="text">
<string>X-&gt;B</string>
</property>
</item>
<item>
<property name="text">
<string>Y-&gt;B</string>
</property>
</item>
<item>
<property name="text">
<string>X-&gt;C</string>
</property>
</item>
<item>
<property name="text">
<string>Y-&gt;C</string>
</property>
</item>
</widget>
</item>
</layout>
</widget>
<customwidgets>
<customwidget>
<class>Gui::QuantitySpinBox</class>
<extends>QWidget</extends>
<header>Gui/QuantitySpinBox.h</header>
</customwidget>
</customwidgets>
<resources/>
<connections/>
</ui>
110 changes: 110 additions & 0 deletions src/Mod/Path/Gui/Resources/panels/DragKnifeEdit.ui
@@ -0,0 +1,110 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>TaskPanel</class>
<widget class="QWidget" name="TaskPanel">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>376</width>
<height>387</height>
</rect>
</property>
<property name="windowTitle">
<string>Dragknife Dressup</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="3" column="2">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>275</height>
</size>
</property>
</spacer>
</item>
<item row="0" column="0">
<widget class="QLabel" name="lblFilterAngle">
<property name="text">
<string>Filter Angle</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="lblPivotHeight">
<property name="text">
<string>Pivot Height</string>
</property>
</widget>
</item>
<item row="1" column="2" colspan="2">
<widget class="Gui::QuantitySpinBox" name="offsetDistance">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Distance the point trails behind the spindle&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</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="value">
<double>2.000000000000000</double>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="lblOffSetDistance">
<property name="text">
<string>Offset Distance</string>
</property>
</widget>
</item>
<item row="2" column="2" colspan="2">
<widget class="Gui::QuantitySpinBox" name="pivotHeight">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Height to raise during corner action&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</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="value">
<double>4.000000000000000</double>
</property>
</widget>
</item>
<item row="0" column="2" colspan="2">
<widget class="Gui::QuantitySpinBox" name="filterAngle">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Angles less than filter angle will not receive corner actions&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="unit" stdset="0">
<string notr="true">deg</string>
</property>
</widget>
</item>
</layout>
</widget>
<customwidgets>
<customwidget>
<class>Gui::QuantitySpinBox</class>
<extends>QWidget</extends>
<header>Gui/QuantitySpinBox.h</header>
</customwidget>
</customwidgets>
<resources/>
<connections/>
</ui>

0 comments on commit 63a244f

Please sign in to comment.