Changeset 418e59f in sasview for src/sas/guiframe

Timestamp:

Mar 4, 2015 2:51:37 PM (10 years ago)

Author:

krzywon

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

6b0fc72

Parents:

4bf54044 (diff), 76aed53 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge remote-tracking branch 'origin/master'

Location:

src/sas/guiframe

Files:

• data_processor.py (modified) (111 diffs)
• gui_manager.py (modified) (221 diffs)
• config.py (modified) (1 diff)

src/sas/guiframe/data_processor.py

@@ -10 +10 @@
 import copy
 from wx.lib.scrolledpanel import ScrolledPanel
-import  wx.grid as  Grid
 import wx.aui
 from wx.aui import AuiNotebook as nb
 import wx.lib.sheet as sheet
 from sas.guiframe.panel_base import PanelBase
-from sas.guiframe.events import NewPlotEvent 
-from sas.guiframe.events import StatusEvent  
+from sas.guiframe.events import NewPlotEvent
+from sas.guiframe.events import StatusEvent
 from sas.plottools import plottables
 from sas.guiframe.dataFitting import Data1D
@@ -23 +22 @@
              "pow": "math.sqrt"}
 
-class BatchCell:
+class BatchCell(object):
     """
     Object describing a cell in  the grid.
-    
+
     """
     def __init__(self):
@@ -34 +33 @@
         self.row = -1
         self.object = []
-        
+
 
 def parse_string(sentence, list):
@@ -42 +41 @@
     :param list: list of columns label
     """
-    toks = []
     p2 = re.compile(r'\d+')
     p = re.compile(r'[\+\-\*\%\/]')
@@ -51 +49 @@
         temp_arr = []
         for label in  list:
-            label_pos =  elt.find(label)
-            separator_pos  = label_pos + len(label)
+            label_pos = elt.find(label)
+            separator_pos = label_pos + len(label)
             if label_pos != -1 and len(elt) >= separator_pos  and\
-                elt[separator_pos]== "[":
+                elt[separator_pos] == "[":
                 # the label contain , meaning the range selected is not 
                 # continuous
@@ -64 +62 @@
                         if range_pos != -1:
                             rang = p2.findall(item)
-                            for i in xrange(int(rang[0]), int(rang[1])+1 ):
+                            for i in xrange(int(rang[0]), int(rang[1]) + 1):
                                 new_temp.append(i)
                     temp_arr += new_temp
@@ -75 +73 @@
                             if range_pos != -1:
                                 rang = p2.findall(item)
-                                for i in xrange(int(rang[0]), int(rang[1])+1 ):
+                                for i in xrange(int(rang[0]), int(rang[1]) + 1):
                                     temp_arr.append(i)
                 col_dict[elt] = (label, temp_arr)
     return col_dict
 
-          
-          
+
 class SPanel(ScrolledPanel):
     def __init__(self, parent, *args, **kwds):
-        ScrolledPanel.__init__(self, parent , *args, **kwds)
-        self.SetupScrolling()  
-        
+        ScrolledPanel.__init__(self, parent, *args, **kwds)
+        self.SetupScrolling()
+
 class GridPage(sheet.CSheet):
     """
@@ -94 +91 @@
         """
         sheet.CSheet.__init__(self, parent)
-        
+
         self.AdjustScrollbars()
         #self.SetLabelBackgroundColour('#DBD4D4')
@@ -132 +129 @@
         self.EnableEditing(True)
         if self.GetNumberCols() > 0:
-            self.default_col_width =  self.GetColSize(0)
+            self.default_col_width = self.GetColSize(0)
         self.Bind(wx.grid.EVT_GRID_LABEL_LEFT_CLICK, self.on_left_click)
         self.Bind(wx.grid.EVT_GRID_LABEL_RIGHT_CLICK, self.on_right_click)
@@ -138 +135 @@
         self.Bind(wx.grid.EVT_GRID_CMD_CELL_CHANGE, self.on_edit_cell)
         self.Bind(wx.grid.EVT_GRID_CELL_RIGHT_CLICK, self.onContextMenu)
-        
+
     def on_edit_cell(self, event):
         """
         """
-        row, col = event.GetRow(), event.GetCol()
+        row, _ = event.GetRow(), event.GetCol()
         if row > self.max_row_touse:
             self.max_row_touse = row
@@ -148 +145 @@
             self.data = {}
         event.Skip()
-        
+
     def on_selected_cell(self, event):
         """
@@ -154 +151 @@
         """
         flag = event.CmdDown() or event.ControlDown()
-        flag_shift =  event.ShiftDown()
+        flag_shift = event.ShiftDown()
         row, col = event.GetRow(), event.GetCol()
         cell = (row, col)
@@ -181 +178 @@
             else:
                 min_r = min(self.selected_rows)
-            for row_s in range(min_r, row+1):
+            for row_s in range(min_r, row + 1):
                 cel = (row_s, col)
                 if cel not in self.selected_cells:
                     if row > 0:
                         self.selected_cells.append(cel)
-                        self.selected_rows.append(row) 
-            for row_s in self.selected_rows: 
+                        self.selected_rows.append(row)
+            for row_s in self.selected_rows:
                 cel = (row_s, col)
                 if row_s > row:
@@ -200 +197 @@
         elif flag:
             if cell not in self.selected_cells:
-                if row > 0 :
+                if row > 0:
                     self.selected_cells.append(cell)
                     self.selected_rows.append(row)
@@ -226 +223 @@
         event.Skip()
         flag = event.CmdDown() or event.ControlDown()
-        
+
         col = event.GetCol()
         row = event.GetRow()
 
-        if not (flag):
+        if not flag:
             self.selected_cols = []
             self.selected_rows = []
@@ -239 +236 @@
             self.plottable_cells = []
             self.plottable_flag = False
-       
+
         self.last_selected_col = col
         self.last_selected_row = row
         if row != -1 and row not in self.selected_rows:
-             self.selected_rows.append(row)
-             
+            self.selected_rows.append(row)
+
         if col != -1:
-            for row in range(1, self.GetNumberRows()+ 1):
+            for row in range(1, self.GetNumberRows() + 1):
                 cell = (row, col)
                 if row > 0 and row < self.max_row_touse:
@@ -253 +250 @@
                     else:
                         if flag:
-                             self.selected_cells.remove(cell)
+                            self.selected_cells.remove(cell)
             self.selected_cols.append(col)
             self.axis_value = []
@@ -263 +260 @@
             if not self.axis_label:
                 self.axis_label = " "
-        
+
     def on_right_click(self, event):
         """
         Catch the right click mouse
         """
-        
         col = event.GetCol()
         row = event.GetRow()
@@ -278 +274 @@
         # Slicer plot popup menu
         slicerpop = wx.Menu()
-        col_label_menu  = wx.Menu()
-        c_name = self.GetCellValue(0, col) 
+        col_label_menu = wx.Menu()
+        c_name = self.GetCellValue(0, col)
         label = "Insert column before %s " % str(c_name)
-        slicerpop.AppendSubMenu(col_label_menu , 
-                                 '&%s' % str(label), str(label))
-        col_name = [self.GetCellValue(0, c) 
-                        for c in range(self.GetNumberCols())]
+        slicerpop.AppendSubMenu(col_label_menu, '&%s' % str(label), str(label))
         row = 0
         label = self.GetCellValue(row, col)
         self.insert_col_menu(col_label_menu, label, self)
-        
-        
-        col_after_menu  = wx.Menu()
+
+        col_after_menu = wx.Menu()
         label = "Insert column after %s " % str(c_name)
-        slicerpop.AppendSubMenu(col_after_menu , 
-                                 '&%s' % str(label), str(label))
-        col_name = [self.GetCellValue(0, c) 
-                        for c in range(self.GetNumberCols())]
+        slicerpop.AppendSubMenu(col_after_menu, '&%s' % str(label), str(label))
         self.insert_after_col_menu(col_after_menu, label, self)
-        
-        
-        id = wx.NewId()    
+
+        wx_id = wx.NewId()
         hint = 'Remove selected column %s'
-        slicerpop.Append(id, '&Remove Column', hint)
-        wx.EVT_MENU(self, id, self.on_remove_column)
-        
+        slicerpop.Append(wx_id, '&Remove Column', hint)
+        wx.EVT_MENU(self, wx_id, self.on_remove_column)
+
         pos = wx.GetMousePosition()
         pos = self.ScreenToClient(pos)
         self.PopupMenu(slicerpop, pos)
         event.Skip()
-        
+
     def insert_col_menu(self, menu, label, window):
         """
@@ -320 +308 @@
         wx.EVT_MENU(window, id, self.on_insert_column)
         row = 0
