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

Timestamp:

Oct 24, 2017 12:33:08 PM (7 years ago)

Author:

Adam Washington <adam.washington@…>

Children:

e958531

Parents:

7b21c05

Message:

Everything into the model

File:

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

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

@@ -25 +25 @@
 class MyMplCanvas(FigureCanvas):
     """Ultimately, this is a QWidget (as well as a FigureCanvasAgg, etc.)."""
-    def __init__(self, parent=None, width=5, height=4, dpi=100):
+    def __init__(self, model, parent=None, width=5, height=4, dpi=100):
+        self.model = model
         self.fig = Figure(figsize=(width, height), dpi=dpi)
         self.axes = self.fig.add_subplot(111)
@@ -38 +39 @@
 
         self.data = None
+        self.extrap = None
+
+    def drawQSpace(self):
+        self.fig.clf()
+
         self.qmin = None
         self.qmax1 = None
         self.qmax2 = None
-        self.extrap = None
-
-    def drawQSpace(self):
-        self.fig.clf()
 
         self.axes = self.fig.add_subplot(111)
@@ -50 +52 @@
         self.axes.set_yscale("log")
 
+        qmin = float(self.model.item(W.W_QMIN).text())
+        qmax1 = float(self.model.item(W.W_QMAX).text())
+        qmax2 = float(self.model.item(W.W_QCUTOFF).text())
+
         if self.data:
             self.axes.plot(self.data.x, self.data.y)
-        if self.qmin:
-            self.axes.axvline(self.qmin)
-        if self.qmax1:
-            self.axes.axvline(self.qmax1)
-        if self.qmax2:
-            self.axes.axvline(self.qmax2)
+            self.axes.axvline(qmin)
+            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))
         if self.extrap:
             self.axes.plot(self.extrap.x, self.extrap.y)
@@ -72 +76 @@
         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.draw()
@@ -99 +104 @@
         self._calculator = CorfuncCalculator()
 
-        self._canvas = MyMplCanvas(self)
-        self._realplot = MyMplCanvas(self)
+        self._canvas = MyMplCanvas(self.model, self)
+        self._realplot = MyMplCanvas(self.model, self)
         self.verticalLayout_7.insertWidget(0, self._canvas)
         self.verticalLayout_7.insertWidget(1, self._realplot)
@@ -160 +165 @@
             print("{} Changed".format(item))
 
-        self._update_calculator()
         self.mapper.toFirst()
         self._canvas.drawQSpace()
@@ -172 +176 @@
 
     def extrapolate(self):
+        self._update_calculator()
         params, extrapolation = self._calculator.compute_extrapolation()
 
@@ -205 +210 @@
             self.model.setItem(W.W_PERIOD, QtGui.QStandardItem(str(params['max'])))
 
+        self._update_calculator()
         self._calculator.compute_transform(extrap, method, bg, completefn, updatefn)
 
@@ -233 +239 @@
 
     def calculateBackground(self):
+        self._update_calculator()
         bg = self._calculator.compute_background()
         temp = QtGui.QStandardItem(str(bg))