6 changes: 5 additions & 1 deletion python/plugins/fTools/tools/doMergeShapes.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,11 @@ def __init__( self, iface ):
QObject.connect( self.leOutShape, SIGNAL( "editingFinished()" ), self.updateOutFile )

def inputDir( self ):
settings = QSettings()
lastDir = settings.value( "/fTools/lastShapeDir", "." ).toString()
inDir = QFileDialog.getExistingDirectory( self,
self.tr( "Select directory with shapefiles to merge" ),
"." )
lastDir )

if inDir.isEmpty():
return
Expand All @@ -48,6 +50,8 @@ def inputDir( self ):
self.inputFiles = None
return

settings.setValue( "/fTools/lastShapeDir", inDir )

self.progressFiles.setRange( 0, self.inputFiles.count() )
self.leInputDir.setText( inDir )

Expand Down
1 change: 0 additions & 1 deletion src/app/qgswmssourceselect.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1039,7 +1039,6 @@ void QgsWMSSourceSelect::addDefaultServers()
QMap<QString, QString> exampleServers;
exampleServers["DM Solutions GMap"] = "http://www2.dmsolutions.ca/cgi-bin/mswms_gmap";
exampleServers["Lizardtech server"] = "http://wms.lizardtech.com/lizardtech/iserv/ows";
exampleServers["GEOIMAGE-AUSTRIA"] = "http://wms.geoimage.at/dop-1mfree?";
// Nice to have the qgis users map, but I'm not sure of the URL at the moment.
// exampleServers["Qgis users map"] = "http://qgis.org/wms.cgi";

