[GRASS-SVN] r56499 - grass/branches/releasebranch_6_4/gui/wxpython/nviz

[svn_grass at osgeo.org]

Author: annakrat
Date: 2013-05-29 14:44:33 -0700 (Wed, 29 May 2013)
New Revision: 56499

Modified:
   grass/branches/releasebranch_6_4/gui/wxpython/nviz/mapwindow.py
   grass/branches/releasebranch_6_4/gui/wxpython/nviz/tools.py
Log:
wxNviz: merge fix (r56122) for #1961

Modified: grass/branches/releasebranch_6_4/gui/wxpython/nviz/mapwindow.py
===================================================================
--- grass/branches/releasebranch_6_4/gui/wxpython/nviz/mapwindow.py	2013-05-29 21:40:28 UTC (rev 56498)
+++ grass/branches/releasebranch_6_4/gui/wxpython/nviz/mapwindow.py	2013-05-29 21:44:33 UTC (rev 56499)
@@ -1790,7 +1790,9 @@
                                     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

Modified: grass/branches/releasebranch_6_4/gui/wxpython/nviz/tools.py
===================================================================
--- grass/branches/releasebranch_6_4/gui/wxpython/nviz/tools.py	2013-05-29 21:40:28 UTC (rev 56498)
+++ grass/branches/releasebranch_6_4/gui/wxpython/nviz/tools.py	2013-05-29 21:44:33 UTC (rev 56499)
@@ -4227,10 +4227,16 @@
             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)