Просмотр исходного кода

remove GISPROMPT_COLOR def from gis.h

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@39880 15284696-431f-4ddb-bdfa-cd5b030d7da7
Martin Landa 15 лет назад
Родитель
Сommit
ea8563193f

+ 1 - 1
display/d.colortable/main.c

@@ -70,7 +70,7 @@ int main(int argc, char **argv)
     opt2->key = "color";
     opt2->type = TYPE_STRING;
     opt2->answer = DEFAULT_BG_COLOR;
-    opt2->gisprompt = GISPROMPT_COLOR;
+    opt2->gisprompt = "old_color,color,color";
     opt2->description =
 	_("Color of lines separating the colors of the color table");
 

+ 1 - 1
display/d.erase/main.c

@@ -37,7 +37,7 @@ int main(int argc, char *argv[])
     color->answer = DEFAULT_BG_COLOR;
     color->description =
 	_("Color to erase with, either a standard GRASS color or R:G:B triplet (separated by colons)");
-    color->gisprompt = GISPROMPT_COLOR;
+    color->gisprompt = "old_color,color,color";
 
     eraseframe = G_define_flag();
     eraseframe->key = 'f';

+ 2 - 2
display/d.geodesic/main.c

@@ -58,7 +58,7 @@ int main(int argc, char *argv[])
     parm.lcolor->type = TYPE_STRING;
     parm.lcolor->required = NO;
     parm.lcolor->description = _("Line color");
-    parm.lcolor->gisprompt = GISPROMPT_COLOR;
+    parm.lcolor->gisprompt = "old_color,color,color";
     parm.lcolor->answer = DEFAULT_FG_COLOR;
 
     parm.tcolor = G_define_option();
@@ -66,7 +66,7 @@ int main(int argc, char *argv[])
     parm.tcolor->type = TYPE_STRING;
     parm.tcolor->required = NO;
     parm.tcolor->description = _("Text color or \"none\"");
-    parm.tcolor->gisprompt = GISPROMPT_COLOR;
+    parm.tcolor->gisprompt = "old_color,color,color";
 
     if (G_parser(argc, argv))
 	exit(EXIT_FAILURE);

+ 1 - 1
display/d.graph/main.c

@@ -76,7 +76,7 @@ int main(int argc, char **argv)
     opt2->description = _("Color to draw with, either a standard GRASS color "
 			  "or R:G:B triplet");
     opt2->answer = DEFAULT_FG_COLOR;
-    opt2->gisprompt = GISPROMPT_COLOR;
+    opt2->gisprompt = "old_color,color,color";
 
     mapcoords = G_define_flag();
     mapcoords->key = 'm';

+ 1 - 1
display/d.legend/main.c

@@ -94,7 +94,7 @@ int main(int argc, char **argv)
     opt2->key = "color";
     opt2->type = TYPE_STRING;
     opt2->answer = DEFAULT_FG_COLOR;
-    opt2->gisprompt = GISPROMPT_COLOR;
+    opt2->gisprompt = "old_color,color,color";
     opt2->description = _("Sets the legend's text color");
 
     opt4 = G_define_option();

+ 2 - 2
display/d.linegraph/main.c

@@ -146,7 +146,7 @@ int main(int argc, char **argv)
     y_color_opt->type = TYPE_STRING;
     y_color_opt->required = NO;
     y_color_opt->multiple = YES;
-    y_color_opt->gisprompt = GISPROMPT_COLOR;
+    y_color_opt->gisprompt = "old_color,color,color";
     y_color_opt->answers = NULL;
 
     t_color_opt = G_define_option();
@@ -154,7 +154,7 @@ int main(int argc, char **argv)
     t_color_opt->description = _("Color for axis, tics, numbers, and title");
     t_color_opt->type = TYPE_STRING;
     t_color_opt->required = NO;
-    t_color_opt->gisprompt = GISPROMPT_COLOR;
+    t_color_opt->gisprompt = "old_color,color,color";
     t_color_opt->answer = DEFAULT_FG_COLOR;
 
     title[0] = G_define_option();

+ 2 - 2
display/d.measure/main.c

