Changeset d85c194 in sasview for src/sas/sasgui/perspectives/simulation

Timestamp:

Feb 22, 2016 9:04:24 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:

06aaa75d

Parents:

d7bb526

Message:

Remaining modules refactored

Location:

src/sas/sasgui/perspectives/simulation

Files:

• ShapeAdapter.py (moved) (moved from src/sas/perspectives/simulation/ShapeAdapter.py) (3 diffs)
• ShapeParameters.py (moved) (moved from src/sas/perspectives/simulation/ShapeParameters.py)
• SimCanvas.py (moved) (moved from src/sas/perspectives/simulation/SimCanvas.py)
• __init__.py (moved) (moved from src/sas/perspectives/simulation/__init__.py)
• requirements.txt (moved) (moved from src/sas/perspectives/simulation/requirements.txt)
• simulation.py (moved) (moved from src/sas/perspectives/simulation/simulation.py) (1 diff)

src/sas/sasgui/perspectives/simulation/ShapeAdapter.py

@@ -8 +8 @@
 copyright 2009, University of Tennessee
 """
-import sas.realspace.VolumeCanvas as VolumeCanvas
+import sas.sascalc.realspace.VolumeCanvas as VolumeCanvas
 
 class ShapeVisitor:
@@ -31 +31 @@
             @return: VolumeCanvas.CylinderDescriptor object
         """
-        from sas.realspace.VolumeCanvas import CylinderDescriptor
+        from sas.sascalc.realspace.VolumeCanvas import CylinderDescriptor
         desc = CylinderDescriptor()
          
@@ -56 +56 @@
             @return: VolumeCanvas.SphereDescriptor object
         """
-        from sas.realspace.VolumeCanvas import SphereDescriptor
+        from sas.sascalc.realspace.VolumeCanvas import SphereDescriptor
         desc = SphereDescriptor()
          

src/sas/sasgui/perspectives/simulation/simulation.py

@@ -18 +18 @@
 import ShapeParameters
 import ShapeAdapter
-from sas.guiframe.dataFitting import Data1D
+from sas.sasgui.guiframe.dataFitting import Data1D
 # Real-space simulation import
-import sas.realspace.VolumeCanvas as VolumeCanvas
+import sas.sascalc.realspace.VolumeCanvas as VolumeCanvas
 
 from sas.sascalc.data_util.calcthread import CalcThread