diff --git a/src/sextante/grass/GrassUtils.py b/src/sextante/grass/GrassUtils.py index f730dae2bfa..0d24950af81 100644 --- a/src/sextante/grass/GrassUtils.py +++ b/src/sextante/grass/GrassUtils.py @@ -54,7 +54,7 @@ class GrassUtils: def grassHelpPath(): folder = SextanteConfig.getSetting(GrassUtils.GRASS_HELP_FOLDER) if folder == None: - folder ="" + folder = os.path.join(GrassUtils.grassPath(), "docs", "html") return folder diff --git a/src/sextante/gui/ParametersDialog.py b/src/sextante/gui/ParametersDialog.py index 4c8fd06b87b..1b3fa9c1e49 100644 --- a/src/sextante/gui/ParametersDialog.py +++ b/src/sextante/gui/ParametersDialog.py @@ -171,6 +171,7 @@ class Ui_ParametersDialog(object): elif isinstance(param, ParameterSelection): item = QtGui.QComboBox() item.addItems(param.options) + item.setCurrentIndex(param.default) elif isinstance(param, ParameterFixedTable): item = FixedTablePanel(param) elif isinstance(param, ParameterRange): diff --git a/src/sextante/parameters/ParameterSelection.py b/src/sextante/parameters/ParameterSelection.py index 7347c08f0b2..9f5bf1a229c 100644 --- a/src/sextante/parameters/ParameterSelection.py +++ b/src/sextante/parameters/ParameterSelection.py @@ -2,11 +2,12 @@ from sextante.parameters.Parameter import Parameter class ParameterSelection(Parameter): - def __init__(self, name="", description="", options=[]): + def __init__(self, name="", description="", options=[], default = 0): self.name = name self.description = description self.options = options self.value = None + self.default = default def setValue(self, n): try: @@ -21,7 +22,10 @@ class ParameterSelection(Parameter): def deserialize(self, s): tokens = s.split("|") - return ParameterSelection(tokens[0], tokens[1], tokens[2].split(";")) + if len(tokens) == 4: + return ParameterSelection(tokens[0], tokens[1], tokens[2].split(";"), int(tokens[3])) + else: + return ParameterSelection(tokens[0], tokens[1], tokens[2].split(";")) def serialize(self): return self.__module__.split(".")[-1] + "|" + self.name + "|" + self.description +\ diff --git a/src/sextante/saga/description/Slope,Aspect,Curvature.txt b/src/sextante/saga/description/Slope,Aspect,Curvature.txt index 25c1e24e860..b3012cb956d 100644 --- a/src/sextante/saga/description/Slope,Aspect,Curvature.txt +++ b/src/sextante/saga/description/Slope,Aspect,Curvature.txt @@ -1,7 +1,7 @@ Slope, Aspect, Curvature ta_morphometry ParameterRaster|ELEVATION|Elevation|False -ParameterSelection|METHOD|Method|[0] Maximum Slope (Travis et al. 1975);[1] Maximum Triangle Slope (Tarboton 1997);[2] Least Squares Fitted Plane (Horn 1981, Costa-Cabral & Burgess 1996);[3] Fit 2.Degree Polynom (Bauer, Rohdenburg, Bork 1985);[4] Fit 2.Degree Polynom (Heerdegen & Beran 1982);[5] Fit 2.Degree Polynom (Zevenbergen & Thorne 1987);[6] Fit 3.Degree Polynom (Haralick 1983) +ParameterSelection|METHOD|Method|[0] Maximum Slope (Travis et al. 1975);[1] Maximum Triangle Slope (Tarboton 1997);[2] Least Squares Fitted Plane (Horn 1981, Costa-Cabral & Burgess 1996);[3] Fit 2.Degree Polynom (Bauer, Rohdenburg, Bork 1985);[4] Fit 2.Degree Polynom (Heerdegen & Beran 1982);[5] Fit 2.Degree Polynom (Zevenbergen & Thorne 1987);[6] Fit 3.Degree Polynom (Haralick 1983)|5 OutputRaster|SLOPE|Slope OutputRaster|ASPECT|Aspect OutputRaster|CURV|Curvature diff --git a/src/sextante/script/DeleteScriptAction.py b/src/sextante/script/DeleteScriptAction.py index f0acfbbe436..cae9f3b612c 100644 --- a/src/sextante/script/DeleteScriptAction.py +++ b/src/sextante/script/DeleteScriptAction.py @@ -1,5 +1,6 @@ from sextante.script.ScriptAlgorithm import ScriptAlgorithm from sextante.gui.ContextAction import ContextAction +import os class DeleteScriptAction(ContextAction): @@ -10,4 +11,5 @@ class DeleteScriptAction(ContextAction): return isinstance(self.alg, ScriptAlgorithm) def execute(self, alg): - pass \ No newline at end of file + os.remove(self.alg.descriptionFile) + self.toolbox.updateTree() \ No newline at end of file diff --git a/src/sextante/script/ScriptAlgorithm.py b/src/sextante/script/ScriptAlgorithm.py index b36e599afd5..a0a236c7f15 100644 --- a/src/sextante/script/ScriptAlgorithm.py +++ b/src/sextante/script/ScriptAlgorithm.py @@ -104,10 +104,10 @@ class ScriptAlgorithm(GeoAlgorithm): out = OutputTable() elif tokens[1].lower().strip().startswith("output html"): out = OutputHTML() - elif tokens[1].lower().strip().startswith("output number"): - out = OutputNumber() - - + #======================================================================= + # elif tokens[1].lower().strip().startswith("output number"): + # out = OutputNumber() + #======================================================================= if param != None: self.addParameter(param)