Improvements to the GRASS toolbox - take 1 from the hackfest

git-svn-id: http://svn.osgeo.org/qgis/trunk@14546 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Nov 11, 2010 · c47217f · c47217f
1 parent 1372985
commit c47217f
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 1 deletion.
diff --git a/src/plugins/grass/modules-6.3/default.qgc b/src/plugins/grass/modules-6.3/default.qgc
@@ -36,6 +36,7 @@
                                 <grass name="v.in.ogr.all.loc"/> 
 				<grass name="v.in.dxf"/>
 				<grass name="v.in.e00"/>
+                                <grass name="v.in.ascii"/>
 				<grass name="v.in.mapgen"/>
 				<grass name="v.in.db"/>
 				<grass name="v.in.garmin"/>

diff --git a/src/plugins/grass/modules-6.4/default.qgc b/src/plugins/grass/modules-6.4/default.qgc
@@ -64,6 +64,7 @@
                         	        <grass name="v.in.ogr.all.loc"/> 
 					<grass name="v.in.dxf"/>
 					<grass name="v.in.e00"/>
+					<grass name="v.in.ascii"/>
 					<grass name="v.in.mapgen"/>
 					<grass name="v.in.db"/>
 					<grass name="v.in.garmin"/>

diff --git a/src/plugins/grass/modules-common/resize_grass b/src/plugins/grass/modules-common/resize_grass
@@ -0,0 +1,22 @@
+#!/bin/bash
+# Use a simple shell loop, to process each of the images.
+mkdir thumbnails
+#  for $a in *.png
+#  echo $a
+#  do convert -thumbnail $a 32x32 thumbnails/$f.png
+#done
+
+# Use find to substitute filenames into a 'convert' command
+  # This also provides the ability to recurse though directories by removing
+  # the -prune option, as well as doing other file checks (like image type,
+  # or the disk space used by an image).
+  find * -prune -name '*.png' \
+         -exec  convert '{}' -alpha set -channel RGBA -fill none -opaque white \
+         -thumbnail x32 thumbnails/'{}' \;
+# -alpha set -channel RGBA -fill none -opaque white test.png
+#for i in `find . -name "*.png`
+#echo $i
+#do
+#  convert $i -thumbnail 32x32 `basename $i.png`.png
+#done
+
diff --git a/src/plugins/grass/modules-common/v.in.ascii.1.png b/src/plugins/grass/modules-common/v.in.ascii.1.png
diff --git a/src/plugins/grass/modules-common/v.in.ascii.2.png b/src/plugins/grass/modules-common/v.in.ascii.2.png
diff --git a/src/plugins/grass/modules-common/v.in.ascii.qgm b/src/plugins/grass/modules-common/v.in.ascii.qgm
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
+
+<qgisgrassmodule label="Import text file" module="v.in.ascii">
+	<file key="input" label="Text file"/>
+	<option key="output"/>
+	<option key="format"/>
+        <option key="fs" label="Separator (| , \t etc.)" />
+	<option key="skip" label="Number of rows to be skipped"/>
+	<option key="x" label="Which column for the X coordinate? The first is 1"/>
+        <option key="y" label="Which column for the Y coordinate?"/>
+        <option key="z" label="Which column for the Z coordinate? If 0, z coordinate is not used"/>
+</qgisgrassmodule>
diff --git a/src/plugins/grass/modules-common/v.net.iso.qgm b/src/plugins/grass/modules-common/v.net.iso.qgm
@@ -4,7 +4,7 @@
 <qgisgrassmodule label="Cut network by cost isolines" module="v.net.iso">
 	<option key="input" layeroption="alayer" typemask="line,boundary" label="Input arcs" id="arcs" />
 	<option key="input" mapid="arcs" layeroption="nlayer" typemask="point" label="Input nodes" id="nodes" />
-	<selection key="ccats" layerid="nodes" label="Cats" />
+	<selection key="ccats" layerid="nodes" label="Cats (select from the map or using their id)" />
 	<option key="costs" />
 	<option key="output" />
 </qgisgrassmodule>