Changeset 6351

Timestamp:

Feb 17, 2009, 8:56:26 AM (16 years ago)

Author:

rwilson

Message:

Cleanup and attempt to get matplotlib 0.98.5.2 working.

Location:

misc/tools/plotcsv

Files:

• plotcsv.py (modified) (10 diffs)
• tkinter_error.py (modified) (1 diff)

misc/tools/plotcsv/plotcsv.py

@@ -311 +311 @@
 
 
+################################################################################
+# GUI routines
+################################################################################
+
 class MyFrame(wx.Frame):
     def __init__(self, parent, id, title, pos=wx.DefaultPosition,
                     size=wx.DefaultSize, style=wx.DEFAULT_FRAME_STYLE):
+        '''Lay out the GUI form'''
+        
         # Make the frame
         wx.Frame.__init__(self, parent, id, title, pos=(50, 50),
@@ -369 +375 @@
                                      size=(100, BUTTON_HEIGHT))
 
+        # bind controls/events to handlers
         self.Bind(wx.EVT_BUTTON, self.AddCSVFile, self.btnAddCSVFile)
         self.Bind(wx.EVT_BUTTON, self.DelCSVFile, self.btnDelCSVFile)
         self.Bind(wx.EVT_BUTTON, self.PlotFiles, self.btnPlot)
+        
         self.Bind(wx.EVT_CLOSE, self.doStateSave)
-        self.Bind(wx.EVT_CLOSE, self.doStateSave)
+
+        # restore saved values
+        self.common_headers = None
         self.cfg = Config(ConfigFilename)
-        self.common_headers = None
         self.doStateRestore()
         self.updateHdrChoices()
@@ -409 +418 @@
 
     def DelCSVFile(self, event):
-        """Add a CSV file to the listbox"""
+        """Delete a CSV file from the listbox"""
 
         sel = self.txtCSVFiles.GetSelections()
@@ -421 +430 @@
 
     def doStateSave(self, event):
-        """Save state from 'self' variables."""
+        """Save state from 'self' variables & controls."""
 
         self.cfg['CSVFiles'] = self.CSVFiles
@@ -485 +494 @@
         '''Update choice controls with header lists.
 
-        Keep initially visible strings visible afterwards, if possible.
+        Disable controls if no CSV files (ie, no headers).
+        Keep selections visible afterwards, if possible.
         '''
 
+        # get current selections, if any
         selected_x = self.cbXColHdr.GetStringSelection()
         selected_y = self.cbYColHdr.GetStringSelection()
@@ -513 +524 @@
 
     def orHeaders(self, new_header):
-        '''Update X & Y column header choices'''
+        '''Update X & Y column header choices.
+
+        Return new 'common headers' list from current
+        self.common_headers and the supplied new_header list.
+        '''
 
         if self.common_headers:
@@ -522 +537 @@
 
     def GenCommonHeaders(self, headers):
-        '''Get new set of common headers'''
+        '''Get new set of common headers.
+
+        Return a new 'common header' list given a
+        list of header lists.
+        '''
 
         result = []
@@ -533 +552 @@
 
     def PlotFiles(self, event):
+        '''Plot files in the CSV file listbox.'''
+        
         selected_x = self.cbXColHdr.GetStringSelection()
         selected_y = self.cbYColHdr.GetStringSelection()
@@ -540 +561 @@
             
     def error(self, msg):
+        '''Issue xwPython error message.'''
+        
         dlg = wx.MessageDialog(self, msg, 'Error',
                                wx.OK | wx.ICON_INFORMATION)
@@ -547 +570 @@
         
 ################################################################################
-# Code to do the GUI
+# Mainline code - start the application.
 ################################################################################
 

misc/tools/plotcsv/tkinter_error.py

@@ -24 +24 @@
             self.LABEL["bg"] = "yellow"
             self.LABEL["justify"] = "left"
-            self.LABEL["font"] = "Courier"
+            self.LABEL["font"] = "9x15bold"
             self.LABEL.pack()