Changeset a3c4217 in sasview for src/sas/qtgui/Perspectives/Corfunc/CorfuncPerspective.py

Timestamp:

Oct 25, 2017 5:09:18 AM (7 years ago)

Author:

Adam Washington <adam.washington@…>

Children:

6930b91

Parents:

be6f7af

Message:

Lint free

File:

• src/sas/qtgui/Perspectives/Corfunc/CorfuncPerspective.py (modified) (8 diffs)

src/sas/qtgui/Perspectives/Corfunc/CorfuncPerspective.py

@@ +1 @@
+"""
+This module provides the intelligence behind the gui interface for Corfunc.
+"""
 # pylint: disable=E1101
 
@@ -6 +9 @@
 
 # sas-global
+# pylint: disable=import-error, no-name-in-module
 import sas.qtgui.Utilities.GuiUtils as GuiUtils
 from sas.sascalc.corfunc.corfunc_calculator import CorfuncCalculator
+# pylint: enable=import-error, no-name-in-module
 
 # local
@@ -53 +58 @@
             self.axes.axvline(qmax1)
             self.axes.axvline(qmax2)
-            self.axes.set_xlim(min(self.data.x), max(self.data.x) * 1.5 -
-                               0.5 * min(self.data.x))
+            self.axes.set_xlim(min(self.data.x) / 2,
+                               max(self.data.x) * 1.5 - 0.5 * min(self.data.x))
         if self.extrap:
             self.axes.plot(self.extrap.x, self.extrap.y)
@@ -74 +79 @@
 
         if self.data:
-            self.axes.plot(self.data.x, self.data.y, label="1D Correlation")
-            self.axes.plot(self.data3.x, self.data3.y, label="3D Correlation")
-            self.axes.plot(self.data_idf.x, self.data_idf.y,
+            data1, data3, data_idf = self.data
+            self.axes.plot(data1.x, data1.y, label="1D Correlation")
+            self.axes.plot(data3.x, data3.y, label="3D Correlation")
+            self.axes.plot(data_idf.x, data_idf.y,
                            label="Interface Distribution Function")
-            self.axes.set_xlim(min(self.data.x), max(self.data.x) / 4)
+            self.axes.set_xlim(min(data1.x), max(data1.x) / 4)
             self.axes.legend()
 
@@ -88 +94 @@
     name = "Corfunc"  # For displaying in the combo box
 
+# pylint: disable=unused-argument
     def __init__(self, parent=None):
         super(CorfuncWindow, self).__init__()
@@ -196 +203 @@
         def completefn(transforms):
             """Extract the values from the transforms and plot"""
-            (trans1, trans3, idf) = transforms
-            self._realplot.data = trans1
-            self._realplot.data3 = trans3
-            self._realplot.data_idf = idf
+            self._realplot.data = transforms
             self._realplot.draw_real_space()
-            params = self._calculator.extract_parameters(trans1)
+            params = self._calculator.extract_parameters(transforms[0])
             self.model.setItem(W.W_CORETHICK,
                                QtGui.QStandardItem(str(params['d0'])))
@@ -251 +255 @@
         self.model.setItem(W.W_BACKGROUND, temp)
 
-    def allowBatch(self):
+    # pylint: disable=invalid-name
+    @staticmethod
+    def allowBatch():
         """
         We cannot perform corfunc analysis in batch at this time.
@@ -286 +292 @@
 
         self._allow_close = value
+    # pylint: enable=invalid-name