Changeset 6482

Timestamp:

Mar 10, 2009, 2:23:46 PM (16 years ago)

Author:

rwilson

Message:

Removed problem with tkinter error-handling after wxPython starts.

File:

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

misc/tools/plotcsv/plotcsv.py

@@ -159 +159 @@
     "zNHrrf9oCIxPMrO3N4LXSYQhEMeNpmcCKVywaA43JUYjwPeBTqcx3BIIOYTHHi74YjP4F4OI"
     "IIgI9JOI2kS0JKI/m33TfzU+ASG0bvT61fpzAAAAAElFTkSuQmCC")
-
-
-def error(msg):
-    print msg
-    import tkinter_error
-    tkinter_error.tkinter_error(msg)
-    sys.exit(10)
 
 
@@ -290 +283 @@
         x_index = header.index(x_hdr)
     except ValueError:
-        error("Sorry, X column header '%s' isn't in data file '%s'."
-              % (x_hdr, filename))
+        TheFrame.error("Sorry, X column header '%s' isn't in data file '%s'."
+                     % (x_hdr, filename))
+        return None
 
     try:
         y_index = header.index(y_hdr)
     except ValueError:
-        error("Sorry, Y column header '%s' isn't in data file '%s'."
-              % (y_hdr, filename))
+        TheFrame.error("Sorry, Y column header '%s' isn't in data file '%s'."
+                       % (y_hdr, filename))
+        return None
 
     # get appropriate columns from data[]
@@ -324 +319 @@
 
     for f in filenames:
-        (x_data, y_data) = getCSVData(f, x_hdr, y_hdr)
+        result = getCSVData(f, x_hdr, y_hdr)
+        if result is None:          # some sort of error
+            pylab.close()
+            return
+
+        (x_data, y_data) = result
         pylab.plot(x_data, y_data)
 
@@ -354 +354 @@
         # Make the frame
         wx.Frame.__init__(self, parent, id, title, pos=(50, 50),
-                            size=(FORM_WIDTH, FORM_HEIGHT),
-                            style=(wx.DEFAULT_FRAME_STYLE &
-                                   ~ (wx.RESIZE_BOX | wx.MAXIMIZE_BOX |
-                                      wx.RESIZE_BORDER)))
+                          size=(FORM_WIDTH, FORM_HEIGHT),
+                          style=(wx.DEFAULT_FRAME_STYLE &
+                                 ~ (wx.RESIZE_BOX | wx.MAXIMIZE_BOX |
+                                    wx.RESIZE_BORDER)))
 
         p = self.panel = wx.Panel(self, -1)
@@ -629 +629 @@
         '''Issue xwPython error message.'''
         
-        dlg = wx.MessageDialog(self, msg, 'Error',
-                               wx.OK | wx.ICON_INFORMATION)
-        dlg.ShowModal()
-        dlg.Destroy()
+        wx.MessageBox(msg, 'Error')
 
         
@@ -640 +637 @@
 
 if __name__ == '__main__':
+    global TheFrame
+
+    # The frame reference
+    TheFrame = None
+
     app = wx.App()
-    frame = MyFrame(None, -1, '%s %s' % (APP_NAME, APP_VERSION),
-                    size=(FORM_WIDTH, FORM_HEIGHT))
-    app.SetTopWindow(frame)
+    TheFrame = MyFrame(None, -1, '%s %s' % (APP_NAME, APP_VERSION),
+                       size=(FORM_WIDTH, FORM_HEIGHT))
+    app.SetTopWindow(TheFrame)
     app.MainLoop()