Changeset 6da3e3d in sasview for src/sas/qtgui/MainWindow/GuiManager.py

Timestamp:

Sep 6, 2018 5:27:00 AM (6 years ago)

Author:

Laura Forster <Awork@…>

Branches:

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

Children:

f84d793, 47471ec

Parents:

0eff615 (diff), 605d944 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'ESS_GUI' of ​https://github.com/SasView/sasview into ESS_GUI

File:

• src/sas/qtgui/MainWindow/GuiManager.py (modified) (4 diffs)

src/sas/qtgui/MainWindow/GuiManager.py

@@ -395 +395 @@
         self.communicate.perspectiveChangedSignal.connect(self.perspectiveChanged)
         self.communicate.updateTheoryFromPerspectiveSignal.connect(self.updateTheoryFromPerspective)
+        self.communicate.deleteIntermediateTheoryPlotsSignal.connect(self.deleteIntermediateTheoryPlotsByModelID)
         self.communicate.plotRequestedSignal.connect(self.showPlot)
         self.communicate.plotFromFilenameSignal.connect(self.showPlotFromFilename)
@@ -438 +439 @@
         self._workspace.actionImage_Viewer.triggered.connect(self.actionImage_Viewer)
         self._workspace.actionOrientation_Viewer.triggered.connect(self.actionOrientation_Viewer)
+        self._workspace.actionFreeze_Theory.triggered.connect(self.actionFreeze_Theory)
         # Fitting
         self._workspace.actionNew_Fit_Page.triggered.connect(self.actionNew_Fit_Page)
@@ -684 +686 @@
         self._workspace.addDockWidget(Qt.RightDockWidgetArea, self.ipDockWidget)
 
+    def actionFreeze_Theory(self):
+        """
+        Convert a child index with data into a separate top level dataset
+        """
+        self.filesWidget.freezeCheckedData()
+
     def actionOrientation_Viewer(self):
         """
@@ -879 +887 @@
         """
         self.filesWidget.updateTheoryFromPerspective(index)
+
+    def deleteIntermediateTheoryPlotsByModelID(self, model_id):
+        """
+        Catch the signal to delete items in the Theory item model which correspond to a model ID.
+        Send the request to the DataExplorer for updating the theory model.
+        """
+        self.filesWidget.deleteIntermediateTheoryPlotsByModelID(model_id)
 
     def updateModelFromDataOperationPanel(self, new_item, new_datalist_item):