Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Handle setting the coolant mode on the job ui
  • Loading branch information
dubstar-04 committed Aug 28, 2019
1 parent 3250913 commit 0002090
Show file tree
Hide file tree
Showing 2 changed files with 83 additions and 19 deletions.
63 changes: 44 additions & 19 deletions src/Mod/Path/Gui/Resources/panels/PathEdit.ui
Expand Up @@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>478</width>
<height>1310</height>
<width>451</width>
<height>705</height>
</rect>
</property>
<property name="windowTitle">
Expand All @@ -31,8 +31,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>458</width>
<height>1201</height>
<width>429</width>
<height>588</height>
</rect>
</property>
<attribute name="label">
Expand Down Expand Up @@ -112,8 +112,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>458</width>
<height>1201</height>
<width>98</width>
<height>28</height>
</rect>
</property>
<attribute name="label">
Expand Down Expand Up @@ -244,6 +244,12 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;Work Coordinate Systems&lt;/span&gt; also called &lt;span style=&quot; font-style:italic;&quot;&gt;Work Offsets&lt;/span&gt;, &lt;span style=&quot; font-style:italic;&quot;&gt;Fixture Offsets&lt;/span&gt;, or &lt;span style=&quot; font-style:italic;&quot;&gt;Fixtures &lt;/span&gt;are useful for building efficient production jobs where the same part is done many times on the machine.&lt;/p&gt;&lt;p&gt;FreeCAD has no knowledge of where a particular coordinate system exists within the machine coordinate system so adding additional coordinate systems to your job will have no visual change within your job. It will, however, change your gcode output. The exact way in which the output is affected is controlled by the 'order by' setting.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
Expand Down Expand Up @@ -418,15 +424,15 @@
<item>
<widget class="QToolBox" name="toolBox_2">
<property name="currentIndex">
<number>0</number>
<number>1</number>
</property>
<widget class="QWidget" name="page_3">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>458</width>
<height>1201</height>
<width>354</width>
<height>979</height>
</rect>
</property>
<attribute name="label">
Expand Down Expand Up @@ -989,15 +995,15 @@
<rect>
<x>0</x>
<y>0</y>
<width>204</width>
<height>266</height>
<width>429</width>
<height>588</height>
</rect>
</property>
<attribute name="label">
<string>Default Values</string>
</attribute>
<layout class="QVBoxLayout" name="verticalLayout_10">
<item>
<layout class="QGridLayout" name="gridLayout_13">
<item row="0" column="0">
<widget class="QGroupBox" name="groupBox">
<property name="title">
<string>Depths</string>
Expand Down Expand Up @@ -1048,7 +1054,7 @@
</layout>
</widget>
</item>
<item>
<item row="1" column="0">
<widget class="QGroupBox" name="groupBox_2">
<property name="title">
<string>Heights</string>
Expand Down Expand Up @@ -1119,7 +1125,26 @@
</layout>
</widget>
</item>
<item>
<item row="2" column="0">
<widget class="QGroupBox" name="groupBox_8">
<property name="title">
<string>Coolant</string>
</property>
<layout class="QGridLayout" name="gridLayout_12">
<item row="0" column="0">
<widget class="QLabel" name="label_17">
<property name="text">
<string>Coolant Mode</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QComboBox" name="setupCoolantMode"/>
</item>
</layout>
</widget>
</item>
<item row="3" column="0">
<spacer name="verticalSpacer_5">
<property name="orientation">
<enum>Qt::Vertical</enum>
Expand Down Expand Up @@ -1153,8 +1178,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>458</width>
<height>1201</height>
<width>429</width>
<height>588</height>
</rect>
</property>
<attribute name="label">
Expand Down Expand Up @@ -1253,8 +1278,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>115</width>
<height>94</height>
<width>137</width>
<height>114</height>
</rect>
</property>
<attribute name="label">
Expand Down
39 changes: 39 additions & 0 deletions src/Mod/Path/Gui/Resources/panels/SetupGlobal.ui
Expand Up @@ -230,6 +230,45 @@
</item>
</layout>
</widget>
<widget class="QWidget" name="tabWidgetPage3">
<attribute name="title">
<string>Coolant</string>
</attribute>
<layout class="QGridLayout" name="gridLayout_3">
<item row="0" column="0">
<widget class="QGroupBox" name="groupBox_4">
<property name="title">
<string>Coolant Mode</string>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0">
<widget class="QLabel" name="label_10">
<property name="text">
<string>Coolant Default:</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QComboBox" name="setupCoolantMode"/>
</item>
</layout>
</widget>
</item>
<item row="1" column="0">
<spacer name="verticalSpacer_3">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>570</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</widget>
</item>
</layout>
Expand Down

0 comments on commit 0002090

Please sign in to comment.