[GRASS-SVN] r57603 - in grass/trunk/gui/wxpython: dbmgr lmgr vdigit

[svn_grass at osgeo.org]

Author: annakrat
Date: 2013-09-06 06:22:05 -0700 (Fri, 06 Sep 2013)
New Revision: 57603

Modified:
   grass/trunk/gui/wxpython/dbmgr/base.py
   grass/trunk/gui/wxpython/lmgr/frame.py
   grass/trunk/gui/wxpython/vdigit/toolbars.py
Log:
wxGUI: fix creating new vector

Modified: grass/trunk/gui/wxpython/dbmgr/base.py
===================================================================
--- grass/trunk/gui/wxpython/dbmgr/base.py	2013-09-06 09:32:49 UTC (rev 57602)
+++ grass/trunk/gui/wxpython/dbmgr/base.py	2013-09-06 13:22:05 UTC (rev 57603)
@@ -581,7 +581,7 @@
 
 class DbMgrBase:
     def __init__(self, id = wx.ID_ANY, mapdisplay = None,
-                 vectorName = None, item = None, log = None,
+                 vectorName = None, item = None, giface = None,
                  statusbar = None, 
                  **kwargs):
         """!Base class, which enables usage of separate pages of Attribute Table Manager 
@@ -625,7 +625,7 @@
         else:
             self.dbMgrData['editable'] = True
         
-        self.cmdLog = log    # self.parent.goutput
+        self.giface = giface
 
         # status bar log class
         self.log = Log(statusbar) # -> statusbar
@@ -744,7 +744,7 @@
         self.parentDbMgrBase = parentDbMgrBase
 
         self.log = self.parentDbMgrBase.log
-        self.cmdLog = self.parentDbMgrBase.cmdLog
+        self.giface = self.parentDbMgrBase.giface
 
         self.map = self.parentDbMgrBase.map
         self.mapdisplay = self.parentDbMgrBase.mapdisplay
@@ -1707,13 +1707,13 @@
             return
         else:
             # dialog to get file name
-            dlg = CreateNewVector(parent = self, title = _('Extract selected features'),
-                                  log = self.cmdLog,
-                                  cmd = (('v.extract',
-                                          { 'input' : self.dbMgrData['vectName'],
-                                            'cats' : ListOfCatsToRange(cats) },
-                                          'output')),
-                                  disableTable = True)
+            dlg = CreateNewVector(parent=self, title=_('Extract selected features'),
+                                  giface=self.giface,
+                                  cmd=(('v.extract',
+                                        {'input': self.dbMgrData['vectName'],
+                                         'cats': ListOfCatsToRange(cats)},
+                                        'output')),
+                                  disableTable=True)
             if not dlg:
                 return
             

Modified: grass/trunk/gui/wxpython/lmgr/frame.py
===================================================================
--- grass/trunk/gui/wxpython/lmgr/frame.py	2013-09-06 09:32:49 UTC (rev 57602)
+++ grass/trunk/gui/wxpython/lmgr/frame.py	2013-09-06 13:22:05 UTC (rev 57603)
@@ -947,10 +947,10 @@
 
     def OnNewVector(self, event):
         """!Create new vector map layer"""
-        dlg = CreateNewVector(self, log = self._gconsole,
-                              cmd = (('v.edit',
-                                      { 'tool' : 'create' },
-                                      'map')))
+        dlg = CreateNewVector(self, giface=self._giface,
+                              cmd=(('v.edit',
+                                    {'tool': 'create'},
+                                    'map')))
         
         if not dlg:
             return

Modified: grass/trunk/gui/wxpython/vdigit/toolbars.py
===================================================================
--- grass/trunk/gui/wxpython/vdigit/toolbars.py	2013-09-06 09:32:49 UTC (rev 57602)
+++ grass/trunk/gui/wxpython/vdigit/toolbars.py	2013-09-06 13:22:05 UTC (rev 57603)
@@ -727,9 +727,9 @@
                 openVectorMap = None
             dlg = CreateNewVector(self.parent,
                                   exceptMap=openVectorMap, giface=self._giface,
-                                  cmd = (('v.edit',
-                                          { 'tool' : 'create' },
-                                          'map')),
+                                  cmd=(('v.edit',
+                                        {'tool': 'create'},
+                                        'map')),
                                   disableAdd = True)
             
             if dlg and dlg.GetName():