Changeset 4ee041f in sasview for sasview

Timestamp:

Mar 15, 2016 9:02:33 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:

66f21cd

Parents:

06aaa75d (diff), 12e19bd (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 ESS_dev

Location:

sasview

Files:

• default_categories.json (modified) (1 diff)
• test/1d_data/saxess_example.pdh (added)
• installer_generator.py (modified) (1 diff)
• local_config.py (modified) (1 diff)
• sasview.py (modified) (5 diffs)
• setup_exe.py (modified) (3 diffs)
• setup_mac.py (modified) (3 diffs)
• welcome_panel.py (modified) (1 diff)

sasview/default_categories.json

@@ -1 @@
-{"Shapes": [["PearlNecklaceModel", true], ["HollowCylinderModel", true], ["CoreMultiShellModel", true], ["FCCrystalModel", true], ["CoreShellEllipsoidXTModel", true], ["FuzzySphereModel", true], ["CSParallelepipedModel", true], ["EllipticalCylinderModel", true], ["BCCrystalModel", true], ["LamellarFFHGModel", true], ["RectangularHollowPrismInfThinWallsModel", true], ["LamellarPCrystalModel", true], ["OnionExpShellModel", true], ["VesicleModel", true], ["MultiShellModel", true], ["RaspBerryModel", true], ["CoreShellEllipsoidModel", true], ["CappedCylinderModel", true], ["CylinderModel", true], ["SphericalSLDModel", true], ["StackedDisksModel", true], ["LamellarPSHGModel", true], ["CoreShellBicelleModel", true], ["RectangularHollowPrismModel", true], ["LamellarPSModel", true], ["EllipsoidModel", true], ["SphereModel", true], ["ParallelepipedModel", true], ["TriaxialEllipsoidModel", true], ["LamellarModel", true], ["PringlesModel", true], ["RectangularPrismModel", true], ["CoreShellCylinderModel", true], ["BinaryHSModel", true], ["FlexibleCylinderModel", true], ["SCCrystalModel", true], ["FlexCylEllipXModel", true], ["LinearPearlsModel", true], ["CoreShellModel", true]], "Structure Factor": [["SquareWellStructure", true], ["HayterMSAStructure", true], ["HardsphereStructure", true], ["StickyHSStructure", true]], "Shape-Independent": [["TwoPowerLawModel", true], ["GelFitModel", true], ["DABModel", true], ["PowerLawAbsModel", true], ["PorodModel", true], ["MassFractalModel", true], ["RPA10Model", true], ["TeubnerStreyModel", true], ["DebyeModel", true], ["MassSurfaceFractal", true], ["Core2ndMomentModel", true], ["TwoLorentzianModel", true], ["UnifiedPowerRgModel", true], ["PolymerExclVolume", true], ["BEPolyelectrolyte", true], ["GuinierModel", true], ["GuinierPorodModel", true], ["CorrLengthModel", true], ["StarPolymer", true], ["FractalModel", true], ["PeakLorentzModel", true], ["BroadPeakModel", true], ["PeakGaussModel", true], ["FractalCoreShellModel", true], ["Poly_GaussCoil", true], ["SurfaceFractalModel", true], ["GaussLorentzGelModel", true], ["LorentzModel", true]], "Uncategorized": [["ReflectivityModel", true], ["ReflectivityIIModel", true], ["LineModel", true], ["MicelleSphCoreModel", true]]}
+{"Shapes": [["BarBellModel", true], ["PearlNecklaceModel", true], ["HollowCylinderModel", true], ["CoreMultiShellModel", true], ["FCCrystalModel", true], ["ParallelepipedModel", true], ["FuzzySphereModel", true], ["CoreShellEllipsoidXTModel", true], ["LamellarPCrystalModel", true], ["BCCrystalModel", true], ["EllipticalCylinderModel", true], ["RectangularHollowPrismInfThinWallsModel", true], ["CSParallelepipedModel", true], ["OnionExpShellModel", true], ["MultiShellModel", true], ["RaspBerryModel", true], ["CoreShellEllipsoidModel", true], ["CappedCylinderModel", true], ["CylinderModel", true], ["SphericalSLDModel", true], ["SCCrystalModel", true], ["StackedDisksModel", true], ["LamellarPSHGModel", true], ["CoreShellBicelleModel", true], ["RectangularHollowPrismModel", true], ["LamellarPSModel", true], ["EllipsoidModel", true], ["SphereModel", true], ["VesicleModel", true], ["TriaxialEllipsoidModel", true], ["LamellarModel", true], ["PringlesModel", true], ["RectangularPrismModel", true], ["CoreShellCylinderModel", true], ["BinaryHSModel", true], ["FlexibleCylinderModel", true], ["LamellarFFHGModel", true], ["FlexCylEllipXModel", true], ["LinearPearlsModel", true], ["CoreShellModel", true]], "Structure Factor": [["SquareWellStructure", true], ["HayterMSAStructure", true], ["HardsphereStructure", true], ["StickyHSStructure", true]], "Shape-Independent": [["TwoPowerLawModel", true], ["GelFitModel", true], ["DABModel", true], ["PowerLawAbsModel", true], ["PorodModel", true], ["GuinierModel", true], ["RPA10Model", true], ["TeubnerStreyModel", true], ["StarPolymer", true], ["UnifiedPowerRgModel", true], ["MassSurfaceFractal", true], ["Core2ndMomentModel", true], ["TwoLorentzianModel", true], ["DebyeModel", true], ["MassFractalModel", true], ["GuinierPorodModel", true], ["CorrLengthModel", true], ["PolymerExclVolume", true], ["FractalModel", true], ["PeakLorentzModel", true], ["BroadPeakModel", true], ["FractalCoreShellModel", true], ["PeakGaussModel", true], ["BEPolyelectrolyte", true], ["Poly_GaussCoil", true], ["SurfaceFractalModel", true], ["GaussLorentzGelModel", true], ["LorentzModel", true]], "Uncategorized": [["ReflectivityModel", true], ["ReflectivityIIModel", true], ["LineModel", true], ["MicelleSphCoreModel", true]]}

sasview/installer_generator.py

@@ -45 +45 @@
         
         #(ext, type, name, flags)
-        from sas.dataloader.loader import Loader
+        from sas.sascalc.dataloader.loader import Loader
         wild_cards = Loader().get_wildcards()
         for item in wild_cards:

sasview/local_config.py

@@ -4 +4 @@
 import time
 import os
-from sas.guiframe.gui_style import GUIFRAME
+from sas.sasgui.guiframe.gui_style import GUIFRAME
 import sas.sasview
 import logging

sasview/sasview.py

@@ -88 +88 @@
     reload(sys)
     sys.setdefaultencoding("iso-8859-1")
-from sas.guiframe import gui_manager
-from sas.guiframe.gui_style import GUIFRAME
+from sas.sasgui.guiframe import gui_manager
+from sas.sasgui.guiframe.gui_style import GUIFRAME
 from welcome_panel import WelcomePanel
 # For py2exe, import config here
@@ -116 +116 @@
         # Fitting perspective
         try:
-            import sas.perspectives.fitting as module    
+            import sas.sasgui.perspectives.fitting as module    
             fitting_plug = module.Plugin()
             self.gui.add_perspective(fitting_plug)
@@ -125 +125 @@
         # P(r) perspective
         try:
-            import sas.perspectives.pr as module
+            import sas.sasgui.perspectives.pr as module
             pr_plug = module.Plugin()
             self.gui.add_perspective(pr_plug)
@@ -134 +134 @@
         #Invariant perspective
         try:
-            import sas.perspectives.invariant as module
+            import sas.sasgui.perspectives.invariant as module
             invariant_plug = module.Plugin()
             self.gui.add_perspective(invariant_plug)
-        except:
+        except Exception as e :
             logging.error("%s: could not find Invariant plug-in module"% \
                           APP_NAME)
@@ -144 +144 @@
         #Calculator perspective   
         try:
-            import sas.perspectives.calculator as module
+            import sas.sasgui.perspectives.calculator as module
             calculator_plug = module.Plugin()
             self.gui.add_perspective(calculator_plug)

sasview/setup_exe.py

@@ -244 +244 @@
 data_files += periodictable.data_files()
 
-import sas.perspectives.fitting as fitting
+import sas.sasgui.perspectives.fitting as fitting
 data_files += fitting.data_files()
 
-import sas.perspectives.calculator as calculator
+import sas.sasgui.perspectives.calculator as calculator
 data_files += calculator.data_files()
 
-import sas.perspectives.invariant as invariant
+import sas.sasgui.perspectives.invariant as invariant
 data_files += invariant.data_files()
 
-import sas.guiframe as guiframe
+import sas.sasgui.guiframe as guiframe
 data_files += guiframe.data_files()
 
@@ -264 +264 @@
 
 # Copy the settings file for the sas.dataloader file extension associations
-import sas.dataloader.readers
+import sas.sascalc.dataloader.readers
 f = os.path.join(sas.dataloader.readers.get_data_path(), 'defaults.json')
 if os.path.isfile(f):
@@ -388 +388 @@
 gen.generate_installer()
 #initialize category stuff
-#from sas.guiframe.CategoryInstaller import CategoryInstaller
+#from sas.sasgui.guiframe.CategoryInstaller import CategoryInstaller
 #CategoryInstaller.check_install(s)
 

sasview/setup_mac.py

@@ -13 +13 @@
 from setuptools import setup
 import periodictable.xsf
-import sas.dataloader.readers 
+import sas.sascalc.dataloader.readers 
 import os
 import string
@@ -35 +35 @@
 DATA_FILES = periodictable.data_files()
 #invariant and calculator help doc
-import sas.perspectives.fitting as fitting
+import sas.sasgui.perspectives.fitting as fitting
 DATA_FILES += fitting.data_files()
-import sas.perspectives.calculator as calculator
+import sas.sasgui.perspectives.calculator as calculator
 DATA_FILES += calculator.data_files()
-import sas.perspectives.invariant as invariant
+import sas.sasgui.perspectives.invariant as invariant
 DATA_FILES += invariant.data_files()
 import sas.models as models
 DATA_FILES += models.data_files()
-import sas.guiframe as guiframe
+import sas.sasgui.guiframe as guiframe
 DATA_FILES += guiframe.data_files()
 
@@ -83 +83 @@
         list = []
         EXCEPTION_LIST = ['*', '.', '']
-        from sas.dataloader.loader import Loader
+        from sas.sascalc.dataloader.loader import Loader
         wild_cards = Loader().get_wildcards()
         for item in wild_cards:

sasview/welcome_panel.py

@@ -9 +9 @@
 import local_config as config
 from wx.lib.scrolledpanel import ScrolledPanel
-from sas.guiframe.panel_base import PanelBase
+from sas.sasgui.guiframe.panel_base import PanelBase
 #Font size width
 if sys.platform.count("win32") > 0: