Fixed legends on sleep trend. Closes #3

Author: ggilestro

panels/5_sleeptrend.py

@@ -31,6 +31,8 @@ def __init__(self, parent):
         self.name = 'Sleep Trend'
         self.compatible = 'all'
 
+        self.AddOption('show_legend', 'boolean', 1, ['Show legend', 'Do not show legend'], 'Do you want to draw a legend in the Day / Night graph?')
+
 
     def Refresh(self):
         '''
@@ -137,24 +139,36 @@ def Refresh(self):
         single_day_std = average(value_std) 
         single_day_rd_avg = average(day_sleep)
         single_day_rn_avg = average(night_sleep)
+        
+        plot_legend = self.GetOption('show_legend')
 
-        self.canvas.redraw(subplot_trend, title, value_avg, value_std, single_day_avg, single_day_std, single_day_rd_avg, single_day_rn_avg, pos, color )
+        self.canvas.redraw(subplot_trend, title, value_avg, value_std, single_day_avg, single_day_std, single_day_rd_avg, single_day_rn_avg, pos, color, plot_legend )
         self.WriteComment(cSEL.Comment or '')
 
 
-def subplot_trend(fig, title, value_avg, value_std, single_day_avg, single_day_std, single_day_rd_avg, single_day_rn_avg, pos, col):
+def subplot_trend(fig, title, value_avg, value_std, single_day_avg, single_day_std, single_day_rd_avg, single_day_rn_avg, pos, col, plot_legend):
 
 ##    for n, point in zip(range(len(value_avg)), value_avg):
 ##        if point == NaN: value_avg[n] = -1
 
+    if GUI['choice'] == 'AI':
+        ylabel = 'Activity Index'
+        a2title = 'Activity'
+        
+    else:
+        ylabel = 'Minutes'
+        a2title = 'Sleep'
+
+
 
     #UPPER PANEL
     a1 = fig.add_subplot(211)
     #a1.xlim(0,len(tot_sleep)+1)
     a1.plot(value_avg, color=col, marker= 'o', ls = ':')
     if GUI['ErrorBar']: a1.errorbar(range(0,len(value_avg)), value_avg, value_std, ecolor=col, fmt=None )
     if single_day_avg > 3: a1.set_ylim(0,1440)
-    a1.set_ylabel('Sleep (m/d)')
+    
+    a1.set_ylabel(ylabel)
 
     a1.set_xlim(-1,len(value_avg))
     step = (len(value_avg)>50 * 5) or 1
@@ -165,7 +179,7 @@ def subplot_trend(fig, title, value_avg, value_std, single_day_avg, single_day_s
     a1.set_title(title)
 
     #LOWER RIGHT
-    a2 = fig.add_subplot(224, title = 'Total Sleep')
+    a2 = fig.add_subplot(224, title = a2title)
     pos = pos + 1
     width = float(pos) / (pos*2)
 
@@ -174,15 +188,16 @@ def subplot_trend(fig, title, value_avg, value_std, single_day_avg, single_day_s
     else:
         a2.bar(pos, single_day_avg, width, color=col , align='center')
 
-    a2.set_ylabel('Sleep (m/d)')
+
+    a2.set_ylabel(ylabel)
     a2.set_xticks(range(1,pos+2))
     a2.set_xticklabels(['']+range(1,pos))
     a2.set_xlim(1.5,pos+0.5)
     if single_day_avg > 3: a2.set_ylim(0,1440)
 
 
     #LOWER LEFT
-    a3 = fig.add_subplot(223, title = 'Total Sleep (day/night)')
+    a3 = fig.add_subplot(223, title = 'Total Sleep (day - night)')
 
     col_brighter = brighten(col)
 
@@ -195,5 +210,8 @@ def subplot_trend(fig, title, value_avg, value_std, single_day_avg, single_day_s
     a3.set_xticklabels(['']+range(1,pos))
     a3.set_xlim(1.5,pos+0.5)
     a3.set_ylim(0,1440)
-##    a3.legend( (p1[0], p2[0]), ('Day', 'Night') )
-    ##a3.set_ylabel('Sleep (m/d)')
+    
+    if plot_legend:
+        a3.legend( (p1[0], p2[0]), ('Day', 'Night') )
+    
+    a3.set_ylabel('Minutes')

pysolo_anal.py

@@ -19,6 +19,15 @@
 #       along with this program; if not, write to the Free Software
 #       Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 #       MA 02110-1301, USA.
+#
+#        self.sp = MultiSplitterWindow
+#           self.TreePanel
+#           self.Notebook
+#               self.Pages
+#           self.sbPanel
+#               self.OptSB
+#               self.ExportSB
+
 
 import wx, os, glob
 from pysolo_path import panelPath, imgPath
@@ -34,6 +43,10 @@
 from wx.lib.buttons import GenBitmapToggleButton
 import wx.lib.agw.customtreectrl as CT
 
+import wx.lib.newevent
+myEVT_OPTION_CHANGED, EVT_OPTION_CHANGED = wx.lib.newevent.NewEvent()
+
+
 class ExportVariableSideBar(wx.Panel):
     """
     Custom Panel for the Export Variable sidebar
@@ -249,6 +262,7 @@ def __init__(self, parent):
         create the actual panel
         """
 
+        self.parent = parent
         wx.Panel.__init__(self, parent, -1)
 
         self.varType = ''
@@ -307,6 +321,10 @@ def onSelChanged(self, event):
 
         self.OptionsInfo.SetValue(descMsg)
 
+        #create and post the event
+        #TOFIX: this event does not propagate upstream
+        #It's needed to refresh drawing when variables are changed
+        wx.PostEvent(self.parent, myEVT_OPTION_CHANGED())
 
     def SetItemsList(self, checked, choices):
         """
@@ -413,9 +431,6 @@ def __init__(self, parent):
         GUI['currentlyDrawn'] = 0
         GUI['holdplot'] = False
 
-    
-
-
     def onKeyDown(self,event):
         """
         Detects a key down event and take corresponding action
@@ -684,20 +699,22 @@ def __init__(self, parent, id, title, siblingMode = False):
         self.MakeTheTree() #creates self.TreePanel and contents
 
         self.MakeTheNotebook() #creates self.nb
-        SB = self.MakeTheSideBar() #creates the sidebar on the right side
+        self.sidebar = self.MakeTheSideBar() #creates the sidebar on the right side
 
 
         self.sp.AppendWindow(self.TreePanel, self.initpos)
-        self.sp.AppendWindow(self.nb)
-        self.sp.AppendWindow(SB)
+        self.sp.AppendWindow(self.nb) # contains all the panels as pages
+        self.sp.AppendWindow(self.sidebar) # contains optsb and exportsb
 
         self.OptSB.Show(False)
 
         #self.sp.SplitVertically(self.TreePanel, self.nb, self.initpos)
         self.sp.SetMinimumPaneSize(self.minpane)
 
+        #custom events are defined in pysolo_lib
         self.Bind(EVT_FILE_MODIFIED, self.SetfileisModified)
         self.Bind(EVT_OPTIONSB_SHOW_HIDE, self.onShowOptionsSideBar)
+        self.Bind(EVT_OPTION_CHANGED, self.Refresh)
         self.Bind(wx.EVT_CLOSE, self.onClose)
         self.Bind(wx.EVT_SIZE, self.onResize)
 
@@ -792,7 +809,7 @@ def GetPanels(self):
 
     def MakeTheSideBar(self):
         """
-        We create the panel that will sit on the right side to modify panel specific parameters
+        We create an option panel that will sit on the right side to modify panel specific parameters
         """
 
         sbPanel = MultiSplitterWindow(self.sp)