Changeset 6348

Timestamp:

Feb 16, 2009, 4:00:20 PM (16 years ago)

Author:

rwilson

Message:

GUI version of plotcsv

Location:

misc/tools/plotcsv

Files:

• README (modified) (1 diff)
• installer (added)
• installer/INSTALL.txt (added)
• installer/README.txt (added)
• installer/plotcsv.nsi (added)
• plotcsv.ico (added)
• plotcsv.py (modified) (12 diffs)
• tkinter_error.py (added)

misc/tools/plotcsv/README

@@ +1 @@
+First version of plotcsv was command-line only.  Doesn't play
+well in the Windows environment.
+
 Plan B is to create a GUI program that will have two areas:
 1. Select a set of CSV files

misc/tools/plotcsv/plotcsv.py

@@ -52 +52 @@
 MARGIN = 10
 
-LAB_CTRL_OFFSET = 3
+LAB_CTRL_OFFSET = 5
 
 BOX_WIDTH = 400
@@ -64 +64 @@
 TXT_CSVFILE_HEIGHT = 200
 
-COLLAB_X_OFFSET = 20
+COLLAB_X_OFFSET = 25
 
 CHBOX_HEIGHT = 30
@@ -145 +145 @@
     "zNHrrf9oCIxPMrO3N4LXSYQhEMeNpmcCKVywaA43JUYjwPeBTqcx3BIIOYTHHi74YjP4F4OI"
     "IIgI9JOI2kS0JKI/m33TfzU+ASG0bvT61fpzAAAAAElFTkSuQmCC")
+
+
+def error(msg):
+    print msg
+    sys.exit(10)
 
 
@@ -254 +259 @@
 
 ##
-# @brief Plot a sequence of data.
-# @param x_data The X data sequence to plot.
-# @param y_data The Y data sequence to plot.
-# @param options A dictionary of plot options.
-def plot_data(x_data, y_data, options):
-    print 'x_data=%s' % str(x_data)
-    print 'y_data=%s' % str(y_data)
-    pylab.plot(x_data, y_data)
-
-    # if user requested a particular Y range
-    if not options[Y_RANGE] is None:
-        try:
-            (minimum, maximum) = options[Y_RANGE].split(',')
-            minimum = float(minimum)
-            maximum = float(maximum)
-        except:
-            error('Sorry, got a bad value for Y range: %s' % options[Y_RANGE])
-        pylab.ylim(ymin=minimum, ymax=maximum)
-
-
-##
 # @brief Get CSV data from a file.
 # @param filename Path to the data file to plot.
-# @param x_hdr The X axis title string (or index).
-# @param y_hdr The Y axis title string (or index).
-# @param options A dictionary of options.
-def getCSVData(filename, x_hdr, y_hdr, options):
+# @param x_hdr The X axis title string.
+# @param y_hdr The Y axis title string.
+def getCSVData(filename, x_hdr, y_hdr):
     # get contents of data file
     # after this, 'header' is list of column header strings
@@ -293 +276 @@
     del data[0]         # get rid of header in dataset
 
-    # convert column specifiers to 'int' if required
+    # get int index values for column headers
     try:
-        index = int(x_hdr)
-    except:
-        try:
-            index = header.index(x_hdr)
-        except ValueError:
-            error("Sorry, X column header '%s' isn't in the data file." % x_hdr)
-    options[X_DATACOL] = index
+        x_index = header.index(x_hdr)
+    except ValueError:
+        error("Sorry, X column header '%s' isn't in the data file." % x_hdr)
 
     try:
-        index = int(y_hdr)
-    except:
-        try:
-            index = header.index(y_hdr)
-        except ValueError:
-            error("Sorry, Y column header '%s' isn't in the data file." % y_hdr)
-    options[Y_DATACOL] = index
-    
-    # extract required columns from the data (int at this point)
-    x_col = options[X_DATACOL]
-    y_col = options[Y_DATACOL]
-
-    # get max column number, check requested columns
-    max_col = len(header)
-    if x_col >= max_col or y_col >= max_col:
-        error('Sorry, maximum column number for that file is %d.' % (max_col-1))
-
-    x_label = header[x_col].title()
-    x_data = map(lambda x: x[x_col], data)
-    if x_label == 'Time':
-        x_label = 'Time (hours)'
+        y_index = header.index(y_hdr)
+    except ValueError:
+        error("Sorry, Y column header '%s' isn't in the data file." % y_hdr)
+
+    # get appropriate columns from data[]
+    x_data = map(lambda x: x[x_index], data)
+    if x_hdr == 'time':
         x_data = map(lambda x: float(x)/3600., x_data)
-    y_data = map(lambda x: x[y_col], data)
-    y_label = header[y_col].title()
-
-    options[X_LABEL] = x_label
-    options[Y_LABEL] = y_label
+    y_data = map(lambda x: x[y_index], data)
 
     return (x_data, y_data)
