[sextante] minor bug fix in saga/grass installation checking.

Also code cleaning
qgis · Apr 13, 2013 · ac43402 · ac43402
1 parent 3a35a53
commit ac43402
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 38 deletions.
diff --git a/python/plugins/sextante/grass/GrassAlgorithmProvider.py b/python/plugins/sextante/grass/GrassAlgorithmProvider.py
@@ -102,19 +102,4 @@ def getSupportedOutputVectorLayerExtensions(self):
     def getSupportedOutputRasterLayerExtensions(self):
         return ["tif"]
 
-    def createDescriptionFiles(self):
-        folder = "C:\\descs\\grass"
-        i = 0
-        for alg in self.preloadedAlgs:
-            f = open (os.path.join(folder, alg.name +".txt"), "w")
-            f.write(alg.name + "\n")
-            f.write(alg.name + "\n")
-            f.write(alg.group + "\n")
-            for param in alg.parameters:
-                f.write(param.serialize() + "\n")
-            for out in alg.outputs:
-                f.write(out.serialize() + "\n")
-            f.close()
-            i+=1
-
 
diff --git a/python/plugins/sextante/grass/GrassUtils.py b/python/plugins/sextante/grass/GrassUtils.py
@@ -326,8 +326,8 @@ def checkGrassIsInstalled(ignoreRegistrySettings=False):
                         + "folder is correctly configured")
 
         settings = QSettings()
-        if not ignoreRegistrySettings:
-            GRASS_INSTALLED = "/SextanteQGIS/GrassInstalled"
+        GRASS_INSTALLED = "/SextanteQGIS/GrassInstalled"
+        if not ignoreRegistrySettings:            
             if settings.contains(GRASS_INSTALLED):
                 return
 

diff --git a/python/plugins/sextante/saga/SagaAlgorithmProvider.py b/python/plugins/sextante/saga/SagaAlgorithmProvider.py
@@ -114,25 +114,6 @@ def getSupportedOutputRasterLayerExtensions(self):
     def getSupportedOutputTableLayerExtensions(self):
         return ["dbf"]
 
-
     def getIcon(self):
         return  QIcon(os.path.dirname(__file__) + "/../images/saga.png")
 
-    def createDescriptionFiles(self):
-        folder = "C:\\descs\\saga"
-        i = 0
-        for alg in self.preloadedAlgs:
-            f = open (os.path.join(folder, alg.name.replace(" ","").replace("/", "") + ".txt"), "w")
-            f.write(alg.name + "\n")
-            f.write(alg.undecoratedGroup + "\n")
-            for param in alg.parameters:
-                f.write(param.serialize() + "\n")
-            for out in alg.outputs:
-                f.write(out.serialize() + "\n")
-            f.close()
-            i+=1
-
-
-
-
-
diff --git a/python/plugins/sextante/saga/SagaUtils.py b/python/plugins/sextante/saga/SagaUtils.py
@@ -136,8 +136,8 @@ def checkSagaIsInstalled(ignoreRegistrySettings=False):
                         + "folder is correctly configured")
 
         settings = QSettings()
-        if not ignoreRegistrySettings:
-            SAGA_INSTALLED = "/SextanteQGIS/SagaInstalled"
+        SAGA_INSTALLED = "/SextanteQGIS/SagaInstalled"
+        if not ignoreRegistrySettings:            
             if settings.contains(SAGA_INSTALLED):
                 return