Changeset d7f727d in sasview

Timestamp:

Mar 16, 2011 3:32:22 PM (14 years ago)

Author:

Gervaise Alina <gervyh@…>

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:

3658717e

Parents:

27f4bee

Message:

working data management

Location:

guiframe

Files:

• data_manager.py (modified) (1 diff)
• data_panel.py (modified) (1 diff)
• gui_manager.py (modified) (2 diffs)
• local_perspectives/plotting/Plotter1D.py (modified) (1 diff)

guiframe/data_manager.py

@@ -204 +204 @@
                         self.stored_data[new_theory.id] = selected_theory[new_theory.id]
                     else:
-                        msg = "Theory with ID %s " % str(theory_id)
+                        msg = "Theory with ID %s " % str(t_id)
                         msg += "couldn't not be frozen" 
                         raise ValueError, msg

guiframe/data_panel.py

@@ -457 +457 @@
                         i_t_c = self.tree_ctrl.AppendItem(t_p_c,
                                                           process.__str__())
-                    t_child.Bind(wx.EVT_TREE_CHECK, self.check_item)
                     theory_list_ctrl[theory_id] = [t_child, 
                                                    i_c_c, 

guiframe/gui_manager.py

@@ -1345 +1345 @@
         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)
+        total_plot_list = data_list.values()
         for item in temp_list_theory.values():
             theory_data, theory_state = item
-            data_list.values().append(theory_data)
+            total_plot_list.append(theory_data)
         GROUP_ID = wx.NewId()
-        for new_plot in data_list:
+        for new_plot in total_plot_list:
             if append:
                 if self.panel_on_focus is None:
@@ -1374 +1376 @@
                                                   title=title))
             
-  
-                
     def remove_data(self, data_id, theory_id=None):
         """

guiframe/local_perspectives/plotting/Plotter1D.py

@@ -153 +153 @@
                 #onRemove: graph is empty must be the panel must be destroyed
                 self.parent.delete_panel(self.uid)
-        else:
-            msg = "Attempt to remove an unexisting plot with ID %s " % str(id)
-            raise ValueError, msg
         
     def plot_data(self, data):