Changeset 5eebcd6 in sasview

Timestamp:

Sep 26, 2018 6:23:29 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:

9d23e4c

Parents:

009c7a4

Message:

Close subWindow properly. SASVIEW-1115

Location:

src/sas/qtgui/Plotting

Files:

• BoxSum.py (modified) (2 diffs)
• Plotter2D.py (modified) (2 diffs)

src/sas/qtgui/Plotting/BoxSum.py

@@ -13 +13 @@
 
 class BoxSum(QtWidgets.QDialog, Ui_BoxSumUI):
+    closeWidgetSignal = QtCore.pyqtSignal()
     def __init__(self, parent=None, model=None):
         super(BoxSum, self).__init__()
@@ -44 +45 @@
         self.setFixedSize(self.minimumSizeHint())
 
-        # Handle the Apply button click
-        self.buttonBox.button(QtWidgets.QDialogButtonBox.Close).clicked.connect(self.onClose)
+        # Handle the Close button click
+        self.buttonBox.button(QtWidgets.QDialogButtonBox.Close).clicked.connect(lambda:self.closeWidgetSignal.emit())
 
-    def onClose(self):
-        """
-        close the window containing this panel
-        """
-        self.close()
-

src/sas/qtgui/Plotting/Plotter2D.py

@@ -335 +335 @@
         self.slicer.update()
 
+        def boxWidgetClosed():
+            # Need to disconnect the signal!!
+            self.boxwidget.closeWidgetSignal.disconnect()
+            # reset box on "Edit Slicer Parameters" window close
+            self.manager.parent.workspace().removeSubWindow(self.boxwidget_subwindow)
+            self.boxwidget = None
+
         # Get the BoxSumCalculator model.
         self.box_sum_model = self.slicer.model()
@@ -340 +347 @@
         self.boxwidget = BoxSum(self, model=self.box_sum_model)
         # Add the plot to the workspace
-        self.manager.parent.workspace().addSubWindow(self.boxwidget)
+        self.boxwidget_subwindow = self.manager.parent.workspace().addSubWindow(self.boxwidget)
+        self.boxwidget.closeWidgetSignal.connect(boxWidgetClosed)
+
         self.boxwidget.show()