Changeset af47c8d in sasview for guiframe

Timestamp:

Aug 4, 2010 12:45:36 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:

10f3b23

Parents:

210ff4f

Message:

reverse guiframe

Location:

guiframe

Files:

• data_loader.py (modified) (2 diffs)
• gui_manager.py (modified) (4 diffs)

guiframe/data_loader.py

@@ -229 +229 @@
                         #add this plot the an existing panel
                         new_plot.group_id = existing_panel.group_id
-        parent.set_loaded_data(data_list=[(new_plot, path)])
+        wx.PostEvent(parent, NewPlotEvent(plot=new_plot, title=title))
+        
     ## the output of the loader is a list , some xml files contain more than one data
     else:
@@ -285 +286 @@
                         #add this plot the an existing panel
                         new_plot.group_id = existing_panel.group_id
-            parent.set_loaded_data(data_list=[(new_plot, path)])
+            wx.PostEvent(parent, NewPlotEvent(plot=new_plot, title=str(title)))
             i+=1
          

guiframe/gui_manager.py

@@ -230 +230 @@
         ## Application manager
         self.app_manager = None
-        
-        ## Data Manager
-        self.data_manager = DataManager(parent=self)
         
         ## Find plug-ins
@@ -705 +702 @@
             self._mgr.Update()
    
-    def set_loaded_data(self, data_list=[]):
-        """
-        Save data and path in to data manager
-        """
-        self.data_manager.set_loaded_data(data_list=data_list)
-       
-    def get_data_manager(self):
-        """
-        return data manager instance
-        """
-        return self.data_manager
-    
     def _on_open(self, event):
         """
@@ -727 +712 @@
         if path and os.path.isfile(path):
             plot_data(self, path)
-        data_list = self.data_manager.get_data()
-        
         if self.defaultPanel is not None and \
             self._mgr.GetPane(self.panels["default"].window_name).IsShown():
             self.on_close_welcome_panel()
-        else:
-            for item in self.panels.keys():
-                # Check whether this is a sticky panel
-                if hasattr(self.panels[item], "ALWAYS_ON"):
-                    if self.panels[item].ALWAYS_ON:
-                        continue 
-                if self._mgr.GetPane(self.panels[item].window_name).IsShown():
-                    self.panels[item].set_data(list=data_list)
-            
+       
     def _onClose(self, event):
         """
@@ -896 +871 @@
                 if not self._mgr.GetPane(self.panels[item].window_name).IsShown():
                     self._mgr.GetPane(self.panels[item].window_name).Show()
-                    list_of_data = self.data_manager.get_data()
-                    self.panels[item].set_data(list=list_of_data)
             else:
                 if self._mgr.GetPane(self.panels[item].window_name).IsShown():
                     self._mgr.GetPane(self.panels[item].window_name).Hide()
-                    
+    
         self._mgr.Update()