[GRASS-SVN] r34657 - grass/trunk/gui/wxpython/gui_modules

[svn_grass at osgeo.org]

Author: martinl
Date: 2008-12-01 14:20:12 -0500 (Mon, 01 Dec 2008)
New Revision: 34657

Modified:
   grass/trunk/gui/wxpython/gui_modules/dbm.py
Log:
wxGUI/dbm: add list of columns for simple query
	   (merge from devbr6, r34656)


Modified: grass/trunk/gui/wxpython/gui_modules/dbm.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/dbm.py	2008-12-01 19:18:20 UTC (rev 34656)
+++ grass/trunk/gui/wxpython/gui_modules/dbm.py	2008-12-01 19:20:12 UTC (rev 34657)
@@ -590,13 +590,17 @@
             sqlSimple.Bind(wx.EVT_RADIOBUTTON,   self.OnChangeSql)
             sqlAdvanced.Bind(wx.EVT_RADIOBUTTON, self.OnChangeSql)
 
-            sqlWhere = wx.TextCtrl(parent=panel, id=wx.ID_ANY, value="",
-                                   style=wx.TE_PROCESS_ENTER)
+            sqlWhereColumn = wx.Choice(parent=panel, id=wx.ID_ANY,
+                                       size=(100,-1),
+                                       choices=self.mapDBInfo.GetColumns(self.mapDBInfo.layers[layer]['table']))
+            sqlWhereValue = wx.TextCtrl(parent=panel, id=wx.ID_ANY, value="",
+                                        style=wx.TE_PROCESS_ENTER)
+
             sqlStatement = wx.TextCtrl(parent=panel, id=wx.ID_ANY,
                                        value="SELECT * FROM %s" % \
                                            self.mapDBInfo.layers[layer]['table'],
                                        style=wx.TE_PROCESS_ENTER)
-            sqlWhere.Bind(wx.EVT_TEXT_ENTER,     self.OnApplySqlStatement)
+            sqlWhereValue.Bind(wx.EVT_TEXT_ENTER, self.OnApplySqlStatement)
             sqlStatement.Bind(wx.EVT_TEXT_ENTER, self.OnApplySqlStatement)
 
             sqlLabel = wx.StaticText(parent=panel, id=wx.ID_ANY,
@@ -613,8 +617,10 @@
             sqlSimpleSizer = wx.BoxSizer(wx.HORIZONTAL)
             sqlSimpleSizer.Add(item=sqlLabel,
                                flag=wx.ALIGN_CENTER_VERTICAL)
-            sqlSimpleSizer.Add(item=sqlWhere, proportion=1,
+            sqlSimpleSizer.Add(item=sqlWhereColumn,
                                flag=wx.EXPAND | wx.ALIGN_CENTER_VERTICAL)
+            sqlSimpleSizer.Add(item=sqlWhereValue, proportion=1,
+                               flag=wx.EXPAND | wx.ALIGN_CENTER_VERTICAL)
             sqlFlexSizer.Add(item=sqlSimpleSizer,
                              flag=wx.ALIGN_CENTER_VERTICAL | wx.EXPAND)
             sqlFlexSizer.Add(item=btnApply,
@@ -645,7 +651,8 @@
             self.layerPage[layer]['data']      = win.GetId()
             self.layerPage[layer]['simple']    = sqlSimple.GetId()
             self.layerPage[layer]['advanced']  = sqlAdvanced.GetId()
-            self.layerPage[layer]['where']     = sqlWhere.GetId()
+            self.layerPage[layer]['whereColumn'] = sqlWhereColumn.GetId()
+            self.layerPage[layer]['where']     = sqlWhereValue.GetId()
             self.layerPage[layer]['builder']   = btnSqlBuilder.GetId()
             self.layerPage[layer]['statement'] = sqlStatement.GetId()
 
@@ -1572,7 +1579,13 @@
         """Layer tab changed"""
         pageNum = event.GetSelection()
         self.layer = self.mapDBInfo.layers.keys()[pageNum]
+        
         try:
+            idCol = self.layerPage[self.layer]['whereColumn']
+        except KeyError:
+            idCol = None
+        
+        try:
             self.OnChangeSql(None)
             # update statusbar
             self.log.write(_("Number of loaded records: %d") % \
@@ -1580,7 +1593,12 @@
                                GetItemCount())
         except:
             pass
-
+        
+        if idCol:
+            winCol = self.FindWindowById(idCol)
+            table = self.mapDBInfo.layers[self.layer]["table"]
+            self.mapDBInfo.GetColumns(table)
+        
         event.Skip()
         
     def OnPageChanged(self, event):
@@ -1674,10 +1692,11 @@
         listWin = self.FindWindowById(self.layerPage[self.layer]['data'])
         if self.FindWindowById(self.layerPage[self.layer]['simple']).GetValue():
             # simple sql statement
-            where = self.FindWindowById(self.layerPage[self.layer]['where']).GetValue().strip()
+            whereCol = self.FindWindowById(self.layerPage[self.layer]['whereColumn']).GetStringSelection()
+            whereVal = self.FindWindowById(self.layerPage[self.layer]['where']).GetValue().strip()
             try:
-                if len(where) > 0:
-                    keyColumn = listWin.LoadData(self.layer, where=where)
+                if len(whereVal) > 0:
+                    keyColumn = listWin.LoadData(self.layer, where=whereCol + whereVal)
                 else:
                     keyColumn = listWin.LoadData(self.layer)
             except gcmd.CmdError, e: