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

Timestamp:

Nov 9, 2017 6:43:07 AM (6 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 05:50:09)

git-committer:

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

Message:

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

File:

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

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

@@ -3 +3 @@
 """
 import numpy as np
-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 Data2D
@@ -21 +22 @@
     'LOG_SPACED']
 
-class DataWidgetMapper(QtGui.QDataWidgetMapper):
+class DataWidgetMapper(QtWidgets.QDataWidgetMapper):
     """
     Custom version of the standard QDataWidgetMapper allowing for proper
@@ -32 +33 @@
             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))
 
-        elif isinstance(widget, QtGui.QCheckBox):
+        elif isinstance(widget, QtWidgets.QCheckBox):
             delegate = self.itemDelegate()
             widget.stateChanged.connect(lambda: delegate.commitData.emit(widget))
 
-class OptionsWidget(QtGui.QWidget, Ui_tabOptions):
+class OptionsWidget(QtWidgets.QWidget, Ui_tabOptions):
     plot_signal = QtCore.pyqtSignal()
     def __init__(self, parent=None, logic=None):
@@ -52 +53 @@
 
         # Weight radio box group
-        self.weightingGroup = QtGui.QButtonGroup()
+        self.weightingGroup = QtWidgets.QButtonGroup()
         self.weighting = 0
 
@@ -114 +115 @@
         self.mapper.addMapping(self.txtNpts,     MODEL.index('NPTS'))
         self.mapper.addMapping(self.chkLogData,  MODEL.index('LOG_SPACED'))
-        self.mapper.toFirst()
+        # FIXME DOESNT WORK WITH QT5
+        #self.mapper.toFirst()
 
     def toggleLogData(self, isChecked):