Changeset 490e230 in sasview

Timestamp:

Nov 6, 2018 7:52:21 AM (6 years ago)

Author:

Piotr Rozyczko <piotr.rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

be74751

Parents:

17e2d502

Message:

Working batch page in project save/load

File:

• src/sas/qtgui/MainWindow/DataExplorer.py (modified) (3 diffs)

src/sas/qtgui/MainWindow/DataExplorer.py

@@ -365 +365 @@
         return all_data
 
+    def getItemForID(self, id):
+        # return the model item with the given ID
+        item = None
+        for model in (self.model, self.theory_model):
+            for i in range(model.rowCount()):
+                properties = {}
+                item = model.item(i)
+                data = GuiUtils.dataFromItem(item)
+                if data is None: continue
+                if data.id != id: continue
+                # We found the item - return it
+                break
+        return item
+
     def getAllData(self):
         """
@@ -430 +444 @@
         If so, pull out relevant indices and recreate the batch page(s)
         """
-        batch_page_counter = 0
-        # {counter:[[item1, item2,...], {properties}]}
-        batch_page_dict = {}
         batch_pages = []
         for key, value in all_data.items():
@@ -441 +452 @@
                 if page['is_batch_fitting'][0] != 'True':
                     continue
-                batch_ids = page['data_id']
-                batch_pages.append(batch_ids)
-        # Now we have all batchpages in batch_pages.
-        # remove duplicates
-        #for page in batch_pages:
-        #    if page in 
+                batch_ids = page['data_id'][0]
+                # check for duplicates
+                batch_set = set(batch_ids)
+                if batch_set in batch_pages:
+                    continue
+                # Found a unique batch page. Send it away
+                items = [self.getItemForID(i) for i in batch_set]
+                # Update the batch page list
+                batch_pages.append(batch_set)
+                # Assign parameters to the most recent (current) page.
+                self._perspective().setData(data_item=items, is_batch=True)
+                self._perspective().updateFromParameters(page)
+
+        pass
 
     def updatePerspectiveWithProperties(self, key, value):