kindred/create
1
1
Fork 0
Code Issues 51 Pull Requests 1 Actions Packages Projects 9 Releases 2 Wiki Activity

Added file path and job template to preferences.

Browse Source
This commit is contained in:
Markus Lampert
2017-06-09 13:54:26 -07:00
parent 0fcaea1b44
commit 907ea1b3ab
3 changed files with 415 additions and 239 deletions
Download Patch File Download Diff File Expand all files Collapse all files

548
src/Mod/Path/Gui/Resources/preferences/PathJob.ui
View File

File diff suppressed because one or more lines are too long

52
src/Mod/Path/PathScripts/PathPreferences.py
View File

@@ -26,12 +26,23 @@ import FreeCAD
import os
import glob
import PathScripts.PathLog as PathLog
PathLog.setLevel(PathLog.Level.INFO, PathLog.thisModule())
PathLog.trackModule()
class PathPreferences:
PostProcessorDefault = "PostProcessorDefault"
PostProcessorDefaultArgs = "PostProcessorDefaultArgs"
PostProcessorBlacklist = "PostProcessorBlacklist"
DefaultFilePath = "DefaultFilePath"
DefaultJobTemplate = "DefaultJobTemplate"
PostProcessorDefault = "PostProcessorDefault"
PostProcessorDefaultArgs = "PostProcessorDefaultArgs"
PostProcessorBlacklist = "PostProcessorBlacklist"
PostProcessorOutputFile = "PostProcessorOutputFile"
PostProcessorOutputPolicy = "PostProcessorOutputPolicy"
# Linear tolerance to use when generating Paths, eg when tesselating geometry
GeometryTolerance = "GeometryTolerance"
GeometryTolerance = "GeometryTolerance"
@classmethod
def preferences(cls):
@@ -76,6 +87,30 @@ class PathPreferences:
def defaultGeometryTolerance(cls):
return cls.preferences().GetFloat(cls.GeometryTolerance, 0.01)
@classmethod
def defaultFilePath(cls):
return cls.preferences().GetString(cls.DefaultFilePath)
@classmethod
def filePath(cls):
path = cls.defaultFilePath()
if not path:
grp = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Macro")
path = grp.GetString("MacroPath", FreeCAD.getUserAppDataDir())
return path
@classmethod
def defaultJobTemplate(cls):
return cls.preferences().GetString(cls.DefaultJobTemplate)
@classmethod
def setJobDefaults(cls, filePath, jobTemplate, geometryTolerance):
PathLog.track("(%s='%s', %s, %s)" % (cls.DefaultFilePath, filePath, jobTemplate, geometryTolerance))
pref = cls.preferences()
pref.SetString(cls.DefaultFilePath, filePath)
pref.SetString(cls.DefaultJobTemplate, jobTemplate)
pref.SetFloat(cls.GeometryTolerance, geometryTolerance)
@classmethod
def postProcessorBlacklist(cls):
pref = cls.preferences()
@@ -85,19 +120,15 @@ class PathPreferences:
return eval(blacklist)
@classmethod
def savePostProcessorDefaults(cls, processor, args, blacklist, geometryTolerance):
def setPostProcessorDefaults(cls, processor, args, blacklist):
pref = cls.preferences()
pref.SetString(cls.PostProcessorDefault, processor)
pref.SetString(cls.PostProcessorDefaultArgs, args)
pref.SetString(cls.PostProcessorBlacklist, "%s" % (blacklist))
pref.SetFloat(cls.GeometryTolerance, geometryTolerance)
PostProcessorOutputFile = "PostProcessorOutputFile"
PostProcessorOutputPolicy = "PostProcessorOutputPolicy"
@classmethod
def saveOutputFileDefaults(cls, file, policy):
def setOutputFileDefaults(cls, file, policy):
pref = cls.preferences()
pref.SetString(cls.PostProcessorOutputFile, file)
pref.SetString(cls.PostProcessorOutputPolicy, policy)
@@ -111,3 +142,4 @@ class PathPreferences:
def defaultOutputPolicy(cls):
pref = cls.preferences()
return pref.GetString(cls.PostProcessorOutputPolicy, "")

54
src/Mod/Path/PathScripts/PathPreferencesPathJob.py
View File