-        col_name = [self.GetCellValue(row, col) 
+        col_name = [self.GetCellValue(row, col) for col in range(self.GetNumberCols())]
+        for c_name in self.data.keys():
+            if c_name not in col_name and self.data[c_name]:
+                wx_id = wx.NewId()
+                hint = "Insert %s column before the " % str(c_name)
+                hint += " %s column" % str(label)
+                menu.Append(wx_id, '&%s' % str(c_name), hint)
+                wx.EVT_MENU(window, wx_id, self.on_insert_column)
+
+    def insert_after_col_menu(self, menu, label, window):
+        """
+        """
+        if self.data is None:
+            return
+        wx_id = wx.NewId()
+        title = "Empty"
+        hint = 'Insert empty column after %s' % str(label)
+        menu.Append(wx_id, title, hint)
+        wx.EVT_MENU(window, wx_id, self.on_insert_after_column)
+        row = 0
+        col_name = [self.GetCellValue(row, col)
                         for col in range(self.GetNumberCols())]
         for c_name in self.data.keys():
             if c_name not in col_name and self.data[c_name]:
-                id = wx.NewId()
-                hint = "Insert %s column before the " % str(c_name)
-                hint += " %s column" % str(label)
-                menu.Append(id, '&%s' % str(c_name), hint)
-                wx.EVT_MENU(window, id, self.on_insert_column)
-            
-    def insert_after_col_menu(self, menu, label, window):
-        """
-        """
-        if self.data is None:
-            return
-        id = wx.NewId()
-        title = "Empty"
-        hint = 'Insert empty column after %s' % str(label)
-        menu.Append(id, title, hint)
-        wx.EVT_MENU(window, id, self.on_insert_after_column)
-        row = 0
-        col_name = [self.GetCellValue(row, col) 
-                        for col in range(self.GetNumberCols())]
-        for c_name in self.data.keys():
-            if c_name not in col_name and self.data[c_name]:
-                id = wx.NewId()
+                wx_id = wx.NewId()
                 hint = "Insert %s column after the " % str(c_name)
                 hint += " %s column" % str(label)
-                menu.Append(id, '&%s' % str(c_name), hint)
-                wx.EVT_MENU(window, id, self.on_insert_after_column)
-                               
+                menu.Append(wx_id, '&%s' % str(c_name), hint)
+                wx.EVT_MENU(window, wx_id, self.on_insert_after_column)
+
     def on_remove_column(self, event=None):
         """
@@ -357 +344 @@
             col = self.selected_cols[0]
             self.remove_column(col=col, numCols=1)
-            
+
     def remove_column(self, col, numCols=1):
         """
@@ -370 +357 @@
                 value = self.GetCellValue(row, col)
                 self.data[col_name].append(value)
-                for k , value_list in self.data.iteritems():
+                for k, value_list in self.data.iteritems():
                     if k != col_name:
                         length = len(value_list)
@@ -378 +365 @@
                                 self.data[k].append("")
         self.DeleteCols(pos=col, numCols=numCols, updateLabels=True)
-            
+
     def on_insert_column(self, event):
         """
@@ -384 +371 @@
         if self.selected_cols is not None or len(self.selected_cols) > 0:
             col = self.selected_cols[0]
-            # add data to the grid    
-            row = 0
-            id = event.GetId()
-            col_name = event.GetEventObject().GetLabelText(id)
+            # add data to the grid
+            wx_id = event.GetId()
+            col_name = event.GetEventObject().GetLabelText(wx_id)
             self.insert_column(col=col, col_name=col_name)
-            if  not issubclass(event.GetEventObject().__class__ , wx.Menu):
+            if  not issubclass(event.GetEventObject().__class__, wx.Menu):
                 col += 1
                 self.selected_cols[0] += 1
-                
+
     def on_insert_after_column(self, event):
         """
@@ -399 +385 @@
         if self.selected_cols is not None or len(self.selected_cols) > 0:
             col = self.selected_cols[0] + 1
-            # add data to the grid    
-            row = 0
-            id = event.GetId()
-            col_name = event.GetEventObject().GetLabelText(id)
+            # add data to the grid
+            wx_id = event.GetId()
+            col_name = event.GetEventObject().GetLabelText(wx_id)
             self.insert_column(col=col, col_name=col_name)
-            if  not issubclass(event.GetEventObject().__class__ , wx.Menu):
+            if  not issubclass(event.GetEventObject().__class__, wx.Menu):
                 self.selected_cols[0] += 1
-           
+
     def insert_column(self, col, col_name):
         """
-        """ 
-         
+        """
         row = 0
         self.InsertCols(pos=col, numCols=1, updateLabels=True)
@@ -417 +401 @@
         if col_name in self.data.keys():
             value_list = self.data[col_name]
-            cell_row =  1
+            cell_row = 1
             for value in value_list:
                 label = value#format_number(value, high=True)
@@ -425 +409 @@
         width = self.GetColSize(col)
         if width < self.default_col_width:
-           self.SetColSize(col, self.default_col_width)
+            self.SetColSize(col, self.default_col_width)
         color = self.parent.GetBackgroundColour()
         self.SetCellBackgroundColour(0, col, color)
         self.ForceRefresh()
-        
+
     def on_set_x_axis(self, event):
         """
         """
         self.panel.set_xaxis(x=self.axis_value, label=self.axis_label)
-   
+
     def on_set_y_axis(self, event):
         """
         """
-        self.panel.set_yaxis(y=self.axis_value, label=self.axis_label)     
-            
+        self.panel.set_yaxis(y=self.axis_value, label=self.axis_label)
+
     def set_data(self, data_inputs, data_outputs, details, file_name):
         """
@@ -448 +432 @@
         self.file_name = file_name
         self.details = details
-        
+
         if data_outputs is None:
             data_outputs = {}
@@ -458 +442 @@
         for item in (self.data_outputs, self.data_inputs):
             self.data.update(item)
-            
-        #if len(self.data) + len(self.data_inputs) +len(self.data_outputs) == 0:
-        #    self.EnableEditing(False)
-        #else:
-        #    self.EnableEditing(True)
+
         if  len(self.data_outputs) > 0:
             self._cols = self.GetNumberCols()
             self._rows = self.GetNumberRows()
             self.col_names = self.data_outputs.keys()
-            self.col_names.sort() 
+            self.col_names.sort()
             nbr_user_cols = len(self.col_names)
             #Add more columns to the grid if necessary
             if nbr_user_cols > self._cols:
-                new_col_nbr = nbr_user_cols -  self._cols + 1
+                new_col_nbr = nbr_user_cols - self._cols + 1
                 self.AppendCols(new_col_nbr, True)
-            #Add more rows to the grid if necessary  
+            #Add more rows to the grid if necessary
             nbr_user_row = len(self.data_outputs.values()[0])
             if nbr_user_row > self._rows + 1:
-                new_row_nbr =  nbr_user_row - self._rows + 1
+                new_row_nbr = nbr_user_row - self._rows + 1
                 self.AppendRows(new_row_nbr, True)
-            # add data to the grid    
+            # add data to the grid
             wx.CallAfter(self.set_grid_values)
         self.ForceRefresh()
-    
+
     def set_grid_values(self):
         """
         Set the values in grids
         """
-        # add data to the grid    
+        # add data to the grid
         row = 0
         col = 0
@@ -494 +474 @@
             self.SetCellValue(row, col, str(col_name))
             col += 1
-            cell_row =  1
+            cell_row = 1
             value_list = self.data_outputs[col_name]
-            
+
             for value in value_list:
                 label = value
@@ -510 +490 @@
                 width = self.GetColSize(cell_col)
                 if width < self.default_col_width:
-                   self.SetColSize(cell_col, self.default_col_width)
-                
+                    self.SetColSize(cell_col, self.default_col_width)
+
                 cell_row += 1
             cell_col += 1
             if cell_row > self.max_row_touse:
                 self.max_row_touse = cell_row
-                         
+
     def get_grid_view(self):
         """
@@ -523 +503 @@
         grid_view = {}
         for col in xrange(self.GetNumberCols()):
-            label = self.GetCellValue(row=0, col=col) 
+            label = self.GetCellValue(row=0, col=col)
             label = label.strip()
             if label != "":
@@ -530 +510 @@
                     value = self.GetCellValue(row=row, col=col)
                     if value != "":
-                        grid_view[label].append(value)  
+                        grid_view[label].append(value)
                     else:
-                        grid_view[label].append(None) 
+                        grid_view[label].append(None)
         return grid_view
-    
+
     def get_nofrows(self):
         """
@@ -540 +520 @@
         """
         return self._rows
-    
+
     def onContextMenu(self, event):
         """
-        Default context menu 
-        """
-        id = wx.NewId()
+        Default context menu
+        """
+        wx_id = wx.NewId()
         c_menu = wx.Menu()
-        copy_menu = c_menu.Append(id, '&Copy', 'Copy the selected cells')
-        wx.EVT_MENU(self, id, self.on_copy)
-        
-        id = wx.NewId()
-        paste_menu = c_menu.Append(id, '&Paste', 'Paste the selected cells')
-        wx.EVT_MENU(self, id, self.on_paste)
-        
-        id = wx.NewId()
-        clear_menu = c_menu.Append(id, '&Clear', 'Clear the selected cells')
-        wx.EVT_MENU(self, id, self.on_clear)
-        
+        copy_menu = c_menu.Append(wx_id, '&Copy', 'Copy the selected cells')
+        wx.EVT_MENU(self, wx_id, self.on_copy)
+
+        wx_id = wx.NewId()
+        c_menu.Append(wx_id, '&Paste', 'Paste the selected cells')
+        wx.EVT_MENU(self, wx_id, self.on_paste)
+
+        wx_id = wx.NewId()
+        clear_menu = c_menu.Append(wx_id, '&Clear', 'Clear the selected cells')
+        wx.EVT_MENU(self, wx_id, self.on_clear)
+
         # enable from flag
         has_selection = False
@@ -576 +556 @@
         except:
             return
-    
+
     def on_copy(self, event):
         """
@@ -592 +572 @@
             self.file_name = 'copied_data'
         self.Paste()
-    
+
     def on_clear(self, event):
         """
@@ -598 +578 @@
         """
         self.Clear()
-    
+
 class Notebook(nb, PanelBase):
     """
@@ -606 +586 @@
     """
     window_caption = "Notebook "
-    
+
     def __init__(self, parent, manager=None, data=None, *args, **kwargs):
         """
         """
         nb.__init__(self, parent, -1,
-                    style=wx.aui.AUI_NB_WINDOWLIST_BUTTON| 
-                    wx.aui.AUI_BUTTON_DOWN|
-                    wx.aui.AUI_NB_DEFAULT_STYLE|
+                    style=wx.aui.AUI_NB_WINDOWLIST_BUTTON |
+                    wx.aui.AUI_BUTTON_DOWN |
+                    wx.aui.AUI_NB_DEFAULT_STYLE |
                     wx.CLIP_CHILDREN)
         PanelBase.__init__(self, parent)
@@ -624 +604 @@
         self.add_empty_page()
         self.pageClosedEvent = wx.aui.EVT_AUINOTEBOOK_PAGE_CLOSE
-        self.Bind(self.pageClosedEvent, self.on_close_page)    
-    
+        self.Bind(self.pageClosedEvent, self.on_close_page)
+
     def add_empty_page(self):
         """
@@ -637 +617 @@
         self.enable_close_button()
         self.gpage_num += 1
-        return grid , pos
-        
+        return grid, pos
+
     def enable_close_button(self):
         """
-        display the close button on tab for more than 1 tabs else remove the 
+        display the close button on tab for more than 1 tabs else remove the
         close button
         """
         if self.GetPageCount() <= 1:
-            style = self.GetWindowStyleFlag() 
+            style = self.GetWindowStyleFlag()
             flag = wx.aui.AUI_NB_CLOSE_ON_ACTIVE_TAB
             if style & wx.aui.AUI_NB_CLOSE_ON_ACTIVE_TAB == flag:
@@ -656 +636 @@
                 style |= wx.aui.AUI_NB_CLOSE_ON_ACTIVE_TAB
                 self.SetWindowStyle(style)
-              
+
     def on_edit_axis(self):
         """
@@ -672 +652 @@
                     msg += "Please select only one column"
                     raise ValueError, msg
-            for (cell_row, cell_col) in grid.selected_cells:
+            for (_, cell_col) in grid.selected_cells:
                 if cell_col != col:
                     msg = "Cannot use cells from different columns for "
@@ -678 +658 @@
                     msg += "Please select elements of the same col.\n"
                     raise ValueError, msg
-                
+
             # Finally check the highlighted cell if any cells missing
             self.get_highlighted_row(True)
@@ -686 +666 @@
             raise ValueError, msg
         return grid.selected_cells
-       
+
     def get_highlighted_row(self, is_number=True):
         """
@@ -706 +686 @@
                     continue
                 if is_number:
-                    try: 
+                    try:
                         float(grid.GetCellValue(row, col))
                     except:
@@ -715 +695 @@
                 if cel not in grid.selected_cells:
                     grid.selected_cells.append(cel)
-                        
+
     def get_column_labels(self):
         """
@@ -723 +703 @@
         grid = self.GetPage(pos)
         labels = {}
-        row = 0
         for col in range(grid.GetNumberCols()):
             label = grid.GetColLabelValue(int(col))
-            #label = grid.GetCellValue(row, col)
-            if label.strip() != "" :
+            if label.strip() != "":
                 labels[label.strip()] = col
         return labels
-        
+
     def create_axis_label(self, cell_list):
         """
-        Receive a list of cells and  create a string presenting the selected 
-        cells. 
+        Receive a list of cells and  create a string presenting the selected
+        cells.
         :param cell_list: list of tuple
-        
+
         """
         pos = self.GetSelection()
@@ -742 +720 @@
         label = ""
         col_name = ""
-        def create_label(col_name,  row_min=None, row_max=None):
+        def create_label(col_name, row_min=None, row_max=None):
             """
             """
@@ -750 +728 @@
                     result = str(row_max) + "]"
                 elif row_max is None:
-                     result = str(col_name) + "[" + str(row_min) + ":"
+                    result = str(col_name) + "[" + str(row_min) + ":"
                 else:
-                    result = str(col_name) +  "[" + str(row_min) + ":"
+                    result = str(col_name) + "[" + str(row_min) + ":"
                     result += str(row_max) + "]"
             return str(result)
-            
+
         if len(cell_list) > 0:
             if len(cell_list) == 1:
-                row_min, col  = cell_list[0]    
-                col_name =  grid.GetColLabelValue(int(col))
-                 
+                row_min, col = cell_list[0]
+                col_name = grid.GetColLabelValue(int(col))
+
                 col_title = grid.GetCellValue(0, col)
-                label = create_label(col_name, row_min+1 , row_min+1)
-                return  label,  col_title
+                label = create_label(col_name, row_min + 1, row_min + 1)
+                return  label, col_title
             else:
                 temp_list = copy.deepcopy(cell_list)
                 temp_list.sort()
                 length = len(temp_list)
-                row_min, col  = temp_list[0]    
-                row_max, _  = temp_list[length-1]
+                row_min, col = temp_list[0]
+                row_max, _ = temp_list[length - 1]
                 col_name = grid.GetColLabelValue(int(col))
                 col_title = grid.GetCellValue(0, col)
@@ -779 +757 @@
                         if row != new_row:
                             temp_list.insert(index, (None, None))
-                            if index -1 >= 0:
-                                new_row, _ = temp_list[index-1]
-                                if not new_row == None and new_row != ' ' :
-                                    label += create_label(col_name, None, 
-                                                          int(new_row) +1)
+                            if index - 1 >= 0:
+                                new_row, _ = temp_list[index - 1]
+                                if not new_row == None and new_row != ' ':
+                                    label += create_label(col_name, None,
+                                                          int(new_row) + 1)
                                 else:
                                     label += "]"
@@ -789 +767 @@
                             if index + 1 < len(temp_list):
                                 new_row, _ = temp_list[index + 1]
-                                if not new_row==None:
-                                    label += create_label(col_name, 
-                                                          int(new_row)+1, None)
+                                if not new_row == None:
+                                    label += create_label(col_name,
+                                                          int(new_row) + 1, None)
                     if row_min != None and row_max != None:
                         if index == 0:
-                            label += create_label(col_name,  
-                                                  int(row_min)+1, None)
-                        elif index == len(temp_list)-1:
-                            label += create_label(col_name, None, 
-                                                  int(row_max)+1)
+                            label += create_label(col_name,
+                                                  int(row_min) + 1, None)
+                        elif index == len(temp_list) - 1:
+                            label += create_label(col_name, None,
+                                                  int(row_max) + 1)
                     index += 1
                 # clean up the list
@@ -809 +787 @@
 
                 return label_out, col_title
-    
+
     def on_close_page(self, event):
         """
@@ -817 +795 @@
             event.Veto()
         wx.CallAfter(self.enable_close_button)
-        
+
     def set_data(self, data_inputs, data_outputs, details="", file_name=None):
         if data_outputs is None or data_outputs == {}:
@@ -826 +804 @@
             if grid.data is None:
                 #Found empty page
-                grid.set_data(data_inputs=inputs, 
+                grid.set_data(data_inputs=inputs,
                               data_outputs=outputs,
                               details=details,
-                              file_name=file_name) 
-                self.SetSelection(pos) 
+                              file_name=file_name)
+                self.SetSelection(pos)
                 return
-                
+
         grid, pos = self.add_empty_page()
-        grid.set_data(data_inputs=inputs, 
+        grid.set_data(data_inputs=inputs,
                       data_outputs=outputs,
                       file_name=file_name,
                       details=details)
-        
+
     def get_odered_results(self, inputs, outputs=None):
         """
@@ -868 +846 @@
             else:
                 inputs[key] = []
-                #print "Different length in %s: Removed from Listing."% key
-                
+
         return inputs, outputs
-    
+
     def add_column(self):
         """
@@ -879 +856 @@
         grid = self.GetPage(pos)
         grid.AppendCols(1, True)
-        
+
     def on_remove_column(self):
         """
@@ -887 +864 @@
         grid = self.GetPage(pos)
         grid.on_remove_column(event=None)
-        
+
 class GridPanel(SPanel):
     def __init__(self, parent, data_inputs=None,
                  data_outputs=None, *args, **kwds):
-        SPanel.__init__(self, parent , *args, **kwds)
-       
+        SPanel.__init__(self, parent, *args, **kwds)
+
         self.vbox = wx.BoxSizer(wx.VERTICAL)
-        
+
         self.plotting_sizer = wx.FlexGridSizer(3, 7, 10, 5)
         self.button_sizer = wx.BoxSizer(wx.HORIZONTAL)
@@ -906 +883 @@
         self._data_outputs = data_outputs
         self.x = []
-        self.y  = []
-        self.dy  = []
+        self.y = []
+        self.dy = []
         self.x_axis_label = None
         self.y_axis_label = None
@@ -919 +896 @@
         self.notebook = None
         self.plot_num = 1
-       
+
         self.layout_grid()
         self.layout_plotting_area()
@@ -932 +909 @@
         self.x_axis_label.SetValue("%s[:]" % str(label))
         self.x_axis_title.SetValue(str(label))
-        
+
     def set_yaxis(self, label="", y=None):
         """
@@ -941 +918 @@
         self.y_axis_label.SetValue("%s[:]" % str(label))
         self.y_axis_title.SetValue(str(label))
-        
+
     def set_dyaxis(self, label="", dy=None):
         """
@@ -949 +926 @@
         self.dy = dy
         self.dy_axis_label.SetValue("%s[:]" % str(label))
-                
+
     def get_plot_axis(self, col, list):
         """
-       
+
         """
         axis = []
@@ -967 +944 @@
                         axis.append(float(value))
                     except:
-                        msg = "Invalid data in row %s column %s" % (str(row),
-                                                                    str(col))
-                        wx.PostEvent(self.parent.parent, 
-                             StatusEvent(status=msg, info="error"))
+                        msg = "Invalid data in row %s column %s" % (str(row), str(col))
+                        wx.PostEvent(self.parent.parent,
+                                     StatusEvent(status=msg, info="error"))
                         return None
             else:
-                axis.append(None) 
+                axis.append(None)
         return axis
-    
+
     def on_view(self, event):
         """
@@ -986 +962 @@
         if len(grid.selected_cells) == 0:
             msg = "Highlight a Data or Chi2 column first..."
-            wx.PostEvent(self.parent.parent, 
-                             StatusEvent(status=msg, info="error")) 
+            wx.PostEvent(self.parent.parent, StatusEvent(status=msg, info="error"))
             return
         elif len(grid.selected_cells) > 20:
             msg = "Too many data (> 20) to plot..."
             msg += "\n Please select no more than 20 data."
-            dial = wx.MessageDialog(self, msg, 'Plotting', wx.OK)
-            wx.PostEvent(self.parent.parent, 
-                             StatusEvent(status=msg, info="error")) 
+            wx.MessageDialog(self, msg, 'Plotting', wx.OK)
+            wx.PostEvent(self.parent.parent, StatusEvent(status=msg, info="error"))
             return
 
@@ -1004 +978 @@
                 values = grid.data[label]
                 if row > len(values) or row < 1:
-                    msg = "Invalid cell was chosen." 
-                    wx.PostEvent(self.parent.parent, StatusEvent(status=msg, 
-                                                                info="error"))
+                    msg = "Invalid cell was chosen."
+                    wx.PostEvent(self.parent.parent, StatusEvent(status=msg, info="error"))
                     continue
                 else:
-                     value = values[row -1]
+                    value = values[row - 1]
                 if issubclass(value.__class__, BatchCell):
                     if value.object is None or len(value.object) == 0:
@@ -1015 +988 @@
                         msg += "Column %s is NOT " % str(label)
                         msg += "the results of fits to view..."
-                        #raise ValueError, msg
-                        wx.PostEvent(self.parent.parent, StatusEvent(status=msg, 
-                                                                info="error")) 
+                        wx.PostEvent(self.parent.parent, StatusEvent(status=msg, info="error"))
                         return
                     for new_plot in value.object:
                         if new_plot is None or \
-                         not issubclass(new_plot.__class__, 
+                         not issubclass(new_plot.__class__,
                                         plottables.Plottable):
                             msg = "Row %s , " % str(row)
                             msg += "Column %s is NOT " % str(label)
                             msg += "the results of fits to view..."
-                            #raise ValueError, msg
-                            wx.PostEvent(self.parent.parent, 
-                                 StatusEvent(status=msg, info="error")) 
+                            wx.PostEvent(self.parent.parent,
+                                         StatusEvent(status=msg, info="error"))
                             return
-                            #continue
-                        #new_plot.name =  title + ': ' + new_plot.title
                         if issubclass(new_plot.__class__, Data1D):
                             if label in grid.list_plot_panels.keys():
@@ -1046 +1014 @@
                                     msg = "2D View: Please select one data set"
                                     msg += " at a time for View Fit Results."
-                                    wx.PostEvent(self.parent.parent, 
-                                                 StatusEvent(status=msg,
-                                                              info="error"))
+                                    wx.PostEvent(self.parent.parent,
+                                                 StatusEvent(status=msg, info="error"))
                                     return
 
-                        wx.PostEvent(self.parent.parent, 
-                                     NewPlotEvent(plot=new_plot, 
-                                                group_id=str(new_plot.group_id),
-                                                title=title))  
+                        wx.PostEvent(self.parent.parent,
+                                     NewPlotEvent(plot=new_plot,
+                                                  group_id=str(new_plot.group_id),
+                                                  title=title))
                         msg = "Plotting the View Fit Results  completed!"
-                        wx.PostEvent( self.parent.parent, 
-                                      StatusEvent(status=msg))  
+                        wx.PostEvent(self.parent.parent, StatusEvent(status=msg))
                 else:
-                   
                     msg = "Row %s , " % str(row)
                     msg += "Column %s is NOT " % str(label)
                     msg += "the results of fits to view..."
-                    wx.PostEvent(self.parent.parent, 
-                         StatusEvent(status=msg, info="error")) 
+                    wx.PostEvent(self.parent.parent, StatusEvent(status=msg, info="error"))
                     return
-    
+
     def on_plot(self, event):
         """
         Evaluate the contains of textcrtl and plot result
-        """ 
+        """
         pos = self.notebook.GetSelection()
         grid = self.notebook.GetPage(pos)
@@ -1084 +1048 @@
         except:
             msg = "X axis value error."
-            wx.PostEvent(self.parent.parent, 
-                            StatusEvent(status=msg, info="error")) 
+            wx.PostEvent(self.parent.parent, StatusEvent(status=msg, info="error"))
             return
         dict = parse_string(sentence, column_names.keys())
-        
+
         try:
             sentence = self.get_sentence(dict, sentence, column_names)
@@ -1094 +1057 @@
         except:
             msg = "Need a proper x-range."
-            wx.PostEvent(self.parent.parent, 
-                             StatusEvent(status=msg, info="error")) 
+            wx.PostEvent(self.parent.parent, StatusEvent(status=msg, info="error"))
             return
         #evaluate y
@@ -1105 +1067 @@
         except:
             msg = "Y axis value error."
-            wx.PostEvent(self.parent.parent, 
-                            StatusEvent(status=msg, info="error")) 
+            wx.PostEvent(self.parent.parent, StatusEvent(status=msg, info="error"))
             return
         dict = parse_string(sentence, column_names.keys())
@@ -1114 +1075 @@
         except:
             msg = "Need a proper y-range."
-            wx.PostEvent(self.parent.parent, 
-                             StatusEvent(status=msg, info="error")) 
+            wx.PostEvent(self.parent.parent, StatusEvent(status=msg, info="error"))
             return
         #evaluate y
@@ -1127 +1087 @@
             except:
                 msg = "Need a proper dy-range."
-                wx.PostEvent(self.parent.parent, 
-                                 StatusEvent(status=msg, info="error")) 
+                wx.PostEvent(self.parent.parent, StatusEvent(status=msg, info="error"))
                 return
         if len(x) != len(y) or (len(x) == 0 or len(y) == 0):
             msg = "Need same length for X and Y axis and both greater than 0"
             msg += " to plot.\n"
-            msg += "Got X length = %s, Y length = %s" % (str(len(x)),
-                                                          str(len(y)))
-            wx.PostEvent(self.parent.parent, 
-                             StatusEvent(status=msg, info="error")) 
+            msg += "Got X length = %s, Y length = %s" % (str(len(x)), str(len(y)))
+            wx.PostEvent(self.parent.parent, StatusEvent(status=msg, info="error"))
             return
-        if dy != None and (len(y) != len(dy)):  
+        if dy != None and (len(y) != len(dy)):
             msg = "Need same length for Y and dY axis and both greater than 0"
             msg += " to plot.\n"
-            msg += "Got Y length = %s, dY length = %s" % (str(len(y)),
-                                                          str(len(dy)))
-            wx.PostEvent(self.parent.parent, 
-                             StatusEvent(status=msg, info="error")) 
+            msg += "Got Y length = %s, dY length = %s" % (str(len(y)), str(len(dy)))
+            wx.PostEvent(self.parent.parent, StatusEvent(status=msg, info="error"))
             return
         if dy == None:
@@ -1150 +1105 @@
         #plotting
         new_plot = Data1D(x=x, y=y, dy=dy)
-        new_plot.id =  wx.NewId()
+        new_plot.id = wx.NewId()
         new_plot.is_data = False
         new_plot.group_id = wx.NewId()
         y_title = self.y_axis_title.GetValue()
         x_title = self.x_axis_title.GetValue()
-        title = "%s_vs_%s" % (y_title, 
-                              x_title)
-        new_plot.xaxis(x_title, 
-                       self.x_axis_unit.GetValue())
-        new_plot.yaxis(y_title, 
-                       self.y_axis_unit.GetValue())
+        title = "%s_vs_%s" % (y_title, x_title)
+        new_plot.xaxis(x_title, self.x_axis_unit.GetValue())
+        new_plot.yaxis(y_title, self.y_axis_unit.GetValue())
         try:
             title = y_title.strip()
-            
             title += "_" + self.notebook.GetPageText(pos)
             title += "_" + str(self.plot_num)
@@ -1169 +1120 @@
             new_plot.name = title
             new_plot.xtransform = "x"
-            new_plot.ytransform  = "y"  
-            #new_plot.is_data = False
-            wx.PostEvent(self.parent.parent, 
-                        NewPlotEvent(plot=new_plot, 
-                        group_id=str(new_plot.group_id), title =title)) 
+            new_plot.ytransform = "y"
+            wx.PostEvent(self.parent.parent,
+                         NewPlotEvent(plot=new_plot,
+                                      group_id=str(new_plot.group_id), title=title))
             msg = "Plotting completed!"
-            wx.PostEvent( self.parent.parent, 
-                                      StatusEvent(status=msg))  
-            self.parent.parent.update_theory(data_id=new_plot.id, 
-                                              theory=new_plot) 
+            wx.PostEvent(self.parent.parent, StatusEvent(status=msg))
+            self.parent.parent.update_theory(data_id=new_plot.id, theory=new_plot)
         except:
-             wx.PostEvent(self.parent.parent, 
-                             StatusEvent(status=msg, info="error")) 
-    
+            wx.PostEvent(self.parent.parent, StatusEvent(status=msg, info="error"))
+
     def get_sentence(self, dict, sentence, column_names):
         """
@@ -1192 +1139 @@
             if axis == None:
                 return None
-            sentence = sentence.replace(tok, 
-                                        "numpy.array(%s)" % str(axis))
+            sentence = sentence.replace(tok, "numpy.array(%s)" % str(axis))
         for key, value in FUNC_DICT.iteritems():
             sentence = sentence.replace(key.lower(), value)
         return sentence
-            
+
     def layout_grid(self):
         """
@@ -1205 +1151 @@
         self.notebook.set_data(self._data_inputs, self._data_outputs)
         self.grid_sizer.Add(self.notebook, 1, wx.EXPAND, 0)
-       
+
     def layout_plotting_area(self):
         """
@@ -1221 +1167 @@
         self.dy_axis_label = wx.TextCtrl(self, -1, size=(200, -1))
         self.x_axis_add = wx.Button(self, -1, "Add")
-        self.x_axis_add.Bind(event=wx.EVT_BUTTON, handler=self.on_edit_axis, 
-                            id=self.x_axis_add.GetId())
+        self.x_axis_add.Bind(event=wx.EVT_BUTTON, handler=self.on_edit_axis,
+                             id=self.x_axis_add.GetId())
         self.y_axis_add = wx.Button(self, -1, "Add")
-        self.y_axis_add.Bind(event=wx.EVT_BUTTON, handler=self.on_edit_axis, 
-                            id=self.y_axis_add.GetId())
+        self.y_axis_add.Bind(event=wx.EVT_BUTTON, handler=self.on_edit_axis,
+                             id=self.y_axis_add.GetId())
         self.dy_axis_add = wx.Button(self, -1, "Add")
-        self.dy_axis_add.Bind(event=wx.EVT_BUTTON, handler=self.on_edit_axis, 
-                            id=self.dy_axis_add.GetId())
+        self.dy_axis_add.Bind(event=wx.EVT_BUTTON, handler=self.on_edit_axis,
+                              id=self.dy_axis_add.GetId())
         self.x_axis_unit = wx.TextCtrl(self, -1)
         self.y_axis_unit = wx.TextCtrl(self, -1)
@@ -1238 +1184 @@
         plot_tip = "Highlight a column for each axis and \n"
         plot_tip += "click the Add buttons first."
-        
+
         self.plot_button.SetToolTipString(plot_tip)
         boxsizer1.AddMany([(note_text, 0, wx.LEFT, 10),
-                           (self.view_button, 0, wx.LEFT|wx.RIGHT, 10)])
-        self.button_sizer.AddMany([(boxsizer1, 0, 
-                                    wx.LEFT|wx.RIGHT|wx.BOTTOM, 10), 
-                                   (self.plot_button, 0, 
-                                    wx.LEFT|wx.TOP|wx.BOTTOM|wx.EXPAND, 12)])
-        
+                           (self.view_button, 0, wx.LEFT | wx.RIGHT, 10)])
+        self.button_sizer.AddMany([(boxsizer1, 0,
+                                    wx.LEFT | wx.RIGHT | wx.BOTTOM, 10),
+                                   (self.plot_button, 0,
+                                    wx.LEFT | wx.TOP | wx.BOTTOM | wx.EXPAND, 12)])
+
         wx.EVT_BUTTON(self, self.plot_button.GetId(), self.on_plot)
-        self.plotting_sizer.AddMany([
-                    (wx.StaticText(self, -1, 
-                                   "X-axis Label\nSelection Range"), 1,
-                      wx.TOP|wx.BOTTOM|wx.LEFT, 10),
-                    (self.x_axis_label, 1, wx.TOP|wx.BOTTOM, 10),
-                    (self.x_axis_add, 1, wx.TOP|wx.BOTTOM|wx.RIGHT, 10),
-                    (wx.StaticText(self, -1, "X-axis Label"), 1, 
-                     wx.TOP|wx.BOTTOM|wx.LEFT, 10),
-                    (self.x_axis_title, 1, wx.TOP|wx.BOTTOM, 10),
-                    (wx.StaticText(self, -1 , "X-axis Unit"), 1, 
-                     wx.TOP|wx.BOTTOM, 10),
-                    (self.x_axis_unit, 1, wx.TOP|wx.BOTTOM, 10),
-                    (wx.StaticText(self, -1, 
-                                   "Y-axis Label\nSelection Range"), 1, 
-                     wx.BOTTOM|wx.LEFT, 10),
+        self.plotting_sizer.AddMany(\
+                   [(wx.StaticText(self, -1, "X-axis Label\nSelection Range"), 1,
+                     wx.TOP | wx.BOTTOM | wx.LEFT, 10),
+                    (self.x_axis_label, 1, wx.TOP | wx.BOTTOM, 10),
+                    (self.x_axis_add, 1, wx.TOP | wx.BOTTOM | wx.RIGHT, 10),
+                    (wx.StaticText(self, -1, "X-axis Label"), 1, wx.TOP | wx.BOTTOM | wx.LEFT, 10),
+                    (self.x_axis_title, 1, wx.TOP | wx.BOTTOM, 10),
+                    (wx.StaticText(self, -1, "X-axis Unit"), 1, wx.TOP | wx.BOTTOM, 10),
+                    (self.x_axis_unit, 1, wx.TOP | wx.BOTTOM, 10),
+                    (wx.StaticText(self, -1, "Y-axis Label\nSelection Range"), 1,
+                     wx.BOTTOM | wx.LEFT, 10),
                     (self.y_axis_label, wx.BOTTOM, 10),
-                    (self.y_axis_add, 1, wx.BOTTOM|wx.RIGHT, 10),
-                    (wx.StaticText(self, -1, "Y-axis Label"), 1, 
-                     wx.BOTTOM|wx.LEFT, 10),
-                    (self.y_axis_title,  wx.BOTTOM, 10),
-                    (wx.StaticText(self, -1 , "Y-axis Unit"), 1, wx.BOTTOM, 10),
+                    (self.y_axis_add, 1, wx.BOTTOM | wx.RIGHT, 10),
+                    (wx.StaticText(self, -1, "Y-axis Label"), 1,
+                     wx.BOTTOM | wx.LEFT, 10),
+                    (self.y_axis_title, wx.BOTTOM, 10),
+                    (wx.StaticText(self, -1, "Y-axis Unit"), 1, wx.BOTTOM, 10),
                     (self.y_axis_unit, 1, wx.BOTTOM, 10),
-                    (wx.StaticText(self, -1, 
-                                   "dY-Bar (Optional)\nSelection Range"),  
-                                   1, wx.BOTTOM|wx.LEFT, 10),
+                    (wx.StaticText(self, -1, "dY-Bar (Optional)\nSelection Range"),
+                     1, wx.BOTTOM | wx.LEFT, 10),
                     (self.dy_axis_label, wx.BOTTOM, 10),
-                    (self.dy_axis_add, 1, wx.BOTTOM|wx.RIGHT, 10),
-                      (-1, -1),
-                      (-1, -1),
-                      (-1, -1),
-                      #(-1, -1),
-                      #(-1, -1),
-                      #(-1, -1),
-                      (-1, 1)])
-   
+                    (self.dy_axis_add, 1, wx.BOTTOM | wx.RIGHT, 10),
+                    (-1, -1),
+                    (-1, -1),
+                    (-1, -1),
+                    (-1, 1)])
+
     def on_edit_axis(self, event):
         """
@@ -1292 +1230 @@
         except:
             msg = str(sys.exc_value)
-            wx.PostEvent(self.parent.parent, 
-                             StatusEvent(status=msg, info="error")) 
-            return 
+            wx.PostEvent(self.parent.parent, StatusEvent(status=msg, info="error"))
+            return
         tcrtl = event.GetEventObject()
         if tcrtl == self.x_axis_add:
-            self.edit_axis_helper(self.x_axis_label, self.x_axis_title,
-                                   label, title)
+            self.edit_axis_helper(self.x_axis_label, self.x_axis_title, label, title)
         elif tcrtl == self.y_axis_add:
-            self.edit_axis_helper(self.y_axis_label, self.y_axis_title,
-                                   label, title)
+            self.edit_axis_helper(self.y_axis_label, self.y_axis_title, label, title)
         elif tcrtl == self.dy_axis_add:
-            self.edit_axis_helper(self.dy_axis_label, None,
-                                   label, None)
-            
+            self.edit_axis_helper(self.dy_axis_label, None, label, None)
+
     def create_axis_label(self, cell_list):
         """
-        Receive a list of cells and  create a string presenting the selected 
-        cells. 
+        Receive a list of cells and  create a string presenting the selected
+        cells.
         :param cell_list: list of tuple
-        
+
         """
         if self.notebook is not None:
             return self.notebook.create_axis_label(cell_list)
-    
+
     def edit_axis_helper(self, tcrtl_label, tcrtl_title, label, title):
         """
@@ -1324 +1258 @@
         if title != None:
             tcrtl_title.SetValue(str(title))
-        
+
     def add_column(self):
         """
@@ -1330 +1264 @@
         if self.notebook is not None:
             self.notebook.add_column()
-        
+
     def on_remove_column(self):
         """
@@ -1336 +1270 @@
         if self.notebook is not None:
             self.notebook.on_remove_column()
-        
-        
+
+
 class GridFrame(wx.Frame):
-    def __init__(self, parent=None, data_inputs=None, data_outputs=None, id=-1, 
+    def __init__(self, parent=None, data_inputs=None, data_outputs=None, id=-1,
                  title="Grid Window", size=(800, 500)):
         wx.Frame.__init__(self, parent=parent, id=id, title=title, size=size)
@@ -1346 +1280 @@
         menubar = wx.MenuBar()
         self.SetMenuBar(menubar)
-        
+
         self.curr_col = None
         self.curr_grid = None
@@ -1352 +1286 @@
         self.file = wx.Menu()
         menubar.Append(self.file, "&File")
-        
+
         hint = "Open file containing batch results"
         open_menu = self.file.Append(wx.NewId(), 'Open ', hint)
         wx.EVT_MENU(self, open_menu.GetId(), self.on_open)
-        
+
         hint = "Open the the current grid into excel"
         self.open_excel_menu = self.file.Append(wx.NewId(), 'Open with Excel', hint)
@@ -1363 +1297 @@
         self.save_menu = self.file.Append(wx.NewId(), 'Save As', 'Save into File')
         wx.EVT_MENU(self, self.save_menu.GetId(), self.on_save_page)
-        
+
         self.edit = wx.Menu()
-        
-        add_table_menu = self.edit.Append(-1, 'New Table', 
+
+        add_table_menu = self.edit.Append(-1, 'New Table',
                                           'Add a New Table')
         self.edit.AppendSeparator()
         wx.EVT_MENU(self, add_table_menu.GetId(), self.add_table)
-        
-        self.copy_menu = self.edit.Append(-1, 'Copy', 
+
+        self.copy_menu = self.edit.Append(-1, 'Copy',
                                           'Copy the selected cells')
         wx.EVT_MENU(self, self.copy_menu.GetId(), self.on_copy)
-        self.paste_menu = self.edit.Append(-1, 'Paste', 
+        self.paste_menu = self.edit.Append(-1, 'Paste',
                                            'Paste the selected Cells')
         wx.EVT_MENU(self, self.paste_menu.GetId(), self.on_paste)
-        self.clear_menu = self.edit.Append(-1, 'Clear', 
+        self.clear_menu = self.edit.Append(-1, 'Clear',
                                            'Clear the selected Cells')
         wx.EVT_MENU(self, self.clear_menu.GetId(), self.on_clear)
@@ -1384 +1318 @@
         hint = "Insert column before the selected column"
         self.insert_before_menu = wx.Menu()
-        self.insertb_sub_menu = self.edit.AppendSubMenu(self.insert_before_menu, 
-                                                      'Insert Before', hint)
+        self.insertb_sub_menu = self.edit.AppendSubMenu(self.insert_before_menu,
+                                                        'Insert Before', hint)
         hint = "Insert column after the selected column"
         self.insert_after_menu = wx.Menu()
-        self.inserta_sub_menu = self.edit.AppendSubMenu(self.insert_after_menu, 
-                                                      'Insert After', hint)
+        self.inserta_sub_menu = self.edit.AppendSubMenu(self.insert_after_menu,
+                                                        'Insert After', hint)
         hint = "Remove the selected column"
         self.remove_menu = self.edit.Append(-1, 'Remove Column', hint)
         wx.EVT_MENU(self, self.remove_menu.GetId(), self.on_remove_column)
-        
+
         self.Bind(wx.EVT_MENU_OPEN, self.on_menu_open)
         menubar.Append(self.edit, "&Edit")
         self.Bind(wx.EVT_CLOSE, self.on_close)
-    
+
     def on_copy(self, event):
         """
@@ -1407 +1341 @@
         grid = self.panel.notebook.GetPage(pos)
         grid.Copy()
-        
+
     def on_paste(self, event):
         """
@@ -1425 +1359 @@
         grid = self.panel.notebook.GetPage(pos)
         grid.Clear()
-     
+
     def GetLabelText(self, id):
         """
@@ -1431 +1365 @@
         """
         for item in self.insert_before_menu.GetMenuItems():
-            m_id = item.GetId() 
+            m_id = item.GetId()
             if m_id == id:
-                return item.GetLabel() 
-    
+                return item.GetLabel()
+
     def on_remove_column(self, event):
         """
@@ -1442 +1376 @@
         grid = self.panel.notebook.GetPage(pos)
         grid.on_remove_column(event=None)
-        
+
     def on_menu_open(self, event):
         """
@@ -1451 +1385 @@
             grid = self.panel.notebook.GetPage(pos)
             has_data = (grid.data != None and grid.data != {})
-            self.open_excel_menu.Enable(has_data) 
-            self.save_menu.Enable(has_data) 
-            
+            self.open_excel_menu.Enable(has_data)
+            self.save_menu.Enable(has_data)
+
         if self.edit == event.GetMenu():
             #get the selected column
@@ -1470 +1404 @@
             self.copy_menu.Enable(has_selection)
             self.clear_menu.Enable(has_selection)
-        
+
             if len(col_list) > 0:
                 self.remove_menu.Enable(True)
@@ -1485 +1419 @@
                 self.insertb_sub_menu.Enable(True)
                 self.inserta_sub_menu.Enable(True)
-                
+
                 col = col_list[0]
                 col_name = grid.GetCellValue(row=0, col=col)
@@ -1492 +1426 @@
                 for item in self.insert_before_menu.GetMenuItems():
                     self.insert_before_menu.DeleteItem(item)
-                grid.insert_col_menu(menu=self.insert_before_menu, 
+                grid.insert_col_menu(menu=self.insert_before_menu,
                                      label=col_name, window=self)
                 label = "Insert Column After " + str(col_name)
@@ -1498 +1432 @@
                 for item in self.insert_after_menu.GetMenuItems():
                     self.insert_after_menu.DeleteItem(item)
-                grid.insert_after_col_menu(menu=self.insert_after_menu, 
-                                     label=col_name, window=self)
+                grid.insert_after_col_menu(menu=self.insert_after_menu,
+                                           label=col_name, window=self)
         event.Skip()
-        
-  
-        
+
+
+
     def on_save_page(self, event):
         """
@@ -1514 +1448 @@
                 name = self.panel.notebook.GetPageText(pos)
                 msg = " %s has not data to save" % str(name)
-                wx.PostEvent(self.parent, 
-                             StatusEvent(status=msg, info="error")) 
-           
+                wx.PostEvent(self.parent,
+                             StatusEvent(status=msg, info="error"))
+
                 return
             reader, ext = os.path.splitext(grid.file_name)
             path = None
-            if self.parent is not None: 
+            if self.parent is not None:
                 location = os.path.dirname(grid.file_name)
                 dlg = wx.FileDialog(self, "Save Project file",
-                            location, grid.file_name, ext, wx.SAVE)
+                                    location, grid.file_name, ext, wx.SAVE)
                 path = None
                 if dlg.ShowModal() == wx.ID_OK:
@@ -1531 +1465 @@
                     if self.parent is not None:
                         data = grid.get_grid_view()
-                        self.parent.write_batch_tofile(data=data, 
-                                               file_name=path,
-                                               details=grid.details)
-    
+                        self.parent.write_batch_tofile(data=data,
+                                                       file_name=path,
+                                                       details=grid.details)
+
     def on_open(self, event):
         """
@@ -1541 +1475 @@
         if self.parent is not None:
             self.parent.on_read_batch_tofile(self)
-            
+
     def open_with_excel(self, event):
         """
@@ -1554 +1488 @@
                 name = self.panel.notebook.GetPageText(pos)
                 msg = " %s has not data to open on excel" % str(name)
-                wx.PostEvent(self.parent, 
-                             StatusEvent(status=msg, info="error")) 
-           
+                wx.PostEvent(self.parent,
+                             StatusEvent(status=msg, info="error"))
+
                 return
             self.parent.open_with_externalapp(data=data,
-                                              file_name=grid.file_name, 
+                                              file_name=grid.file_name,
                                               details=grid.details)
-            
+
     def on_close(self, event):
         """
         """
         self.Hide()
-        
+
     def on_append_column(self, event):
         """
@@ -1572 +1506 @@
         """
         self.panel.add_column()
-        
+
     def set_data(self, data_inputs, data_outputs, details="", file_name=None):
         """
         Set data
         """
-        self.panel.notebook.set_data(data_inputs=data_inputs, 
-                            file_name=file_name,
-                            details=details,
-                            data_outputs=data_outputs)
+        self.panel.notebook.set_data(data_inputs=data_inputs,
+                                     file_name=file_name,
+                                     details=details,
+                                     data_outputs=data_outputs)
 
     def add_table(self, event):
@@ -1587 +1521 @@
         """
         # DO not event.Skip(): it will make 2 pages
-        self.panel.notebook.add_empty_page()      
-      
+        self.panel.notebook.add_empty_page()
+
 class BatchOutputFrame(wx.Frame):
     """
@@ -1597 +1531 @@
         """
         :param parent: Window instantiating this dialog
-        :param result: result to display in a grid or export to an external 
+        :param result: result to display in a grid or export to an external
                 application.
         """
-        #kwds['style'] = wx.CAPTION|wx.SYSTEM_MENU 
+        #kwds['style'] = wx.CAPTION|wx.SYSTEM_MENU
         wx.Frame.__init__(self, parent, *args, **kwds)
         self.parent = parent
@@ -1617 +1551 @@
         self.save_to_file = None
         self._do_layout()
-    
+
     def _do_layout(self):
         """
@@ -1627 +1561 @@
         selection_sizer = wx.GridBagSizer(5, 5)
         button_sizer = wx.BoxSizer(wx.HORIZONTAL)
-        text = "Open with %s" % self.parent.application_name 
-        self.local_app_selected = wx.RadioButton(self.panel, -1, text,
-                                                style=wx.RB_GROUP)
+        text = "Open with %s" % self.parent.application_name
+        self.local_app_selected = wx.RadioButton(self.panel, -1, text, style=wx.RB_GROUP)
         self.Bind(wx.EVT_RADIOBUTTON, self.onselect,
-                    id=self.local_app_selected.GetId())
+                  id=self.local_app_selected.GetId())
         text = "Open with Excel"
-        self.external_app_selected  = wx.RadioButton(self.panel, -1, text)
-        self.Bind(wx.EVT_RADIOBUTTON, self.onselect,
-                    id=self.external_app_selected.GetId())
+        self.external_app_selected = wx.RadioButton(self.panel, -1, text)
+        self.Bind(wx.EVT_RADIOBUTTON, self.onselect, id=self.external_app_selected.GetId())
         text = "Save to File"
         self.save_to_file = wx.CheckBox(self.panel, -1, text)
-        self.Bind(wx.EVT_CHECKBOX, self.onselect,
-                    id=self.save_to_file.GetId())
+        self.Bind(wx.EVT_CHECKBOX, self.onselect, id=self.save_to_file.GetId())
         self.local_app_selected.SetValue(True)
         self.external_app_selected.SetValue(False)
         self.save_to_file.SetValue(False)
         button_close = wx.Button(self.panel, -1, "Close")
-        button_close.Bind(wx.EVT_BUTTON, id=button_close.GetId(),
-                           handler=self.on_close)
+        button_close.Bind(wx.EVT_BUTTON, id=button_close.GetId(), handler=self.on_close)
         button_apply = wx.Button(self.panel, -1, "Apply")
-        button_apply.Bind(wx.EVT_BUTTON, id=button_apply.GetId(),
-                        handler=self.on_apply)
+        button_apply.Bind(wx.EVT_BUTTON, id=button_apply.GetId(), handler=self.on_apply)
         button_apply.SetFocus()
         hint = ""
@@ -1657 +1586 @@
         iy = 0
         selection_sizer.Add(self.local_app_selected, (iy, ix),
-                           (1, 1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
+                            (1, 1), wx.LEFT | wx.EXPAND | wx.ADJUST_MINSIZE, 15)
         iy += 1
         selection_sizer.Add(self.external_app_selected, (iy, ix),
-                           (1, 1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
+                            (1, 1), wx.LEFT | wx.EXPAND | wx.ADJUST_MINSIZE, 15)
         iy += 1
         selection_sizer.Add(self.save_to_file, (iy, ix),
-                           (1, 1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
+                            (1, 1), wx.LEFT | wx.EXPAND | wx.ADJUST_MINSIZE, 15)
         #contruction the sizer contaning button
-        button_sizer.Add((20, 20), 1, wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+        button_sizer.Add((20, 20), 1, wx.EXPAND | wx.ADJUST_MINSIZE, 0)
 
         button_sizer.Add(button_close, 0,
-                        wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
+                         wx.LEFT | wx.EXPAND | wx.ADJUST_MINSIZE, 15)
         button_sizer.Add(button_apply, 0,
-                                wx.LEFT|wx.RIGHT|wx.ADJUST_MINSIZE, 10)
-        vbox.Add(hint_sizer, 0, wx.EXPAND|wx.ALL, 10)
-        vbox.Add(wx.StaticLine(self.panel, -1),  0, wx.EXPAND, 0)
-        vbox.Add(button_sizer, 0, wx.TOP|wx.BOTTOM, 10)
+                         wx.LEFT | wx.RIGHT | wx.ADJUST_MINSIZE, 10)
+        vbox.Add(hint_sizer, 0, wx.EXPAND | wx.ALL, 10)
+        vbox.Add(wx.StaticLine(self.panel, -1), 0, wx.EXPAND, 0)
+        vbox.Add(button_sizer, 0, wx.TOP | wx.BOTTOM, 10)
         self.SetSizer(vbox)
-        
+
     def on_apply(self, event):
         """
@@ -1684 +1613 @@
                                            data_outputs=self.data_outputs)
         elif self.flag == 2:
-            self.parent.open_with_externalapp(data=self.data, 
+            self.parent.open_with_externalapp(data=self.data,
                                               file_name=self.file_name,
                                               details=self.details)
@@ -1692 +1621 @@
         """
         self.Close()
-        
+
     def onselect(self, event=None):
         """
         Receive event and display data into third party application
         or save data to file.
-        
+
         """
         if self.save_to_file.GetValue():
-            reader, ext = os.path.splitext(self.file_name)
+            _, ext = os.path.splitext(self.file_name)
             path = None
             location = os.getcwd()
-            if self.parent is not None: 
+            if self.parent is not None:
                 location = os.path.dirname(self.file_name)
                 dlg = wx.FileDialog(self, "Save Project file",
-                            location, self.file_name, ext, wx.SAVE)
+                                    location, self.file_name, ext, wx.SAVE)
                 path = None
                 if dlg.ShowModal() == wx.ID_OK:
@@ -1713 +1642 @@
                 if path != None:
                     if self.parent is not None and  self.data is not None:
-                        self.parent.write_batch_tofile(data=self.data, 
+                        self.parent.write_batch_tofile(data=self.data,
                                                        file_name=path,
                                                        details=self.details)
@@ -1721 +1650 @@
             self.flag = 2
         return self.flag
-    
-  
-        
+
+
+
 if __name__ == "__main__":
     app = wx.App()
-   
+
     try:
         data = {}
@@ -1732 +1661 @@
         for i in range(4):
             j += 1
-            data["index"+str(i)] = [i/j, i*j, i, i+j]
-        
-        data_input =  copy.deepcopy(data)   
+            data["index" + str(i)] = [i / j, i * j, i, i + j]
+
+        data_input = copy.deepcopy(data)
         data_input["index5"] = [10, 20, 40, 50]
         frame = GridFrame(data_outputs=data, data_inputs=data_input)
@@ -1740 +1669 @@
     except:
         print sys.exc_value
-        
+
     app.MainLoop()

src/sas/guiframe/gui_manager.py

@@ -5 +5 @@
 #This software was developed by the University of Tennessee as part of the
 #Distributed Data Analysis of Neutron Scattering Experiments (DANSE)
-#project funded by the US National Science Foundation. 
+#project funded by the US National Science Foundation.
 #
 #See the license text in license.txtz
@@ -58 +58 @@
         logging.info("Using application path: %s", app_path)
         return app_path
-    
+
     # Next, try the current working directory
     if os.path.isfile(os.path.join(os.getcwd(), "custom_config.py")):
         logging.info("Using application path: %s", os.getcwd())
         return os.path.abspath(os.getcwd())
-    
+
     # Finally, try the directory of the sasview module
     #TODO: gui_manager will have to know about sasview until we
@@ -79 +79 @@
         Returns the user's home directory
     """
-    userdir = os.path.join(os.path.expanduser("~"),".sasview")
+    userdir = os.path.join(os.path.expanduser("~"), ".sasview")
     if not os.path.isdir(userdir):
         os.makedirs(userdir)
     return userdir
-    
+
 def _find_local_config(file, path):
     """
         Find configuration file for the current application
-    """    
+    """
     config_module = None
     fObj = None
     try:
         fObj, path_config, descr = imp.find_module(file, [path])
-        config_module = imp.load_module(file, fObj, path_config, descr) 
+        config_module = imp.load_module(file, fObj, path_config, descr)
     except:
         logging.error("Error loading %s/%s: %s" % (path, file, sys.exc_value))
@@ -102 +102 @@
 
 # Get APP folder
-PATH_APP = get_app_dir() 
+PATH_APP = get_app_dir()
 DATAPATH = PATH_APP
 
-# GUI always starts from the App folder 
+# GUI always starts from the App folder
 #os.chdir(PATH_APP)
 # Read in the local config, which can either be with the main
@@ -113 +113 @@
     config = _find_local_config('local_config', os.getcwd())
     if config is None:
-        # Didn't find local config, load the default 
+        # Didn't find local config, load the default
         import sas.guiframe.config as config
-        logging.info("using default local_config")        
+        logging.info("using default local_config")
     else:
-        logging.info("found local_config in %s" % os.getcwd())  
+        logging.info("found local_config in %s" % os.getcwd())
 else:
-    logging.info("found local_config in %s" % PATH_APP)     
-           
+    logging.info("found local_config in %s" % PATH_APP)
+
 from sas.guiframe.customdir  import SetupCustom
 c_conf_dir = SetupCustom().setup_dir(PATH_APP)
@@ -154 +154 @@
     PLOPANEL_WIDTH = custom_config.PLOPANEL_WIDTH
     DATAPANEL_WIDTH = custom_config.DATAPANEL_WIDTH
-    GUIFRAME_WIDTH = custom_config.GUIFRAME_WIDTH 
+    GUIFRAME_WIDTH = custom_config.GUIFRAME_WIDTH
     GUIFRAME_HEIGHT = custom_config.GUIFRAME_HEIGHT
-    CONTROL_WIDTH = custom_config.CONTROL_WIDTH 
+    CONTROL_WIDTH = custom_config.CONTROL_WIDTH
     CONTROL_HEIGHT = custom_config.CONTROL_HEIGHT
     DEFAULT_PERSPECTIVE = custom_config.DEFAULT_PERSPECTIVE
@@ -173 +173 @@
     PLOPANEL_WIDTH = config.PLOPANEL_WIDTH
     DATAPANEL_WIDTH = config.DATAPANEL_WIDTH
-    GUIFRAME_WIDTH = config.GUIFRAME_WIDTH 
+    GUIFRAME_WIDTH = config.GUIFRAME_WIDTH
     GUIFRAME_HEIGHT = config.GUIFRAME_HEIGHT
-    CONTROL_WIDTH = -1 
+    CONTROL_WIDTH = -1
     CONTROL_HEIGHT = -1
     DEFAULT_PERSPECTIVE = None
@@ -183 +183 @@
 DEFAULT_STYLE = config.DEFAULT_STYLE
 
-PLUGIN_STATE_EXTENSIONS =  config.PLUGIN_STATE_EXTENSIONS
+PLUGIN_STATE_EXTENSIONS = config.PLUGIN_STATE_EXTENSIONS
 OPEN_SAVE_MENU = config.OPEN_SAVE_PROJECT_MENU
 VIEW_MENU = config.VIEW_MENU
@@ -214 +214 @@
         PARENT_FRAME = wx.Frame
         CHILD_FRAME = wx.Frame
-    
+
 class ViewerFrame(PARENT_FRAME):
     """
     Main application frame
     """
-    
-    def __init__(self, parent, title, 
+
+    def __init__(self, parent, title,
                  size=(GUIFRAME_WIDTH, GUIFRAME_HEIGHT),
-                 gui_style=DEFAULT_STYLE, 
+                 gui_style=DEFAULT_STYLE,
                  style=wx.DEFAULT_FRAME_STYLE,
                  pos=wx.DefaultPosition):
@@ -232 +232 @@
         # title
         self.title = title
-        self.__gui_style = gui_style       
+        self.__gui_style = gui_style
         path = os.path.dirname(__file__)
-        temp_path = os.path.join(path,'images')
-        ico_file = os.path.join(temp_path,'ball.ico')
+        temp_path = os.path.join(path, 'images')
+        ico_file = os.path.join(temp_path, 'ball.ico')
         if os.path.isfile(ico_file):
             self.SetIcon(wx.Icon(ico_file, wx.BITMAP_TYPE_ICO))
         else:
-            temp_path = os.path.join(os.getcwd(),'images')
-            ico_file = os.path.join(temp_path,'ball.ico')
+            temp_path = os.path.join(os.getcwd(), 'images')
+            ico_file = os.path.join(temp_path, 'ball.ico')
             if os.path.isfile(ico_file):
                 self.SetIcon(wx.Icon(ico_file, wx.BITMAP_TYPE_ICO))
             else:
                 ico_file = os.path.join(os.path.dirname(os.path.sys.path[0]),
-                             'images', 'ball.ico')
+                                        'images', 'ball.ico')
                 if os.path.isfile(ico_file):
                     self.SetIcon(wx.Icon(ico_file, wx.BITMAP_TYPE_ICO))
         self.path = PATH_APP
-        self.application_name = APPLICATION_NAME 
+        self.application_name = APPLICATION_NAME
         ## Application manager
         self._input_file = None
@@ -294 +294 @@
 
         # Default locations
-        self._default_save_location = DEFAULT_OPEN_FOLDER       
+        self._default_save_location = DEFAULT_OPEN_FOLDER
         # Welcome panel
         self.defaultPanel = None
@@ -303 +303 @@
         self.cpanel_on_focus = None
 
-        self.loader = Loader()   
+        self.loader = Loader()
         #data manager
         self.batch_on = False
@@ -310 +310 @@
         self._data_panel = None#DataPanel(parent=self)
         if self.panel_on_focus is not None:
-            self._data_panel.set_panel_on_focus(
-                                self.panel_on_focus.window_caption)
+            self._data_panel.set_panel_on_focus(self.panel_on_focus.window_caption)
         # list of plot panels in schedule to full redraw
         self.schedule = False
@@ -318 +317 @@
         self.schedule_full_draw_list = []
         self.idletimer = wx.CallLater(TIME_FACTOR, self._onDrawIdle)
-        
+
         self.batch_frame = GridFrame(parent=self)
         self.batch_frame.Hide()
         self.on_batch_selection(event=None)
         self.add_icon()
-        
+
         # Register the close event so it calls our own method
         wx.EVT_CLOSE(self, self.WindowClose)
@@ -338 +337 @@
         # Preferred window size
         self._window_width, self._window_height = size
-        
+
     def add_icon(self):
         """
-        get list of child and attempt to add the default icon 
-        """
-        
-        list_children = self.GetChildren() 
+        get list of child and attempt to add the default icon
+        """
+
+        list_children = self.GetChildren()
         for frame in list_children:
             self.put_icon(frame)
-        
-    def put_icon(self, frame): 
+
+    def put_icon(self, frame):
         """
         Put icon on the tap of a panel
@@ -358 +357 @@
                     frame.SetIcon(icon)
                 except:
-                    pass  
-                
+                    pass
+
     def get_client_size(self):
         """
@@ -370 +369 @@
         if toolbar != None:
             _, tb_h = toolbar.GetSizeTuple()
-            height -= tb_h 
+            height -= tb_h
         return width, height
-    
+
     def on_change_categories(self, evt):
         # ILL
@@ -382 +381 @@
 
         if fitpanel != None:
-            for i in range(0,fitpanel.GetPageCount()):
+            for i in range(0, fitpanel.GetPageCount()):
                 fitpanel.GetPage(i)._populate_listbox()
 
-
-
     def on_set_batch_result(self, data_outputs, data_inputs=None,
-                             plugin_name=""):
+                            plugin_name=""):
         """
         Display data into a grid in batch mode and show the grid
@@ -395 +392 @@
         time_str = time.strftime("%b %d %H;%M of %Y", t)
         details = "File Generated by %s : %s" % (APPLICATION_NAME,
-                                                     str(plugin_name))
-        details += "on %s.\n" % time_str 
+                                                 str(plugin_name))
+        details += "on %s.\n" % time_str
         ext = ".csv"
-        file_name = "Batch_" + str(plugin_name)+ "_" + time_str + ext
+        file_name = "Batch_" + str(plugin_name) + "_" + time_str + ext
         file_name = self._default_save_location + str(file_name)
-        
+
         self.open_with_localapp(file_name=file_name,
                                 details=details,
                                 data_inputs=data_inputs,
-                                    data_outputs=data_outputs)
-     
-    
+                                data_outputs=data_outputs)
+
     def open_with_localapp(self, data_inputs=None, details="", file_name=None,
                            data_outputs=None):
@@ -413 +409 @@
         :param data: dictionary of string and list of items
         """
-        self.batch_frame.set_data(data_inputs=data_inputs, 
+        self.batch_frame.set_data(data_inputs=data_inputs,
                                   data_outputs=data_outputs,
                                   details=details,
                                   file_name=file_name)
         self.show_batch_frame(None)
-        
+
     def on_read_batch_tofile(self, base):
         """
@@ -428 +424 @@
             self._default_save_location = os.getcwd()
         wildcard = "(*.csv; *.txt)|*.csv; *.txt"
-        dlg = wx.FileDialog(base, 
-                            "Choose a file", 
+        dlg = wx.FileDialog(base,
+                            "Choose a file",
                             self._default_save_location, "",
-                             wildcard)
+                            wildcard)
         if dlg.ShowModal() == wx.ID_OK:
             path = dlg.GetPath()
@@ -440 +436 @@
             self.read_batch_tofile(file_name=path)
         except:
-            msg = "Error occurred when reading the file; %s\n"% path
-            msg += "%s\n"% sys.exc_value
+            msg = "Error occurred when reading the file; %s\n" % path
+            msg += "%s\n" % sys.exc_value
             wx.PostEvent(self, StatusEvent(status=msg,
-                                             info="error"))
-            
+                                           info="error"))
+
     def read_batch_tofile(self, file_name):
         """
@@ -457 +453 @@
         if ext.lower() == ".csv":
             separator = ","
-        buffer = fd.read()
-        lines = buffer.split('\n')
+        fd_buffer = fd.read()
+        lines = fd_buffer.split('\n')
         fd.close()
-        column_names_line  = ""
+        column_names_line = ""
         index = None
         details = ""
@@ -487 +483 @@
             if count >= 2:
                 column_names_line = line
-                break 
-           
+                break
+
         if column_names_line.strip() == "" or index is None:
-            return 
+            return
 
         col_name_toks = column_names_line.split(separator)
@@ -500 +496 @@
                 try:
                     float(c_name)
-                    col_name = "Column %s"% str(col_index + 1)
+                    col_name = "Column %s" % str(col_index + 1)
                     index_min = index
                 except:
                     col_name = c_name
                     index_min = index + 1
-                data[col_name] = [ lines[row].split(separator)[c_index]
-                                for row in range(index_min, len(lines)-1)]
+                data[col_name] = [lines[row].split(separator)[c_index]
+                                  for row in range(index_min, len(lines) - 1)]
                 c_index += 1
-                
+
         self.open_with_localapp(data_outputs=data, data_inputs=None,
                                 file_name=file_name, details=details)
-        
+
     def write_batch_tofile(self, data, file_name, details=""):
         """
@@ -541 +537 @@
         max_index = max(max_list)
         index = 0
-        while(index < max_index):
+        while index < max_index:
             for value_list in data.values():
                 if index < len(value_list):
@@ -552 +548 @@
             index += 1
         fd.close()
-            
+
     def open_with_externalapp(self, data, file_name, details=""):
         """
@@ -559 +555 @@
         if not os.path.exists(file_name):
             self.write_batch_tofile(data=data, file_name=file_name,
-                                               details=details)
+                                    details=details)
         try:
             from win32com.client import Dispatch
-            excel_app = Dispatch('Excel.Application')     
-            wb = excel_app.Workbooks.Open(file_name) 
+            excel_app = Dispatch('Excel.Application')
+            excel_app.Workbooks.Open(file_name)
             excel_app.Visible = 1
         except:
@@ -570 +566 @@
             msg += "check that %s really exists.\n" % str(file_name)
             wx.PostEvent(self, StatusEvent(status=msg,
-                                             info="error"))
-            
-         
+                                           info="error"))
+
     def on_batch_selection(self, event=None):
         """
@@ -583 +578 @@
         for plug in self.plugins:
             plug.set_batch_selection(self.batch_on)
-            
+
     def on_color_selection(self, event):
         """
         :param event: contains parameters for id and color
-        """ 
-        color, id = event.color, event.id
+        """
+        color, event_id = event.color, event.id
         for plug in self.plugins:
-            plug.add_color(color, id)
-        
-        
+            plug.add_color(color, event_id)
+
     def setup_custom_conf(self):
         """
@@ -599 +593 @@
         if custom_config == None:
             return
-        
+
         if not FIXED_PANEL:
             self.__gui_style &= (~GUIFRAME.FIXED_PANEL)
@@ -611 +605 @@
 
         if WELCOME_PANEL_SHOW:
-            self.__gui_style |= GUIFRAME.WELCOME_PANEL_ON   
-             
+            self.__gui_style |= GUIFRAME.WELCOME_PANEL_ON
+
     def set_custom_default_perspective(self):
         """
@@ -622 +616 @@
             try:
                 if plugin.sub_menu == DEFAULT_PERSPECTIVE:
-                    
+
                     plugin.on_perspective(event=None)
                     frame = plugin.get_frame()
@@ -629 +623 @@
                 else:
                     frame = plugin.get_frame()
-                    frame.Show(False) 
+                    frame.Show(False)
             except:
-                pass  
-        return          
-                
+                pass
+        return
+
     def on_load_data(self, event):
         """
@@ -640 +634 @@
         if self._data_plugin is not None:
             self._data_plugin.load_data(event)
-            
+
     def get_current_perspective(self):
         """
@@ -652 +646 @@
         """
         return self._default_save_location
-    
+
     def set_input_file(self, input_file):
         """
@@ -658 +652 @@
         """
         self._input_file = input_file
-        
+
     def get_data_manager(self):
         """
@@ -664 +658 @@
         """
         return self._data_manager
-    
+
     def get_toolbar(self):
         """
@@ -670 +664 @@
         """
         return self._toolbar
-    
+
     def set_panel_on_focus(self, event):
         """
@@ -698 +692 @@
                 self.enable_edit_menu()
 
-    def disable_app_menu(self, p_panel=None):  
+    def disable_app_menu(self, p_panel=None):
         """
         Disables all menus in the menubar
         """
         return
-    
-    def send_focus_to_datapanel(self, name):  
+
+    def send_focus_to_datapanel(self, name):
         """
         Send focusing on ID to data explorer
@@ -710 +704 @@
         if self._data_panel != None:
             self._data_panel.set_panel_on_focus(name)
-            
+
     def set_panel_on_focus_helper(self):
         """
@@ -722 +716 @@
             combo_title = str(self.panel_on_focus.window_caption)
             combo.SetStringSelection(combo_title)
-            combo.SetToolTip( wx.ToolTip(combo_title )) 
+            combo.SetToolTip(wx.ToolTip(combo_title))
         elif self.panel_on_focus != self._data_panel:
             cpanel = self.panel_on_focus
@@ -728 +722 @@
                 cpanel.on_tap_focus()
                 self.cpanel_on_focus = self.panel_on_focus
-      
+
     def reset_bookmark_menu(self, panel):
         """
         Reset Bookmark menu list
-        
+
         : param panel: a control panel or tap where the bookmark is
         """
@@ -745 +739 @@
                 if pos < 3:
                     continue
-                id =  bitem.GetId()
+                id = bitem.GetId()
                 label = bitem.GetLabel()
                 self._toolbar.append_bookmark_item(id, label)
                 wx.EVT_MENU(self, id, cpanel._back_to_bookmark)
             self._toolbar.Realize()
-             
+
 
     def build_gui(self):
@@ -771 +765 @@
         self._setup_layout()
         self._add_menu_application()
-        
+
         # Set up the menu
         self._add_current_plugin_menu()
@@ -781 +775 @@
         if not wx.VERSION_STRING >= '3.0.0.0':
             self.SetMenuBar(self._menubar)
-        
+
         try:
             self.load_from_cmd(self._input_file)
         except:
-            msg = "%s Cannot load file %s\n" %(str(APPLICATION_NAME), 
-                                             str(self._input_file))
+            msg = "%s Cannot load file %s\n" % (str(APPLICATION_NAME),
+                                                str(self._input_file))
             msg += str(sys.exc_value) + '\n'
             logging.error(msg)
@@ -798 +792 @@
         self._check_update(None)
 
-    def _setup_extra_custom(self):  
+    def _setup_extra_custom(self):
         """
         Set up toolbar and welcome view if needed
@@ -804 +798 @@
         style = self.__gui_style & GUIFRAME.TOOLBAR_ON
         if (style == GUIFRAME.TOOLBAR_ON) & (not self._toolbar.IsShown()):
-            self._on_toggle_toolbar() 
-        
+            self._on_toggle_toolbar()
+
         # Set Custom deafult start page
         welcome_style = self.__gui_style & GUIFRAME.WELCOME_PANEL_ON
         if welcome_style == GUIFRAME.WELCOME_PANEL_ON:
             self.show_welcome_panel(None)
-      
+
     def _setup_layout(self):
         """
@@ -822 +816 @@
         self._load_panels()
         self.set_default_perspective()
-        
+
     def SetStatusText(self, *args, **kwds):
         """
@@ -828 +822 @@
         number = self.sb.get_msg_position()
         wx.Frame.SetStatusText(self, number=number, *args, **kwds)
-        
+
     def PopStatusText(self, *args, **kwds):
         """
@@ -834 +828 @@
         field = self.sb.get_msg_position()
         wx.Frame.PopStatusText(self, field=field)
-        
+
     def PushStatusText(self, *args, **kwds):
         """
-            FIXME: No message is passed. What is this supposed to do? 
+            FIXME: No message is passed. What is this supposed to do?
         """
         field = self.sb.get_msg_position()
-        wx.Frame.PushStatusText(self, field=field, 
-                        string="FIXME: PushStatusText called without text")
+        wx.Frame.PushStatusText(self, field=field,
+                                string="FIXME: PushStatusText called without text")
 
     def add_perspective(self, plugin):
@@ -855 +849 @@
                 msg = "Plugin %s already loaded" % plugin.sub_menu
                 logging.info(msg)
-                is_loaded = True  
+                is_loaded = True
         if not is_loaded:
-            self.plugins.append(plugin)  
+            self.plugins.append(plugin)
             msg = "Plugin %s appended" % plugin.sub_menu
             logging.info(msg)
-      
+
     def _get_local_plugins(self):
         """
-        get plugins local to guiframe and others 
+        get plugins local to guiframe and others
         """
         plugins = []
@@ -888 +882 @@
                 msg += "cannot import plotting plugin.\n %s" % sys.exc_value
                 logging.error(msg)
-     
+
         return plugins
-    
+
     def _find_plugins(self, dir="perspectives"):
         """
         Find available perspective plug-ins
-        
+
         :param dir: directory in which to look for plug-ins
-        
+
         :return: list of plug-ins
-        
+
         """
         plugins = []
         # Go through files in panels directory
         try:
-            list = os.listdir(dir)
+            file_list = os.listdir(dir)
             ## the default panel is the panel is the last plugin added
-            for item in list:
+            for item in file_list:
                 toks = os.path.splitext(os.path.basename(item))
                 name = ''
@@ -924 +918 @@
                         else:
                             (file, path, info) = imp.find_module(name, path)
-                            module = imp.load_module( name, file, item, info)
+                            module = imp.load_module(name, file, item, info)
                         if hasattr(module, "PLUGIN_ID"):
-                            try: 
+                            try:
                                 plug = module.Plugin()
                                 if plug.set_default_perspective():
                                     self._current_perspective = plug
                                 plugins.append(plug)
-                                
+
                                 msg = "Found plug-in: %s" % module.PLUGIN_ID
                                 logging.info(msg)
@@ -947 +941 @@
             # Should raise and catch at a higher level and 
             # display error on status bar
-            pass  
+            logging.error(sys.exc_value)
 
         return plugins
@@ -963 +957 @@
             panel_width = DATAPANEL_WIDTH
         panel_height = int(self._window_height)
-        style = self.__gui_style & (GUIFRAME.MANAGER_ON)
         if self._data_panel is not None  and (p == self._data_panel):
             return panel_width, panel_height
@@ -976 +969 @@
             return self._window_width, panel_height
         return panel_width, panel_height
-    
+
     def _load_panels(self):
         """
@@ -991 +984 @@
                 ps = item.get_panels(self)
                 panels.extend(ps)
-        
+
         # Set up welcome panel
         #TODO: this needs serious simplification
@@ -1000 +993 @@
             self.defaultPanel.set_frame(welcome_panel)
             welcome_panel.Show(False)
-        
+
         self.panels["default"] = self.defaultPanel
         size_t_bar = 70
@@ -1012 +1005 @@
                 frame.SetPosition((0, mac_pos_y + size_t_bar))
             frame.Show(True)
-        #add data panel 
+        #add data panel
         win = MDIFrame(self, None, 'None', (100, 200))
-        data_panel = DataPanel(parent=win,  id=-1)
+        data_panel = DataPanel(parent=win, id=-1)
         win.set_panel(data_panel)
         self.panels["data_panel"] = data_panel
@@ -1029 +1022 @@
         for panel_class in panels:
             frame = panel_class.get_frame()
-            id = wx.NewId()
+            wx_id = wx.NewId()
             # Check whether we need to put this panel in the center pane
             if hasattr(panel_class, "CENTER_PANE") and panel_class.CENTER_PANE:
                 w, h = self._get_panels_size(panel_class)
                 if panel_class.CENTER_PANE:
-                    self.panels[str(id)] = panel_class
+                    self.panels[str(wx_id)] = panel_class
                     _, pos_y = frame.GetPositionTuple()
                     frame.SetPosition((d_panel_width + 1, pos_y))
@@ -1043 +1036 @@
                 continue
             else:
-                self.panels[str(id)] = panel_class
+                self.panels[str(wx_id)] = panel_class
                 frame.SetSize((w, h))
                 frame.Show(False)
@@ -1061 +1054 @@
             else:
                 self.SetSize((self._window_width, win_height))
-        
+
     def update_data(self, prev_data, new_data):
         """
         Update the data.
         """
-        prev_id, data_state = self._data_manager.update_data(
+        prev_id, data_state = self._data_manager.update_data( \
                               prev_data=prev_data, new_data=new_data)
-        
+
         self._data_panel.remove_by_id(prev_id)
         self._data_panel.load_data_list(data_state)
-        
+
     def update_theory(self, data_id, theory, state=None):
         """
         Update the theory
-        """ 
-        data_state = self._data_manager.update_theory(data_id=data_id, 
-                                         theory=theory,
-                                         state=state)  
+        """
+        data_state = self._data_manager.update_theory(data_id=data_id,
+                                                      theory=theory,
+                                                      state=state)
         wx.CallAfter(self._data_panel.load_data_list, data_state)
-        
+
     def onfreeze(self, theory_id):
         """
@@ -1088 +1081 @@
         for data_state in data_state_list.values():
             new_plot = data_state.get_data()
-            
+
             wx.PostEvent(self, NewPlotEvent(plot=new_plot,
-                                             title=new_plot.title))
-        
+                                            title=new_plot.title))
+
     def freeze(self, data_id, theory_id):
         """
         """
-        data_state_list = self._data_manager.freeze_theory(data_id=data_id, 
-                                                theory_id=theory_id)
+        data_state_list = self._data_manager.freeze_theory(data_id=data_id,
+                                                           theory_id=theory_id)
         self._data_panel.load_data_list(list=data_state_list)
         for data_state in data_state_list.values():
             new_plot = data_state.get_data()
             wx.PostEvent(self, NewPlotEvent(plot=new_plot,
-                                             title=new_plot.title))
-        
+                                            title=new_plot.title))
+
     def delete_data(self, data):
         """
@@ -1108 +1101 @@
         """
         self._current_perspective.delete_data(data)
-        
-    
+
+
     def get_context_menu(self, plotpanel=None):
         """
-        Get the context menu items made available 
-        by the different plug-ins. 
+        Get the context menu items made available
+        by the different plug-ins.
         This function is used by the plotting module
         """
@@ -1122 +1115 @@
             menu_list.extend(item.get_context_menu(plotpanel=plotpanel))
         return menu_list
-        
+
     def get_current_context_menu(self, plotpanel=None):
         """
-        Get the context menu items made available 
-        by the current plug-in. 
+        Get the context menu items made available
+        by the current plug-in.
         This function is used by the plotting module
         """
@@ -1136 +1129 @@
             menu_list.extend(item.get_context_menu(plotpanel=plotpanel))
         return menu_list
-            
+
     def on_panel_close(self, event):
         """
@@ -1150 +1143 @@
                 break
         self.cpanel_on_focus.SetFocus()
-    
-    
+
+
     def popup_panel(self, p):
         """
         Add a panel object to the AUI manager
-        
+
         :param p: panel object to add to the AUI manager
-        
+
         :return: ID of the event associated with the new panel [int]
-        
+
         """
         ID = wx.NewId()
@@ -1179 +1172 @@
         # Append nummber
         captions = self._get_plotpanel_captions()
+        #FIXME: Fix this aweful loop
         while (1):
-            caption = windowcaption + '%s'% str(self.graph_num)
+            caption = windowcaption + '%s' % str(self.graph_num)
             if caption not in captions:
                 break
@@ -1188 +1182 @@
                 break
         if p.window_caption.split()[0] not in NOT_SO_GRAPH_LIST:
-            p.window_caption = caption 
+            p.window_caption = caption
         p.window_name = windowname + str(self.graph_num)
-        
+
         p.frame.SetTitle(p.window_caption)
         p.frame.name = p.window_name
@@ -1214 +1208 @@
                     self._data_panel.cb_plotpanel.Append(str(caption), p)
         return ID
-    
+
     def _get_plotpanel_captions(self):
         """
         Get all the plotpanel cations
-        
+
         : return: list of captions
         """
@@ -1224 +1218 @@
         for Id in self.plot_panels.keys():
             captions.append(self.plot_panels[Id].window_caption)
-        
+
         return captions
-        
+
     def _setup_tool_bar(self):
         """
@@ -1242 +1236 @@
         self._update_toolbar_helper()
         self._on_toggle_toolbar(event=None)
-    
+
     def _update_toolbar_helper(self):
         """
@@ -1249 +1243 @@
         application_name = 'No Selected Analysis'
         panel_name = 'No Panel on Focus'
-        c_panel = self.cpanel_on_focus        
+        c_panel = self.cpanel_on_focus
         if self._toolbar is  None:
             return
@@ -1262 +1256 @@
                 c_panel_state = None
         self._toolbar.update_toolbar(c_panel_state)
-        self._toolbar.update_button(application_name=application_name, 
-                                        panel_name=panel_name)
+        self._toolbar.update_button(application_name=application_name,
+                                    panel_name=panel_name)
         self._toolbar.Realize()
-        
+
     def _add_menu_tool(self):
         """
@@ -1287 +1281 @@
             if self._tool_menu is not None:
                 self._menubar.Append(self._tool_menu, '&Tool')
-                
+
     def _add_current_plugin_menu(self):
         """
         add current plugin menu
         Look for plug-in menus
-        Add available plug-in sub-menus. 
+        Add available plug-in sub-menus.
         """
         if self._menubar is None or self._current_perspective is None \
-            or self._menubar.GetMenuCount()==0:
+            or self._menubar.GetMenuCount() == 0:
             return
         #replace or add a new menu for the current plugin
-       
+
         pos = self._menubar.FindMenu(str(self._applications_menu_name))
         if pos != -1:
@@ -1304 +1298 @@
             if menu_list:
                 for (menu, name) in menu_list:
-                    hidden_menu = self._menubar.Replace(pos, menu, name) 
-                    self._applications_menu_name = name 
-                #self._applications_menu_pos = pos
+                    self._menubar.Replace(pos, menu, name)
+                    self._applications_menu_name = name
             else:
-                hidden_menu = self._menubar.Remove(pos)
+                self._menubar.Remove(pos)
                 self._applications_menu_name = None
             #get the position of the menu when it first added
-            self._applications_menu_pos = pos 
-            
+            self._applications_menu_pos = pos
+
         else:
             menu_list = self._current_perspective.populate_menu(self)
@@ -1320 +1313 @@
                         self._menubar.Append(menu, name)
                     else:
-                        self._menubar.Insert(self._applications_menu_pos, 
+                        self._menubar.Insert(self._applications_menu_pos,
                                              menu, name)
                     self._applications_menu_name = name
-                  
+
     def _add_help_menu(self):
         """
         add help menu to menu bar.  Includes welcome page, about page,
-        tutorial PDF and documentation pages. 
+        tutorial PDF and documentation pages.
         """
         # Help menu
@@ -1336 +1329 @@
             # add the welcome panel menu item
             if config.WELCOME_PANEL_ON and self.defaultPanel is not None:
-                id = wx.NewId()
-                self._help_menu.Append(id, '&Welcome', '')
-                wx.EVT_MENU(self, id, self.show_welcome_panel)
+                wx_id = wx.NewId()
+                self._help_menu.Append(wx_id, '&Welcome', '')
+                wx.EVT_MENU(self, wx_id, self.show_welcome_panel)
 
         self._help_menu.AppendSeparator()
-        id = wx.NewId()
-        self._help_menu.Append(id, '&Documentation', '')
-        wx.EVT_MENU(self, id, self._onSphinxDocs)
-
-        if config._do_tutorial and (IS_WIN or sys.platform =='darwin'):
+        wx_id = wx.NewId()
+        self._help_menu.Append(wx_id, '&Documentation', '')
+        wx.EVT_MENU(self, wx_id, self._onSphinxDocs)
+
+        if config._do_tutorial and (IS_WIN or sys.platform == 'darwin'):
             self._help_menu.AppendSeparator()
-            id = wx.NewId()
-            self._help_menu.Append(id, '&Tutorial', 'Software tutorial')
-            wx.EVT_MENU(self, id, self._onTutorial)
-            
+            wx_id = wx.NewId()
+            self._help_menu.Append(wx_id, '&Tutorial', 'Software tutorial')
+            wx.EVT_MENU(self, wx_id, self._onTutorial)
+
         if config._do_acknowledge:
             self._help_menu.AppendSeparator()
-            id = wx.NewId()
-            self._help_menu.Append(id, '&Acknowledge', 'Acknowledging SasView')
-            wx.EVT_MENU(self, id, self._onAcknowledge)
-        
+            wx_id = wx.NewId()
+            self._help_menu.Append(wx_id, '&Acknowledge', 'Acknowledging SasView')
+            wx.EVT_MENU(self, wx_id, self._onAcknowledge)
+
         if config._do_aboutbox:
             self._help_menu.AppendSeparator()
             self._help_menu.Append(wx.ID_ABOUT, '&About', 'Software information')
             wx.EVT_MENU(self, wx.ID_ABOUT, self._onAbout)
-        
+
         # Checking for updates
-        id = wx.NewId()
-        self._help_menu.Append(id,'&Check for update', 
-         'Check for the latest version of %s' % config.__appname__)
-        wx.EVT_MENU(self, id, self._check_update)
+        wx_id = wx.NewId()
+        self._help_menu.Append(wx_id, '&Check for update',
+                               'Check for the latest version of %s' % config.__appname__)
+        wx.EVT_MENU(self, wx_id, self._check_update)
         self._menubar.Append(self._help_menu, '&Help')
-            
+
     def _add_menu_view(self):
         """
@@ -1376 +1369 @@
             return
         self._view_menu = wx.Menu()
-        
-        id = wx.NewId()
+
+        wx_id = wx.NewId()
         hint = "Display the Grid Window for batch results etc."
-        self._view_menu.Append(id, '&Show Grid Window', hint) 
-        wx.EVT_MENU(self, id, self.show_batch_frame)
-        
+        self._view_menu.Append(wx_id, '&Show Grid Window', hint)
+        wx.EVT_MENU(self, wx_id, self.show_batch_frame)
+
         self._view_menu.AppendSeparator()
         style = self.__gui_style & GUIFRAME.MANAGER_ON
-        id = wx.NewId()
-        self._data_panel_menu = self._view_menu.Append(id,
-                                                '&Show Data Explorer', '')
-        wx.EVT_MENU(self, id, self.show_data_panel)
+        wx_id = wx.NewId()
+        self._data_panel_menu = self._view_menu.Append(wx_id,
+                                                       '&Show Data Explorer', '')
+        wx.EVT_MENU(self, wx_id, self.show_data_panel)
         if style == GUIFRAME.MANAGER_ON:
             self._data_panel_menu.SetText('Hide Data Explorer')
         else:
             self._data_panel_menu.SetText('Show Data Explorer')
-  
+
         self._view_menu.AppendSeparator()
-        id = wx.NewId()
+        wx_id = wx.NewId()
         style1 = self.__gui_style & GUIFRAME.TOOLBAR_ON
         if style1 == GUIFRAME.TOOLBAR_ON:
-            self._toolbar_menu = self._view_menu.Append(id, '&Hide Toolbar', '')
+            self._toolbar_menu = self._view_menu.Append(wx_id, '&Hide Toolbar', '')
         else:
-            self._toolbar_menu = self._view_menu.Append(id, '&Show Toolbar', '')
-        wx.EVT_MENU(self, id, self._on_toggle_toolbar)
+            self._toolbar_menu = self._view_menu.Append(wx_id, '&Show Toolbar', '')
+        wx.EVT_MENU(self, wx_id, self._on_toggle_toolbar)
 
         if custom_config != None:
             self._view_menu.AppendSeparator()
-            id = wx.NewId()
+            wx_id = wx.NewId()
             hint_ss = "Select the current/default configuration "
             hint_ss += "as a startup setting"
-            preference_menu = self._view_menu.Append(id, 'Startup Setting', 
+            preference_menu = self._view_menu.Append(wx_id, 'Startup Setting',
                                                      hint_ss)
-            wx.EVT_MENU(self, id, self._on_preference_menu)
-            
-        id = wx.NewId()
+            wx.EVT_MENU(self, wx_id, self._on_preference_menu)
+
+        wx_id = wx.NewId()
         self._view_menu.AppendSeparator()
-        self._view_menu.Append(id, 'Category Manager', 'Edit model categories')
-        wx.EVT_MENU(self, id, self._on_category_manager)
-
-        self._menubar.Append(self._view_menu, '&View')   
-         
+        self._view_menu.Append(wx_id, 'Category Manager', 'Edit model categories')
+        wx.EVT_MENU(self, wx_id, self._on_category_manager)
+
+        self._menubar.Append(self._view_menu, '&View')
+
     def show_batch_frame(self, event=None):
         """
@@ -1425 +1418 @@
         self.batch_frame.Show(False)
         self.batch_frame.Show(True)
-    
-    def  on_category_panel(self, event):  
+
+    def  on_category_panel(self, event):
         """
         On cat panel
         """
         self._on_category_manager(event)
-          
+
     def _on_category_manager(self, event):
         """
@@ -1440 +1433 @@
         frame.SetIcon(icon)
 
-    def _on_preference_menu(self, event):     
+    def _on_preference_menu(self, event):
         """
         Build a panel to allow to edit Mask
@@ -1446 +1439 @@
         from sas.guiframe.startup_configuration \
         import StartupConfiguration as ConfDialog
-        
+
         dialog = ConfDialog(parent=self, gui=self.__gui_style)
         result = dialog.ShowModal()
@@ -1454 +1447 @@
             wx.PostEvent(self, StatusEvent(status="Wrote custom configuration", info='info'))
         dialog.Destroy()
-        
+
     def _add_menu_application(self):
         """
@@ -1461 +1454 @@
         add menu application
         """
-        if self._num_perspectives  > 1:
+        if self._num_perspectives > 1:
             plug_data_count = False
             plug_no_data_count = False
@@ -1471 +1464 @@
                     id = wx.NewId()
                     if plug.use_data():
-                        
-                        self._applications_menu.InsertCheckItem(pos, id, plug.sub_menu,
-                                      "Switch to analysis: %s" % plug.sub_menu)
+                        self._applications_menu.InsertCheckItem(pos, id, plug.sub_menu, \
+                            "Switch to analysis: %s" % plug.sub_menu)
                         plug_data_count = True
                         pos += 1
                     else:
                         plug_no_data_count = True
-                        self._applications_menu.AppendCheckItem(id, plug.sub_menu,
-                                      "Switch to analysis: %s" % plug.sub_menu)
+                        self._applications_menu.AppendCheckItem(id, plug.sub_menu, \
+                            "Switch to analysis: %s" % plug.sub_menu)
                     wx.EVT_MENU(self, id, plug.on_perspective)
 
-            if (not plug_data_count or not plug_no_data_count):
+            if not plug_data_count or not plug_no_data_count:
                 self._applications_menu.RemoveItem(separator)
             self._menubar.Append(self._applications_menu, '&Analysis')
             self._check_applications_menu()
-            
+
     def _populate_file_menu(self):
         """
@@ -1499 +1491 @@
                     wx.EVT_MENU(self, id, m_handler)
                 self._file_menu.AppendSeparator()
-                
+
         style1 = self.__gui_style & GUIFRAME.MULTIPLE_APPLICATIONS
         if OPEN_SAVE_MENU:
             id = wx.NewId()
             hint_load_file = "read all analysis states saved previously"
-            self._save_appl_menu = self._file_menu.Append(id, 
-                                    '&Open Project', hint_load_file)
+            self._save_appl_menu = self._file_menu.Append(id, '&Open Project', hint_load_file)
             wx.EVT_MENU(self, id, self._on_open_state_project)
-            
+
         if style1 == GUIFRAME.MULTIPLE_APPLICATIONS:
             # some menu of plugin to be seen under file menu
@@ -1513 +1504 @@
             hint_load_file += " them into the analysis"
             id = wx.NewId()
-            self._save_appl_menu = self._file_menu.Append(id, 
-                                    '&Open Analysis', hint_load_file)
+            self._save_appl_menu = self._file_menu.Append(id,
+                                                          '&Open Analysis', hint_load_file)
             wx.EVT_MENU(self, id, self._on_open_state_application)
-        if OPEN_SAVE_MENU:        
+        if OPEN_SAVE_MENU:
             self._file_menu.AppendSeparator()
             id = wx.NewId()
             self._file_menu.Append(id, '&Save Project',
-                                 'Save the state of the whole analysis')
+                                   'Save the state of the whole analysis')
             wx.EVT_MENU(self, id, self._on_save_project)
         if style1 == GUIFRAME.MULTIPLE_APPLICATIONS:
             id = wx.NewId()
-            self._save_appl_menu = self._file_menu.Append(id, 
-                                                      '&Save Analysis',
-                        'Save state of the current active analysis panel')
+            self._save_appl_menu = self._file_menu.Append(id, \
+                '&Save Analysis', 'Save state of the current active analysis panel')
             wx.EVT_MENU(self, id, self._on_save_application)
-        if not sys.platform =='darwin':
+        if not sys.platform == 'darwin':
             self._file_menu.AppendSeparator()
             id = wx.NewId()
-            self._file_menu.Append(id, '&Quit', 'Exit') 
+            self._file_menu.Append(id, '&Quit', 'Exit')
             wx.EVT_MENU(self, id, self.Close)
-        
+
     def _add_menu_file(self):
         """
@@ -1542 +1532 @@
         # Add sub menus
         self._menubar.Append(self._file_menu, '&File')
-        
+
     def _add_menu_edit(self):
         """
@@ -1551 +1541 @@
         # Edit Menu
         self._edit_menu = wx.Menu()
-        self._edit_menu.Append(GUIFRAME_ID.UNDO_ID, '&Undo', 
+        self._edit_menu.Append(GUIFRAME_ID.UNDO_ID, '&Undo',
                                'Undo the previous action')
         wx.EVT_MENU(self, GUIFRAME_ID.UNDO_ID, self.on_undo_panel)
-        self._edit_menu.Append(GUIFRAME_ID.REDO_ID, '&Redo', 
+        self._edit_menu.Append(GUIFRAME_ID.REDO_ID, '&Redo',
                                'Redo the previous action')
         wx.EVT_MENU(self, GUIFRAME_ID.REDO_ID, self.on_redo_panel)
         self._edit_menu.AppendSeparator()
-        self._edit_menu.Append(GUIFRAME_ID.COPY_ID, '&Copy Params', 
+        self._edit_menu.Append(GUIFRAME_ID.COPY_ID, '&Copy Params',
                                'Copy parameter values')
         wx.EVT_MENU(self, GUIFRAME_ID.COPY_ID, self.on_copy_panel)
-        self._edit_menu.Append(GUIFRAME_ID.PASTE_ID, '&Paste Params', 
+        self._edit_menu.Append(GUIFRAME_ID.PASTE_ID, '&Paste Params',
                                'Paste parameter values')
         wx.EVT_MENU(self, GUIFRAME_ID.PASTE_ID, self.on_paste_panel)
@@ -1570 +1560 @@
         #Sub menu for Copy As...
         self._edit_menu_copyas.Append(GUIFRAME_ID.COPYEX_ID, 'Copy current tab to Excel',
-                               'Copy parameter values in tabular format')
+                                      'Copy parameter values in tabular format')
         wx.EVT_MENU(self, GUIFRAME_ID.COPYEX_ID, self.on_copy_panel)
 
         self._edit_menu_copyas.Append(GUIFRAME_ID.COPYLAT_ID, 'Copy current tab to LaTeX',
-                               'Copy parameter values in tabular format')
+                                      'Copy parameter values in tabular format')
         wx.EVT_MENU(self, GUIFRAME_ID.COPYLAT_ID, self.on_copy_panel)
 
 
-        self._edit_menu.AppendMenu(GUIFRAME_ID.COPYAS_ID, 'Copy Params as...', self._edit_menu_copyas,
-                               'Copy parameter values in various formats')
-
+        self._edit_menu.AppendMenu(GUIFRAME_ID.COPYAS_ID, 'Copy Params as...',
+                                   self._edit_menu_copyas,
+                                   'Copy parameter values in various formats')
 
         self._edit_menu.AppendSeparator()
-        
+
         self._edit_menu.Append(GUIFRAME_ID.PREVIEW_ID, '&Report Results',
                                'Preview current panel')
         wx.EVT_MENU(self, GUIFRAME_ID.PREVIEW_ID, self.on_preview_panel)
 
-        self._edit_menu.Append(GUIFRAME_ID.RESET_ID, '&Reset Page', 
+        self._edit_menu.Append(GUIFRAME_ID.RESET_ID, '&Reset Page',
                                'Reset current panel')
         wx.EVT_MENU(self, GUIFRAME_ID.RESET_ID, self.on_reset_panel)
-    
-        self._menubar.Append(self._edit_menu,  '&Edit')
+
+        self._menubar.Append(self._edit_menu, '&Edit')
         self.enable_edit_menu()
-        
+
     def get_style(self):
         """
@@ -1600 +1590 @@
         """
         return  self.__gui_style
-    
+
     def _add_menu_data(self):
         """
@@ -1610 +1600 @@
                 for (menu, name) in menu_list:
                     self._menubar.Append(menu, name)
-        
-                        
+
     def _on_toggle_toolbar(self, event=None):
         """
@@ -1627 +1616 @@
             self._toolbar.Show()
         self._toolbar.Realize()
-        
+
     def _on_status_event(self, evt):
         """
@@ -1634 +1623 @@
         # This CallAfter fixes many crashes on MAC.
         wx.CallAfter(self.sb.set_status, evt)
-       
+
     def on_view(self, evt):
         """
         A panel was selected to be shown. If it's not already
         shown, display it.
-        
+
         :param evt: menu event
-        
+
         """
         panel_id = str(evt.GetId())
         self.on_set_plot_focus(self.panels[panel_id])
-        wx.CallLater(5*TIME_FACTOR, self.set_schedule(True))
+        wx.CallLater(5 * TIME_FACTOR, self.set_schedule(True))
         self.set_plot_unfocus()
- 
+
     def show_welcome_panel(self, event):
-        """    
+        """
         Display the welcome panel
         """
         if self.defaultPanel is None:
-            return 
+            return
         frame = self.panels['default'].get_frame()
         if frame == None:
@@ -1660 +1649 @@
         if not frame.IsShown():
             frame.Show(True)
-            
+
     def on_close_welcome_panel(self):
         """
@@ -1666 +1655 @@
         """
         if self.defaultPanel is None:
-            return 
+            return
         default_panel = self.panels["default"].frame
         if default_panel.IsShown():
-            default_panel.Show(False) 
-                
+            default_panel.Show(False)
+
     def delete_panel(self, uid):
         """
@@ -1677 +1666 @@
         ID = str(uid)
         config.printEVT("delete_panel: %s" % ID)
-        try:
-            caption = self.panels[ID].window_caption
-        except:
-            logging.error("delete_panel: No such plot id as %s" % ID)
-            return
         if ID in self.panels.keys():
             self.panel_on_focus = None
@@ -1691 +1675 @@
 
             if panel in self.schedule_full_draw_list:
-                self.schedule_full_draw_list.remove(panel) 
-            
+                self.schedule_full_draw_list.remove(panel)
+
             #delete uid number not str(uid)
             if ID in self.plot_panels.keys():
@@ -1698 +1682 @@
             if ID in self.panels.keys():
                 del self.panels[ID]
-            return 
-            
+        else:
+            logging.error("delete_panel: No such plot id as %s" % ID)
+
     def create_gui_data(self, data, path=None):
         """
         """
         return self._data_manager.create_gui_data(data, path)
-    
+
     def get_data(self, path):
         """
@@ -1712 +1697 @@
         output = []
         error_message = ""
-        basename  = os.path.basename(path)
+        basename = os.path.basename(path)
         root, extension = os.path.splitext(basename)
         if extension.lower() not in EXTENSIONS:
@@ -1720 +1705 @@
             logging.error(log_msg)
             return
-        
+
         #reading a state file
         for plug in self.plugins:
@@ -1734 +1719 @@
                     except:
                         msg = "DataLoader Error: Encounted Non-ASCII character"
-                        msg += "\n(%s)"% sys.exc_value
-                        wx.PostEvent(self, StatusEvent(status=msg, 
-                                                info="error", type="stop"))
+                        msg += "\n(%s)" % sys.exc_value
+                        wx.PostEvent(self, StatusEvent(status=msg,
+                                                       info="error", type="stop"))
                         return
-        
+
         style = self.__gui_style & GUIFRAME.MANAGER_ON
         if style == GUIFRAME.MANAGER_ON:
             if self._data_panel is not None:
                 self._data_panel.frame.Show(True)
-      
-    def load_from_cmd(self,  path):   
+
+    def load_from_cmd(self, path):
         """
         load data from cmd or application
-        """ 
+        """
         if path is None:
             return
@@ -1754 +1739 @@
             if not os.path.isfile(path) and not os.path.isdir(path):
                 return
-            
+
             if os.path.isdir(path):
                 self.load_folder(path)
                 return
 
-        basename  = os.path.basename(path)
-        root, extension = os.path.splitext(basename)
+        basename = os.path.basename(path)
+        _, extension = os.path.splitext(basename)
         if extension.lower() not in EXTENSIONS:
             self.load_data(path)
@@ -1767 +1752 @@
 
         self._default_save_location = os.path.dirname(path)
-        
-    def load_state(self, path, is_project=False):   
+
+    def load_state(self, path, is_project=False):
         """
         load data from command line or application
         """
         if path and (path is not None) and os.path.isfile(path):
-            basename  = os.path.basename(path)
+            basename = os.path.basename(path)
             if APPLICATION_STATE_EXTENSION is not None \
                 and basename.endswith(APPLICATION_STATE_EXTENSION):
@@ -1784 +1769 @@
         else:
             wx.PostEvent(self, StatusEvent(status=" "))
-            
+
     def load_data(self, path):
         """
@@ -1791 +1776 @@
         if not os.path.isfile(path):
             return
-        basename  = os.path.basename(path)
-        root, extension = os.path.splitext(basename)
+        basename = os.path.basename(path)
+        _, extension = os.path.splitext(basename)
         if extension.lower() in EXTENSIONS:
             log_msg = "Data Loader cannot "
@@ -1804 +1789 @@
         try:
             logging.info("Loading Data...:\n" + str(path) + "\n")
-            temp =  self.loader.load(path)
+            temp = self.loader.load(path)
             if temp.__class__.__name__ == "list":
                 for item in temp:
@@ -1812 +1797 @@
                 data = self.create_gui_data(temp, path)
                 output[data.id] = data
-            
+
             self.add_data(data_list=output)
         except:
@@ -1819 +1804 @@
             error_message += str(sys.exc_value) + "\n"
             logging.error(error_message)
- 
+
     def load_folder(self, path):
         """
         Load entire folder
-        """   
+        """
         if not os.path.isdir(path):
             return
@@ -1834 +1819 @@
                 self._data_plugin.get_data(file_list)
             else:
-                return 
+                return
         except:
             error_message = "Error while loading"
@@ -1840 +1825 @@
             error_message += str(sys.exc_value) + "\n"
             logging.error(error_message)
-            
+
     def _on_open_state_application(self, event):
         """
@@ -1849 +1834 @@
         wx.PostEvent(self, StatusEvent(status="Loading Analysis file..."))
         plug_wlist = self._on_open_state_app_helper()
-        dlg = wx.FileDialog(self, 
-                            "Choose a file", 
+        dlg = wx.FileDialog(self,
+                            "Choose a file",
                             self._default_save_location, "",
                             plug_wlist)
@@ -1858 +1843 @@
                 self._default_save_location = os.path.dirname(path)
         dlg.Destroy()
-        self.load_state(path=path)  
-    
+        self.load_state(path=path)
+
     def _on_open_state_app_helper(self):
         """
-        Helps '_on_open_state_application()' to find the extension of 
+        Helps '_on_open_state_application()' to find the extension of
         the current perspective/application
         """
         # No current perspective or no extension attr
         if self._current_perspective is None:
-            return PLUGINS_WLIST 
+            return PLUGINS_WLIST
         try:
-            # Find the extension of the perspective 
+            # Find the extension of the perspective
             # and get that as 1st item in list
             ind = None
@@ -1888 +1873 @@
 
         except:
-            plug_wlist = PLUGINS_WLIST 
-            
+            plug_wlist = PLUGINS_WLIST
+
         return plug_wlist
-            
+
     def _on_open_state_project(self, event):
         """
@@ -1899 +1884 @@
             self._default_save_location = os.getcwd()
         wx.PostEvent(self, StatusEvent(status="Loading Project file..."))
-        dlg = wx.FileDialog(self, 
-                            "Choose a file", 
+        dlg = wx.FileDialog(self,
+                            "Choose a file",
                             self._default_save_location, "",
-                             APPLICATION_WLIST)
+                            APPLICATION_WLIST)
         if dlg.ShowModal() == wx.ID_OK:
             path = dlg.GetPath()
@@ -1908 +1893 @@
                 self._default_save_location = os.path.dirname(path)
         dlg.Destroy()
-        
+
         self.load_state(path=path, is_project=True)
-        
+
     def _on_save_application(self, event):
         """
@@ -1917 +1902 @@
         if self.cpanel_on_focus is not None:
             try:
-                wx.PostEvent(self, 
+                wx.PostEvent(self,
                              StatusEvent(status="Saving Analysis file..."))
                 self.cpanel_on_focus.on_save(event)
-                wx.PostEvent(self, 
+                wx.PostEvent(self,
                              StatusEvent(status="Completed saving."))
             except:
                 msg = "Error occurred while saving: "
                 msg += "To save, the application panel should have a data set.."
-                wx.PostEvent(self, StatusEvent(status=msg))  
-            
+                wx.PostEvent(self, StatusEvent(status=msg))
+
     def _on_save_project(self, event):
         """
@@ -1934 +1919 @@
             return
         wx.PostEvent(self, StatusEvent(status="Saving Project file..."))
-        reader, ext = self._current_perspective.get_extensions()
         path = None
         extension = '*' + APPLICATION_STATE_EXTENSION
         dlg = wx.FileDialog(self, "Save Project file",
                             self._default_save_location, "sasview_proj",
-                             extension, 
-                             wx.SAVE)
+                            extension,
+                            wx.SAVE)
         if dlg.ShowModal() == wx.ID_OK:
             path = dlg.GetPath()
@@ -1956 +1940 @@
                 if temp is not None:
                     doc = temp
-            
+
             # Write the XML document
             extens = APPLICATION_STATE_EXTENSION
@@ -1972 +1956 @@
                 msg += "No project was saved to %s" % (str(path))
                 logging.error(msg)
-                wx.PostEvent(self,StatusEvent(status=msg))
+                wx.PostEvent(self, StatusEvent(status=msg))
         except:
             msg = "Error occurred while saving: "
             msg += "To save, at least one application panel "
             msg += "should have a data set.."
-            wx.PostEvent(self, StatusEvent(status=msg))    
-                    
+            wx.PostEvent(self, StatusEvent(status=msg))
+
     def on_save_helper(self, doc, reader, panel, path):
         """
         Save state into a file
         """
-        try:
-            if reader is not None:
-                # case of a panel with multi-pages
-                if hasattr(panel, "opened_pages"):
-                    for uid, page in panel.opened_pages.iteritems():
-                        data = page.get_data()
-                        # state must be cloned
-                        state = page.get_state().clone()
-                        if data is not None:
-                            new_doc = reader.write_toXML(data, state)
-                            if doc != None and hasattr(doc, "firstChild"):
-                                child = new_doc.firstChild.firstChild
-                                doc.firstChild.appendChild(child)  
-                            else:
-                                doc = new_doc 
-                # case of only a panel
-                else:
-                    data = panel.get_data()
-                    state = panel.get_state()
+        if reader is not None:
+            # case of a panel with multi-pages
+            if hasattr(panel, "opened_pages"):
+                for _, page in panel.opened_pages.iteritems():
+                    data = page.get_data()
+                    # state must be cloned
+                    state = page.get_state().clone()
                     if data is not None:
                         new_doc = reader.write_toXML(data, state)
                         if doc != None and hasattr(doc, "firstChild"):
                             child = new_doc.firstChild.firstChild
-                            doc.firstChild.appendChild(child)  
+                            doc.firstChild.appendChild(child)
                         else:
-                            doc = new_doc 
-        except: 
-            raise
-            #pass
-
+                            doc = new_doc
+            # case of only a panel
+            else:
+                data = panel.get_data()
+                state = panel.get_state()
+                if data is not None:
+                    new_doc = reader.write_toXML(data, state)
+                    if doc != None and hasattr(doc, "firstChild"):
+                        child = new_doc.firstChild.firstChild
+                        doc.firstChild.appendChild(child)
+                    else:
+                        doc = new_doc
         return doc
 
@@ -2021 +2000 @@
         message = "\nDo you really want to exit this application?        \n\n"
         dial = wx.MessageDialog(self, message, 'Confirm Exit',
-                           wx.YES_NO|wx.YES_DEFAULT|wx.ICON_QUESTION)
+                                wx.YES_NO | wx.YES_DEFAULT | wx.ICON_QUESTION)
         if dial.ShowModal() == wx.ID_YES:
             return True
         else:
-            return False    
-        
+            return False
+
     def WindowClose(self, event=None):
         """
@@ -2035 +2014 @@
             _pylab_helpers.Gcf.figs = {}
             self.Close()
-            
+
     def Close(self, event=None):
         """
@@ -2042 +2021 @@
         wx.Exit()
         sys.exit()
-            
-    def _check_update(self, event=None): 
+
+    def _check_update(self, event=None):
         """
         Check with the deployment server whether a new version
@@ -2051 +2030 @@
         """
         try:
-            conn = httplib.HTTPConnection(config.__update_URL__[0], 
-                              timeout=3.0)
+            conn = httplib.HTTPConnection(config.__update_URL__[0],
+                                          timeout=3.0)
             conn.request("GET", config.__update_URL__[1])
             res = conn.getresponse()
@@ -2059 +2038 @@
         except:
             content = "0.0.0"
-       
+
         version = content.strip()
         if len(re.findall('\d+\.\d+\.\d+$', version)) < 0:
             content = "0.0.0"
-        self._process_version(content, standalone=event==None)
-    
+        self._process_version(content, standalone=event == None)
+
     def _process_version(self, version, standalone=True):
         """
@@ -2071 +2050 @@
         version number has been obtained. If the check is being done in the
         background, the user will not be notified unless there's an update.
-        
+
         :param version: version string
-        :param standalone: True of the update is being checked in 
+        :param standalone: True of the update is being checked in
            the background, False otherwise.
-           
+
         """
         try:
@@ -2088 +2067 @@
                     webbrowser.open(config.__download_page__)
                 else:
-                    msg +=  "See the help menu to download it." 
+                    msg += "See the help menu to download it."
                 self.SetStatusText(msg)
             else:
@@ -2103 +2082 @@
                 msg += " Please try again later."
                 self.SetStatusText(msg)
-                    
+
     def _onAcknowledge(self, evt):
         """
         Pop up the acknowledge dialog
-        
+
         :param evt: menu event
-        
+
         """
         if config._do_acknowledge:
@@ -2115 +2094 @@
             dialog = AcknowledgeBox.DialogAcknowledge(None, -1, "")
             dialog.ShowModal()
-                     
+
     def _onAbout(self, evt):
         """
         Pop up the about dialog
-        
+
         :param evt: menu event
-        
+
         """
         if config._do_aboutbox:
             import sas.guiframe.aboutbox as AboutBox
             dialog = AboutBox.DialogAbout(None, -1, "")
-            dialog.ShowModal()   
-                     
+            dialog.ShowModal()
+
     def _onTutorial(self, evt):
         """
         Pop up the tutorial dialog
-        
+
         :param evt: menu event
-        
-        """
-        if config._do_tutorial:   
+
+        """
+        if config._do_tutorial:
             path = config.TUTORIAL_PATH
             if IS_WIN:
@@ -2142 +2121 @@
                     dialog = PDFFrame(None, -1, "Tutorial", path)
                     # put icon
-                    self.put_icon(dialog)  
-                    dialog.Show(True) 
+                    self.put_icon(dialog)
+                    dialog.Show(True)
                 except:
                     logging.error("Error in _onTutorial: %s" % sys.exc_value)
@@ -2175 +2154 @@
         'documentation' is clicked. Calls DocumentationWindow with the top
         level path of "index.html"
-        
+
         :param evt: menu event
         """
@@ -2181 +2160 @@
         # different place than they would otherwise.
         from documentation_window import DocumentationWindow
-        
-        sphinx_doc_viewer = DocumentationWindow(self, -1, "index.html", \
-                                                "General Help")
+        DocumentationWindow(self, -1, "index.html", "General Help")
 
     def set_manager(self, manager):
         """
         Sets the application manager for this frame
-        
+
         :param manager: frame manager
         """
         self.app_manager = manager
-        
+
     def post_init(self):
         """
-        This initialization method is called after the GUI 
+        This initialization method is called after the GUI
         has been created and all plug-ins loaded. It calls
         the post_init() method of each plug-in (if it exists)
@@ -2203 +2180 @@
             if hasattr(item, "post_init"):
                 item.post_init()
-        
+
     def set_default_perspective(self):
         """
-        Choose among the plugin the first plug-in that has 
+        Choose among the plugin the first plug-in that has
         "set_default_perspective" method and its return value is True will be
         as a default perspective when the welcome page is closed
@@ -2214 +2191 @@
                 if item.set_default_perspective():
                     item.on_perspective(event=None)
-                    return 
-        
+                    return
+
     def set_perspective(self, panels):
         """
@@ -2221 +2198 @@
         Opens all the panels in the list, and closes
         all the others.
-        
+
         :param panels: list of panels
         """
@@ -2228 +2205 @@
             if hasattr(self.panels[item], "ALWAYS_ON"):
                 if self.panels[item].ALWAYS_ON:
-                    continue 
+                    continue
             if self.panels[item] == None:
                 continue
@@ -2252 +2229 @@
                     if frame.IsShown():
                         frame.Show(False)
-        
+
     def show_data_panel(self, event=None, action=True):
         """
@@ -2263 +2240 @@
         frame = pane.get_frame()
         if label == 'Show Data Explorer':
-            if action: 
+            if action:
                 frame.Show(True)
             self.__gui_style = self.__gui_style | GUIFRAME.MANAGER_ON
@@ -2278 +2255 @@
         if self._data_manager is not None:
             self._data_manager.add_data(data_list)
-        
+
     def add_data(self, data_list):
         """
         receive a dictionary of data from loader
         store them its data manager if possible
-        send to data the current active perspective if the data panel 
-        is not active. 
+        send to data the current active perspective if the data panel
+        is not active.
         :param data_list: dictionary of data's ID and value Data
         """
@@ -2293 +2270 @@
             data_state = self._data_manager.get_data_state(data_list.keys())
             self._data_panel.load_data_list(data_state)
-        #if the data panel is shown wait for the user to press a button 
+        #if the data panel is shown wait for the user to press a button
         #to send data to the current perspective. if the panel is not
         #show  automatically send the data to the current perspective
         style = self.__gui_style & GUIFRAME.MANAGER_ON
         if style == GUIFRAME.MANAGER_ON:
-            #wait for button press from the data panel to set_data 
+            #wait for button press from the data panel to set_data
             if self._data_panel is not None:
                 self._data_panel.frame.Show(True)
@@ -2304 +2281 @@
             #automatically send that to the current perspective
             self.set_data(data_id=data_list.keys())
-       
-    def set_data(self, data_id, theory_id=None): 
+
+    def set_data(self, data_id, theory_id=None):
         """
         set data to current perspective
@@ -2316 +2293 @@
             msg = "Guiframe does not have a current perspective"
             logging.info(msg)
-            
+
     def set_theory(self, state_id, theory_id=None):
         """
@@ -2331 +2308 @@
             msg = "Guiframe does not have a current perspective"
             logging.info(msg)
-            
-    def plot_data(self,  state_id, data_id=None,
+
+    def plot_data(self, state_id, data_id=None,
                   theory_id=None, append=False):
         """
         send a list of data to plot
         """
-        total_plot_list = []
         data_list, _ = self._data_manager.get_by_id(data_id)
         _, temp_list_theory = self._data_manager.get_by_id(theory_id)
@@ -2350 +2326 @@
                     message = "cannot append plot. No plot panel on focus!"
                     message += "please click on any available plot to set focus"
-                    wx.PostEvent(self, StatusEvent(status=message, 
+                    wx.PostEvent(self, StatusEvent(status=message,
                                                    info='warning'))
-                    return 
+                    return
                 else:
                     if self.enable_add_data(new_plot):
@@ -2359 +2335 @@
                         message = "Only 1D Data can be append to"
                         message += " plot panel containing 1D data.\n"
-                        message += "%s not be appended.\n" %str(new_plot.name)
+                        message += "%s not be appended.\n" % str(new_plot.name)
                         message += "try new plot option.\n"
-                        wx.PostEvent(self, StatusEvent(status=message, 
-                                                   info='warning'))
+                        wx.PostEvent(self, StatusEvent(status=message,
+                                                       info='warning'))
             else:
                 #if not append then new plot
@@ -2374 +2350 @@
             title = "PLOT " + str(new_plot.title)
             wx.PostEvent(self, NewPlotEvent(plot=new_plot,
-                                                  title=title,
-                                                  group_id = new_plot.group_id))
-            
+                                            title=title,
+                                            group_id=new_plot.group_id))
+
     def remove_data(self, data_id, theory_id=None):
         """
@@ -2387 +2363 @@
         for plug in self.plugins:
             plug.delete_data(temp)
-        total_plot_list = []
         data_list, _ = self._data_manager.get_by_id(data_id)
         _, temp_list_theory = self._data_manager.get_by_id(theory_id)
@@ -2398 +2373 @@
             for group_id in new_plot.list_group_id:
                 wx.PostEvent(self, NewPlotEvent(id=id,
-                                                   group_id=group_id,
-                                                   action='remove'))
+                                                group_id=group_id,
+                                                action='remove'))
                 #remove res plot: Todo: improve
                 wx.CallAfter(self._remove_res_plot, id)
