Ignore:
Timestamp:
Mar 20, 2016 2:25:51 PM (9 years ago)
Author:
butler
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:
e4ca2eb
Parents:
0b709f2c
Message:

Fix so 4.0 uses categories.json instead of serialized_cat.json. Thus
this last won't be overwritten and both old SasView? with old model names
and new SasView? with new model names can co-exist.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • 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.