@@ -338 +299 @@
 # @brief Plot data files.
 # @param filenames List of full pathnames to plot.
-# @param options A dictionary of options.
-def plot_files(filenames, options=None):
-    # set options defaults
-    opts = options
-    if opts is None:
-        opts = {}
-
-##    pylab.title(options.get(TITLE, ''))
-##    pylab.xlabel(options.get(X_LABEL, ''))
-##    pylab.ylabel(options.get(Y_LABEL, ''))
-##    pylab.grid(True)
-##
+# @param x_hdr The X axis label string.
+# @param y_hdr The Y axis label string.
+def plot_files(filenames, x_hdr, y_hdr):
+    pylab.rc('axes', linewidth=2)
+    pylab.xlabel(x_hdr.title())
+    pylab.ylabel(y_hdr.title())
+    pylab.grid(True)
+
     for f in filenames:
-        (x_data, y_data) = getCSVData(f, opts[X_LABEL], opts[Y_LABEL], options)
-        print 'x_data=%s' % str(x_data)
-        print 'y_data=%s' % str(y_data)
+        (x_data, y_data) = getCSVData(f, x_hdr, y_hdr)
         pylab.plot(x_data, y_data)
 
+    (min_y, max_y) = pylab.ylim()
+    range_y = max_y - min_y
+    add_y = float(range_y) / 5
+    pylab.ylim((min_y, max_y+add_y))
+    pylab.legend(filenames, 'upper left')
+
     pylab.show()
+#    pylab.close()
 
 
@@ -397 +359 @@
         Y_OFFSET += BUTTON_HEIGHT + MARGIN 
 
-        wx.StaticBox(p, -1, 'Plot details', (3, Y_OFFSET),
+        wx.StaticBox(p, -1, 'Plot files', (3, Y_OFFSET),
                      size=(BOX_PLOT_WIDTH, BOX_PLOT_HEIGHT))
         Y_OFFSET += GEN_DELTAY
         wx.StaticText(p, -1, 'X-Column',
                       pos=(COLLAB_X_OFFSET, Y_OFFSET+LAB_CTRL_OFFSET), style=wx.ALIGN_LEFT)
-        self.cbXColHdr = wx.Choice(p, -1, pos=(COLLAB_X_OFFSET+50, Y_OFFSET),
+        self.cbXColHdr = wx.Choice(p, -1, pos=(COLLAB_X_OFFSET+65, Y_OFFSET),
                                    size=(80, -1))
         self.XColHdr = []
@@ -409 +371 @@
                            Y_OFFSET+LAB_CTRL_OFFSET), style=wx.ALIGN_LEFT)
         x = FORM_WIDTH/2 + COLLAB_X_OFFSET
-        self.cbYColHdr = wx.Choice(p, -1, pos=(x+50, Y_OFFSET), size=(80, -1))
+        self.cbYColHdr = wx.Choice(p, -1, pos=(x+65, Y_OFFSET), size=(80, -1))
         self.YColHdr = []
 
@@ -491 +453 @@
             self.XColHdr = []
         # -1 here means 'no selection'
-        self.XColHdrSelection = self.cfg['XColHdrSelection', -1]
+        self.XColHdrSelection = self.cfg['XColHdrSelection']
         self.YColHdr = self.cfg['YColHdr']
         if self.YColHdr is None:
             self.YColHdr = []
         # -1 here means 'no selection'
-        self.YColHdrSelection = self.cfg['YColHdrSelection', -1]
+        self.YColHdrSelection = self.cfg['YColHdrSelection']
         self.file_dir = self.cfg['file_dir']
         if self.file_dir is None:
@@ -507 +469 @@
             self.headers.append(headers)
             self.txtCSVFiles.Insert(f, i)
+        self.common_headers = self.GenCommonHeaders(self.headers)
+        self.updateHdrChoices()
+
+        if self.XColHdrSelection:
+            self.cbXColHdr.SetSelection(self.XColHdrSelection)
+        if self.YColHdrSelection:
+            self.cbYColHdr.SetSelection(self.YColHdrSelection)
 
     def getHeaders(self, filename):
@@ -526 +495 @@
         '''Update choice controls with header lists.
 
-        Keep initially visible strings visible afterwards, if posssible.
+        Keep initially visible strings visible afterwards, if possible.
         '''
 
@@ -578 +547 @@
 
         if selected_x and selected_y:
-            options = {}
-            # set X and Y axis labels
-            options[X_LABEL] = selected_x
-            options[Y_LABEL] = selected_y
-            options[SIZE] = '800,600'
-            options[TITLE] = 'TITLE'
-
-            plot_files(self.CSVFiles, options) 
+            plot_files(self.CSVFiles, selected_x, selected_y) 
             
     def error(self, msg):