move tooltip data into toolbar

Author: stephanie

odmtools/gui/mnuPlotToolbar.py

@@ -12,6 +12,11 @@
 
 
 
+import matplotlib.dates as mdates
+from matplotlib.lines import Line2D
+from matplotlib.text import Text
+from matplotlib import dates
+
 tools = LoggerTool()
 logger = tools.setupLogger(__name__, __name__ + '.log', 'w', logging.DEBUG)
 
@@ -72,6 +77,18 @@ def _init_toolbar(self):
                                   text, tooltip_text)
             bind(self, wx.EVT_TOOL, getattr(self, callback), id=self.wx_ids[text])
 
+
+        #init hover tooltip
+
+        # create a long tooltip with newline to get around wx bug (in v2.6.3.3)
+        # where newlines aren't recognized on subsequent self.tooltip.SetTip() calls
+        self.tooltip = wx.ToolTip(tip='tip with a long %s line and a newline\n')
+        self.canvas.SetToolTip(self.tooltip)
+        self.tooltip.Enable(False)
+        self.tooltip.SetDelay(0)
+
+
+
         self.Realize()
 
 
@@ -139,11 +156,17 @@ def editSeries(self, xys, edit):
         # enable select button
         self.xys = xys
         self.editCurve = edit
+        self.pointPick = self.canvas.mpl_connect('pick_event', self._onPick)
         self.select_tool.Enable(True)
         self.zoom_to_data.Enable(True)
         self.Realize()
 
     def stopEdit(self):
+        try:
+            self.canvas.mpl_disconnect(self.pointPick)
+            self.pointPick = None
+        except AttributeError as e:
+            logger.error(e)
 
         self.canvas.mpl_disconnect(self.lassoAction)
         self.xys = None
@@ -248,6 +271,63 @@ def on_toggle_zoom_data_tool(self, event):
         self.canvas.draw()
 
 
+
+    def _onMotion(self, event):
+        """
+
+        :type event: matplotlib.backend_bases.MouseEvent
+        :return:
+        """
+        try:
+            if event.xdata and event.ydata:
+                xValue = dates.num2date(event.xdata).replace(tzinfo=None)
+                #self.toolbar.msg.SetLabelText("X= %s,  Y= %.2f" % (xValue.strftime("%Y-%m-%d %H:%M:%S"), event.ydata))
+                #self.toolbar.msg.SetLabelText("X= %s,  Y= %.2f" % (xValue.strftime("%b %d, %Y %H:%M:%S"), event.ydata))
+                self.toolbar.msg.SetLabelText("X= %s,  Y= %.2f" % (xValue.strftime("%b %d, %Y %H:%M"), event.ydata))
+                self.toolbar.msg.SetForegroundColour((66, 66, 66))
+            else:
+                self.toolbar.msg.SetLabelText("")
+        except ValueError:
+            pass
+
+    def _onPick(self, event):
+        """
+
+        :param event:
+        :return:
+        """
+
+        if isinstance(event.artist, Line2D):
+            thisline = event.artist
+            xdata = thisline.get_xdata()
+            ydata = thisline.get_ydata()
+            ind = event.ind
+
+            xValue = xdata[ind][0]
+            yValue = ydata[ind][0]
+            #tip = '(%s, %s)' % (xValue.strftime("%Y-%m-%d %H:%M:%S"), yValue)
+            #tip = '(%s, %s)' % (xValue.strftime("%b %d, %Y %H:%M:%S"), yValue)
+            tip = '(%s, %s)' % (xValue.strftime("%b %d, %Y %H:%M"), yValue)
+
+            self.tooltip.SetTip(tip)
+            self.tooltip.Enable(True)
+            self.tooltip.SetAutoPop(10000)
+
+        elif isinstance(event.artist, Text):
+            text = event.artist
+            #print "Picking Label: ", text.get_text()
+
+    def _onFigureLeave(self, event):
+        """Catches mouse leaving the figure
+
+        :param event:
+        :return:
+        """
+
+        if self.tooltip.Window.Enabled:
+            self.tooltip.SetTip("")
+
+
 #must add these methods for mac functionality
     def release_zoom(self, event):
         super(self.__class__, self).release_zoom(event)

odmtools/gui/mnuRibbon.py

@@ -15,7 +15,7 @@
 from odmtools.controller.frmLinearDrift import frmLinearDrift
 from odmtools.controller.frmAbout import frmAbout
 import wizSave
-from odmtools.common import *
+from odmtools.common.icons import *
 import pandas as pd
 
 

odmtools/gui/plotTimeSeries.py

@@ -15,8 +15,7 @@
 from mpl_toolkits.axes_grid1 import host_subplot
 
 
-from matplotlib.lines import Line2D
-from matplotlib.text import Text
+
 
 from matplotlib.font_manager import FontProperties
 from wx.lib.pubsub import pub as Publisher