Expand Down
3 changes: 3 additions & 0 deletions src/plugins/grass/modules/default.qgc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,7 @@
<grass name="r.category"/>
</section>
<section label="Statistics">
<grass name="r.stats"/>
<grass name="r.sum"/>
<grass name="r.report"/>
<grass name="r.average"/>
Expand Down Expand Up @@ -329,6 +330,8 @@
</section>
<section label="Convert 2D vector to 3D by sampling raster">
<grass name="v.drape"/>
<grass name="v.extrude.fixed"/>
<grass name="v.extrude.attr"/>
</section>
<section label="Reproject vector from another Location">
<grass name="v.transform"/>
Expand Down
9 changes: 5 additions & 4 deletions src/plugins/grass/modules/r.external.all.qgm
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassdatamodule.dtd">
<qgisgrassmodule label="Link all GDAL supported rasters in a directory as GRASS rasters" module="r.external.all.py" manual="r.external">
<flag key="o"/>
<flag key="e"/>
<flag key="r"/>
<file key="input" type="directory" label="Directory of rasters to be linked"/>
<option key="band"/>
<option key="title" advanced="yes"/>
<option key="band" advanced="yes"/>
<flag key="r" advanced="yes"/>
<flag key="o" advanced="yes"/>
<flag key="e" advanced="yes"/>
</qgisgrassmodule>
10 changes: 5 additions & 5 deletions src/plugins/grass/modules/r.external.qgis.qgm
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassdatamodule.dtd">
<qgisgrassmodule label="Link GDAL supported raster loaded in QGIS as GRASS raster" module="r.external">
<flag key="o"/>
<flag key="e"/>
<gdal key="source" label="GDAL raster layer"/>
<gdal key="source" label="Loaded layer"/>
<option key="output"/>
<option key="band"/>
<option key="title"/>
<option key="title" advanced="yes"/>
<option key="band" advanced="yes"/>
<flag key="o" advanced="yes"/>
<flag key="e" advanced="yes"/>
</qgisgrassmodule>
8 changes: 4 additions & 4 deletions src/plugins/grass/modules/r.external.qgm
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassdatamodule.dtd">
<qgisgrassmodule label="Link GDAL supported raster as GRASS raster" module="r.external">
<flag key="o"/>
<flag key="e"/>
<file key="input"/>
<option key="output"/>
<option key="band"/>
<option key="title"/>
<option key="title" advanced="yes"/>
<option key="band" advanced="yes"/>
<flag key="o" advanced="yes"/>
<flag key="e" advanced="yes"/>
</qgisgrassmodule>
5 changes: 3 additions & 2 deletions src/plugins/grass/modules/r.in.gdal.loc.qgm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Import GDAL supported raster and create a fitted location" module="r.in.gdal">
<flag key="o" answer="off" hidden="yes" />
<flag key="e" answer="on" hidden="yes" />
<file key="input" />
<option key="output" />
<option key="location" />
<option key="title" advanced="yes"/>
<option key="band" advanced="yes"/>
<flag key="o" advanced="yes"/>
</qgisgrassmodule>
9 changes: 5 additions & 4 deletions src/plugins/grass/modules/r.in.gdal.qgis.loc.qgm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Import loaded raster and create a fitted location" module="r.in.gdal">
<flag key="o" answer="off" hidden="yes" />
<flag key="e" answer="on" hidden="yes" />
<gdal key="input" label="GDAL raster layer" />
<option key="output" />
<gdal key="input" label="Loaded layer"/>
<option key="output" />
<option key="location" />
<option key="title" advanced="yes"/>
<option key="band" advanced="yes"/>
<flag key="o" advanced="yes"/>
</qgisgrassmodule>
8 changes: 5 additions & 3 deletions src/plugins/grass/modules/r.in.gdal.qgis.qgm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Import loaded raster" module="r.in.gdal">
<flag key="o" answer="on" hidden="yes" />
<flag key="e" answer="off" hidden="yes" />
<gdal key="input" label="GDAL raster layer" />
<gdal key="input" label="Loaded layer"/>
<option key="output" />
<option key="title" advanced="yes"/>
<option key="band" advanced="yes"/>
<flag key="o" advanced="yes"/>
<flag key="e" advanced="yes"/>
</qgisgrassmodule>
6 changes: 4 additions & 2 deletions src/plugins/grass/modules/r.in.gdal.qgm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Import GDAL supported raster" module="r.in.gdal">
<flag key="o" answer="on" hidden="yes" />
<flag key="e" answer="off" hidden="yes" />
<file key="input" />
<option key="output" />
<option key="title" advanced="yes"/>
<option key="band" advanced="yes"/>
<flag key="o" advanced="yes"/>
<flag key="e" advanced="yes"/>
</qgisgrassmodule>
1 change: 1 addition & 0 deletions src/plugins/grass/modules/r.slope.qgm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@
<qgisgrassmodule label="Create slope raster from DEM (digital elevation model)" module="r.slope.aspect">
<option key="elevation" />
<option key="slope" />
<option key="format" advanced="yes" />
</qgisgrassmodule>
Binary file added src/plugins/grass/modules/r.stats.1.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
23 changes: 23 additions & 0 deletions src/plugins/grass/modules/r.stats.qgm
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Generates area statistics for rasters" module="r.stats">
<option key="input" />
<flag key="1" advanced="yes"/>
<flag key="A" advanced="yes"/>
<flag key="a" advanced="yes"/>
<flag key="c" advanced="yes"/>
<flag key="p" advanced="yes"/>
<flag key="l" advanced="yes"/>
<flag key="n" advanced="yes"/>
<flag key="N" advanced="yes"/>
<flag key="g" advanced="yes"/>
<flag key="x" advanced="yes"/>
<flag key="C" advanced="yes"/>
<flag key="r" advanced="yes"/>
<flag key="i" advanced="yes"/>
<option key="fs" advanced="yes"/>
<option key="nv" advanced="yes"/>
<option key="nsteps" advanced="yes"/>
<file key="output" type="new" advanced="yes"/>
</qgisgrassmodule>
10 changes: 10 additions & 0 deletions src/plugins/grass/modules/v.extrude.attr.qgm
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Extrudes flat vector object to 3D with height based on attribute" module="v.extrude">
<option key="input" layeroption="layer"/>
<option key="elevation" label="Elevation raster for height extraction (optional)"/>
<option key="zshift" advanced="yes" />
<field key="hcolumn" layer="input" type="integer,double" />
<option key="output"/>
</qgisgrassmodule>
10 changes: 10 additions & 0 deletions src/plugins/grass/modules/v.extrude.fixed.qgm
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Extrudes flat vector object to 3D with fixed height" module="v.extrude">
<option key="input" layeroption="layer"/>
<option key="elevation" label="Elevation raster for height extraction (optional)"/>
<option key="zshift" advanced="yes" />
<option key="height" />
<option key="output"/>
</qgisgrassmodule>
2 changes: 1 addition & 1 deletion src/plugins/grass/modules/v.in.ogr.all.loc.qgm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Import all OGR/PostGIS vectors in a given data source and create a fitted location" module="v.in.ogr">
<flag key="o" answer="off" hidden="yes" />
<option key="dsn" label="Path to the OGR data source" />
<option key="output" />
<option key="location" />
Expand All @@ -11,4 +10,5 @@
<flag key="e" answer="off" hidden="no" advanced="yes"/>
<option key="snap" advanced="yes" />
<option key="min_area" advanced="yes" />
<flag key="o" answer="on" advanced="yes" />
</qgisgrassmodule>
2 changes: 1 addition & 1 deletion src/plugins/grass/modules/v.in.ogr.all.qgm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Import OGR vectors in a given data source combining them in a GRASS vector" module="v.in.ogr">
<flag key="o" answer="on" hidden="yes" />
<file key="dsn" type="directory" label="Path to the OGR data source" />
<option key="output" />
<option key="type" advanced="yes"/>
<flag key="z" answer="off" hidden="no" advanced="yes"/>
<flag key="e" answer="off" hidden="no" advanced="yes"/>
<option key="snap" advanced="yes" />
<option key="min_area" advanced="yes" />
<flag key="o" answer="on" advanced="yes" />
</qgisgrassmodule>
6 changes: 3 additions & 3 deletions src/plugins/grass/modules/v.in.ogr.loc.qgm
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Import OGR/PostGIS vector and create a fitted location" module="v.in.ogr">
<flag key="o" answer="off" hidden="yes" />
<file key="dsn" type="old" label="OGR file" />
<qgisgrassmodule label="Import OGR vector and create a fitted location" module="v.in.ogr">
<file key="dsn" />
<option key="output" />
<option key="location" />
<option key="type" advanced="yes"/>
Expand All @@ -12,4 +11,5 @@
<option key="snap" advanced="yes" />
<option key="min_area" advanced="yes" />
<option key="where" advanced="yes"/>
<flag key="o" answer="on" advanced="yes" />
</qgisgrassmodule>
4 changes: 2 additions & 2 deletions src/plugins/grass/modules/v.in.ogr.qgis.loc.qgm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Import loaded vector and create a fitted location" module="v.in.ogr">
<flag key="o" answer="off" hidden="yes" />
<ogr key="dsn" layeroption="layer" whereoption="where" label="OGR vector layer" />
<ogr key="dsn" layeroption="layer" whereoption="where" label="Loaded layer" />
<option key="output" />
<option key="location" />
<option key="type" advanced="yes"/>
Expand All @@ -12,4 +11,5 @@
<option key="snap" advanced="yes" />
<option key="min_area" advanced="yes" />
<option key="where" advanced="yes"/>
<flag key="o" answer="on" advanced="yes" />
</qgisgrassmodule>
4 changes: 2 additions & 2 deletions src/plugins/grass/modules/v.in.ogr.qgis.qgm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Import loaded vector" module="v.in.ogr">
<flag key="o" answer="on" hidden="yes" />
<ogr key="dsn" layeroption="layer" whereoption="where" label="OGR vector layer" />
<ogr key="dsn" layeroption="layer" whereoption="where" label="Loaded layer" />
<option key="output" />
<option key="type" advanced="yes"/>
<flag key="z" answer="off" hidden="no" advanced="yes" />
<flag key="e" answer="off" hidden="no" advanced="yes" />
<option key="snap" advanced="yes" />
<option key="min_area" advanced="yes" />
<option key="where" advanced="yes"/>
<flag key="o" answer="on" advanced="yes" />
</qgisgrassmodule>
4 changes: 2 additions & 2 deletions src/plugins/grass/modules/v.in.ogr.qgm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Import OGR vector" module="v.in.ogr">
<flag key="o" answer="on" hidden="yes" />
<file key="dsn" type="old" label="OGR file" />
<file key="dsn" />
<option key="output" />
<option key="type" advanced="yes"/>
<flag key="z" answer="off" hidden="no" advanced="yes"/>
<flag key="e" answer="off" hidden="no" advanced="yes"/>
<option key="snap" advanced="yes" />
<option key="min_area" advanced="yes" />
<option key="where" advanced="yes"/>
<flag key="o" answer="on" advanced="yes" />
</qgisgrassmodule>