[GRASS-SVN] r54948 - grass/trunk/gui/wxpython/vnet

[svn_grass at osgeo.org]

Author: wenzeslaus
Date: 2013-02-06 01:35:22 -0800 (Wed, 06 Feb 2013)
New Revision: 54948

Modified:
   grass/trunk/gui/wxpython/vnet/dialogs.py
Log:
wxGUI/vnet: network analysis works for d.mon (patch provided by Stepan Turek)

Modified: grass/trunk/gui/wxpython/vnet/dialogs.py
===================================================================
--- grass/trunk/gui/wxpython/vnet/dialogs.py	2013-02-06 08:47:57 UTC (rev 54947)
+++ grass/trunk/gui/wxpython/vnet/dialogs.py	2013-02-06 09:35:22 UTC (rev 54948)
@@ -359,11 +359,11 @@
         selPanels = {}
         for dataSel in dataSelects:
             selPanels[dataSel[0]] = wx.Panel(parent = dataPanel)
-            if dataSel[0] == 'input' and self.mapWin.tree:
-                self.inputData[dataSel[0]] = dataSel[2](parent = selPanels[dataSel[0]],  
+            if dataSel[0] == 'input':
+                self.inputData[dataSel[0]] = dataSel[2](parent = selPanels[dataSel[0]],
                                                         size = (-1, -1), 
                                                         type = 'vector')
-
+            if dataSel[0] == 'input' and self.mapWin.tree:
                 icon = wx.Image(os.path.join(globalvar.ETCICONDIR, "grass", "layer-vector-add.png"))
                 icon.Rescale(18, 18)
                 icon = wx.BitmapFromImage(icon) 
@@ -373,7 +373,7 @@
                 self.addToTreeBtn.SetToolTipString(_("Add vector map into layer tree"))
                 self.addToTreeBtn.Disable()
                 self.addToTreeBtn.Bind(wx.EVT_BUTTON, self.OnToTreeBtn)
-            else:
+            elif dataSel[0] != 'input':
                 self.inputData[dataSel[0]] = dataSel[2](parent = selPanels[dataSel[0]],  
                                                         size = (-1, -1))
             label[dataSel[0]] =  wx.StaticText(parent =  selPanels[dataSel[0]], 
@@ -2444,10 +2444,10 @@
         if self.renderLayer:       
              self.DeleteRenderLayer()
 
-        self.renderLayer = self.parent.mapWin.Map.AddLayer(type = "vector",  command = cmd,
-                                                           l_active=True,    name = self.fullName, 
-                                                           l_hidden = True,  l_opacity = 1.0, 
-                                                           l_render = False,  pos = -1)
+        self.renderLayer = self.parent.mapWin.Map.AddLayer(ltype = "vector",     command = cmd,
+                                                           name = self.fullName, active = True,
+                                                           opacity = 1.0,        render = True,       
+                                                           pos = -1)
         return True
 
     def DeleteRenderLayer(self):