Changeset ec611aad in sasview for guiframe/data_manager.py

Timestamp:

Mar 22, 2011 4:59:13 PM (13 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:

6e8b436

Parents:

a3c96f7a

Message:

working on datamanager

File:

• guiframe/data_manager.py (modified) (3 diffs)

guiframe/data_manager.py

@@ -120 +120 @@
         return name
     
-    def add_theory_data(self, data_list):
-        """
-        """
-        for id, data in data_list.iteritems():
-            if id  in self.stored_data:
-                msg = "Data manager already stores %s" % str(data.name)
-                msg += ""
-                logging.info(msg)
-                data_state = self.stored_data[id]
-                data_state.theory_data = data
-            else:
-                data_state = DataState(theory_data=data)
-                data_state.id = data.id
-                self.stored_data[id] = data_state
-                
+  
     def add_data(self, data_list):
         """
@@ -151 +137 @@
                 self.stored_data[id] = data_state
     
-        
     def update_data(self, prev_data, new_data):
         """
@@ -164 +149 @@
         return prev_data.id, {new_data.id: self.stored_data[new_data.id]}
     
-    def update_theory(self, data_id, theory, state=None):
-        """
-        """
-        if data_id in self.stored_data.keys():
-            data_state = self.stored_data[data_id] 
-            data_state.set_theory(theory_data=theory, theory_state=state)
-            return {data_id: self.stored_data[data_id]}
-        return {}
+    def update_theory(self, theory, data_id=None, state=None):
+        """
+        """
+        uid = data_id
+        if data_id is None and theory is not None:
+            uid = theory.id
+        if uid in self.stored_data.keys():
+             data_state = self.stored_data[uid] 
+        else:
+            data_state = DataState()
+        data_state.uid = uid
+        data_state.set_theory(theory_data=theory, theory_state=state)
+        self.stored_data[uid] = data_state
+        return {uid: self.stored_data[uid]}
+       
     
     def get_message(self):