[processing] prevent otb algorithms being run if otb not configured

fixes #13215
qgis · Sep 30, 2015 · ea712c6 · ea712c6
1 parent 1d67ce7
commit ea712c6
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 5 deletions.
diff --git a/python/plugins/processing/algs/otb/OTBAlgorithm.py b/python/plugins/processing/algs/otb/OTBAlgorithm.py
@@ -166,15 +166,17 @@ def defineCharacteristicsFromFile(self):
                                        self.tr('Could not open OTB algorithm: %s\n%s' % (self.descriptionFile, line)))
                 raise e
 
+    def checkBeforeOpeningParametersDialog(self):
+        return OTBUtils.checkOtbConfiguration()
+
     def processAlgorithm(self, progress):
         currentOs = os.name
 
+        msg = OTBUtils.checkOtbConfiguration()
+        if msg:
+            raise GeoAlgorithmExecutionException(msg)
+
         path = OTBUtils.otbPath()
-        libpath = OTBUtils.otbLibPath()
-        if path == "" or libpath == "":
-            raise GeoAlgorithmExecutionException(
-                self.tr('OTB folder is not configured. Please configure it '
-                        'before running OTB algorithms.'))
 
         commands = []
         commands.append(path + os.sep + self.cliName)

diff --git a/python/plugins/processing/algs/otb/OTBUtils.py b/python/plugins/processing/algs/otb/OTBUtils.py
@@ -144,6 +144,16 @@ def executeOtb(commands, progress):
 
         ProcessingLog.addToLog(ProcessingLog.LOG_INFO, loglines)
 
+
+    @staticmethod
+    def checkOtbConfiguration():
+        path = OTBUtils.otbPath()
+        libpath = OTBUtils.otbLibPath()
+        configurationOk = bool(path) and bool(libpath)
+        if not configurationOk:
+            return OTBUtils.tr('OTB folder is not configured. Please configure it '
+                        'before running OTB algorithms.')
+
     @staticmethod
     def tr(string, context=''):
         if context == '':