Changeset 657e52c in sasview for fittingview/src/sans/perspectives


Ignore:
Timestamp:
Dec 14, 2012 12:50:24 PM (12 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:
3 edited

Legend:

Unmodified
Added
Removed

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

    ref67145 r657e52c  
    33643364            self.master_category_dict = pickle.load(cat_file) 
    33653365            self._regenerate_model_dict() 
     3366            cat_file.close() 
    33663367 
    33673368        except IOError: 

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

    rea5fa58 r657e52c  
    17951795            if new_plot.group_id == None: 
    17961796                new_plot.group_id = data.group_id 
    1797             new_plot.id = str(page_id) + "model-" + data.name 
     1797            new_plot.id = str(page_id) + " " + data.name 
    17981798            #if new_plot.id in self.color_dict: 
    17991799            #    new_plot.custom_color = self.color_dict[new_plot.id] 
    … …  
    18711871        new_plot.name = model.name + '2d' 
    18721872        new_plot.title = "Analytical model 2D " 
    1873         new_plot.id = str(page_id) + "model-" + data.name 
     1873        new_plot.id = str(page_id) + " " + data.name 
    18741874        new_plot.group_id = str(page_id) + " Model2D" 
    18751875        new_plot.detector = data.detector 

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

    rea5fa58 r657e52c  
    1919from sans.models.pluginmodel import Model1DPlugin 
    2020from sans.models.BaseComponent import BaseComponent 
     21from sans.guiframe.CategoryInstaller import CategoryInstaller 
    2122    
    2223PLUGIN_DIR = 'plugin_models' 
    … …  
    937938    """ 
    938939    __modelmanager = ModelManagerBase() 
     940    cat_model_list = [model_name for model_name \ 
     941                      in __modelmanager.model_dictionary.keys() \ 
     942                      if model_name not in __modelmanager.stored_plugins.keys()] 
     943 
     944    CategoryInstaller.check_install(model_list=cat_model_list) 
    939945     
    940946    def findModels(self): 
Note: See TracChangeset for help on using the changeset viewer.