Changeset c889a3e in sasview


Ignore:
Timestamp:
May 16, 2018 5:05:26 AM (5 months ago)
Author:
Piotr Rozyczko <rozyczko@…>
Branches:
ESS_GUI, ESS_GUI_Pr_fixes, ESS_GUI_image_viewer, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_project_save
Children:
d3b57a0
Parents:
bc3debf8
Message:

Create categories.json if file not present. SASVIEW-937

Location:
src/sas
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • src/sas/qtgui/MainWindow/GuiManager.py

    rfa05c6c1 rc889a3e  
    6565        # Add signal callbacks 
    6666        self.addCallbacks() 
     67 
     68        # Assure model categories are available 
     69        self.addCategories() 
    6770 
    6871        # Create the data manager 
     
    142145        self.ResolutionCalculator = ResolutionCalculatorPanel(self) 
    143146        self.DataOperation = DataOperationUtilityPanel(self) 
     147 
     148    def addCategories(self): 
     149        """ 
     150        Make sure categories.json exists and if not compile it and install in ~/.sasview 
     151        """ 
     152        try: 
     153            from sas.sascalc.fit.models import ModelManager 
     154            from sas.qtgui.Utilities.CategoryInstaller import CategoryInstaller 
     155            model_list = ModelManager().cat_model_list() 
     156            CategoryInstaller.check_install(model_list=model_list) 
     157        except Exception: 
     158            logger.error("%s: could not load SasView models") 
     159            logger.error(traceback.format_exc()) 
    144160 
    145161    def statusBarSetup(self): 
  • src/sas/qtgui/Utilities/CategoryInstaller.py

    rcee5c78 rc889a3e  
    174174                                                          model_enabled_dict) 
    175175 
    176             json.dump(master_category_dict, open(serialized_file, 'wb')) 
     176            json.dump(master_category_dict, open(serialized_file, "w", encoding="utf8")) 
    177177 
  • src/sas/sascalc/fit/models.py

    rfa81e94 rc889a3e  
    181181            try: 
    182182                model = load_custom_model(path) 
    183                 # TODO: add [plug-in] tag to model name in sasview_model 
    184                 if not model.name.startswith(PLUGIN_NAME_BASE): 
    185                     model.name = PLUGIN_NAME_BASE + model.name 
    186183                plugins[model.name] = model 
    187184            except Exception: 
Note: See TracChangeset for help on using the changeset viewer.