[GRASS-SVN] r53451 - in grass/branches/develbranch_6/gui/wxpython: dbmgr gui_core

[svn_grass at osgeo.org]

Author: martinl
Date: 2012-10-17 12:59:51 -0700 (Wed, 17 Oct 2012)
New Revision: 53451

Modified:
   grass/branches/develbranch_6/gui/wxpython/dbmgr/manager.py
   grass/branches/develbranch_6/gui/wxpython/gui_core/goutput.py
Log:
wxGUI: fix usage of internal variables


Modified: grass/branches/develbranch_6/gui/wxpython/dbmgr/manager.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/dbmgr/manager.py	2012-10-17 19:28:09 UTC (rev 53450)
+++ grass/branches/develbranch_6/gui/wxpython/dbmgr/manager.py	2012-10-17 19:59:51 UTC (rev 53451)
@@ -579,8 +579,8 @@
         self.panel = wx.Panel(parent = self, id = wx.ID_ANY)
 
         try:
-            self.map        = self.parent.curr_page.maptree.Map
-            self.mapdisplay = self.parent.curr_page.maptree.mapdisplay
+            self.map        = self.parent.GetLayerTree().GetMap()
+            self.mapdisplay = self.parent.GetLayerTree().GetMapDisplay()
         except:
             self.map = self.mapdisplay = None
         
@@ -1274,7 +1274,7 @@
             # set opacity based on queried layer
             if self.parent and self.parent.GetName() == "LayerManager" and \
                     self.treeItem:
-                maptree = self.parent.curr_page.maptree
+                maptree = self.parent.GetLayerTree()
                 opacity = maptree.GetPyData(self.treeItem)[0]['maplayer'].GetOpacity(float = True)
                 self.qlayer.SetOpacity(opacity)
             if zoom:
@@ -2102,9 +2102,9 @@
             name = dlg.GetName(full = True)
             if name and dlg.IsChecked('add'):
                 # add layer to map layer tree
-                self.parent.curr_page.maptree.AddLayer(ltype = 'vector',
-                                                       lname = name,
-                                                       lcmd = ['d.vect', 'map=%s' % name])
+                self.parent.GetLayerTree().AddLayer(ltype = 'vector',
+                                                    lname = name,
+                                                    lcmd = ['d.vect', 'map=%s' % name])
             dlg.Destroy()
             
     def OnDeleteSelected(self, event):

Modified: grass/branches/develbranch_6/gui/wxpython/gui_core/goutput.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_core/goutput.py	2012-10-17 19:28:09 UTC (rev 53450)
+++ grass/branches/develbranch_6/gui/wxpython/gui_core/goutput.py	2012-10-17 19:59:51 UTC (rev 53451)
@@ -527,20 +527,21 @@
                                          "Try adding it as a command layer instead.") % command[0])
                     return
                 
+                mapdisp = self.parent.GetMapDisplay()
                 if layertype == 'barscale':
-                    self.parent.curr_page.maptree.GetMapDisplay().OnAddBarscale(None)
+                    mapdisp.OnAddBarscale(None)
                 elif layertype == 'rastleg':
-                    self.parent.curr_page.maptree.GetMapDisplay().OnAddLegend(None)
+                    mapdisp.OnAddLegend(None)
                 elif layertype == 'redraw':
-                    self.parent.curr_page.maptree.GetMapDisplay().OnRender(None)
+                    mapdisp.OnRender(None)
                 else:
                     # add layer into layer tree
                     lname, found = utils.GetLayerNameFromCmd(command, fullyQualified = True,
                                                              layerType = layertype)
                     if self.parent.GetName() == "LayerManager":
-                        self.parent.curr_page.maptree.AddLayer(ltype = layertype,
-                                                               lname = lname,
-                                                               lcmd = command)
+                        self.parent.GetLayerTree().AddLayer(ltype = layertype,
+                                                            lname = lname,
+                                                            lcmd = command)
             
             else:
                 # other GRASS commands (r|v|g|...)