Changeset 125c4be in sasview

Timestamp:

Jun 9, 2017 4:35:37 AM (7 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

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

Children:

2d0e0c1

Parents:

8eaa101

Message:

Allow rebuilding of the categories file and plugin_models dir

Location:

src/sas/qtgui

Files:

• Perspectives/Fitting/FittingPerspective.py (modified) (2 diffs)
• Perspectives/Fitting/ModelUtilities.py (added)
• Utilities/CategoryInstaller.py (modified) (1 diff)

src/sas/qtgui/Perspectives/Fitting/FittingPerspective.py

@@ -7 +7 @@
 
 from sas.qtgui.Perspectives.Fitting.FittingWidget import FittingWidget
+from sas.qtgui.Perspectives.Fitting import ModelUtilities
 
 class FittingWindow(QtGui.QTabWidget):
@@ -43 +44 @@
         # Perspective window not allowed to close by default
         self._allow_close = False
+
+        self.menu_manager = ModelUtilities.ModelManager()
+        # TODO: reuse these in FittingWidget properly
+        self.model_list_box = self.menu_manager.get_model_list()
+        self.model_dictionary = self.menu_manager.get_model_dictionary()
 
         self.setWindowTitle('Fit panel - Active Fitting Optimizer: %s' % self.optimizer)

src/sas/qtgui/Utilities/CategoryInstaller.py

@@ -35 +35 @@
         return sas.sascalc.dataloader.readers.get_data_path()
 
-    #@staticmethod
-    #def _get_models_py_dir():
-    #    """
-    #    returns the dir where models.py should be
-    #    """
-    #    import sas.sasgui.perspectives.fitting.models
-    #    return sas.sasgui.perspectives.fitting.models.get_model_python_path()
+    @staticmethod
+    def _get_models_py_dir():
+        """
+        returns the dir where models.py should be
+        """
+        import sas.sasgui.perspectives.fitting.models
+        return sas.sasgui.perspectives.fitting.models.get_model_python_path()
 
     @staticmethod