wxNviz: surface and volume default color changed to grey, changed label

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@47316 15284696-431f-4ddb-bdfa-cd5b030d7da7

gui/wxpython/gui_modules/nviz_tools.py

@@ -707,8 +707,9 @@ class NvizToolWindow(FN.FlatNotebook):
                           pos = (row, 2))
             
             if code == 'color':
+                color = UserSettings.Get(group = 'nviz', key = 'surface', subkey = ['color', 'value'])
                 value = csel.ColourSelect(panel, id = wx.ID_ANY,
-                                          colour = (0,0,0),
+                                          colour = color,
                                           size = globalvar.DIALOG_COLOR_SIZE)
                 value.Bind(csel.EVT_COLOURSELECT, self.OnSurfaceMap)
             elif code == 'mask':
@@ -1913,7 +1914,7 @@ class NvizToolWindow(FN.FlatNotebook):
         self.win['volume']['inout'] = inout.GetId()
         
         row = 1
-        for code, attrb in (('topo', _("Topography level")),
+        for code, attrb in (('topo', _("Isosurface value")),
                             ('color', _("Color")),
                             ('mask', _("Mask")),
                             ('transp', _("Transparency")),
@@ -1958,8 +1959,9 @@ class NvizToolWindow(FN.FlatNotebook):
                 map = None
             
             if code == 'color':
+                color = UserSettings.Get(group = 'nviz', key = 'volume', subkey = ['color', 'value'])
                 value = csel.ColourSelect(panel, id = wx.ID_ANY,
-                                          colour = (0,0,0),
+                                          colour = color,
                                           size = globalvar.DIALOG_COLOR_SIZE)
                 value.Bind(csel.EVT_COLOURSELECT, self.OnVolumeIsosurfMap)
                 value.SetName('color')

gui/wxpython/gui_modules/preferences.py

@@ -500,7 +500,7 @@ class Settings:
                         },
                     'color' : {
                         'map' : True,
-                        'value' : (0, 0, 0, 255), # constant: black
+                        'value' : (100, 100, 100, 255), # constant: grey
                         },
                     'draw' : {
                         'wire-color' : (136, 136, 136, 255),
@@ -542,7 +542,7 @@ class Settings:
                 'volume' : {
                     'color' : {
                         'map' : True,
-                        'value' : (0, 0, 0, 255), # constant: black
+                        'value' : (100, 100, 100, 255), # constant: grey
                         },
                     'draw' : {
                         'mode'       : 0, # isosurfaces
@@ -557,10 +557,6 @@ class Settings:
                         'map' : None,
                         'value' : 0.0
                         },
-                    'color': {
-                        'map' : True,
-                        'value': ''
-                        },
                     'transp': {
                         'map' : None,
                         'value': 0