Changeset f159d1b in sasview for src

Timestamp:

Oct 24, 2017 7:11:43 AM (7 years ago)

Author:

Adam Washington <adam.washington@…>

Children:

f7b73d5

Parents:

22e6043

git-author:

Adam Washington <adam.washington@…> (10/24/17 07:05:40)

git-committer:

Adam Washington <adam.washington@…> (10/24/17 07:11:43)

Message:

Live update drawing

File:

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

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

@@ -28 +28 @@
         self.fig = Figure(figsize=(width, height), dpi=dpi)
         self.axes = self.fig.add_subplot(111)
-        # # We want the axes cleared every time plot() is called
-        # self.axes.hold(False)
-        self.axes.set_xscale("log")
-        self.axes.set_yscale("log")
-
-        # self.compute_initial_figure()
 
         FigureCanvas.__init__(self, self.fig)
@@ -43 +37 @@
         # FigureCanvas.updateGeometry(self)
 
-    def sizeHint(self):
-        w, h = self.get_width_height()
-        return QSize(w, h)
-
-    def minimumSizeHint(self):
-        return QSize(10, 10)
+        self.data = None
+        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)
+        self.axes.set_xscale("log")
+        self.axes.set_yscale("log")
+
+        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)
+        if self.extrap:
+            print(self.extrap)
+            self.axes.plot(self.extrap.x, self.extrap.y)
+
+        self.draw()
+
+
+
+    # def sizeHint(self):
+    #     w, h = self.get_width_height()
+    #     return QSize(w, h)
+
+    # def minimumSizeHint(self):
+    #     return QSize(10, 10)
 
 
@@ -68 +91 @@
 
         self._canvas = MyMplCanvas(self)
-        self.verticalLayout_7.addWidget(self._canvas)
+        self.verticalLayout_7.insertWidget(0,self._canvas)
 
         # Connect buttons to slots.
@@ -109 +132 @@
             self.qMin.setValue(value)
             self._calculator.lowerq = value
+            self._canvas.qmin = value
         elif item.row() == W.W_QMAX:
             value = float(self.model.item(W.W_QMAX).text())
             self.qMax1.setValue(value)
             self._calculator.upperq = (value, self._calculator.upperq[1])
+            self._canvas.qmax1 = value
         elif item.row() == W.W_QCUTOFF:
             value = float(self.model.item(W.W_QCUTOFF).text())
             self.qMax2.setValue(value)
             self._calculator.upperq = (self._calculator.upperq[0], value)
+            self._canvas.qmax2 = value
         elif item.row() == W.W_BACKGROUND:
             value = float(self.model.item(W.W_BACKGROUND).text())
@@ -123 +149 @@
         else:
             print("{} Changed".format(item))
+
+        self._canvas.drawQSpace()
 
 
@@ -132 +160 @@
         self.porodSigma.setValue(params['sigma'])
         print(params)
+        self._canvas.extrap = extrapolation
+        self._canvas.drawQSpace()
 
 
@@ -182 +212 @@
         self._calculator.set_data(data)
 
-        self._canvas.axes.plot(data.x, data.y)
+        self._canvas.data = data
+        self._canvas.drawQSpace()
 
         # self.model.item(WIDGETS.W_FILENAME).setData(QtCoreQVariant(self._model_item.text()))