[GRASS-SVN] r52336 - grass/trunk/gui/wxpython/mapdisp

[svn_grass at osgeo.org]

Author: martinl
Date: 2012-07-07 02:22:51 -0700 (Sat, 07 Jul 2012)
New Revision: 52336

Modified:
   grass/trunk/gui/wxpython/mapdisp/frame.py
   grass/trunk/gui/wxpython/mapdisp/toolbars.py
Log:
wxGUI/mapdisp: add item for vector analysis tool (experimental, GSoC 2012)
               --- testing issues


Modified: grass/trunk/gui/wxpython/mapdisp/frame.py
===================================================================
--- grass/trunk/gui/wxpython/mapdisp/frame.py	2012-07-07 09:19:39 UTC (rev 52335)
+++ grass/trunk/gui/wxpython/mapdisp/frame.py	2012-07-07 09:22:51 UTC (rev 52336)
@@ -180,6 +180,7 @@
         self.dialogs['category'] = None
         self.dialogs['barscale'] = None
         self.dialogs['legend'] = None
+        self.dialogs['vnet'] = None
 
         self.decorationDialog = None # decoration/overlays
         
@@ -1322,6 +1323,17 @@
         """!Returns toolbar with zooming tools"""
         return self.toolbars['map']
 
+    def OnVnet(self, event):
+        """!Dialog for v.net* modules 
+        """
+        if self.dialogs['vnet']:
+            return
+        else:
+            from vnet.dialog import VNETDialog
+            self.dialogs['vnet'] = VNETDialog(parent = self)
+            self.dialogs['vnet'].CenterOnScreen()
+            self.dialogs['vnet'].Show()
+
     def SwitchTool(self, toolbar, event):
         """!Calls UpdateTools to manage connected toolbars"""
         self.UpdateTools(event)

Modified: grass/trunk/gui/wxpython/mapdisp/toolbars.py
===================================================================
--- grass/trunk/gui/wxpython/mapdisp/toolbars.py	2012-07-07 09:19:39 UTC (rev 52335)
+++ grass/trunk/gui/wxpython/mapdisp/toolbars.py	2012-07-07 09:22:51 UTC (rev 52336)
@@ -46,6 +46,8 @@
                             label = _('Add text layer')),
     'histogram'  : MetaIcon(img = 'layer-raster-histogram',
                             label = _('Create histogram of raster map')),
+    'vnet'       : MetaIcon(img = 'line-split',
+                            label = _('Vector network analysis (experimental, GSoC 2012)')),
     }
 
 NvizIcons = {
@@ -241,7 +243,8 @@
                       (MapIcons["profile"],    self.parent.OnProfile),
                       (MapIcons["scatter"],    self.parent.OnScatterplot),
                       (MapIcons["histogram"],  self.parent.OnHistogramPyPlot),
-                      (BaseIcons["histogramD"], self.parent.OnHistogram)))
+                      (BaseIcons["histogramD"], self.parent.OnHistogram),
+                      (MapIcons["vnet"],        self.parent.OnVnet)))
         
     def OnDecoration(self, event):
         """!Decorations overlay menu