qgis · Jan 15, 2016
diff --git a/‎python/plugins/processing/algs/otb/OTBAlgorithm.py
Lines changed: 6 additions & 9 deletions b/‎python/plugins/processing/algs/otb/OTBAlgorithm.py
Lines changed: 6 additions & 9 deletions
diff --git a/‎python/plugins/processing/algs/otb/OTBAlgorithmProvider.py
Lines changed: 15 additions & 10 deletions b/‎python/plugins/processing/algs/otb/OTBAlgorithmProvider.py
Lines changed: 15 additions & 10 deletions
@@ -43,7 +43,7 @@
 from processing.core.ProcessingLog import ProcessingLog
 from processing.core.parameters import getParameterFromString
 from processing.core.outputs import getOutputFromString
-from OTBUtils import OTBUtils
+import OTBUtils
 from processing.core.parameters import ParameterExtent
 from processing.tools.system import getTempFilename
 import xml.etree.ElementTree as ET
@@ -77,7 +77,11 @@ def getIcon(self):
         return QIcon(os.path.join(pluginPath, 'images', 'otb.png'))
 
     def help(self):
-        folder = os.path.join(OTBUtils.otbDescriptionPath(), 'doc')
+        version = OTBUtils.getInstalledVersion()
+        folder = OTBUtils.compatibleDescriptionPath(version)
+        if folder is None:
+            return False, None
+        folder = os.path.join(folder, 'doc')
         helpfile = os.path.join(unicode(folder), self.appkey + ".html")
         if os.path.exists(helpfile):
             return False, helpfile
@@ -166,16 +170,9 @@ 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()
 
         commands = []
 
@@ -32,7 +32,7 @@
 from PyQt4.QtGui import QIcon
 from processing.core.AlgorithmProvider import AlgorithmProvider
 from processing.core.ProcessingConfig import ProcessingConfig, Setting
-from OTBUtils import OTBUtils
+import OTBUtils
 from OTBAlgorithm import OTBAlgorithm
 from processing.core.ProcessingLog import ProcessingLog
 
@@ -45,7 +45,6 @@ class OTBAlgorithmProvider(AlgorithmProvider):
     def __init__(self):
         AlgorithmProvider.__init__(self)
         self.activate = True
-        self.createAlgsList()
 
     def getDescription(self):
         return self.tr("Orfeo Toolbox (Image analysis)")
@@ -57,18 +56,27 @@ def getIcon(self):
         return QIcon(os.path.join(pluginPath, 'images', 'otb.png'))
 
     def _loadAlgorithms(self):
-        self.algs = self.preloadedAlgs
+        self.algs = []
+
+        version = OTBUtils.getInstalledVersion(True)
+        if version is None:
+            ProcessingLog.addToLog(ProcessingLog.LOG_ERROR,
+                                   self.tr('Problem with OTB installation: OTB was not found or is not correctly installed'))
+            return
+
+        folder = OTBUtils.compatibleDescriptionPath(version)
+        if folder is None:
+            ProcessingLog.addToLog(ProcessingLog.LOG_ERROR,
+                                   self.tr('Problem with OTB installation: installed OTB version (%s) is not supported' % version))
+            return
 
-    def createAlgsList(self):
-        self.preloadedAlgs = []
-        folder = OTBUtils.otbDescriptionPath()
         for descriptionFile in os.listdir(folder):
             if descriptionFile.endswith("xml"):
                 try:
                     alg = OTBAlgorithm(os.path.join(folder, descriptionFile))
 
                     if alg.name.strip() != "":
-                        self.preloadedAlgs.append(alg)
+                        self.algs.append(alg)
                     else:
                         ProcessingLog.addToLog(ProcessingLog.LOG_ERROR,
                                                self.tr("Could not open OTB algorithm: %s" % descriptionFile))
@@ -101,6 +109,3 @@ def unload(self):
         AlgorithmProvider.unload(self)
         ProcessingConfig.removeSetting(OTBUtils.OTB_FOLDER)
         ProcessingConfig.removeSetting(OTBUtils.OTB_LIB_FOLDER)
-
-    def canBeActivated(self):
-        return not bool(OTBUtils.checkOtbConfiguration())