Skip to content

Commit b3584dc

Browse files
author
volayaf@gmail.com
committed
added a new method for loading layers into qgis
git-svn-id: http://sextante.googlecode.com/svn/trunk/soft/bindings/qgis-plugin@38 881b9c09-3ef8-f3c2-ec3d-21d735c97f4d
1 parent 88ea07f commit b3584dc

File tree

4 files changed

+13
-7
lines changed

4 files changed

+13
-7
lines changed

src/sextante/core/QGisLayers.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,9 @@ def load(layer, name = None, crs = None):
8080

8181

8282
@staticmethod
83-
def loadMap(layersmap, crs):
84-
for name in layersmap.keys():
85-
QGisLayers.load(layersmap[name], name, crs)
83+
def loadFromDict(layersdict, crs):
84+
for name in layersdict.keys():
85+
QGisLayers.load(layersdict[name], name, crs)
8686

8787

8888
@staticmethod

src/sextante/core/Sextante.py

+4
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,10 @@ def runalg(name, *args):
210210
def load(layer):
211211
QGisLayers.load(layer)
212212

213+
@staticmethod
214+
def loadFromAlg(layersdict):
215+
QGisLayers.loadFromDict(layersdict)
216+
213217
@staticmethod
214218
def getObject(string):
215219
QGisLayers.getObjectFromUri(string)

src/sextante/saga/SagaAlgorithmProvider.py

+4-3
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
from PyQt4.QtGui import *
66
from sextante.core.SextanteConfig import SextanteConfig, Setting
77
from sextante.core.AlgorithmProvider import AlgorithmProvider
8+
from sextante.core.SextanteLog import SextanteLog
89

910
class SagaAlgorithmProvider(AlgorithmProvider):
1011

@@ -22,14 +23,14 @@ def __init__(self):
2223
def _loadAlgorithms(self):
2324
folder = SagaUtils.sagaDescriptionPath()
2425
for descriptionFile in os.listdir(folder):
25-
#try:
26+
try:
2627
if descriptionFile.startswith("alg_"):
2728
alg = SagaAlgorithm(os.path.join(folder, descriptionFile))
2829
if alg.name.strip() != "":
2930
alg.provider = self
3031
self.algs.append(alg)
31-
#except Exception,e:
32-
#pass
32+
except Exception,e:
33+
SextanteLog.addToLog(SextanteLog.LOG_ERROR, "Could not open SAGA algorithm: " + descriptionFile)
3334

3435
#self.createDescriptionFiles()
3536

src/sextante/saga/description/alg_27.txt

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,6 @@ ParameterBoolean|USER_FIT_EXTENT |Fit Extent|True
2222
ParameterNumber|USER_X_EXTENT_MIN|X-Extent Min|None|None|0
2323
ParameterNumber|USER_X_EXTENT_MAX|X-Extent Max|None|None|0
2424
ParameterNumber|USER_Y_EXTENT_MIN|Y-Extent Min|None|None|0
25-
ParameterNumber|USER_Y_EXTENT_MAX|Y-Extent Max|None|None|0OutputRaster|GRID|Grid
25+
ParameterNumber|USER_Y_EXTENT_MAX|Y-Extent Max|None|None|0
26+
OutputRaster|GRID|Grid
2627
OutputRaster|VARIANCE|Variance

0 commit comments

Comments
 (0)