Skip to content
Permalink
Browse files

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

Also code cleaning
  • Loading branch information
volaya committed Apr 13, 2013
1 parent 3a35a53 commit ac434028d7655c0da7d2b57e93124acc28f93127
@@ -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


@@ -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

@@ -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





@@ -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

0 comments on commit ac43402

Please sign in to comment.
You can’t perform that action at this time.