[GRASS-SVN] r62033 - in grass/branches/releasebranch_7_0: gui/wxpython/core lib/nviz

[svn_grass at osgeo.org]

Author: annakrat
Date: 2014-09-17 20:51:49 -0700 (Wed, 17 Sep 2014)
New Revision: 62033

Modified:
   grass/branches/releasebranch_7_0/gui/wxpython/core/settings.py
   grass/branches/releasebranch_7_0/lib/nviz/map_obj.c
Log:
wxNviz: use black as default for vectors (merge from trunk, r62032)

Modified: grass/branches/releasebranch_7_0/gui/wxpython/core/settings.py
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/core/settings.py	2014-09-18 03:49:19 UTC (rev 62032)
+++ grass/branches/releasebranch_7_0/gui/wxpython/core/settings.py	2014-09-18 03:51:49 UTC (rev 62033)
@@ -657,7 +657,7 @@
                     'lines' : {
                         'show' : False,
                         'width' : 2,
-                        'color' : (0, 0, 255, 255), # blue
+                        'color' : (0, 0, 0, 255),
                         'flat' : False,
                         'height' : 0,
                         'rgbcolumn': None,
@@ -668,7 +668,7 @@
                         'size' : 100,
                         'width' : 2,
                         'marker' : 2,
-                        'color' : (0, 0, 255, 255), # blue
+                        'color' : (0, 0, 0, 255),
                         'height' : 0,
                         'rgbcolumn': None,
                         'sizecolumn': None,

Modified: grass/branches/releasebranch_7_0/lib/nviz/map_obj.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/nviz/map_obj.c	2014-09-18 03:49:19 UTC (rev 62032)
+++ grass/branches/releasebranch_7_0/lib/nviz/map_obj.c	2014-09-18 03:51:49 UTC (rev 62033)
@@ -101,7 +101,7 @@
 
 	/* initialize display parameters
 	   automatically select all surfaces to draw vector */
-	GV_set_style(new_id, 1, 0xFF0000, 2, 0);
+	GV_set_style(new_id, 1, 0x000000, 2, 0);
 	surf_list = GS_get_surf_list(&num_surfs);
 	if (num_surfs) {
 	    for (i = 0; i < num_surfs; i++) {
@@ -130,7 +130,7 @@
 	}
 
 	/* initialize display parameters */
-	GP_set_style(new_id, 0xFF0000, 2, 100, ST_X);
+	GP_set_style(new_id, 0x000000, 2, 100, ST_X);
 	surf_list = GS_get_surf_list(&num_surfs);
 	for (i = 0; i < num_surfs; i++) {
 	    GP_select_surf(new_id, surf_list[i]);