@@ -59,11 +58,12 @@ def _init_ctrls(self, parent):
         self.canvas.SetFont(wx.Font(20, wx.SWISS, wx.NORMAL, wx.NORMAL, False, u'Tahoma'))
         self.isShowLegendEnabled = False
 
-        self.canvas.mpl_connect('figure_leave_event', self._onFigureLeave)
-        Publisher.subscribe(self.updateCursor, "updateCursor")
+
 
         # Create the navigation toolbar, tied to the canvas
         self.toolbar = NavigationToolbar(self.canvas, allowselect=True)
+        self.canvas.mpl_connect('figure_leave_event', self.toolbar._onFigureLeave)
+        Publisher.subscribe(self.updateCursor, "updateCursor")
         self.toolbar.Realize()
         self.seriesPlotInfo = None
 
@@ -76,24 +76,13 @@ def _init_ctrls(self, parent):
         self._setColor("WHITE")
 
         left = 0.125  # the left side of the subplots of the figure
-        #right = 0.9  # the right side of the subplots of the figure
-        #bottom = 0.51  # the bottom of the subplots of the figure
-        #top = 1.2  # the top of the subplots of the figure
-        #wspace = .8  # the amount of width reserved for blank space between subplots
-        #hspace = .8  # the amount of height reserved for white space between subplots
+
         plt.subplots_adjust(
             left=left#, bottom=bottom, right=right, top=top, wspace=wspace, hspace=hspace
         )
         plt.tight_layout()
 
-        #init hover tooltip
 
-        # create a long tooltip with newline to get around wx bug (in v2.6.3.3)
-        # where newlines aren't recognized on subsequent self.tooltip.SetTip() calls
-        self.tooltip = wx.ToolTip(tip='tip with a long %s line and a newline\n')
-        self.canvas.SetToolTip(self.tooltip)
-        self.tooltip.Enable(False)
-        self.tooltip.SetDelay(0)
 
         #init lists
         #self.lines = {}
@@ -103,7 +92,7 @@ def _init_ctrls(self, parent):
         self.editseriesID = -1
         self.editCurve = None
         self.editPoint =None
-        self.hoverAction = None
+        # self.hoverAction = None
         self.selplot= None
 
         self.cursors = []
@@ -117,28 +106,6 @@ def _init_sizers(self):
         self._init_coll_boxSizer1_Items(self.boxSizer1)
         self.SetSizer(self.boxSizer1)
 
-    '''
-    def changePlotSelection(self, datetime_list=[]):
-        cc= ColorConverter()
-        # k black,    # r red
-        # needs to have graph first
-        selected = cc.to_rgba('r', 1)
-        unselected = cc.to_rgba('k', 0.1)
-        allunselected = cc.to_rgba('k', 1)
-        if self.editPoint:
-            colorlist=[allunselected] *len(self.editCurve.dataTable)
-            if len(datetime_list)>0:
-                for i in xrange(len(self.editCurve.dataTable)):
-                    if  self.editCurve.dataTable[i][1] in datetime_list:
-                        colorlist[i]=selected
-                    else:
-                        colorlist[i]=unselected
-
-            self.editPoint.set_color(colorlist)
-            #self.editPoint.set_color(['k' if x == 0 else 'r' for x in tflist])
-            self.canvas.draw()
-
-    '''
     ## TODO 10/15/2014 Change function so that it will accept a list of datavalues. This will remove the need to loop through the values currently plotted and we would instead plot the list of datetimes and datavalues together.
 
     def changePlotSelection(self, filtered_datetime):
@@ -225,13 +192,13 @@ def stopEdit(self):
         self.lman = None
 
         #self.canvas.mpl_disconnect(self.hoverAction)
-        try:
-            self.canvas.mpl_disconnect(self.pointPick)
-            self.pointPick = None
-        except AttributeError as e:
-            logger.error(e)
+        # try:
+        #     self.canvas.mpl_disconnect(self.pointPick)
+        #     self.pointPick = None
+        # except AttributeError as e:
+        #     logger.error(e)
 
-        self.hoverAction = None
+        # self.hoverAction = None
         self.xys = None
         self.alpha=1
 
@@ -280,10 +247,9 @@ def drawEditPlot(self, oneSeries):
         convertedDates = matplotlib.dates.date2num(dates)
         self.xys = zip(convertedDates, oneSeries.dataTable['DataValue'])
         self.toolbar.editSeries(self.xys, self.editCurve)
-        self.pointPick = self.canvas.mpl_connect('pick_event', self._onPick)
+        # self.pointPick = self.canvas.mpl_connect('pick_event', self._onPick)
         self.editSeries = oneSeries
 
