Changeset b2669f5 in sasview for src/sas/sasgui

Timestamp:

Mar 18, 2016 6:24:33 AM (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, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

fdeabcc

Parents:

6177333 (diff), c81f9b6 (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' of ​https://github.com/SasView/sasview.git

Location:

src/sas/sasgui/perspectives/fitting

Files:

• batchfitpage.py (modified) (1 diff)
• fitpage.py (modified) (1 diff)
• fitproblem.py (modified) (1 diff)

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

@@ -15 +15 @@
 
 from sas.sasgui.perspectives.fitting.basepage import PageInfoEvent
-from sas.models.qsmearing import smear_selection
+from sas.sascalc.data_util.qsmearing import smear_selection
 from sas.sasgui.perspectives.fitting.fitpage import FitPage
 from sas.sasgui.perspectives.fitting.fitpage import check_data_validity

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

@@ -26 +26 @@
 from sas.sasgui.perspectives.fitting.basepage import BasicPage as BasicPage
 from sas.sasgui.perspectives.fitting.basepage import PageInfoEvent as PageInfoEvent
-from sas.models.qsmearing import smear_selection
+from sas.sascalc.data_util.qsmearing import smear_selection
 from .basepage import ModelTextCtrl
 

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

@@ -14 +14 @@
 ################################################################################
 import copy
-from sas.models.qsmearing import smear_selection
+from sas.sascalc.data_util.qsmearing import smear_selection
 
 class FitProblemComponent(object):