wxGUI: some improvement when creating new vector map using digitizer

       report time consumption for running command


git-svn-id: https://svn.osgeo.org/grass/grass/trunk@49181 15284696-431f-4ddb-bdfa-cd5b030d7da7

gui/wxpython/gui_modules/dbm_dialogs.py

@@ -168,10 +168,6 @@ class DisplayAttributesDialog(wx.Dialog):
             Debug.msg(2, "DisplayAttributesDialog(): Nothing found!")
             ### self.mapDBInfo = None
         
-    def __SelectAttributes(self, layer):
-        """!Select attributes"""
-        pass
-
     def OnSQLStatement(self, event):
         """!Update SQL statement"""
         pass
@@ -182,7 +178,7 @@ class DisplayAttributesDialog(wx.Dialog):
         @return True on attributes found
         @return False attributes not found
         """
-        return bool(self.notebook.GetPageCount())
+        return bool(self.mapDBInfo and self.notebook.GetPageCount() > 0)
     
     def GetSQLString(self, updateValues = False):
         """!Create SQL statement string based on self.sqlStatement

gui/wxpython/gui_modules/gcmd.py

@@ -32,6 +32,7 @@ import signal
 import locale
 import traceback
 import types
+import time
 
 import wx
 
@@ -591,11 +592,12 @@ def RunCommand(prog, flags = "", overwrite = False, quiet = False, verbose = Fal
     
     if stdin:
         kwargs['stdin'] = subprocess.PIPE
+
+    Debug.msg(2, "gcmd.RunCommand(): command started")
+    start = time.time()
     
     ps = grass.start_command(prog, flags, overwrite, quiet, verbose, **kwargs)
     
-    Debug.msg(2, "gcmd.RunCommand(): command started")
-
     if stdin:
         ps.stdin.write(stdin)
         ps.stdin.close()
@@ -605,8 +607,9 @@ def RunCommand(prog, flags = "", overwrite = False, quiet = False, verbose = Fal
     stdout, stderr = map(utils.DecodeString, ps.communicate())
     
     ret = ps.returncode
-    Debug.msg(1, "gcmd.RunCommand(): get return code %d" % ret)
-        
+    Debug.msg(1, "gcmd.RunCommand(): get return code %d (%.6f sec)" % \
+                  (ret, (time.time() - start)))
+    
     Debug.msg(3, "gcmd.RunCommand(): print error")
     if ret != 0 and parent:
         Debug.msg(2, "gcmd.RunCommand(): error %s" % stderr)

gui/wxpython/gui_modules/gdialogs.py

@@ -254,11 +254,14 @@ class NewVectorDialog(ElementDialog):
         if disableTable:
             self.table.Enable(False)
         
-        self.keycol = wx.TextCtrl(parent = self.panel, id =  wx.ID_ANY,
-                                  size = globalvar.DIALOG_SPIN_SIZE)
-        self.keycol.SetValue(UserSettings.Get(group = 'atm', key = 'keycolumn', subkey = 'value'))
-        if disableTable:
-            self.keycol.Enable(False)
+        if showType:
+            self.keycol = None
+        else:
+            self.keycol = wx.TextCtrl(parent = self.panel, id =  wx.ID_ANY,
+                                      size = globalvar.DIALOG_SPIN_SIZE)
+            self.keycol.SetValue(UserSettings.Get(group = 'atm', key = 'keycolumn', subkey = 'value'))
+            if disableTable:
+                self.keycol.Enable(False)
         
         self.addbox = wx.CheckBox(parent = self.panel,
                                   label = _('Add created map into layer tree'), style = wx.NO_BORDER)
@@ -280,7 +283,8 @@ class NewVectorDialog(ElementDialog):
         self.OnElement(event)
         
     def OnTable(self, event):
-        self.keycol.Enable(event.IsChecked())
+        if self.keycol:
+            self.keycol.Enable(event.IsChecked())
         
     def _layout(self):
         """!Do layout"""
@@ -293,17 +297,18 @@ class NewVectorDialog(ElementDialog):
         
         self.dataSizer.Add(item = self.table, proportion = 0,
                       flag = wx.EXPAND | wx.ALL, border = 1)
-
-        keySizer = wx.BoxSizer(wx.HORIZONTAL)
-        keySizer.Add(item = wx.StaticText(parent = self.panel, label = _("Key column:")),
-                     proportion = 0,
-                     flag = wx.ALIGN_CENTER_VERTICAL)
-        keySizer.AddSpacer(10)
-        keySizer.Add(item = self.keycol, proportion = 0,
-                     flag = wx.ALIGN_RIGHT)
-        self.dataSizer.Add(item = keySizer, proportion = 1,
-                           flag = wx.EXPAND | wx.ALL, border = 1)
-
+        
+        if self.keycol:
+            keySizer = wx.BoxSizer(wx.HORIZONTAL)
+            keySizer.Add(item = wx.StaticText(parent = self.panel, label = _("Key column:")),
+                         proportion = 0,
+                         flag = wx.ALIGN_CENTER_VERTICAL)
+            keySizer.AddSpacer(10)
+            keySizer.Add(item = self.keycol, proportion = 0,
+                         flag = wx.ALIGN_RIGHT)
+            self.dataSizer.Add(item = keySizer, proportion = 1,
+                               flag = wx.EXPAND | wx.ALL, border = 1)
+            
         self.dataSizer.AddSpacer(5)
         
         self.dataSizer.Add(item = self.addbox, proportion = 0,
@@ -328,7 +333,9 @@ class NewVectorDialog(ElementDialog):
 
     def GetKey(self):
         """!Get key column name"""
-        return self.keycol.GetValue()
+        if self.keycol:
+            return self.keycol.GetValue()
+        return UserSettings.Get(group = 'atm', key = 'keycolumn', subkey = 'value')
     
     def IsChecked(self, key):
         """!Get dialog properties

gui/wxpython/gui_modules/mapdisp_vdigit.py

@@ -170,7 +170,7 @@ class VDigitWindow(BufferedWindow):
                         self._geomAttrb(fid, addRecordDlg, 'area')
                         self._geomAttrb(fid, addRecordDlg, 'perimeter')
                 
-                if addRecordDlg.mapDBInfo and \
+                if addRecordDlg.IsFound() and \
                         addRecordDlg.ShowModal() == wx.ID_OK:
                     sqlfile = tempfile.NamedTemporaryFile(mode = "w")
                     for sql in addRecordDlg.GetSQLString():

gui/wxpython/gui_modules/toolbars.py

@@ -1046,7 +1046,7 @@ class VDigitToolbar(AbstractToolbar):
             dlg = CreateNewVector(self.parent,
                                   exceptMap = openVectorMap, log = self.log,
                                   cmd = (('v.edit',
-                                          { 'tool' : 'create' },
+                                          { 'flags' : 'b', 'tool' : 'create' },
                                           'map')),
                                   disableAdd = True)