[GRASS-SVN] r63703 - in grass/branches/releasebranch_7_0: . vector/v.colors
svn_grass at osgeo.org
svn_grass at osgeo.org
Wed Dec 24 02:42:58 PST 2014
Author: martinl
Date: 2014-12-24 02:42:58 -0800 (Wed, 24 Dec 2014)
New Revision: 63703
Modified:
grass/branches/releasebranch_7_0/
grass/branches/releasebranch_7_0/vector/v.colors/main.c
grass/branches/releasebranch_7_0/vector/v.colors/v.colors.html
grass/branches/releasebranch_7_0/vector/v.colors/write_rgb.c
Log:
v.colors: fix creating column in pg driver (be case-sensitive) - #2513
avoid unix commands (head) in the manual
(merge r63700-2 from trunk)
Property changes on: grass/branches/releasebranch_7_0
___________________________________________________________________
Modified: svn:mergeinfo
- /grass/trunk:60817,61096,61141,61994,62105,62179-62180,62182,62190,62403,62422,62424,62437,62466,62469,62487,62491,62494,62501,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62566,62570,62573,62575,62585,62588,62597,62603,62606,62608-62609,62614,62618,62628,62632,62638,62642,62648-62649,62652,62654-62657,62666,62691,62705,62709,62723,62730,62739,62741,62743,62746,62750-62752,62757,62762,62785,62798,62800-62801,62803,62805,62812,62822,62824,62828,62831,62838,62845,62847,62850,62856,62879,62881,62886,62904,62907-62908,62910,62912,62914,62916,62918,62920,62925,62932-62933,62935,62940,62942,62944-62946,62949,62955-62956,62958,62960,62962,62964,62966-62968,62970,62973,62975,62977,62981,62983,62985,62987,62989,62991,62993,62995,62997,62999-63000,63003,63005,63007,63009,63011,63013,63015,63017,63020,63022,63024,63026,63028-63031,63033,63035,63037,63040,63043-63044,63047,63049,63051,63053,63055,63057,63060,63062-63064,63066,63068,63070-63071,63074,
63076,63079,63081,63083,63085,63087,63089,63091,63093,63095,63098,63100,63102,63105,63107,63109,63111,63113-63114,63116,63119,63121,63123,63125,63130,63132-63133,63135,63137,63140,63143,63145,63147,63149,63151,63153-63154,63157,63160,63165,63170,63173,63175,63187,63192-63193,63196,63199-63200,63202,63209,63216,63220-63221,63224,63227,63240,63246,63250,63255,63259,63261,63275-63276,63279,63281,63283,63287,63290,63292,63297,63302,63304-63307,63315,63319,63327,63330,63332,63339,63342,63345,63362,63367,63379,63389,63391,63393,63402,63408-63409,63416-63417,63425,63427,63429,63431,63433,63448,63451,63453,63457,63459,63464-63470,63473,63482,63497,63505,63508,63510,63515,63521-63524,63526,63536-63537,63551-63552,63554,63556,63558-63559,63562,63570,63576,63582,63589-63593,63602,63604,63608-63609,63616,63618,63624,63626,63628,63630,63634,63639,63642,63644,63650,63652,63656,63679,63685,63689,63691,63693,63695
+ /grass/trunk:60817,61096,61141,61994,62105,62179-62180,62182,62190,62403,62422,62424,62437,62466,62469,62487,62491,62494,62501,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62566,62570,62573,62575,62585,62588,62597,62603,62606,62608-62609,62614,62618,62628,62632,62638,62642,62648-62649,62652,62654-62657,62666,62691,62705,62709,62723,62730,62739,62741,62743,62746,62750-62752,62757,62762,62785,62798,62800-62801,62803,62805,62812,62822,62824,62828,62831,62838,62845,62847,62850,62856,62879,62881,62886,62904,62907-62908,62910,62912,62914,62916,62918,62920,62925,62932-62933,62935,62940,62942,62944-62946,62949,62955-62956,62958,62960,62962,62964,62966-62968,62970,62973,62975,62977,62981,62983,62985,62987,62989,62991,62993,62995,62997,62999-63000,63003,63005,63007,63009,63011,63013,63015,63017,63020,63022,63024,63026,63028-63031,63033,63035,63037,63040,63043-63044,63047,63049,63051,63053,63055,63057,63060,63062-63064,63066,63068,63070-63071,63074,
63076,63079,63081,63083,63085,63087,63089,63091,63093,63095,63098,63100,63102,63105,63107,63109,63111,63113-63114,63116,63119,63121,63123,63125,63130,63132-63133,63135,63137,63140,63143,63145,63147,63149,63151,63153-63154,63157,63160,63165,63170,63173,63175,63187,63192-63193,63196,63199-63200,63202,63209,63216,63220-63221,63224,63227,63240,63246,63250,63255,63259,63261,63275-63276,63279,63281,63283,63287,63290,63292,63297,63302,63304-63307,63315,63319,63327,63330,63332,63339,63342,63345,63362,63367,63379,63389,63391,63393,63402,63408-63409,63416-63417,63425,63427,63429,63431,63433,63448,63451,63453,63457,63459,63464-63470,63473,63482,63497,63505,63508,63510,63515,63521-63524,63526,63536-63537,63551-63552,63554,63556,63558-63559,63562,63570,63576,63582,63589-63593,63602,63604,63608-63609,63616,63618,63624,63626,63628,63630,63634,63639,63642,63644,63650,63652,63656,63679,63685,63689,63691,63693,63695,63698,63700-63702
Modified: grass/branches/releasebranch_7_0/vector/v.colors/main.c
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.colors/main.c 2014-12-24 10:33:06 UTC (rev 63702)
+++ grass/branches/releasebranch_7_0/vector/v.colors/main.c 2014-12-24 10:42:58 UTC (rev 63703)
@@ -7,7 +7,7 @@
*
* PURPOSE: Manage color tables for vector maps
*
- * COPYRIGHT: (C) 2011 by the GRASS Development Team
+ * COPYRIGHT: (C) 2011-2014 by the GRASS Development Team
*
* This program is free software under the GNU General
* Public License (>=v2). Read the file COPYING that
Modified: grass/branches/releasebranch_7_0/vector/v.colors/v.colors.html
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.colors/v.colors.html 2014-12-24 10:33:06 UTC (rev 63702)
+++ grass/branches/releasebranch_7_0/vector/v.colors/v.colors.html 2014-12-24 10:42:58 UTC (rev 63703)
@@ -10,7 +10,7 @@
rules based on points or centroids z-coordinate (<b>use=z</b>). 3D
vector lines are not supported.
-<p>The <b>rast</b> option allows user to specify a raster map from
+<p>The <b>raster</b> option allows user to specify a raster map from
which to copy the color table, similarly <b>volume</b> option for 3D
raster map.
@@ -38,7 +38,7 @@
<h2>EXAMPLES</h2>
-<h3>Define color table</h3>
+<h3>Define color table based on categories</h3>
Define color table <tt>wave</tt> based on categories from layer 1
@@ -46,6 +46,8 @@
v.colors map=soils_general layer=1 color=wave
</pre></div>
+<h3>Define color table based on attribute values</h3>
+
Define color table <tt>ryg</tt> based on values from attribute
column <tt>AREA</tt>. Attribute table is linked to layer 1.
@@ -54,6 +56,8 @@
v.colors map=soils_general layer=1 color=wave use=attr column=AREA
</pre></div>
+<h3>Define color table stored as RGB values in attribute table</h3>
+
Write color values to the attribute table (column <tt>GRASSRGB</tt>)
instead of creating color table.
@@ -61,7 +65,7 @@
v.colors map=soils_general layer=1 color=wave use=attr column=AREA rgb_column=GRASSRGB
# See some GRASSRGB values:
-v.db.select map=soils_general | head -n 4
+v.db.select map=soils_general where="cat < 4"
cat|OBJECTID|AREA|PERIMETER|GSLNC250_|GSLNC250_I|GSL_NAME|GRASSRGB
1|1|0|164616.125|2|1|NC113|212:42:127
2|2|0|30785.529297|3|2|NC096|212:42:127
@@ -127,6 +131,7 @@
<h2>AUTHORS</h2>
-Martin Landa, Czech Technical University in Prague, Czech Republic
+Martin Landa, OSGeoREL, Czech Technical University in Prague, Czech Republic
-<p><i>Last changed: $Date$</i>
+<p>
+<i>Last changed: $Date$</i>
Modified: grass/branches/releasebranch_7_0/vector/v.colors/write_rgb.c
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.colors/write_rgb.c 2014-12-24 10:33:06 UTC (rev 63702)
+++ grass/branches/releasebranch_7_0/vector/v.colors/write_rgb.c 2014-12-24 10:42:58 UTC (rev 63703)
@@ -30,7 +30,7 @@
ctype = db_column_Ctype(driver, fi->table, column_name);
if (ctype == -1) {
- sprintf(buf, "ALTER TABLE %s ADD COLUMN %s VARCHAR(11)",
+ sprintf(buf, "ALTER TABLE \"%s\" ADD COLUMN \"%s\" VARCHAR(11)",
fi->table, column_name);
db_set_string(&stmt, buf);
if (db_execute_immediate(driver, &stmt) != DB_OK)
@@ -77,7 +77,7 @@
colors) == 0)
G_warning(_("No color value defined for category %d"), pval[i]);
- sprintf(buf, "UPDATE %s SET %s='%d:%d:%d' WHERE %s=%d", fi->table,
+ sprintf(buf, "UPDATE \"%s\" SET \"%s\"='%d:%d:%d' WHERE %s=%d", fi->table,
column_name, red, grn, blu, fi->key, pval[i]);
G_debug(3, "\tSQL: %s", buf);
More information about the grass-commit
mailing list