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

nviz2/cmd: vector lines opts added

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

+ 44 - 0
visualization/nviz2/cmd/args.c

@@ -208,6 +208,18 @@ void parse_command(int argc, char* argv[], struct GParams *params)
     params->wire_color->answer = "136:136:136";
     params->wire_color->guisection = _("Draw");
 
+    /* shading */
+    params->shade = G_define_option();
+    params->shade->key = "shading";
+    params->shade->key_desc = "string";
+    params->shade->type = TYPE_STRING;
+    params->shade->required = YES;
+    params->shade->multiple = YES;
+    params->shade->description = _("Shading");
+    params->shade->options = "flat,gouraud";
+    params->shade->answer = "gouraud";
+    params->shade->guisection = _("Draw");
+
     /*
       vector
     */
@@ -218,6 +230,38 @@ void parse_command(int argc, char* argv[], struct GParams *params)
     params->vector->guisection = _("Vector");
     params->vector->key = "vector";
 
+    /* line width */
+    params->line_width = G_define_option();
+    params->line_width->key = "line_width";
+    params->line_width->key_desc = "value";
+    params->line_width->type = TYPE_INTEGER;
+    params->line_width->required = NO;
+    params->line_width->multiple = YES;
+    params->line_width->description = _("Vector line width");
+    params->line_width->guisection = _("Vector");
+    params->line_width->options = "1-100";
+
+    /* line color */
+    params->line_color = G_define_standard_option(G_OPT_C_FG);
+    params->line_color->multiple = YES;
+    params->line_color->required = NO;
+    params->line_color->label = _("Vector line color");
+    params->line_color->key = "line_color";
+    params->line_color->answer = "blue";
+    params->line_color->guisection = _("Vector");
+
+    /* shading */
+    params->line_mode = G_define_option();
+    params->line_mode->key = "line_display";
+    params->line_mode->key_desc = "string";
+    params->line_mode->type = TYPE_STRING;
+    params->line_mode->required = YES;
+    params->line_mode->multiple = YES;
+    params->line_mode->description = _("Vector line display mode");
+    params->line_mode->options = "surface,flat";
+    params->line_mode->answer = "surface";
+    params->line_mode->guisection = _("Vector");
+
     /*
       misc
     */

+ 1 - 1
visualization/nviz2/cmd/local_proto.h

@@ -13,7 +13,7 @@ struct GParams {
   /* draw */
     *mode, *res_fine, *res_coarse, *style, *shade, *wire_color,
   /* vector */
-    *vector, 
+    *vector, *line_width, *line_color, *line_mode,
   /* misc */
     *exag, *bgcolor, 
   /* viewpoint */

+ 1 - 1
visualization/nviz2/cmd/main.c

@@ -165,7 +165,7 @@ int main (int argc, char *argv[])
 
     /* draw */
     Nviz_draw_cplane(&data, -1, -1);
-    Nviz_draw_all (&data, 1); /* clear screen */
+    Nviz_draw_all (&data);
 
     /* write to image */
     ret = 0;