Changes in / [f66d9d1:e5ea2d0] in sasview

Files:

• docs/sphinx-docs/build_sphinx.py (modified) (1 diff)
• docs/sphinx-docs/source/user/user.rst (modified) (1 diff)
• sasview/setup_mac.py (modified) (1 diff)
• setup.py (modified) (3 diffs, 1 prop)
• src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) (2 diffs)

docs/sphinx-docs/build_sphinx.py

@@ -32 +32 @@
 SPHINX_SOURCE = os.path.join(CURRENT_SCRIPT_DIR, "source")
 SPHINX_SOURCE_API = os.path.join(SPHINX_SOURCE, "dev", "api")
-SPHINX_SOURCE_GUIFRAME = os.path.join(SPHINX_SOURCE, "user", "guiframe")
+SPHINX_SOURCE_GUIFRAME = os.path.join(SPHINX_SOURCE, "user", "sasgui", "guiframe")
 SPHINX_SOURCE_MODELS = os.path.join(SPHINX_SOURCE, "user", "models")
-SPHINX_SOURCE_PERSPECTIVES = os.path.join(SPHINX_SOURCE, "user", "perspectives")
+SPHINX_SOURCE_PERSPECTIVES = os.path.join(SPHINX_SOURCE, "user", "sasgui", "perspectives")
 SPHINX_SOURCE_TEST = os.path.join(SPHINX_SOURCE, "test")
 

docs/sphinx-docs/source/user/user.rst

@@ -6 +6 @@
 .. toctree::
    :maxdepth: 1
+
+   Model Documentation <models/model_functions>
+
+   Data Formats <sasgui/guiframe/data_formats_help>
    
-   Model Documentation <models/model_functions>
+   Loading Data <sasgui/guiframe/data_explorer_help>
    
-   Data Formats <guiframe/data_formats_help>
+   Plotting Data/Models <sasgui/guiframe/graph_help>
    
-   Loading Data <guiframe/data_explorer_help>
+   Fitting Perspective <sasgui/perspectives/fitting/fitting>
    
-   Plotting Data/Models <guiframe/graph_help>
+   P(r) Inversion Perspective <sasgui/perspectives/pr/pr_help>
    
-   Fitting Perspective <perspectives/fitting/fitting>
+   Invariant Calculation Perspective <sasgui/perspectives/invariant/invariant_help>
    
-   P(r) Inversion Perspective <perspectives/pr/pr_help>
+   Data Operations Tool <sasgui/perspectives/calculator/data_operator_help>
+      
+   Density/Volume Calculator Tool <sasgui/perspectives/calculator/density_calculator_help>
    
-   Invariant Calculation Perspective <perspectives/invariant/invariant_help>
+   Generic SANS Calculator Tool <sasgui/perspectives/calculator/sas_calculator_help>
    
-   Data Operations Tool <perspectives/calculator/data_operator_help>
-      
-   Density/Volume Calculator Tool <perspectives/calculator/density_calculator_help>
+   Image Viewer Tool <sasgui/perspectives/calculator/image_viewer_help>
    
-   Generic SANS Calculator Tool <perspectives/calculator/sas_calculator_help>
+   Kiessig Thickness Calculator Tool <sasgui/perspectives/calculator/kiessig_calculator_help>
    
-   Image Viewer Tool <perspectives/calculator/image_viewer_help>
-      
-   Kiessig Thickness Calculator Tool <perspectives/calculator/kiessig_calculator_help>
+   SLD Calculator Tool <sasgui/perspectives/calculator/sld_calculator_help>
    
-   SLD Calculator Tool <perspectives/calculator/sld_calculator_help>
+   Slit Size Calculator Tool <sasgui/perspectives/calculator/slit_calculator_help>
    
-   Slit Size Calculator Tool <perspectives/calculator/slit_calculator_help>
+   Q Resolution Estimator Tool <sasgui/perspectives/calculator/resolution_calculator_help>
    
-   Q Resolution Estimator Tool <perspectives/calculator/resolution_calculator_help>
-   
-   Python Shell Tool <perspectives/calculator/python_shell_help>
-   
+   Python Shell Tool <sasgui/perspectives/calculator/python_shell_help>
+
    Test Data <../test/testdata_help.rst>

sasview/setup_mac.py

@@ -47 +47 @@
 
 #CANSAxml reader data files
-RESOURCES_FILES.append(os.path.join(sas.dataloader.readers.get_data_path(),'defaults.json'))
+RESOURCES_FILES.append(os.path.join(sas.sascalc.dataloader.readers.get_data_path(),'defaults.json'))
 
 # Locate libxml2 library

setup.py

@@ -164 +164 @@
 packages.append("sas")
 
-# sas.invariant
-package_dir["sas.invariant"] = os.path.join("src", "sas", "sascalc", "invariant")
-packages.extend(["sas.invariant"])
+# sas module
+package_dir["sas.sasgui"] = os.path.join("src", "sas", "sasgui")
+packages.append("sas.sasgui")
+
+# sas module
+package_dir["sas.sascalc"] = os.path.join("src", "sas", "sascalc")
+packages.append("sas.sascalc")
+
+# sas.sascalc.invariant
+package_dir["sas.sascalc.invariant"] = os.path.join("src", "sas", "sascalc", "invariant")
+packages.extend(["sas.sascalc.invariant"])
 
 # sas.sasgui.guiframe
@@ -181 +189 @@
         package_dir[package_name] = os.path.join(guiframe_path, "local_perspectives", d)
 
-# sas.dataloader
-package_dir["sas.dataloader"] = os.path.join("src", "sas", "sascalc", "dataloader")
-package_data["sas.dataloader.readers"] = ['defaults.json','schema/*.xsd']
-packages.extend(["sas.dataloader","sas.dataloader.readers","sas.dataloader.readers.schema"])
-
-# sas.calculator
-package_dir["sas.calculator"] =os.path.join("src", "sas", "sascalc", "calculator")
+# sas.sascalc.dataloader
+package_dir["sas.sascalc.dataloader"] = os.path.join("src", "sas", "sascalc", "dataloader")
+package_data["sas.sascalc.dataloader.readers"] = ['defaults.json','schema/*.xsd']
+packages.extend(["sas.sascalc.dataloader","sas.sascalc.dataloader.readers","sas.sascalc.dataloader.readers.schema"])
+
+# sas.sascalc.calculator
+package_dir["sas.sascalc.calculator"] =os.path.join("src", "sas", "sascalc", "calculator")
 packages.extend(["sas.sascalc.calculator"])
     
@@ -227 +235 @@
     
 # Data util
-package_dir["data_util"] = os.path.join("src", "sas", "sascalc", "data_util")
+package_dir["sas.sascalc.data_util"] = os.path.join("src", "sas", "sascalc", "data_util")
 packages.append("sas.sascalc.data_util")
 

src/sas/sascalc/dataloader/readers/cansas_reader.py

@@ -149 +149 @@
         # Generic values for the cansas file based on the version
         cansas_defaults = CANSAS_NS.get(self.cansas_version, "1.0")
-        schema_path = "{0}/sas/dataloader/readers/schema/{1}".format\
+        schema_path = "{0}/sas/sascalc/dataloader/readers/schema/{1}".format\
                 (base, cansas_defaults.get("schema")).replace("\\", "/")
 
@@ -1005 +1005 @@
         mod = mod_name.split("sas/")
         mod_name = mod[1]
-        if mod_name != "dataloader/readers/cansas_reader":
+        if mod_name != "sascalc/dataloader/readers/cansas_reader":
             string = self.to_string(doc, pretty_print=False)
             doc = parseString(string)