@@ -24,12 +24,17 @@
import FreeCAD
import FreeCADGui
import PathScripts.PathLog as PathLog
from FreeCAD import Units
from PySide import QtCore, QtGui
from PathScripts.PathPreferences import PathPreferences
from PathScripts.PathPostProcessor import PostProcessor
PathLog.setLevel(PathLog.Level.INFO, PathLog.thisModule())
class JobPreferencesPage:
def __init__(self, parent=None):
self.form = FreeCADGui.PySideUic.loadUi(":preferences/PathJob.ui")
@@ -39,6 +44,11 @@ class JobPreferencesPage:
self.processor = { }
def saveSettings(self):
filePath = self.form.leDefaultFilePath.text()
jobTemplate = self.form.leDefaultJobTemplate.text()
geometryTolerance = Units.Quantity(self.form.geometryTolerance.text())
PathPreferences.setJobDefaults(filePath, jobTemplate, geometryTolerance)
processor = str(self.form.defaultPostProcessor.currentText())
args = str(self.form.defaultPostProcessorArgs.text())
blacklist = []
@@ -46,12 +56,11 @@ class JobPreferencesPage:
item = self.form.postProcessorList.item(i)
if item.checkState() == QtCore.Qt.CheckState.Unchecked:
blacklist.append(item.text())
geometryTolerance = Units.Quantity(self.form.geometryTolerance.text())
PathPreferences.savePostProcessorDefaults(processor, args, blacklist, geometryTolerance)
PathPreferences.setPostProcessorDefaults(processor, args, blacklist)
path = str(self.form.leOutputFile.text())
policy = str(self.form.cboOutputPolicy.currentText())
PathPreferences.saveOutputFileDefaults(path, policy)
PathPreferences.setOutputFileDefaults(path, policy)
def selectComboEntry(self, widget, text):
index = widget.findText(text, QtCore.Qt.MatchFixedString)
@@ -82,6 +91,9 @@ class JobPreferencesPage:
self.verifyAndUpdateDefaultPostProcessorWith(str(self.form.defaultPostProcessor.currentText()))
def loadSettings(self):
self.form.leDefaultFilePath.setText(PathPreferences.defaultFilePath())
self.form.leDefaultJobTemplate.setText(PathPreferences.defaultJobTemplate())
blacklist = PathPreferences.postProcessorBlacklist()
for processor in PathPreferences.allAvailablePostProcessors():
item = QtGui.QListWidgetItem(processor)
@@ -101,10 +113,12 @@ class JobPreferencesPage:
self.form.leOutputFile.setText(PathPreferences.defaultOutputFile())
self.selectComboEntry(self.form.cboOutputPolicy, PathPreferences.defaultOutputPolicy())
self.form.tbDefaultFilePath.clicked.connect(self.browseDefaultFilePath)
self.form.tbDefaultJobTemplate.clicked.connect(self.browseDefaultJobTemplate)
self.form.postProcessorList.itemEntered.connect(self.setProcessorListTooltip)
self.form.postProcessorList.itemChanged.connect(self.verifyAndUpdateDefaultPostProcessor)
self.form.defaultPostProcessor.currentIndexChanged.connect(self.updateDefaultPostProcessorToolTip)
self.form.pbBrowseFileSystem.clicked.connect(self.browseFileSystem)
self.form.tbOutputFile.clicked.connect(self.browseOutputFile)
def getPostProcessor(self, name):
if not name in self.processor.keys():
@@ -136,7 +150,35 @@ class JobPreferencesPage:
self.form.defaultPostProcessor.setToolTip(self.postProcessorDefaultTooltip)
self.form.defaultPostProcessorArgs.setToolTip(self.postProcessorArgsDefaultTooltip)
def browseFileSystem(self):
foo = QtGui.QFileDialog.getExistingDirectory(QtGui.qApp.activeWindow(), "Path - Output File/Directory", self.form.leOutputFile.text())
def bestGuessForFilePath(self):
path = self.form.leDefaultFilePath.text()
if not path:
path = PathPreferences.filePath()
return path
def browseDefaultJobTemplate(self):
path = self.form.leDefaultJobTemplate.text()
if not path:
path = self.bestGuessForFilePath()
foo = QtGui.QFileDialog.getOpenFileName(QtGui.qApp.activeWindow(),
"Path - Job Template",
path,
"job_*.xml")[0]
if foo:
self.form.leDefaultJobTemplate.setText(foo)
def browseDefaultFilePath(self):
path = self.bestGuessForFilePath()
foo = QtGui.QFileDialog.getExistingDirectory(QtGui.qApp.activeWindow(), "Path - External File Directory", path)
if foo:
self.form.leDefaultFilePath.setText(foo)
def browseOutputFile(self):
path = self.form.leOutputFile.text()
foo = QtGui.QFileDialog.getExistingDirectory(QtGui.qApp.activeWindow(), "Path - Output File/Directory", path)
if foo:
self.form.leOutputFile.setText(foo)