Changeset 50a77df in sasview for src/sas/sasgui/perspectives/fitting/basepage.py

Timestamp:

Mar 15, 2016 11:18:39 AM (8 years ago)

Author:

ajj

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, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

f66d9d1

Parents:

02098e3 (diff), 0b63c6e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into sasmodels-integration

File:

• src/sas/sasgui/perspectives/fitting/basepage.py (moved) (moved from src/sas/perspectives/fitting/basepage.py) (3 diffs)

src/sas/sasgui/perspectives/fitting/basepage.py

@@ -14 +14 @@
 from collections import defaultdict
 from wx.lib.scrolledpanel import ScrolledPanel
-from sas.guiframe.panel_base import PanelBase
-from sas.guiframe.utils import format_number, check_float, IdList
-from sas.guiframe.events import PanelOnFocusEvent
-from sas.guiframe.events import StatusEvent
-from sas.guiframe.events import AppendBookmarkEvent
-from sas.guiframe.dataFitting import Data2D
-from sas.guiframe.dataFitting import Data1D
-from sas.guiframe.dataFitting import check_data_validity
-from sas.guiframe.gui_style import GUIFRAME_ID
-from sas.dataloader.data_info import Detector
-from sas.dataloader.data_info import Source
-from sas.perspectives.fitting.pagestate import PageState
-from sas.guiframe.CategoryInstaller import CategoryInstaller
-from sas.guiframe.documentation_window import DocumentationWindow
+from sas.sasgui.guiframe.panel_base import PanelBase
+from sas.sasgui.guiframe.utils import format_number, check_float, IdList
+from sas.sasgui.guiframe.events import PanelOnFocusEvent
+from sas.sasgui.guiframe.events import StatusEvent
+from sas.sasgui.guiframe.events import AppendBookmarkEvent
+from sas.sasgui.guiframe.dataFitting import Data2D
+from sas.sasgui.guiframe.dataFitting import Data1D
+from sas.sasgui.guiframe.dataFitting import check_data_validity
+from sas.sasgui.guiframe.gui_style import GUIFRAME_ID
+from sas.sascalc.dataloader.data_info import Detector
+from sas.sascalc.dataloader.data_info import Source
+from sas.sasgui.perspectives.fitting.pagestate import PageState
+from sas.sasgui.guiframe.CategoryInstaller import CategoryInstaller
+from sas.sasgui.guiframe.documentation_window import DocumentationWindow
 
 
@@ -1808 +1808 @@
                     temp_smear = self.current_smearer
             # compute weight for the current data
-            from sas.perspectives.fitting.utils import get_weight
+            from sas.sasgui.perspectives.fitting.utils import get_weight
             flag = self.get_weight_flag()
             weight = get_weight(data=self.data, is2d=self._is_2D(), flag=flag)
@@ -1833 +1833 @@
         x, y = self.model.getProfile()
 
-        from sas.plottools import Data1D as pf_data1d
-        #from sas.perspectives.theory.profile_dialog import SLDPanel
-        from sas.guiframe.local_perspectives.plotting.profile_dialog \
+        from sas.sasgui.plottools import Data1D as pf_data1d
+        #from sas.sasgui.perspectives.theory.profile_dialog import SLDPanel
+        from sas.sasgui.guiframe.local_perspectives.plotting.profile_dialog \
         import SLDPanel
         sld_data = pf_data1d(x, y)