Changeset 50008e3 in sasview

Timestamp:

Mar 20, 2016 4:25:51 PM (8 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.

Files:

• sasview/installer.iss (modified) (1 diff)
• sasview/installer_generator.py (modified) (1 diff)
• setup.py (modified) (1 diff)
• src/sas/sasgui/guiframe/CategoryInstaller.py (modified) (3 diffs)

sasview/installer.iss

@@ -71 +71 @@
 Source: "dist\plugin_models\*"; DestDir: "{userdesktop}\..\.sasview\plugin_models";     Flags: recursesubdirs createallsubdirs
 Source: "dist\config\custom_config.py"; DestDir: "{userdesktop}\..\.sasview\config";    Flags: recursesubdirs createallsubdirs
-Source: "dist\default_categories.json";    DestDir: "{userdesktop}\..\.sasview";        DestName: "serialized_cat.json";
+Source: "dist\default_categories.json";    DestDir: "{userdesktop}\..\.sasview";        DestName: "categories.json";
 ;       NOTE: Don't use "Flags: ignoreversion" on any shared system files
 

sasview/installer_generator.py

@@ -202 +202 @@
     msg += """Flags: recursesubdirs createallsubdirs\n"""
     msg += """Source: "dist\default_categories.json";    DestDir: "{userdesktop}\..\.sasview";\t""" 
-    msg += """DestName: "serialized_cat.json";\n"""
+    msg += """DestName: "categories.json";\n"""
     msg += """;\tNOTE: Don't use "Flags: ignoreversion" on any shared system files"""
     return msg

setup.py

@@ -47 +47 @@
     if os.path.isfile(f_path):
         os.remove(f_path)
-    f_path = os.path.join(sas_dir, "serialized_cat.json")
+    f_path = os.path.join(sas_dir, "categories.json")
     if os.path.isfile(f_path):
         os.remove(f_path)

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