Changeset 27b7acc in sasview for sansview

Timestamp:

Apr 3, 2014 7:28:51 PM (11 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:

bbd97e5

Parents:

34dbaf4

Message:

converted stored category file from pickle to json and a bit of cleanup

Location:

sansview

Files:

• default_categories.json (added)
• installer.iss (modified) (1 diff)
• installer_generator.py (modified) (1 diff)
• setup_exe.py (modified) (1 diff)
• setup_mac.py (modified) (1 diff)

sansview/installer.iss

@@ -73 +73 @@
 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.p";    DestDir: "{userdesktop}\..\.sasview";   DestName: "serialized_cat.p";
+Source: "dist\default_categories.json";    DestDir: "{userdesktop}\..\.sasview";        DestName: "serialized_cat.json";
 ;       NOTE: Don't use "Flags: ignoreversion" on any shared system files
 

sansview/installer_generator.py

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

sansview/setup_exe.py

@@ -271 +271 @@
     data_files.append(('.', [f]))
 
-f = 'default_categories.p'
+f = 'default_categories.json'
 if os.path.isfile(f):
     data_files.append(('.', [f]))

sansview/setup_mac.py

@@ -55 +55 @@
 APP = ['sansview.py']
 DATA_FILES += ['images','test','media', 'custom_config.py', 'local_config.py',
-               'default_categories.p']
+               'default_categories.json']
 if os.path.isfile("BUILD_NUMBER"):
     DATA_FILES.append("BUILD_NUMBER")