فهرست منبع

wxGUI: fix d.vect dialog when loading layer without db connection, caused by https://trac.osgeo.org/grass/changeset/72547

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@72626 15284696-431f-4ddb-bdfa-cd5b030d7da7
Anna Petrášová 7 سال پیش
والد
کامیت
09cd5bf0b5

+ 1 - 0
gui/wxpython/core/gthread.py

@@ -22,6 +22,7 @@ import wx
 import Queue
 
 from core.gconsole import EVT_CMD_DONE, wxCmdDone
+from core.gcmd import DecodeString
 
 
 class gThread(threading.Thread, wx.EvtHandler):

+ 1 - 0
gui/wxpython/dbmgr/base.py

@@ -251,6 +251,7 @@ class VirtualAttributeList(wx.ListCtrl,
         for column in columns:
             if globalvar.wxPythonPhoenix:
                 info.Text = column
+                info.SetAlign(wx.LIST_FORMAT_LEFT)
                 self.InsertColumn(i, info)
             else:
                 info.m_text = column

+ 1 - 1
gui/wxpython/gui_core/gselect.py

@@ -1139,7 +1139,7 @@ class ColumnSelect(ComboCtrl):
                             self.columns.remove(key)
                         except ValueError:
                             pass
-        except (KeyError, ValueError):
+        except (KeyError, ValueError, GException):
             self.columns[:] = []
 
         # update list

+ 3 - 1
gui/wxpython/gui_core/widgets.py

@@ -1087,7 +1087,7 @@ class SearchModuleWidget(wx.Panel):
         self._search.Bind(wx.EVT_TEXT_ENTER, self.OnEnter)
 
         if self._showTip:
-            self._searchTip = StaticWrapText(parent=self, id=wx.ID_ANY,
+            self._searchTip = wx.StaticText(parent=self, id=wx.ID_ANY,
                                   label="Choose a module", size=(-1, 35))
 
         if self._showChoice:
@@ -1160,6 +1160,7 @@ class SearchModuleWidget(wx.Panel):
         label = _("%d modules match") % len(commands)
         if self._showTip:
             self._searchTip.SetLabel(label)
+            self._searchTip.Wrap(self.GetSize()[0])
 
         self.showNotification.emit(message=label)
 
@@ -1193,6 +1194,7 @@ class SearchModuleWidget(wx.Panel):
             for module in self._results:
                 if cmd == module.data['command']:
                     self._searchTip.SetLabel(module.data['description'])
+                    self._searchTip.Wrap(self.GetSize()[0])
                     break
 
     def Reset(self):

+ 2 - 0
gui/wxpython/iclass/digit.py

@@ -167,7 +167,9 @@ class IClassVDigit(IVDigit):
         G_set_verbose(verbose)
 
         ret = Vect_get_num_lines(poMapInfoNew)
+        print os.listdir('/home/anna/grassdata/nc_spm_08_grass7/user1/.tmp/anna-laptop/vector')
         Vect_close(poMapInfoNew)
+        print os.listdir('/home/anna/grassdata/nc_spm_08_grass7/user1/.tmp/anna-laptop/vector')
 
         return ret
 

+ 2 - 1
gui/wxpython/iclass/frame.py

@@ -624,7 +624,8 @@ class IClassMapFrame(DoubleMapFrame):
             return
 
         # copy features to the temporary map
-        vname = self._getTempVectorName()
+        #vname = self._getTempVectorName()
+        vname = self.trainingAreaVector
         # avoid deleting temporary map
         os.environ['GRASS_VECTOR_TEMPORARY'] = '1'
         if digitClass.CopyMap(vname, tmp=True) == -1: