Changeset fbfc488 in sasview for src/sas/qtgui/Plotting/BoxSum.py

Timestamp:

Nov 9, 2017 8:43:55 AM (7 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

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

Children:

d6b8a1d

Parents:

7969b9c

git-author:

Piotr Rozyczko <rozyczko@…> (11/03/17 10:58:39)

git-committer:

Piotr Rozyczko <rozyczko@…> (11/09/17 08:43:55)

Message:

More Qt5 related fixes.

File:

• src/sas/qtgui/Plotting/BoxSum.py (modified) (4 diffs)

src/sas/qtgui/Plotting/BoxSum.py

@@ -11 +11 @@
 
 class BoxSum(QtWidgets.QDialog, Ui_BoxSumUI):
-    apply_signal = QtCore.pyqtSignal(tuple, str)
     def __init__(self, parent=None, model=None):
         super(BoxSum, self).__init__()
@@ -24 +23 @@
 
         self.model = model
-        self.mapper = QtGui.QDataWidgetMapper()
+        self.mapper = QtWidgets.QDataWidgetMapper()
         self.mapper.setModel(self.model)
 
@@ -32 +31 @@
         self.mapper.addMapping(self.txtCenterX, 2)
         self.mapper.addMapping(self.txtCenterY, 3)
-        self.mapper.addMapping(self.lblAvg, 4, "text")
-        self.mapper.addMapping(self.lblAvgErr, 5, "text")
-        self.mapper.addMapping(self.lblSum, 6, "text")
-        self.mapper.addMapping(self.lblSumErr, 7, "text")
-        self.mapper.addMapping(self.lblNumPoints, 8, "text")
+        self.mapper.addMapping(self.lblAvg, 4, b"text")
+        self.mapper.addMapping(self.lblAvgErr, 5, b"text")
+        self.mapper.addMapping(self.lblSum, 6, b"text")
+        self.mapper.addMapping(self.lblSumErr, 7, b"text")
+        self.mapper.addMapping(self.lblNumPoints, 8, b"text")
 
         # Populate the widgets with data from the first column
@@ -43 +42 @@
         self.setFixedSize(self.minimumSizeHint())
 
+        # Handle the Apply button click
+        self.buttonBox.button(QtWidgets.QDialogButtonBox.Close).clicked.connect(self.onClose)
+
+    def onClose(self):
+        """
+        close the window containing this panel
+        """
+        self.close()
+