@@ -54,7 +54,7 @@ int main(int argc, char **argv)
     parm.c1->description = _("Line color 1");
     parm.c1->type = TYPE_STRING;
     parm.c1->required = NO;
-    parm.c1->gisprompt = GISPROMPT_COLOR;
+    parm.c1->gisprompt = "old_color,color,color";
     parm.c1->answer = DEFAULT_BG_COLOR;
 
     parm.c2 = G_define_option();
@@ -62,7 +62,7 @@ int main(int argc, char **argv)
     parm.c2->description = _("Line color 2");
     parm.c2->type = TYPE_STRING;
     parm.c2->required = NO;
-    parm.c2->gisprompt = GISPROMPT_COLOR;
+    parm.c2->gisprompt = "old_color,color,color";
     parm.c2->answer = DEFAULT_FG_COLOR;
 
     parm.s = G_define_flag();

+ 3 - 3
display/d.path/main.c

@@ -97,7 +97,7 @@ int main(int argc, char **argv)
     color_opt->type = TYPE_STRING;
     color_opt->answer = DEFAULT_FG_COLOR;
     color_opt->description = _("Original line color");
-    color_opt->gisprompt = GISPROMPT_COLOR;
+    color_opt->gisprompt = "old_color,color,color";
     color_opt->guisection = _("Rendering");
 
     hcolor_opt = G_define_option();
@@ -105,7 +105,7 @@ int main(int argc, char **argv)
     hcolor_opt->type = TYPE_STRING;
     hcolor_opt->answer = "red";
     hcolor_opt->description = _("Highlight color");
-    hcolor_opt->gisprompt = GISPROMPT_COLOR;
+    hcolor_opt->gisprompt = "old_color,color,color";
     hcolor_opt->guisection = _("Rendering");
 
     bgcolor_opt = G_define_option();
@@ -113,7 +113,7 @@ int main(int argc, char **argv)
     bgcolor_opt->type = TYPE_STRING;
     bgcolor_opt->answer = DEFAULT_BG_COLOR;
     bgcolor_opt->description = _("Background color");
-    bgcolor_opt->gisprompt = GISPROMPT_COLOR;
+    bgcolor_opt->gisprompt = "old_color,color,color";
     bgcolor_opt->guisection = _("Rendering");
 
     geo_f = G_define_flag();

+ 1 - 1
display/d.rast.arrow/main.c

@@ -118,7 +118,7 @@ int main(int argc, char **argv)
     opt3->type = TYPE_STRING;
     opt3->required = NO;
     opt3->answer = "green";
-    opt3->gisprompt = GISPROMPT_COLOR;
+    opt3->gisprompt = "old_color,color,color";
     opt3->description = _("Color for drawing arrows");
 
     opt4 = G_define_option();

+ 1 - 1
display/d.rast.num/main.c

@@ -89,7 +89,7 @@ int main(int argc, char **argv)
     opt3->type = TYPE_STRING;
     opt3->required = NO;
     opt3->answer = DEFAULT_FG_COLOR;
-    opt3->gisprompt = GISPROMPT_COLOR;
+    opt3->gisprompt = "old_color,color,color";
     opt3->key_desc = "color";
     opt3->description = _("Color for drawing text");
 

+ 1 - 1
display/d.rast/main.c

@@ -80,7 +80,7 @@ int main(int argc, char **argv)
     bg->key = "bg";
     bg->key_desc = "color";
     bg->type = TYPE_STRING;
-    bg->gisprompt = GISPROMPT_COLOR;
+    bg->gisprompt = "old_color,color,color";
     bg->required = NO;
     bg->description = _("Background color (for null)");
 

+ 2 - 2
display/d.rhumbline/main.c

@@ -56,7 +56,7 @@ int main(int argc, char *argv[])
     parm.lcolor->type = TYPE_STRING;
     parm.lcolor->required = NO;
     parm.lcolor->description = _("Line color");
-    parm.lcolor->gisprompt = GISPROMPT_COLOR;
+    parm.lcolor->gisprompt = "old_color,color,color";
     parm.lcolor->answer = DEFAULT_FG_COLOR;
 
 #ifdef CAN_DO_DISTANCES
