소스 검색

wxNviz: use black as default for vectors (merge from trunk, https://trac.osgeo.org/grass/changeset/62032)

git-svn-id: https://svn.osgeo.org/grass/grass/branches/releasebranch_7_0@62033 15284696-431f-4ddb-bdfa-cd5b030d7da7
Anna Petrášová 10 년 전
부모
커밋
50bb6af565
2개의 변경된 파일4개의 추가작업 그리고 4개의 파일을 삭제
  1. 2 2
      gui/wxpython/core/settings.py
  2. 2 2
      lib/nviz/map_obj.c

+ 2 - 2
gui/wxpython/core/settings.py

@@ -657,7 +657,7 @@ class Settings:
                     '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 @@ class Settings:
                         'size' : 100,
                         'width' : 2,
                         'marker' : 2,
-                        'color' : (0, 0, 255, 255), # blue
+                        'color' : (0, 0, 0, 255),
                         'height' : 0,
                         'rgbcolumn': None,
                         'sizecolumn': None,

+ 2 - 2
lib/nviz/map_obj.c

@@ -101,7 +101,7 @@ int Nviz_new_map_obj(int type, const char *name, double value, nv_data * data)
 
 	/* 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 @@ int Nviz_new_map_obj(int type, const char *name, double value, nv_data * data)
 	}
 
 	/* 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]);