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

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/calculator

Files:

• collimation_editor.py (modified) (1 diff)
• console.py (modified) (1 diff)
• data_editor.py (modified) (1 diff)
• data_operator.py (modified) (1 diff)
• detector_editor.py (modified) (1 diff)
• gen_scatter_panel.py (modified) (1 diff)
• image_viewer.py (modified) (1 diff)
• kiessig_calculator_panel.py (modified) (1 diff)
• load_thread.py (modified) (1 diff)
• resolcal_thread.py (modified) (1 diff)
• resolution_calculator_panel.py (modified) (1 diff)
• sample_editor.py (modified) (1 diff)
• slit_length_calculator_panel.py (modified) (1 diff)
• source_editor.py (modified) (1 diff)

src/sas/perspectives/calculator/collimation_editor.py

@@ -4 +4 @@
 import sys
 from copy import deepcopy
-from sas.dataloader.loader import Loader
-from sas.dataloader.data_info import Aperture, Collimation
+from sas.sascalc.dataloader.loader import Loader
+from sas.sascalc.dataloader.data_info import Aperture, Collimation
 from aperture_editor import ApertureDialog
 

src/sas/perspectives/calculator/console.py

@@ -4 +4 @@
 import wx
 import sys
-from sas.dataloader.loader import Loader
+from sas.sascalc.dataloader.loader import Loader
 
 _BOX_WIDTH = 60

src/sas/perspectives/calculator/data_editor.py

@@ -5 +5 @@
 from copy import deepcopy
 
-from sas.dataloader.loader import Loader
-from sas.dataloader.data_info import Data2D
+from sas.sascalc.dataloader.loader import Loader
+from sas.sascalc.dataloader.data_info import Data2D
 from detector_editor import DetectorDialog
 from collimation_editor import CollimationDialog

src/sas/perspectives/calculator/data_operator.py

@@ -6 +6 @@
 import time
 import numpy
-from sas.dataloader.data_info import Data1D
+from sas.sascalc.dataloader.data_info import Data1D
 from sas.plottools.PlotPanel import PlotPanel
 from sas.plottools.plottables import Graph

src/sas/perspectives/calculator/detector_editor.py

@@ -3 +3 @@
 import sys
 from copy import deepcopy
-from sas.dataloader.data_info import Detector
+from sas.sascalc.dataloader.data_info import Detector
 from sas.guiframe.utils import check_float
 

src/sas/perspectives/calculator/gen_scatter_panel.py

@@ -20 +20 @@
 
 #from sas.guiframe.gui_manager import MDIFrame
-from sas.data_util.calcthread import CalcThread
+from sas.sascalc.data_util.calcthread import CalcThread
 from sas.guiframe.local_perspectives.plotting.SimplePlot import PlotFrame
 from sas.guiframe.dataFitting import Data2D
 from sas.guiframe.dataFitting import Data1D
-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.guiframe.panel_base import PanelBase
 from sas.guiframe.utils import format_number
 from sas.guiframe.events import StatusEvent
-from sas.calculator import sas_gen
+from sas.sascalc.calculator import sas_gen
 from sas.perspectives.calculator.calculator_widgets import OutputTextCtrl
 from sas.perspectives.calculator.calculator_widgets import InputTextCtrl

src/sas/perspectives/calculator/image_viewer.py

@@ -13 +13 @@
 from sas.guiframe.events import StatusEvent
 from sas.perspectives.calculator.calculator_widgets import InputTextCtrl
-from sas.dataloader.data_info import Data2D
-from sas.dataloader.data_info import Detector
-from sas.dataloader.manipulations import reader2D_converter
+from sas.sascalc.dataloader.data_info import Data2D
+from sas.sascalc.dataloader.data_info import Detector
+from sas.sascalc.dataloader.manipulations import reader2D_converter
 from sas.guiframe.documentation_window import DocumentationWindow
 

src/sas/perspectives/calculator/kiessig_calculator_panel.py

@@ -13 +13 @@
 
 from sas.guiframe.panel_base import PanelBase
-from sas.calculator.kiessig_calculator import KiessigThicknessCalculator
+from sas.sascalc.calculator.kiessig_calculator import KiessigThicknessCalculator
 from calculator_widgets import OutputTextCtrl
 from calculator_widgets import InputTextCtrl

src/sas/perspectives/calculator/load_thread.py

@@ -3 +3 @@
 """
 import time
-from sas.data_util.calcthread import CalcThread
-from sas.dataloader.loader import Loader
+from sas.sascalc.data_util.calcthread import CalcThread
+from sas.sascalc.dataloader.loader import Loader
 
 class DataReader(CalcThread):

src/sas/perspectives/calculator/resolcal_thread.py

@@ -3 +3 @@
 """
 import time
-from sas.data_util.calcthread import CalcThread
+from sas.sascalc.data_util.calcthread import CalcThread
 
 class CalcRes(CalcThread):

src/sas/perspectives/calculator/resolution_calculator_panel.py

@@ -26 +26 @@
 
 #from sas.guicomm.events import StatusEvent
-from sas.calculator.resolution_calculator import ResolutionCalculator
+from sas.sascalc.calculator.resolution_calculator import ResolutionCalculator
 from sas.guiframe.events import StatusEvent
 from sas.perspectives.calculator.calculator_widgets import OutputTextCtrl

src/sas/perspectives/calculator/sample_editor.py

@@ -546 +546 @@
 if __name__ == "__main__":
     app = wx.App()
-    from sas.dataloader.data_info import Sample
+    from sas.sascalc.dataloader.data_info import Sample
     sample = Sample()
     dlg = SampleDialog(sample=sample)

src/sas/perspectives/calculator/slit_length_calculator_panel.py

@@ -16 +16 @@
 
 from sas.guiframe.events import StatusEvent
-from sas.calculator.slit_length_calculator import SlitlengthCalculator
+from sas.sascalc.calculator.slit_length_calculator import SlitlengthCalculator
 from calculator_widgets import OutputTextCtrl
 from calculator_widgets import InterActiveOutputTextCtrl

src/sas/perspectives/calculator/source_editor.py

@@ -534 +534 @@
 if __name__ == "__main__":
     app = wx.App()
-    from sas.dataloader.data_info import Source
+    from sas.sascalc.dataloader.data_info import Source
     source = Source()
     dlg = SourceDialog(source=source)