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

Timestamp:

Jul 11, 2016 5:14:07 AM (8 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, 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:

02a8779

Parents:

0bbebee

Message:

Refactor plot labels into separate file

Location:

src/sas/sasgui/perspectives/corfunc

Files:

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

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

@@ -17 +17 @@
 from sas.sascalc.dataloader.loader import Loader
 import sas.sascalc.dataloader
-
-
-GROUP_ID_IQ_DATA = r"$I(q)$"
-IQ_DATA_LABEL = r"$I_{obs}(q)$"
-IQ_EXTRAPOLATED_DATA_LABEL = r"$I_{extrap}(q)$"
-
-GROUP_ID_TRANSFORM = r"$\Gamma(x)$"
-TRANSFORM_LABEL = r"$\Gamma(x)$"
+from plot_labels import *
 
 

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

@@ -13 +13 @@
 import sas.sasgui.perspectives.corfunc.corfunc
 from sas.sascalc.corfunc.corfunc_calculator import CorfuncCalculator
+from plot_labels import *
 
 OUTPUT_STRINGS = {
@@ -152 +153 @@
         self.set_extracted_params(None)
         if self._manager is not None:
-            from sas.sasgui.perspectives.corfunc.corfunc import IQ_DATA_LABEL
             self._manager.clear_data()
             self._manager.show_data(self._data, IQ_DATA_LABEL, reset=True)
@@ -196 +196 @@
         plot_y = self._extrapolated_data.y[0:numpts]
         to_plot = Data1D(plot_x, plot_y)
-        from sas.sasgui.perspectives.corfunc.corfunc import\
-            IQ_EXTRAPOLATED_DATA_LABEL
         self._manager.show_data(to_plot, IQ_EXTRAPOLATED_DATA_LABEL)
         self._transform_btn.Enable()
@@ -218 +216 @@
             return
         self._transformed_data = transformed_data
-        from sas.sasgui.perspectives.corfunc.corfunc import TRANSFORM_LABEL
         import numpy as np
         plot_x = transformed_data.x[np.where(transformed_data.x <= 200)]
@@ -298 +295 @@
         self.background = float(self._background_input.GetValue())
         self._calculator.background = self.background
-        from sas.sasgui.perspectives.corfunc.corfunc import GROUP_ID_IQ_DATA,\
-            IQ_DATA_LABEL
         if event is not None:
             active_ctrl = event.GetEventObject()
@@ -318 +313 @@
         is_click = event.LeftDown()
         if is_click:
-            from sas.sasgui.perspectives.corfunc.corfunc import GROUP_ID_IQ_DATA,\
-                IQ_DATA_LABEL
             wx.PostEvent(self._manager.parent, PlotQrangeEvent(
                 ctrl=[self._qmin_input, self._qmax1_input, self._qmax2_input],