Changeset 37d53225 in sasview for src/sas/sasgui/perspectives

Timestamp:

Jul 18, 2017 10:55:35 AM (7 years ago)

Author:

lewis

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

7dda833

Parents:

626f833

Message:

Implement computation of IDF

Location:

src/sas/sasgui/perspectives/corfunc

Files:

• corfunc.py (modified) (1 diff)
• corfunc_panel.py (modified) (2 diffs)
• plot_labels.py (modified) (1 diff)

src/sas/sasgui/perspectives/corfunc/corfunc.py

@@ -189 +189 @@
             # Show the transformation as a curve instead of points
             new_plot.symbol = GUIFRAME_ID.CURVE_SYMBOL_NUM
+        elif label == IDF_LABEL:
+            new_plot.xaxis("{x}", 'A')
+            new_plot.yaxis("{G}", '')
+
+            new_plot.xtransform = 'x'
+            new_plot.ytransform = 'y'
+            group_id = GROUP_ID_IDF
+            new_plot.symbol = GUIFRAME_ID.CURVE_SYMBOL_NUM
         new_plot.id = label
         new_plot.name = label

src/sas/sasgui/perspectives/corfunc/corfunc_panel.py

@@ -276 +276 @@
             return
         self._transformed_data = transforms
-        (transform1, transform3) = transforms
+        (transform1, transform3, idf) = transforms
         import numpy as np
         plot_x = transform1.x[np.where(transform1.x <= 200)]
@@ -283 +283 @@
         # No need to shorten gamma3 as it's only calculated up to x=200
         self._manager.show_data(transform3, TRANSFORM_LABEL3)
+        self._manager.show_data(idf, IDF_LABEL)
         # Only enable extract params button if a fourier trans. has been done
         if self.transform_type == 'fourier':

src/sas/sasgui/perspectives/corfunc/plot_labels.py

@@ -6 +6 @@
 TRANSFORM_LABEL1 = r"$\Gamma_1(x)$"
 TRANSFORM_LABEL3 = r"$\Gamma_3(x)$"
+
+GROUP_ID_IDF = r"$G(x)$"
+IDF_LABEL = r"$G(x)$"