Added jobs as a selection for the base models.

This commit is contained in:
Markus Lampert
2018-08-30 22:03:08 -07:00
committed by wmayer
parent 5d5afd8b08
commit cc2ffc38a8
2 changed files with 33 additions and 3 deletions

View File

@@ -47,7 +47,7 @@
<property name="currentIndex">
<number>0</number>
</property>
<widget class="QWidget" name="tab">
<widget class="QWidget" name="tabSolids">
<attribute name="title">
<string>Solids</string>
</attribute>
@@ -57,7 +57,7 @@
</item>
</layout>
</widget>
<widget class="QWidget" name="tab_3">
<widget class="QWidget" name="tabTwoD">
<attribute name="title">
<string>2D</string>
</attribute>
@@ -67,6 +67,16 @@
</item>
</layout>
</widget>
<widget class="QWidget" name="tabJobs">
<attribute name="title">
<string>Jobs</string>
</attribute>
<layout class="QVBoxLayout" name="verticalLayout_5">
<item>
<widget class="QListWidget" name="jobList"/>
</item>
</layout>
</widget>
</widget>
</item>
</layout>

View File

@@ -50,6 +50,7 @@ class JobCreate:
def __init__(self, parent=None, sel=None):
self.dialog = FreeCADGui.PySideUic.loadUi(":/panels/DlgJobCreate.ui")
self.items = []
self.jobs = []
self.dialog.templateGroup.hide()
self.dialog.modelGroup.hide()
@@ -80,6 +81,22 @@ class JobCreate:
else:
self.dialog.twoDList.addItem(item)
self.items.append(item)
activateJobs = False
for j in sorted(PathJob.Instances(), key=lambda x: x.Label):
if j != job:
item = QtGui.QListWidgetItem(j.Label)
item.setData(self.DataObject, j)
if j.Label in selected:
activateJobs = True
item.setCheckState(QtCore.Qt.CheckState.Checked)
else:
item.setCheckState(QtCore.Qt.CheckState.Unchecked)
self.dialog.jobList.addItem(item)
self.jobs.append(item)
if activateJobs:
self.dialog.models.setCurrentWidget(self.dialog.tabJobs)
self.dialog.modelGroup.show()
@@ -117,7 +134,10 @@ class JobCreate:
def getModels(self):
'''answer the base models selected for the job'''
return [item.data(self.DataObject) for item in self.items if item.checkState() == QtCore.Qt.CheckState.Checked]
models = [item.data(self.DataObject) for item in self.items if item.checkState() == QtCore.Qt.CheckState.Checked]
for job in [item.data(self.DataObject) for item in self.jobs if item.checkState() == QtCore.Qt.CheckState.Checked]:
models.extend(job.Model.Group)
return models
def getTemplate(self):
'''answer the file name of the template to be assigned'''