Changeset 657e52c in sasview for fittingview/src

Timestamp:

Dec 14, 2012 12:50:24 PM (11 years ago)

Author:

Jae Cho <jhjcho@…>

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:

0203ade

Parents:

aa01d07b

Message:

merging from the release 2.2.0

Location:

fittingview/src/sans/perspectives/fitting

Files:

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

fittingview/src/sans/perspectives/fitting/basepage.py

@@ -3364 +3364 @@
             self.master_category_dict = pickle.load(cat_file)
             self._regenerate_model_dict()
+            cat_file.close()
 
         except IOError:

fittingview/src/sans/perspectives/fitting/fitting.py

@@ -1795 +1795 @@
             if new_plot.group_id == None:
                 new_plot.group_id = data.group_id
-            new_plot.id = str(page_id) + "model-" + data.name
+            new_plot.id = str(page_id) + " " + data.name
             #if new_plot.id in self.color_dict:
             #    new_plot.custom_color = self.color_dict[new_plot.id]
@@ -1871 +1871 @@
         new_plot.name = model.name + '2d'
         new_plot.title = "Analytical model 2D "
-        new_plot.id = str(page_id) + "model-" + data.name
+        new_plot.id = str(page_id) + " " + data.name
         new_plot.group_id = str(page_id) + " Model2D"
         new_plot.detector = data.detector

fittingview/src/sans/perspectives/fitting/models.py

@@ -19 +19 @@
 from sans.models.pluginmodel import Model1DPlugin
 from sans.models.BaseComponent import BaseComponent
+from sans.guiframe.CategoryInstaller import CategoryInstaller
    
 PLUGIN_DIR = 'plugin_models'
@@ -937 +938 @@
     """
     __modelmanager = ModelManagerBase()
+    cat_model_list = [model_name for model_name \
+                      in __modelmanager.model_dictionary.keys() \
+                      if model_name not in __modelmanager.stored_plugins.keys()]
+
+    CategoryInstaller.check_install(model_list=cat_model_list)
     
     def findModels(self):