@@ -65,7 +65,7 @@ int main(int argc, char *argv[])
     parm.tcolor->type = TYPE_STRING;
     parm.tcolor->required = NO;
     parm.tcolor->description = _("Text color");
-    parm.tcolor->gisprompt = GISPROMPT_COLOR;
+    parm.tcolor->gisprompt = "old_color,color,color";
 #endif
 
     if (G_parser(argc, argv))

+ 2 - 2
display/d.text/main.c

@@ -162,7 +162,7 @@ int main(int argc, char **argv)
     opt.fgcolor->required = NO;
     opt.fgcolor->description =
 	_("Text color, either a standard GRASS color or R:G:B triplet");
-    opt.fgcolor->gisprompt = GISPROMPT_COLOR;
+    opt.fgcolor->gisprompt = "old_color,color,color";
 
     opt.bgcolor = G_define_option();
     opt.bgcolor->key = "bgcolor";
@@ -170,7 +170,7 @@ int main(int argc, char **argv)
     opt.bgcolor->required = NO;
     opt.bgcolor->description =
         _("Text background color, either a standard GRASS color or R:G:B triplet");
-    opt.bgcolor->gisprompt = GISPROMPT_COLOR;
+    opt.bgcolor->gisprompt = "old_color,color,color";
 
     opt.line = G_define_option();
     opt.line->key = "line";

+ 2 - 2
display/d.thematic.area/main.c

@@ -121,7 +121,7 @@ int main(int argc, char **argv)
     colors_opt->multiple = YES;
     colors_opt->description = _("Colors (one per class).");
     /* This won't work. We would need multiple color prompt.
-     * colors_opt->gisprompt = GISPROMPT_COLOR; */
+     * colors_opt->gisprompt = "old_color,color,color"; */
 
     field_opt = G_define_standard_option(G_OPT_V_FIELD);
     field_opt->description =
@@ -144,7 +144,7 @@ int main(int argc, char **argv)
     bcolor_opt->answer = DEFAULT_FG_COLOR;
     bcolor_opt->description = _("Boundary color");
     bcolor_opt->guisection = _("Boundaries");
-    bcolor_opt->gisprompt = GISPROMPT_COLOR;
+    bcolor_opt->gisprompt = "old_color,color,color";
 
     legend_file_opt = G_define_standard_option(G_OPT_F_OUTPUT);
     legend_file_opt->key = "legendfile";

+ 1 - 1
display/d.title/main.c

@@ -58,7 +58,7 @@ int main(int argc, char **argv)
     opt2->type = TYPE_STRING;
     opt2->answer = DEFAULT_FG_COLOR;
     opt2->required = NO;
-    opt2->gisprompt = GISPROMPT_COLOR;
+    opt2->gisprompt = "old_color,color,color";
     opt2->description = _("Sets the text color");
 
     opt3 = G_define_option();

+ 2 - 2
display/d.vect.chart/main.c

@@ -117,7 +117,7 @@ int main(int argc, char **argv)
     ocolor_opt->type = TYPE_STRING;
     ocolor_opt->answer = DEFAULT_FG_COLOR;
     ocolor_opt->description = _("Outline color");
-    ocolor_opt->gisprompt = GISPROMPT_COLOR;
+    ocolor_opt->gisprompt = "old_color,color,color";
     ocolor_opt->guisection = _("Chart properties");
 
     colors_opt = G_define_option();
@@ -126,7 +126,7 @@ int main(int argc, char **argv)
     colors_opt->required = NO;
     colors_opt->multiple = YES;
     colors_opt->description = _("Colors used to fill charts");
-    colors_opt->gisprompt = GISPROMPT_COLOR;
+    colors_opt->gisprompt = "old_color,color,color";
     colors_opt->guisection = _("Chart properties");
 
     y_center_flag = G_define_flag();

+ 0 - 2
include/gis.h

@@ -104,8 +104,6 @@ static const char *GRASS_copyright __attribute__ ((unused))
 #define YES           1
 #define NO            0
 
-#define GISPROMPT_COLOR    "old_color,color,color"
-
 /* File/directory name lengths */
 #define GNAME_MAX 256
 #define GMAPSET_MAX 256