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

[scm-commit@wald.intevation.org]

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

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/results.py
   branches/3.0.0-all-models/GREAT-ER/Greater/UI/context.py
Log:
Merged revisions 397-398 via svnmerge from 
svn+ssh://wald.intevation.org/greater/trunk/GREAT-ER

........
  r397 | bricks | 2011-07-11 12:10:41 +0200 (Mon, 11 Jul 2011) | 2 lines
  
  Fix typo
........
  r398 | bricks | 2011-07-11 12:11:49 +0200 (Mon, 11 Jul 2011) | 2 lines
  
  Fix: Check if map is a GreaterMap
........



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

Modified: branches/3.0.0-all-models/GREAT-ER/ChangeLog
===================================================================
--- branches/3.0.0-all-models/GREAT-ER/ChangeLog	2011-07-25 14:11:41 UTC (rev 3664)
+++ branches/3.0.0-all-models/GREAT-ER/ChangeLog	2011-07-25 14:15:20 UTC (rev 3665)
@@ -31,6 +31,11 @@
 		- 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.
+	* Greater/UI/context.py:
+		- Check for DischargeLayer and PicturesLayer before accessing it
+		  this fixes and exception during load.
+	* Greater/Modules/results.py:
+		- Fix typo
 
 2006-05-10  Frank Koormann   <frank at intevation.de>
 

Modified: branches/3.0.0-all-models/GREAT-ER/Greater/Modules/results.py
===================================================================
--- branches/3.0.0-all-models/GREAT-ER/Greater/Modules/results.py	2011-07-25 14:11:41 UTC (rev 3664)
+++ branches/3.0.0-all-models/GREAT-ER/Greater/Modules/results.py	2011-07-25 14:15:20 UTC (rev 3665)
@@ -86,7 +86,7 @@
         be a CSV file where the first line starts with a #
         and contains the fieldnames (also comma-separated)
 
-        The first column is always interger, all others
+        The first column is always integer, all others
         are double.
 
         unit_factor -- All values are multiplied with this factor

Modified: branches/3.0.0-all-models/GREAT-ER/Greater/UI/context.py
===================================================================
--- branches/3.0.0-all-models/GREAT-ER/Greater/UI/context.py	2011-07-25 14:11:41 UTC (rev 3664)
+++ branches/3.0.0-all-models/GREAT-ER/Greater/UI/context.py	2011-07-25 14:15:20 UTC (rev 3665)
@@ -69,6 +69,7 @@
 def discharge_layer_visible(context):
     """Return true there is a discharge layer and it is visible"""
     return context.mainwindow.canvas.Map() is not None and \
+           hasattr(context.mainwindow.canvas.Map(), "DischargeLayer") and \
            context.mainwindow.canvas.Map().DischargeLayer() is not None and \
            context.mainwindow.canvas.Map().DischargeLayer().Visible()
 
@@ -163,6 +164,7 @@
     layer."""
     return context_catchment_open(context) and \
            context.mainwindow.canvas.Map() is not None and \
+           hasattr(context.mainwindow.canvas.Map(), "PicturesLayer") and \
            context.mainwindow.canvas.Map().PicturesLayer() is not None
 
 def context_pics_exist_and_layer_visible(context):