wxNviz: merge fix (https://trac.osgeo.org/grass/changeset/56122) for https://trac.osgeo.org/grass/ticket/1961

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

gui/wxpython/nviz/mapwindow.py

@@ -1803,7 +1803,9 @@ class GLWindow(MapWindow, glcanvas.GLCanvas):
                                     subkey = ('z-exag', 'max'))
         if zexagMax <= self.view['z-exag']['value']:
             self.view['z-exag']['max'] = self.view['z-exag']['value'] * 2
-        elif self.view['z-exag']['value'] < 1: 
+        elif self.view['z-exag']['value'] < 1:
+            if self.view['z-exag']['value'] == 0:
+                self.view['z-exag']['value'] = 1
             self.view['z-exag']['max'] = 10 * self.view['z-exag']['value'] 
         else: 
             self.view['z-exag']['max'] = zexagMax

gui/wxpython/nviz/tools.py

@@ -4477,10 +4477,16 @@ class NvizToolWindow(FN.FlatNotebook):
             zmin = self.mapWindow.view['z-exag']['min']
             zmax = self.mapWindow.view['z-exag']['max']
             zval = self.mapWindow.view['z-exag']['value']
-            
+
             for control in ('slider','text'):
-                self.FindWindowById(self.win['view']['height'][control]).SetRange(
-                                                                        hmin,hmax)
+                try:
+                    self.FindWindowById(self.win['view']['height'][control]).SetRange(
+                                                                             hmin, hmax)
+                except OverflowError:
+                    hmin = self.mapWindow.iview['height']['min'] = 0
+                    hmax = self.mapWindow.iview['height']['max'] = 10000
+                    hval = self.mapWindow.iview['height']['value'] = 5000
+                    self.FindWindowById(self.win['view']['height'][control]).SetRange(hmin, hmax)
                 self.FindWindowById(self.win['view']['z-exag'][control]).SetRange(
                                                                         zmin, zmax) 
                 self.FindWindowById(self.win['view']['height'][control]).SetValue(hval)