Path: GUI for fixture support working
This commit is contained in:
@@ -189,7 +189,7 @@
|
||||
</widget>
|
||||
</item>
|
||||
<item row="3" column="1">
|
||||
<widget class="QCheckBox" name="checkBox">
|
||||
<widget class="QCheckBox" name="splitOutput">
|
||||
<property name="text">
|
||||
<string>Split Output</string>
|
||||
</property>
|
||||
@@ -205,12 +205,7 @@
|
||||
<widget class="QComboBox" name="orderBy">
|
||||
<item>
|
||||
<property name="text">
|
||||
<string>Operation</string>
|
||||
</property>
|
||||
</item>
|
||||
<item>
|
||||
<property name="text">
|
||||
<string>Work Coordinate System</string>
|
||||
<string>Fixture</string>
|
||||
</property>
|
||||
</item>
|
||||
<item>
|
||||
@@ -218,6 +213,11 @@
|
||||
<string>Tool</string>
|
||||
</property>
|
||||
</item>
|
||||
<item>
|
||||
<property name="text">
|
||||
<string>Operation</string>
|
||||
</property>
|
||||
</item>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="0">
|
||||
|
||||
@@ -599,6 +599,17 @@ class TaskPanel:
|
||||
self.obj.Label = str(self.form.jobLabel.text())
|
||||
self.obj.Description = str(self.form.jobDescription.toPlainText())
|
||||
self.obj.Operations.Group = [self.form.operationsList.item(i).data(self.DataObject) for i in range(self.form.operationsList.count())]
|
||||
try:
|
||||
self.obj.SplitOutput = self.form.splitOutput.isChecked()
|
||||
self.obj.OrderOutputBy = str(self.form.orderBy.currentText())
|
||||
|
||||
flist = []
|
||||
for i in range(self.form.wcslist.count()):
|
||||
if self.form.wcslist.item(i).checkState() == QtCore.Qt.CheckState.Checked:
|
||||
flist.append(self.form.wcslist.item(i).text())
|
||||
self.obj.Fixtures = flist
|
||||
except:
|
||||
FreeCAD.Console.PrintWarning("The Job was created without fixture support. Please delete and recreate the job\r\n")
|
||||
|
||||
self.updateTooltips()
|
||||
self.stockEdit.getFields(self.obj)
|
||||
@@ -680,6 +691,17 @@ class TaskPanel:
|
||||
self.form.jobLabel.setText(self.obj.Label)
|
||||
self.form.jobDescription.setPlainText(self.obj.Description)
|
||||
|
||||
if hasattr(self.obj, "SplitOutput"):
|
||||
self.form.splitOutput.setChecked(self.obj.SplitOutput)
|
||||
if hasattr(self.obj, "OrderOutputBy"):
|
||||
self.selectComboBoxText(self.form.orderBy, self.obj.OrderOutputBy)
|
||||
|
||||
if hasattr(self.obj, "Fixtures"):
|
||||
for f in self.obj.Fixtures:
|
||||
item = self.form.wcslist.findItems(f, QtCore.Qt.MatchExactly)[0]
|
||||
item.setCheckState(QtCore.Qt.Checked)
|
||||
|
||||
|
||||
self.form.postProcessorOutputFile.setText(self.obj.PostProcessorOutputFile)
|
||||
self.selectComboBoxText(self.form.postProcessor, self.obj.PostProcessor)
|
||||
self.form.postProcessorArguments.setText(self.obj.PostProcessorArgs)
|
||||
|
||||
Reference in New Issue
Block a user