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

[scm-commit@wald.intevation.org]

Author: aheinecke
Date: 2011-07-26 11:32:20 +0200 (Tue, 26 Jul 2011)
New Revision: 3683

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/analysis.py
Log:
Merged revisions 3613 via svnmerge from 
svn+ssh://wald.intevation.org/greater/trunk/GREAT-ER

........
  r3613 | aheinecke | 2011-07-18 16:28:07 +0200 (Mon, 18 Jul 2011) | 3 lines
  
  generate_singletones no longer requires num_classes since we use new style
  ramps
........



Property changes on: branches/3.0.0-all-models/GREAT-ER
___________________________________________________________________
Name: svnmerge-integrated
   - /trunk/GREAT-ER:1-232,310,312-315,319,322,327,333,335,340-344,346-347,368,375,397-398,400,403,410,412-431,434-448,3577-3578,3604-3606,3611
   + /trunk/GREAT-ER:1-232,310,312-315,319,322,327,333,335,340-344,346-347,368,375,397-398,400,403,410,412-431,434-448,3577-3578,3604-3606,3611,3613

Modified: branches/3.0.0-all-models/GREAT-ER/ChangeLog
===================================================================
--- branches/3.0.0-all-models/GREAT-ER/ChangeLog	2011-07-26 09:30:37 UTC (rev 3682)
+++ branches/3.0.0-all-models/GREAT-ER/ChangeLog	2011-07-26 09:32:20 UTC (rev 3683)
@@ -8,6 +8,9 @@
 	* Greater/UI/application.py:
 		- Read Thuban Startup Files to enable Thuban extentions if they
 		  are available.
+	* Greater/Modules/analysis.py:
+		- Remove num_classes parameter from generate_singletons which
+		  is no longer necessary because of the new ramps in Thuban.
 
 2011-07-25  Andre Heinecke <aheinecke at intevation.de>
 

Modified: branches/3.0.0-all-models/GREAT-ER/Greater/Modules/analysis.py
===================================================================
--- branches/3.0.0-all-models/GREAT-ER/Greater/Modules/analysis.py	2011-07-26 09:30:37 UTC (rev 3682)
+++ branches/3.0.0-all-models/GREAT-ER/Greater/Modules/analysis.py	2011-07-26 09:32:20 UTC (rev 3683)
@@ -602,8 +602,7 @@
             numGroups = num_flow_classes * num_csim_classes
             _list = combined_classes_dict.keys()
             _list.sort()
-            clazz = generate_singletons(_list,
-                                        numGroups, green_to_red_ramp)
+            clazz = generate_singletons(_list, green_to_red_ramp)
             dg = clazz.GetDefaultGroup()
             dg.GetProperties().SetLineColor(Color(0,0,1))
             dg.SetVisible(0)