fixes 6114

replaces DlgJobChooser with QInputDialog.
This commit is contained in:
sliptonic
2022-03-07 17:46:02 -06:00
parent bda12907de
commit 51b9d40010
4 changed files with 26 additions and 84 deletions

View File

@@ -44,6 +44,8 @@ LOG_MODULE = PathLog.thisModule()
PathLog.setLevel(PathLog.Level.INFO, LOG_MODULE)
translate = FreeCAD.Qt.translate
class _TempObject:
Path = None
Name = "Fixture"
@@ -241,6 +243,7 @@ class CommandPathPost:
job = None
else:
job = None
if job is None:
targetlist = []
for o in FreeCAD.ActiveDocument.Objects:
@@ -249,13 +252,12 @@ class CommandPathPost:
targetlist.append(o.Label)
PathLog.debug("Possible post objects: {}".format(targetlist))
if len(targetlist) > 1:
form = FreeCADGui.PySideUic.loadUi(":/panels/DlgJobChooser.ui")
form.cboProject.addItems(targetlist)
r = form.exec_()
if r is False:
jobname, result = QtGui.QInputDialog.getItem(
None, translate("Path", "Choose a Path Job"), None, targetlist
)
if result is False:
return
else:
jobname = form.cboProject.currentText()
else:
jobname = targetlist[0]
job = FreeCAD.ActiveDocument.getObject(jobname)

View File

@@ -21,10 +21,21 @@
# ***************************************************************************
import FreeCADGui
import FreeCAD
import PathGui as PGui # ensure Path/Gui/Resources are loaded
import PathScripts
import PathScripts.PathJobCmd as PathJobCmd
import PathScripts.PathUtils as PathUtils
from PySide import QtGui
import PathScripts.PathLog as PathLog
if False:
PathLog.setLevel(PathLog.Level.DEBUG, PathLog.thisModule())
PathLog.trackModule(PathLog.thisModule())
else:
PathLog.setLevel(PathLog.Level.INFO, PathLog.thisModule())
translate = FreeCAD.Qt.translate
class PathUtilsUserInput(object):
@@ -73,19 +84,19 @@ class PathUtilsUserInput(object):
if 1 == len(modelObjectSelected):
job = modelObjectSelected[0]
else:
form = FreeCADGui.PySideUic.loadUi(":/panels/DlgJobChooser.ui")
if modelObjectSelected:
mylist = [j.Label for j in modelObjectSelected]
else:
mylist = [j.Label for j in jobs]
form.cboProject.addItems(mylist)
r = form.exec_()
if r is False or r == 0:
jobname, result = QtGui.QInputDialog.getItem(
None, translate("Path", "Choose a Path Job"), None, mylist
)
if result is False:
return None
else:
job = [
j for j in jobs if j.Label == form.cboProject.currentText()
][0]
job = [j for j in jobs if j.Label == jobname][0]
return job
def createJob(self):