Changeset 2387abc in sasview for src/sas/sasgui/guiframe

Timestamp:

Aug 19, 2016 11:02:55 AM (8 years ago)

Author:

lewis

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, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

6f343e3

Parents:

32c5983 (diff), 45d7662 (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 branch 'master' into corfunc

Location:

src/sas/sasgui/guiframe

Files:

• data_panel.py (modified) (101 diffs)
• local_perspectives/data_loader/data_loader.py (modified) (3 diffs)
• local_perspectives/plotting/Plotter1D.py (modified) (5 diffs)
• media/data_explorer_help.rst (modified) (2 diffs)
• media/graph_help.rst (modified) (28 diffs)

src/sas/sasgui/guiframe/data_panel.py

@@ -2 +2 @@
 #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.txt
@@ -41 +41 @@
         as QucikPlotDialog
 import sas.sasgui.guiframe.config as config
- 
+
 extension_list = []
 if config.APPLICATION_STATE_EXTENSION is not None:
     extension_list.append(config.APPLICATION_STATE_EXTENSION)
-EXTENSIONS = config.PLUGIN_STATE_EXTENSIONS + extension_list   
+EXTENSIONS = config.PLUGIN_STATE_EXTENSIONS + extension_list
 PLUGINS_WLIST = config.PLUGINS_WLIST
 APPLICATION_WLIST = config.APPLICATION_WLIST
 
-#Control panel width 
+#Control panel width
 if sys.platform.count("win32") > 0:
     PANEL_WIDTH = 235
@@ -67 +67 @@
 STYLE_FLAG = wx.RAISED_BORDER|CT.TR_HAS_BUTTONS| CT.TR_HIDE_ROOT|\
                     wx.WANTS_CHARS|CT.TR_HAS_VARIABLE_ROW_HEIGHT
-                    
-                    
+
+
 class DataTreeCtrl(CT.CustomTreeCtrl):
     """
@@ -97 +97 @@
                     CT.CustomTreeCtrl.__init__(self, parent, *args, **kwds)
         self.root = self.AddRoot("Available Data")
-                   
+
     def OnCompareItems(self, item1, item2):
-        """ 
-        Overrides OnCompareItems in wx.TreeCtrl. 
-        Used by the SortChildren method. 
+        """
+        Overrides OnCompareItems in wx.TreeCtrl.
+        Used by the SortChildren method.
         """
         # Get the item data
@@ -113 +113 @@
         else:
             return 0
-        
+
 class DataPanel(ScrolledPanel, PanelBase):
     """
-    This panel displays data available in the application and widgets to 
+    This panel displays data available in the application and widgets to
     interact with data.
     """
@@ -123 +123 @@
     ## Title to appear on top of the window
     window_caption = "Data Explorer"
-    #type of window 
+    #type of window
     window_type = "Data Panel"
     ## Flag to tell the GUI manager that this panel is not
     #  tied to any perspective
     #ALWAYS_ON = True
-    def __init__(self, parent, 
+    def __init__(self, parent,
                  list=None,
                  size=(PANEL_WIDTH, PANEL_HEIGHT),
@@ -138 +138 @@
         PanelBase.__init__(self, parent)
         self.SetupScrolling()
-        #Set window's font size 
+        #Set window's font size
         self.SetWindowVariant(variant=FONT_VARIANT)
-        self.loader = Loader()  
+        self.loader = Loader()
         #Default location
-        self._default_save_location = None  
+        self._default_save_location = None
         self.all_data1d = True
         self.parent = parent.parent
@@ -188 +188 @@
         if self.parent is not None:
             self.parent.Bind(EVT_DELETE_PLOTPANEL, self._on_delete_plot_panel)
-     
+
     def do_layout(self):
         """
@@ -198 +198 @@
         self.layout_batch()
         self.layout_button()
-        
+
     def disable_app_combo(self, enable):
         """
@@ -204 +204 @@
         """
         self.perspective_cbox.Enable(enable)
-        
+
     def define_panel_structure(self):
         """
@@ -213 +213 @@
         self.sizer1 = wx.BoxSizer(wx.VERTICAL)
         self.sizer1.SetMinSize(wx.Size(w/13, h*2/5))
-      
+
         self.sizer2 = wx.BoxSizer(wx.VERTICAL)
         self.sizer3 = wx.FlexGridSizer(9, 2, 4, 1)
         self.sizer4 = wx.BoxSizer(wx.VERTICAL)
         self.sizer5 = wx.BoxSizer(wx.VERTICAL)
-       
+
         self.vbox.Add(self.sizer5, 0, wx.EXPAND|wx.ALL, 1)
         self.vbox.Add(self.sizer1, 1, wx.EXPAND|wx.ALL, 0)
@@ -224 +224 @@
         self.vbox.Add(self.sizer3, 0, wx.EXPAND|wx.ALL, 10)
         #self.vbox.Add(self.sizer4, 0, wx.EXPAND|wx.ALL,5)
-        
+
         self.SetSizer(self.vbox)
-        
+
     def layout_selection(self):
         """
@@ -244 +244 @@
         self.selection_cbox.SetValue('Select all Data')
         wx.EVT_COMBOBOX(self.selection_cbox, -1, self._on_selection_type)
-        self.sizer5.AddMany([(select_txt, 0, wx.ALL, 5), 
+        self.sizer5.AddMany([(select_txt, 0, wx.ALL, 5),
                             (self.selection_cbox, 0, wx.ALL,5)])
         self.enable_selection()
-        
-    
+
+
     def _on_selection_type(self, event):
         """
@@ -254 +254 @@
             :param event: UI event
         """
+        def check_item_and_children(control, check_value=True):
+            self.tree_ctrl.CheckItem(data_ctrl, check_value)
+            if data_ctrl.HasChildren():
+                if check_value == True and not control.IsExpanded():
+                    # Only select children if control is expanded
+                    # Always deselect children, regardless (see ticket #259)
+                    return
+                for child_ctrl in data_ctrl.GetChildren():
+                    self.tree_ctrl.CheckItem(child_ctrl, check_value)
+
         option = self.selection_cbox.GetValue()
-        
+
         pos = self.selection_cbox.GetSelection()
         if pos == wx.NOT_FOUND:
-            return 
+            return
         option = self.selection_cbox.GetString(pos)
         for item in self.list_cb_data.values():
             data_ctrl, _, _, _, _, _, _, _ = item
-            _, data_class, _ = self.tree_ctrl.GetItemPyData(data_ctrl) 
+            _, data_class, _ = self.tree_ctrl.GetItemPyData(data_ctrl)
             if option == 'Select all Data':
-                self.tree_ctrl.CheckItem(data_ctrl, True) 
+                check_item_and_children(data_ctrl, check_value=True)
             elif option == 'Unselect all Data':
-                self.tree_ctrl.CheckItem(data_ctrl, False)
+                check_item_and_children(data_ctrl, check_value=False)
             elif option == 'Select all Data 1D':
                 if data_class == 'Data1D':
-                    self.tree_ctrl.CheckItem(data_ctrl, True) 
+                    check_item_and_children(data_ctrl, check_value=True)
             elif option == 'Unselect all Data 1D':
                 if data_class == 'Data1D':
-                    self.tree_ctrl.CheckItem(data_ctrl, False) 
-            elif option == 'Select all Data 1D':
-                if data_class == 'Data1D':
-                    self.tree_ctrl.CheckItem(data_ctrl, True) 
+                    check_item_and_children(data_ctrl, check_value=False)
             elif option == 'Select all Data 2D':
                 if data_class == 'Data2D':
-                    self.tree_ctrl.CheckItem(data_ctrl, True) 
+                    check_item_and_children(data_ctrl, check_value=True)
             elif option == 'Unselect all Data 2D':
                 if data_class == 'Data2D':
-                    self.tree_ctrl.CheckItem(data_ctrl, False) 
+                    check_item_and_children(data_ctrl, check_value=False)
         self.enable_append()
         self.enable_freeze()
@@ -287 +294 @@
         self.enable_import()
         self.enable_remove()
-               
+
     def layout_button(self):
         """
@@ -293 +300 @@
         """
         #Load Data Button
-        self.bt_add = wx.Button(self, wx.NewId(), "Load Data", 
+        self.bt_add = wx.Button(self, wx.NewId(), "Load Data",
                                 size=(BUTTON_WIDTH, -1))
         self.bt_add.SetToolTipString("Load data files")
         wx.EVT_BUTTON(self, self.bt_add.GetId(), self._load_data)
-        
+
         #Delete Data Button
         self.bt_remove = wx.Button(self, wx.NewId(), "Delete Data",
@@ -303 +310 @@
         self.bt_remove.SetToolTipString("Delete data from the application")
         wx.EVT_BUTTON(self, self.bt_remove.GetId(), self.on_remove)
-        
+
         #Send data to perspective button
         self.bt_import = wx.Button(self, wx.NewId(), "Send To",
@@ -309 +316 @@
         self.bt_import.SetToolTipString("Send Data set to active perspective")
         wx.EVT_BUTTON(self, self.bt_import.GetId(), self.on_import)
-        
+
         #Choose perspective to be send data to combo box
         self.perspective_cbox = wx.ComboBox(self, -1,
@@ -315 +322 @@
         if not IS_MAC:
             self.perspective_cbox.SetMinSize((BUTTON_WIDTH*1.6, -1))
-        wx.EVT_COMBOBOX(self.perspective_cbox, -1, 
+        wx.EVT_COMBOBOX(self.perspective_cbox, -1,
                         self._on_perspective_selection)
-    
+
         #Append data to current Graph Button
         self.bt_append_plot = wx.Button(self, wx.NewId(), "Append Plot To",
@@ -324 +331 @@
                                 "Plot the selected data in the active panel")
         wx.EVT_BUTTON(self, self.bt_append_plot.GetId(), self.on_append_plot)
-        
+
         #Create a new graph and send data to that new graph button
-        self.bt_plot = wx.Button(self, wx.NewId(), "New Plot", 
+        self.bt_plot = wx.Button(self, wx.NewId(), "New Plot",
                                  size=(BUTTON_WIDTH, -1))
         self.bt_plot.SetToolTipString("To trigger plotting")
         wx.EVT_BUTTON(self, self.bt_plot.GetId(), self.on_plot)
-        
+
         #Freeze current theory button - becomes a data set and stays on graph
-        self.bt_freeze = wx.Button(self, wx.NewId(), "Freeze Theory", 
+        self.bt_freeze = wx.Button(self, wx.NewId(), "Freeze Theory",
                                    size=(BUTTON_WIDTH, -1))
         freeze_tip = "To trigger freeze a theory: making a copy\n"
@@ -339 +346 @@
         self.bt_freeze.SetToolTipString(freeze_tip)
         wx.EVT_BUTTON(self, self.bt_freeze.GetId(), self.on_freeze)
-       
+
         #select plot to send to combo box (blank if no data)
         if sys.platform == 'darwin':
-            self.cb_plotpanel = wx.ComboBox(self, -1, 
+            self.cb_plotpanel = wx.ComboBox(self, -1,
                                             style=wx.CB_READONLY)
         else:
-            self.cb_plotpanel = wx.ComboBox(self, -1, 
+            self.cb_plotpanel = wx.ComboBox(self, -1,
                                             style=wx.CB_READONLY|wx.CB_SORT)
         wx.EVT_COMBOBOX(self.cb_plotpanel, -1, self._on_plot_selection)
         self.cb_plotpanel.Disable()
-        
+
         #Help button
         self.bt_help = wx.Button(self, wx.NewId(), "HELP",
@@ -365 +372 @@
                              ((10, 10)),
                              (self.bt_append_plot),
-                             (self.cb_plotpanel, 
+                             (self.cb_plotpanel,
                               wx.EXPAND|wx.ADJUST_MINSIZE, 5),
                              ((5, 5)),
                              ((5, 5)),
                              (self.bt_import, 0, wx.EXPAND|wx.RIGHT, 5),
-                             (self.perspective_cbox, 
+                             (self.perspective_cbox,
                               wx.EXPAND|wx.ADJUST_MINSIZE, 5),
                              ((10, 10)),
@@ -385 +392 @@
         self.enable_freeze()
         self.enable_remove_plot()
-        
+
     def layout_batch(self):
         """
@@ -397 +404 @@
         self.Bind(wx.EVT_RADIOBUTTON, self.on_batch_mode,
                    id=self.rb_batch_mode.GetId())
-        
+
         self.rb_single_mode.SetValue(not self.parent.batch_on)
         self.rb_batch_mode.SetValue(self.parent.batch_on)
         self.sizer4.AddMany([(self.rb_single_mode, 0, wx.ALL, 4),
                              (self.rb_batch_mode, 0, wx.ALL, 4)])
-        
+
     def on_single_mode(self, event):
         """
@@ -410 +417 @@
         if self.parent is not None:
             wx.PostEvent(self.parent, NewBatchEvent(enable=False))
-       
+
     def on_batch_mode(self, event):
         """
@@ -417 +424 @@
         """
         if self.parent is not None:
-            wx.PostEvent(self.parent, 
+            wx.PostEvent(self.parent,
                          NewBatchEvent(enable=True))
-    
-    def _get_data_selection(self, event):  
+
+    def _get_data_selection(self, event):
         """
             Get data selection from the right click
@@ -435 +442 @@
             data = theory_list.values()[0][0]
         return data
-    
+
     def on_edit_data(self, event):
         """
@@ -443 +450 @@
         from sas.sasgui.guiframe.local_perspectives.plotting.masking \
             import MaskPanel as MaskDialog
-        
-        panel = MaskDialog(parent=self.parent, base=self, 
+
+        panel = MaskDialog(parent=self.parent, base=self,
                            data=data, id=wx.NewId())
         panel.ShowModal()
-    
+
     def on_plot_3d(self, event):
         """
@@ -455 +462 @@
         from sas.sasgui.guiframe.local_perspectives.plotting.masking \
         import FloatPanel as Float3dDialog
-        
-        panel = Float3dDialog(base=self, data=data, 
+
+        panel = Float3dDialog(base=self, data=data,
                               dimension=3, id=wx.NewId())
-        panel.ShowModal()   
-    
+        panel.ShowModal()
+
     def on_quick_plot(self, event):
         """
@@ -468 +475 @@
             dimension = 2
         else:
-            dimension = 1 
-        #panel = QucikPlotDialog(base=self, data=data, 
+            dimension = 1
+        #panel = QucikPlotDialog(base=self, data=data,
         #                        dimension=dimension, id=wx.NewId())
         frame = QucikPlotDialog(self, -1, "Plot " + data.name, 'log_{10}')
@@ -477 +484 @@
         frame.Show(True)
         frame.SetFocus()
-        #panel.ShowModal()    
-    
+        #panel.ShowModal()
+
     def on_data_info(self, event):
         """
@@ -488 +495 @@
         else:
             self.parent.show_data1d(data, data.name)
-        
+
     def on_save_as(self, event):
         """
@@ -506 +513 @@
             else:
                 print "unable to save this type of data"
-        
+
     def layout_data_list(self):
         """
@@ -523 +530 @@
         self.data_menu.Append(id, name, msg)
         wx.EVT_MENU(self, id, self.on_data_info)
-        
+
         id = wx.NewId()
         name = "Save As"
@@ -529 +536 @@
         self.data_menu.Append(id, name, msg)
         wx.EVT_MENU(self, id, self.on_save_as)
-    
+
         quickplot_id = wx.NewId()
         name = "Quick Plot"
@@ -535 +542 @@
         self.data_menu.Append(quickplot_id, name, msg)
         wx.EVT_MENU(self, quickplot_id, self.on_quick_plot)
-        
+
         self.plot3d_id = wx.NewId()
         name = "Quick 3DPlot (Slow)"
@@ -541 +548 @@
         self.data_menu.Append(self.plot3d_id, name, msg)
         wx.EVT_MENU(self, self.plot3d_id, self.on_plot_3d)
-            
+
         self.editmask_id = wx.NewId()
         name = "Edit Mask"
@@ -547 +554 @@
         self.data_menu.Append(self.editmask_id, name, msg)
         wx.EVT_MENU(self, self.editmask_id, self.on_edit_data)
-        
+
         tree_ctrl_theory_label = wx.StaticText(self, -1, "Theory")
         tree_ctrl_theory_label.SetForegroundColour('blue')
-        self.tree_ctrl_theory = DataTreeCtrl(parent=self, 
+        self.tree_ctrl_theory = DataTreeCtrl(parent=self,
                                                     style=wx.SUNKEN_BORDER)
-        self.tree_ctrl_theory.Bind(CT.EVT_TREE_ITEM_CHECKING, 
+        self.tree_ctrl_theory.Bind(CT.EVT_TREE_ITEM_CHECKING,
                                                     self.on_check_item)
-        self.tree_ctrl_theory.Bind(CT.EVT_TREE_ITEM_MENU, 
+        self.tree_ctrl_theory.Bind(CT.EVT_TREE_ITEM_MENU,
                                    self.on_right_click_theory)
         self.sizer1.Add(tree_ctrl_label, 0, wx.LEFT, 10)
@@ -560 +567 @@
         self.sizer1.Add(tree_ctrl_theory_label, 0,  wx.LEFT, 10)
         self.sizer1.Add(self.tree_ctrl_theory, 1, wx.EXPAND|wx.ALL, 10)
-           
+
     def on_right_click_theory(self, event):
         """
@@ -575 +582 @@
             self.data_menu.Enable(self.editmask_id, False)
             self.data_menu.Enable(self.plot3d_id, menu_enable)
-            self.PopupMenu(self.data_menu) 
-                   
+            self.PopupMenu(self.data_menu)
+
     def on_right_click_data(self, event):
         """
@@ -596 +603 @@
             self.data_menu.Enable(self.editmask_id, maskmenu_enable)
             self.data_menu.Enable(self.plot3d_id, menu_enable)
-            self.PopupMenu(self.data_menu) 
-        
-    def onContextMenu(self, event): 
+            self.PopupMenu(self.data_menu)
+
+    def onContextMenu(self, event):
         """
         Retrieve the state selected state
@@ -606 +613 @@
         pos = event.GetPosition()
         pos = self.ScreenToClient(pos)
-        self.PopupMenu(self.popUpMenu, pos) 
-      
-  
+        self.PopupMenu(self.popUpMenu, pos)
+
+
     def on_check_item(self, event):
         """
@@ -614 +621 @@
         """
         item = event.GetItem()
-        item.Check(not item.IsChecked()) 
+        item.Check(not item.IsChecked())
         self.enable_append()
         self.enable_freeze()
@@ -621 +628 @@
         self.enable_remove()
         event.Skip()
-        
+
     def fill_cbox_analysis(self, plugin):
         """
@@ -635 +642 @@
                 if plug.get_perspective():
                     self.perspective_cbox.Append(plug.sub_menu, plug)
-            
+
             curr_pers = self.parent.get_current_perspective()
             if curr_pers:
                 self.perspective_cbox.SetStringSelection(curr_pers.sub_menu)
                 self.enable_import()
-                        
+
     def load_data_list(self, list):
         """
@@ -654 +661 @@
                     data_run = str(data.run)
                     data_class = data.__class__.__name__
-                    path = dstate.get_path() 
+                    path = dstate.get_path()
                     process_list = data.process
                     data_id = data.id
@@ -661 +668 @@
                         #new state
                         data_c = self.tree_ctrl.InsertItem(self.tree_ctrl.root,
-                                        0, data_name, ct_type=1, 
+                                        0, data_name, ct_type=1,
                                         data=(data_id, data_class, state_id))
                         data_c.Check(True)
                         d_i_c = self.tree_ctrl.AppendItem(data_c, 'Info')
-                        d_t_c = self.tree_ctrl.AppendItem(d_i_c, 
+                        d_t_c = self.tree_ctrl.AppendItem(d_i_c,
                                                       'Title: %s' % data_title)
-                        r_n_c = self.tree_ctrl.AppendItem(d_i_c, 
+                        r_n_c = self.tree_ctrl.AppendItem(d_i_c,
                                                       'Run: %s' % data_run)
-                        i_c_c = self.tree_ctrl.AppendItem(d_i_c, 
+                        i_c_c = self.tree_ctrl.AppendItem(d_i_c,
                                                       'Type: %s' % data_class)
                         p_c_c = self.tree_ctrl.AppendItem(d_i_c,
                                                       "Path: '%s'" % s_path)
                         d_p_c = self.tree_ctrl.AppendItem(d_i_c, 'Process')
-                        
+
                         for process in process_list:
                             process_str = str(process).replace('\n',' ')
@@ -680 +687 @@
                                 process_str = process_str[:20]+' [...]'
                             self.tree_ctrl.AppendItem(d_p_c, process_str)
-                        theory_child = self.tree_ctrl.AppendItem(data_c, 
+                        theory_child = self.tree_ctrl.AppendItem(data_c,
                                                                  "THEORIES")
-                        self.list_cb_data[state_id] = [data_c, 
+                        self.list_cb_data[state_id] = [data_c,
                                                        d_i_c,
                                                        d_t_c,
@@ -695 +702 @@
                         data_c, d_i_c, d_t_c, r_n_c,  i_c_c, p_c_c, d_p_c, _ \
                                 = data_ctrl_list
-                        self.tree_ctrl.SetItemText(data_c, data_name) 
+                        self.tree_ctrl.SetItemText(data_c, data_name)
                         temp = (data_id, data_class, state_id)
-                        self.tree_ctrl.SetItemPyData(data_c, temp) 
-                        self.tree_ctrl.SetItemText(i_c_c, 
+                        self.tree_ctrl.SetItemPyData(data_c, temp)
+                        self.tree_ctrl.SetItemText(i_c_c,
                                                    'Type: %s' % data_class)
-                        self.tree_ctrl.SetItemText(p_c_c, 
-                                                   'Path: %s' % s_path) 
-                        self.tree_ctrl.DeleteChildren(d_p_c) 
+                        self.tree_ctrl.SetItemText(p_c_c,
+                                                   'Path: %s' % s_path)
+                        self.tree_ctrl.DeleteChildren(d_p_c)
                         for process in process_list:
                             if not process.is_empty():
@@ -710 +717 @@
             # Sort by data name
             if self.tree_ctrl.root:
-                self.tree_ctrl.SortChildren(self.tree_ctrl.root)    
+                self.tree_ctrl.SortChildren(self.tree_ctrl.root)
         self.enable_remove()
         self.enable_import()
@@ -716 +723 @@
         self.enable_freeze()
         self.enable_selection()
-        
+
     def _uncheck_all(self):
         """
@@ -723 +730 @@
         for item in self.list_cb_data.values():
             data_ctrl, _, _, _, _, _, _, _ = item
-            self.tree_ctrl.CheckItem(data_ctrl, False) 
+            self.tree_ctrl.CheckItem(data_ctrl, False)
         self.enable_append()
         self.enable_freeze()
@@ -729 +736 @@
         self.enable_import()
         self.enable_remove()
-   
+
     def append_theory(self, state_id, theory_list):
         """
@@ -736 +743 @@
         """
         if not theory_list:
-            return 
+            return
         if state_id not in self.list_cb_data.keys():
             root = self.tree_ctrl_theory.root
@@ -746 +753 @@
             tree = self.tree_ctrl
         if root is not None:
-            wx.CallAfter(self.append_theory_helper, tree=tree, root=root, 
-                                       state_id=state_id, 
+            wx.CallAfter(self.append_theory_helper, tree=tree, root=root,
+                                       state_id=state_id,
                                        theory_list=theory_list)
-      
-      
+
+
     def append_theory_helper(self, tree, root, state_id, theory_list):
         """
@@ -778 +785 @@
                                                     name, ct_type=1, data=temp)
                     t_i_c = tree.AppendItem(t_child, 'Info')
-                    i_c_c = tree.AppendItem(t_i_c, 
+                    i_c_c = tree.AppendItem(t_i_c,
                                                   'Type: %s' % theory_class)
                     t_p_c = tree.AppendItem(t_i_c, 'Process')
-                    
+
                     for process in theory_data.process:
                         tree.AppendItem(t_p_c, process.__str__())
-                    theory_list_ctrl[theory_id] = [t_child, 
-                                                   i_c_c, 
+                    theory_list_ctrl[theory_id] = [t_child,
+                                                   i_c_c,
                                                    t_p_c]
                 else:
                     #replace theory
                     t_child, i_c_c, t_p_c = theory_list_ctrl[theory_id]
-                    tree.SetItemText(t_child, name) 
-                    tree.SetItemPyData(t_child, temp) 
-                    tree.SetItemText(i_c_c, 'Type: %s' % theory_class) 
-                    tree.DeleteChildren(t_p_c) 
+                    tree.SetItemText(t_child, name)
+                    tree.SetItemPyData(t_child, temp)
+                    tree.SetItemText(i_c_c, 'Type: %s' % theory_class)
+                    tree.DeleteChildren(t_p_c)
                     for process in theory_data.process:
                         tree.AppendItem(t_p_c, process.__str__())
-              
+
         else:
             #data didn't have a theory associated it before
@@ -807 +814 @@
                     theory_id = theory_data.id
                     #if theory_state is not None:
-                    #    name = theory_state.model.name 
+                    #    name = theory_state.model.name
                     temp = (theory_id, theory_class, state_id)
                     t_child = tree.AppendItem(root,
-                            name, ct_type=1, 
+                            name, ct_type=1,
                             data=(theory_data.id, theory_class, state_id))
                     t_i_c = tree.AppendItem(t_child, 'Info')
-                    i_c_c = tree.AppendItem(t_i_c, 
+                    i_c_c = tree.AppendItem(t_i_c,
                                                   'Type: %s' % theory_class)
                     t_p_c = tree.AppendItem(t_i_c, 'Process')
-                    
+
                     for process in theory_data.process:
                         tree.AppendItem(t_p_c, process.__str__())
-            
+
                     theory_list_ctrl[theory_id] = [t_child, i_c_c, t_p_c]
                 #self.list_cb_theory[data_id] = theory_list_ctrl
                 self.list_cb_theory[state_id] = theory_list_ctrl
-        
-            
-   
+
+
+
     def set_data_helper(self):
         """
@@ -840 +847 @@
                 if state_id not in state_to_plot:
                     state_to_plot.append(state_id)
-           
+
         for theory_dict in self.list_cb_theory.values():
             for _, value in theory_dict.iteritems():
@@ -850 +857 @@
                         state_to_plot.append(state_id)
         return data_to_plot, theory_to_plot, state_to_plot
-    
+
     def remove_by_id(self, id):
         """
@@ -857 +864 @@
         for item in self.list_cb_data.values():
             data_c, _, _, _, _, _,  _, _ = item
-            data_id, _, state_id = self.tree_ctrl.GetItemPyData(data_c) 
+            data_id, _, state_id = self.tree_ctrl.GetItemPyData(data_c)
             if id == data_id:
                 self.tree_ctrl.Delete(data_c)
                 del self.list_cb_data[state_id]
                 del self.list_cb_theory[data_id]
-              
+
     def load_error(self, error=None):
         """
         Pop up an error message.
-        
+
         :param error: details error message to be displayed
         """
         if error is not None or str(error).strip() != "":
-            dial = wx.MessageDialog(self.parent, str(error), 
+            dial = wx.MessageDialog(self.parent, str(error),
                                     'Error Loading File',
                                     wx.OK | wx.ICON_EXCLAMATION)
-            dial.ShowModal()  
-        
+            dial.ShowModal()
+
     def _load_data(self, event):
         """
@@ -881 +888 @@
         if self.parent is not None:
             wx.PostEvent(self.parent, NewLoadDataEvent())
-            
+
 
     def on_remove(self, event):
         """
         Get a list of item checked and remove them from the treectrl
-        Ask the parent to remove reference to this item 
+        Ask the parent to remove reference to this item
         """
         msg = "This operation will delete the data sets checked "
@@ -893 +900 @@
         if msg_box.ShowModal() != wx.ID_OK:
             return
-        
+
         data_to_remove, theory_to_remove, _ = self.set_data_helper()
         data_key = []
@@ -906 +913 @@
                     theory_list_ctrl = self.list_cb_theory[d_key]
                     theory_to_remove += theory_list_ctrl.keys()
-        # Remove theory from treectrl       
+        # Remove theory from treectrl
         for _, theory_dict in self.list_cb_theory.iteritems():
             for  key, value in theory_dict.iteritems():
@@ -916 +923 @@
                         pass
                     theory_key.append(key)
-                    
+
         #Remove data and related theory references
         for key in data_key:
@@ -934 +941 @@
                                 pass
                     del theory_dict[key]
-                    
-            
+
+
         self.parent.remove_data(data_id=data_to_remove,
                                   theory_id=theory_to_remove)
@@ -941 +948 @@
         self.enable_freeze()
         self.enable_remove_plot()
-        
+
     def on_import(self, event=None):
         """
@@ -951 +958 @@
         temp = data_id + state_id
         self.parent.set_data(data_id=temp, theory_id=theory_id)
-        
+
     def on_append_plot(self, event=None):
         """
@@ -958 +965 @@
         self._on_plot_selection()
         data_id, theory_id, state_id = self.set_data_helper()
-        self.parent.plot_data(data_id=data_id,  
+        self.parent.plot_data(data_id=data_id,
                               state_id=state_id,
                               theory_id=theory_id,
                               append=True)
-   
+
     def on_plot(self, event=None):
         """
@@ -968 +975 @@
         """
         data_id, theory_id, state_id = self.set_data_helper()
-        self.parent.plot_data(data_id=data_id,  
+        self.parent.plot_data(data_id=data_id,
                               state_id=state_id,
                               theory_id=theory_id,
                               append=False)
         self.enable_remove_plot()
-         
+
     def on_close_page(self, event=None):
         """
@@ -982 +989 @@
         # send parent to update menu with no show nor hide action
         self.parent.show_data_panel(action=False)
-    
+
     def on_freeze(self, event):
         """
@@ -995 +1002 @@
             msg = "Freeze Theory: Requires at least one theory checked."
         wx.PostEvent(self.parent, StatusEvent(status=msg))
-            
+
     def set_active_perspective(self, name):
         """
@@ -1002 +1009 @@
         self.perspective_cbox.SetStringSelection(name)
         self.enable_import()
-        
+
     def _on_delete_plot_panel(self, event):
         """
-        get an event with attribute name and caption to delete existing name 
+        get an event with attribute name and caption to delete existing name
         from the combobox of the current panel
         """
@@ -1011 +1018 @@
         caption = event.caption
         if self.cb_plotpanel is not None:
-            pos = self.cb_plotpanel.FindString(str(caption)) 
+            pos = self.cb_plotpanel.FindString(str(caption))
             if pos != wx.NOT_FOUND:
                 self.cb_plotpanel.Delete(pos)
         self.enable_append()
-        
+
     def set_panel_on_focus(self, name=None):
         """
@@ -1031 +1038 @@
         self.enable_append()
         self.enable_remove_plot()
-    
+
     def set_plot_unfocus(self):
         """
@@ -1037 +1044 @@
         """
         return
-    
+
     def _on_perspective_selection(self, event=None):
         """
@@ -1047 +1054 @@
             perspective.on_perspective(event=None)
             self.parent.check_multimode(perspective=perspective)
-                
+
     def _on_plot_selection(self, event=None):
         """
@@ -1061 +1068 @@
         if combo.GetValue() != 'None':
             panel = combo.GetClientData(selection)
-            self.parent.on_set_plot_focus(panel)   
-            
+            self.parent.on_set_plot_focus(panel)
+
     def on_close_plot(self, event):
         """
         clseo the panel on focus
-        """ 
+        """
         self.enable_append()
         selection = self.cb_plotpanel.GetSelection()
@@ -1072 +1079 @@
             panel = self.cb_plotpanel.GetClientData(selection)
             if self.parent is not None and panel is not None:
-                wx.PostEvent(self.parent, 
+                wx.PostEvent(self.parent,
                              NewPlotEvent(group_id=panel.group_id,
                                           action="delete"))
         self.enable_remove_plot()
-    
+
     def set_frame(self, frame):
         """
         """
         self.frame = frame
-    
+
     def get_frame(self):
         """
         """
-        return self.frame 
-    
+        return self.frame
+
     def on_help(self, event):
         """
@@ -1115 +1122 @@
         """
         self.parent.show_data_panel(event)
-                        
+
     def set_schedule_full_draw(self, panel=None, func='del'):
         """
@@ -1121 +1128 @@
         """
         self.parent.set_schedule_full_draw(panel, func)
-        
+
     def enable_remove_plot(self):
         """
@@ -1131 +1138 @@
         #else:
         #    self.bt_close_plot.Enable()
-            
+
     def enable_remove(self):
         """
@@ -1142 +1149 @@
         else:
             self.bt_remove.Enable()
-            
+
     def enable_import(self):
         """
@@ -1160 +1167 @@
         else:
             self.perspective_cbox.Enable()
-            
+
     def enable_plot(self):
         """
         enable or disable plot button
         """
-        n_t = 0 
+        n_t = 0
         n_t_t = 0
         if self.tree_ctrl != None:
@@ -1176 +1183 @@
             self.bt_plot.Enable()
         self.enable_append()
-       
+
     def enable_append(self):
         """
         enable or disable append button
         """
-        n_t = 0 
+        n_t = 0
         n_t_t = 0
         if self.tree_ctrl != None:
@@ -1187 +1194 @@
         if self.tree_ctrl_theory != None:
             n_t_t = self.tree_ctrl_theory.GetCount()
-        if n_t + n_t_t <= 0: 
+        if n_t + n_t_t <= 0:
             self.bt_append_plot.Disable()
             self.cb_plotpanel.Disable()
@@ -1196 +1203 @@
             self.bt_append_plot.Enable()
             self.cb_plotpanel.Enable()
-            
+
     def check_theory_to_freeze(self):
         """
@@ -1214 +1221 @@
         else:
             self.bt_freeze.Disable()
-        
+
     def enable_selection(self):
         """
@@ -1229 +1236 @@
         else:
             self.selection_cbox.Disable()
-            
+
     def show_data_button(self):
         """
-        show load data and remove data button if 
+        show load data and remove data button if
         dataloader on else hide them
         """
@@ -1238 +1245 @@
             gui_style = self.parent.get_style()
             style = gui_style & GUIFRAME.DATALOADER_ON
-            if style == GUIFRAME.DATALOADER_ON: 
+            if style == GUIFRAME.DATALOADER_ON:
                 #self.bt_remove.Show(True)
-                self.bt_add.Show(True) 
+                self.bt_add.Show(True)
             else:
                 #self.bt_remove.Hide()
                 self.bt_add.Hide()
-        except: 
+        except:
             #self.bt_remove.Hide()
-            self.bt_add.Hide() 
-    
+            self.bt_add.Hide()
+
 
 
@@ -1264 +1271 @@
         self.list_of_ctrl = []
         if not data_list:
-            return 
+            return
         self._sizer_main = wx.BoxSizer(wx.VERTICAL)
         self._sizer_txt = wx.BoxSizer(wx.VERTICAL)
@@ -1273 +1280 @@
         self._panel.SetupScrolling()
         self.__do_layout(data_list, text=text)
-        
+
     def __do_layout(self, data_list, text=''):
         """
@@ -1279 +1286 @@
         """
         if not data_list or len(data_list) <= 1:
-            return 
+            return
         #add text
-        
+
         text = "Deleting these file reset some panels.\n"
         text += "Do you want to proceed?\n"
@@ -1315 +1322 @@
                                 wx.LEFT|wx.RIGHT|wx.ADJUST_MINSIZE, 10)
         static_line = wx.StaticLine(self, -1)
-        
+
         self._sizer_txt.Add(self._panel, 1, wx.EXPAND|wx.LEFT|wx.RIGHT, 5)
         self._sizer_main.Add(self._sizer_txt, 1, wx.EXPAND|wx.ALL, 10)
-        #self._sizer_main.Add(self._data_text_ctrl, 0, 
+        #self._sizer_main.Add(self._data_text_ctrl, 0,
         #                     wx.EXPAND|wx.LEFT|wx.RIGHT, 10)
         self._sizer_main.Add(static_line, 0, wx.EXPAND, 0)
@@ -1324 +1331 @@
         self.SetSizer(self._sizer_main)
         self.Layout()
-        
+
     def get_data(self):
         """
@@ -1335 +1342 @@
                 temp.append(data)
         return temp
-               
+
 class DataFrame(wx.Frame):
     """
@@ -1347 +1354 @@
     #  tied to any perspective
     ALWAYS_ON = True
-    
+
     def __init__(self, parent=None, owner=None, manager=None, size=(300, 800),
                          list_of_perspective=[], list=[], *args, **kwds):
@@ -1357 +1364 @@
         self.owner = owner
         self._manager = manager
-        self.panel = DataPanel(parent=self, 
+        self.panel = DataPanel(parent=self,
                                manager=manager,
                                list_of_perspective=list_of_perspective)
-     
+
     def load_data_list(self, list=[]):
         """
@@ -1366 +1373 @@
         """
         self.panel.load_data_list(list=list)
-        
-   
-    
+
+
+
 from sas.sasgui.guiframe.dataFitting import Theory1D
 from sas.sasgui.guiframe.data_state import DataState
@@ -1383 +1390 @@
         self.msg += "name  value\n"
         return self.msg
-    
+
 def set_data_state(data=None, path=None, theory=None, state=None):
     """
@@ -1391 +1398 @@
     dstate.set_path(path=path)
     dstate.set_theory(theory, state)
-  
+
     return dstate
-    
+
 if __name__ == "__main__":
-    
+
     app = wx.App()
     try:
@@ -1477 +1484 @@
         #raise
         print "error", sys.exc_value
-        
-    app.MainLoop()  
-    
-    
+
+    app.MainLoop()

src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py

@@ -162 +162 @@
             logging.error("Loader returned an invalid object:\n %s" % str(item))
             data_error = True
-        
+
         data = self.parent.create_gui_data(item, p_file)
         output[data.id] = data
@@ -170 +170 @@
         """
         """
-        message = ""
-        log_msg = ''
+        file_errors = {}
         output = {}
-        any_error = False
-        data_error = False
-        error_message = ""
+        exception_occurred = False
+
         for p_file in path:
-            info = "info"
             basename = os.path.basename(p_file)
             _, extension = os.path.splitext(basename)
             if extension.lower() in EXTENSIONS:
-                any_error = True
                 log_msg = "Data Loader cannot "
-                log_msg += "load: %s\n" % str(p_file)
-                log_msg += """Please try to open that file from "open project" """
-                log_msg += """or "open analysis" menu\n"""
-                error_message = log_msg + "\n"
+                log_msg += "load: {}\n".format(str(p_file))
+                log_msg += "Please try to open that file from \"open project\""
+                log_msg += "or \"open analysis\" menu."
                 logging.info(log_msg)
+                file_errors[basename] = [log_msg]
                 continue
 
             try:
-                message = "Loading Data... " + str(p_file) + "\n"
-                self.load_update(output=output, message=message, info=info)
+                message = "Loading {}...\n".format(p_file)
+                self.load_update(output=output, message=message, info="info")
                 temp = self.loader.load(p_file, format)
-                if temp.__class__.__name__ == "list":
-                    for item in temp:
-                        output, error_message, data_error = \
-                            self._process_data_and_errors(item,
-                                                          p_file,
-                                                          output,
-                                                          error_message)
-                else:
+                if not isinstance(temp, list):
+                    temp = [temp]
+                for item in temp:
+                    error_message = ""
                     output, error_message, data_error = \
-                            self._process_data_and_errors(temp,
-                                                          p_file,
-                                                          output,
-                                                          error_message)
+                        self._process_data_and_errors(item,
+                                                      p_file,
+                                                      output,
+                                                      error_message)
+                    if data_error:
+                        if basename in file_errors.keys():
+                            file_errors[basename] += [error_message]
+                        else:
+                            file_errors[basename] = [error_message]
+                        self.load_update(output=output,
+                            message=error_message, info="warning")
+
+                self.load_update(output=output,
+                message="Loaded {}\n".format(p_file),
+                info="info")
+
             except:
                 logging.error(sys.exc_value)
-                any_error = True
-            if any_error or error_message != "":
-                if error_message == "":
-                    error = "Error: " + str(sys.exc_info()[1]) + "\n"
-                    error += "while loading Data: \n%s\n" % str(basename)
-                    error_message += "The data file you selected could not be loaded.\n"
-                    error_message += "Make sure the content of your file"
-                    error_message += " is properly formatted.\n\n"
-                    error_message += "When contacting the SasView team, mention the"
-                    error_message += " following:\n%s" % str(error)
-                elif data_error:
-                    base_message = "Errors occurred while loading "
-                    base_message += "{0}\n".format(basename)
-                    base_message += "The data file loaded but with errors.\n"
-                    error_message = base_message + error_message
-                else:
-                    error_message += "%s\n" % str(p_file)
-                info = "error"
-        
-        if any_error or error_message:
-            self.load_update(output=output, message=error_message, info=info)
-        else:
-            message = "Loading Data Complete! "
-        message += log_msg
-        self.load_complete(output=output, error_message=error_message,
-                           message=message, path=path, info='info')
+
+                error_message = "The Data file you selected could not be loaded.\n"
+                error_message += "Make sure the content of your file"
+                error_message += " is properly formatted.\n"
+                error_message += "When contacting the SasView team, mention the"
+                error_message += " following:\n"
+                error_message += "Error: " + str(sys.exc_info()[1])
+                file_errors[basename] = [error_message]
+                self.load_update(output=output, message=error_message, info="warning")
+
+        if len(file_errors) > 0:
+            error_message = ""
+            for filename, error_array in file_errors.iteritems():
+                error_message += "The following errors occured whilst "
+                error_message += "loading {}:\n".format(filename)
+                for message in error_array:
+                    error_message += message + "\n"
+                error_message += "\n"
+            self.load_update(output=output, message=error_message, info="error")
+
+        self.load_complete(output=output, message="Loading data complete!",
+            info="info")
 
     def load_update(self, output=None, message="", info="warning"):
@@ -254 +254 @@
         #    self.load_error(error_message)
         self.parent.add_data(data_list=output)
-
-
-

src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py

@@ -552 +552 @@
             self.subplot.set_xlim((xlo, xhi))
             self.subplot.set_ylim((ylo, yhi))
+        self.graph.selected_plottable = None
 
 
@@ -629 +630 @@
 
             if self.parent.ClassName.count('wxDialog') == 0:
-                wx_id = ids.next()
-                plot_menu.Append(wx_id, '&Linear Fit', name)
-                wx.EVT_MENU(self, wx_id, self.onFitting)
-                plot_menu.AppendSeparator()
+                if plot.id != 'fit':
+                    wx_id = ids.next()
+                    plot_menu.Append(wx_id, '&Linear Fit', name)
+                    wx.EVT_MENU(self, wx_id, self.onFitting)
+                    plot_menu.AppendSeparator()
 
                 wx_id = ids.next()
@@ -694 +696 @@
         self._slicerpop.AppendSeparator()
         wx_id = ids.next()
+        self._slicerpop.Append(wx_id, '&Set Graph Range')
+        wx.EVT_MENU(self, wx_id, self.onSetRange)
+        wx_id = ids.next()
         self._slicerpop.Append(wx_id, '&Reset Graph Range')
         wx.EVT_MENU(self, wx_id, self.onResetGraph)
@@ -710 +715 @@
         self.PopupMenu(self._slicerpop, pos)
 
+    def onSetRange(self, event):
+        # Display dialog
+        # self.subplot.set_xlim((low, high))
+        # self.subplot.set_ylim((low, high))
+        from sas.sasgui.plottools.RangeDialog import RangeDialog
+        d = RangeDialog(self, -1)
+        xlim = self.subplot.get_xlim()
+        ylim = self.subplot.get_ylim()
+        d.SetXRange(xlim)
+        d.SetYRange(ylim)
+        if d.ShowModal() == wx.ID_OK:
+            x_range = d.GetXRange()
+            y_range = d.GetYRange()
+            if x_range is not None and y_range is not None:
+                self.subplot.set_xlim(x_range)
+                self.subplot.set_ylim(y_range)
+                self.subplot.figure.canvas.draw_idle()
+        d.Destroy()
+
     def onFreeze(self, event):
         """
@@ -796 +820 @@
                                                              int(curr_symbol))), curr_label)
         self.appD.Bind(wx.EVT_CLOSE, self.on_AppDialog_close)
+        self.graph.selected_plottable = None
 
     def on_AppDialog_close(self, event):

src/sas/sasgui/guiframe/media/data_explorer_help.rst

@@ -20 +20 @@
 
 *NOTE! When* Data Explorer *is hidden, all data loaded will be sent directly 
-to the current active analysis perspective, if possible. When* Data Explorer *is
+to the current active analysis, if possible. When* Data Explorer *is
 shown, data go first to the* Data Explorer.
 
@@ -116 +116 @@
 
 Click on the *Send To* button to send the currently selected data to one of the
-perspectives (for *Fitting*, *P(r) Inversion*, or *Invariant* calculation).
+available types of analysis (*Fitting*, *P(r) Inversion*, or *Invariant* calculation).
  
-The *Single*/*Batch* mode radio buttons only apply to the *Fitting* perspective.
+The *Single*/*Batch* mode radio buttons only apply to *Fitting*.
 
 *Batch mode* provides serial (batch) fitting with one model function, that is, 

src/sas/sasgui/guiframe/media/graph_help.rst

@@ -20 +20 @@
 ^^^^^^^^^^^^^^^^^^^^^^^
 
-To invoke the *Graph Menu* simply right-click on a data/theory plot, or click 
-the *Graph Menu* (bullet list) icon in the toolbar at the bottom of the plot. 
+To invoke the *Graph Menu* simply right-click on a data/theory plot, or click
+the *Graph Menu* (bullet list) icon in the toolbar at the bottom of the plot.
 Then select a menu item.
 
@@ -27 +27 @@
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-To expand a plot window, click the *Maximise* (square) icon in the top-right 
+To expand a plot window, click the *Maximise* (square) icon in the top-right
 corner.
 
-To shrink a plot window, click the *Restore down* (square-on-square) icon in 
+To shrink a plot window, click the *Restore down* (square-on-square) icon in
 the top-right corner.
 
-To hide a plot, click the *Minimise* (-) icon in the top-right corner of the 
+To hide a plot, click the *Minimise* (-) icon in the top-right corner of the
 plot window.
 
-To show a hidden plot, select the *Restore up* (square-on-square) icon on the 
+To show a hidden plot, select the *Restore up* (square-on-square) icon on the
 minimised window.
 
-To delete a plot, click the *Close* (x) icon in the top-right corner of the 
+To delete a plot, click the *Close* (x) icon in the top-right corner of the
 plot window.
 
-*NOTE! If a residuals graph (when fitting data) is hidden, it will not show up 
+*NOTE! If a residuals graph (when fitting data) is hidden, it will not show up
 after computation.*
 
@@ -48 +48 @@
 ^^^^^^^^^^^^^^^
 
-Select the *Pan* (crossed arrows) icon in the toolbar at the bottom of the plot 
-to activate this option. Move the mouse pointer to the plot. It will change to 
-a hand. Then left-click and drag the plot around. The axis values will adjust 
+Select the *Pan* (crossed arrows) icon in the toolbar at the bottom of the plot
+to activate this option. Move the mouse pointer to the plot. It will change to
+a hand. Then left-click and drag the plot around. The axis values will adjust
 accordingly.
- 
+
 To disable dragging mode, unselect the *crossed arrows* icon on the toolbar.
 
@@ -58 +58 @@
 ^^^^^^^^^^^^^^^^^^^^^^^^
 
-Select the *Zoom* (magnifying glass) button in the toolbar at the bottom of 
-the plot to activate this option. Move the mouse pointer to the plot. It will 
-change to a cross-hair. Then left-click and drag the pointer around to generate 
+Select the *Zoom* (magnifying glass) button in the toolbar at the bottom of
+the plot to activate this option. Move the mouse pointer to the plot. It will
+change to a cross-hair. Then left-click and drag the pointer around to generate
 a region of interest. Release the mouse button to generate the new view.
 
 To disable zoom mode, unselect the *Zoom* button on the toolbar.
 
-After zooming in on a a region, the *left arrow* or *right arrow* buttons on 
+After zooming in on a a region, the *left arrow* or *right arrow* buttons on
 the toolbar will switch between recent views.
 
-*NOTE! If a wheel mouse is available scrolling the wheel will zoom in/out 
-on the current plot (changing both axes). Alternatively, point at the numbers 
+*NOTE! If a wheel mouse is available scrolling the wheel will zoom in/out
+on the current plot (changing both axes). Alternatively, point at the numbers
 on one axis and scroll the wheel to zoom in/out on just that axis.*
 
-To return to the original view of the data, click the the *Reset* (home) icon 
+To return to the original view of the data, click the the *Reset* (home) icon
 in the toolbar at the bottom of the plot (see Resetting_the_graph_ for further details).
 
@@ -78 +78 @@
 ^^^^^^^^^^^^^^^^^^^
 
-To save the current plot as an image file, right click on the plot to bring up 
+To save the current plot as an image file, right click on the plot to bring up
 the *Graph Menu* (see Invoking_the_graph_menu_) and select *Save Image*.
-Alternatively, click on the *Save* (floppy disk) icon in the toolbar at the 
+Alternatively, click on the *Save* (floppy disk) icon in the toolbar at the
 bottom of the plot.
- 
-A dialog window will open. Select a folder, enter a filename, choose an output 
+
+A dialog window will open. Select a folder, enter a filename, choose an output
 image type, and click *Save*.
 
@@ -94 +94 @@
 *  PNG (portable network graphics)
 *  PS (postscript)
-*  RAW/RGBA (bitmap)
+*  RAW/RGBA (bitmap, stored as 935x635 pixels of depth 8)
 *  SVG/SVGA (scalable vector graphics)
 *  TIF/TIFF (tagged iamge file)
@@ -101 +101 @@
 ^^^^^^^^^^^^^^^
 
-To send the current plot to a printer, click on the *Print* (printer) icon in 
+To send the current plot to a printer, click on the *Print* (printer) icon in
 the toolbar at the bottom of the plot.
 
@@ -109 +109 @@
 ^^^^^^^^^^^^^^^^^^^
 
-To reset the axis range of a graph to its initial values select *Reset Graph 
+To reset the axis range of a graph to its initial values select *Reset Graph
 Range* on the *Graph Menu* (see Invoking_the_graph_menu_). Alternatively, use
 the *Reset* (home) icon in the toolbar at the bottom of the plot.
@@ -133 +133 @@
 
 From the *Graph Menu* (see Invoking_the_graph_menu_) select *Change Scale*. A
-dialog window will appear in which it is possible to choose different 
+dialog window will appear in which it is possible to choose different
 transformations of the x (usually Q) or y (usually I(Q)) axes, including:
 
@@ -139 +139 @@
 *  y, 1/y, ln(y), y^2, y.(x^4), 1/sqrt(y),
 *  log10(y), ln(y.x), ln(y.x^2), ln(y.x^4), log10(y.x^4)
- 
+
 A *View* option includes short-cuts to common SAS transformations, such as:
 
@@ -148 +148 @@
 *  Kratky
 
-For properly corrected and scaled data, these SAS transformations can be used 
-to estimate, for example, Rg, rod diameter, or SANS incoherent background 
+For properly corrected and scaled data, these SAS transformations can be used
+to estimate, for example, Rg, rod diameter, or SANS incoherent background
 levels, via a linear fit (see Making_a_linear_fit_).
 
@@ -158 +158 @@
 
 From the *Graph Menu* (see Invoking_the_graph_menu_) select *Toggle Linear/Log
-Scale* to switch between a linear to log intensity scale. The type of scale 
+Scale* to switch between a linear to log intensity scale. The type of scale
 selected is written alongside the colour scale.
 
@@ -167 +167 @@
 
 From the *Graph Menu* (see Invoking_the_graph_menu_) select *2D Color Map* to
-choose a different color scale for the image and/or change the maximum or 
+choose a different color scale for the image and/or change the maximum or
 minimum limits of the scale.
 
@@ -173 +173 @@
 ^^^^^^^^^^^^^^^^^^^^^^^^
 
-Clicking anywhere in the plot window will cause the current coordinates to be 
+Clicking anywhere in the plot window will cause the current coordinates to be
 displayed in the status bar at the very bottom-left of the SasView window.
- 
+
 .. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
 
@@ -193 +193 @@
 
 In the *Dataset Menu* (see Invoking_the_dataset_menu_), highlight a data set
-and select *DataInfo* to bring up a data information dialog panel for that 
+and select *DataInfo* to bring up a data information dialog panel for that
 data set.
 
@@ -200 +200 @@
 
 In the *Dataset Menu* (see Invoking_the_dataset_menu_), select *Save Points as
-a File* (if 1D data) or *Save as a file(DAT)* (if 2D data). A save dialog will 
+a File* (if 1D data) or *Save as a file(DAT)* (if 2D data). A save dialog will
 appear.
 
-1D data can be saved in either ASCII text (.TXT) or CanSAS/SASXML (.XML) 
+1D data can be saved in either ASCII text (.TXT) or CanSAS/SASXML (.XML)
 formats (see :ref:`Formats`).
 
@@ -216 +216 @@
 
 In the *Dataset Menu* (see Invoking_the_dataset_menu_), select *Linear Fit*. A
-fitting dialog will appear. Set some initial parameters and data limits and 
-click *Fit*. The fitted parameter values are displayed and the resulting line 
-calculated from them is added to the plot. 
+fitting dialog will appear. Set some initial parameters and data limits and
+click *Fit*. The fitted parameter values are displayed and the resulting line
+calculated from them is added to the plot.
 
 This option is most useful for performing simple Guinier, XS Guinier, and
-Porod type analyses, for example, to estimate Rg, a rod diameter, or incoherent 
+Porod type analyses, for example, to estimate Rg, a rod diameter, or incoherent
 background level, respectively.
 
@@ -240 +240 @@
 
 In the *Dataset Menu* (see Invoking_the_dataset_menu_), select *Show Error Bar*
-or *Hide Error Bar* to switch between showing/hiding the errors associated 
-with the chosen dataset. 
+or *Hide Error Bar* to switch between showing/hiding the errors associated
+with the chosen dataset.
 
 Modify plot properties
@@ -247 +247 @@
 
 In the *Dataset Menu* (see Invoking_the_dataset_menu_), select *Modify Plot
-Property* to change the size, color, or shape of the displayed marker for the 
+Property* to change the size, color, or shape of the displayed marker for the
 chosen dataset, or to change the dataset label that appears on the plot.
 
@@ -260 +260 @@
 This feature is only available with 2D data.
 
-2D data averaging allows you to perform different types of averages on your 
-data. The region to be averaged is displayed in the plot window and its limits 
+2D data averaging allows you to perform different types of averages on your
+data. The region to be averaged is displayed in the plot window and its limits
 can be modified by dragging the boundaries around.
 
@@ -277 +277 @@
 *  Box averaging on Qy
 
-A 'slicer' will appear (except for *Perform Circular Average*) in the plot that 
-you can drag by clicking on a slicer's handle. When the handle is highlighted 
+A 'slicer' will appear (except for *Perform Circular Average*) in the plot that
+you can drag by clicking on a slicer's handle. When the handle is highlighted
 in red, it means that the slicer can move/change size.
 
-*NOTE! The slicer size will reset if you try to select a region greater than 
+*NOTE! The slicer size will reset if you try to select a region greater than
 the size of the data.*
 
-Alternatively, once a 'slicer' is active you can also select the region to 
-average by bringing back the *Dataset Menu* and selecting *Edit Slicer 
-Parameters*. A dialog window will appear in which you can enter values to 
+Alternatively, once a 'slicer' is active you can also select the region to
+average by bringing back the *Dataset Menu* and selecting *Edit Slicer
+Parameters*. A dialog window will appear in which you can enter values to
 define a region or select the number of points to plot (*nbins*).
 
-A separate plot window will also have appeared, displaying the requested 
+A separate plot window will also have appeared, displaying the requested
 average.
 
-*NOTE! The displayed average only updates when input focus is moved back to 
+*NOTE! The displayed average only updates when input focus is moved back to
 that window; ie, when the mouse pointer is moved onto that plot.*
 
-Selecting *Box Sum* automatically brings up the 'Slicer Parameters' dialog in 
+Selecting *Box Sum* automatically brings up the 'Slicer Parameters' dialog in
 order to display the average numerically, rather than graphically.
 
@@ -303 +303 @@
 ^^^^^^^^^^^^^^^^^^^^^^^^^
 
-This operation will perform an average in constant Q-rings around the (x,y) 
+This operation will perform an average in constant Q-rings around the (x,y)
 pixel location of the beam center.
 
@@ -309 +309 @@
 ^^^^^^^^^^^^^^^^^^^^^^^
 
-This operation is the same as 'Unmasked Circular Average' except that any 
+This operation is the same as 'Unmasked Circular Average' except that any
 masked region is excluded.
 
@@ -317 +317 @@
 This operation averages in constant Q-arcs.
 
-The width of the sector is specified in degrees (+/- |delta|\|phi|\) each side 
+The width of the sector is specified in degrees (+/- |delta|\|phi|\) each side
 of the central angle (|phi|\).
 
@@ -323 +323 @@
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-This operation performs an average between two Q-values centered on (0,0), 
+This operation performs an average between two Q-values centered on (0,0),
 and averaged over a specified number of pixels.
 
-The data is returned as a function of angle (|phi|\) in degrees with zero 
+The data is returned as a function of angle (|phi|\) in degrees with zero
 degrees at the 3 O'clock position.
 
@@ -334 +334 @@
 This operation performs a sum of counts in a 2D region of interest.
 
-When editing the slicer parameters, the user can enter the length and the width 
+When editing the slicer parameters, the user can enter the length and the width
 the rectangular slicer and the coordinates of the center of the rectangle.
 
@@ -342 +342 @@
 This operation computes an average I(Qx) for the region of interest.
 
-When editing the slicer parameters, the user can control the length and the 
-width the rectangular slicer. The averaged output is calculated from constant 
-bins with rectangular shape. The resultant Q values are nominal values, that 
+When editing the slicer parameters, the user can control the length and the
+width the rectangular slicer. The averaged output is calculated from constant
+bins with rectangular shape. The resultant Q values are nominal values, that
 is, the central value of each bin on the x-axis.
 
@@ -352 +352 @@
 This operation computes an average I(Qy) for the region of interest.
 
-When editing the slicer parameters, the user can control the length and the 
-width the rectangular slicer. The averaged output is calculated from constant 
-bins with rectangular shape. The resultant Q values are nominal values, that 
+When editing the slicer parameters, the user can control the length and the
+width the rectangular slicer. The averaged output is calculated from constant
+bins with rectangular shape. The resultant Q values are nominal values, that
 is, the central value of each bin on the x-axis.