Merge pull request #281 from ODM2/scroll_zoom

fix issue #119

Author: Stephanie Reeder

odmtools/gui/mnuPlotToolbar.py

@@ -132,7 +132,7 @@ def __init__(self, plotCanvas, multPlots=False, allowselect=False):
 
         self.msg = wx.StaticText(self, -1, "")
         self.AddControl(self.msg)
-
+        self.canvas.mpl_connect('scroll_event', self.on_scroll_zoom)
         self.Realize()
 
     def editSeries(self, xys, edit):
@@ -248,6 +248,8 @@ def on_toggle_zoom_data_tool(self, event):
         self.canvas.draw()
 
 
+
+
 #must add these methods for mac functionality
     def release_zoom(self, event):
         super(self.__class__, self).release_zoom(event)
@@ -264,3 +266,37 @@ def forward(self, event):
     def home(self, event):
         super(self.__class__, self).home(event)
         self.canvas.draw()
+
+
+
+
+    def on_scroll_zoom(self, event):
+        axes = self.canvas.figure.axes[0]
+        base_scale = 1.2
+        # get the current x and y limits
+        cur_xlim = axes.get_xlim()
+        cur_ylim = axes.get_ylim()
+        cur_xrange = (cur_xlim[1] - cur_xlim[0])*.5
+        cur_yrange = (cur_ylim[1] - cur_ylim[0])*.5
+        xdata = event.xdata # get event x location
+        ydata = event.ydata # get event y location
+        if event.button == 'up':
+            # deal with zoom in
+            scale_factor = 1/base_scale
+        elif event.button == 'down':
+            # deal with zoom out
+            scale_factor = base_scale
+        else:
+            # deal with something that should never happen
+            scale_factor = 1
+            print event.button
+        # set new limits
+        axes.set_xlim([xdata - cur_xrange*scale_factor,
+                     xdata + cur_xrange*scale_factor])
+        axes.set_ylim([ydata - cur_yrange*scale_factor,
+                     ydata + cur_yrange*scale_factor])
+        self.canvas.draw() # force re-draw
+
+    # fig = ax.get_figure() # get the figure of interest
+    # attach the call back
+

odmtools/gui/plotTimeSeries.py

@@ -278,6 +278,9 @@ def drawEditPlot(self, oneSeries):
         curraxis.set_xlabel('Date')
 
         convertedDates = matplotlib.dates.date2num(dates)
+
+        scale = 1.5
+        f = zoom_factory(curraxis , base_scale = scale)
         self.xys = zip(convertedDates, oneSeries.dataTable['DataValue'])
         self.toolbar.editSeries(self.xys, self.editCurve)
         self.pointPick = self.canvas.mpl_connect('pick_event', self._onPick)
@@ -696,3 +699,6 @@ def __call__(self, event):
         self.toolbar.msg.SetLabelText("X= %s,  Y= %.4f (%s)" % (xValue, y, self.name))
         self.toolbar.msg.SetForegroundColour((66, 66, 66))
         #logger.debug('{n}: ({x}, {y:0.2f})'.format(n=self.name, x=xValue.strftime("%Y-%m-%d %H:%M:%S"), y=y))
+
+
+