Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[processing] save last used models/scripts directory (fix #12536)
  • Loading branch information
alexbruy committed Apr 10, 2015
1 parent a449af2 commit b9f391f
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 3 deletions.
8 changes: 7 additions & 1 deletion python/plugins/processing/modeler/AddModelFromFileAction.py
Expand Up @@ -28,6 +28,7 @@
import os
import shutil
from PyQt4.QtGui import QIcon, QFileDialog, QMessageBox
from PyQt4.QtCore import QSettings, QFileInfo
from processing.gui.ToolboxAction import ToolboxAction
from processing.modeler.ModelerAlgorithm import ModelerAlgorithm
from processing.modeler.WrongModelException import WrongModelException
Expand All @@ -43,11 +44,16 @@ def getIcon(self):
return QIcon(os.path.dirname(__file__) + '/../images/model.png')

def execute(self):
settings = QSettings()
lastDir = settings.value('Processing/lastModelsDir', '')
filename = QFileDialog.getOpenFileName(self.toolbox,
self.tr('Open model', 'AddModelFromFileAction'), None,
self.tr('Open model', 'AddModelFromFileAction'), lastDir,
self.tr('Processing model files (*.model *.MODEL)', 'AddModelFromFileAction'))
if filename:
try:
settings.setValue('Processing/lastModelsDir',
QFileInfo(fileName).absoluteDir().absolutePath())

ModelerAlgorithm.fromFile(filename)
except WrongModelException:
QMessageBox.warning(
Expand Down
8 changes: 6 additions & 2 deletions python/plugins/processing/script/AddScriptFromFileAction.py
Expand Up @@ -42,12 +42,16 @@ def getIcon(self):
return QIcon(':/processing/images/script.png')

def execute(self):
settings = QSettings()
lastDir = settings.value('Processing/lastScriptsDir', '')
filename = QFileDialog.getOpenFileName(self.toolbox,
self.tr('Script files', 'AddScriptFromFileAction'), None,
self.tr('Script files (*.py *.PY)', 'AddScriptFromFileAction')
)
self.tr('Script files (*.py *.PY)', 'AddScriptFromFileAction'))
if filename:
try:
settings.setValue('Processing/lastScriptsDir',
QFileInfo(fileName).absoluteDir().absolutePath())

script = ScriptAlgorithm(filename)
except WrongScriptException:
QMessageBox.warning(self.toolbox,
Expand Down

0 comments on commit b9f391f

Please sign in to comment.