Changeset 6477

Timestamp:

Mar 10, 2009, 10:26:25 AM (15 years ago)

Author:

rwilson

Message:

Fixed bug whereby spaces in CSV header strings crashed the application.

File:

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

misc/tools/plotcsv/plotcsv.py

@@ -162 +162 @@
 def error(msg):
     print msg
+    import tkinter_error
+    tkinter_error.tkinter_error(msg)
     sys.exit(10)
 
@@ -167 +169 @@
 ################################################################################
 # An object that behaves like a dictionary but is pickled/unpickled from a file.
+# Used to save state in the application.
 ################################################################################
 
@@ -279 +282 @@
     del data[0]         # get rid of header in dataset
 
+    # ensure header strings don't have leading/trailing spaces
+    new_header = []
+    for h in header:
+        new_header.append(h.strip())
+    header = new_header
+
     # get int index values for column headers
     try:
         x_index = header.index(x_hdr)
     except ValueError:
-        error("Sorry, X column header '%s' isn't in the data file." % x_hdr)
+        error("Sorry, X column header '%s' isn't in data file '%s'."
+              % (x_hdr, filename))
 
     try:
         y_index = header.index(y_hdr)
     except ValueError:
-        error("Sorry, Y column header '%s' isn't in the data file." % y_hdr)
+        error("Sorry, Y column header '%s' isn't in data file '%s'."
+              % (y_hdr, filename))
 
     # get appropriate columns from data[]
@@ -329 +340 @@
             legend_names = [os.path.basename(x) for x in filenames]
         pylab.legend(legend_names, 'upper right')
-#        pylab.legend(legend_names, 'upper left')
 
     pylab.show()
-#    pylab.close()
+    pylab.close()