Changeset c70eb7c in sasview for guiframe/gui_manager.py

Timestamp:

Mar 9, 2011 7:02:50 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:

8b6f489

Parents:

99abf5d

Message:

working data_panel

File:

• guiframe/gui_manager.py (modified) (5 diffs)

guiframe/gui_manager.py

@@ -431 +431 @@
                                   Hide())        
       
+    def append_theory(self, data_id, theory, state=None):
+        """
+        """
+        data_state = self._data_manager.append_theory(data_id=data_id, 
+                                                      theory=theory,
+                                                      state=state)
+        self._data_panel.load_data_list(data_state)
+        
+    def update_data(self, prev_data, new_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 freeze(self, data_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:
+            theory_list = data_state.get_theory()
+            for new_plot in theory_list:
+                wx.PostEvent(self, NewplotEvent(plot=new_plot,
+                                             title=new_plot.title))
+        
+    def delete_data(self, data):
+        """
+        """
+        self._current_perspective.delete_data(data)
+        
+    
     def get_context_menu(self, plotpanel=None):
         """
@@ -1207 +1243 @@
             self.__gui_style = self.__gui_style & (~GUIFRAME.MANAGER_ON)
             self._data_panel_menu.SetText('Data Explorer ON')
- 
+    
+    def add_data_helper(self, data_list):
+        """
+        """
+        self._data_manager.add_data(data_list)
+        
     def add_data(self, data_list):
         """
@@ -1215 +1256 @@
         #send a list of available data to plotting plugin
         avalaible_data = []
+        theory_list = []
         if self._data_manager is not None:
             self._data_manager.add_data(data_list)
             avalaible_data = self._data_manager.get_all_data()
-        
-        # set data in the data panel
-        if self._data_panel is not None:
-            data_state = self._data_manager.get_selected_data()
-            self._data_panel.load_data_list(data_state)
         style = self.__gui_style & GUIFRAME.MANAGER_ON
         if style == GUIFRAME.MANAGER_ON:
@@ -1232 +1269 @@
             #automatically send that to the current perspective
             self.set_data(data_list)
-                
+       
+         # set data in the data panel
+        if self._data_panel is not None:
+            data_state = self._data_manager.get_selected_data()
+            self._data_panel.load_data_list(data_state)
+           
     def get_data_from_panel(self, data_id, plot=False,append=False):
         """
@@ -1290 +1332 @@
                                                   title=str(new_plot.title)))
             
-    def add_theory(self, data_id, theory):
-        """
-        """
-        self._data_manager.append_theory(data_id, theory)
-        style = self.__gui_style & GUIFRAME.MANAGER_ON
-        if style == GUIFRAME.MANAGER_ON:
-            if self._data_panel is not None:
-                data_state = self._data_manager.get_by_id([data_id])
-                self._data_panel.load_data_list(data_state)
+  
                 
     def remove_data(self, data_id, theory_id=None, delete_all=True):