Merge pull request #3245 from Schildkroet/4th-axis-improve

[Path] Added 4th axis support to drilling GUI
This commit is contained in:
sliptonic
2020-03-24 14:24:54 -05:00
committed by GitHub
2 changed files with 37 additions and 2 deletions

View File

@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>572</width>
<height>419</height>
<width>454</width>
<height>386</height>
</rect>
</property>
<property name="windowTitle">
@@ -154,6 +154,37 @@
</item>
</widget>
</item>
<item row="8" column="6">
<widget class="QComboBox" name="enableRotation">
<item>
<property name="text">
<string>Off</string>
</property>
</item>
<item>
<property name="text">
<string>A(x)</string>
</property>
</item>
<item>
<property name="text">
<string>B(y)</string>
</property>
</item>
<item>
<property name="text">
<string>A &amp; B</string>
</property>
</item>
</widget>
</item>
<item row="8" column="4">
<widget class="QLabel" name="label">
<property name="text">
<string>Enable Rotation</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>

View File

@@ -99,6 +99,8 @@ class TaskPanelOpPage(PathCircularHoleBaseGui.TaskPanelOpPage):
obj.PeckEnabled = self.form.peckEnabled.isChecked()
if obj.ExtraOffset != str(self.form.ExtraOffset.currentText()):
obj.ExtraOffset = str(self.form.ExtraOffset.currentText())
if obj.EnableRotation != str(self.form.enableRotation.currentText()):
obj.EnableRotation = str(self.form.enableRotation.currentText())
self.updateToolController(obj, self.form.toolController)
self.updateCoolant(obj, self.form.coolantController)
@@ -122,6 +124,7 @@ class TaskPanelOpPage(PathCircularHoleBaseGui.TaskPanelOpPage):
self.setupToolController(obj, self.form.toolController)
self.setupCoolant(obj, self.form.coolantController)
self.selectInComboBox(obj.EnableRotation, self.form.enableRotation)
def getSignalsForUpdate(self, obj):
@@ -137,6 +140,7 @@ class TaskPanelOpPage(PathCircularHoleBaseGui.TaskPanelOpPage):
signals.append(self.form.coolantController.currentIndexChanged)
signals.append(self.form.coolantController.currentIndexChanged)
signals.append(self.form.ExtraOffset.currentIndexChanged)
signals.append(self.form.enableRotation.currentIndexChanged)
return signals