default TauDEM/MPI paths for OS X

kyngchaos · kyngchaos · commit 0ca725cae0f1 · 2013-04-20T15:38:40.000-05:00
diff --git a/python/plugins/sextante/taudem/TauDEMUtils.py b/python/plugins/sextante/taudem/TauDEMUtils.py
@@ -43,6 +43,14 @@ def taudemPath():
         if folder == None:
             folder = ""
 
+        if SextanteUtils.isMac():
+            testfolder = os.path.join(str(QgsApplication.prefixPath()), "bin")
+            if os.path.exists(os.path.join(testfolder, "slopearea")):
+                folder = testfolder
+            else:
+                testfolder = "/usr/local/bin"
+                if os.path.exists(os.path.join(testfolder, "slopearea")):
+                    folder = testfolder
         return folder
 
     @staticmethod
@@ -51,6 +59,14 @@ def mpiexecPath():
         if folder == None:
             folder = ""
 
+        if SextanteUtils.isMac():
+            testfolder = os.path.join(str(QgsApplication.prefixPath()), "bin")
+            if os.path.exists(os.path.join(testfolder, "mpiexec")):
+                folder = testfolder
+            else:
+                testfolder = "/usr/local/bin"
+                if os.path.exists(os.path.join(testfolder, "mpiexec")):
+                    folder = testfolder
         return folder
 
     @staticmethod
