Changeset 2f55df6 in sasview

Timestamp:

Sep 27, 2018 4:13:13 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:

51b9c14

Parents:

b38871e

git-author:

Piotr Rozyczko <piotr.rozyczko@…> (09/27/18 04:11:38)

git-committer:

Piotr Rozyczko <piotr.rozyczko@…> (09/27/18 04:13:13)

Message:

Slicer Parameters should also close the corresponding subwindow on exit.
Also: fixed toFloat() conversion.
SASVIEW-1115

Location:

src/sas/qtgui/Plotting

Files:

• Plotter2D.py (modified) (2 diffs)
• SlicerParameters.py (modified) (3 diffs)
• UnitTesting/SlicerParametersTest.py (modified) (1 diff)

src/sas/qtgui/Plotting/Plotter2D.py

@@ -229 +229 @@
         def slicer_closed():
             # Need to disconnect the signal!!
-            self.slicer_widget.close_signal.disconnect()
+            self.slicer_widget.closeWidgetSignal.disconnect()
+            self.manager.parent.workspace().removeSubWindow(self.slicer_subwindow)
             # reset slicer_widget on "Edit Slicer Parameters" window close
             self.slicer_widget = None
@@ -237 +238 @@
         self.slicer_widget = SlicerParameters(model=self.param_model,
                                               validate_method=self.slicer.validate)
-        self.slicer_widget.close_signal.connect(slicer_closed)
+        self.slicer_widget.closeWidgetSignal.connect(slicer_closed)
         # Add the plot to the workspace
-        self.manager.parent.workspace().addSubWindow(self.slicer_widget)
+        self.slicer_subwindow = self.manager.parent.workspace().addSubWindow(self.slicer_widget)
 
         self.slicer_widget.show()

src/sas/qtgui/Plotting/SlicerParameters.py

@@ -20 +20 @@
     passed from a slicer instance.
     """
-    close_signal = QtCore.pyqtSignal()
+    closeWidgetSignal = QtCore.pyqtSignal()
     def __init__(self, model=None, validate_method=None):
         super(SlicerParameters, self).__init__()
@@ -79 +79 @@
         signal to the parent.
         """
-        self.close_signal.emit()
+        self.closeWidgetSignal.emit()
         if event:
             event.accept()
@@ -163 +163 @@
 
         # Find out the changed parameter name and proposed value
-        new_value = self.editor.text().toFloat()[0]
-        param_name = str(model.sourceModel().item(index.row(),0).text())
+        new_value = GuiUtils.toDouble(self.editor.text())
+        param_name = model.sourceModel().item(index.row(),0).text()
 
         validated = True

src/sas/qtgui/Plotting/UnitTesting/SlicerParametersTest.py

@@ -60 +60 @@
 
         # Set up the spy
-        spy_close = QtSignalSpy(self.widget, self.widget.close_signal)
+        spy_close = QtSignalSpy(self.widget, self.widget.closeWidgetSignal)
         # Click on the "Close" button
         QtTest.QTest.mouseClick(self.widget.buttonBox.button(QtWidgets.QDialogButtonBox.Close), QtCore.Qt.LeftButton)