Changes in / [9e531f2:b85502d] in sasview


Ignore:
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • docs/sphinx-docs/source/user/sasgui/perspectives/fitting/fitting.rst

    re2c22b5 r5f5c596  
    11.. _Fitting_Documentation: 
    22 
    3 Model Fitting 
    4 ============= 
     3Fitting Documentation 
     4===================== 
    55 
    66.. toctree:: 

  • docs/sphinx-docs/source/user/sasgui/perspectives/invariant/invariant_help.rst

    r8dcc9bc6 r5f5c596  
    44.. by S King, ISIS, during SasView CodeCamp-III in Feb 2015. 
    55 
    6 Invariant Calculation 
    7 ===================== 
     6Invariant Calculation Perspective 
     7================================= 
    88 
    99Description 

  • docs/sphinx-docs/source/user/sasgui/perspectives/pr/pr_help.rst

    rca5f55f r5f5c596  
    44.. by S King, ISIS, during SasView CodeCamp-III in Feb 2015. 
    55 
    6 P(r) Inversion 
    7 ============== 
     6P(r) Inversion Perspective 
     7========================== 
    88 
    99Description 

  • docs/sphinx-docs/source/user/shape-cylinder.rst

    r9dcd5ed rc90bce6  
    1717    models/hollow_cylinder.rst 
    1818    models/pearl_necklace.rst 
     19    models/pringle.rst 
    1920    models/stacked_disks.rst 

  • docs/sphinx-docs/source/user/shape-sphere.rst

    re565eaf re4ca2eb  
    1313    models/linear_pearls.rst 
    1414    models/multi_shell.rst 
     15    models/onion.rst 
    1516    models/raspberry.rst 
    1617    models/sphere.rst 

  • sasview/installer.iss

    r25f223b r50008e3  
    7171Source: "dist\plugin_models\*"; DestDir: "{userdesktop}\..\.sasview\plugin_models";     Flags: recursesubdirs createallsubdirs 
    7272Source: "dist\config\custom_config.py"; DestDir: "{userdesktop}\..\.sasview\config";    Flags: recursesubdirs createallsubdirs 
    73 Source: "dist\default_categories.json";    DestDir: "{userdesktop}\..\.sasview";        DestName: "serialized_cat.json"; 
     73Source: "dist\default_categories.json";    DestDir: "{userdesktop}\..\.sasview";        DestName: "categories.json"; 
    7474;       NOTE: Don't use "Flags: ignoreversion" on any shared system files 
    7575 

  • sasview/installer_generator.py

    rb699768 r50008e3  
    202202    msg += """Flags: recursesubdirs createallsubdirs\n""" 
    203203    msg += """Source: "dist\default_categories.json";    DestDir: "{userdesktop}\..\.sasview";\t"""  
    204     msg += """DestName: "serialized_cat.json";\n""" 
     204    msg += """DestName: "categories.json";\n""" 
    205205    msg += """;\tNOTE: Don't use "Flags: ignoreversion" on any shared system files""" 
    206206    return msg 

  • setup.py

    r9e531f2 r9e531f2  
    4747    if os.path.isfile(f_path): 
    4848        os.remove(f_path) 
    49     f_path = os.path.join(sas_dir, "serialized_cat.json") 
     49    f_path = os.path.join(sas_dir, "categories.json") 
    5050    if os.path.isfile(f_path): 
    5151        os.remove(f_path) 

  • src/sas/sasgui/guiframe/CategoryInstaller.py

    r1ca0ac0 r50008e3  
    1515from collections import defaultdict 
    1616 
    17 USER_FILE = 'serialized_cat.json' 
     17USER_FILE = 'categories.json' 
    1818 
    1919class CategoryInstaller: 
    … …  
    111111    def get_user_file(): 
    112112        """ 
    113         returns the user data file, eg .sasview/serialized_cat.json 
     113        returns the user data file, eg .sasview/categories.json.json 
    114114        """ 
    115115        return os.path.join(CategoryInstaller._get_home_dir(), 
    … …  
    129129        """ 
    130130        the main method of this class 
    131         makes sure serialized_cat.json exists and if not 
     131        makes sure categories.json exists and if not 
    132132        compile it and install 
    133133        :param homefile: Override the default home directory 
Note: See TracChangeset for help on using the changeset viewer.