Changeset f7b73d5 in sasview for src/sas

Timestamp:

Oct 24, 2017 10:04:16 AM (7 years ago)

Author:

Adam Washington <adam.washington@…>

Children:

c1b3ffb

Parents:

f159d1b

Message:

Display transformed value

Location:

src/sas/qtgui/Perspectives/Corfunc

Files:

• CorfuncPerspective.py (modified) (4 diffs)
• CorfuncUtils.py (added)
• UI/CorfuncPanel.ui (modified) (7 diffs)

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

@@ -59 +59 @@
             self.axes.axvline(self.qmax2)
         if self.extrap:
-            print(self.extrap)
             self.axes.plot(self.extrap.x, self.extrap.y)
 
         self.draw()
 
+    def drawRealSpace(self):
+        self.fig.clf()
+
+        self.axes = self.fig.add_subplot(111)
+        self.axes.set_xscale("linear")
+        self.axes.set_yscale("linear")
+
+        if self.data:
+            self.axes.plot(self.data.x, self.data.y)
+
+        self.draw()
 
 
@@ -91 +101 @@
 
         self._canvas = MyMplCanvas(self)
+        self._realplot = MyMplCanvas(self)
         self.verticalLayout_7.insertWidget(0,self._canvas)
+        self.verticalLayout_7.insertWidget(1, self._realplot)
 
         # Connect buttons to slots.
@@ -106 +118 @@
         self.extractBtn.clicked.connect(self.action)
         self.extrapolateBtn.clicked.connect(self.extrapolate)
-        self.transformBtn.clicked.connect(self.action)
+        self.transformBtn.clicked.connect(self.transform)
 
         self.calculateBgBtn.clicked.connect(self.calculateBackground)
@@ -159 +171 @@
         self.porodK.setValue(params['K'])
         self.porodSigma.setValue(params['sigma'])
-        print(params)
         self._canvas.extrap = extrapolation
         self._canvas.drawQSpace()
 
+
+    def transform(self):
+        if self.fourierBtn.isChecked():
+            method = "fourier"
+        elif self.hilbertBtn.isChecked():
+            method = "hilbert"
+
+        extrap = self._canvas.extrap
+        bg = self._calculator.background
+        def updatefn(*args, **kwargs):
+            pass
+
+        def completefn(transform):
+            self._realplot.data = transform
+            self._realplot.drawRealSpace()
+
+        self._calculator.compute_transform(extrap, method, bg, completefn, updatefn)
 
 

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

@@ -15 +15 @@
   </property>
   <layout class="QGridLayout" name="gridLayout">
-   <item row="0" column="0">
-    <layout class="QVBoxLayout" name="verticalLayout_7">
+   <item row="1" column="0">
+    <layout class="QVBoxLayout" name="verticalLayout_7" stretch="1,0,0">
+     <item>
+      <spacer name="verticalSpacer">
+       <property name="orientation">
+        <enum>Qt::Vertical</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>20</width>
+         <height>40</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
      <item>
       <layout class="QHBoxLayout" name="horizontalLayout_2">
@@ -156 +169 @@
       <layout class="QHBoxLayout" name="horizontalLayout_3">
        <item>
-        <layout class="QVBoxLayout" name="verticalLayout_2">
+        <layout class="QVBoxLayout" name="verticalLayout_2" stretch="1,1,1">
          <item alignment="Qt::AlignHCenter">
           <widget class="QLabel" name="label_5">
@@ -169 +182 @@
             <string>Fourier</string>
            </property>
+           <property name="checked">
+            <bool>true</bool>
+           </property>
           </widget>
          </item>
@@ -181 +197 @@
        </item>
        <item>
-        <layout class="QVBoxLayout" name="verticalLayout">
+        <layout class="QVBoxLayout" name="verticalLayout" stretch="0,1">
          <item alignment="Qt::AlignHCenter">
           <widget class="QLabel" name="label_3">
@@ -191 +207 @@
          <item>
           <layout class="QFormLayout" name="formLayout">
+           <property name="sizeConstraint">
+            <enum>QLayout::SetMinimumSize</enum>
+           </property>
+           <property name="fieldGrowthPolicy">
+            <enum>QFormLayout::FieldsStayAtSizeHint</enum>
+           </property>
            <item row="0" column="0">
             <widget class="QDoubleSpinBox" name="qMin">
@@ -256 +278 @@
        </item>
        <item>
-        <layout class="QVBoxLayout" name="verticalLayout_6">
+        <layout class="QVBoxLayout" name="verticalLayout_6" stretch="0,1">
          <item alignment="Qt::AlignHCenter">
           <widget class="QLabel" name="label_13">
@@ -265 +287 @@
          </item>
          <item>
-          <layout class="QHBoxLayout" name="horizontalLayout">
+          <layout class="QHBoxLayout" name="horizontalLayout" stretch="0,0,0">
            <item>
             <widget class="QPushButton" name="extrapolateBtn">