Changeset b0b09b9 in sasview for src/sas/qtgui/Perspectives/Fitting/FittingUtilities.py

Timestamp:

Oct 26, 2017 3:13:05 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:

895e7359

Parents:

def64a0

Message:

Initial changes to make SasView? run with python3

File:

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

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

@@ -44 +44 @@
     Returns a list of all multi-shell parameters in 'model'
     """
-    return list(filter(lambda par: "[" in par.name, model.iq_parameters))
+    return list([par for par in model.iq_parameters if "[" in par.name])
 
 def getMultiplicity(model):
@@ -156 +156 @@
     """
     for i, item in enumerate(model_header_captions):
-        model.setHeaderData(i, QtCore.Qt.Horizontal, QtCore.QVariant(item))
+        #model.setHeaderData(i, QtCore.Qt.Horizontal, QtCore.QVariant(item))
+        model.setHeaderData(i, QtCore.Qt.Horizontal, item)
 
     model.header_tooltips = model_header_tooltips
@@ -167 +168 @@
     model_header_error_captions.insert(2, header_error_caption)
     for i, item in enumerate(model_header_error_captions):
-        model.setHeaderData(i, QtCore.Qt.Horizontal, QtCore.QVariant(item))
+        model.setHeaderData(i, QtCore.Qt.Horizontal, item)
 
     model_header_error_tooltips = model_header_tooltips
@@ -178 +179 @@
     """
     for i, item in enumerate(poly_header_captions):
-        model.setHeaderData(i, QtCore.Qt.Horizontal, QtCore.QVariant(item))
+        model.setHeaderData(i, QtCore.Qt.Horizontal, item)
 
     model.header_tooltips = poly_header_tooltips
@@ -190 +191 @@
     poly_header_error_captions.insert(2, header_error_caption)
     for i, item in enumerate(poly_header_error_captions):
-        model.setHeaderData(i, QtCore.Qt.Horizontal, QtCore.QVariant(item))
+        model.setHeaderData(i, QtCore.Qt.Horizontal, item)
 
     poly_header_error_tooltips = poly_header_tooltips
@@ -202 +203 @@
     multishell_parameters = getIterParams(parameters)
 
-    for i in xrange(index):
+    for i in range(index):
         for par in multishell_parameters:
             # Create the name: <param>[<i>], e.g. "sld1" for parameter "sld[n]"
@@ -396 +397 @@
 
 def binary_encode(i, digits):
-    return [i >> d & 1 for d in xrange(digits)]
+    return [i >> d & 1 for d in range(digits)]
 
 def getWeight(data, is2d, flag=None):