Skip to content

Commit

Permalink
Merge pull request #3081 from Schildkroet/master
Browse files Browse the repository at this point in the history 
[Path] Added GUI support to PathDeburrOp for direction selection
  • Loading branch information
@sliptonic
sliptonic committed Feb 27, 2020
2 parents 3d4013b + 4b62adb commit 0d0af0e
Show file tree
Hide file tree
Showing 3 changed files with 92 additions and 9 deletions.
89 changes: 81 additions & 8 deletions src/Mod/Path/Gui/Resources/panels/PageOpDeburrEdit.ui
View file
Expand Up @@ -6,14 +6,14 @@
<rect>
<x>0</x>
<y>0</y>
<width>375</width>
<height>303</height>
<width>399</width>
<height>333</height>
</rect>
</property>
<property name="windowTitle">
<string>Form</string>
</property>
<layout class="QGridLayout" name="gridLayout_3">
<layout class="QGridLayout" name="gridLayout_3" rowstretch="0,0,0">
<item row="0" column="0">
<widget class="QFrame" name="frame">
<property name="sizePolicy">
Expand All @@ -29,28 +29,28 @@
<enum>QFrame::Raised</enum>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0">
<item row="1" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Tool Controller</string>
</property>
</widget>
</item>
<item row="0" column="1">
<item row="1" column="1">
<widget class="QComboBox" name="toolController">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The tool and its settings to be used for this operation.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
<item row="1" column="0">
<item row="2" column="0">
<widget class="QLabel" name="label_5">
<property name="text">
<string>Coolant Mode</string>
</property>
</widget>
</item>
<item row="1" column="1">
<item row="2" column="1">
<widget class="QComboBox" name="coolantController">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The tool and its settings to be used for this operation.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
Expand All @@ -60,7 +60,7 @@
</layout>
</widget>
</item>
<item row="1" column="0">
<item row="2" column="0">
<widget class="QWidget" name="widget" native="true">
<layout class="QGridLayout" name="gridLayout_4">
<item row="0" column="0">
Expand Down Expand Up @@ -236,6 +236,79 @@
</layout>
</widget>
</item>
<item row="1" column="0">
<widget class="QWidget" name="gridWidget" native="true">
<layout class="QGridLayout" name="gridLayout_5">
<property name="leftMargin">
<number>9</number>
</property>
<property name="topMargin">
<number>9</number>
</property>
<property name="rightMargin">
<number>9</number>
</property>
<property name="bottomMargin">
<number>9</number>
</property>
<property name="spacing">
<number>8</number>
</property>
<item row="1" column="2">
<widget class="QComboBox" name="direction">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The direction in which the profile is performed, clockwise or counter clockwise.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="currentText">
<string>CW</string>
</property>
<property name="currentIndex">
<number>0</number>
</property>
<item>
<property name="text">
<string>CW</string>
</property>
</item>
<item>
<property name="text">
<string>CCW</string>
</property>
</item>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="direction_label">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Direction</string>
</property>
</widget>
</item>
<item row="1" column="1">
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Preferred</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>30</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
<customwidgets>
Expand Down
5 changes: 5 additions & 0 deletions src/Mod/Path/PathScripts/PathDeburr.py
View file
Expand Up @@ -32,6 +32,11 @@

from PySide import QtCore

__title__ = "Path Deburr Operation"
__author__ = "sliptonic (Brad Collette), Schildkroet"
__url__ = "http://www.freecadweb.org"
__doc__ = "Deburr operation."

PathLog.setLevel(PathLog.Level.INFO, PathLog.thisModule())
#PathLog.trackModule(PathLog.thisModule())

Expand Down
7 changes: 6 additions & 1 deletion src/Mod/Path/PathScripts/PathDeburrGui.py
View file
Expand Up @@ -32,7 +32,7 @@
from PySide import QtCore, QtGui

__title__ = "Path Deburr Operation UI"
__author__ = "sliptonic (Brad Collette)"
__author__ = "sliptonic (Brad Collette), Schildkroet"
__url__ = "http://www.freecadweb.org"
__doc__ = "Deburr operation page controller and command implementation."

Expand Down Expand Up @@ -72,6 +72,9 @@ def getFields(self, obj):
obj.Join = 'Round'
elif self.form.joinMiter.isChecked():
obj.Join = 'Miter'

if obj.Direction != str(self.form.direction.currentText()):
obj.Direction = str(self.form.direction.currentText())

self.updateToolController(obj, self.form.toolController)
self.updateCoolant(obj, self.form.coolantController)
Expand All @@ -84,6 +87,7 @@ def setFields(self, obj):
self.form.joinRound.setChecked('Round' == obj.Join)
self.form.joinMiter.setChecked('Miter' == obj.Join)
self.form.joinFrame.hide()
self.selectInComboBox(obj.Direction, self.form.direction)

def updateWidth(self):
PathGui.updateInputField(self.obj, 'Width', self.form.value_W)
Expand All @@ -96,6 +100,7 @@ def getSignalsForUpdate(self, obj):
signals.append(self.form.joinMiter.clicked)
signals.append(self.form.joinRound.clicked)
signals.append(self.form.coolantController.currentIndexChanged)
signals.append(self.form.direction.currentIndexChanged)
return signals

def registerSignalHandlers(self, obj):
Expand Down

0 comments on commit 0d0af0e

Please sign in to comment.