Bladeren bron

wxNviz: other z-exag changes

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@51702 15284696-431f-4ddb-bdfa-cd5b030d7da7
Anna Petrášová 13 jaren geleden
bovenliggende
commit
bb5603fb0d
2 gewijzigde bestanden met toevoegingen van 3 en 3 verwijderingen
  1. 2 2
      gui/wxpython/core/workspace.py
  2. 1 1
      gui/wxpython/nviz/mapwindow.py

+ 2 - 2
gui/wxpython/core/workspace.py

@@ -495,7 +495,7 @@ class ProcessWorkspaceFile:
         view['z-exag']['value'] = self.__processLayerNvizNode(node_zexag, 'value', float)
         view['z-exag']['min'] = self.__processLayerNvizNode(node_zexag, 'min', int)
         view['z-exag']['max'] = self.__processLayerNvizNode(node_zexag, 'max', int)
-        iview['z-exag']['original'] = self.__processLayerNvizNode(node_zexag, 'original', float)
+        iview['z-exag']['llRatio'] = self.__processLayerNvizNode(node_zexag, 'llRatio', float)
         node_focus = node_view.find('focus')
         iview['focus'] = {}
         iview['focus']['x'] = self.__processLayerNvizNode(node_focus, 'x', int)
@@ -933,7 +933,7 @@ class WriteWorkspaceFile(object):
         self.file.write('%s<value>%.2f</value>\n' % (' ' * self.indent, view['z-exag']['value']))
         self.file.write('%s<min>%d</min>\n' % (' ' * self.indent, view['z-exag']['min']))
         self.file.write('%s<max>%d</max>\n' % (' ' * self.indent, view['z-exag']['max']))
-        self.file.write('%s<original>%.2f</original>\n' % (' ' * self.indent, iview['z-exag']['original']))
+        self.file.write('%s<llRatio>%.2f</llRatio>\n' % (' ' * self.indent, iview['z-exag']['llRatio']))
         self.indent -= 4
         self.file.write('%s</z-exag>\n' % (' ' * self.indent))
         # focus (look here)

+ 1 - 1
gui/wxpython/nviz/mapwindow.py

@@ -2440,7 +2440,7 @@ class GLWindow(MapWindow, glcanvas.GLCanvas):
         subcmd += "height=%d " % (self.iview['height']['value'])
         subcmd += "perspective=%d " % (self.view['persp']['value'])
         subcmd += "twist=%d " % (self.view['twist']['value'])
-        subcmd += "zexag=%d " % (self.view['z-exag']['value'] * self.iview['z-exag']['original'])
+        subcmd += "zexag=%f " % (self.view['z-exag']['value'] / self.iview['z-exag']['llRatio'])
         subcmd += "focus=%d,%d,%d " % (self.iview['focus']['x'],self.iview['focus']['y'],self.iview['focus']['z'])
         cmd += subcmd