Path preferences for default post processor and arguments.

This commit is contained in:
Markus Lampert
2016-10-21 14:16:06 -07:00
committed by wmayer
parent bf4783235b
commit 01f4feca5c
2 changed files with 60 additions and 2 deletions

View File

@@ -68,6 +68,7 @@ class ObjectPathJob:
obj.addProperty("App::PropertyString", "Description", "Path", QtCore.QT_TRANSLATE_NOOP("App::Property","An optional description for this job"))
obj.addProperty("App::PropertyEnumeration", "PostProcessor", "Output", QtCore.QT_TRANSLATE_NOOP("App::Property","Select the Post Processor"))
obj.PostProcessor = allposts
obj.PostProcessor
obj.addProperty("App::PropertyString", "PostProcessorArgs", "Output", QtCore.QT_TRANSLATE_NOOP("App::Property", "Arguments for the Post Processor (specific to the script)"))
obj.PostProcessorArgs = ""
obj.addProperty("App::PropertyString", "MachineName", "Output", QtCore.QT_TRANSLATE_NOOP("App::Property","Name of the Machine that will use the CNC program"))
@@ -89,6 +90,13 @@ class ObjectPathJob:
obj.Proxy = self
preferences = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Path")
defaultPostProcessor = preferences.GetString("DefaultPostProcessor", "")
print("DefaultPostProcessor = '%s'" % defaultPostProcessor)
if defaultPostProcessor:
obj.PostProcessor = defaultPostProcessor
obj.PostProcessorArgs = preferences.GetString("DefaultPostProcessorArgs", "")
if FreeCAD.GuiUp:
ViewProviderJob(obj.ViewObject)
@@ -132,6 +140,8 @@ class ObjectPathJob:
if hasattr(current_post, "TOOLTIP_ARGS"):
self.tooltipArgs = current_post.TOOLTIP_ARGS
self.PostProcessorArgs = ''
# def getToolControllers(self, obj):
# '''returns a list of ToolControllers for the current job'''
# controllers = []
@@ -274,11 +284,14 @@ class TaskPanel:
self.form.cboPostProcessor.setToolTip(self.obj.Proxy.tooltip)
if hasattr(self.obj.Proxy, "tooltipArgs") and self.obj.Proxy.tooltipArgs:
self.form.cboPostProcessorArgs.setToolTip(self.obj.Proxy.tooltipArgs)
self.form.cboPostProcessorArgs.setText(self.obj.PostProcessorArgs)
else:
self.form.cboPostProcessorArgs.setToolTip(self.postProcessorDefaultArgsTooltip)
self.form.cboPostProcessorArgs.setText('')
else:
self.form.cboPostProcessor.setToolTip(self.postProcessorDefaultTooltip)
self.form.cboPostProcessorArgs.setToolTip(self.postProcessorDefaultArgsTooltip)
self.form.cboPostProcessorArgs.setText('')
def getFields(self):
'''sets properties in the object to match the form'''
@@ -286,7 +299,7 @@ class TaskPanel:
if hasattr(self.obj, "PostProcessor"):
self.obj.PostProcessor = str(self.form.cboPostProcessor.currentText())
if hasattr(self.obj, "PostProcessorArgs"):
self.obj.PostProcessorArgs = str(self.form.cboPostProcessorArgs.displayText)
self.obj.PostProcessorArgs = str(self.form.cboPostProcessorArgs.displayText())
if hasattr(self.obj, "Label"):
self.obj.Label = str(self.form.leLabel.text())
if hasattr(self.obj, "OutputFile"):
@@ -327,7 +340,6 @@ class TaskPanel:
# make sure the proxy loads post processor script values and settings
self.obj.Proxy.onChanged(self.obj, "PostProcessor")
self.updateTooltips()
self.form.cboPostProcessorArgs.displayText = self.obj.PostProcessorArgs
for child in self.obj.Group:
self.form.PathsList.addItem(child.Name)