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

[svn_grass at osgeo.org]

Author: martinl
Date: 2008-04-14 15:00:53 -0400 (Mon, 14 Apr 2008)
New Revision: 30990

Modified:
   grass/trunk/gui/wxpython/gui_modules/digit.py
   grass/trunk/gui/wxpython/gui_modules/toolbars.py
Log:
wxGUI (digitizer): query tool works again

Modified: grass/trunk/gui/wxpython/gui_modules/digit.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/digit.py	2008-04-14 18:59:21 UTC (rev 30989)
+++ grass/trunk/gui/wxpython/gui_modules/digit.py	2008-04-14 19:00:53 UTC (rev 30990)
@@ -708,8 +708,8 @@
                   'map=%s' % self.map,
                   'tool=select',
                   'bbox=%f,%f,%f,%f' % (w, n, e, s),
-                  'query=%s' % UserSettings.Get(group='vdigit', key='query', subkey='thresh'),
-                  'thresh=%f' % thresh])
+                  'query=%s' % UserSettings.Get(group='vdigit', key='query', subkey='type'),
+                  'thresh=0,0,%f' % thresh])
 
         vEditCmd = gcmd.Command(vEdit)
         
@@ -1081,7 +1081,8 @@
 
         type = vdigit.GV_POINTS | vdigit.GV_LINES # TODO: 3D
         
-        ids = self.digit.SelectLinesByQuery(w, n, 0.0, e, s, 1000.0, UserSettings.Get(group='vdigit', key='query', subkey='box'),
+        ids = self.digit.SelectLinesByQuery(w, n, 0.0, e, s, 1000.0,
+                                            UserSettings.Get(group='vdigit', key='query', subkey='box'),
                                             query, type, thresh)
 
         Debug.msg(4, "VDigit.SelectLinesByQuery(): %s" % \

Modified: grass/trunk/gui/wxpython/gui_modules/toolbars.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/toolbars.py	2008-04-14 18:59:21 UTC (rev 30989)
+++ grass/trunk/gui/wxpython/gui_modules/toolbars.py	2008-04-14 19:00:53 UTC (rev 30990)
@@ -626,7 +626,8 @@
 
     def OnQuery(self, event):
         """Query selected lines/boundaries"""
-        Debug.msg(2, "Digittoolbar.OnQuery(): %s" % self.parent.digit.settings["query"][0])
+        Debug.msg(2, "Digittoolbar.OnQuery(): %s" % \
+                      UserSettings.Get(group='vdigit', key='query', subkey='type'))
         self.action="queryLine"
         self.parent.MapWindow.mouse['box'] = 'box'