Changeset a3c96f7a in sasview for guiframe/data_manager.py

Timestamp:

Mar 21, 2011 5:18:01 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:

ec611aad

Parents:

6512644

Message:

updating plot display

File:

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

guiframe/data_manager.py

@@ -120 +120 @@
         return name
     
-    def add_data(self, data_list):
-        """
-        receive a list of 
+    def add_theory_data(self, data_list):
+        """
         """
         for id, data in data_list.iteritems():
@@ -130 +129 @@
                 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):
+        """
+        receive a list of 
+        """
+        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.data = data
             else:
                 data_state = DataState(data)
-                data_state.id = time.time()
+                data_state.id = id
                 self.stored_data[id] = data_state