-        self._data_manager.delete_data(data_id=data_id, 
+        self._data_manager.delete_data(data_id=data_id,
                                        theory_id=theory_id)
-        
+
     def _remove_res_plot(self, id):
         """
         Try to remove corresponding res plot
-        
+
         : param id: id of the data
         """
         try:
-            wx.PostEvent(self, NewPlotEvent(id=("res"+str(id)),
-                                           group_id=("res"+str(id)),
-                                           action='remove'))
+            wx.PostEvent(self, NewPlotEvent(id=("res" + str(id)),
+                                            group_id=("res" + str(id)),
+                                            action='remove'))
         except:
-            pass
-    
+            logging.error(sys.exc_value)
+
     def save_data1d(self, data, fname):
         """
@@ -2424 +2399 @@
         default_name = fname
         wildcard = "Text files (*.txt)|*.txt|"\
-                    "CanSAS 1D files(*.xml)|*.xml" 
+                    "CanSAS 1D files(*.xml)|*.xml"
         path = None
         dlg = wx.FileDialog(self, "Choose a file",
                             self._default_save_location,
-                            default_name, wildcard , wx.SAVE)
-       
+                            default_name, wildcard, wx.SAVE)
+
         if dlg.ShowModal() == wx.ID_OK:
             path = dlg.GetPath()
@@ -2441 +2416 @@
             path = os.path.splitext(path)[0] + format
             mypath = os.path.basename(path)
-            
-            #TODO: This is bad design. The DataLoader is designed 
-            #to recognize extensions.
-            # It should be a simple matter of calling the .
-            #save(file, data, '.xml') method
-            # of the sas.dataloader.loader.Loader class.
-            from sas.dataloader.loader import  Loader
-            #Instantiate a loader 
-            loader = Loader() 
+
+            #Instantiate a loader
+            loader = Loader()
             format = ".txt"
             if os.path.splitext(mypath)[1].lower() == format:
@@ -2465 +2434 @@
                 self._default_save_location = os.path.dirname(path)
             except:
-                pass    
+                pass
         dlg.Destroy()
-        
-        
+
+
     def _onsaveTXT(self, data, path):
         """
-        Save file as txt  
+        Save file as txt
         :TODO: Refactor and remove this method. See TODO in _onSave.
         """
@@ -2493 +2462 @@
             else:
                 out.write("<X>   <Y>\n")
-                
+
             for i in range(len(data.x)):
                 if has_errors:
                     if data.dx != None and data.dx != []:
                         if  data.dx[i] != None:
-                            out.write("%g  %g  %g  %g\n" % (data.x[i], 
-                                                        data.y[i],
-                                                        data.dy[i],
-                                                        data.dx[i]))
+                            out.write("%g  %g  %g  %g\n" % (data.x[i],
+                                                            data.y[i],
+                                                            data.dy[i],
+                                                            data.dx[i]))
                         else:
-                            out.write("%g  %g  %g\n" % (data.x[i], 
+                            out.write("%g  %g  %g\n" % (data.x[i],
                                                         data.y[i],
                                                         data.dy[i]))
                     else:
-                        out.write("%g  %g  %g\n" % (data.x[i], 
+                        out.write("%g  %g  %g\n" % (data.x[i],
                                                     data.y[i],
                                                     data.dy[i]))
                 else:
-                    out.write("%g  %g\n" % (data.x[i], 
+                    out.write("%g  %g\n" % (data.x[i],
                                             data.y[i]))
-            out.close()  
-                             
+            out.close()
+
     def show_data1d(self, data, name):
         """
         Show data dialog
-        """   
+        """
         try:
             xmin = min(data.x)
             ymin = min(data.y)
         except:
-            msg = "Unable to find min/max of \n data named %s"% \
-                        data.filename  
+            msg = "Unable to find min/max of \n data named %s" % \
+                        data.filename
             wx.PostEvent(self, StatusEvent(status=msg,
-                                       info="error"))
+                                           info="error"))
             raise ValueError, msg
         ## text = str(data)
         text = data.__str__()
         text += 'Data Min Max:\n'
