Changeset d3b57a0 in sasview for src/sas

Timestamp:

May 16, 2018 5:06:10 AM (7 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

ESS_GUI, 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

Children:

b12404e

Parents:

c889a3e (diff), 4a0d3197 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'ESS_GUI' of ​https://github.com/SasView/sasview into ESS_GUI

Location:

src/sas

Files:

• qtgui/Calculators/media/data_oper_pic.png (modified) (1 prop) (previous)
• qtgui/Calculators/media/density_calculator_help.rst (modified) (1 diff)
• qtgui/Calculators/media/density_tutor.png (modified) (1 prop) (previous)
• qtgui/MainWindow/GuiManager.py (modified) (2 diffs)
• qtgui/Utilities/CategoryInstaller.py (modified) (1 diff)
• sascalc/fit/models.py (modified) (1 diff)

src/sas/qtgui/Calculators/media/density_calculator_help.rst

@@ -27 +27 @@
    then type in an input value.
 
-4) Click the 'Calculate' button to perform the calculation.
+4) Press Tab button or click out to perform the calculation.
 
 .. image:: density_tutor.png

src/sas/qtgui/MainWindow/GuiManager.py

@@ -65 +65 @@
         # Add signal callbacks
         self.addCallbacks()
+
+        # Assure model categories are available
+        self.addCategories()
 
         # Create the data manager
@@ -142 +145 @@
         self.ResolutionCalculator = ResolutionCalculatorPanel(self)
         self.DataOperation = DataOperationUtilityPanel(self)
+
+    def addCategories(self):
+        """
+        Make sure categories.json exists and if not compile it and install in ~/.sasview
+        """
+        try:
+            from sas.sascalc.fit.models import ModelManager
+            from sas.qtgui.Utilities.CategoryInstaller import CategoryInstaller
+            model_list = ModelManager().cat_model_list()
+            CategoryInstaller.check_install(model_list=model_list)
+        except Exception:
+            logger.error("%s: could not load SasView models")
+            logger.error(traceback.format_exc())
 
     def statusBarSetup(self):

src/sas/qtgui/Utilities/CategoryInstaller.py

@@ -174 +174 @@
                                                           model_enabled_dict)
 
-            json.dump(master_category_dict, open(serialized_file, 'wb'))
+            json.dump(master_category_dict, open(serialized_file, "w", encoding="utf8"))
 

src/sas/sascalc/fit/models.py

@@ -181 +181 @@
             try:
                 model = load_custom_model(path)
-                # TODO: add [plug-in] tag to model name in sasview_model
-                if not model.name.startswith(PLUGIN_NAME_BASE):
-                    model.name = PLUGIN_NAME_BASE + model.name
                 plugins[model.name] = model
             except Exception: