Procházet zdrojové kódy

wxGUI: assume layer is 1 instead of Nonewhen module does not have layer option (like v.vol.rst)

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@57689 15284696-431f-4ddb-bdfa-cd5b030d7da7
Anna Petrášová před 11 roky
rodič
revize
d4095e44b5
1 změnil soubory, kde provedl 7 přidání a 2 odebrání
  1. 7 2
      gui/wxpython/gui_core/gselect.py

+ 7 - 2
gui/wxpython/gui_core/gselect.py

@@ -949,9 +949,14 @@ class ColumnSelect(wx.combo.ComboCtrl):
             dbInfo = VectorDBInfo(vector)
             dbInfo = VectorDBInfo(vector)
         
         
         try:
         try:
-            table = dbInfo.GetTable(int(layer))
+            try:
+                layer = int(layer)
+            except TypeError:
+                # assuming layer 1
+                layer = 1
+            table = dbInfo.GetTable(layer)
             columnchoices = dbInfo.GetTableDesc(table)
             columnchoices = dbInfo.GetTableDesc(table)
-            keyColumn = dbInfo.GetKeyColumn(int(layer))
+            keyColumn = dbInfo.GetKeyColumn(layer)
             columns = len(columnchoices.keys()) * ['']
             columns = len(columnchoices.keys()) * ['']
             for key, val in columnchoices.iteritems():
             for key, val in columnchoices.iteritems():
                 columns[val['index']] = key
                 columns[val['index']] = key