-        text += 'X_min = %s:  X_max = %s\n'% (xmin, max(data.x))
-        text += 'Y_min = %s:  Y_max = %s\n'% (ymin, max(data.y))
+        text += 'X_min = %s:  X_max = %s\n' % (xmin, max(data.x))
+        text += 'Y_min = %s:  Y_max = %s\n' % (ymin, max(data.y))
         if data.dy != None:
-            text += 'dY_min = %s:  dY_max = %s\n'% (min(data.dy), max(data.dy))
+            text += 'dY_min = %s:  dY_max = %s\n' % (min(data.dy), max(data.dy))
         text += '\nData Points:\n'
         x_st = "X"
@@ -2547 +2516 @@
                 dx_val = 0.0
             if data.dxl != None and len(data.dxl) > index:
-                if index == 0: 
+                if index == 0:
                     x_st = "Xl"
                 dx_val = data.dxl[index]
             elif data.dxw != None and len(data.dxw) > index:
-                if index == 0: 
+                if index == 0:
                     x_st = "Xw"
                 dx_val = data.dxw[index]
-            
+
             if index == 0:
-                text += "<index> \t<X> \t<Y> \t<dY> \t<d%s>\n"% x_st
+                text += "<index> \t<X> \t<Y> \t<dY> \t<d%s>\n" % x_st
             text += "%s \t%s \t%s \t%s \t%s\n" % (index,
-                                            data.x[index], 
-                                            data.y[index],
-                                            dy_val,
-                                            dx_val)
+                                                  data.x[index],
+                                                  data.y[index],
+                                                  dy_val,
+                                                  dx_val)
         from pdfview import TextFrame
