Changeset b2c8aef in sasview

Timestamp:

Oct 24, 2017 7:54:06 AM (7 years ago)

Author:

Adam Washington <adam.washington@…>

Children:

7b536da

Parents:

59183b7

git-author:

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

git-committer:

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

Message:

Start calculating results from the model

Location:

src/sas/qtgui/Perspectives/Corfunc

Files:

• CorfuncPerspective.py (modified) (6 diffs)
• UI/CorfuncPanel.ui (modified) (6 diffs)

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

@@ -11 +11 @@
 from sas.qtgui.Plotting.PlotterData import Data1D
 import sas.qtgui.Utilities.GuiUtils as GuiUtils
+from sas.sascalc.corfunc.corfunc_calculator import CorfuncCalculator
 
 # local
@@ -32 +33 @@
         self.model = QtGui.QStandardItemModel(self)
         self.communicate = GuiUtils.Communicate()
+        self._calculator = CorfuncCalculator()
 
         # Connect buttons to slots.
@@ -48 +50 @@
         self.transformBtn.clicked.connect(self.action)
 
+        self.calculateBgBtn.clicked.connect(self.calculateBackground)
+
         self.hilbertBtn.clicked.connect(self.action)
         self.fourierBtn.clicked.connect(self.action)
+
+        self.model.itemChanged.connect(self.modelChanged)
 
     def setupModel(self):
@@ -63 +69 @@
                            QtGui.QStandardItem("Fourier"))
 
+    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
+        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])
+        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)
+        elif item.row() == W.W_BACKGROUND:
+            value = float(self.model.item(W.W_BACKGROUND).text())
+            self.bg.setValue(float(value))
+        else:
+            print("{} Changed".format(item))
+
+
     def setupMapper(self):
         self.mapper = QtGui.QDataWidgetMapper(self)
@@ -75 +101 @@
         self.mapper.toFirst()
 
+    def calculateBackground(self):
+        bg = self._calculator.compute_background()
+        print(bg)
+        self.model.setItem(W.W_BACKGROUND, QtGui.QStandardItem(str(bg)))
 
     def action(self):
@@ -102 +132 @@
         self._model_item = data_item[0]
         data = GuiUtils.dataFromItem(self._model_item)
+        self._calculator.lowerq = 1e-3
+        self._calculator.upperq = (2e-1, 3e-1)
+        self._calculator.set_data(data)
 
         # self.model.item(WIDGETS.W_FILENAME).setData(QtCoreQVariant(self._model_item.text()))

src/sas/qtgui/Perspectives/Corfunc/UI/CorfuncPanel.ui

@@ -38 +38 @@
          <string>Values with q &lt; qmin will be used for Guinier back extrapolation</string>
         </property>
+        <property name="decimals">
+         <number>4</number>
+        </property>
+        <property name="singleStep">
+         <double>0.001000000000000</double>
+        </property>
        </widget>
       </item>
@@ -52 +58 @@
          <string>Values with Uppder &lt; q &lt; Cutoff will be used for Porod forward extrapolation</string>
         </property>
+        <property name="decimals">
+         <number>4</number>
+        </property>
+        <property name="singleStep">
+         <double>0.001000000000000</double>
+        </property>
        </widget>
       </item>
@@ -65 +77 @@
         <property name="toolTip">
          <string>Values with Uppder &lt; q &lt; Cutoff will be used for Porod forward extrapolation</string>
+        </property>
+        <property name="decimals">
+         <number>4</number>
+        </property>
+        <property name="singleStep">
+         <double>0.001000000000000</double>
         </property>
        </widget>
@@ -82 +100 @@
    <property name="geometry">
     <rect>
-     <x>410</x>
-     <y>220</y>
+     <x>120</x>
+     <y>130</y>
      <width>160</width>
      <height>80</height>
@@ -222 +240 @@
          <bool>true</bool>
         </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QPushButton" name="calculateBackground">
+        <property name="decimals">
+         <number>4</number>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QPushButton" name="calculateBgBtn">
         <property name="text">
          <string>Calculate Background</string>
@@ -255 +276 @@
      <layout class="QHBoxLayout" name="horizontalLayout">
       <item>
+       <widget class="QPushButton" name="extrapolateBtn">
+        <property name="text">
+         <string>Extrapolate</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QPushButton" name="transformBtn">
+        <property name="text">
+         <string>Transform</string>
+        </property>
+       </widget>
+      </item>
+      <item>
        <widget class="QPushButton" name="extractBtn">
         <property name="text">
          <string>Extract</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QPushButton" name="transformBtn">
-        <property name="text">
-         <string>Transform</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QPushButton" name="extrapolateBtn">
-        <property name="text">
-         <string>Extrapolate</string>
         </property>
        </widget>