Fix and closes #9 and fix and closes #12

Author: ggilestro

panels/6_sleepdeprivation.py

@@ -166,9 +166,8 @@ def rebound_plot(self, fig, t, dist_sde_sel , dist_sde_rem, dist_re_mins, dist_r
         if n_bin1: w2 = 1.0/n_bin1
         else: w2 = 0.3
 
-
-        if len(dist_sde_sel) != 0: n1, bins, patches = a1.hist(dist_sde_sel, n_bin1 , rwidth=w1, fc = col)#, alpha=0.5)
-        if len(dist_sde_rem) != 0: n2, bins, patches = a1.hist(dist_sde_rem, n_bin2 , rwidth=w2, fc = brighten(col))#, alpha=0.5)
+        if len(dist_sde_sel) > 1: n1, bins, patches = a1.hist(dist_sde_sel, n_bin1 , rwidth=w1, fc = col)#, alpha=0.5)
+        if len(dist_sde_rem) > 1: n2, bins, patches = a1.hist(dist_sde_rem, n_bin2 , rwidth=w2, fc = brighten(col))#, alpha=0.5)
 
         a1.set_ylabel('n. of flies')
         a1.set_xlim((0, 100))
@@ -179,9 +178,12 @@ def rebound_plot(self, fig, t, dist_sde_sel , dist_sde_rem, dist_re_mins, dist_r
         a5 = fig.add_axes([0.70, 0.55, 0.20, 0.35])
         n_low_sde_thre = len(dist_sde_rem)
         n_hig_sde_thre = len(dist_sde_sel)
-        
-        a5.bar(1, n_low_sde_thre, color=brighten(col) , align='center')
-        a5.bar(2, n_hig_sde_thre, color=col , align='center')
+
+        #if plot_legend:
+        b1 = a5.bar(1, n_low_sde_thre, color=brighten(col) , align='center')
+        b2 = a5.bar(2, n_hig_sde_thre, color=col , align='center')
+        a5.legend( (b1[0], b2[0]), ('<SDE', '>SDE') )
+
         a5.set_xticks([])
         a5.set_xticklabels([])
 

panels/default_panels.py

@@ -1148,19 +1148,17 @@ def __init__(self, panel_name, variable, variable_name, description):
         self.name = variable_name
         self.description = description
 
-    def exportToFile(self, outputPath, fileType='binary'):
+    def exportToFile(self, outfile, fileType='binary'):
         '''
         export to variable as np export object
         if it is not a numpy array, it will be first converted to one
         '''
-        i = ['binary', 'text'].index(fileType)
-        separator = ['','\t'][i]
-        try:
-            var = array(self.variable)
-            var.tofile(outputPath, separator)
-            return True
-        except:
-            return False
+        if 'binary' in fileType:
+            np.save(outfile, self.variable)
+        else:
+            np.savetxt(outfile, self.variable, delimiter=',')   # X is an array
+
+        return True
 
 
 class pySoloPanel(wx.Panel):