-        frame = TextFrame(None, -1, "Data Info: %s"% data.name, text) 
+        frame = TextFrame(None, -1, "Data Info: %s" % data.name, text)
         # put icon
-        self.put_icon(frame) 
-        frame.Show(True) 
-            
-    def save_data2d(self, data, fname):    
+        self.put_icon(frame)
+        frame.Show(True)
+
+    def save_data2d(self, data, fname):
         """
         Save data2d dialog
@@ -2576 +2545 @@
         dlg = wx.FileDialog(self, "Choose a file",
                             self._default_save_location,
-                            default_name, wildcard , wx.SAVE)
-       
+                            default_name, wildcard, wx.SAVE)
+
         if dlg.ShowModal() == wx.ID_OK:
             path = dlg.GetPath()
@@ -2589 +2558 @@
             path = os.path.splitext(path)[0] + format
             mypath = os.path.basename(path)
-            
-            #TODO: This is bad design. The DataLoader is designed 
-            #to recognize extensions.
-            # It should be a simple matter of calling the .
-            #save(file, data, '.xml') method
-            # of the DataLoader.loader.Loader class.
-            from sas.dataloader.loader import  Loader
-            #Instantiate a loader 
-            loader = Loader() 
+
+            #Instantiate a loader
+            loader = Loader()
 
             format = ".dat"
@@ -2608 +2571 @@
                 self._default_save_location = os.path.dirname(path)
             except:
-                pass    
-        dlg.Destroy() 
-                             
+                pass
+        dlg.Destroy()
+
     def show_data2d(self, data, name):
         """
         Show data dialog
