Sfoglia il codice sorgente

wxGUI: fix linking postgis vectors

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@44300 15284696-431f-4ddb-bdfa-cd5b030d7da7
Martin Landa 14 anni fa
parent
commit
7514978255

+ 2 - 2
gui/wxpython/gui_modules/gdialogs.py

@@ -1042,7 +1042,7 @@ class ImportDialog(wx.Dialog):
         """!Import/Link data (each layes as separate vector map)"""
         pass
     
-    def AddLayers(self, returncode):
+    def AddLayers(self, returncode, cmd = None):
         """!Add imported/linked layers into layer tree"""
         self.commandId += 1
         
@@ -1282,7 +1282,7 @@ class LayersList(wx.ListCtrl, listmix.ListCtrlAutoWidthMixin,
             self.SetStringItem(index, 1, "%s" % str(name))
             self.SetStringItem(index, 2, "%s" % str(grassName))
             # check by default
-            self.CheckItem(index, True)
+            ### self.CheckItem(index, True)
         
         self.SetColumnWidth(col=0, width=wx.LIST_AUTOSIZE_USEHEADER)
 

+ 5 - 5
gui/wxpython/gui_modules/gselect.py

@@ -1201,7 +1201,7 @@ class GdalSelect(wx.Panel):
         
         layerId = 1
         if self.format.GetStringSelection() == 'PostgreSQL':
-            dsn = 'PG:dbname=%s' % self.input[self.dsnType][1].GetStringSelection()
+            dsn = 'PG:dbname=%s' % self.input[self.dsnType][1].GetValue()
         else:
             dsn = self.input[self.dsnType][1].GetValue()
         if self.dsnType == 'file':
@@ -1221,13 +1221,13 @@ class GdalSelect(wx.Panel):
         elif self.dsnType == 'db':
             ret = gcmd.RunCommand('v.in.ogr',
                                   quiet = True,
-                                  parent = self,
                                   read = True,
                                   flags = 'l',
                                   dsn = dsn)
             if not ret:
-                self.list.LoadData()
-                self.btn_run.Enable(False)
+                self.parent.list.LoadData()
+                if hasattr(self, "btn_run"):
+                    self.btn_run.Enable(False)
                 return
             layerId = 1
             for line in ret.splitlines():
@@ -1319,7 +1319,7 @@ class GdalSelect(wx.Panel):
     def GetDsn(self):
         """!Get DSN"""
         if self.format.GetStringSelection() == 'PostgreSQL':
-            return 'PG:dbname=%s' % self.input[self.dsnType][1].GetStringSelection()
+            return 'PG:dbname=%s' % self.input[self.dsnType][1].GetValue()
         
         return self.input[self.dsnType][1].GetValue()