[Greater-commits] r322 - trunk/GREAT-ER/Greater/Modules

[scm-commit@wald.intevation.org]

Author: aheinecke
Date: 2011-06-30 12:05:44 +0200 (Thu, 30 Jun 2011)
New Revision: 322

Modified:
   trunk/GREAT-ER/Greater/Modules/analysis.py
   trunk/GREAT-ER/Greater/Modules/catchment.py
Log:
Correctly inherit from viewport tool


Modified: trunk/GREAT-ER/Greater/Modules/analysis.py
===================================================================
--- trunk/GREAT-ER/Greater/Modules/analysis.py	2011-06-30 09:46:17 UTC (rev 321)
+++ trunk/GREAT-ER/Greater/Modules/analysis.py	2011-06-30 10:05:44 UTC (rev 322)
@@ -22,7 +22,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, \
@@ -1017,14 +1017,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: trunk/GREAT-ER/Greater/Modules/catchment.py
===================================================================
--- trunk/GREAT-ER/Greater/Modules/catchment.py	2011-06-30 09:46:17 UTC (rev 321)
+++ trunk/GREAT-ER/Greater/Modules/catchment.py	2011-06-30 10:05:44 UTC (rev 322)
@@ -25,7 +25,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
@@ -600,12 +600,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