[GRASS-SVN] r46750 - in grass/trunk/raster: r.colors r.colors.out
svn_grass at osgeo.org
svn_grass at osgeo.org
Tue Jun 21 09:44:17 EDT 2011
Author: huhabla
Date: 2011-06-21 06:44:17 -0700 (Tue, 21 Jun 2011)
New Revision: 46750
Added:
grass/trunk/raster/r.colors/test.r.colors.sh
grass/trunk/raster/r.colors/test_elev_double_example1.ref
grass/trunk/raster/r.colors/test_elev_double_example1_hist.ref
grass/trunk/raster/r.colors/test_elev_double_example2.ref
grass/trunk/raster/r.colors/test_elev_double_example2_log.ref
grass/trunk/raster/r.colors/test_elev_double_example3.ref
grass/trunk/raster/r.colors/test_elev_double_example3_logabs.ref
grass/trunk/raster/r.colors/test_elev_double_example4.ref
grass/trunk/raster/r.colors/test_elev_double_example4_inv.ref
grass/trunk/raster/r.colors/test_elev_float_example1.ref
grass/trunk/raster/r.colors/test_elev_float_example1_hist.ref
grass/trunk/raster/r.colors/test_elev_float_example2.ref
grass/trunk/raster/r.colors/test_elev_float_example2_log.ref
grass/trunk/raster/r.colors/test_elev_float_example3.ref
grass/trunk/raster/r.colors/test_elev_float_example3_logabs.ref
grass/trunk/raster/r.colors/test_elev_float_example4.ref
grass/trunk/raster/r.colors/test_elev_float_example4_inv.ref
grass/trunk/raster/r.colors/test_elev_int_example1.ref
grass/trunk/raster/r.colors/test_elev_int_example1_hist.ref
grass/trunk/raster/r.colors/test_elev_int_example1_perc.ref
grass/trunk/raster/r.colors/test_elev_int_example2.ref
grass/trunk/raster/r.colors/test_elev_int_example2_log.ref
grass/trunk/raster/r.colors/test_elev_int_example2_perc.ref
grass/trunk/raster/r.colors/test_elev_int_example3.ref
grass/trunk/raster/r.colors/test_elev_int_example3_logabs.ref
grass/trunk/raster/r.colors/test_elev_int_example3_perc.ref
grass/trunk/raster/r.colors/test_elev_int_example4.ref
grass/trunk/raster/r.colors/test_elev_int_example4_inv.ref
grass/trunk/raster/r.colors/test_elev_int_example4_perc.ref
grass/trunk/raster/r.colors/test_volume_double_example1.ref
grass/trunk/raster/r.colors/test_volume_double_example2.ref
grass/trunk/raster/r.colors/test_volume_double_example2_log.ref
grass/trunk/raster/r.colors/test_volume_double_example3.ref
grass/trunk/raster/r.colors/test_volume_double_example3_logabs.ref
grass/trunk/raster/r.colors/test_volume_double_example4.ref
grass/trunk/raster/r.colors/test_volume_double_example4_inv.ref
grass/trunk/raster/r.colors/test_volume_double_example5.ref
Modified:
grass/trunk/raster/r.colors.out/main.c
grass/trunk/raster/r.colors/Makefile
grass/trunk/raster/r.colors/main.c
Log:
Added r3.color and r3.clors.out support to the sources of r.colors and r.colors.out. Several tests are implemented r/r3.colors and r/r3.colors.out. The Makefiles are still not modified to compile r3.colors or r3.colors.out.
Modified: grass/trunk/raster/r.colors/Makefile
===================================================================
--- grass/trunk/raster/r.colors/Makefile 2011-06-20 20:54:02 UTC (rev 46749)
+++ grass/trunk/raster/r.colors/Makefile 2011-06-21 13:44:17 UTC (rev 46750)
@@ -2,8 +2,8 @@
PGM = r.colors
-LIBES = $(RASTERLIB) $(GISLIB) $(MATHLIB)
-DEPENDENCIES = $(RASTERDEP) $(GISDEP)
+LIBES = $(RASTERLIB) $(GISLIB) $(MATHLIB) $(G3DLIB)
+DEPENDENCIES = $(RASTERDEP) $(GISDEP) $(G3DDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.colors/main.c
===================================================================
--- grass/trunk/raster/r.colors/main.c 2011-06-20 20:54:02 UTC (rev 46749)
+++ grass/trunk/raster/r.colors/main.c 2011-06-21 13:44:17 UTC (rev 46750)
@@ -23,6 +23,7 @@
#include <grass/raster.h>
#include <grass/glocale.h>
#include "local_proto.h"
+#include <grass/G3d.h>
static char **rules;
static int nrules;
@@ -147,31 +148,48 @@
int have_stats = 0;
struct FPRange range;
DCELL min, max;
- const char *name, *mapset;
- const char *style, *cmap, *cmapset;
- const char *rules;
+ const char *name = NULL, *mapset = NULL;
+ const char *style = NULL, *cmap = NULL, *cmapset = NULL;
+ const char *rules = NULL;
int fp;
struct GModule *module;
struct
{
- struct Flag *r, *w, *l, *g, *a, *e, *n;
+ struct Flag *r, *w, *l, *g, *a,*n;
+#ifndef USE_RASTER3D
+ struct Flag *e;
+#endif
} flag;
struct
{
- struct Option *map, *colr, *rast, *rules;
+ struct Option *map, *colr, *rast, *volume, *rules;
} opt;
-
-
+#ifdef USE_RASTER3D
+ const char *maptype = "raster3d";
+ const char *Maptype = "Raster3d";
+#else
+ const char *maptype = "raster";
+ const char *Maptype = "Raster";
+#endif
G_gisinit(argv[0]);
module = G_define_module();
+ G_add_keyword(_("raster3d"));
G_add_keyword(_("raster"));
G_add_keyword(_("color table"));
+#ifdef USE_RASTER3D
module->description =
+ _("Creates/modifies the color table associated with a raster3d map.");
+#else
+ module->description =
_("Creates/modifies the color table associated with a raster map.");
-
+#endif
+
+#ifdef USE_RASTER3D
+ opt.map = G_define_standard_option(G_OPT_R3_MAP);
+#else
opt.map = G_define_standard_option(G_OPT_R_MAP);
-
+#endif
scan_rules();
opt.colr = G_define_option();
@@ -191,6 +209,13 @@
_("Raster map from which to copy color table");
opt.rast->guisection = _("Define");
+ opt.volume = G_define_standard_option(G_OPT_R3_INPUT);
+ opt.volume->key = "volume";
+ opt.volume->required = NO;
+ opt.volume->description =
+ _("Raster3d map from which to copy color table");
+ opt.volume->guisection = _("Define");
+
opt.rules = G_define_standard_option(G_OPT_F_INPUT);
opt.rules->key = "rules";
opt.rules->required = NO;
@@ -229,10 +254,12 @@
flag.a->description = _("Logarithmic-absolute scaling");
flag.a->guisection = _("Define");
+#ifndef USE_RASTER3D
flag.e = G_define_flag();
flag.e->key = 'e';
flag.e->description = _("Histogram equalization");
flag.e->guisection = _("Define");
+#endif
if (G_parser(argc, argv))
exit(EXIT_FAILURE);
@@ -246,12 +273,22 @@
remove = flag.r->answer;
name = opt.map->answer;
+
+ if (!name)
+ G_fatal_error(_("No %s map specified"), maptype);
+
+ if(opt.rast->answer && opt.volume->answer)
+ G_fatal_error(_("\raster\" and \"volume\" options are mutually exclusive"));
+
style = opt.colr->answer;
- cmap = opt.rast->answer;
+
+ if(opt.rast->answer)
+ cmap = opt.rast->answer;
+ if(opt.volume->answer)
+ cmap = opt.volume->answer;
+
rules = opt.rules->answer;
- if (!name)
- G_fatal_error(_("No raster map specified"));
if (!cmap && !style && !rules && !remove)
G_fatal_error(_("One of \"-r\" or options \"color\", \"raster\" or \"rules\" must be specified!"));
@@ -265,23 +302,33 @@
is_from_stdin = rules && strcmp(rules, "-") == 0;
if (is_from_stdin)
rules = NULL;
-
+#ifdef USE_RASTER3D
+ mapset = G_find_grid3(name, "");
+#else
mapset = G_find_raster2(name, "");
+#endif
if (mapset == NULL)
- G_fatal_error(_("Raster map <%s> not found"), name);
-
+ G_fatal_error(_("%s map <%s> not found"), Maptype, name);
+
if (remove) {
+#ifdef USE_RASTER3D
+ int stat = G3d_removeColor(name);
+#else
int stat = Rast_remove_colors(name, mapset);
-
+#endif
if (stat < 0)
- G_fatal_error(_("Unable to remove color table of raster map <%s>"), name);
+ G_fatal_error(_("Unable to remove color table of %s map <%s>"), maptype, name);
if (stat == 0)
- G_warning(_("Color table of raster map <%s> not found"), name);
+ G_warning(_("Color table of %s map <%s> not found"), maptype, name);
return EXIT_SUCCESS;
}
G_suppress_warnings(1);
+#ifdef USE_RASTER3D
+ have_colors = G3d_readColors(name, mapset, &colors);
+#else
have_colors = Rast_read_colors(name, mapset, &colors);
+#endif
/*
if (have_colors >= 0)
Rast_free_colors(&colors);
@@ -294,8 +341,13 @@
G_suppress_warnings(0);
+#ifdef USE_RASTER3D
+ fp = 1; /* g3d maps are always floating point */
+ G3d_readRange(name, mapset, &range);
+#else
fp = Rast_map_is_fp(name, mapset);
Rast_read_fp_range(name, mapset, &range);
+#endif
Rast_get_fp_range_min_max(&range, &min, &max);
if (is_from_stdin) {
@@ -308,19 +360,19 @@
*/
if (strcmp(style, "random") == 0) {
if (fp)
- G_fatal_error(_("Color table 'random' is not supported for floating point raster map"));
+ G_fatal_error(_("Color table 'random' is not supported for floating point %s map"), maptype);
Rast_make_random_colors(&colors, (CELL) min, (CELL) max);
}
else if (strcmp(style, "grey.eq") == 0) {
if (fp)
- G_fatal_error(_("Color table 'grey.eq' is not supported for floating point raster map"));
+ G_fatal_error(_("Color table 'grey.eq' is not supported for floating point %s map"), maptype);
if (!have_stats)
have_stats = get_stats(name, mapset, &statf);
Rast_make_histogram_eq_colors(&colors, &statf);
}
else if (strcmp(style, "grey.log") == 0) {
if (fp)
- G_fatal_error(_("Color table 'grey.log' is not supported for floating point raster map"));
+ G_fatal_error(_("Color table 'grey.log' is not supported for floating point %s map"), maptype);
if (!have_stats)
have_stats = get_stats(name, mapset, &statf);
Rast_make_histogram_log_colors(&colors, &statf, (CELL) min,
@@ -345,12 +397,21 @@
}
else {
/* use color from another map (cmap) */
- cmapset = G_find_raster2(cmap, "");
- if (cmapset == NULL)
- G_fatal_error(_("Raster map <%s> not found"), cmap);
+ if(opt.rast->answer) {
+ cmapset = G_find_raster2(cmap, "");
+ if (cmapset == NULL)
+ G_fatal_error(_("Raster map <%s> not found"), cmap);
- if (Rast_read_colors(cmap, cmapset, &colors) < 0)
- G_fatal_error(_("Unable to read color table for raster map <%s>"), cmap);
+ if (Rast_read_colors(cmap, cmapset, &colors) < 0)
+ G_fatal_error(_("Unable to read color table for raster map <%s>"), cmap);
+ } else {
+ cmapset = G_find_grid3(cmap, "");
+ if (cmapset == NULL)
+ G_fatal_error(_("Raster3d map <%s> not found"), cmap);
+
+ if (G3d_readColors(cmap, cmapset, &colors) < 0)
+ G_fatal_error(_("Unable to read color table for raster3d map <%s>"), cmap);
+ }
}
if (fp)
@@ -359,6 +420,8 @@
if (flag.n->answer)
Rast_invert_colors(&colors);
+ /* This is not avilable for raster3d maps yet */
+#ifndef USE_RASTER3D
if (flag.e->answer) {
if (fp) {
struct FP_stats fpstats;
@@ -372,7 +435,8 @@
}
colors = colors_tmp;
}
-
+#endif
+
if (flag.g->answer) {
Rast_log_colors(&colors_tmp, &colors, 100);
colors = colors_tmp;
@@ -385,9 +449,12 @@
if (fp)
Rast_mark_colors_as_fp(&colors);
-
+#ifdef USE_RASTER3D
+ G3d_writeColors(name, mapset, &colors);
+#else
Rast_write_colors(name, mapset, &colors);
- G_message(_("Color table for raster map <%s> set to '%s'"), name,
+#endif
+ G_message(_("Color table for %s map <%s> set to '%s'"), maptype, name,
is_from_stdin ? "rules" : style ? style : rules ? rules :
cmap);
Added: grass/trunk/raster/r.colors/test.r.colors.sh
===================================================================
--- grass/trunk/raster/r.colors/test.r.colors.sh (rev 0)
+++ grass/trunk/raster/r.colors/test.r.colors.sh 2011-06-21 13:44:17 UTC (rev 46750)
@@ -0,0 +1,60 @@
+# This script tests r.colors and r.colors.out as well
+# as r3.colors and r3.colors.out
+# Color rules are set with r/r3.colors and exported using r/r3.colors.out
+
+# We specific a small region in the
+# @preprocess step and generate
+# raster data with r.mapcalc
+# The region setting should work for UTM and LL test locations
+g.region s=0 n=90 w=0 e=100 b=0 t=50 res=10 res3=10 -p3
+# To test r.colors, we need several maps of different types
+r.mapcalc --o expr="test_elev_int = int(if(row() == 2, null(), row()))"
+r.mapcalc --o expr="test_elev_double = double(if(row() == 2, null(), row() + 0.5))"
+r.mapcalc --o expr="test_elev_float = float(if(row() == 2, null(), row() + 0.5))"
+# Create the volumes
+r3.mapcalc --o expr="volume_double = double(col() + row() + depth())"
+r3.mapcalc --o expr="volume_double_null = if(row() == 1 || row() == 5, null(), volume_double)"
+
+# First we @test the integer maps
+# We use the examples to test the import, export and setting of color tables with differrent options
+# the vaidation is based on raster map colur rules @files reference files created with r.colors.out
+r.colors map=test_elev_int rules=example1 && r.colors.out --o map=test_elev_int rules=test_elev_int_example1.txt
+r.colors -e map=test_elev_int rules=example1 && r.colors.out --o map=test_elev_int rules=test_elev_int_example1_hist.txt
+r.colors map=test_elev_int rules=example2 && r.colors.out --o map=test_elev_int rules=test_elev_int_example2.txt
+r.colors -g map=test_elev_int rules=example2 && r.colors.out --o map=test_elev_int rules=test_elev_int_example2_log.txt
+r.colors map=test_elev_int rules=example3 && r.colors.out --o map=test_elev_int rules=test_elev_int_example3.txt
+r.colors -a map=test_elev_int rules=example3 && r.colors.out --o map=test_elev_int rules=test_elev_int_example3_logabs.txt
+r.colors map=test_elev_int rules=example4 && r.colors.out --o map=test_elev_int rules=test_elev_int_example4.txt
+r.colors -n map=test_elev_int rast=test_elev_int && r.colors.out --o map=test_elev_int rules=test_elev_int_example4_inv.txt
+# test the percentage output
+r.colors map=test_elev_int rules=example1 && r.colors.out --o -p map=test_elev_int rules=test_elev_int_example1_perc.txt
+r.colors map=test_elev_int rules=example2 && r.colors.out --o -p map=test_elev_int rules=test_elev_int_example2_perc.txt
+r.colors map=test_elev_int rules=example3 && r.colors.out --o -p map=test_elev_int rules=test_elev_int_example3_perc.txt
+r.colors map=test_elev_int rules=example4 && r.colors.out --o -p map=test_elev_int rules=test_elev_int_example4_perc.txt
+# float maps
+r.colors map=test_elev_float rules=example1 && r.colors.out --o map=test_elev_float rules=test_elev_float_example1.txt
+r.colors -e map=test_elev_float rules=example1 && r.colors.out --o map=test_elev_float rules=test_elev_float_example1_hist.txt
+r.colors map=test_elev_float rules=example2 && r.colors.out --o map=test_elev_float rules=test_elev_float_example2.txt
+r.colors -g map=test_elev_float rules=example2 && r.colors.out --o map=test_elev_float rules=test_elev_float_example2_log.txt
+r.colors map=test_elev_float rules=example3 && r.colors.out --o map=test_elev_float rules=test_elev_float_example3.txt
+r.colors -a map=test_elev_float rules=example3 && r.colors.out --o map=test_elev_float rules=test_elev_float_example3_logabs.txt
+r.colors map=test_elev_float rules=example4 && r.colors.out --o map=test_elev_float rules=test_elev_float_example4.txt
+r.colors -n map=test_elev_float rast=test_elev_float && r.colors.out --o map=test_elev_float rules=test_elev_float_example4_inv.txt
+# double maps
+r.colors map=test_elev_double rules=example1 && r.colors.out --o map=test_elev_double rules=test_elev_double_example1.txt
+r.colors -e map=test_elev_double rules=example1 && r.colors.out --o map=test_elev_double rules=test_elev_double_example1_hist.txt
+r.colors map=test_elev_double rules=example2 && r.colors.out --o map=test_elev_double rules=test_elev_double_example2.txt
+r.colors -g map=test_elev_double rules=example2 && r.colors.out --o map=test_elev_double rules=test_elev_double_example2_log.txt
+r.colors map=test_elev_double rules=example3 && r.colors.out --o map=test_elev_double rules=test_elev_double_example3.txt
+r.colors -a map=test_elev_double rules=example3 && r.colors.out --o map=test_elev_double rules=test_elev_double_example3_logabs.txt
+r.colors map=test_elev_double rules=example4 && r.colors.out --o map=test_elev_double rules=test_elev_double_example4.txt
+r.colors -n map=test_elev_double rast=test_elev_double && r.colors.out --o map=test_elev_double rules=test_elev_double_example4_inv.txt
+# The volume maps using r3.colors and r3.colors.out
+r3.colors map=volume_double_null rules=example1 && r3.colors.out --o map=volume_double_null rules=test_volume_double_example1.txt
+r3.colors map=volume_double_null rules=example2 && r3.colors.out --o map=volume_double_null rules=test_volume_double_example2.txt
+r3.colors -g map=volume_double_null rules=example2 && r3.colors.out --o map=volume_double_null rules=test_volume_double_example2_log.txt
+r3.colors map=volume_double_null rules=example3 && r3.colors.out --o map=volume_double_null rules=test_volume_double_example3.txt
+r3.colors -a map=volume_double_null rules=example3 && r3.colors.out --o map=volume_double_null rules=test_volume_double_example3_logabs.txt
+r3.colors map=volume_double_null rules=example4 && r3.colors.out --o map=volume_double_null rules=test_volume_double_example4.txt
+r3.colors -n map=volume_double_null volume=volume_double_null && r3.colors.out --o map=volume_double_null rules=test_volume_double_example4_inv.txt
+r3.colors map=volume_double_null raster=test_elev_double && r3.colors.out --o map=volume_double_null rules=test_volume_double_example5.ref
\ No newline at end of file
Added: grass/trunk/raster/r.colors/test_elev_double_example1.ref
===================================================================
--- grass/trunk/raster/r.colors/test_elev_double_example1.ref (rev 0)
+++ grass/trunk/raster/r.colors/test_elev_double_example1.ref 2011-06-21 13:44:17 UTC (rev 46750)
@@ -0,0 +1,9 @@
+1.5 0:230:0
+3.1 0:160:0
+4.3 50:130:0
+5.9 120:100:30
+7.5 120:130:40
+8.7 170:160:50
+9.5 255:255:150
+nv 255:255:255
+default 255:255:255
Added: grass/trunk/raster/r.colors/test_elev_double_example1_hist.ref
===================================================================
--- grass/trunk/raster/r.colors/test_elev_double_example1_hist.ref (rev 0)
+++ grass/trunk/raster/r.colors/test_elev_double_example1_hist.ref 2011-06-21 13:44:17 UTC (rev 46750)
@@ -0,0 +1,11 @@
+1.5 0:230:0
+1.508 0:187:0
+3.508 16:150:0
+4.508 58:127:3
+5.508 102:108:22
+6.508 120:111:33
+7.508 120:129:40
+8.508 161:155:48
+9.5 161:155:48
+nv 255:255:255
+default 255:255:255
Added: grass/trunk/raster/r.colors/test_elev_double_example2.ref
===================================================================
--- grass/trunk/raster/r.colors/test_elev_double_example2.ref (rev 0)
+++ grass/trunk/raster/r.colors/test_elev_double_example2.ref 2011-06-21 13:44:17 UTC (rev 46750)
@@ -0,0 +1,5 @@
+1.5 128:255:0
+5.5 255:0:128
+9.5 0:128:255
+nv 255:255:255
+default 255:255:255
Added: grass/trunk/raster/r.colors/test_elev_double_example2_log.ref
===================================================================
--- grass/trunk/raster/r.colors/test_elev_double_example2_log.ref (rev 0)
+++ grass/trunk/raster/r.colors/test_elev_double_example2_log.ref 2011-06-21 13:44:17 UTC (rev 46750)
@@ -0,0 +1,103 @@
+1.5 128:255:0
+1.52794 130:250:2
+1.55641 133:245:5
+1.58541 135:240:7
+1.61494 138:235:10
+1.64503 140:230:12
+1.67567 143:225:15
+1.70689 145:220:17
+1.73869 148:215:20
+1.77108 150:210:23
+1.80407 153:205:25
+1.83768 155:199:28
+1.87192 158:194:30
+1.90679 161:189:33
+1.94232 163:184:35
+1.9785 166:179:38
+2.01536 168:174:40
+2.0529 171:169:43
+2.09115 173:164:46
+2.13011 176:159:48
+2.16979 178:153:51
+2.21021 181:148:53
+2.25139 183:143:56
+2.29333 186:138:58
+2.33605 188:133:61
+2.37957 191:128:64
+2.42391 194:123:66
+2.46906 196:118:69
+2.51506 199:113:71
+2.56191 201:108:74
+2.60964 204:102:76
+2.65826 206:97:79
+2.70778 209:92:81
+2.75823 211:87:84
+2.80961 214:82:87
+2.86195 216:77:89
+2.91527 219:72:92
+2.96958 221:67:94
+3.0249 224:62:97
+3.08126 227:57:99
+3.13866 229:51:102
+3.19713 232:46:104
+3.25669 234:41:107
+3.31736 237:36:110
+3.37917 239:31:112
+3.44212 242:26:115
+3.50624 244:21:117
+3.57156 247:16:120
+3.6381 249:11:122
+3.70588 252:6:125
+3.77492 255:0:128
+3.84524 250:2:130
+3.91688 245:5:133
+3.98985 240:7:135
+4.06418 235:10:138
+4.13989 230:12:140
+4.21702 225:15:143
+4.29558 220:17:145
+4.3756 215:20:148
+4.45712 210:23:150
+4.54015 205:25:153
+4.62474 199:28:155
+4.71089 194:30:158
+4.79866 189:33:161
+4.88805 184:35:163
+4.97912 179:38:166
+5.07188 174:40:168
+5.16636 169:43:171
+5.26261 164:46:173
+5.36065 159:48:176
+5.46052 154:51:178
+5.56225 148:53:181
+5.66587 143:56:183
+5.77142 138:58:186
+5.87894 133:61:188
+5.98847 128:64:191
+6.10003 123:66:194
+6.21367 118:69:196
+6.32943 113:71:199
+6.44734 108:74:201
+6.56746 102:76:204
+6.68981 97:79:206
+6.81443 92:81:209
+6.94138 87:84:211
+7.0707 82:87:214
+7.20243 77:89:216
+7.3366 72:92:219
+7.47328 67:94:221
+7.61251 62:97:224
+7.75433 57:99:227
+7.89879 52:102:229
+8.04594 46:104:232
+8.19583 41:107:234
+8.34852 36:110:237
+8.50405 31:112:239
+8.66247 26:115:242
+8.82385 21:117:244
+8.98824 16:120:247
+9.15569 11:122:249
+9.32625 6:125:252
+9.5 0:128:255
+nv 255:255:255
+default 255:255:255
Added: grass/trunk/raster/r.colors/test_elev_double_example3.ref
===================================================================
--- grass/trunk/raster/r.colors/test_elev_double_example3.ref (rev 0)
+++ grass/trunk/raster/r.colors/test_elev_double_example3.ref 2011-06-21 13:44:17 UTC (rev 46750)
@@ -0,0 +1,9 @@
+1.5 0:230:0
+2.3 0:160:0
+2.86 50:130:0
+3.66 120:100:30
+4.46 120:130:40
+5.9 170:160:50
+7.1 255:255:150
+nv 255:255:255
+default 255:255:255
Added: grass/trunk/raster/r.colors/test_elev_double_example3_logabs.ref
===================================================================
--- grass/trunk/raster/r.colors/test_elev_double_example3_logabs.ref (rev 0)
+++ grass/trunk/raster/r.colors/test_elev_double_example3_logabs.ref 2011-06-21 13:44:17 UTC (rev 46750)
@@ -0,0 +1,382 @@
+1 0:230:0
+1.02114 0:226:0
+-1.02114 0:226:0
+-1 0:230:0
+1.02114 0:226:0
+1.04272 0:221:0
+-1.04272 0:221:0
+-1.02114 0:226:0
+1.04272 0:221:0
+1.06477 0:216:0
+-1.06477 0:216:0
+-1.04272 0:221:0
+1.06477 0:216:0
+1.08727 0:211:0
+-1.08727 0:211:0
+-1.06477 0:216:0
+1.08727 0:211:0
+1.11026 0:206:0
+-1.11026 0:206:0
+-1.08727 0:211:0
+1.11026 0:206:0
+1.13373 0:201:0
+-1.13373 0:201:0
+-1.11026 0:206:0
+1.13373 0:201:0
+1.15769 0:196:0
+-1.15769 0:196:0
+-1.13373 0:201:0
+1.15769 0:196:0
+1.18217 0:191:0
+-1.18217 0:191:0
+-1.15769 0:196:0
+1.18217 0:191:0
+1.20716 0:186:0
+-1.20716 0:186:0
+-1.18217 0:191:0
+1.20716 0:186:0
+1.23267 0:181:0
+-1.23267 0:181:0
+-1.20716 0:186:0
+1.23267 0:181:0
+1.25873 0:177:0
+-1.25873 0:177:0
+-1.23267 0:181:0
+1.25873 0:177:0
+1.28534 0:172:0
+-1.28534 0:172:0
+-1.25873 0:177:0
+1.28534 0:172:0
+1.31251 0:167:0
+-1.31251 0:167:0
+-1.28534 0:172:0
+1.31251 0:167:0
+1.34026 0:162:0
+-1.34026 0:162:0
+-1.31251 0:167:0
+1.34026 0:162:0
+1.36859 3:158:0
+-1.36859 3:158:0
+-1.34026 0:162:0
+1.36859 3:158:0
+1.39752 8:155:0
+-1.39752 8:155:0
+-1.36859 3:158:0
+1.39752 8:155:0
+1.42706 13:152:0
+-1.42706 13:152:0
+-1.39752 8:155:0
+1.42706 13:152:0
+1.45723 18:149:0
+-1.45723 18:149:0
+-1.42706 13:152:0
+1.45723 18:149:0
+1.48803 23:146:0
+-1.48803 23:146:0
+-1.45723 18:149:0
+1.48803 23:146:0
+1.51949 28:143:0
+-1.51949 28:143:0
+-1.48803 23:146:0
+1.51949 28:143:0
+1.55161 33:140:0
+-1.55161 33:140:0
+-1.51949 28:143:0
+1.55161 33:140:0
+1.58441 38:137:0
+-1.58441 38:137:0
+-1.55161 33:140:0
+1.58441 38:137:0
+1.6179 43:134:0
+-1.6179 43:134:0
+-1.58441 38:137:0
+1.6179 43:134:0
+1.6521 48:131:0
+-1.6521 48:131:0
+-1.6179 43:134:0
+1.6521 48:131:0
+1.68702 53:129:1
+-1.68702 53:129:1
+-1.6521 48:131:0
+1.68702 53:129:1
+1.72269 58:127:3
+-1.72269 58:127:3
+-1.68702 53:129:1
+1.72269 58:127:3
+1.7591 63:125:5
+-1.7591 63:125:5
+-1.72269 58:127:3
+1.7591 63:125:5
+1.79629 68:123:7
+-1.79629 68:123:7
+-1.7591 63:125:5
+1.79629 68:123:7
+1.83426 73:121:9
+-1.83426 73:121:9
+-1.79629 68:123:7
+1.83426 73:121:9
+1.87303 77:119:11
+-1.87303 77:119:11
+-1.83426 73:121:9
+1.87303 77:119:11
+1.91263 82:116:14
+-1.91263 82:116:14
+-1.87303 77:119:11
+1.91263 82:116:14
+1.95306 87:114:16
+-1.95306 87:114:16
+-1.91263 82:116:14
+1.95306 87:114:16
+1.99434 92:112:18
+-1.99434 92:112:18
+-1.95306 87:114:16
+1.99434 92:112:18
+2.0365 97:110:20
+-2.0365 97:110:20
+-1.99434 92:112:18
+2.0365 97:110:20
+2.07955 102:108:22
+-2.07955 102:108:22
+-2.0365 97:110:20
+2.07955 102:108:22
+2.12351 107:106:24
+-2.12351 107:106:24
+-2.07955 102:108:22
+2.12351 107:106:24
+2.1684 112:104:26
+-2.1684 112:104:26
+-2.12351 107:106:24
+2.1684 112:104:26
+2.21424 117:102:28
+-2.21424 117:102:28
+-2.1684 112:104:26
+2.21424 117:102:28
+2.26104 120:100:30
+-2.26104 120:100:30
+-2.21424 117:102:28
+2.26104 120:100:30
+2.30884 120:103:31
+-2.30884 120:103:31
+-2.26104 120:100:30
+2.30884 120:103:31
+2.35765 120:105:31
+-2.35765 120:105:31
+-2.30884 120:103:31
+2.35765 120:105:31
+2.40749 120:107:32
+-2.40749 120:107:32
+-2.35765 120:105:31
+2.40749 120:107:32
+2.45838 120:109:33
+-2.45838 120:109:33
+-2.40749 120:107:32
+2.45838 120:109:33
+2.51034 120:111:33
+-2.51034 120:111:33
+-2.45838 120:109:33
+2.51034 120:111:33
+2.56341 120:113:34
+-2.56341 120:113:34
+-2.51034 120:111:33
+2.56341 120:113:34
+2.6176 120:115:35
+-2.6176 120:115:35
+-2.56341 120:113:34
+2.6176 120:115:35
+2.67293 120:117:35
+-2.67293 120:117:35
+-2.6176 120:115:35
+2.67293 120:117:35
+2.72944 120:119:36
+-2.72944 120:119:36
+-2.67293 120:117:35
+2.72944 120:119:36
+2.78713 120:121:37
+-2.78713 120:121:37
+-2.72944 120:119:36
+2.78713 120:121:37
+2.84605 120:123:37
+-2.84605 120:123:37
+-2.78713 120:121:37
+2.84605 120:123:37
+2.90621 120:126:38
+-2.90621 120:126:38
+-2.84605 120:123:37
+2.90621 120:126:38
+2.96765 120:128:39
+-2.96765 120:128:39
+-2.90621 120:126:38
+2.96765 120:128:39
+3.03038 120:130:40
+-3.03038 120:130:40
+-2.96765 120:128:39
+3.03038 120:130:40
+3.09444 122:131:40
+-3.09444 122:131:40
+-3.03038 120:130:40
+3.09444 122:131:40
+3.15985 124:132:40
+-3.15985 124:132:40
+-3.09444 122:131:40
+3.15985 124:132:40
+3.22665 126:133:41
+-3.22665 126:133:41
+-3.15985 124:132:40
+3.22665 126:133:41
+3.29486 128:134:41
+-3.29486 128:134:41
+-3.22665 126:133:41
+3.29486 128:134:41
+3.36451 129:135:41
+-3.36451 129:135:41
+-3.29486 128:134:41
+3.36451 129:135:41
+3.43563 131:137:42
+-3.43563 131:137:42
+-3.36451 129:135:41
+3.43563 131:137:42
+3.50825 133:138:42
+-3.50825 133:138:42
+-3.43563 131:137:42
+3.50825 133:138:42
+3.58241 135:139:43
+-3.58241 135:139:43
+-3.50825 133:138:42
+3.58241 135:139:43
+3.65814 137:140:43
+-3.65814 137:140:43
+-3.58241 135:139:43
+3.65814 137:140:43
+3.73547 139:141:43
+-3.73547 139:141:43
+-3.65814 137:140:43
+3.73547 139:141:43
+3.81444 141:142:44
+-3.81444 141:142:44
+-3.73547 139:141:43
+3.81444 141:142:44
+3.89507 143:144:44
+-3.89507 143:144:44
+-3.81444 141:142:44
+3.89507 143:144:44
+3.97741 145:145:45
+-3.97741 145:145:45
+-3.89507 143:144:44
+3.97741 145:145:45
+4.06149 147:146:45
+-4.06149 147:146:45
+-3.97741 145:145:45
+4.06149 147:146:45
+4.14734 149:147:45
+-4.14734 149:147:45
+-4.06149 147:146:45
+4.14734 149:147:45
+4.23501 151:148:46
+-4.23501 151:148:46
+-4.14734 149:147:45
+4.23501 151:148:46
+4.32454 153:149:46
+-4.32454 153:149:46
+-4.23501 151:148:46
+4.32454 153:149:46
+4.41595 155:151:47
+-4.41595 155:151:47
+-4.32454 153:149:46
+4.41595 155:151:47
+4.5093 157:152:47
+-4.5093 157:152:47
+-4.41595 155:151:47
+4.5093 157:152:47
+4.60462 159:153:47
+-4.60462 159:153:47
+-4.5093 157:152:47
+4.60462 159:153:47
+4.70196 161:154:48
+-4.70196 161:154:48
+-4.60462 159:153:47
+4.70196 161:154:48
+4.80135 163:155:48
+-4.80135 163:155:48
+-4.70196 161:154:48
+4.80135 163:155:48
+4.90285 164:156:48
+-4.90285 164:156:48
+-4.80135 163:155:48
+4.90285 164:156:48
+5.00649 166:158:49
+-5.00649 166:158:49
+-4.90285 164:156:48
+5.00649 166:158:49
+5.11232 168:159:49
+-5.11232 168:159:49
+-5.00649 166:158:49
+5.11232 168:159:49
+5.22039 171:161:51
+-5.22039 171:161:51
+-5.11232 168:159:49
+5.22039 171:161:51
+5.33075 175:166:56
+-5.33075 175:166:56
+-5.22039 171:161:51
+5.33075 175:166:56
+5.44343 179:170:61
+-5.44343 179:170:61
+-5.33075 175:166:56
+5.44343 179:170:61
+5.5585 183:175:65
+-5.5585 183:175:65
+-5.44343 179:170:61
+5.5585 183:175:65
+5.676 187:179:70
+-5.676 187:179:70
+-5.5585 183:175:65
+5.676 187:179:70
+5.79599 191:184:75
+-5.79599 191:184:75
+-5.676 187:179:70
+5.79599 191:184:75
+5.91851 195:188:79
+-5.91851 195:188:79
+-5.79599 191:184:75
+5.91851 195:188:79
+6.04362 199:192:84
+-6.04362 199:192:84
+-5.91851 195:188:79
+6.04362 199:192:84
+6.17138 203:197:89
+-6.17138 203:197:89
+-6.04362 199:192:84
+6.17138 203:197:89
+6.30183 207:201:93
+-6.30183 207:201:93
+-6.17138 203:197:89
+6.30183 207:201:93
+6.43505 211:206:98
+-6.43505 211:206:98
+-6.30183 207:201:93
+6.43505 211:206:98
+6.57108 215:210:103
+-6.57108 215:210:103
+-6.43505 211:206:98
+6.57108 215:210:103
+6.70998 219:215:108
+-6.70998 219:215:108
+-6.57108 215:210:103
+6.70998 219:215:108
+6.85182 223:219:112
+-6.85182 223:219:112
+-6.70998 219:215:108
+6.85182 223:219:112
+6.99666 227:223:117
+-6.99666 227:223:117
+-6.85182 223:219:112
+6.99666 227:223:117
+7.14457 231:228:121
+-7.14457 231:228:121
+-6.99666 227:223:117
+7.1 255:255:150
+7.93232 251:250:145
+-7.93232 251:250:145
+-7.1 255:255:150
+nv 255:255:255
+default 255:255:255
Added: grass/trunk/raster/r.colors/test_elev_double_example4.ref
===================================================================
--- grass/trunk/raster/r.colors/test_elev_double_example4.ref (rev 0)
+++ grass/trunk/raster/r.colors/test_elev_double_example4.ref 2011-06-21 13:44:17 UTC (rev 46750)
@@ -0,0 +1,11 @@
+1 0:0:0
+2 255:255:0
+3 255:127:0
+4 255:0:0
+5 255:0:255
+6 0:127:255
+7 0:255:255
+8 0:255:0
+9 0:0:0
+nv 255:255:255
+default 255:255:255
Added: grass/trunk/raster/r.colors/test_elev_double_example4_inv.ref
===================================================================
--- grass/trunk/raster/r.colors/test_elev_double_example4_inv.ref (rev 0)
+++ grass/trunk/raster/r.colors/test_elev_double_example4_inv.ref 2011-06-21 13:44:17 UTC (rev 46750)
@@ -0,0 +1,11 @@
+1 0:0:0
+2 255:255:0
+3 255:127:0
+4 255:0:0
+5 255:0:255
+6 0:127:255
+7 0:255:255
+8 0:255:0
+9 0:0:0
+nv 255:255:255
+default 255:255:255
Added: grass/trunk/raster/r.colors/test_elev_float_example1.ref
===================================================================
--- grass/trunk/raster/r.colors/test_elev_float_example1.ref (rev 0)
+++ grass/trunk/raster/r.colors/test_elev_float_example1.ref 2011-06-21 13:44:17 UTC (rev 46750)
@@ -0,0 +1,9 @@
+1.5 0:230:0
+3.1 0:160:0
+4.3 50:130:0
+5.9 120:100:30
+7.5 120:130:40
+8.7 170:160:50
+9.5 255:255:150
+nv 255:255:255
+default 255:255:255
Added: grass/trunk/raster/r.colors/test_elev_float_example1_hist.ref
===================================================================
--- grass/trunk/raster/r.colors/test_elev_float_example1_hist.ref (rev 0)
+++ grass/trunk/raster/r.colors/test_elev_float_example1_hist.ref 2011-06-21 13:44:17 UTC (rev 46750)
@@ -0,0 +1,11 @@
+1.5 0:230:0
+1.508 0:187:0
+3.508 16:150:0
+4.508 58:127:3
+5.508 102:108:22
+6.508 120:111:33
+7.508 120:129:40
+8.508 161:155:48
+9.5 161:155:48
+nv 255:255:255
+default 255:255:255
Added: grass/trunk/raster/r.colors/test_elev_float_example2.ref
===================================================================
--- grass/trunk/raster/r.colors/test_elev_float_example2.ref (rev 0)
+++ grass/trunk/raster/r.colors/test_elev_float_example2.ref 2011-06-21 13:44:17 UTC (rev 46750)
@@ -0,0 +1,5 @@
+1.5 128:255:0
+5.5 255:0:128
+9.5 0:128:255
+nv 255:255:255
+default 255:255:255
Added: grass/trunk/raster/r.colors/test_elev_float_example2_log.ref
===================================================================
--- grass/trunk/raster/r.colors/test_elev_float_example2_log.ref (rev 0)
+++ grass/trunk/raster/r.colors/test_elev_float_example2_log.ref 2011-06-21 13:44:17 UTC (rev 46750)
@@ -0,0 +1,103 @@
+1.5 128:255:0
+1.52794 130:250:2
+1.55641 133:245:5
+1.58541 135:240:7
+1.61494 138:235:10
+1.64503 140:230:12
+1.67567 143:225:15
+1.70689 145:220:17
+1.73869 148:215:20
+1.77108 150:210:23
+1.80407 153:205:25
+1.83768 155:199:28
+1.87192 158:194:30
+1.90679 161:189:33
+1.94232 163:184:35
+1.9785 166:179:38
+2.01536 168:174:40
+2.0529 171:169:43
+2.09115 173:164:46
+2.13011 176:159:48
+2.16979 178:153:51
+2.21021 181:148:53
+2.25139 183:143:56
+2.29333 186:138:58
+2.33605 188:133:61
+2.37957 191:128:64
+2.42391 194:123:66
+2.46906 196:118:69
+2.51506 199:113:71
+2.56191 201:108:74
+2.60964 204:102:76
+2.65826 206:97:79
+2.70778 209:92:81
+2.75823 211:87:84
+2.80961 214:82:87
+2.86195 216:77:89
+2.91527 219:72:92
+2.96958 221:67:94
+3.0249 224:62:97
+3.08126 227:57:99
+3.13866 229:51:102
+3.19713 232:46:104
+3.25669 234:41:107
+3.31736 237:36:110
+3.37917 239:31:112
+3.44212 242:26:115
+3.50624 244:21:117
+3.57156 247:16:120
+3.6381 249:11:122
+3.70588 252:6:125
+3.77492 255:0:128
+3.84524 250:2:130
+3.91688 245:5:133
+3.98985 240:7:135
+4.06418 235:10:138
+4.13989 230:12:140
+4.21702 225:15:143
+4.29558 220:17:145
+4.3756 215:20:148
+4.45712 210:23:150
+4.54015 205:25:153
+4.62474 199:28:155
+4.71089 194:30:158
+4.79866 189:33:161
+4.88805 184:35:163
+4.97912 179:38:166
+5.07188 174:40:168
+5.16636 169:43:171
+5.26261 164:46:173
+5.36065 159:48:176
+5.46052 154:51:178
+5.56225 148:53:181
+5.66587 143:56:183
+5.77142 138:58:186
+5.87894 133:61:188
+5.98847 128:64:191
+6.10003 123:66:194
+6.21367 118:69:196
+6.32943 113:71:199
+6.44734 108:74:201
+6.56746 102:76:204
+6.68981 97:79:206
+6.81443 92:81:209
+6.94138 87:84:211
+7.0707 82:87:214
+7.20243 77:89:216
+7.3366 72:92:219
+7.47328 67:94:221
+7.61251 62:97:224
+7.75433 57:99:227
+7.89879 52:102:229
+8.04594 46:104:232
+8.19583 41:107:234
+8.34852 36:110:237
+8.50405 31:112:239
+8.66247 26:115:242
+8.82385 21:117:244
+8.98824 16:120:247
+9.15569 11:122:249
+9.32625 6:125:252
+9.5 0:128:255
+nv 255:255:255
+default 255:255:255
Added: grass/trunk/raster/r.colors/test_elev_float_example3.ref
===================================================================
--- grass/trunk/raster/r.colors/test_elev_float_example3.ref (rev 0)
+++ grass/trunk/raster/r.colors/test_elev_float_example3.ref 2011-06-21 13:44:17 UTC (rev 46750)
@@ -0,0 +1,9 @@
+1.5 0:230:0
+2.3 0:160:0
+2.86 50:130:0
+3.66 120:100:30
+4.46 120:130:40
+5.9 170:160:50
+7.1 255:255:150
+nv 255:255:255
+default 255:255:255
Added: grass/trunk/raster/r.colors/test_elev_float_example3_logabs.ref
===================================================================
--- grass/trunk/raster/r.colors/test_elev_float_example3_logabs.ref (rev 0)
+++ grass/trunk/raster/r.colors/test_elev_float_example3_logabs.ref 2011-06-21 13:44:17 UTC (rev 46750)
@@ -0,0 +1,382 @@
+1 0:230:0
+1.02114 0:226:0
+-1.02114 0:226:0
+-1 0:230:0
+1.02114 0:226:0
+1.04272 0:221:0
+-1.04272 0:221:0
+-1.02114 0:226:0
+1.04272 0:221:0
+1.06477 0:216:0
+-1.06477 0:216:0
+-1.04272 0:221:0
+1.06477 0:216:0
+1.08727 0:211:0
+-1.08727 0:211:0
+-1.06477 0:216:0
+1.08727 0:211:0
+1.11026 0:206:0
+-1.11026 0:206:0
+-1.08727 0:211:0
+1.11026 0:206:0
+1.13373 0:201:0
+-1.13373 0:201:0
+-1.11026 0:206:0
+1.13373 0:201:0
+1.15769 0:196:0
+-1.15769 0:196:0
+-1.13373 0:201:0
+1.15769 0:196:0
+1.18217 0:191:0
+-1.18217 0:191:0
+-1.15769 0:196:0
+1.18217 0:191:0
+1.20716 0:186:0
+-1.20716 0:186:0
+-1.18217 0:191:0
+1.20716 0:186:0
+1.23267 0:181:0
+-1.23267 0:181:0
+-1.20716 0:186:0
+1.23267 0:181:0
+1.25873 0:177:0
+-1.25873 0:177:0
+-1.23267 0:181:0
+1.25873 0:177:0
+1.28534 0:172:0
+-1.28534 0:172:0
+-1.25873 0:177:0
+1.28534 0:172:0
+1.31251 0:167:0
+-1.31251 0:167:0
+-1.28534 0:172:0
+1.31251 0:167:0
+1.34026 0:162:0
+-1.34026 0:162:0
+-1.31251 0:167:0
+1.34026 0:162:0
+1.36859 3:158:0
+-1.36859 3:158:0
+-1.34026 0:162:0
+1.36859 3:158:0
+1.39752 8:155:0
+-1.39752 8:155:0
+-1.36859 3:158:0
+1.39752 8:155:0
+1.42706 13:152:0
+-1.42706 13:152:0
+-1.39752 8:155:0
+1.42706 13:152:0
+1.45723 18:149:0
+-1.45723 18:149:0
+-1.42706 13:152:0
+1.45723 18:149:0
+1.48803 23:146:0
+-1.48803 23:146:0
+-1.45723 18:149:0
+1.48803 23:146:0
+1.51949 28:143:0
+-1.51949 28:143:0
+-1.48803 23:146:0
+1.51949 28:143:0
+1.55161 33:140:0
+-1.55161 33:140:0
+-1.51949 28:143:0
+1.55161 33:140:0
+1.58441 38:137:0
+-1.58441 38:137:0
+-1.55161 33:140:0
+1.58441 38:137:0
+1.6179 43:134:0
+-1.6179 43:134:0
+-1.58441 38:137:0
+1.6179 43:134:0
+1.6521 48:131:0
+-1.6521 48:131:0
+-1.6179 43:134:0
+1.6521 48:131:0
+1.68702 53:129:1
+-1.68702 53:129:1
+-1.6521 48:131:0
+1.68702 53:129:1
+1.72269 58:127:3
+-1.72269 58:127:3
+-1.68702 53:129:1
+1.72269 58:127:3
+1.7591 63:125:5
+-1.7591 63:125:5
+-1.72269 58:127:3
+1.7591 63:125:5
+1.79629 68:123:7
+-1.79629 68:123:7
+-1.7591 63:125:5
+1.79629 68:123:7
+1.83426 73:121:9
+-1.83426 73:121:9
+-1.79629 68:123:7
+1.83426 73:121:9
+1.87303 77:119:11
+-1.87303 77:119:11
+-1.83426 73:121:9
+1.87303 77:119:11
+1.91263 82:116:14
+-1.91263 82:116:14
+-1.87303 77:119:11
+1.91263 82:116:14
+1.95306 87:114:16
+-1.95306 87:114:16
+-1.91263 82:116:14
+1.95306 87:114:16
+1.99434 92:112:18
+-1.99434 92:112:18
+-1.95306 87:114:16
+1.99434 92:112:18
+2.0365 97:110:20
+-2.0365 97:110:20
+-1.99434 92:112:18
+2.0365 97:110:20
+2.07955 102:108:22
+-2.07955 102:108:22
+-2.0365 97:110:20
+2.07955 102:108:22
+2.12351 107:106:24
+-2.12351 107:106:24
+-2.07955 102:108:22
+2.12351 107:106:24
+2.1684 112:104:26
+-2.1684 112:104:26
+-2.12351 107:106:24
+2.1684 112:104:26
+2.21424 117:102:28
+-2.21424 117:102:28
+-2.1684 112:104:26
+2.21424 117:102:28
+2.26104 120:100:30
+-2.26104 120:100:30
+-2.21424 117:102:28
+2.26104 120:100:30
+2.30884 120:103:31
+-2.30884 120:103:31
+-2.26104 120:100:30
+2.30884 120:103:31
+2.35765 120:105:31
+-2.35765 120:105:31
+-2.30884 120:103:31
+2.35765 120:105:31
+2.40749 120:107:32
+-2.40749 120:107:32
+-2.35765 120:105:31
+2.40749 120:107:32
+2.45838 120:109:33
+-2.45838 120:109:33
+-2.40749 120:107:32
+2.45838 120:109:33
+2.51034 120:111:33
+-2.51034 120:111:33
+-2.45838 120:109:33
+2.51034 120:111:33
+2.56341 120:113:34
+-2.56341 120:113:34
+-2.51034 120:111:33
+2.56341 120:113:34
+2.6176 120:115:35
+-2.6176 120:115:35
+-2.56341 120:113:34
+2.6176 120:115:35
+2.67293 120:117:35
+-2.67293 120:117:35
+-2.6176 120:115:35
+2.67293 120:117:35
+2.72944 120:119:36
+-2.72944 120:119:36
+-2.67293 120:117:35
+2.72944 120:119:36
+2.78713 120:121:37
+-2.78713 120:121:37
+-2.72944 120:119:36
+2.78713 120:121:37
+2.84605 120:123:37
+-2.84605 120:123:37
+-2.78713 120:121:37
+2.84605 120:123:37
+2.90621 120:126:38
+-2.90621 120:126:38
+-2.84605 120:123:37
+2.90621 120:126:38
+2.96765 120:128:39
+-2.96765 120:128:39
+-2.90621 120:126:38
+2.96765 120:128:39
+3.03038 120:130:40
+-3.03038 120:130:40
+-2.96765 120:128:39
+3.03038 120:130:40
+3.09444 122:131:40
+-3.09444 122:131:40
+-3.03038 120:130:40
+3.09444 122:131:40
+3.15985 124:132:40
+-3.15985 124:132:40
+-3.09444 122:131:40
+3.15985 124:132:40
+3.22665 126:133:41
+-3.22665 126:133:41
+-3.15985 124:132:40
+3.22665 126:133:41
+3.29486 128:134:41
+-3.29486 128:134:41
+-3.22665 126:133:41
+3.29486 128:134:41
+3.36451 129:135:41
+-3.36451 129:135:41
+-3.29486 128:134:41
+3.36451 129:135:41
+3.43563 131:137:42
+-3.43563 131:137:42
+-3.36451 129:135:41
+3.43563 131:137:42
+3.50825 133:138:42
+-3.50825 133:138:42
+-3.43563 131:137:42
+3.50825 133:138:42
+3.58241 135:139:43
+-3.58241 135:139:43
+-3.50825 133:138:42
+3.58241 135:139:43
+3.65814 137:140:43
+-3.65814 137:140:43
+-3.58241 135:139:43
+3.65814 137:140:43
+3.73547 139:141:43
+-3.73547 139:141:43
+-3.65814 137:140:43
+3.73547 139:141:43
+3.81444 141:142:44
+-3.81444 141:142:44
+-3.73547 139:141:43
+3.81444 141:142:44
+3.89507 143:144:44
+-3.89507 143:144:44
+-3.81444 141:142:44
+3.89507 143:144:44
+3.97741 145:145:45
+-3.97741 145:145:45
+-3.89507 143:144:44
+3.97741 145:145:45
+4.06149 147:146:45
+-4.06149 147:146:45
+-3.97741 145:145:45
+4.06149 147:146:45
+4.14734 149:147:45
+-4.14734 149:147:45
+-4.06149 147:146:45
+4.14734 149:147:45
+4.23501 151:148:46
+-4.23501 151:148:46
+-4.14734 149:147:45
+4.23501 151:148:46
+4.32454 153:149:46
+-4.32454 153:149:46
+-4.23501 151:148:46
+4.32454 153:149:46
+4.41595 155:151:47
+-4.41595 155:151:47
+-4.32454 153:149:46
+4.41595 155:151:47
+4.5093 157:152:47
+-4.5093 157:152:47
+-4.41595 155:151:47
+4.5093 157:152:47
+4.60462 159:153:47
+-4.60462 159:153:47
+-4.5093 157:152:47
+4.60462 159:153:47
+4.70196 161:154:48
+-4.70196 161:154:48
+-4.60462 159:153:47
+4.70196 161:154:48
+4.80135 163:155:48
+-4.80135 163:155:48
+-4.70196 161:154:48
+4.80135 163:155:48
+4.90285 164:156:48
+-4.90285 164:156:48
+-4.80135 163:155:48
+4.90285 164:156:48
+5.00649 166:158:49
+-5.00649 166:158:49
+-4.90285 164:156:48
+5.00649 166:158:49
+5.11232 168:159:49
+-5.11232 168:159:49
+-5.00649 166:158:49
+5.11232 168:159:49
+5.22039 171:161:51
+-5.22039 171:161:51
+-5.11232 168:159:49
+5.22039 171:161:51
+5.33075 175:166:56
+-5.33075 175:166:56
+-5.22039 171:161:51
+5.33075 175:166:56
+5.44343 179:170:61
+-5.44343 179:170:61
+-5.33075 175:166:56
+5.44343 179:170:61
+5.5585 183:175:65
+-5.5585 183:175:65
+-5.44343 179:170:61
+5.5585 183:175:65
+5.676 187:179:70
+-5.676 187:179:70
+-5.5585 183:175:65
+5.676 187:179:70
+5.79599 191:184:75
+-5.79599 191:184:75
+-5.676 187:179:70
+5.79599 191:184:75
+5.91851 195:188:79
+-5.91851 195:188:79
+-5.79599 191:184:75
+5.91851 195:188:79
+6.04362 199:192:84
+-6.04362 199:192:84
+-5.91851 195:188:79
+6.04362 199:192:84
+6.17138 203:197:89
+-6.17138 203:197:89
+-6.04362 199:192:84
+6.17138 203:197:89
+6.30183 207:201:93
+-6.30183 207:201:93
+-6.17138 203:197:89
+6.30183 207:201:93
+6.43505 211:206:98
+-6.43505 211:206:98
+-6.30183 207:201:93
+6.43505 211:206:98
+6.57108 215:210:103
+-6.57108 215:210:103
+-6.43505 211:206:98
+6.57108 215:210:103
+6.70998 219:215:108
+-6.70998 219:215:108
+-6.57108 215:210:103
+6.70998 219:215:108
+6.85182 223:219:112
+-6.85182 223:219:112
+-6.70998 219:215:108
+6.85182 223:219:112
+6.99666 227:223:117
+-6.99666 227:223:117
+-6.85182 223:219:112
+6.99666 227:223:117
+7.14457 231:228:121
+-7.14457 231:228:121
+-6.99666 227:223:117
+7.1 255:255:150
+7.93232 251:250:145
+-7.93232 251:250:145
+-7.1 255:255:150
+nv 255:255:255
+default 255:255:255
Added: grass/trunk/raster/r.colors/test_elev_float_example4.ref
===================================================================
--- grass/trunk/raster/r.colors/test_elev_float_example4.ref (rev 0)
+++ grass/trunk/raster/r.colors/test_elev_float_example4.ref 2011-06-21 13:44:17 UTC (rev 46750)
@@ -0,0 +1,11 @@
+1 0:0:0
+2 255:255:0
+3 255:127:0
+4 255:0:0
+5 255:0:255
+6 0:127:255
+7 0:255:255
+8 0:255:0
+9 0:0:0
+nv 255:255:255
+default 255:255:255
Added: grass/trunk/raster/r.colors/test_elev_float_example4_inv.ref
===================================================================
--- grass/trunk/raster/r.colors/test_elev_float_example4_inv.ref (rev 0)
+++ grass/trunk/raster/r.colors/test_elev_float_example4_inv.ref 2011-06-21 13:44:17 UTC (rev 46750)
@@ -0,0 +1,11 @@
+1 0:0:0
+2 255:255:0
+3 255:127:0
+4 255:0:0
+5 255:0:255
+6 0:127:255
+7 0:255:255
+8 0:255:0
+9 0:0:0
+nv 255:255:255
+default 255:255:255
Added: grass/trunk/raster/r.colors/test_elev_int_example1.ref
===================================================================
--- grass/trunk/raster/r.colors/test_elev_int_example1.ref (rev 0)
+++ grass/trunk/raster/r.colors/test_elev_int_example1.ref 2011-06-21 13:44:17 UTC (rev 46750)
@@ -0,0 +1,9 @@
+1 0:230:0
+2.6 0:160:0
+3.8 50:130:0
+5.4 120:100:30
+7 120:130:40
+8.2 170:160:50
+9 255:255:150
+nv 255:255:255
+default 255:255:255
Added: grass/trunk/raster/r.colors/test_elev_int_example1_hist.ref
===================================================================
--- grass/trunk/raster/r.colors/test_elev_int_example1_hist.ref (rev 0)
+++ grass/trunk/raster/r.colors/test_elev_int_example1_hist.ref 2011-06-21 13:44:17 UTC (rev 46750)
@@ -0,0 +1,10 @@
+1 0:209:0
+3 0:165:0
+4 37:138:0
+5 80:117:13
+6 120:101:30
+7 120:120:36
+8 140:142:44
+9 201:195:87
+nv 255:255:255
+default 255:255:255
Added: grass/trunk/raster/r.colors/test_elev_int_example1_perc.ref
===================================================================
--- grass/trunk/raster/r.colors/test_elev_int_example1_perc.ref (rev 0)
+++ grass/trunk/raster/r.colors/test_elev_int_example1_perc.ref 2011-06-21 13:44:17 UTC (rev 46750)
@@ -0,0 +1,9 @@
+0% 0:230:0
+20% 0:160:0
+35% 50:130:0
+55% 120:100:30
+75% 120:130:40
+90% 170:160:50
+100% 255:255:150
+nv 255:255:255
+default 255:255:255
Added: grass/trunk/raster/r.colors/test_elev_int_example2.ref
===================================================================
--- grass/trunk/raster/r.colors/test_elev_int_example2.ref (rev 0)
+++ grass/trunk/raster/r.colors/test_elev_int_example2.ref 2011-06-21 13:44:17 UTC (rev 46750)
@@ -0,0 +1,5 @@
+1 128:255:0
+5 255:0:128
+9 0:128:255
+nv 255:255:255
+default 255:255:255
Added: grass/trunk/raster/r.colors/test_elev_int_example2_log.ref
===================================================================
--- grass/trunk/raster/r.colors/test_elev_int_example2_log.ref (rev 0)
+++ grass/trunk/raster/r.colors/test_elev_int_example2_log.ref 2011-06-21 13:44:17 UTC (rev 46750)
@@ -0,0 +1,103 @@
+1 128:255:0
+1.02222 130:250:2
+1.04492 133:245:5
+1.06814 135:240:7
+1.09187 138:235:10
+1.11612 140:230:12
+1.14092 143:225:15
+1.16626 145:220:17
+1.19217 148:215:20
+1.21866 150:210:23
+1.24573 153:204:25
+1.27341 155:199:28
+1.30169 158:194:30
+1.33061 161:189:33
+1.36017 163:184:35
+1.39039 166:179:38
+1.42128 168:174:40
+1.45285 171:169:43
+1.48513 173:164:46
+1.51812 176:159:48
+1.55185 178:153:51
+1.58632 181:148:53
+1.62156 183:143:56
+1.65758 186:138:58
+1.69441 188:133:61
+1.73205 191:128:64
+1.77053 194:123:66
+1.80986 196:118:69
+1.85007 199:113:71
+1.89117 201:108:74
+1.93318 204:102:76
+1.97613 206:97:79
+2.02003 209:92:81
+2.0649 211:87:84
+2.11078 214:82:87
+2.15767 216:77:89
+2.2056 219:72:92
+2.2546 221:67:94
+2.30469 224:62:97
+2.35589 227:57:99
+2.40822 229:51:102
+2.46172 232:46:104
+2.51641 234:41:107
+2.57232 237:36:110
+2.62946 239:31:112
+2.68788 242:26:115
+2.74759 244:21:117
+2.80863 247:16:120
+2.87102 249:11:122
+2.9348 252:6:125
+3 255:0:128
+3.06665 250:2:130
+3.13477 245:5:133
+3.20441 240:7:135
+3.2756 235:10:138
+3.34837 230:12:140
+3.42275 225:15:143
+3.49879 220:17:145
+3.57652 215:20:148
+3.65597 210:23:150
+3.73719 205:25:153
+3.82022 199:28:155
+3.90508 194:30:158
+3.99184 189:33:161
+4.08052 184:35:163
+4.17117 179:38:166
+4.26383 174:40:168
+4.35855 169:43:171
+4.45538 164:46:173
+4.55436 159:48:176
+4.65554 154:51:178
+4.75896 148:53:181
+4.86468 143:56:183
+4.97275 138:58:186
+5.08323 133:61:188
+5.19615 128:64:191
+5.31159 123:66:194
+5.42959 118:69:196
+5.55021 113:71:199
+5.67351 108:74:201
+5.79955 102:76:204
+5.92839 97:79:206
+6.06009 92:81:209
+6.19471 87:84:211
+6.33233 82:87:214
+6.47301 77:89:216
+6.61681 72:92:219
+6.7638 67:94:221
+6.91406 62:97:224
+7.06766 57:99:227
+7.22467 52:102:229
+7.38517 46:104:232
+7.54924 41:107:234
+7.71695 36:110:237
+7.88838 31:112:239
+8.06363 26:115:242
+8.24276 21:117:244
+8.42588 16:120:247
+8.61306 11:122:249
+8.80441 6:125:252
+9 0:128:255
+nv 255:255:255
+default 255:255:255
Added: grass/trunk/raster/r.colors/test_elev_int_example2_perc.ref
===================================================================
--- grass/trunk/raster/r.colors/test_elev_int_example2_perc.ref (rev 0)
+++ grass/trunk/raster/r.colors/test_elev_int_example2_perc.ref 2011-06-21 13:44:17 UTC (rev 46750)
@@ -0,0 +1,5 @@
+0% 128:255:0
+50% 255:0:128
+100% 0:128:255
+nv 255:255:255
+default 255:255:255
Added: grass/trunk/raster/r.colors/test_elev_int_example3.ref
===================================================================
--- grass/trunk/raster/r.colors/test_elev_int_example3.ref (rev 0)
+++ grass/trunk/raster/r.colors/test_elev_int_example3.ref 2011-06-21 13:44:17 UTC (rev 46750)
@@ -0,0 +1,9 @@
+1 0:230:0
+1.8 0:160:0
+2.36 50:130:0
+3.16 120:100:30
+3.96 120:130:40
+5.4 170:160:50
+6.6 255:255:150
+nv 255:255:255
+default 255:255:255
Added: grass/trunk/raster/r.colors/test_elev_int_example3_logabs.ref
===================================================================
--- grass/trunk/raster/r.colors/test_elev_int_example3_logabs.ref (rev 0)
+++ grass/trunk/raster/r.colors/test_elev_int_example3_logabs.ref 2011-06-21 13:44:17 UTC (rev 46750)
@@ -0,0 +1,382 @@
+1 0:230:0
+1.02049 0:226:0
+-1.02049 0:226:0
+-1 0:230:0
+1.02049 0:226:0
+1.0414 0:221:0
+-1.0414 0:221:0
+-1.02049 0:226:0
+1.0414 0:221:0
+1.06273 0:216:0
+-1.06273 0:216:0
+-1.0414 0:221:0
+1.06273 0:216:0
+1.08451 0:211:0
+-1.08451 0:211:0
+-1.06273 0:216:0
+1.08451 0:211:0
+1.10673 0:206:0
+-1.10673 0:206:0
+-1.08451 0:211:0
+1.10673 0:206:0
+1.1294 0:201:0
+-1.1294 0:201:0
+-1.10673 0:206:0
+1.1294 0:201:0
+1.15254 0:196:0
+-1.15254 0:196:0
+-1.1294 0:201:0
+1.15254 0:196:0
+1.17616 0:191:0
+-1.17616 0:191:0
+-1.15254 0:196:0
+1.17616 0:191:0
+1.20025 0:186:0
+-1.20025 0:186:0
+-1.17616 0:191:0
+1.20025 0:186:0
+1.22485 0:181:0
+-1.22485 0:181:0
+-1.20025 0:186:0
+1.22485 0:181:0
+1.24994 0:177:0
+-1.24994 0:177:0
+-1.22485 0:181:0
+1.24994 0:177:0
+1.27555 0:172:0
+-1.27555 0:172:0
+-1.24994 0:177:0
+1.27555 0:172:0
+1.30168 0:167:0
+-1.30168 0:167:0
+-1.27555 0:172:0
+1.30168 0:167:0
+1.32835 0:162:0
+-1.32835 0:162:0
+-1.30168 0:167:0
+1.32835 0:162:0
+1.35557 3:158:0
+-1.35557 3:158:0
+-1.32835 0:162:0
+1.35557 3:158:0
+1.38334 8:155:0
+-1.38334 8:155:0
+-1.35557 3:158:0
+1.38334 8:155:0
+1.41169 13:152:0
+-1.41169 13:152:0
+-1.38334 8:155:0
+1.41169 13:152:0
+1.44061 18:149:0
+-1.44061 18:149:0
+-1.41169 13:152:0
+1.44061 18:149:0
+1.47013 23:146:0
+-1.47013 23:146:0
+-1.44061 18:149:0
+1.47013 23:146:0
+1.50025 28:143:0
+-1.50025 28:143:0
+-1.47013 23:146:0
+1.50025 28:143:0
+1.53098 33:140:0
+-1.53098 33:140:0
+-1.50025 28:143:0
+1.53098 33:140:0
+1.56235 38:137:0
+-1.56235 38:137:0
+-1.53098 33:140:0
+1.56235 38:137:0
+1.59436 43:134:0
+-1.59436 43:134:0
+-1.56235 38:137:0
+1.59436 43:134:0
+1.62703 48:131:0
+-1.62703 48:131:0
+-1.59436 43:134:0
+1.62703 48:131:0
+1.66036 53:129:1
+-1.66036 53:129:1
+-1.62703 48:131:0
+1.66036 53:129:1
+1.69438 58:127:3
+-1.69438 58:127:3
+-1.66036 53:129:1
+1.69438 58:127:3
+1.7291 63:125:5
+-1.7291 63:125:5
+-1.69438 58:127:3
+1.7291 63:125:5
+1.76452 68:123:7
+-1.76452 68:123:7
+-1.7291 63:125:5
+1.76452 68:123:7
+1.80068 73:121:9
+-1.80068 73:121:9
+-1.76452 68:123:7
+1.80068 73:121:9
+1.83757 77:119:11
+-1.83757 77:119:11
+-1.80068 73:121:9
+1.83757 77:119:11
+1.87522 82:116:14
+-1.87522 82:116:14
+-1.83757 77:119:11
+1.87522 82:116:14
+1.91364 87:114:16
+-1.91364 87:114:16
+-1.87522 82:116:14
+1.91364 87:114:16
+1.95285 92:112:18
+-1.95285 92:112:18
+-1.91364 87:114:16
+1.95285 92:112:18
+1.99286 97:110:20
+-1.99286 97:110:20
+-1.95285 92:112:18
+1.99286 97:110:20
+2.03369 102:108:22
+-2.03369 102:108:22
+-1.99286 97:110:20
+2.03369 102:108:22
+2.07536 107:106:24
+-2.07536 107:106:24
+-2.03369 102:108:22
+2.07536 107:106:24
+2.11788 112:104:26
+-2.11788 112:104:26
+-2.07536 107:106:24
+2.11788 112:104:26
+2.16127 117:102:28
+-2.16127 117:102:28
+-2.11788 112:104:26
+2.16127 117:102:28
+2.20555 120:100:30
+-2.20555 120:100:30
+-2.16127 117:102:28
+2.20555 120:100:30
+2.25074 120:103:31
+-2.25074 120:103:31
+-2.20555 120:100:30
+2.25074 120:103:31
+2.29685 120:105:31
+-2.29685 120:105:31
+-2.25074 120:103:31
+2.29685 120:105:31
+2.34391 120:107:32
+-2.34391 120:107:32
+-2.29685 120:105:31
+2.34391 120:107:32
+2.39194 120:109:33
+-2.39194 120:109:33
+-2.34391 120:107:32
+2.39194 120:109:33
+2.44094 120:111:33
+-2.44094 120:111:33
+-2.39194 120:109:33
+2.44094 120:111:33
+2.49096 120:113:34
+-2.49096 120:113:34
+-2.44094 120:111:33
+2.49096 120:113:34
+2.54199 120:115:35
+-2.54199 120:115:35
+-2.49096 120:113:34
+2.54199 120:115:35
+2.59407 120:117:35
+-2.59407 120:117:35
+-2.54199 120:115:35
+2.59407 120:117:35
+2.64722 120:119:36
+-2.64722 120:119:36
+-2.59407 120:117:35
+2.64722 120:119:36
+2.70146 120:121:37
+-2.70146 120:121:37
+-2.64722 120:119:36
+2.70146 120:121:37
+2.75681 120:123:37
+-2.75681 120:123:37
+-2.70146 120:121:37
+2.75681 120:123:37
+2.81329 120:126:38
+-2.81329 120:126:38
+-2.75681 120:123:37
+2.81329 120:126:38
+2.87093 120:128:39
+-2.87093 120:128:39
+-2.81329 120:126:38
+2.87093 120:128:39
+2.92975 120:130:40
+-2.92975 120:130:40
+-2.87093 120:128:39
+2.92975 120:130:40
+2.98978 122:131:40
+-2.98978 122:131:40
+-2.92975 120:130:40
+2.98978 122:131:40
+3.05104 124:132:40
+-3.05104 124:132:40
+-2.98978 122:131:40
+3.05104 124:132:40
+3.11355 126:133:41
+-3.11355 126:133:41
+-3.05104 124:132:40
+3.11355 126:133:41
+3.17734 128:134:41
+-3.17734 128:134:41
+-3.11355 126:133:41
+3.17734 128:134:41
+3.24244 129:135:41
+-3.24244 129:135:41
+-3.17734 128:134:41
+3.24244 129:135:41
+3.30887 131:137:42
+-3.30887 131:137:42
+-3.24244 129:135:41
+3.30887 131:137:42
+3.37667 133:138:42
+-3.37667 133:138:42
+-3.30887 131:137:42
+3.37667 133:138:42
+3.44585 135:139:43
+-3.44585 135:139:43
+-3.37667 133:138:42
+3.44585 135:139:43
+3.51645 137:140:43
+-3.51645 137:140:43
+-3.44585 135:139:43
+3.51645 137:140:43
+3.5885 139:141:43
+-3.5885 139:141:43
+-3.51645 137:140:43
+3.5885 139:141:43
+3.66202 141:142:44
+-3.66202 141:142:44
+-3.5885 139:141:43
+3.66202 141:142:44
+3.73705 143:144:44
+-3.73705 143:144:44
+-3.66202 141:142:44
+3.73705 143:144:44
+3.81362 145:145:45
+-3.81362 145:145:45
+-3.73705 143:144:44
+3.81362 145:145:45
+3.89175 147:146:45
+-3.89175 147:146:45
+-3.81362 145:145:45
+3.89175 147:146:45
+3.97149 149:147:45
+-3.97149 149:147:45
+-3.89175 147:146:45
+3.97149 149:147:45
+4.05286 151:148:46
+-4.05286 151:148:46
+-3.97149 149:147:45
+4.05286 151:148:46
+4.1359 153:149:46
+-4.1359 153:149:46
+-4.05286 151:148:46
+4.1359 153:149:46
+4.22063 155:151:47
+-4.22063 155:151:47
+-4.1359 153:149:46
+4.22063 155:151:47
+4.30711 157:152:47
+-4.30711 157:152:47
+-4.22063 155:151:47
+4.30711 157:152:47
+4.39535 159:153:47
+-4.39535 159:153:47
+-4.30711 157:152:47
+4.39535 159:153:47
+4.48541 161:154:48
+-4.48541 161:154:48
+-4.39535 159:153:47
+4.48541 161:154:48
+4.57731 163:155:48
+-4.57731 163:155:48
+-4.48541 161:154:48
+4.57731 163:155:48
+4.67109 164:156:48
+-4.67109 164:156:48
+-4.57731 163:155:48
+4.67109 164:156:48
+4.76679 166:158:49
+-4.76679 166:158:49
+-4.67109 164:156:48
+4.76679 166:158:49
+4.86446 168:159:49
+-4.86446 168:159:49
+-4.76679 166:158:49
+4.86446 168:159:49
+4.96413 171:161:51
+-4.96413 171:161:51
+-4.86446 168:159:49
+4.96413 171:161:51
+5.06583 175:166:56
+-5.06583 175:166:56
+-4.96413 171:161:51
+5.06583 175:166:56
+5.16962 179:170:61
+-5.16962 179:170:61
+-5.06583 175:166:56
+5.16962 179:170:61
+5.27554 183:175:65
+-5.27554 183:175:65
+-5.16962 179:170:61
+5.27554 183:175:65
+5.38363 187:179:70
+-5.38363 187:179:70
+-5.27554 183:175:65
+5.38363 187:179:70
+5.49393 191:184:75
+-5.49393 191:184:75
+-5.38363 187:179:70
+5.49393 191:184:75
+5.6065 195:188:79
+-5.6065 195:188:79
+-5.49393 191:184:75
+5.6065 195:188:79
+5.72137 199:192:84
+-5.72137 199:192:84
+-5.6065 195:188:79
+5.72137 199:192:84
+5.83859 203:197:89
+-5.83859 203:197:89
+-5.72137 199:192:84
+5.83859 203:197:89
+5.95821 207:201:93
+-5.95821 207:201:93
+-5.83859 203:197:89
+5.95821 207:201:93
+6.08029 211:206:98
+-6.08029 211:206:98
+-5.95821 207:201:93
+6.08029 211:206:98
+6.20486 215:210:103
+-6.20486 215:210:103
+-6.08029 211:206:98
+6.20486 215:210:103
+6.33199 219:215:108
+-6.33199 219:215:108
+-6.20486 215:210:103
+6.33199 219:215:108
+6.46173 223:219:112
+-6.46173 223:219:112
+-6.33199 219:215:108
+6.46173 223:219:112
+6.59412 227:223:117
+-6.59412 227:223:117
+-6.46173 223:219:112
+6.59412 227:223:117
+6.72922 231:228:121
+-6.72922 231:228:121
+-6.59412 227:223:117
+6.6 255:255:150
+7.44741 251:250:145
+-7.44741 251:250:145
+-6.6 255:255:150
+nv 255:255:255
+default 255:255:255
Added: grass/trunk/raster/r.colors/test_elev_int_example3_perc.ref
===================================================================
--- grass/trunk/raster/r.colors/test_elev_int_example3_perc.ref (rev 0)
+++ grass/trunk/raster/r.colors/test_elev_int_example3_perc.ref 2011-06-21 13:44:17 UTC (rev 46750)
@@ -0,0 +1,9 @@
+0% 0:230:0
+10% 0:160:0
+17% 50:130:0
+27% 120:100:30
+37% 120:130:40
+55% 170:160:50
+70% 255:255:150
+nv 255:255:255
+default 255:255:255
Added: grass/trunk/raster/r.colors/test_elev_int_example4.ref
===================================================================
--- grass/trunk/raster/r.colors/test_elev_int_example4.ref (rev 0)
+++ grass/trunk/raster/r.colors/test_elev_int_example4.ref 2011-06-21 13:44:17 UTC (rev 46750)
@@ -0,0 +1,11 @@
+1 0:0:0
+2 255:255:0
+3 255:127:0
+4 255:0:0
+5 255:0:255
+6 0:127:255
+7 0:255:255
+8 0:255:0
+9 0:0:0
+nv 255:255:255
+default 255:255:255
Added: grass/trunk/raster/r.colors/test_elev_int_example4_inv.ref
===================================================================
--- grass/trunk/raster/r.colors/test_elev_int_example4_inv.ref (rev 0)
+++ grass/trunk/raster/r.colors/test_elev_int_example4_inv.ref 2011-06-21 13:44:17 UTC (rev 46750)
@@ -0,0 +1,11 @@
+1 0:0:0
+2 255:255:0
+3 255:127:0
+4 255:0:0
+5 255:0:255
+6 0:127:255
+7 0:255:255
+8 0:255:0
+9 0:0:0
+nv 255:255:255
+default 255:255:255
Added: grass/trunk/raster/r.colors/test_elev_int_example4_perc.ref
===================================================================
--- grass/trunk/raster/r.colors/test_elev_int_example4_perc.ref (rev 0)
+++ grass/trunk/raster/r.colors/test_elev_int_example4_perc.ref 2011-06-21 13:44:17 UTC (rev 46750)
@@ -0,0 +1,11 @@
+0% 0:0:0
+12.5% 255:255:0
+25% 255:127:0
+37.5% 255:0:0
+50% 255:0:255
+62.5% 0:127:255
+75% 0:255:255
+87.5% 0:255:0
+100% 0:0:0
+nv 255:255:255
+default 255:255:255
Added: grass/trunk/raster/r.colors/test_volume_double_example1.ref
===================================================================
--- grass/trunk/raster/r.colors/test_volume_double_example1.ref (rev 0)
+++ grass/trunk/raster/r.colors/test_volume_double_example1.ref 2011-06-21 13:44:17 UTC (rev 46750)
@@ -0,0 +1,9 @@
+4 0:230:0
+8 0:160:0
+11 50:130:0
+15 120:100:30
+19 120:130:40
+22 170:160:50
+24 255:255:150
+nv 255:255:255
+default 255:255:255
Added: grass/trunk/raster/r.colors/test_volume_double_example2.ref
===================================================================
--- grass/trunk/raster/r.colors/test_volume_double_example2.ref (rev 0)
+++ grass/trunk/raster/r.colors/test_volume_double_example2.ref 2011-06-21 13:44:17 UTC (rev 46750)
@@ -0,0 +1,5 @@
+4 128:255:0
+14 255:0:128
+24 0:128:255
+nv 255:255:255
+default 255:255:255
Added: grass/trunk/raster/r.colors/test_volume_double_example2_log.ref
===================================================================
--- grass/trunk/raster/r.colors/test_volume_double_example2_log.ref (rev 0)
+++ grass/trunk/raster/r.colors/test_volume_double_example2_log.ref 2011-06-21 13:44:17 UTC (rev 46750)
@@ -0,0 +1,103 @@
+4 128:255:0
+4.07232 130:250:2
+4.14594 133:245:5
+4.22089 135:240:7
+4.2972 138:235:10
+4.37489 140:230:12
+4.45399 143:225:15
+4.53451 145:220:17
+4.61649 148:215:20
+4.69995 150:210:23
+4.78492 153:204:25
+4.87143 155:199:28
+4.9595 158:194:30
+5.04917 161:189:33
+5.14045 163:184:35
+5.23338 166:179:38
+5.328 168:174:40
+5.42433 171:169:43
+5.52239 173:164:46
+5.62223 176:159:48
+5.72388 178:153:51
+5.82736 181:148:53
+5.93271 183:143:56
+6.03997 186:138:58
+6.14917 188:133:61
+6.26034 191:128:64
+6.37352 194:123:66
+6.48875 196:118:69
+6.60606 199:113:71
+6.72549 201:108:74
+6.84708 204:102:76
+6.97087 206:97:79
+7.0969 209:92:81
+7.2252 211:87:84
+7.35583 214:82:87
+7.48881 216:77:89
+7.6242 219:72:92
+7.76204 221:67:94
+7.90237 224:62:97
+8.04524 227:57:99
+8.19069 229:51:102
+8.33877 232:46:104
+8.48953 234:41:107
+8.64301 237:36:110
+8.79927 239:31:112
+8.95835 242:26:115
+9.12031 244:21:117
+9.2852 247:16:120
+9.45306 249:11:122
+9.62397 252:6:125
+9.79796 255:0:128
+9.9751 250:2:130
+10.1554 245:5:133
+10.339 240:7:135
+10.526 235:10:138
+10.7163 230:12:140
+10.91 225:15:143
+11.1072 220:17:145
+11.308 215:20:148
+11.5125 210:23:150
+11.7206 204:25:153
+11.9325 199:28:155
+12.1483 194:30:158
+12.3679 189:33:161
+12.5915 184:35:163
+12.8191 179:38:166
+13.0509 174:40:168
+13.2868 169:43:171
+13.527 164:46:173
+13.7716 159:48:176
+14.0206 153:51:178
+14.2741 148:53:181
+14.5321 143:56:183
+14.7948 138:58:186
+15.0623 133:61:188
+15.3346 128:64:191
+15.6119 123:66:194
+15.8941 118:69:196
+16.1815 113:71:199
+16.474 108:74:201
+16.7719 102:76:204
+17.0751 97:79:206
+17.3838 92:81:209
+17.6981 87:84:211
+18.018 82:87:214
+18.3438 77:89:216
+18.6754 72:92:219
+19.013 67:94:221
+19.3568 62:97:224
+19.7067 57:99:227
+20.063 51:102:229
+20.4257 46:104:232
+20.795 41:107:234
+21.171 36:110:237
+21.5537 31:112:239
+21.9434 26:115:242
+22.3401 21:117:244
+22.744 16:120:247
+23.1552 11:122:249
+23.5738 6:125:252
+24 0:128:255
+nv 255:255:255
+default 255:255:255
Added: grass/trunk/raster/r.colors/test_volume_double_example3.ref
===================================================================
--- grass/trunk/raster/r.colors/test_volume_double_example3.ref (rev 0)
+++ grass/trunk/raster/r.colors/test_volume_double_example3.ref 2011-06-21 13:44:17 UTC (rev 46750)
@@ -0,0 +1,9 @@
+4 0:230:0
+6 0:160:0
+7.4 50:130:0
+9.4 120:100:30
+11.4 120:130:40
+15 170:160:50
+18 255:255:150
+nv 255:255:255
+default 255:255:255
Added: grass/trunk/raster/r.colors/test_volume_double_example3_logabs.ref
===================================================================
--- grass/trunk/raster/r.colors/test_volume_double_example3_logabs.ref (rev 0)
+++ grass/trunk/raster/r.colors/test_volume_double_example3_logabs.ref 2011-06-21 13:44:17 UTC (rev 46750)
@@ -0,0 +1,402 @@
+1 0:230:0
+1.02988 0:226:0
+-1.02988 0:226:0
+-1 0:230:0
+1.02988 0:226:0
+1.06066 0:221:0
+-1.06066 0:221:0
+-1.02988 0:226:0
+1.06066 0:221:0
+1.09235 0:216:0
+-1.09235 0:216:0
+-1.06066 0:221:0
+1.09235 0:216:0
+1.12499 0:211:0
+-1.12499 0:211:0
+-1.09235 0:216:0
+1.12499 0:211:0
+1.15861 0:206:0
+-1.15861 0:206:0
+-1.12499 0:211:0
+1.15861 0:206:0
+1.19323 0:201:0
+-1.19323 0:201:0
+-1.15861 0:206:0
+1.19323 0:201:0
+1.22889 0:196:0
+-1.22889 0:196:0
+-1.19323 0:201:0
+1.22889 0:196:0
+1.26561 0:191:0
+-1.26561 0:191:0
+-1.22889 0:196:0
+1.26561 0:191:0
+1.30343 0:186:0
+-1.30343 0:186:0
+-1.26561 0:191:0
+1.30343 0:186:0
+1.34238 0:181:0
+-1.34238 0:181:0
+-1.30343 0:186:0
+1.34238 0:181:0
+1.38249 0:177:0
+-1.38249 0:177:0
+-1.34238 0:181:0
+1.38249 0:177:0
+1.4238 0:172:0
+-1.4238 0:172:0
+-1.38249 0:177:0
+1.4238 0:172:0
+1.46635 0:167:0
+-1.46635 0:167:0
+-1.4238 0:172:0
+1.46635 0:167:0
+1.51017 0:162:0
+-1.51017 0:162:0
+-1.46635 0:167:0
+1.51017 0:162:0
+1.5553 3:158:0
+-1.5553 3:158:0
+-1.51017 0:162:0
+1.5553 3:158:0
+1.60177 8:155:0
+-1.60177 8:155:0
+-1.5553 3:158:0
+1.60177 8:155:0
+1.64964 13:152:0
+-1.64964 13:152:0
+-1.60177 8:155:0
+1.64964 13:152:0
+1.69893 18:149:0
+-1.69893 18:149:0
+-1.64964 13:152:0
+1.69893 18:149:0
+1.7497 23:146:0
+-1.7497 23:146:0
+-1.69893 18:149:0
+1.7497 23:146:0
+1.80198 28:143:0
+-1.80198 28:143:0
+-1.7497 23:146:0
+1.80198 28:143:0
+1.85583 33:140:0
+-1.85583 33:140:0
+-1.80198 28:143:0
+1.85583 33:140:0
+1.91129 38:137:0
+-1.91129 38:137:0
+-1.85583 33:140:0
+1.91129 38:137:0
+1.9684 43:134:0
+-1.9684 43:134:0
+-1.91129 38:137:0
+1.9684 43:134:0
+2.02722 48:131:0
+-2.02722 48:131:0
+-1.9684 43:134:0
+2.02722 48:131:0
+2.0878 53:129:1
+-2.0878 53:129:1
+-2.02722 48:131:0
+2.0878 53:129:1
+2.15019 58:127:3
+-2.15019 58:127:3
+-2.0878 53:129:1
+2.15019 58:127:3
+2.21444 63:125:5
+-2.21444 63:125:5
+-2.15019 58:127:3
+2.21444 63:125:5
+2.28061 68:123:7
+-2.28061 68:123:7
+-2.21444 63:125:5
+2.28061 68:123:7
+2.34876 73:121:9
+-2.34876 73:121:9
+-2.28061 68:123:7
+2.34876 73:121:9
+2.41895 77:119:11
+-2.41895 77:119:11
+-2.34876 73:121:9
+2.41895 77:119:11
+2.49123 82:116:14
+-2.49123 82:116:14
+-2.41895 77:119:11
+2.49123 82:116:14
+2.56567 87:114:16
+-2.56567 87:114:16
+-2.49123 82:116:14
+2.56567 87:114:16
+2.64234 92:112:18
+-2.64234 92:112:18
+-2.56567 87:114:16
+2.64234 92:112:18
+2.7213 97:110:20
+-2.7213 97:110:20
+-2.64234 92:112:18
+2.7213 97:110:20
+2.80262 102:108:22
+-2.80262 102:108:22
+-2.7213 97:110:20
+2.80262 102:108:22
+2.88637 107:106:24
+-2.88637 107:106:24
+-2.80262 102:108:22
+2.88637 107:106:24
+2.97262 112:104:26
+-2.97262 112:104:26
+-2.88637 107:106:24
+2.97262 112:104:26
+3.06144 117:102:28
+-3.06144 117:102:28
+-2.97262 112:104:26
+3.06144 117:102:28
+3.15293 120:100:30
+-3.15293 120:100:30
+-3.06144 117:102:28
+3.15293 120:100:30
+3.24714 120:102:30
+-3.24714 120:102:30
+-3.15293 120:100:30
+3.24714 120:102:30
+3.34417 120:105:31
+-3.34417 120:105:31
+-3.24714 120:102:30
+3.34417 120:105:31
+3.44411 120:107:32
+-3.44411 120:107:32
+-3.34417 120:105:31
+3.44411 120:107:32
+3.54702 120:109:33
+-3.54702 120:109:33
+-3.44411 120:107:32
+3.54702 120:109:33
+3.65302 120:111:33
+-3.65302 120:111:33
+-3.54702 120:109:33
+3.65302 120:111:33
+3.76218 120:113:34
+-3.76218 120:113:34
+-3.65302 120:111:33
+3.76218 120:113:34
+3.8746 120:115:35
+-3.8746 120:115:35
+-3.76218 120:113:34
+3.8746 120:115:35
+3.99038 120:117:35
+-3.99038 120:117:35
+-3.8746 120:115:35
+3.99038 120:117:35
+4.10962 120:119:36
+-4.10962 120:119:36
+-3.99038 120:117:35
+4.10962 120:119:36
+4.23242 120:121:37
+-4.23242 120:121:37
+-4.10962 120:119:36
+4.23242 120:121:37
+4.3589 120:123:37
+-4.3589 120:123:37
+-4.23242 120:121:37
+4.3589 120:123:37
+4.48915 120:126:38
+-4.48915 120:126:38
+-4.3589 120:123:37
+4.48915 120:126:38
+4.6233 120:128:39
+-4.6233 120:128:39
+-4.48915 120:126:38
+4.6233 120:128:39
+4.76145 120:130:40
+-4.76145 120:130:40
+-4.6233 120:128:39
+4.76145 120:130:40
+4.90373 122:131:40
+-4.90373 122:131:40
+-4.76145 120:130:40
+4.90373 122:131:40
+5.05027 124:132:40
+-5.05027 124:132:40
+-4.90373 122:131:40
+5.05027 124:132:40
+5.20118 126:133:41
+-5.20118 126:133:41
+-5.05027 124:132:40
+5.20118 126:133:41
+5.3566 128:134:41
+-5.3566 128:134:41
+-5.20118 126:133:41
+5.3566 128:134:41
+5.51667 129:135:41
+-5.51667 129:135:41
+-5.3566 128:134:41
+5.51667 129:135:41
+5.68152 131:137:42
+-5.68152 131:137:42
+-5.51667 129:135:41
+5.68152 131:137:42
+5.8513 133:138:42
+-5.8513 133:138:42
+-5.68152 131:137:42
+5.8513 133:138:42
+6.02615 135:139:43
+-6.02615 135:139:43
+-5.8513 133:138:42
+6.02615 135:139:43
+6.20622 137:140:43
+-6.20622 137:140:43
+-6.02615 135:139:43
+6.20622 137:140:43
+6.39168 139:141:43
+-6.39168 139:141:43
+-6.20622 137:140:43
+6.39168 139:141:43
+6.58267 141:143:44
+-6.58267 141:143:44
+-6.39168 139:141:43
+6.58267 141:143:44
+6.77938 143:144:44
+-6.77938 143:144:44
+-6.58267 141:143:44
+6.77938 143:144:44
+6.98196 145:145:45
+-6.98196 145:145:45
+-6.77938 143:144:44
+6.98196 145:145:45
+7.1906 147:146:45
+-7.1906 147:146:45
+-6.98196 145:145:45
+7.1906 147:146:45
+7.40547 149:147:45
+-7.40547 149:147:45
+-7.1906 147:146:45
+7.40547 149:147:45
+7.62676 151:148:46
+-7.62676 151:148:46
+-7.40547 149:147:45
+7.62676 151:148:46
+7.85466 153:150:46
+-7.85466 153:150:46
+-7.62676 151:148:46
+7.85466 153:150:46
+8.08938 155:151:47
+-8.08938 155:151:47
+-7.85466 153:150:46
+8.08938 155:151:47
+8.3311 157:152:47
+-8.3311 157:152:47
+-8.08938 155:151:47
+8.3311 157:152:47
+8.58006 159:153:47
+-8.58006 159:153:47
+-8.3311 157:152:47
+8.58006 159:153:47
+8.83645 161:154:48
+-8.83645 161:154:48
+-8.58006 159:153:47
+8.83645 161:154:48
+9.1005 163:155:48
+-9.1005 163:155:48
+-8.83645 161:154:48
+9.1005 163:155:48
+9.37244 165:157:49
+-9.37244 165:157:49
+-9.1005 163:155:48
+9.37244 165:157:49
+9.65251 166:158:49
+-9.65251 166:158:49
+-9.37244 165:157:49
+9.65251 166:158:49
+9.94095 168:159:49
+-9.94095 168:159:49
+-9.65251 166:158:49
+9.94095 168:159:49
+10.238 171:161:52
+-10.238 171:161:52
+-9.94095 168:159:49
+10.238 171:161:52
+10.5439 175:166:56
+-10.5439 175:166:56
+-10.238 171:161:52
+10.5439 175:166:56
+10.859 179:170:61
+-10.859 179:170:61
+-10.5439 175:166:56
+10.859 179:170:61
+11.1835 183:175:66
+-11.1835 183:175:66
+-10.859 179:170:61
+11.1835 183:175:66
+11.5177 187:179:70
+-11.5177 187:179:70
+-11.1835 183:175:66
+11.5177 187:179:70
+11.8619 191:184:75
+-11.8619 191:184:75
+-11.5177 187:179:70
+11.8619 191:184:75
+12.2163 195:188:80
+-12.2163 195:188:80
+-11.8619 191:184:75
+12.2163 195:188:80
+12.5814 199:192:84
+-12.5814 199:192:84
+-12.2163 195:188:80
+12.5814 199:192:84
+12.9573 203:197:89
+-12.9573 203:197:89
+-12.5814 199:192:84
+12.9573 203:197:89
+13.3445 207:201:94
+-13.3445 207:201:94
+-12.9573 203:197:89
+13.3445 207:201:94
+13.7433 211:206:98
+-13.7433 211:206:98
+-13.3445 207:201:94
+13.7433 211:206:98
+14.154 215:210:103
+-14.154 215:210:103
+-13.7433 211:206:98
+14.154 215:210:103
+14.5769 219:215:108
+-14.5769 219:215:108
+-14.154 215:210:103
+14.5769 219:215:108
+15.0125 223:219:112
+-15.0125 223:219:112
+-14.5769 219:215:108
+15.0125 223:219:112
+15.4611 227:223:117
+-15.4611 227:223:117
+-15.0125 223:219:112
+15.4611 227:223:117
+15.9231 231:228:122
+-15.9231 231:228:122
+-15.4611 227:223:117
+15.9231 231:228:122
+16.3989 235:232:126
+-16.3989 235:232:126
+-15.9231 231:228:122
+16.3989 235:232:126
+16.889 239:237:131
+-16.889 239:237:131
+-16.3989 235:232:126
+16.889 239:237:131
+17.3937 243:241:135
+-17.3937 243:241:135
+-16.889 239:237:131
+17.3937 243:241:135
+17.9134 247:246:140
+-17.9134 247:246:140
+-17.3937 243:241:135
+17.9134 247:246:140
+18.4487 251:250:145
+-18.4487 251:250:145
+-17.9134 247:246:140
+18 255:255:150
+18.4487 251:250:145
+-18.4487 251:250:145
+-18 255:255:150
+nv 255:255:255
+default 255:255:255
Added: grass/trunk/raster/r.colors/test_volume_double_example4.ref
===================================================================
--- grass/trunk/raster/r.colors/test_volume_double_example4.ref (rev 0)
+++ grass/trunk/raster/r.colors/test_volume_double_example4.ref 2011-06-21 13:44:17 UTC (rev 46750)
@@ -0,0 +1,11 @@
+1 0:0:0
+2 255:255:0
+3 255:127:0
+4 255:0:0
+5 255:0:255
+6 0:127:255
+7 0:255:255
+8 0:255:0
+9 0:0:0
+nv 255:255:255
+default 255:255:255
Added: grass/trunk/raster/r.colors/test_volume_double_example4_inv.ref
===================================================================
--- grass/trunk/raster/r.colors/test_volume_double_example4_inv.ref (rev 0)
+++ grass/trunk/raster/r.colors/test_volume_double_example4_inv.ref 2011-06-21 13:44:17 UTC (rev 46750)
@@ -0,0 +1,11 @@
+1 0:0:0
+2 255:255:0
+3 255:127:0
+4 255:0:0
+5 255:0:255
+6 0:127:255
+7 0:255:255
+8 0:255:0
+9 0:0:0
+nv 255:255:255
+default 255:255:255
Added: grass/trunk/raster/r.colors/test_volume_double_example5.ref
===================================================================
--- grass/trunk/raster/r.colors/test_volume_double_example5.ref (rev 0)
+++ grass/trunk/raster/r.colors/test_volume_double_example5.ref 2011-06-21 13:44:17 UTC (rev 46750)
@@ -0,0 +1,11 @@
+1 0:0:0
+2 255:255:0
+3 255:127:0
+4 255:0:0
+5 255:0:255
+6 0:127:255
+7 0:255:255
+8 0:255:0
+9 0:0:0
+nv 255:255:255
+default 255:255:255
Modified: grass/trunk/raster/r.colors.out/main.c
===================================================================
--- grass/trunk/raster/r.colors.out/main.c 2011-06-20 20:54:02 UTC (rev 46749)
+++ grass/trunk/raster/r.colors.out/main.c 2011-06-21 13:44:17 UTC (rev 46750)
@@ -20,6 +20,9 @@
#include <grass/gis.h>
#include <grass/raster.h>
#include <grass/glocale.h>
+#ifdef USE_RASTER3D
+#include <grass/G3d.h>
+#endif
static FILE *fp;
static int perc;
@@ -60,13 +63,28 @@
G_gisinit(argv[0]);
module = G_define_module();
+#ifdef USE_RASTER3D
+ G_add_keyword(_("raster3d"));
+#else
G_add_keyword(_("raster"));
+#endif
+
G_add_keyword(_("export"));
G_add_keyword(_("color table"));
+
+#ifdef USE_RASTER3D
module->description =
+ _("Exports the color table associated with a raster3d map layer.");
+#else
+ module->description =
_("Exports the color table associated with a raster map layer.");
+#endif
+#ifdef USE_RASTER3D
+ opt.map = G_define_standard_option(G_OPT_R3_MAP);
+#else
opt.map = G_define_standard_option(G_OPT_R_MAP);
+#endif
opt.file = G_define_standard_option(G_OPT_F_OUTPUT);
opt.file->key = "rules";
@@ -85,10 +103,16 @@
file = opt.file->answer;
perc = flag.p->answer ? 1 : 0;
+#ifdef USE_RASTER3D
+ if (G3d_readColors(name, "", &colors) < 0)
+ G_fatal_error(_("Unable to read color table for raster3d map <%s>"), name);
+ G3d_readRange(name, "", &range);
+#else
if (Rast_read_colors(name, "", &colors) < 0)
- G_fatal_error(_("Unable to read color table for raster map <%s>"));
+ G_fatal_error(_("Unable to read color table for raster map <%s>"), name);
+ Rast_read_fp_range(name, "", &range);
+#endif
- Rast_read_fp_range(name, "", &range);
Rast_get_fp_range_min_max(&range, &min, &max);
if (!file || strcmp(file, "-") == 0)
More information about the grass-commit
mailing list