Changeset b699768 in sasview for src/sas/perspectives/fitting

Timestamp:

Feb 19, 2016 10:07:22 AM (9 years ago)

Author:

Piotr Rozyczko <piotr.rozyczko@…>

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:

d7bb526

Parents:

792e6be

Message:

Initial commit of the refactored SasCalc? module.

Location:

src/sas/perspectives/fitting

Files:

• basepage.py (modified) (1 diff)
• console.py (modified) (1 diff)
• fit_thread.py (modified) (1 diff)
• fitting.py (modified) (2 diffs)
• model_thread.py (modified) (1 diff)
• pagestate.py (modified) (1 diff)

src/sas/perspectives/fitting/basepage.py

@@ -23 +23 @@
 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.sascalc.dataloader.data_info import Detector
+from sas.sascalc.dataloader.data_info import Source
 from sas.perspectives.fitting.pagestate import PageState
 from sas.guiframe.CategoryInstaller import CategoryInstaller

src/sas/perspectives/fitting/console.py

@@ -5 +5 @@
 import time
 import wx
-from sas.fit import FitHandler
+from sas.sascalc.fit import FitHandler
 
 class ConsoleUpdate(FitHandler):

src/sas/perspectives/fitting/fit_thread.py

@@ -2 +2 @@
 import sys
 import time
-from sas.data_util.calcthread import CalcThread
+from sas.sascalc.data_util.calcthread import CalcThread
 
 def map_getattr(classInstance, classFunc, *args):

src/sas/perspectives/fitting/fitting.py

@@ -21 +21 @@
 import models
 
-from sas.dataloader.loader import Loader
+from sas.sascalc.dataloader.loader import Loader
 from sas.guiframe.dataFitting import Data2D
 from sas.guiframe.dataFitting import Data1D
@@ -32 +32 @@
 from sas.guiframe.plugin_base import PluginBase
 from sas.guiframe.data_processor import BatchCell
-from sas.fit.BumpsFitting import BumpsFit as Fit
+from sas.sascalc.fit.BumpsFitting import BumpsFit as Fit
 from sas.perspectives.fitting.console import ConsoleUpdate
 from sas.perspectives.fitting.fitproblem import FitProblemDictionary

src/sas/perspectives/fitting/model_thread.py

@@ -6 +6 @@
 import numpy
 import math
-from sas.data_util.calcthread import CalcThread
+from sas.sascalc.data_util.calcthread import CalcThread
 
 class Calc2D(CalcThread):

src/sas/perspectives/fitting/pagestate.py

@@ -25 +25 @@
 from lxml import etree
 
-import sas.dataloader
-from sas.dataloader.readers.cansas_reader import Reader as CansasReader
-from sas.dataloader.readers.cansas_reader import get_content, write_node
-from sas.dataloader.data_info import Data2D
-from sas.dataloader.data_info import Collimation
-from sas.dataloader.data_info import Detector
-from sas.dataloader.data_info import Process
-from sas.dataloader.data_info import Aperture
+import sas.sascalc.dataloader
+from sas.sascalc.dataloader.readers.cansas_reader import Reader as CansasReader
+from sas.sascalc.dataloader.readers.cansas_reader import get_content, write_node
+from sas.sascalc.dataloader.data_info import Data2D
+from sas.sascalc.dataloader.data_info import Collimation
+from sas.sascalc.dataloader.data_info import Detector
+from sas.sascalc.dataloader.data_info import Process
+from sas.sascalc.dataloader.data_info import Aperture
 #Information to read/write state as xml
 FITTING_NODE_NAME = 'fitting_plug_in'