Index: src/sas/qtgui/Perspectives/Corfunc/CorfuncPerspective.py
===================================================================
--- src/sas/qtgui/Perspectives/Corfunc/CorfuncPerspective.py (revision a3c421739d17aa2f47f14c3fe4021acf03076816)
+++ src/sas/qtgui/Perspectives/Corfunc/CorfuncPerspective.py (revision 6930b91ff56befe2c8d86e3b38146b4ef37f524e)
@@ -189,8 +189,5 @@
def transform(self):
"""Calculate the real space version of the extrapolation."""
- if self.fourierBtn.isChecked():
- method = "fourier"
- elif self.hilbertBtn.isChecked():
- method = "hilbert"
+ method = str(self.model.item(W.W_TRANSFORM).text()).lower()
extrap = self._canvas.extrap
@@ -233,4 +230,5 @@
self.mapper.addMapping(self.qMax2, W.W_QCUTOFF)
self.mapper.addMapping(self.bg, W.W_BACKGROUND)
+ self.mapper.addMapping(self.transformCombo, W.W_TRANSFORM)
self.mapper.addMapping(self.guinierA, W.W_GUINIERA)
Index: src/sas/qtgui/Perspectives/Corfunc/UI/CorfuncPanel.ui
===================================================================
--- src/sas/qtgui/Perspectives/Corfunc/UI/CorfuncPanel.ui (revision c1b3ffbcf89c7e31092c60c5a4687475af6474e4)
+++ src/sas/qtgui/Perspectives/Corfunc/UI/CorfuncPanel.ui (revision 6930b91ff56befe2c8d86e3b38146b4ef37f524e)
@@ -136,32 +136,4 @@
- -
-
-
-
-
-
- Background
-
-
-
- -
-
-
- true
-
-
- 4
-
-
-
- -
-
-
- Calculate Background
-
-
-
-
-
@@ -259,36 +231,4 @@
-
-
-
-
-
-
-
-
- Transform Type
-
-
-
- -
-
-
-
-
-
- Hilbert
-
-
-
- -
-
-
- Fourier
-
-
- true
-
-
-
-
-
-
-
-
@@ -296,16 +236,20 @@
- Q Range
+ Controls
-
-
+
QLayout::SetMinimumSize
-
- QFormLayout::FieldsStayAtSizeHint
-
+
-
+
+
+ Background
+
+
+
-
@@ -348,4 +292,37 @@
+ -
+
+
+ Transform Type
+
+
+
+ -
+
+
+ Cutoff
+
+
+
+ -
+
+
-
+
+ Fourier
+
+
+
+
+ -
+
+
+ true
+
+
+ 4
+
+
+
-
@@ -361,27 +338,12 @@
- -
-
-
- Cutoff
-
-
-
-
-
-
-
- -
-
-
-
-
-
- Controls
-
-
-
- -
-
-
-
+
-
+
+
+ Calculate Background
+
+
+
+ -
@@ -390,5 +352,5 @@
- -
+
-