sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-18 00:06:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

[processing] minor fixes related to settings

Browse Source
This commit is contained in:
volaya 2014-05-08 18:48:25 +02:00
parent 9aff0d7355
commit b1570fb20a
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
python/plugins/processing/core/GeoAlgorithm.py
View File

@ -232,7 +232,7 @@ class GeoAlgorithm:
self.runHookScript(scriptFile, progress) self.runHookScript(scriptFile, progress)
def runHookScript(self, filename, progress): def runHookScript(self, filename, progress):
if not os.path.exists(filename): if filename is None or not os.path.exists(filename):
return return
try: try:
script = 'import processing\n' script = 'import processing\n'

7
python/plugins/processing/core/ProcessingConfig.py
View File

@ -26,7 +26,7 @@ __copyright__ = '(C) 2012, Victor Olaya'
__revision__ = '$Format:%H$' __revision__ = '$Format:%H$'
import os.path import os.path
from PyQt4 import QtGui from PyQt4 import QtGui,QtCore
from processing.tools.system import * from processing.tools.system import *
@ -150,7 +150,10 @@ class ProcessingConfig:
@staticmethod @staticmethod
def getSetting(name): def getSetting(name):
if name in ProcessingConfig.settings.keys(): if name in ProcessingConfig.settings.keys():
return ProcessingConfig.settings[name].value v = ProcessingConfig.settings[name].value
if isinstance(v, QtCore.QPyNullVariant):
v = None
return v
else: else:
return None return None