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

[scm-commit@wald.intevation.org]

Author: aheinecke
Date: 2011-07-25 15:38:30 +0200 (Mon, 25 Jul 2011)
New Revision: 3652

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

........
  r322 | aheinecke | 2011-06-30 12:05:44 +0200 (Thu, 30 Jun 2011) | 2 lines
  
  Correctly inherit from viewport tool
........



Property changes on: branches/3.0.0-all-models/GREAT-ER
___________________________________________________________________
Name: svnmerge-integrated
   - /trunk/GREAT-ER:1-232,310,312-315,319
   + /trunk/GREAT-ER:1-232,310,312-315,319,322

Modified: branches/3.0.0-all-models/GREAT-ER/ChangeLog
===================================================================
--- branches/3.0.0-all-models/GREAT-ER/ChangeLog	2011-07-25 13:36:06 UTC (rev 3651)
+++ branches/3.0.0-all-models/GREAT-ER/ChangeLog	2011-07-25 13:38:30 UTC (rev 3652)
@@ -3,13 +3,16 @@
 	* Greater/UI/application.py:
 		- Use _dagreater_pg as default backend
 		- Check if sim_server exists before accessing it
-	* Greater/Modules/analysis.py: Change classnames to Thuban 1.2 names
+	* Greater/Modules/analysis.py:
+		- Change classnames to Thuban 1.2 names
+		- Inherit from the correct Tool Class from viewport
 	* Greater/Dialogs/opensession.py: Add encoding line
 	* Greater/UI/session.py: Change classgen classnames to Thuban 1.2
 	* Greater/Modules/catchment.py: 
 		- Change classgen classnames to Thuban 1.2
 		- Write encoding files for shapelib with the assumption that
 		  the Database delivers UTF-8 encoded data.
+		- Inherit from the correct Tool class from viewport
 	* Greater/Dialogs/editdischargedata.py: Add encoding line
 	* Greater/Dialogs/editsubstance.py: Add encoding line
 	* Greater/Dialogs/editenvironment.py: Add encoding line

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-25 13:36:06 UTC (rev 3651)
+++ branches/3.0.0-all-models/GREAT-ER/Greater/Modules/analysis.py	2011-07-25 13:38:30 UTC (rev 3652)
@@ -24,7 +24,7 @@
 
 from Thuban.UI.command import registry, Command, ToolCommand
 from Thuban.UI.mainwindow import make_check_current_tool
-from Thuban.UI.view import CanvasPanTool
+from Thuban.UI.viewport import Tool
 from Thuban.Model.color import Color
 from Thuban.Model.layer import Layer
 from Thuban.Model.classgen import generate_uniform_distribution, generate_quantiles, \
@@ -1163,14 +1163,14 @@
     finally:
         wxEndBusyCursor()
 
-class SelectTool(CanvasPanTool):
+class SelectTool(Tool):
 
     """Tool to pick an object and run a dialog"""
 
     def __init__(self, view, name, context, function, layer_name = None):
         """layer_name may either be "PICS" (Pictures).
         Anything else defeaults to RiverNetworkResults."""
-        CanvasPanTool.__init__(self, view)
+        Tool.__init__(self, view)
         self.name = name
         self.context = context
         self.function = function

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:36:06 UTC (rev 3651)
+++ branches/3.0.0-all-models/GREAT-ER/Greater/Modules/catchment.py	2011-07-25 13:38:30 UTC (rev 3652)
@@ -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.viewport import PanTool
+from Thuban.UI.viewport import Tool
 from Thuban.UI.mainwindow import make_check_current_tool
 from Thuban.Model.table import FIELDTYPE_STRING, FIELDTYPE_INT, \
                                FIELDTYPE_DOUBLE, MemoryTable
@@ -672,12 +672,12 @@
 
 from Thuban.UI.command import registry, Command
 
-class EditTool(PanTool):
+class EditTool(Tool):
 
     """Tool to pick an object and run a dialog"""
 
     def __init__(self, view, name, context, function):
-        PanTool.__init__(self, view)
+        Tool.__init__(self, view)
         self.name = name
         self.context = context
         self.function = function