[Greater-commits] r3645 - in branches/3.0.0-all-models/GREAT-ER: . Greater/Modules Greater/UI

[scm-commit@wald.intevation.org]

Author: aheinecke
Date: 2011-07-25 15:10:16 +0200 (Mon, 25 Jul 2011)
New Revision: 3645

Modified:
   branches/3.0.0-all-models/GREAT-ER/
   branches/3.0.0-all-models/GREAT-ER/ChangeLog
   branches/3.0.0-all-models/GREAT-ER/Greater/Modules/catchment.py
   branches/3.0.0-all-models/GREAT-ER/Greater/UI/session.py
Log:
Merged revisions 229 via svnmerge from 
svn+ssh://wald.intevation.org/greater/trunk/GREAT-ER

........
  r229 | aheinecke | 2011-06-22 09:59:26 +0200 (Wed, 22 Jun 2011) | 2 lines
  
  Change some old classnames to new thuban classnames
........



Property changes on: branches/3.0.0-all-models/GREAT-ER
___________________________________________________________________
Name: svnmerge-integrated
   - /trunk/GREAT-ER:1-228
   + /trunk/GREAT-ER:1-229

Modified: branches/3.0.0-all-models/GREAT-ER/ChangeLog
===================================================================
--- branches/3.0.0-all-models/GREAT-ER/ChangeLog	2011-07-25 13:06:19 UTC (rev 3644)
+++ branches/3.0.0-all-models/GREAT-ER/ChangeLog	2011-07-25 13:10:16 UTC (rev 3645)
@@ -3,6 +3,7 @@
 	* Greater/UI/application.py: Use _dagreater_pg as default backend
 	* Greater/Modules/analysis.py: Change classnames to Thuban 1.2 names
 	* Greater/Dialogs/opensession.py: Add encoding line
+	* Greater/UI/session.py: Change classgen classnames to Thuban 1.2
 
 2006-05-10  Frank Koormann   <frank at intevation.de>
 

Modified: branches/3.0.0-all-models/GREAT-ER/Greater/Modules/catchment.py
===================================================================
--- branches/3.0.0-all-models/GREAT-ER/Greater/Modules/catchment.py	2011-07-25 13:06:19 UTC (rev 3644)
+++ branches/3.0.0-all-models/GREAT-ER/Greater/Modules/catchment.py	2011-07-25 13:10:16 UTC (rev 3645)
@@ -27,7 +27,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
@@ -664,12 +664,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: branches/3.0.0-all-models/GREAT-ER/Greater/UI/session.py
===================================================================
--- branches/3.0.0-all-models/GREAT-ER/Greater/UI/session.py	2011-07-25 13:06:19 UTC (rev 3644)
+++ branches/3.0.0-all-models/GREAT-ER/Greater/UI/session.py	2011-07-25 13:10:16 UTC (rev 3645)
@@ -28,7 +28,7 @@
 from Thuban.Model.color import Color
 from Thuban.Model.classification import Classification, \
                                         ClassGroupRange, ClassGroupProperties
-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, \
@@ -278,9 +278,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))