[GRASS-SVN] r56924 - grass/trunk/gui/wxpython/scripts

[svn_grass at osgeo.org]

Author: annakrat
Date: 2013-06-25 13:58:38 -0700 (Tue, 25 Jun 2013)
New Revision: 56924

Modified:
   grass/trunk/gui/wxpython/scripts/vkrige.py
Log:
wxGUI/vkrige: another gui fix for #1619

Modified: grass/trunk/gui/wxpython/scripts/vkrige.py
===================================================================
--- grass/trunk/gui/wxpython/scripts/vkrige.py	2013-06-25 15:48:54 UTC (rev 56923)
+++ grass/trunk/gui/wxpython/scripts/vkrige.py	2013-06-25 20:58:38 UTC (rev 56924)
@@ -85,7 +85,8 @@
         self.InputDataColumn = gselect.ColumnSelect(self, id = wx.ID_ANY)
         flexSizer.Add(item = self.InputDataColumn)
         
-        self.InputDataMap.GetChildren()[0].Bind(wx.EVT_TEXT, self.OnInputDataChanged)
+        self.InputDataMap.GetChildren()[0].Bind(wx.EVT_TEXT, self.OnInputMapChanged)
+        self.InputDataColumn.GetChildren()[0].Bind(wx.EVT_TEXT, self.OnInputColumnChanged)
         
         InputBoxSizer.Add(item = flexSizer)
         
@@ -203,17 +204,21 @@
         
         event.Skip()
 
-    def OnInputDataChanged(self, event):
-        """ Refreshes list of columns and fills output map name TextCtrl """
+    def OnInputMapChanged(self, event):
+        """ Refreshes list of columns."""
         MapName = event.GetString()
         self.InputDataColumn.InsertColumns(vector = MapName,
                                    layer = 1, excludeKey = True,
                                    type = ['integer', 'double precision'])
-        self.InputDataColumn.SetSelection(0)
-        self.RunButton.Enable(self.InputDataColumn.GetSelection() is not -1)
-        self.RBookgstatPanel.PlotButton.Enable(self.InputDataColumn.GetSelection() is not -1)
+
+    def OnInputColumnChanged(self, event):
+        """Fills output map name TextCtrl """
+        MapName = self.InputDataMap.GetValue()
+        enable = bool(self.InputDataColumn.GetValue())
+        self.RunButton.Enable(enable)
+        self.RBookgstatPanel.PlotButton.Enable(enable)
         
-        if self.InputDataColumn.GetSelection() is not -1:
+        if enable:
             self.OutputMapName.SetValue(MapName.split("@")[0]+"_kriging")
             self.OutputVarianceMapName.SetValue(MapName.split("@")[0]+"_kriging_var")
         else:
@@ -267,9 +272,9 @@
     def _switchPage(self, priority):
         """!Manages @c 'output' notebook page according to priority."""
         if priority == 1:
-            self.notebook.HighlightPageByName('output')
+            self.RPackagesBook.HighlightPageByName('output')
         if priority >= 2:
-            self.notebook.SetSelectionByName('output')
+            self.RPackagesBook.SetSelectionByName('output')
         if priority >= 3:
             self.SetFocus()
             self.Raise()