-
     def _setColor(self, color):
         """Set figure and canvas colours to be the same.
         :rtype : object
@@ -596,60 +562,60 @@ def make_patch_spines_invisible(self, ax):
         for sp in ax.spines.itervalues():
             sp.set_visible(False)
 
-    def _onMotion(self, event):
-        """
-
-        :type event: matplotlib.backend_bases.MouseEvent
-        :return:
-        """
-        try:
-            if event.xdata and event.ydata:
-                xValue = matplotlib.dates.num2date(event.xdata).replace(tzinfo=None)
-                #self.toolbar.msg.SetLabelText("X= %s,  Y= %.2f" % (xValue.strftime("%Y-%m-%d %H:%M:%S"), event.ydata))
-                #self.toolbar.msg.SetLabelText("X= %s,  Y= %.2f" % (xValue.strftime("%b %d, %Y %H:%M:%S"), event.ydata))
-                self.toolbar.msg.SetLabelText("X= %s,  Y= %.2f" % (xValue.strftime("%b %d, %Y %H:%M"), event.ydata))
-                self.toolbar.msg.SetForegroundColour((66, 66, 66))
-            else:
-                self.toolbar.msg.SetLabelText("")
-        except ValueError:
-            pass
-
-    def _onPick(self, event):
-        """
-
-        :param event:
-        :return:
-        """
-
-        if isinstance(event.artist, Line2D):
-            thisline = event.artist
-            xdata = thisline.get_xdata()
-            ydata = thisline.get_ydata()
-            ind = event.ind
-
-            xValue = xdata[ind][0]
-            yValue = ydata[ind][0]
-            #tip = '(%s, %s)' % (xValue.strftime("%Y-%m-%d %H:%M:%S"), yValue)
-            #tip = '(%s, %s)' % (xValue.strftime("%b %d, %Y %H:%M:%S"), yValue)
-            tip = '(%s, %s)' % (xValue.strftime("%b %d, %Y %H:%M"), yValue)
-
-            self.tooltip.SetTip(tip)
-            self.tooltip.Enable(True)
-            self.tooltip.SetAutoPop(10000)
-
-        elif isinstance(event.artist, Text):
-            text = event.artist
-            #print "Picking Label: ", text.get_text()
-
-    def _onFigureLeave(self, event):
-        """Catches mouse leaving the figure
-
-        :param event:
-        :return:
-        """
-
-        if self.tooltip.Window.Enabled:
-            self.tooltip.SetTip("")
+    # def _onMotion(self, event):
+    #     """
+    #
+    #     :type event: matplotlib.backend_bases.MouseEvent
+    #     :return:
+    #     """
+    #     try:
+    #         if event.xdata and event.ydata:
+    #             xValue = matplotlib.dates.num2date(event.xdata).replace(tzinfo=None)
+    #             #self.toolbar.msg.SetLabelText("X= %s,  Y= %.2f" % (xValue.strftime("%Y-%m-%d %H:%M:%S"), event.ydata))
+    #             #self.toolbar.msg.SetLabelText("X= %s,  Y= %.2f" % (xValue.strftime("%b %d, %Y %H:%M:%S"), event.ydata))
+    #             self.toolbar.msg.SetLabelText("X= %s,  Y= %.2f" % (xValue.strftime("%b %d, %Y %H:%M"), event.ydata))
+    #             self.toolbar.msg.SetForegroundColour((66, 66, 66))
+    #         else:
+    #             self.toolbar.msg.SetLabelText("")
+    #     except ValueError:
+    #         pass
+    #
+    # def _onPick(self, event):
+    #     """
+    #
+    #     :param event:
+    #     :return:
+    #     """
+    #
+    #     if isinstance(event.artist, Line2D):
+    #         thisline = event.artist
+    #         xdata = thisline.get_xdata()
+    #         ydata = thisline.get_ydata()
+    #         ind = event.ind
+    #
+    #         xValue = xdata[ind][0]
+    #         yValue = ydata[ind][0]
+    #         #tip = '(%s, %s)' % (xValue.strftime("%Y-%m-%d %H:%M:%S"), yValue)
+    #         #tip = '(%s, %s)' % (xValue.strftime("%b %d, %Y %H:%M:%S"), yValue)
+    #         tip = '(%s, %s)' % (xValue.strftime("%b %d, %Y %H:%M"), yValue)
+    #
+    #         self.tooltip.SetTip(tip)
+    #         self.tooltip.Enable(True)
+    #         self.tooltip.SetAutoPop(10000)
+    #
+    #     elif isinstance(event.artist, Text):
+    #         text = event.artist
+    #         #print "Picking Label: ", text.get_text()
+    #
+    # def _onFigureLeave(self, event):
+    #     """Catches mouse leaving the figure
+    #
+    #     :param event:
+    #     :return:
+    #     """
+    #
+    #     if self.tooltip.Window.Enabled:
+    #         self.tooltip.SetTip("")
 
 class Cursor(object):
     def __init__(self, canvas, toolbar, ax, name):