wxGUI/nviz: minor fixes (missing wx config file)

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

gui/wxpython/gui_modules/nviz_mapdisp.py

@@ -252,7 +252,7 @@ class GLWindow(MapWindow, glcanvas.GLCanvas):
                               data['persp']['value'],
                               data['twist']['value'])
         
-        if event and event.zExag:
+        if event and event.zExag and data['z-exag'].has_key('value'):
             self._display.SetZExag(data['z-exag']['value'])
         
         if event:

gui/wxpython/gui_modules/nviz_tools.py

@@ -1266,7 +1266,11 @@ class NvizToolWindow(FN.FlatNotebook):
                     value = UserSettings.Get(group = 'nviz', key = 'view',
                                              subkey = ['height', 'value'], internal = True)
                 else:
-                    value = self.mapWindow.view[control]['value']
+                    try:
+                        value = self.mapWindow.view[control]['value']
+                    except KeyError:
+                        value = -1
+                
                 self.FindWindowById(win).SetValue(value)
         
         viewWin = self.FindWindowById(self.win['view']['pos'])

gui/wxpython/gui_modules/wxnviz.py

@@ -184,13 +184,13 @@ class Nviz(object):
         # first
         Nviz_set_light_position(self.data, 1, 0.68, -0.68, 0.80, 0.0)
         Nviz_set_light_bright(self.data,   1, 0.8)
-        Nviz_set_light_color(self.data,    1, 255, 255, 255)
+        Nviz_set_light_color(self.data,    1, 1.0, 1.0, 1.0)
         Nviz_set_light_ambient(self.data,  1, 0.2, 0.2, 0.2)
         
         # second
         Nviz_set_light_position(self.data, 2, 0.0, 0.0, 1.0, 0.0)
         Nviz_set_light_bright(self.data,   2, 0.5)
-        Nviz_set_light_color(self.data,    2, 255, 255, 255)
+        Nviz_set_light_color(self.data,    2, 1.0, 1.0, 1.0)
         Nviz_set_light_ambient(self.data,  2, 0.3, 0.3, 0.3)
         
         Debug.msg(3, "Nviz::SetLightsDefault()")
@@ -204,7 +204,7 @@ class Nviz(object):
         @param w local coordinate (default to 0)
         """
         Nviz_set_light_position(self.data, lid, x, y, z, w)
-        Nviz_set_light_color(self.data, lid, color[0], color[1], color[2])
+        Nviz_set_light_color(self.data, lid, color[0] / 255., color[1] / 255., color[2] / 255.)
         Nviz_set_light_bright(self.data, lid, bright)
         Nviz_set_light_ambient(self.data, lid, ambient, ambient, ambient)