Changeset fbfc488 in sasview for src/sas/qtgui/Calculators/SldPanel.py

Timestamp:

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

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/Calculators/SldPanel.py (modified) (4 diffs)

src/sas/qtgui/Calculators/SldPanel.py

@@ -128 +128 @@
 
         # set validators
-        self.ui.editMolecularFormula.setValidator(GuiUtils.FormulaValidator(self.ui.editMolecularFormula))
+        # TODO: GuiUtils.FormulaValidator() crashes with Qt5 - fix
+        #self.ui.editMolecularFormula.setValidator(GuiUtils.FormulaValidator(self.ui.editMolecularFormula))
 
         rx = QtCore.QRegExp("[+\-]?(?:0|[1-9]\d*)(?:\.\d*)?(?:[eE][+\-]?\d+)?")
@@ -148 +149 @@
 
         self.model.dataChanged.connect(self.dataChanged)
-        #QtCore.QObject.connect(
-        #    self.model,
-        #    QtCore.SIGNAL("dataChanged(QModelIndex,QModelIndex)"),
-        #    self.dataChanged)
 
         self.modelReset()
@@ -166 +163 @@
             self.mapper.addMapping(edit, key)
 
-        # FIXME DOESNT WORK WITH QT5
-        #self.mapper.toFirst()
+        self.mapper.toFirst()
 
     def dataChanged(self, top, bottom):
@@ -216 +212 @@
         finally:
             pass
-            #self.model.endResetModel()
+        #self.model.endResetModel()
 
     def displayHelp(self):