From 904f49eceba6f1df38370cc33ccde6aef8c2bcc6 Mon Sep 17 00:00:00 2001 From: Matteo Ghetta Date: Tue, 18 Oct 2016 10:08:36 +0200 Subject: [PATCH 1/4] [processing] Missing import fixed for R algorithm --- python/plugins/processing/algs/r/RUtils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/plugins/processing/algs/r/RUtils.py b/python/plugins/processing/algs/r/RUtils.py index db8f0a085da..35fbe64d2a3 100644 --- a/python/plugins/processing/algs/r/RUtils.py +++ b/python/plugins/processing/algs/r/RUtils.py @@ -35,7 +35,7 @@ import subprocess from qgis.PyQt.QtCore import QSettings, QCoreApplication from processing.core.ProcessingConfig import ProcessingConfig from processing.core.ProcessingLog import ProcessingLog -from processing.tools.system import userFolder, isWindows, mkdir +from processing.tools.system import userFolder, isWindows, mkdir, getTempFilenameInTempFolder class RUtils(object): From 76eb086c89b5a1de2581995f3e1a0a3b3fb74f1e Mon Sep 17 00:00:00 2001 From: Matteo Ghetta Date: Tue, 18 Oct 2016 10:10:54 +0200 Subject: [PATCH 2/4] [processing] avoid overlapping UI multi field widget doesn't overlap anymore with other widgets --- python/plugins/processing/gui/ListMultiselectWidget.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/plugins/processing/gui/ListMultiselectWidget.py b/python/plugins/processing/gui/ListMultiselectWidget.py index 8a53e6450b3..37f7c4e6ebf 100644 --- a/python/plugins/processing/gui/ListMultiselectWidget.py +++ b/python/plugins/processing/gui/ListMultiselectWidget.py @@ -150,7 +150,7 @@ class ListMultiSelectWidget(QGroupBox): def _setupUI(self): self.setSizePolicy( - QSizePolicy.Preferred, QSizePolicy.Ignored) + QSizePolicy.Preferred, QSizePolicy.Preferred) self.setMinimumHeight(180) From 7f3b10b4240016b051f7b658086d4da2e8d32083 Mon Sep 17 00:00:00 2001 From: Matteo Ghetta Date: Tue, 18 Oct 2016 10:13:54 +0200 Subject: [PATCH 3/4] [processing] fix button font size in script editor fixes the zooming of the font size in script editor dialog using another method --- .../processing/gui/ScriptEditorDialog.py | 34 +++++++------------ 1 file changed, 12 insertions(+), 22 deletions(-) diff --git a/python/plugins/processing/gui/ScriptEditorDialog.py b/python/plugins/processing/gui/ScriptEditorDialog.py index 74751fcef67..f7a3dc13a4e 100644 --- a/python/plugins/processing/gui/ScriptEditorDialog.py +++ b/python/plugins/processing/gui/ScriptEditorDialog.py @@ -16,7 +16,6 @@ * * *************************************************************************** """ -from builtins import str __author__ = 'Alexander Bruy' __date__ = 'December 2012' @@ -98,8 +97,8 @@ class ScriptEditorDialog(BASE, WIDGET): self.btnPaste.clicked.connect(self.editor.paste) self.btnUndo.clicked.connect(self.editor.undo) self.btnRedo.clicked.connect(self.editor.redo) - self.btnIncreaseFont.clicked.connect(self.increaseFontSize) - self.btnDecreaseFont.clicked.connect(self.decreaseFontSize) + self.btnIncreaseFont.clicked.connect(self.editor.zoomIn) + self.btnDecreaseFont.clicked.connect(self.editor.zoomOut) self.editor.textChanged.connect(lambda: self.setHasChanged(True)) self.alg = alg @@ -139,19 +138,10 @@ class ScriptEditorDialog(BASE, WIDGET): self.editor.setLexerType(self.algType) - def increaseFontSize(self): - font = self.editor.defaultFont - self.editor.setFonts(font.pointSize() + 1) - self.editor.initLexer() - - def decreaseFontSize(self): - font = self.editor.defaultFont - self.editor.setFonts(font.pointSize() - 1) - self.editor.initLexer() def showSnippets(self, evt): popupmenu = QMenu() - for name, snippet in list(self.snippets.items()): + for name, snippet in self.snippets.iteritems(): action = QAction(self.tr(name), self.btnSnippets) action.triggered[()].connect(lambda snippet=snippet: self.editor.insert(snippet)) popupmenu.addAction(action) @@ -173,9 +163,9 @@ class ScriptEditorDialog(BASE, WIDGET): def editHelp(self): if self.alg is None: if self.algType == self.SCRIPT_PYTHON: - alg = ScriptAlgorithm(None, str(self.editor.text())) + alg = ScriptAlgorithm(None, unicode(self.editor.text())) elif self.algType == self.SCRIPT_R: - alg = RAlgorithm(None, str(self.editor.text())) + alg = RAlgorithm(None, unicode(self.editor.text())) else: alg = self.alg @@ -200,7 +190,7 @@ class ScriptEditorDialog(BASE, WIDGET): scriptDir = RUtils.RScriptsFolders()[0] filterName = self.tr('Processing R script (*.rsx)') - self.filename, selected_filter = QFileDialog.getOpenFileName( + self.filename = QFileDialog.getOpenFileName( self, self.tr('Open script'), scriptDir, filterName) if self.filename == '': @@ -231,9 +221,9 @@ class ScriptEditorDialog(BASE, WIDGET): scriptDir = RUtils.RScriptsFolders()[0] filterName = self.tr('Processing R script (*.rsx)') - self.filename, filter = QFileDialog.getSaveFileName(self, + self.filename = unicode(QFileDialog.getSaveFileName(self, self.tr('Save script'), scriptDir, - filterName) + filterName)) if self.filename: if self.algType == self.SCRIPT_PYTHON and \ @@ -243,7 +233,7 @@ class ScriptEditorDialog(BASE, WIDGET): not self.filename.lower().endswith('.rsx'): self.filename += '.rsx' - text = str(self.editor.text()) + text = unicode(self.editor.text()) if self.alg is not None: self.alg.script = text try: @@ -252,7 +242,7 @@ class ScriptEditorDialog(BASE, WIDGET): except IOError: QMessageBox.warning(self, self.tr('I/O error'), self.tr('Unable to save edits. Reason:\n %s') - % str(sys.exc_info()[1]) + % unicode(sys.exc_info()[1]) ) return self.update = True @@ -273,10 +263,10 @@ class ScriptEditorDialog(BASE, WIDGET): def runAlgorithm(self): if self.algType == self.SCRIPT_PYTHON: - alg = ScriptAlgorithm(None, str(self.editor.text())) + alg = ScriptAlgorithm(None, unicode(self.editor.text())) alg.provider = algList.getProviderFromName('script') if self.algType == self.SCRIPT_R: - alg = RAlgorithm(None, str(self.editor.text())) + alg = RAlgorithm(None, unicode(self.editor.text())) alg.provider = algList.getProviderFromName('r') dlg = alg.getCustomParametersDialog() From 76d17ca55b2a7f41145bafadfdf8b73193e4b1f6 Mon Sep 17 00:00:00 2001 From: matteo Date: Tue, 18 Oct 2016 10:56:54 +0200 Subject: [PATCH 4/4] update ScriptEditorDialog for py3 --- .../plugins/processing/gui/ScriptEditorDialog.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/python/plugins/processing/gui/ScriptEditorDialog.py b/python/plugins/processing/gui/ScriptEditorDialog.py index f7a3dc13a4e..c07f78dab7c 100644 --- a/python/plugins/processing/gui/ScriptEditorDialog.py +++ b/python/plugins/processing/gui/ScriptEditorDialog.py @@ -141,7 +141,7 @@ class ScriptEditorDialog(BASE, WIDGET): def showSnippets(self, evt): popupmenu = QMenu() - for name, snippet in self.snippets.iteritems(): + for name, snippet in list(self.snippets.items()): action = QAction(self.tr(name), self.btnSnippets) action.triggered[()].connect(lambda snippet=snippet: self.editor.insert(snippet)) popupmenu.addAction(action) @@ -163,9 +163,9 @@ class ScriptEditorDialog(BASE, WIDGET): def editHelp(self): if self.alg is None: if self.algType == self.SCRIPT_PYTHON: - alg = ScriptAlgorithm(None, unicode(self.editor.text())) + alg = ScriptAlgorithm(None, self.editor.text()) elif self.algType == self.SCRIPT_R: - alg = RAlgorithm(None, unicode(self.editor.text())) + alg = RAlgorithm(None, self.editor.text()) else: alg = self.alg @@ -221,7 +221,7 @@ class ScriptEditorDialog(BASE, WIDGET): scriptDir = RUtils.RScriptsFolders()[0] filterName = self.tr('Processing R script (*.rsx)') - self.filename = unicode(QFileDialog.getSaveFileName(self, + self.filename = str(QFileDialog.getSaveFileName(self, self.tr('Save script'), scriptDir, filterName)) @@ -233,7 +233,7 @@ class ScriptEditorDialog(BASE, WIDGET): not self.filename.lower().endswith('.rsx'): self.filename += '.rsx' - text = unicode(self.editor.text()) + text = self.editor.text() if self.alg is not None: self.alg.script = text try: @@ -242,7 +242,7 @@ class ScriptEditorDialog(BASE, WIDGET): except IOError: QMessageBox.warning(self, self.tr('I/O error'), self.tr('Unable to save edits. Reason:\n %s') - % unicode(sys.exc_info()[1]) + % str(sys.exc_info()[1]) ) return self.update = True @@ -263,10 +263,10 @@ class ScriptEditorDialog(BASE, WIDGET): def runAlgorithm(self): if self.algType == self.SCRIPT_PYTHON: - alg = ScriptAlgorithm(None, unicode(self.editor.text())) + alg = ScriptAlgorithm(None, self.editor.text()) alg.provider = algList.getProviderFromName('script') if self.algType == self.SCRIPT_R: - alg = RAlgorithm(None, unicode(self.editor.text())) + alg = RAlgorithm(None, self.editor.text()) alg.provider = algList.getProviderFromName('r') dlg = alg.getCustomParametersDialog()