Changeset 1dc8ec9 in sasview

Timestamp:

Jan 13, 2017 12:23:48 PM (8 years ago)

Author:

smk78

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, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

b61bd57

Parents:

73cbeec

Message:

Provisioning for #784. Changed TRANSFORM_LABEL to TRANSFORM_LABEL1. In
addition, created TRANSFORM_LABEL3.

Location:

src/sas/sasgui/perspectives/corfunc

Files:

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

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

@@ -67 +67 @@
             return []
         data = plotpanel.plots[graph.selected_plottable]
-        if data.id == IQ_DATA_LABEL or data.id == IQ_EXTRAPOLATED_DATA_LABEL or data.id == TRANSFORM_LABEL:
+        if data.id == IQ_DATA_LABEL or data.id == IQ_EXTRAPOLATED_DATA_LABEL or data.id == TRANSFORM_LABEL1 or data.id == TRANSFORM_LABEL3:
             return []
         item = plotpanel.plots[graph.selected_plottable]
@@ -179 +179 @@
                 # Show the extrapolation as a curve instead of points
                 new_plot.symbol = GUIFRAME_ID.CURVE_SYMBOL_NUM
-        elif label == TRANSFORM_LABEL:
+        elif label == TRANSFORM_LABEL1 or label == TRANSFORM_LABEL3:
             new_plot.xaxis("{x}", 'A')
             new_plot.yaxis("{\\Gamma}", '')

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

@@ -274 +274 @@
         plot_x = transform.x[np.where(transform.x <= 200)]
         plot_y = transform.y[np.where(transform.x <= 200)]
-        self._manager.show_data(Data1D(plot_x, plot_y), TRANSFORM_LABEL)
+        self._manager.show_data(Data1D(plot_x, plot_y), TRANSFORM_LABEL1)
         # 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

@@ -4 +4 @@
 
 GROUP_ID_TRANSFORM = r"$\Gamma(x)$"
-TRANSFORM_LABEL = r"$\Gamma(x)$"
+TRANSFORM_LABEL1 = r"$\Gamma1(x)$"
+TRANSFORM_LABEL3 = r"$\Gamma3(x)$"