[GRASS-SVN] r32035 - grass/trunk/visualization/nviz2/cmd

[svn_grass at osgeo.org]

Author: martinl
Date: 2008-07-06 16:51:09 -0400 (Sun, 06 Jul 2008)
New Revision: 32035

Modified:
   grass/trunk/visualization/nviz2/cmd/args.c
   grass/trunk/visualization/nviz2/cmd/local_proto.h
   grass/trunk/visualization/nviz2/cmd/main.c
Log:
nviz2/cmd: vector lines opts added

Modified: grass/trunk/visualization/nviz2/cmd/args.c
===================================================================
--- grass/trunk/visualization/nviz2/cmd/args.c	2008-07-06 20:45:30 UTC (rev 32034)
+++ grass/trunk/visualization/nviz2/cmd/args.c	2008-07-06 20:51:09 UTC (rev 32035)
@@ -208,6 +208,18 @@
     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 @@
     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
     */

Modified: grass/trunk/visualization/nviz2/cmd/local_proto.h
===================================================================
--- grass/trunk/visualization/nviz2/cmd/local_proto.h	2008-07-06 20:45:30 UTC (rev 32034)
+++ grass/trunk/visualization/nviz2/cmd/local_proto.h	2008-07-06 20:51:09 UTC (rev 32035)
@@ -13,7 +13,7 @@
   /* draw */
     *mode, *res_fine, *res_coarse, *style, *shade, *wire_color,
   /* vector */
-    *vector, 
+    *vector, *line_width, *line_color, *line_mode,
   /* misc */
     *exag, *bgcolor, 
   /* viewpoint */

Modified: grass/trunk/visualization/nviz2/cmd/main.c
===================================================================
--- grass/trunk/visualization/nviz2/cmd/main.c	2008-07-06 20:45:30 UTC (rev 32034)
+++ grass/trunk/visualization/nviz2/cmd/main.c	2008-07-06 20:51:09 UTC (rev 32035)
@@ -165,7 +165,7 @@
 
     /* draw */
     Nviz_draw_cplane(&data, -1, -1);
-    Nviz_draw_all (&data, 1); /* clear screen */
+    Nviz_draw_all (&data);
 
     /* write to image */
     ret = 0;