Changeset 69708

Timestamp:

Oct 19, 2016, 3:17:34 PM (8 years ago)

Author:

wenzeslaus

Message:

rasterlib: use G_str_to_color() for parsing color table rules

This introduces whatever syntax from G_str_to_color() to Rast_parse_color_rule(),
i.e. not only 'v r g b', 'v r:g:b', and 'v name' is supported, but also any other
separator from G_str_to_color() which now adds comma and semicolon.

Also hexadecimal colors from r69683 are now supported which makes the fact
that comments in color rules (indicated by hash) must start at the first column (character)
more important than before. (Comments starting in the middle of the line are not
currently supported, but from now on they cannot be supported because it would interfere
with color identification because hexadecimal colors are (usually and in G_str_to_color())
indicated by hash.)

Now also NONE/none color is parsed but considered as an syntax error and not reported
separately to the user.

Number of errors (error strings) reported to user was reduced because G_str_to_color()
has limited diagnostics. Specifically, out-of-range RGB values and broken syntax (which
includes and was not distinguished from wrong color names) is reported and syntax
error in color (if the paring of the whole rule was successful).

The commit removes last/only usage of the G_color_values() function. Named
colors for Rast_parse_color_rule() now go from the lib/gis/color_str.c file and
not from the lib/gis/named_colr.c file.

Location:

grass/trunk/lib/raster

Files:

• color_rules.c (modified) (6 diffs)
• testsuite (added)
• testsuite/rast_parse_color_rule.py (added)

grass/trunk/lib/raster/color_rules.c

@@ -1 +1 @@
 /*!
-  \file lib/raster/color_read.c
+  \file lib/raster/color_rules.c
   
   \brief Raster Library - Read and parse color rules file
   
-  (C) 2007 by the GRASS Development Team
+  (C) 2007-2016 by the GRASS Development Team
   
   This program is free software under the GNU General Public
@@ -16 +16 @@
 
 #include <grass/gis.h>
+#include <grass/colors.h>
 #include <grass/raster.h>
 #include <grass/glocale.h>
@@ -29 +30 @@
 {
     CR_OK = 0,
-    CR_ERROR_SYNTAX,
-    CR_ERROR_RGB,
-    CR_ERROR_COLOR,
+    CR_ERROR_RULE_SYNTAX,
+    CR_ERROR_COLOR_SYNTAX,
     CR_ERROR_PERCENT,
     CR_ERROR_VALUE,
@@ -39 +39 @@
   \brief Read color rule
 
-  \param min, max min & max values (used only when color rules are in percentage)
-  \param buf
-  \param val value
+  The val output parameter is always an absolute value and is derived
+  from the rule and the min and max values in case the rule is in percents.
+
+  Always only one of the norm, nval, and dflt output parameters is set
+  to non-zero value, the others are set to zero.
+
+  The return code can be translated to an error message using
+  the Rast_parse_color_rule_error() function.
+
+  \param min, max min & max values (used only when color rules are in percentage)
+  \param buf string with the color rule
+  \param[out] val value which the color is assigned to
   \param[out] r,g,b color values
-  \param norm
-  \param nval
-  \param dflt
-
-  \return 0 on failure
-  \return 1 on success
+  \param[out] norm set to non-zero value if the value and color are set
+  \param[out] nval set to non-zero value if rule is for null value
+  \param[out] dflt set to non-zero value if rule specifies the default color
+
+  \returns enum rule_error values (non-zero on failure)
 */
 int Rast_parse_color_rule(DCELL min, DCELL max, const char *buf,
@@ -61 +69 @@
 
     if (sscanf(buf, "%s %[^\n]", value, color) != 2)
-        return CR_ERROR_SYNTAX;
-
-    G_chop(color);
-
-    if (sscanf(color, "%d:%d:%d", r, g, b) == 3 ||
-        sscanf(color, "%d %d %d", r, g, b) == 3) {
-        if (*r < 0 || *r > 255 || *g < 0 || *g > 255 || *b < 0 || *b > 255)
-            return CR_ERROR_RGB;
-    }
-    else {
-        float fr, fg, fb;
-
-        if (G_color_values(color, &fr, &fg, &fb) < 0)
-            return CR_ERROR_COLOR;
-
-        *r = (int)(fr * 255.99);
-        *g = (int)(fg * 255.99);
-        *b = (int)(fb * 255.99);
-    }
+        return CR_ERROR_RULE_SYNTAX;
+
+    /* we don't allow 'none' color here (ret == 2) */
+    /* G_str_to_color chops and has only 1 error state */
+    if (G_str_to_color(color, r, g, b) != 1)
+            return CR_ERROR_COLOR_SYNTAX;
 
     G_chop(value);
@@ -122 +117 @@
     case CR_OK:
         return "";
-    case CR_ERROR_SYNTAX:
-        return _("syntax error");
+    case CR_ERROR_RULE_SYNTAX:
+        return _("syntax error in the color rule");
+    case CR_ERROR_COLOR_SYNTAX:
+        return _("syntax error in the color format");
+/* we no longer distinguish between these two errors
     case CR_ERROR_RGB:
         return _("R/G/B not in range 0-255");
     case CR_ERROR_COLOR:
         return _("invalid color name");
+*/
     case CR_ERROR_PERCENT:
         return _("percentage not in range 0-100");