Changeset 895e7359 in sasview for src/sas/qtgui/Perspectives/Fitting

Timestamp:

Oct 27, 2017 3:42:57 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:

99ea1b0

Parents:

b0b09b9

Message:

Converted more syntax not covered by 2to3

Location:

src/sas/qtgui/Perspectives/Fitting

Files:

• FittingUtilities.py (modified) (1 diff, 1 prop)
• FittingWidget.py (modified) (2 diffs, 1 prop)
• ModelThread.py (modified) (1 diff, 1 prop)

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

@@ -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, item)
 

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

@@ -989 +989 @@
         if not dict:
             return
+        if self._model_model.rowCount() == 0:
+            return
 
         def iterateOverMagnetModel(func):
@@ -1000 +1002 @@
             # Utility function for main model update
             # internal so can use closure for param_dict
+            if self._magnet_model.item(row, 0) is None:
+                return
             param_name = str(self._magnet_model.item(row, 0).text())
             if param_name not in list(param_dict.keys()):

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

@@ -53 +53 @@
         self.starttime = time.time()
         # Determine appropriate q range
-        if self.qmin == None:
+        if self.qmin is None:
             self.qmin = 0
-        if self.qmax == None:
-            if self.data != None:
+        if self.qmax is None:
+            if self.data is not None:
                 newx = math.pow(max(math.fabs(self.data.xmax),
                                    math.fabs(self.data.xmin)), 2)