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

[scm-commit@wald.intevation.org]

Author: aheinecke
Date: 2011-07-25 16:07:46 +0200 (Mon, 25 Jul 2011)
New Revision: 3662

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

........
  r347 | aheinecke | 2011-07-01 14:47:43 +0200 (Fri, 01 Jul 2011) | 3 lines
  
  Use decimal x/y format by default as it used to be in the old reportlab versions
  now it is %s which is way to much precision for us
........



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
   + /trunk/GREAT-ER:1-232,310,312-315,319,322,327,333,335,340-344,346-347

Modified: branches/3.0.0-all-models/GREAT-ER/ChangeLog
===================================================================
--- branches/3.0.0-all-models/GREAT-ER/ChangeLog	2011-07-25 13:59:51 UTC (rev 3661)
+++ branches/3.0.0-all-models/GREAT-ER/ChangeLog	2011-07-25 14:07:46 UTC (rev 3662)
@@ -27,6 +27,10 @@
 	* Greater/UI/mainwindow.py:
 		- Allow extra args for the mainwindow update_status_bar
 		  function to provide the same interface as thubans update_status_bar.
+	* Greater/Modules/plot.py:
+		- Use decimal x/y format by default as it used to be in the old
+		  reportlab versions before it was __repr__ %s which to much 
+		  precision causing the diagram to become unreadable.
 
 2006-05-10  Frank Koormann   <frank at intevation.de>
 

Modified: branches/3.0.0-all-models/GREAT-ER/Greater/Modules/plot.py
===================================================================
--- branches/3.0.0-all-models/GREAT-ER/Greater/Modules/plot.py	2011-07-25 13:59:51 UTC (rev 3661)
+++ branches/3.0.0-all-models/GREAT-ER/Greater/Modules/plot.py	2011-07-25 14:07:46 UTC (rev 3662)
@@ -80,11 +80,12 @@
 
     lp.xValueAxis.valueMin = 0
     lp.xValueAxis.valueMax = maxL
-    if maxL > 5:
-        lp.xValueAxis.valueStep = maxL/5
+    if maxL > 10:
+        lp.xValueAxis.valueStep = (maxL/10)
     else:
         lp.xValueAxis.valueStep = 1
-    lp.xValueAxis.labelTextFormat = '%3.0f'
+    lp.xValueAxis.labelTextFormat = '%d'
+    lp.yValueAxis.labelTextFormat = '%d'
 
     lp.yValueAxis.valueMin = minC
     lp.yValueAxis.valueMax = maxC