Changeset 4992ff2 in sasview for src/sas/qtgui/Perspectives/Fitting/SmearingWidget.py

Timestamp:

Nov 9, 2017 8:43:07 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:

7969b9c

Parents:

7fb471d

git-author:

Piotr Rozyczko <rozyczko@…> (10/30/17 07:50:09)

git-committer:

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

Message:

Initial, in-progress version. Not really working atm. SASVIEW-787

File:

• src/sas/qtgui/Perspectives/Fitting/SmearingWidget.py (modified) (5 diffs, 1 prop)

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

@@ -2 +2 @@
 Widget/logic for smearing data.
 """
-from PyQt4 import QtGui
-from PyQt4 import QtCore
+from PyQt5 import QtCore
+from PyQt5 import QtGui
+from PyQt5 import QtWidgets
 
 from sas.qtgui.Plotting.PlotterData import Data1D
@@ -11 +12 @@
 from sas.qtgui.Perspectives.Fitting.UI.SmearingWidgetUI import Ui_SmearingWidgetUI
 
-class DataWidgetMapper(QtGui.QDataWidgetMapper):
+class DataWidgetMapper(QtWidgets.QDataWidgetMapper):
     """
     Custom version of the standard QDataWidgetMapper allowing for proper
@@ -22 +23 @@
             super(DataWidgetMapper, self).addMapping(widget, section, propertyName)
 
-        if isinstance(widget, QtGui.QComboBox):
+        if isinstance(widget, QtWidgets.QComboBox):
             delegate = self.itemDelegate()
             widget.currentIndexChanged.connect(lambda: delegate.commitData.emit(widget))
@@ -35 +36 @@
     'ACCURACY']
 
-class SmearingWidget(QtGui.QWidget, Ui_SmearingWidgetUI):
+class SmearingWidget(QtWidgets.QWidget, Ui_SmearingWidgetUI):
     def __init__(self, parent=None):
         super(SmearingWidget, self).__init__()
@@ -83 +84 @@
         self.mapper.addMapping(self.cbSmearing,   MODEL.index('SMEARING'))
         self.mapper.addMapping(self.cbAccuracy,   MODEL.index('ACCURACY'))
-        self.mapper.toFirst()
+
+        # FIXME DOESNT WORK WITH QT5
+        #self.mapper.toFirst()
 
     def updateSmearing(self, data=None):