Skip to content

Commit b9f391f

Browse files
committed
[processing] save last used models/scripts directory (fix #12536)
1 parent a449af2 commit b9f391f

File tree

2 files changed

+13
-3
lines changed

2 files changed

+13
-3
lines changed

python/plugins/processing/modeler/AddModelFromFileAction.py

+7-1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import os
2929
import shutil
3030
from PyQt4.QtGui import QIcon, QFileDialog, QMessageBox
31+
from PyQt4.QtCore import QSettings, QFileInfo
3132
from processing.gui.ToolboxAction import ToolboxAction
3233
from processing.modeler.ModelerAlgorithm import ModelerAlgorithm
3334
from processing.modeler.WrongModelException import WrongModelException
@@ -43,11 +44,16 @@ def getIcon(self):
4344
return QIcon(os.path.dirname(__file__) + '/../images/model.png')
4445

4546
def execute(self):
47+
settings = QSettings()
48+
lastDir = settings.value('Processing/lastModelsDir', '')
4649
filename = QFileDialog.getOpenFileName(self.toolbox,
47-
self.tr('Open model', 'AddModelFromFileAction'), None,
50+
self.tr('Open model', 'AddModelFromFileAction'), lastDir,
4851
self.tr('Processing model files (*.model *.MODEL)', 'AddModelFromFileAction'))
4952
if filename:
5053
try:
54+
settings.setValue('Processing/lastModelsDir',
55+
QFileInfo(fileName).absoluteDir().absolutePath())
56+
5157
ModelerAlgorithm.fromFile(filename)
5258
except WrongModelException:
5359
QMessageBox.warning(

python/plugins/processing/script/AddScriptFromFileAction.py

+6-2
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,16 @@ def getIcon(self):
4242
return QIcon(':/processing/images/script.png')
4343

4444
def execute(self):
45+
settings = QSettings()
46+
lastDir = settings.value('Processing/lastScriptsDir', '')
4547
filename = QFileDialog.getOpenFileName(self.toolbox,
4648
self.tr('Script files', 'AddScriptFromFileAction'), None,
47-
self.tr('Script files (*.py *.PY)', 'AddScriptFromFileAction')
48-
)
49+
self.tr('Script files (*.py *.PY)', 'AddScriptFromFileAction'))
4950
if filename:
5051
try:
52+
settings.setValue('Processing/lastScriptsDir',
53+
QFileInfo(fileName).absoluteDir().absolutePath())
54+
5155
script = ScriptAlgorithm(filename)
5256
except WrongScriptException:
5357
QMessageBox.warning(self.toolbox,

0 commit comments

Comments
 (0)