Changeset 6358

Timestamp:

Feb 18, 2009, 8:50:16 AM (16 years ago)

Author:

rwilson

Message:

Added short filenames in legend option.

File:

• misc/tools/plotcsv/plotcsv.py (modified) (9 diffs)

misc/tools/plotcsv/plotcsv.py

@@ -83 +83 @@
 
 FORM_WIDTH = BOX_WIDTH + 15
-FORM_HEIGHT = 455
+FORM_HEIGHT = 450
 
 START_YOFFSET = 7
@@ -304 +304 @@
 # @param x_hdr The X axis label string.
 # @param y_hdr The Y axis label string.
-def plot_files(filenames, x_hdr, y_hdr, title='', legend=False):
+# @param title The string used to title the graph.
+# @param legend True if a legend is to be displayed.
+# @param legend_path True if legend is to contain full file paths.
+def plot_files(filenames, x_hdr, y_hdr, title='', legend=False,
+               legend_path=False):
     pylab.rc('axes', linewidth=2)
     pylab.xlabel(x_hdr.title())
@@ -321 +325 @@
         add_y = float(range_y) / 5
         pylab.ylim((min_y, max_y+add_y))
-        pylab.legend(filenames, 'upper left')
+        legend_names = filenames
+        if not legend_path:
+            legend_names = [os.path.basename(x) for x in filenames]
+        pylab.legend(legend_names, 'upper right')
+#        pylab.legend(legend_names, 'upper left')
 
     pylab.show()
@@ -388 +396 @@
 
         self.chkLegend = wx.CheckBox(p, -1, " Show graph legend",
-                                     pos=(COLLAB_X_OFFSET, Y_OFFSET))
-        
-        Y_OFFSET += GEN_DELTAY
+                                     pos=(COLLAB_X_OFFSET+20, Y_OFFSET))        
+        self.chkLegendPath = wx.CheckBox(p, -1, " Full file path in legend",
+                                         pos=(COLLAB_X_OFFSET+180, Y_OFFSET))        
+        Y_OFFSET += GEN_DELTAY + 3
+        
         wx.StaticText(p, -1, 'Title',
                       pos=(18, Y_OFFSET+LAB_CTRL_OFFSET+2), style=wx.ALIGN_LEFT)
@@ -407 +417 @@
         self.Bind(wx.EVT_BUTTON, self.DelCSVFile, self.btnDelCSVFile)
         self.Bind(wx.EVT_BUTTON, self.PlotFiles, self.btnPlot)
+        self.Bind(wx.EVT_CHECKBOX, self.ChangeLegend, self.chkLegend)
         
         self.Bind(wx.EVT_CLOSE, self.doStateSave)
@@ -457 +468 @@
             self.updateHdrChoices()
 
+    def ChangeLegend(self, event):
+        if self.chkLegend.GetValue():
+            self.chkLegendPath.Enable()
+        else:
+            self.chkLegendPath.Disable()
+
     def doStateSave(self, event):
         """Save state from 'self' variables & controls."""
@@ -468 +485 @@
         self.cfg['GraphTitle'] = self.txtTitle.GetValue()
         self.cfg['GraphLegend'] = self.chkLegend.GetValue()
+        self.cfg['LegendPath'] = self.chkLegendPath.GetValue()
 
         self.cfg.save()
@@ -509 +527 @@
         if self.cfg['GraphLegend']:
             self.chkLegend.SetValue(True)
-
+        if self.cfg['LegendPath']:
+            self.chkLegendPath.SetValue(True)
+        self.ChangeLegend(None)
+        
     def getHeaders(self, filename):
         '''Get header list from a file'''
@@ -594 +615 @@
             plot_files(self.CSVFiles, selected_x, selected_y,
                        title=self.txtTitle.GetValue(),
-                       legend=self.chkLegend.GetValue()) 
+                       legend=self.chkLegend.GetValue(),
+                       legend_path=self.chkLegendPath.GetValue()) 
             
     def error(self, msg):