Changeset e4a3302 in sasview

Timestamp:

Oct 24, 2017 9:49:38 AM (6 years ago)

Author:

Adam Washington <adam.washington@…>

Children:

9634f86

Parents:

c1b3ffb

Message:

Move more data into the model

Location:

src/sas/qtgui/Perspectives/Corfunc

Files:

• CorfuncPerspective.py (modified) (5 diffs)
• CorfuncUtils.py (modified) (1 diff)

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

@@ -90 +90 @@
     #def __init__(self, manager=None, parent=None):
     def __init__(self, parent=None):
-        #super(InvariantWindow, self).__init__(parent)
         super(CorfuncWindow, self).__init__()
         self.setupUi(self)
@@ -102 +101 @@
         self._canvas = MyMplCanvas(self)
         self._realplot = MyMplCanvas(self)
-        self.verticalLayout_7.insertWidget(0,self._canvas)
+        self.verticalLayout_7.insertWidget(0, self._canvas)
         self.verticalLayout_7.insertWidget(1, self._realplot)
 
@@ -137 +136 @@
         self.model.setItem(W.W_TRANSFORM,
                            QtGui.QStandardItem("Fourier"))
+        self.model.setItem(W.W_GUINIERA,
+                           QtGui.QStandardItem("0.0"))
+        self.model.setItem(W.W_GUINIERB,
+                           QtGui.QStandardItem("0.0"))
+        self.model.setItem(W.W_PORODK,
+                           QtGui.QStandardItem("0.0"))
+        self.model.setItem(W.W_PORODSIGMA,
+                           QtGui.QStandardItem("0.0"))
 
     def modelChanged(self, item):
         if item.row() == W.W_QMIN:
             value = float(self.model.item(W.W_QMIN).text())
-            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())
-            self.bg.setValue(value)
             self._calculator.background = value
         else:
             print("{} Changed".format(item))
 
+        self.mapper.toFirst()
         self._canvas.drawQSpace()
 
@@ -166 +170 @@
     def extrapolate(self):
         params, extrapolation = self._calculator.compute_extrapolation()
-        self.guinierA.setValue(params['A'])
-        self.guinierB.setValue(params['B'])
-        self.porodK.setValue(params['K'])
-        self.porodSigma.setValue(params['sigma'])
+
+        self.model.setItem(W.W_GUINIERA, QtGui.QStandardItem(str(params['A'])))
+        self.model.setItem(W.W_GUINIERB, QtGui.QStandardItem(str(params['B'])))
+        self.model.setItem(W.W_PORODK, QtGui.QStandardItem(str(params['K'])))
+        self.model.setItem(W.W_PORODSIGMA, QtGui.QStandardItem(str(params['sigma'])))
+
         self._canvas.extrap = extrapolation
         self._canvas.drawQSpace()
@@ -209 +215 @@
         self.mapper.addMapping(self.bg, W.W_BACKGROUND)
 
+        self.mapper.addMapping(self.guinierA, W.W_GUINIERA)
+        self.mapper.addMapping(self.guinierB, W.W_GUINIERB)
+        self.mapper.addMapping(self.porodK, W.W_PORODK)
+        self.mapper.addMapping(self.porodSigma, W.W_PORODSIGMA)
+
         self.mapper.toFirst()
 
     def calculateBackground(self):
         bg = self._calculator.compute_background()
-        print(bg)
-        self.model.setItem(W.W_BACKGROUND, QtGui.QStandardItem(str(bg)))
+        temp = QtGui.QStandardItem(str(bg))
+        self.model.setItem(W.W_BACKGROUND, temp)
 
     def action(self):

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

@@ -8 +8 @@
                 'W_BACKGROUND',
                 'W_TRANSFORM',
+                'W_GUINIERA',
+                'W_GUINIERB',
+                'W_PORODK',
+                'W_PORODSIGMA',
                 )