Changeset 50008e3 in sasview for src/sas

Timestamp:

Mar 20, 2016 4: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:

• src/sas/sasgui/guiframe/CategoryInstaller.py (modified) (3 diffs)

src/sas/sasgui/guiframe/CategoryInstaller.py

@@ -15 +15 @@
 from collections import defaultdict
 
-USER_FILE = 'serialized_cat.json'
+USER_FILE = 'categories.json'
 
 class CategoryInstaller:
@@ -111 +111 @@
     def get_user_file():
         """
-        returns the user data file, eg .sasview/serialized_cat.json
+        returns the user data file, eg .sasview/categories.json.json
         """
         return os.path.join(CategoryInstaller._get_home_dir(),
@@ -129 +129 @@
         """
         the main method of this class
-        makes sure serialized_cat.json exists and if not
+        makes sure categories.json exists and if not
         compile it and install
         :param homefile: Override the default home directory