Changeset e0bbb7c in sasview

Timestamp:

Mar 16, 2016 8:20:55 AM (8 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:

ba31ed1

Parents:

45d90b9

Message:

Documentation fixes after sascalc split.

Files:

• docs/sphinx-docs/source/user/user.rst (modified) (1 diff)
• setup.py (modified) (3 diffs, 1 prop)

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>

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")