Changeset 7b21c05 in sasview

Timestamp:

Oct 24, 2017 12:15:21 PM (7 years ago)

Author:

Adam Washington <adam.washington@…>

Children:

cadd595a

Parents:

1bb879d

Message:

Move more data into the model

File:

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

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

@@ -151 +151 @@
         if item.row() == W.W_QMIN:
             value = float(self.model.item(W.W_QMIN).text())
-            self._calculator.lowerq = value
             self._canvas.qmin = value
-        elif item.row() == W.W_QMAX:
-            value = float(self.model.item(W.W_QMAX).text())
-            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._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())
-            self._calculator.background = value
+        elif item.row() == W.W_QMAX or item.row() == W.W_QCUTOFF:
+            a = float(self.model.item(W.W_QMAX).text())
+            b = float(self.model.item(W.W_QCUTOFF).text())
+            self._canvas.qmax1 = a
+            self._canvas.qmax2 = b
         else:
             print("{} Changed".format(item))
 
+        self._update_calculator()
         self.mapper.toFirst()
         self._canvas.drawQSpace()
 
+    def _update_calculator(self):
+        self._calculator.lowerq = 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())
+        self._calculator.upperq = (qmax1, qmax2)
+        self._calculator.background = float(self.model.item(W.W_BACKGROUND).text())
 
     def extrapolate(self):
@@ -190 +190 @@
 
         extrap = self._canvas.extrap
-        bg = self._calculator.background
+        bg = float(self.model.item(W.W_BACKGROUND).text())
         def updatefn(*args, **kwargs):
             pass