Changeset e88ebfd in sasview for guiframe/gui_manager.py

Timestamp:

Mar 11, 2011 4:39:00 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:

ee2b492

Parents:

14cd91b1

Message:

working on guiframe

File:

• guiframe/gui_manager.py (modified) (6 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):
         """
@@ -444 +436 @@
         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):
+        """
+        """ 
+        data_state = self._data_manager.update_theory(data_id=data_id, 
+                                         theory=theory,
+                                         state=state)  
+        self._data_panel.load_data_list(data_state)
         
     def freeze(self, data_id, theory_id):
@@ -1271 +1271 @@
         """
         """
-        self._data_manager.add_data(data_list)
-        
-    def add_data(self, data_list):
-        """
-        receive a list of data . store them its data manager if possible
-        determine if data was be plot of send to data perspectives
-        """
-        #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()
+        
+    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. 
+        :param data_list: dictionary of data's ID and value Data
+        """
+        #Store data into manager
+        self.add_data_helper(data_list)
+        # set data in the data panel
+        if self._data_panel is not None:
+            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 
+        #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:
@@ -1292 +1299 @@
         else:
             #automatically send that to the current perspective
-            self.set_data(data_list)
+            self.set_data(data_id=data_list.keys())
        
-         # 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):
-        """
-        receive a list of data key retreive the data from data manager and set 
-        then to the current perspective
-        """
-        data_dict = self._data_manager.get_by_id(data_id)
-        data_list = []
-        for data_state in data_dict.values():
-            data_list.append(data_state.data)
-        if plot:
-            self.plot_data(data_list, append=append)
+    def set_data(self, data_id): 
+        """
+        set data to current perspective
+        """
+        list_data, _ = self._data_manager.get_by_id(data_id)
+        if self._current_perspective is not None:
+            self._current_perspective.set_data(list_data)
         else:
-            #sent data to active application
-            self.set_data(data_list=data_list)
-       
-        
-    def set_data(self, data_list):
-        """
-        set data to current perspective
-        """
+            msg = "Guiframe does not have a current perspective"
+            logging.info(msg)
+            
+    def set_theory(self, state_id, theory_id=None):
+        """
+        """
+        _, list_theory = self._data_manager.get_by_id(state_id, theory_id)
         if self._current_perspective is not None:
             try:
-                self._current_perspective.set_data(data_list)
+                self._current_perspective.set_theory(list_theory)
             except:
-                msg = str(sys.exc_value)
+                msg = "Guiframe set_theory: \n" + str(sys.exc_value)
+                logging.info(msg)
                 wx.PostEvent(self, StatusEvent(status=msg, info="error"))
         else:
@@ -1329 +1327 @@
             logging.info(msg)
             
-    def plot_data(self, data_list, append=False):
+    def plot_data(self,  state_id, data_id=None,
+                  theory_id=None, append=False):
         """
         send a list of data to plot
         """
-        if not data_list:
-            message = "Please check data to plot or append"
-            wx.PostEvent(self, StatusEvent(status=message, info='warning'))
-            return 
+        data_list, _ = self._data_manager.get_by_id(data_id)
+        _, temp_list_theory = self._data_manager.get_by_id(state_id, theory_id)
+        for item in temp_list_theory:
+            theory_data, theory_state = item
+            data_list.append(theory_data)
+        GROUP_ID = wx.NewId()
         for new_plot in data_list:
             if append:
@@ -1347 +1348 @@
                     return 
                 else:
-                    if self.enable_add_data(new_plot) and \
-                    hasattr(self.panel_on_focus, 'group_id'):
-                        new_plot.group_id.append(self.panel_on_focus.group_id)
+                    if self.enable_add_data(new_plot):
+                        new_plot.group_id = self.panel_on_focus.group_id
+                    else:
+                        message = "Only 1D Data can be append to plot panel\n"
+                        message += "%s will be plot separetly\n" %str(new_plot.name)
+                        wx.PostEvent(self, StatusEvent(status=message, 
+                                                   info='warning'))
             else:
                 #if not append then new plot
-                new_plot.group_id.append(wx.NewId())
+                new_plot.group_id = GROUP_ID
+            title = "PLOT " + str(new_plot.title)
             wx.PostEvent(self, NewPlotEvent(plot=new_plot,
-                                                  title=str(new_plot.title)))
+                                                  title=title))