[GRASS-SVN] r47316 - grass/trunk/gui/wxpython/gui_modules

[svn_grass at osgeo.org]

Author: annakrat
Date: 2011-07-29 23:12:08 -0700 (Fri, 29 Jul 2011)
New Revision: 47316

Modified:
   grass/trunk/gui/wxpython/gui_modules/nviz_tools.py
   grass/trunk/gui/wxpython/gui_modules/preferences.py
Log:
wxNviz: surface and volume default color changed to grey, changed label

Modified: grass/trunk/gui/wxpython/gui_modules/nviz_tools.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/nviz_tools.py	2011-07-30 03:17:22 UTC (rev 47315)
+++ grass/trunk/gui/wxpython/gui_modules/nviz_tools.py	2011-07-30 06:12:08 UTC (rev 47316)
@@ -707,8 +707,9 @@
                           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 @@
         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 @@
                 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')

Modified: grass/trunk/gui/wxpython/gui_modules/preferences.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/preferences.py	2011-07-30 03:17:22 UTC (rev 47315)
+++ grass/trunk/gui/wxpython/gui_modules/preferences.py	2011-07-30 06:12:08 UTC (rev 47316)
@@ -500,7 +500,7 @@
                         },
                     '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 @@
                 '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 @@
                         'map' : None,
                         'value' : 0.0
                         },
-                    'color': {
-                        'map' : True,
-                        'value': ''
-                        },
                     'transp': {
                         'map' : None,
                         'value': 0