Changeset ff8cb73 in sasview

Timestamp:

Oct 25, 2017 4:11:27 AM (7 years ago)

Author:

Adam Washington <adam.washington@…>

Children:

7be7136

Parents:

c57ecca

Message:

Update to latest version of corfunc

File:

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

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

@@ -67 +67 @@
         self.draw()
 
-    def drawRealSpace(self):
+    def draw_real_space(self):
         self.fig.clf()
 
@@ -75 +75 @@
 
         if self.data:
-            self.axes.plot(self.data.x, self.data.y)
-            self.axes.set_xlim(min(self.data.x), max(self.data.x)/4)
+            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, label="Interface Distribution Function")
+            self.axes.set_xlim(min(self.data.x), max(self.data.x) / 4)
+            self.axes.legend()
 
         self.draw()
@@ -188 +191 @@
             pass
 
-        def completefn(transform):
-            self._realplot.data = transform
-            self._realplot.drawRealSpace()
-            params = self._calculator.extract_parameters(transform)
-            self.model.setItem(W.W_CORETHICK, QtGui.QStandardItem(str(params['d0'])))
-            self.model.setItem(W.W_INTTHICK, QtGui.QStandardItem(str(params['dtr'])))
-            self.model.setItem(W.W_HARDBLOCK, QtGui.QStandardItem(str(params['Lc'])))
-            self.model.setItem(W.W_CRYSTAL, QtGui.QStandardItem(str(params['fill'])))
-            self.model.setItem(W.W_POLY, QtGui.QStandardItem(str(params['A'])))
-            self.model.setItem(W.W_PERIOD, QtGui.QStandardItem(str(params['max'])))
+        def completefn(transforms):
+            (trans1, trans3, idf) = transforms
+            self._realplot.data = trans1
+            self._realplot.data3 = trans3
+            self._realplot.data_idf = idf
+            self._realplot.draw_real_space()
+            params = self._calculator.extract_parameters(trans1)
+            self.model.setItem(W.W_CORETHICK,
+                               QtGui.QStandardItem(str(params['d0'])))
+            self.model.setItem(W.W_INTTHICK,
+                               QtGui.QStandardItem(str(params['dtr'])))
+            self.model.setItem(W.W_HARDBLOCK,
+                               QtGui.QStandardItem(str(params['Lc'])))
+            self.model.setItem(W.W_CRYSTAL,
+                               QtGui.QStandardItem(str(params['fill'])))
+            self.model.setItem(W.W_POLY,
+                               QtGui.QStandardItem(str(params['A'])))
+            self.model.setItem(W.W_PERIOD,
+                               QtGui.QStandardItem(str(params['max'])))
 
         self._update_calculator()