[GRASS-SVN] r44143 - in grass/branches/releasebranch_6_4:
gui/wxpython/xml raster raster/r.colors.out
svn_grass at osgeo.org
svn_grass at osgeo.org
Mon Nov 1 06:26:40 EDT 2010
Author: martinl
Date: 2010-11-01 03:26:40 -0700 (Mon, 01 Nov 2010)
New Revision: 44143
Added:
grass/branches/releasebranch_6_4/raster/r.colors.out/
grass/branches/releasebranch_6_4/raster/r.colors.out/Makefile
grass/branches/releasebranch_6_4/raster/r.colors.out/description.html
grass/branches/releasebranch_6_4/raster/r.colors.out/main.c
Removed:
grass/branches/releasebranch_6_4/raster/r.colors.out/Makefile
grass/branches/releasebranch_6_4/raster/r.colors.out/description.html
grass/branches/releasebranch_6_4/raster/r.colors.out/main.c
Modified:
grass/branches/releasebranch_6_4/gui/wxpython/xml/menudata.xml
grass/branches/releasebranch_6_4/raster/Makefile
Log:
r.colors.out: backported from trunk
Modified: grass/branches/releasebranch_6_4/gui/wxpython/xml/menudata.xml
===================================================================
--- grass/branches/releasebranch_6_4/gui/wxpython/xml/menudata.xml 2010-11-01 10:17:59 UTC (rev 44142)
+++ grass/branches/releasebranch_6_4/gui/wxpython/xml/menudata.xml 2010-11-01 10:26:40 UTC (rev 44143)
@@ -959,6 +959,13 @@
<handler>RulesCmd</handler>
<command>r.colors</command>
</menuitem>
+ <menuitem>
+ <label>Export color table</label>
+ <help>Exports the color table associated with a raster map layer.</help>
+ <keywords>raster,color table</keywords>
+ <handler>OnMenuCmd</handler>
+ <command>r.colors.out</command>
+ </menuitem>
<separator />
<menuitem>
<label>Blend 2 color rasters</label>
Modified: grass/branches/releasebranch_6_4/raster/Makefile
===================================================================
--- grass/branches/releasebranch_6_4/raster/Makefile 2010-11-01 10:17:59 UTC (rev 44142)
+++ grass/branches/releasebranch_6_4/raster/Makefile 2010-11-01 10:26:40 UTC (rev 44143)
@@ -12,6 +12,7 @@
r.clump \
r.coin \
r.colors \
+ r.colors.out \
r.composite \
r.compress \
r.contour \
Property changes on: grass/branches/releasebranch_6_4/raster/r.colors.out
___________________________________________________________________
Added: svn:ignore
+ OBJ.*
Deleted: grass/branches/releasebranch_6_4/raster/r.colors.out/Makefile
===================================================================
--- grass/branches/develbranch_6/raster/r.colors.out/Makefile 2010-11-01 07:52:05 UTC (rev 44137)
+++ grass/branches/releasebranch_6_4/raster/r.colors.out/Makefile 2010-11-01 10:26:40 UTC (rev 44143)
@@ -1,11 +0,0 @@
-MODULE_TOPDIR = ../..
-
-PGM = r.colors.out
-
-LIBES = $(RASTERLIB) $(GISLIB)
-DEPENDENCIES = $(RASTERDEP) $(GISDEP)
-
-include $(MODULE_TOPDIR)/include/Make/Module.make
-
-default: cmd
-
Copied: grass/branches/releasebranch_6_4/raster/r.colors.out/Makefile (from rev 44137, grass/branches/develbranch_6/raster/r.colors.out/Makefile)
===================================================================
--- grass/branches/releasebranch_6_4/raster/r.colors.out/Makefile (rev 0)
+++ grass/branches/releasebranch_6_4/raster/r.colors.out/Makefile 2010-11-01 10:26:40 UTC (rev 44143)
@@ -0,0 +1,11 @@
+MODULE_TOPDIR = ../..
+
+PGM = r.colors.out
+
+LIBES = $(GISLIB)
+DEPENDENCIES = $(GISDEP)
+
+include $(MODULE_TOPDIR)/include/Make/Module.make
+
+default: cmd
+
Deleted: grass/branches/releasebranch_6_4/raster/r.colors.out/description.html
===================================================================
--- grass/branches/develbranch_6/raster/r.colors.out/description.html 2010-11-01 07:52:05 UTC (rev 44137)
+++ grass/branches/releasebranch_6_4/raster/r.colors.out/description.html 2010-11-01 10:26:40 UTC (rev 44143)
@@ -1,24 +0,0 @@
-<h2>DESCRIPTION</h2>
-
-<em>r.colors.out</em> allows the user to export the color table for a
-raster map to a file which is suitable as input
-to <em><a href="r.colors.html">r.colors</a></em>.
-
-<h2>EXAMPLES</h2>
-
-<div class="code"><pre>
-r.colors.out map=el_D782_6m rules=rules.txt
-r.colors map=el_D783_6m rules=rules.txt
-</pre></div>
-
-<h2>SEE ALSO</h2>
-
-<em>
- <a href="r.colors.html">r.colors</a>
-</em>
-
-<h2>AUTHOR</h2>
-Glynn Clements
-
-<p>
-<i>Last changed: $Date$</i>
Copied: grass/branches/releasebranch_6_4/raster/r.colors.out/description.html (from rev 44137, grass/branches/develbranch_6/raster/r.colors.out/description.html)
===================================================================
--- grass/branches/releasebranch_6_4/raster/r.colors.out/description.html (rev 0)
+++ grass/branches/releasebranch_6_4/raster/r.colors.out/description.html 2010-11-01 10:26:40 UTC (rev 44143)
@@ -0,0 +1,24 @@
+<h2>DESCRIPTION</h2>
+
+<em>r.colors.out</em> allows the user to export the color table for a
+raster map to a file which is suitable as input
+to <em><a href="r.colors.html">r.colors</a></em>.
+
+<h2>EXAMPLES</h2>
+
+<div class="code"><pre>
+r.colors.out map=el_D782_6m rules=rules.txt
+r.colors map=el_D783_6m rules=rules.txt
+</pre></div>
+
+<h2>SEE ALSO</h2>
+
+<em>
+ <a href="r.colors.html">r.colors</a>
+</em>
+
+<h2>AUTHOR</h2>
+Glynn Clements
+
+<p>
+<i>Last changed: $Date$</i>
Deleted: grass/branches/releasebranch_6_4/raster/r.colors.out/main.c
===================================================================
--- grass/branches/develbranch_6/raster/r.colors.out/main.c 2010-11-01 07:52:05 UTC (rev 44137)
+++ grass/branches/releasebranch_6_4/raster/r.colors.out/main.c 2010-11-01 10:26:40 UTC (rev 44143)
@@ -1,144 +0,0 @@
-
-/****************************************************************************
- *
- * MODULE: r.colors.out
- *
- * AUTHOR(S): Glynn Clements
- *
- * PURPOSE: Allows export of the color table for a raster map layer.
- *
- * COPYRIGHT: (C) 2008, 2010 Glynn Clements and the GRASS Development Team
- *
- * This program is free software under the GNU General
- * Public License (>=v2). Read the file COPYING that
- * comes with GRASS for details.
- *
- ***************************************************************************/
-
-#include <stdlib.h>
-#include <string.h>
-#include <grass/gis.h>
-#include <grass/raster.h>
-#include <grass/glocale.h>
-
-static FILE *fp;
-static int perc;
-static DCELL min, max;
-
-static void write_rule(DCELL *val, int r, int g, int b)
-{
- static DCELL v0;
- static int r0 = -1, g0 = -1, b0 = -1;
-
- if (v0 == *val && r0 == r && g0 == g && b0 == b)
- return;
- v0 = *val, r0 = r, g0 = g, b0 = b;
-
- if (perc)
- fprintf(fp, "%g%% %d:%d:%d\n", 100 * (*val - min) / (max - min), r, g, b);
- else
- fprintf(fp, "%g %d:%d:%d\n", *val, r, g, b);
-}
-
-int main(int argc, char **argv)
-{
- struct GModule *module;
- struct
- {
- struct Option *map, *file;
- } opt;
- struct
- {
- struct Flag *p;
- } flag;
- const char *name, *file, *mapset;
- struct Colors colors;
- struct FPRange range;
- int count;
- int i;
-
- G_gisinit(argv[0]);
-
- module = G_define_module();
- module->keywords = _("raster, export, color table");
- module->description =
- _("Exports the color table associated with a raster map layer.");
-
- opt.map = G_define_standard_option(G_OPT_R_MAP);
-
- opt.file = G_define_standard_option(G_OPT_F_OUTPUT);
- opt.file->key = "rules";
- opt.file->label = _("Path to output rules file");
- opt.file->description = _("\"-\" to write to stdout");
-
- flag.p = G_define_flag();
- flag.p->key = 'p';
- flag.p->description = _("Output values as percentages");
-
- if (G_parser(argc, argv))
- exit(EXIT_FAILURE);
-
- name = opt.map->answer;
- file = opt.file->answer;
- perc = flag.p->answer ? 1 : 0;
-
- mapset = G_find_cell2(name, "");
- if (mapset == NULL)
- G_fatal_error(_("Raster map <%s> not found"), name);
-
- if (G_read_colors(name, "", &colors) < 0)
- G_fatal_error(_("Unable to read color table for raster map <%s>"));
-
- G_read_fp_range(name, "", &range);
- G_get_fp_range_min_max(&range, &min, &max);
-
- if (!file || strcmp(file, "-") == 0)
- fp = stdout;
- else {
- fp = fopen(file, "w");
- if (!fp)
- G_fatal_error(_("Unable to open output file <%s>"), file);
- }
-
- if (colors.version < 0) {
- /* 3.0 format */
- CELL lo, hi;
-
- G_get_color_range(&lo, &hi, &colors);
-
- for (i = lo; i <= hi; i++) {
- unsigned char r, g, b, set;
- DCELL val = (DCELL) i;
- G_lookup_colors(&i, &r, &g, &b, &set, 1, &colors);
- write_rule(&val, r, g, b);
- }
- }
- else {
- count = G_colors_count(&colors);
-
- for (i = 0; i < count; i++) {
- DCELL val1, val2;
- unsigned char r1, g1, b1, r2, g2, b2;
-
- G_get_f_color_rule(&val1, &r1, &g1, &b1,
- &val2, &r2, &g2, &b2,
- &colors, count - 1 - i);
-
- write_rule(&val1, r1, g1, b1);
- write_rule(&val2, r2, g2, b2);
- }
- }
-
- {
- int r, g, b;
- G_get_null_value_color(&r, &g, &b, &colors);
- fprintf(fp, "nv %d:%d:%d\n", r, g, b);
- G_get_default_color(&r, &g, &b, &colors);
- fprintf(fp, "default %d:%d:%d\n", r, g, b);
- }
-
- if (fp != stdout)
- fclose(fp);
-
- exit(EXIT_SUCCESS);
-}
Copied: grass/branches/releasebranch_6_4/raster/r.colors.out/main.c (from rev 44137, grass/branches/develbranch_6/raster/r.colors.out/main.c)
===================================================================
--- grass/branches/releasebranch_6_4/raster/r.colors.out/main.c (rev 0)
+++ grass/branches/releasebranch_6_4/raster/r.colors.out/main.c 2010-11-01 10:26:40 UTC (rev 44143)
@@ -0,0 +1,145 @@
+
+/****************************************************************************
+ *
+ * MODULE: r.colors.out
+ *
+ * AUTHOR(S): Glynn Clements
+ *
+ * PURPOSE: Allows export of the color table for a raster map layer.
+ *
+ * COPYRIGHT: (C) 2008, 2010 Glynn Clements and the GRASS Development Team
+ *
+ * This program is free software under the GNU General
+ * Public License (>=v2). Read the file COPYING that
+ * comes with GRASS for details.
+ *
+ ***************************************************************************/
+
+#include <stdlib.h>
+#include <string.h>
+#include <grass/gis.h>
+#include <grass/raster.h>
+#include <grass/glocale.h>
+
+static FILE *fp;
+static int perc;
+static DCELL min, max;
+
+static void write_rule(DCELL *val, int r, int g, int b)
+{
+ static DCELL v0;
+ static int r0 = -1, g0 = -1, b0 = -1;
+
+ if (v0 == *val && r0 == r && g0 == g && b0 == b)
+ return;
+ v0 = *val, r0 = r, g0 = g, b0 = b;
+
+ if (perc)
+ fprintf(fp, "%g%% %d:%d:%d\n", 100 * (*val - min) / (max - min), r, g, b);
+ else
+ fprintf(fp, "%g %d:%d:%d\n", *val, r, g, b);
+}
+
+int main(int argc, char **argv)
+{
+ struct GModule *module;
+ struct
+ {
+ struct Option *map, *file;
+ } opt;
+ struct
+ {
+ struct Flag *p;
+ } flag;
+ const char *name, *file, *mapset;
+ struct Colors colors;
+ struct FPRange range;
+ int count;
+ int i;
+
+ G_gisinit(argv[0]);
+
+ module = G_define_module();
+ module->keywords = _("raster, export, color table");
+ module->description =
+ _("Exports the color table associated with a raster map layer.");
+
+ opt.map = G_define_standard_option(G_OPT_R_MAP);
+
+ opt.file = G_define_standard_option(G_OPT_F_OUTPUT);
+ opt.file->key = "rules";
+ opt.file->label = _("Path to output rules file");
+ opt.file->description = _("\"-\" to write to stdout");
+ opt.file->answer = "-";
+
+ flag.p = G_define_flag();
+ flag.p->key = 'p';
+ flag.p->description = _("Output values as percentages");
+
+ if (G_parser(argc, argv))
+ exit(EXIT_FAILURE);
+
+ name = opt.map->answer;
+ file = opt.file->answer;
+ perc = flag.p->answer ? 1 : 0;
+
+ mapset = G_find_cell2(name, "");
+ if (mapset == NULL)
+ G_fatal_error(_("Raster map <%s> not found"), name);
+
+ if (G_read_colors(name, "", &colors) < 0)
+ G_fatal_error(_("Unable to read color table for raster map <%s>"));
+
+ G_read_fp_range(name, "", &range);
+ G_get_fp_range_min_max(&range, &min, &max);
+
+ if (!file || strcmp(file, "-") == 0)
+ fp = stdout;
+ else {
+ fp = fopen(file, "w");
+ if (!fp)
+ G_fatal_error(_("Unable to open output file <%s>"), file);
+ }
+
+ if (colors.version < 0) {
+ /* 3.0 format */
+ CELL lo, hi;
+
+ G_get_color_range(&lo, &hi, &colors);
+
+ for (i = lo; i <= hi; i++) {
+ unsigned char r, g, b, set;
+ DCELL val = (DCELL) i;
+ G_lookup_colors(&i, &r, &g, &b, &set, 1, &colors);
+ write_rule(&val, r, g, b);
+ }
+ }
+ else {
+ count = G_colors_count(&colors);
+
+ for (i = 0; i < count; i++) {
+ DCELL val1, val2;
+ unsigned char r1, g1, b1, r2, g2, b2;
+
+ G_get_f_color_rule(&val1, &r1, &g1, &b1,
+ &val2, &r2, &g2, &b2,
+ &colors, count - 1 - i);
+
+ write_rule(&val1, r1, g1, b1);
+ write_rule(&val2, r2, g2, b2);
+ }
+ }
+
+ {
+ int r, g, b;
+ G_get_null_value_color(&r, &g, &b, &colors);
+ fprintf(fp, "nv %d:%d:%d\n", r, g, b);
+ G_get_default_color(&r, &g, &b, &colors);
+ fprintf(fp, "default %d:%d:%d\n", r, g, b);
+ }
+
+ if (fp != stdout)
+ fclose(fp);
+
+ exit(EXIT_SUCCESS);
+}
More information about the grass-commit
mailing list