Changeset d1ad101 in sasview for src/sas

Timestamp:

Jan 8, 2019 5:44:06 AM (6 years ago)

Author:

Piotr Rozyczko <piotr.rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_opencl, ESS_GUI_sync_sascalc

Children:

bbcf9f0

Parents:

10786bc2

Message:

Be careful with standard item lifetime. SASVIEW-1231

Location:

src/sas/qtgui

Files:

• MainWindow/DataExplorer.py (modified) (2 diffs)
• MainWindow/GuiManager.py (modified) (1 diff)
• Perspectives/Fitting/FittingWidget.py (modified) (1 diff)

src/sas/qtgui/MainWindow/DataExplorer.py

@@ -640 +640 @@
         # Figure out which rows are checked
         ind = -1
-        # Use 'while' so the row count is forced at every iteration
+
+        deleted_items = []
+        deleted_names = []
         while ind < self.theory_model.rowCount():
             ind += 1
             item = self.theory_model.item(ind)
+
             if item and item.isCheckable() and item.checkState() == QtCore.Qt.Checked:
                 # Delete these rows from the model
+                deleted_names.append(str(self.theory_model.item(ind).text()))
+                deleted_items.append(item)
+
                 self.theory_model.removeRow(ind)
                 # Decrement index since we just deleted it
                 ind -= 1
 
-        # pass temporarily kept as a breakpoint anchor
-        pass
+        # Let others know we deleted data
+        self.communicator.dataDeletedSignal.emit(deleted_items)
+
+        # update stored_data
+        self.manager.update_stored_data(deleted_names)
 
     def sendData(self, event=None):
@@ -1810 +1819 @@
             raise AttributeError(msg)
 
-        # Check if there are any other items for this tab
-        # If so, delete them
+        # Check if there exists an item for this tab
+        # If so, replace it
         current_tab_name = model_item.text()
         for current_index in range(self.theory_model.rowCount()):
-            if current_tab_name == self.theory_model.item(current_index).text():
-                self.theory_model.removeRow(current_index)
-                break
-        # send in the new item
+            current_item = self.theory_model.item(current_index)
+            if current_tab_name == current_item.text():
+                # replace data instead
+                new_data = GuiUtils.dataFromItem(model_item)
+                current_item.child(0).setData(new_data)
+                return current_item
+
+        # add the new item to the model
         self.theory_model.appendRow(model_item)
+        return model_item
 
     def deleteIntermediateTheoryPlotsByModelID(self, model_id):

src/sas/qtgui/MainWindow/GuiManager.py

@@ -1049 +1049 @@
         Send the request to the DataExplorer for updating the theory model.
         """
-        self.filesWidget.updateTheoryFromPerspective(index)
+        item = self.filesWidget.updateTheoryFromPerspective(index)
+        # Now notify the perspective that the item was/wasn't replaced
+        per = self.perspective()
+        if not isinstance(per, FittingWindow):
+            # currently only fitting supports generation of theories.
+            return
+        per.currentTab.setTheoryItem(item)
 
     def deleteIntermediateTheoryPlotsByModelID(self, model_id):

src/sas/qtgui/Perspectives/Fitting/FittingWidget.py

@@ -2619 +2619 @@
         """
         name = self.nameFromData(fitted_data)
-        # Notify the GUI manager so it can create the theory model in DataExplorer
-        self.theory_item = GuiUtils.createModelItemWithPlot(fitted_data, name=name)
-        self.communicate.updateTheoryFromPerspectiveSignal.emit(self.theory_item)
+        # Modify the item or add it if new
+        theory_item = GuiUtils.createModelItemWithPlot(fitted_data, name=name)
+        self.communicate.updateTheoryFromPerspectiveSignal.emit(theory_item)
+
+    def setTheoryItem(self, item):
+        """
+        Reset the theory item based on the data explorer update
+        """
+        self.theory_item = item
 
     def nameFromData(self, fitted_data):