|
@@ -560,14 +560,11 @@ class VectorDBInfo:
|
|
def _CheckDBConnection(self):
|
|
def _CheckDBConnection(self):
|
|
"""!Check DB connection"""
|
|
"""!Check DB connection"""
|
|
nuldev = file(os.devnull, 'w+')
|
|
nuldev = file(os.devnull, 'w+')
|
|
- self.layers = grass.vector_db(map=self.map, stderr=nuldev)
|
|
|
|
|
|
+ self.layers = grass.vector_db(map = self.map, stderr = nuldev)
|
|
nuldev.close()
|
|
nuldev.close()
|
|
|
|
|
|
- if (len(self.layers.keys()) == 0):
|
|
|
|
- return False
|
|
|
|
-
|
|
|
|
- return True
|
|
|
|
-
|
|
|
|
|
|
+ return bool(len(self.layers.keys()) > 0)
|
|
|
|
+
|
|
def _DescribeTables(self):
|
|
def _DescribeTables(self):
|
|
"""!Describe linked tables"""
|
|
"""!Describe linked tables"""
|
|
for layer in self.layers.keys():
|
|
for layer in self.layers.keys():
|
|
@@ -1484,13 +1481,6 @@ class GdalSelect(wx.Panel):
|
|
win.SetValue('')
|
|
win.SetValue('')
|
|
win.Show()
|
|
win.Show()
|
|
|
|
|
|
- if sel in (self.sourceMap['file'],
|
|
|
|
- self.sourceMap['dir']):
|
|
|
|
- if not self.ogr:
|
|
|
|
- self.OnSetFormat(event = None, format = 'GeoTIFF')
|
|
|
|
- else:
|
|
|
|
- self.OnSetFormat(event = None, format = 'ESRI Shapefile')
|
|
|
|
-
|
|
|
|
if sel == self.sourceMap['native']: # native
|
|
if sel == self.sourceMap['native']: # native
|
|
win.Enable(False)
|
|
win.Enable(False)
|
|
self.format.Enable(False)
|
|
self.format.Enable(False)
|
|
@@ -1506,6 +1496,13 @@ class GdalSelect(wx.Panel):
|
|
if self.parent.GetName() == 'MultiImportDialog':
|
|
if self.parent.GetName() == 'MultiImportDialog':
|
|
self.parent.list.DeleteAllItems()
|
|
self.parent.list.DeleteAllItems()
|
|
|
|
|
|
|
|
+ if sel in (self.sourceMap['file'],
|
|
|
|
+ self.sourceMap['dir']):
|
|
|
|
+ if not self.ogr:
|
|
|
|
+ self.OnSetFormat(event = None, format = 'GeoTIFF')
|
|
|
|
+ else:
|
|
|
|
+ self.OnSetFormat(event = None, format = 'ESRI Shapefile')
|
|
|
|
+
|
|
if sel == self.sourceMap['dir'] and not self.dest:
|
|
if sel == self.sourceMap['dir'] and not self.dest:
|
|
if not self.extension.IsShown():
|
|
if not self.extension.IsShown():
|
|
self.extensionText.Show()
|
|
self.extensionText.Show()
|