Skip to content

Commit dbbcca2

Browse files
author
volayaf
committed
added some i.* to grass, some new tools to lastools and nviz
git-svn-id: http://sextante.googlecode.com/svn/trunk/soft/bindings/qgis-plugin@148 881b9c09-3ef8-f3c2-ec3d-21d735c97f4d
1 parent 0023d04 commit dbbcca2

25 files changed

+229
-74
lines changed

‎build.xml‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,8 @@
55
<property name="version.number" value="1.0"/>
66
<target name="copy"
77
description="copy files">
8-
<copy todir="C:/Users/volaya/.qgis/python/plugins/sextante">
9-
<fileset dir="src/sextante" includes="**"/>
8+
<copy todir="C:/Users/volaya/.qgis/python/plugins">
9+
<fileset dir="src" includes="**"/>
1010
</copy>
11-
<copy todir="C:/Users/volaya/.qgis/python/plugins/sextanteexampleprovider">
12-
<fileset dir="src/sextanteexampleprovider" includes="**"/>
13-
</copy>
1411
</target>
1512
</project>

‎src/sextante/core/GeoAlgorithm.py‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -145,12 +145,13 @@ def setOutputCRSFromInputLayers(self):
145145
layers = QGisLayers.getAllLayers()
146146
for param in self.parameters:
147147
if isinstance(param, (ParameterRaster, ParameterVector, ParameterMultipleInput)):
148-
inputlayers = param.value.split(";")
149-
for inputlayer in inputlayers:
150-
for layer in layers:
151-
if layer.source() == inputlayer:
152-
self.crs = layer.crs()
153-
return
148+
if param.value:
149+
inputlayers = param.value.split(";")
150+
for inputlayer in inputlayers:
151+
for layer in layers:
152+
if layer.source() == inputlayer:
153+
self.crs = layer.crs()
154+
return
154155

155156

156157
def addOutput(self, output):

‎src/sextante/grass/GrassAlgorithm.py‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -92,19 +92,20 @@ def calculateRegion(self):
9292
if auto:
9393
first = True;
9494
for param in self.parameters:
95-
if isinstance(param, (ParameterRaster, ParameterVector)):
96-
if isinstance(param.value, (QgsRasterLayer, QgsVectorLayer)):
97-
layer = param.value
98-
else:
99-
layer = QGisLayers.getObjectFromUri(param.value)
100-
self.addToRegion(layer, first)
101-
first = False
102-
elif isinstance(param, ParameterMultipleInput):
103-
layers = param.value.split(";")
104-
for layername in layers:
105-
layer = QGisLayers.getObjectFromUri(layername, first)
95+
if param.value:
96+
if isinstance(param, (ParameterRaster, ParameterVector)):
97+
if isinstance(param.value, (QgsRasterLayer, QgsVectorLayer)):
98+
layer = param.value
99+
else:
100+
layer = QGisLayers.getObjectFromUri(param.value)
106101
self.addToRegion(layer, first)
107102
first = False
103+
elif isinstance(param, ParameterMultipleInput):
104+
layers = param.value.split(";")
105+
for layername in layers:
106+
layer = QGisLayers.getObjectFromUri(layername, first)
107+
self.addToRegion(layer, first)
108+
first = False
108109
if self.cellsize == 0:
109110
self.cellsize = 1
110111
else:

‎src/sextante/grass/GrassAlgorithmProvider.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
from sextante.grass.GrassAlgorithm import GrassAlgorithm
99
from sextante.core.SextanteUtils import SextanteUtils
1010
from sextante.grass.DefineGrassRegionAction import DefineGrassRegionAction
11+
from sextante.grass.nviz import nviz
1112

1213
class GrassAlgorithmProvider(AlgorithmProvider):
1314