-        """   
-
-        wx.PostEvent(self, StatusEvent(status = "Gathering Data2D Info.", 
-                                       type = 'start' ))
-        text = data.__str__() 
+        """
+        wx.PostEvent(self, StatusEvent(status="Gathering Data2D Info.",
+                                       type='start'))
+        text = data.__str__()
         text += 'Data Min Max:\n'
-        text += 'I_min = %s\n'% min(data.data)
-        text += 'I_max = %s\n\n'% max(data.data)
+        text += 'I_min = %s\n' % min(data.data)
+        text += 'I_max = %s\n\n' % max(data.data)
         text += 'Data (First 2501) Points:\n'
         text += 'Data columns include err(I).\n'
@@ -2629 +2591 @@
         dx_val = 0.0
         dy_val = 0.0
-        #mask_val = True
         len_data = len(data.qx_data)
         for index in xrange(0, len_data):
@@ -2635 +2596 @@
             y_val = data.qy_data[index]
             i_val = data.data[index]
-            if data.err_data != None: 
+            if data.err_data != None:
                 di_val = data.err_data[index]
-            if data.dqx_data != None: 
+            if data.dqx_data != None:
                 dx_val = data.dqx_data[index]
-            if data.dqy_data != None: 
+            if data.dqy_data != None:
                 dy_val = data.dqy_data[index]
