Changeset e2e5f3d in sasview

Timestamp:

Oct 1, 2018 9:22:15 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:

b8745fa

Parents:

0d2629f

git-author:

Piotr Rozyczko <piotr.rozyczko@…> (10/01/18 09:19:42)

git-committer:

Piotr Rozyczko <piotr.rozyczko@…> (10/01/18 09:22:15)

Message:

Fixed freeze on theory curves - SASVIEW-1185

Location:

src/sas/qtgui

Files:

• MainWindow/DataExplorer.py (modified) (2 diffs)
• MainWindow/DataManager.py (modified) (1 diff)
• Plotting/Plotter.py (modified) (1 diff)

src/sas/qtgui/MainWindow/DataExplorer.py

@@ -536 +536 @@
         self.cbgraph.setCurrentIndex(ind)
         self.cbgraph.setItemText(ind, current_name)
+
+    def add_data(self, data_list):
+        """
+        Update the data manager with new items
+        """
+        self.manager.add_data(data_list)
 
     def updateGraphCount(self, graph_list):
@@ -1205 +1211 @@
         self.model.endResetModel()
 
+    def freezeDataToItem(self, data=None):
+        """
+        Freeze given set of data to main model
+        """
+        if data is None:
+            return
+        self.model.beginResetModel()
+        new_item = GuiUtils.createModelItemWithPlot(data, data.name)
+
+        self.model.appendRow(new_item)
+        self.model.endResetModel()
+
     def freezeSelectedItems(self):
         """

src/sas/qtgui/MainWindow/DataManager.py

@@ -150 +150 @@
     def add_data(self, data_list):
         """
-        receive a list of
+        receive a list of data items for storage
         """
         for id, data in data_list.items():

src/sas/qtgui/Plotting/Plotter.py

@@ -467 +467 @@
         """
         plot = self.plot_dict[id]
-        self.manager.add_data(data_list=[plot])
+        self.manager.add_data(data_list={id:plot})
+        self.manager.freezeDataToItem(plot)
 
     def onModifyPlot(self, id):