[Greater-commits] r229 - in trunk/GREAT-ER/Greater: Modules UI

[scm-commit@wald.intevation.org]

Author: aheinecke
Date: 2011-06-22 09:59:26 +0200 (Wed, 22 Jun 2011)
New Revision: 229

Modified:
   trunk/GREAT-ER/Greater/Modules/catchment.py
   trunk/GREAT-ER/Greater/UI/session.py
Log:
Change some old classnames to new thuban classnames


Modified: trunk/GREAT-ER/Greater/Modules/catchment.py
===================================================================
--- trunk/GREAT-ER/Greater/Modules/catchment.py	2011-06-22 07:58:00 UTC (rev 228)
+++ trunk/GREAT-ER/Greater/Modules/catchment.py	2011-06-22 07:59:26 UTC (rev 229)
@@ -25,7 +25,7 @@
 from Thuban.Model.map import Map
 from Thuban.Model.data import ShapefileStore
 from Thuban.UI.command import registry, Command, ToolCommand
-from Thuban.UI.view import Tool
+from Thuban.UI.viewport import PanTool
 from Thuban.UI.mainwindow import make_check_current_tool
 from Thuban.Model.table import FIELDTYPE_STRING, FIELDTYPE_INT, \
                                FIELDTYPE_DOUBLE, MemoryTable
@@ -592,12 +592,12 @@
 
 from Thuban.UI.command import registry, Command
 
-class EditTool(Tool):
+class EditTool(PanTool):
 
     """Tool to pick an object and run a dialog"""
 
     def __init__(self, view, name, context, function):
-        Tool.__init__(self, view)
+        PanTool.__init__(self, view)
         self.name = name
         self.context = context
         self.function = function

Modified: trunk/GREAT-ER/Greater/UI/session.py
===================================================================
--- trunk/GREAT-ER/Greater/UI/session.py	2011-06-22 07:58:00 UTC (rev 228)
+++ trunk/GREAT-ER/Greater/UI/session.py	2011-06-22 07:59:26 UTC (rev 229)
@@ -26,7 +26,7 @@
 from Thuban.Model.data import DerivedShapeStore
 from Thuban.Model.color import Color
 from Thuban.Model.classification import ClassGroupRange
-from Thuban.Model.classgen import GenQuantiles, GreenToRedRamp 
+from Thuban.Model.classgen import generate_quantiles, green_to_red_ramp 
 from Thuban.Model.range import Range
 
 from Greater.Modules.catchment import catchment_map_from_catchment, \
@@ -264,9 +264,9 @@
                     _list.append(res.StretchTable().ReadValue(i,
                                                         'CSIMINTERN_MEAN'))
                 _list.sort()
-                quantiles, clazz = GenQuantiles(_list,
+                quantiles, clazz = generate_quantiles(_list,
                                                 [ 0.25, 0.50, 0.75, 1.0 ],
-                                                GreenToRedRamp(),
+                                                green_to_red_ramp(),
                                                 Range(']0;oo['))
                 dg = clazz.GetDefaultGroup()
                 dg.GetProperties().SetLineColor(Color(0,0,1))