-  
+
             text += "%s \t%s \t%s \t%s \t%s \t%s \t%s\n" % (index,
-                                            x_val, 
-                                            y_val,
-                                            i_val,
-                                            di_val,
-                                            dx_val,
-                                            dy_val)
+                                                            x_val,
+                                                            y_val,
+                                                            i_val,
+                                                            di_val,
+                                                            dx_val,
+                                                            dy_val)
             # Takes too long time for typical data2d: Break here
             if index >= 2500:
@@ -2655 +2616 @@
 
         from pdfview import TextFrame
-        frame = TextFrame(None, -1, "Data Info: %s"% data.name, text) 
+        frame = TextFrame(None, -1, "Data Info: %s" % data.name, text)
         # put icon
         self.put_icon(frame)
-        frame.Show(True) 
-        wx.PostEvent(self, StatusEvent(status = "Data2D Info Displayed", 
-                                       type = 'stop' ))
-                                  
+        frame.Show(True)
+        wx.PostEvent(self, StatusEvent(status="Data2D Info Displayed",
+                                       type='stop'))
+
     def set_current_perspective(self, perspective):
         """
-        set the current active perspective 
+        set the current active perspective
         """
         self._current_perspective = perspective
@@ -2680 +2641 @@
                             else:
                                 frame.Show(False)
-                            #break               
             name = self._current_perspective.sub_menu
             if self._data_panel is not None:
@@ -2687 +2647 @@
             #Set the SasView title
             self._set_title_name(name)
-            
+
     def _set_title_name(self, name):
         """
         Set the SasView title w/ the current application name
-        
+
         : param name: application name [string]
         """
@@ -2697 +2657 @@
         title = self.title + "  - " + name + " -"
         self.SetTitle(title)
-            
+
     def _check_applications_menu(self):
         """
@@ -2710 +2670 @@
                             menu.Check(True)
                         else:
-                            menu.Check(False) 
-            
+                            menu.Check(False)
+
     def enable_add_data(self, new_plot):
         """
@@ -2721 +2681 @@
         is_theory = len(self.panel_on_focus.plots) <= 1 and \
             self.panel_on_focus.plots.values()[0].__class__.__name__ == "Theory1D"
-            
+
         is_data2d = hasattr(new_plot, 'data')
-        
+
         is_data1d = self.panel_on_focus.__class__.__name__ == "ModelPanel1D"\
             and self.panel_on_focus.group_id is not None
         has_meta_data = hasattr(new_plot, 'meta_data')
-        
+
         #disable_add_data if the data is being recovered from  a saved state file.
         is_state_data = False
         if has_meta_data:
-            if 'invstate' in new_plot.meta_data: 
+            if 'invstate' in new_plot.meta_data:
                 is_state_data = True
-            if  'prstate' in new_plot.meta_data: 
+            if  'prstate' in new_plot.meta_data:
                 is_state_data = True
-            if  'fitstate' in new_plot.meta_data: 
+            if  'fitstate' in new_plot.meta_data:
                 is_state_data = True
-    
+
         return is_data1d and not is_data2d and not is_theory and not is_state_data
-    
+
     def check_multimode(self, perspective=None):
         """
@@ -2756 +2716 @@
         self._data_panel.rb_single_mode.Enable(flag)
         self._data_panel.rb_batch_mode.Enable(flag)
-                
-
-    
+
     def enable_edit_menu(self):
         """
@@ -2775 +2733 @@
             #Copy menu
             flag = self.cpanel_on_focus.get_copy_flag()
-            #self._edit_menu.ENABLE(GUIFRAME_ID.COPYAS_ID,flag)
             self._edit_menu_copyas.Enable(GUIFRAME_ID.COPYEX_ID, flag)
             self._edit_menu_copyas.Enable(GUIFRAME_ID.COPYLAT_ID, flag)
