- Timestamp:
- Mar 15, 2016 9:02:33 AM (8 years ago)
- 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. - Location:
- sasview
- Files:
-
- 1 added
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
sasview/default_categories.json
rd26dea0 rdb46d13 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]]}1 {"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
r3a39c2e rb699768 45 45 46 46 #(ext, type, name, flags) 47 from sas. dataloader.loader import Loader47 from sas.sascalc.dataloader.loader import Loader 48 48 wild_cards = Loader().get_wildcards() 49 49 for item in wild_cards: -
sasview/local_config.py
r957af0d rd85c194 4 4 import time 5 5 import os 6 from sas. guiframe.gui_style import GUIFRAME6 from sas.sasgui.guiframe.gui_style import GUIFRAME 7 7 import sas.sasview 8 8 import logging -
sasview/sasview.py
r85130cb rd85c194 88 88 reload(sys) 89 89 sys.setdefaultencoding("iso-8859-1") 90 from sas. guiframe import gui_manager91 from sas. guiframe.gui_style import GUIFRAME90 from sas.sasgui.guiframe import gui_manager 91 from sas.sasgui.guiframe.gui_style import GUIFRAME 92 92 from welcome_panel import WelcomePanel 93 93 # For py2exe, import config here … … 116 116 # Fitting perspective 117 117 try: 118 import sas. perspectives.fitting as module118 import sas.sasgui.perspectives.fitting as module 119 119 fitting_plug = module.Plugin() 120 120 self.gui.add_perspective(fitting_plug) … … 125 125 # P(r) perspective 126 126 try: 127 import sas. perspectives.pr as module127 import sas.sasgui.perspectives.pr as module 128 128 pr_plug = module.Plugin() 129 129 self.gui.add_perspective(pr_plug) … … 134 134 #Invariant perspective 135 135 try: 136 import sas. perspectives.invariant as module136 import sas.sasgui.perspectives.invariant as module 137 137 invariant_plug = module.Plugin() 138 138 self.gui.add_perspective(invariant_plug) 139 except :139 except Exception as e : 140 140 logging.error("%s: could not find Invariant plug-in module"% \ 141 141 APP_NAME) … … 144 144 #Calculator perspective 145 145 try: 146 import sas. perspectives.calculator as module146 import sas.sasgui.perspectives.calculator as module 147 147 calculator_plug = module.Plugin() 148 148 self.gui.add_perspective(calculator_plug) -
sasview/setup_exe.py
r24d3a40 rd85c194 244 244 data_files += periodictable.data_files() 245 245 246 import sas. perspectives.fitting as fitting246 import sas.sasgui.perspectives.fitting as fitting 247 247 data_files += fitting.data_files() 248 248 249 import sas. perspectives.calculator as calculator249 import sas.sasgui.perspectives.calculator as calculator 250 250 data_files += calculator.data_files() 251 251 252 import sas. perspectives.invariant as invariant252 import sas.sasgui.perspectives.invariant as invariant 253 253 data_files += invariant.data_files() 254 254 255 import sas. guiframe as guiframe255 import sas.sasgui.guiframe as guiframe 256 256 data_files += guiframe.data_files() 257 257 … … 264 264 265 265 # Copy the settings file for the sas.dataloader file extension associations 266 import sas. dataloader.readers266 import sas.sascalc.dataloader.readers 267 267 f = os.path.join(sas.dataloader.readers.get_data_path(), 'defaults.json') 268 268 if os.path.isfile(f): … … 388 388 gen.generate_installer() 389 389 #initialize category stuff 390 #from sas. guiframe.CategoryInstaller import CategoryInstaller390 #from sas.sasgui.guiframe.CategoryInstaller import CategoryInstaller 391 391 #CategoryInstaller.check_install(s) 392 392 -
sasview/setup_mac.py
re8e3e38 rd85c194 13 13 from setuptools import setup 14 14 import periodictable.xsf 15 import sas. dataloader.readers15 import sas.sascalc.dataloader.readers 16 16 import os 17 17 import string … … 35 35 DATA_FILES = periodictable.data_files() 36 36 #invariant and calculator help doc 37 import sas. perspectives.fitting as fitting37 import sas.sasgui.perspectives.fitting as fitting 38 38 DATA_FILES += fitting.data_files() 39 import sas. perspectives.calculator as calculator39 import sas.sasgui.perspectives.calculator as calculator 40 40 DATA_FILES += calculator.data_files() 41 import sas. perspectives.invariant as invariant41 import sas.sasgui.perspectives.invariant as invariant 42 42 DATA_FILES += invariant.data_files() 43 43 import sas.models as models 44 44 DATA_FILES += models.data_files() 45 import sas. guiframe as guiframe45 import sas.sasgui.guiframe as guiframe 46 46 DATA_FILES += guiframe.data_files() 47 47 … … 83 83 list = [] 84 84 EXCEPTION_LIST = ['*', '.', ''] 85 from sas. dataloader.loader import Loader85 from sas.sascalc.dataloader.loader import Loader 86 86 wild_cards = Loader().get_wildcards() 87 87 for item in wild_cards: -
sasview/welcome_panel.py
r7425bcf rd85c194 9 9 import local_config as config 10 10 from wx.lib.scrolledpanel import ScrolledPanel 11 from sas. guiframe.panel_base import PanelBase11 from sas.sasgui.guiframe.panel_base import PanelBase 12 12 #Font size width 13 13 if sys.platform.count("win32") > 0:
Note: See TracChangeset
for help on using the changeset viewer.