@@ -57,6 +58,7 @@ def createAlgsList(self):
5758
SextanteLog.addToLog(SextanteLog.LOG_ERROR, "Could not open GRASS algorithm: " + descriptionFile)
5859
except Exception,e:
5960
SextanteLog.addToLog(SextanteLog.LOG_ERROR, "Could not open GRASS algorithm: " + descriptionFile)
61+
self.preloadedAlgs.append(nviz())
6062
#self.createDescriptionFiles()
6163

6264
def _loadAlgorithms(self):

‎src/sextante/grass/GrassUtils.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ def grassHelpPath():
6565
if os.path.exists(f):
6666
folder = f
6767
break
68-
68+
6969
return folder
7070

7171
@staticmethod
@@ -122,9 +122,9 @@ def createGrassScript(commands):
122122
output.write("set PATHEXT=%PATHEXT%;.PY\n")
123123
output.write("set PYTHONPATH=%PYTHONPATH%;%WINGISBASE%\\etc\\python;%WINGISBASE%\\etc\\wxpython\\n");
124124
output.write("\n")
125-
output.write("g.gisenv.exe set=\"MAPSET= " + mapset + "\n")
126-
output.write("g.gisenv.exe set=\"LOCATION=" + location + "\n")
127-
output.write("g.gisenv.exe set=\"LOCATION_NAME=" + location + "\n")
125+
output.write("g.gisenv.exe set=\"MAPSET=" + mapset + "\"\n")
126+
output.write("g.gisenv.exe set=\"LOCATION=" + location + "\"\n")
127+
output.write("g.gisenv.exe set=\"LOCATION_NAME=" + location + "\"\n")
128128
output.write("g.gisenv.exe set=\"GISDBASE=" + gisdbase + "\"\n")
129129
output.write("g.gisenv.exe set=\"GRASS_GUI=text\"\n")
130130
for command in commands:

‎src/sextante/grass/description/i.atcorr.txt‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
i.attcorr
2+
i.attcorr
3+
Imagery (i.*)
4+
ParameterBoolean|-f|-f|False
5+
ParameterBoolean|-a|-a|False
6+
ParameterBoolean|-b|-b|False
7+
ParameterBoolean|-o|-o|False
8+
ParameterRaster|iimg|iimg|False
9+
ParameterRaster|ialt|ialt|True
10+
ParameterRaster|ivis|ivis|True
11+
ParameterRange|iscl|iscl|0,255
12+
ParameterFile|icnd|icnd|False
13+
OutputRaster|oimg|oimg

‎src/sextante/grass/description/i.fft.txt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
i.fft
2+
i.fft
3+
Imagery (i.*)
4+
ParameterRaster|input_image|input_image|False
5+
OutputRaster|real_image|real_image
6+
OutputRaster|imaginary_image|imaginary_image

‎src/sextante/grass/description/i.his.rgb.txt‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
i.his.rgb
2+
i.his.rgb
3+
Imagery (i.*)
4+
ParameterRaster|hue_input|hue_input|False
5+
ParameterRaster|intensity_input|intensity_input|False
6+
ParameterRaster|saturation_input|saturation_input|False
7+
OutputRaster|red_output|red_output
8+
OutputRaster|green_output|green_output
9+
OutputRaster|blue_output|blue_output

‎src/sextante/grass/description/i.ifft.txt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
i.ifft
2+
i.ifft
3+
Imagery (i.*)
4+
ParameterRaster|real_image|real_image|False
5+
ParameterRaster|imaginary_image|imaginary_image|False
6+
OutputRaster|output_image|output_image

‎src/sextante/grass/description/i.zc.txt‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
i.zc
2+
i.zc
3+
Imagery (i.*)
4+
ParameterRaster|input|input|False
5+
ParameterRaster|green|green|False
6+
ParameterNumber|width|width|1|None|9
7+
ParameterNumber|threshold|threshold|0|None|10.0
8+
ParameterNumber|orientations|orientations|0|None|1
9+
OutputRaster|output|output

0 commit comments

Comments
 (0)