@@ -2789 +2746 @@
             self._edit_menu.Enable(GUIFRAME_ID.COPY_ID, flag)
             self._edit_menu.Enable(GUIFRAME_ID.PASTE_ID, flag)
-            #self._edit_menu.Enable(GUIFRAME_ID.COPYEX_ID, flag)
-            #self._edit_menu.Enable(GUIFRAME_ID.COPYLAT_ID, flag)
-            #self._edit_menu.Enable(GUIFRAME_ID.COPYAS_ID, flag)
             self._edit_menu.Enable(GUIFRAME_ID.PREVIEW_ID, flag)
             self._edit_menu.Enable(GUIFRAME_ID.RESET_ID, flag)
-            
+
     def on_undo_panel(self, event=None):
         """
@@ -2801 +2755 @@
         if self.cpanel_on_focus is not None:
             self.cpanel_on_focus.on_undo(event)
-            
+
     def on_redo_panel(self, event=None):
         """
@@ -2808 +2762 @@
         if self.cpanel_on_focus is not None:
             self.cpanel_on_focus.on_redo(event)
-            
+
     def on_copy_panel(self, event=None):
         """
@@ -2815 +2769 @@
         if self.cpanel_on_focus is not None:
             self.cpanel_on_focus.on_copy(event)
-            
+
     def on_paste_panel(self, event=None):
         """
@@ -2822 +2776 @@
         if self.cpanel_on_focus is not None:
             self.cpanel_on_focus.on_paste(event)
-                    
+
     def on_bookmark_panel(self, event=None):
         """
@@ -2829 +2783 @@
         if self.cpanel_on_focus is not None:
             self.cpanel_on_focus.on_bookmark(event)
-            
+
     def append_bookmark(self, event=None):
         """
@@ -2835 +2789 @@
         """
         self._toolbar.append_bookmark(event)
-            
+
     def on_save_panel(self, event=None):
         """
@@ -2842 +2796 @@
         if self.cpanel_on_focus is not None:
             self.cpanel_on_focus.on_save(event)
-            
+
     def on_preview_panel(self, event=None):
         """
@@ -2849 +2803 @@
         if self.cpanel_on_focus is not None:
             self.cpanel_on_focus.on_preview(event)
-            
+
     def on_print_panel(self, event=None):
         """
@@ -2856 +2810 @@
         if self.cpanel_on_focus is not None:
             self.cpanel_on_focus.on_print(event)
-            
+
     def on_zoom_panel(self, event=None):
         """
@@ -2863 +2817 @@
         if self.cpanel_on_focus is not None:
             self.cpanel_on_focus.on_zoom(event)
-            
+
     def on_zoom_in_panel(self, event=None):
         """
@@ -2870 +2824 @@
         if self.cpanel_on_focus is not None:
             self.cpanel_on_focus.on_zoom_in(event)
-            
+
     def on_zoom_out_panel(self, event=None):
         """
@@ -2877 +2831 @@
         if self.cpanel_on_focus is not None:
             self.cpanel_on_focus.on_zoom_out(event)
-            
+
     def on_drag_panel(self, event=None):
         """
@@ -2884 +2838 @@
         if self.cpanel_on_focus is not None:
             self.cpanel_on_focus.on_drag(event)
-            
+
     def on_reset_panel(self, event=None):
         """
@@ -2891 +2845 @@
         if self.cpanel_on_focus is not None:
             self.cpanel_on_focus.on_reset(event)
-            
-    def on_change_caption(self, name, old_caption, new_caption):     
+
+    def on_change_caption(self, name, old_caption, new_caption):
         """
         Change the panel caption
-        
+
         :param name: window_name of the pane
         :param old_caption: current caption [string]
@@ -2901 +2855 @@
         """
         # wx.aui.AuiPaneInfo
-        pane_info = self.get_paneinfo(old_caption) 
+        pane_info = self.get_paneinfo(old_caption)
         # update the data_panel.cb_plotpanel
         if 'data_panel' in self.panels.keys():
@@ -2909 +2863 @@
                 # Check if any panel has the same caption
                 has_newstring = data_panel.cb_plotpanel.FindString\
-                                                            (str(new_caption)) 
+                                                            (str(new_caption))
                 caption = new_caption
                 if has_newstring != wx.NOT_FOUND:
@@ -2915 +2869 @@
                     # Append nummber
                     inc = 1
+                    #FIXME: fix this terrible loop
                     while (1):
-                        caption = new_caption + '_%s'% str(inc)
+                        caption = new_caption + '_%s' % str(inc)
                         if caption not in captions:
                             break
                         inc += 1
                     # notify to users
-                    msg = "Found Same Title: Added '_%s'"% str(inc)
+                    msg = "Found Same Title: Added '_%s'" % str(inc)
                     wx.PostEvent(self, StatusEvent(status=msg))
                 # update data_panel cb
-                pos = data_panel.cb_plotpanel.FindString(str(old_caption)) 
+                pos = data_panel.cb_plotpanel.FindString(str(old_caption))
                 if pos != wx.NOT_FOUND:
                     data_panel.cb_plotpanel.SetString(pos, caption)
@@ -2931 +2886 @@
         pane_info.SetTitle(caption)
         return caption
-        
+
     def get_paneinfo(self, name):
         """
         Get pane Caption from window_name
-        
+
         :param name: window_name in AuiPaneInfo
         : return: AuiPaneInfo of the name
@@ -2943 +2898 @@
                 return panel.frame
         return None
-    
+
     def enable_undo(self):
         """
@@ -2950 +2905 @@
         if self.cpanel_on_focus is not None:
             self._toolbar.enable_undo(self.cpanel_on_focus)
-            
+
     def enable_redo(self):
         """
-        enable redo 
+        enable redo
         """
         if self.cpanel_on_focus is not None:
             self._toolbar.enable_redo(self.cpanel_on_focus)
-            
+
     def enable_copy(self):
         """
@@ -2964 +2919 @@
         if self.cpanel_on_focus is not None:
             self._toolbar.enable_copy(self.cpanel_on_focus)
-            
+
     def enable_paste(self):
         """
-        enable paste 
+        enable paste
         """
         if self.cpanel_on_focus is not None:
             self._toolbar.enable_paste(self.cpanel_on_focus)
-                       
+
     def enable_bookmark(self):
         """
-        Bookmark 
+        Bookmark
         """
         if self.cpanel_on_focus is not None:
             self._toolbar.enable_bookmark(self.cpanel_on_focus)
-            
+
     def enable_save(self):
         """
-        save 
+        save
         """
         if self.cpanel_on_focus is not None:
             self._toolbar.enable_save(self.cpanel_on_focus)
-            
+
     def enable_preview(self):
         """
-        preview 
+        preview
         """
         if self.cpanel_on_focus is not None:
             self._toolbar.enable_preview(self.cpanel_on_focus)
-            
+
     def enable_print(self):
         """
-        print 
+        print
         """
         if self.cpanel_on_focus is not None:
             self._toolbar.enable_print(self.cpanel_on_focus)
-            
+
     def enable_zoom(self):
         """
-        zoom 
+        zoom
         """
         if self.cpanel_on_focus is not None:
             self._toolbar.enable_zoom(self.panel_on_focus)
-            
+
     def enable_zoom_in(self):
         """
-        zoom in 
+        zoom in
         """
         if self.cpanel_on_focus is not None:
             self._toolbar.enable_zoom_in(self.panel_on_focus)
-            
+
     def enable_zoom_out(self):
         """
-        zoom out 
+        zoom out
         """
         if self.cpanel_on_focus is not None:
             self._toolbar.enable_zoom_out(self.panel_on_focus)
-            
+
     def enable_drag(self, event=None):
         """
-        drag 
+        drag
         """
         #Not implemeted
-            
+
     def enable_reset(self):
         """
@@ -3033 +2988 @@
         if self.cpanel_on_focus is not None:
             self._toolbar.enable_reset(self.panel_on_focus)
-            
+
     def get_toolbar_height(self):
         """
@@ -3042 +2997 @@
                 _, size_y = self.GetToolBar().GetSizeTuple()
         return size_y
-    
+
     def set_schedule_full_draw(self, panel=None, func='del'):
         """
         Add/subtract the schedule full draw list with the panel given
-        
+
         :param panel: plot panel
         :param func: append or del [string]
@@ -3054 +3009 @@
         if func == 'append':
             if not panel in self.schedule_full_draw_list:
-                self.schedule_full_draw_list.append(panel) 
+                self.schedule_full_draw_list.append(panel)
         # remove this panel from schedule list
         elif func == 'del':
@@ -3065 +3020 @@
             self.schedule = False
         else:
-            self.schedule = True    
-        
+            self.schedule = True
+
     def full_draw(self):
         """
         Draw the panels with axes in the schedule to full dwar list
         """
-        
+
         count = len(self.schedule_full_draw_list)
         #if not self.schedule:
@@ -3097 +3052 @@
                 # while any panel is capture.
                 frame = panel.frame
-                
+
                 if not frame.GetCapture():
                     # draw if possible
@@ -3105 +3060 @@
                 # Check if the panel is not shown
                 flag = frame.IsShown()
-                frame.Show(flag)  
+                frame.Show(flag)
             except:
                 pass
-     
+
         # Draw all panels 
         if count == 1:
-            f_draw(self.schedule_full_draw_list[0])  
+            f_draw(self.schedule_full_draw_list[0])
         else:
             map(f_draw, self.schedule_full_draw_list)
@@ -3119 +3074 @@
         else:
             self.set_schedule(True)
-        
-    def set_schedule(self, schedule=False):  
+
+    def set_schedule(self, schedule=False):
         """
         Set schedule
         """
         self.schedule = schedule
-                
-    def get_schedule(self):  
+
+    def get_schedule(self):
         """
         Get schedule
         """
         return self.schedule
-    
+
     def on_set_plot_focus(self, panel):
         """
@@ -3139 +3094 @@
             return
         #self.set_plot_unfocus()
-        panel.on_set_focus(None)  
+        panel.on_set_focus(None)
         # set focusing panel
-        self.panel_on_focus = panel  
+        self.panel_on_focus = panel
         self.set_panel_on_focus(None)
 
-    def set_plot_unfocus(self): 
+    def set_plot_unfocus(self):
         """
         Un focus all plot panels
@@ -3150 +3105 @@
         for plot in self.plot_panels.values():
             plot.on_kill_focus(None)
-    
+
     def get_window_size(self):
         """
-        Get window size 
-        
+        Get window size
+
         :return size: tuple
         """
@@ -3163 +3118 @@
                 height -= 45
         return (width, height)
-            
+
     def _onDrawIdle(self, *args, **kwargs):
         """
@@ -3175 +3130 @@
         except:
             pass
-            
+
         # restart idle        
         self._redraw_idle(*args, **kwargs)
 
-            
+
     def _redraw_idle(self, *args, **kwargs):
         """
@@ -3185 +3140 @@
         """
         # restart idle   
-        self.idletimer.Restart(100*TIME_FACTOR, *args, **kwargs)
-
-        
+        self.idletimer.Restart(100 * TIME_FACTOR, *args, **kwargs)
+
+
 class DefaultPanel(wx.Panel, PanelBase):
     """
@@ -3202 +3157 @@
         wx.Panel.__init__(self, parent, *args, **kwds)
         PanelBase.__init__(self, parent)
-    
+
 
 
@@ -3213 +3168 @@
         When initialised
         """
-        pos, size, self.is_max = self.window_placement((GUIFRAME_WIDTH, 
-                                           GUIFRAME_HEIGHT))     
-        self.frame = ViewerFrame(parent=None, 
-                             title=APPLICATION_NAME, 
-                             pos=pos, 
-                             gui_style = DEFAULT_STYLE,
-                             size=size)
+        pos, size, self.is_max = self.window_placement((GUIFRAME_WIDTH,
+                                                        GUIFRAME_HEIGHT))
+        self.frame = ViewerFrame(parent=None,
+                                 title=APPLICATION_NAME,
+                                 pos=pos,
+                                 gui_style=DEFAULT_STYLE,
+                                 size=size)
         self.frame.Hide()
         if not IS_WIN:
@@ -3234 +3189 @@
         try:
             if os.path.isfile(SPLASH_SCREEN_PATH):
-                self.s_screen = self.display_splash_screen(parent=self.frame, 
-                                        path=SPLASH_SCREEN_PATH)
+                self.s_screen = self.display_splash_screen(parent=self.frame,
+                                                           path=SPLASH_SCREEN_PATH)
             else:
-                self.frame.Show()   
+                self.frame.Show()
         except:
             if self.s_screen is not None:
                 self.s_screen.Close()
             msg = "Cannot display splash screen\n"
-            msg += str (sys.exc_value)
+            msg += str(sys.exc_value)
             logging.error(msg)
             self.frame.Show()
 
         self.SetTopWindow(self.frame)
-  
+
         return True
-    
+
     def maximize_win(self):
         """
@@ -3266 +3221 @@
         if len(sys.argv) >= 2:
             cmd = sys.argv[0].lower()
-            basename  = os.path.basename(cmd)
+            basename = os.path.basename(cmd)
             app_base = str(APPLICATION_NAME).lower()
             if os.path.isfile(cmd) or basename.lower() == app_base:
@@ -3274 +3229 @@
                 if basename.lower() in [app_py, app_exe, app_app, app_base]:
                     data_base = sys.argv[1]
-                    input_file = os.path.normpath(os.path.join(DATAPATH, 
+                    input_file = os.path.normpath(os.path.join(DATAPATH,
                                                                data_base))
         if input_file is None:
@@ -3280 +3235 @@
         if self.frame is not None:
             self.frame.set_input_file(input_file=input_file)
-         
-    def clean_plugin_models(self, path): 
+
+    def clean_plugin_models(self, path):
         """
         Delete plugin models  in app folder
-        
+
         :param path: path of the plugin_models folder in app
         """
         # do it only the first time app loaded
-        # delete unused model folder    
+        # delete unused model folder
         model_folder = os.path.join(PATH_APP, path)
         if os.path.exists(model_folder) and os.path.isdir(model_folder):
@@ -3300 +3255 @@
                     logging.error("gui_manager.clean_plugin_models:\n  %s" \
                                   % sys.exc_value)
-              
+
     def set_manager(self, manager):
         """
         Sets a reference to the application manager
-        of the GUI manager (Frame) 
+        of the GUI manager (Frame)
         """
         self.frame.set_manager(manager)
-        
+
     def build_gui(self):
         """
@@ -3318 +3273 @@
             raise
         self.frame.build_gui()
-        
+
     def set_welcome_panel(self, panel_class):
         """
         Set the welcome panel
-        
+
         :param panel_class: class of the welcome panel to be instantiated
-        
+
         """
         self.frame.welcome_panel_class = panel_class
-        
+
     def add_perspective(self, perspective):
         """
@@ -3333 +3288 @@
         """
         self.frame.add_perspective(perspective)
-    
+
     def window_placement(self, size):
         """
@@ -3350 +3305 @@
                 displayRect = screen.GetClientArea()
                 break
-        
-        posX, posY, displayWidth, displayHeight = displayRect        
+
+        posX, posY, displayWidth, displayHeight = displayRect
         customWidth, customHeight = size
-        
+
         # If the custom size is default, set 90% of the screen size
         if customWidth <= 0 and customHeight <= 0:
@@ -3367 +3322 @@
             if customHeight > displayHeight:
                 customHeight = displayHeight
-            
+
         # Note that when running Linux and using an Xming (X11) server on a PC
         # with a dual  monitor configuration, the reported display size may be
@@ -3374 +3329 @@
         # screen 'too big'.  If so, we assume a smaller width which means the
         # application will be placed towards the left hand side of the screen.
-        
+
         # If dual screen registered as 1 screen. Make width half.
         # MAC just follows the default behavior of pos
         if IS_WIN:
-            if displayWidth > (displayHeight*2):
-                if (customWidth == displayWidth):
-                    customWidth = displayWidth/2
+            if displayWidth > (displayHeight * 2):
+                if customWidth == displayWidth:
+                    customWidth = displayWidth / 2
                 # and set the position to be the corner of the screen.
                 posX = 0
                 posY = 0
-                
+
             # Make the position the middle of the screen. (Not 0,0)
             else:
-                posX = (displayWidth - customWidth)/2
-                posY = (displayHeight - customHeight)/2
-        # Return the suggested position and size for the application frame.    
+                posX = (displayWidth - customWidth) / 2
+                posY = (displayHeight - customHeight) / 2
+        # Return the suggested position and size for the application frame.
         return (posX, posY), (customWidth, customHeight), is_maximized
 
-    
-    def display_splash_screen(self, parent, 
+
+    def display_splash_screen(self, parent,
                               path=SPLASH_SCREEN_PATH):
         """Displays the splash screen.  It will exactly cover the main frame."""
-       
+
         # Prepare the picture.  On a 2GHz intel cpu, this takes about a second.
         image = wx.Image(path, wx.BITMAP_TYPE_PNG)
-        image.Rescale(SPLASH_SCREEN_WIDTH, 
+        image.Rescale(SPLASH_SCREEN_WIDTH,
                       SPLASH_SCREEN_HEIGHT, wx.IMAGE_QUALITY_HIGH)
         bm = image.ConvertToBitmap()
@@ -3413 +3368 @@
         # case the splash screen disappears upon entering the event loop.
         s_screen = wx.SplashScreen(bitmap=bm,
-                                   splashStyle=(wx.SPLASH_TIMEOUT|
+                                   splashStyle=(wx.SPLASH_TIMEOUT |
                                                 wx.SPLASH_CENTRE_ON_SCREEN),
-                                   style=(wx.SIMPLE_BORDER|
-                                          wx.FRAME_NO_TASKBAR|
+                                   style=(wx.SIMPLE_BORDER |
+                                          wx.FRAME_NO_TASKBAR |
                                           wx.FRAME_FLOAT_ON_PARENT),
                                    milliseconds=SS_MAX_DISPLAY_TIME,
@@ -3427 +3382 @@
         s_screen.Show()
         return s_screen
-        
-        
+
+
     def on_close_splash_screen(self, event):
         """
@@ -3442 +3397 @@
     Frame for panels
     """
-    def __init__(self, parent, panel, title="Untitled", size=(300,200)):
+    def __init__(self, parent, panel, title="Untitled", size=(300, 200)):
         """
         comment
@@ -3456 +3411 @@
             self.set_panel(panel)
         self.Show(False)
-    
+
     def show_data_panel(self, action):
         """
         """
         self.parent.show_data_panel(action)
-        
+
     def set_panel(self, panel):
         """
@@ -3471 +3426 @@
         width, height = self.parent._get_panels_size(panel)
         if hasattr(panel, "CENTER_PANE") and panel.CENTER_PANE:
-            width *= 0.6  
+            width *= 0.6
         self.SetSize((width, height))
         self.parent.put_icon(self)
@@ -3477 +3432 @@
         self.Bind(wx.EVT_CLOSE, self.OnClose)
         self.Show(False)
-    
+
     def set_panel_focus(self, event):
         """
@@ -3484 +3439 @@
             self.panel.SetFocus()
             self.parent.panel_on_focus = self.panel
-        
+
     def OnClose(self, event):
         """
@@ -3490 +3445 @@
         """
         self.panel.on_close(event)
-        
-if __name__ == "__main__": 
+
+if __name__ == "__main__":
     app = ViewApp(0)
     app.MainLoop()

src/sas/guiframe/config.py

@@ -31 +31 @@
 '''If you found this software useful to your work please remember to acknowledge 
 its use in your publications as suggested below and reference the SasView website: 
-http://www.sasview.org/index.html. Please also consider letting us know by sending us the 
+http://www.sasview.org/. Please also consider letting us know by sending us the 
 reference to your work. This will help us to ensure the long term support and 
 development of the software.
 '''
 _acknowledgement_publications = \
-'''This work originally developed as part of the DANSE project funded by the NSF
-under grant DMR-0520547, and currently maintained by NIST, UMD, ORNL, ISIS, ESS 
+'''This work benefited from software developed by the DANSE project under NSF 
+award DMR-0520547 and currently maintained by NIST, UMD, ORNL, ISIS, ESS 
 and ILL.
 '''