Changeset 27b7acc in sasview for src/sans/perspectives

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:

src/sans/perspectives/fitting

Files:

• basepage.py (modified) (2 diffs)
• models.py (modified) (1 diff)

src/sans/perspectives/fitting/basepage.py

@@ -10 +10 @@
 import math
 import string
-import cPickle as pickle
-#import shutil
+import json
 from collections import defaultdict
 from wx.lib.scrolledpanel import ScrolledPanel
@@ -3585 +3584 @@
             if not os.path.isfile(categorization_file):
                 categorization_file = CategoryInstaller.get_default_file()
-            cat_file = open(categorization_file, 'rb')
-                            
-            self.master_category_dict = pickle.load(cat_file)
+            cat_file = open(categorization_file, 'rb')                           
+            self.master_category_dict = json.load(cat_file)
             self._regenerate_model_dict()
             cat_file.close()

src/sans/perspectives/fitting/models.py

@@ -948 +948 @@
 
     CategoryInstaller.check_install(model_list=cat_model_list)
-    
     def findModels(self):
         return self.__modelmanager.findModels()