Changeset cee5c78 in sasview for src/sas/qtgui/Perspectives

Timestamp:

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

7fb471d

Parents:

b3e8629

git-author:

Piotr Rozyczko <rozyczko@…> (10/27/17 03:42:57)

git-committer:

Piotr Rozyczko <rozyczko@…> (11/09/17 08:41:55)

Message:

Converted more syntax not covered by 2to3

Location:

src/sas/qtgui/Perspectives

Files:

• Fitting/FittingUtilities.py (modified) (1 diff, 1 prop)
• Fitting/FittingWidget.py (modified) (2 diffs)
• Fitting/ModelThread.py (modified) (1 diff, 1 prop)
• Invariant/InvariantPerspective.py (modified) (3 diffs, 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

@@ -995 +995 @@
         if not dict:
             return
+        if self._model_model.rowCount() == 0:
+            return
 
         def iterateOverMagnetModel(func):
@@ -1006 +1008 @@
             # 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)

src/sas/qtgui/Perspectives/Invariant/InvariantPerspective.py

@@ -297 +297 @@
 
             # Add the plot to the model item
-            # variant_item = QtCore.QVariant(self._plotter)
-            variant_item = QtCore.QVariant(extrapolated_data)
-
             # This needs to run in the main thread
             reactor.callFromThread(GuiUtils.updateModelItemWithPlot,
-                    self._model_item, variant_item, title)
+                    self._model_item, extrapolated_data, title)
 
         if self._high_extrapolate:
@@ -322 +319 @@
 
             # Add the plot to the model item
-            # variant_item = QtCore.QVariant(self._plotter)
-            variant_item = QtCore.QVariant(high_out_data)
             # This needs to run in the main thread
             reactor.callFromThread(GuiUtils.updateModelItemWithPlot,
-                    self._model_item, variant_item, title)
+                    self._model_item, high_out_data, title)
 
         item = QtGui.QStandardItem(str(float('%.5g'% volume_fraction)))
@@ -561 +556 @@
         # Extract data on 1st child - this is the Data1D/2D component
         data = GuiUtils.dataFromItem(self._model_item)
-        self.model.item(WIDGETS.W_FILENAME).setData(QtCore.QVariant(self._model_item.text()))
+        self.model.item(WIDGETS.W_FILENAME).setData(self._model_item.text())
 
         ##### DEBUG ####