[GRASS-SVN] r49086 - grass/branches/develbranch_6/gui/wxpython/gui_modules

[svn_grass at osgeo.org]

Author: annakrat
Date: 2011-11-03 13:34:24 -0700 (Thu, 03 Nov 2011)
New Revision: 49086

Modified:
   grass/branches/develbranch_6/gui/wxpython/gui_modules/colorrules.py
Log:
wxGUI: add missing parameters, avoid DB error when loading rules is stopped (merge from trunk, r49085)

Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/colorrules.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/colorrules.py	2011-11-03 20:28:09 UTC (rev 49085)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/colorrules.py	2011-11-03 20:34:24 UTC (rev 49086)
@@ -898,6 +898,7 @@
         # in version 7 v.colors used, otherwise color column only
         self.version7 = int(grass.version()['version'].split('.')[0]) >= 7
         self.colorTable = False
+        self.updateColumn = True
         # vector properties
         self.properties = {
             # vector layer for attribute table to use for setting color
@@ -1414,6 +1415,7 @@
                 else:
                     busy.Destroy()
                     dlg.Destroy()
+                    self.updateColumn = False
                     return
             
         self.rulesPanel.AddRules(i, start = True)
@@ -1558,8 +1560,10 @@
         if self.colorTable:
             ret = ColorTable.CreateColorTable(self)
         else:
-            ret = self.UpdateColorColumn(tmp)
-            
+            if self.updateColumn:
+                ret = self.UpdateColorColumn(tmp)
+            else:
+                ret = True
         return ret
         
     def UpdateColorColumn(self, tmp):
@@ -1616,7 +1620,7 @@
         else:
             self.UseAttrColumn(True)
         
-        return ColorTable.OnApply()
+        return ColorTable.OnApply(self, event)
         
 class ThematicVectorTable(VectorColorTable):
     def __init__(self, parent, vectorType, **kwargs):