Changeset d6b8a1d in sasview for src/sas/qtgui/Calculators

Timestamp:

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

53c771e

Parents:

fbfc488

git-author:

Piotr Rozyczko <rozyczko@…> (11/07/17 08:29:59)

git-committer:

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

Message:

More Qt5 related fixes

Location:

src/sas/qtgui/Calculators

Files:

• DataOperationUtilityPanel.py (modified) (1 diff)
• GenericScatteringCalculator.py (modified) (1 diff)
• ResolutionCalculatorPanel.py (modified) (1 diff)

src/sas/qtgui/Calculators/DataOperationUtilityPanel.py

@@ -56 +56 @@
 
         # validator for coefficient
-        self.txtNumber.setValidator(QtGui.QDoubleValidator())
+        self.txtNumber.setValidator(GuiUtils.DoubleValidator())
 
         self.layoutOutput = QtWidgets.QHBoxLayout()

src/sas/qtgui/Calculators/GenericScatteringCalculator.py

@@ -611 +611 @@
             'options': QtWidgets.QFileDialog.DontUseNativeDialog}
         # Query user for filename.
-        filename = str(QtWidgets.QFileDialog.getSaveFileName(**kwargs))
+        filename_tuple = QtWidgets.QFileDialog.getSaveFileName(**kwargs)
+        filename = name_tuple[0]
         if filename:
             try:
-                if os.path.splitext(filename)[1].lower() == '.sld':
-                    sas_gen.SLDReader().write(filename, self.sld_data)
-                else:
-                    sas_gen.SLDReader().write('.'.join((filename, 'sld')),
-                                              self.sld_data)
+                _, extension = os.path.splitext(filename)
+                if not extension:
+                    filename = '.'.join((filename, 'sld'))
+                sas_gen.SLDReader().write(filename, self.sld_data)
             except:
                 raise

src/sas/qtgui/Calculators/ResolutionCalculatorPanel.py

@@ -106 +106 @@
 
         # double validator
-        self.txtSource2SampleDistance.setValidator(QtGui.QDoubleValidator())
-        self.txtSample2DetectorDistance.setValidator(QtGui.QDoubleValidator())
-        self.txtSampleOffset.setValidator(QtGui.QDoubleValidator())
+        self.txtSource2SampleDistance.setValidator(GuiUtils.DoubleValidator())
+        self.txtSample2DetectorDistance.setValidator(GuiUtils.DoubleValidator())
+        self.txtSampleOffset.setValidator(GuiUtils.DoubleValidator())
 
         # call compute to calculate with default values