Changeset b10cf92 in sasview for src/sas/qtgui/MainWindow

Timestamp:

May 17, 2018 3:49:28 PM (7 years ago)

Author:

wojciech

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:

3aa3351, a0ed202

Parents:

6459916 (diff), 57be490 (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

File:

• src/sas/qtgui/MainWindow/GuiManager.py (modified) (5 diffs)

src/sas/qtgui/MainWindow/GuiManager.py

@@ -23 +23 @@
 from sas.qtgui.Utilities.GridPanel import BatchOutputPanel
 
+from sas.qtgui.Utilities.ReportDialog import ReportDialog
 from sas.qtgui.MainWindow.UI.AcknowledgementsUI import Ui_Acknowledgements
 from sas.qtgui.MainWindow.AboutBox import AboutBox
@@ -65 +66 @@
         # Add signal callbacks
         self.addCallbacks()
+
+        # Assure model categories are available
+        self.addCategories()
 
         # Create the data manager
@@ -142 +146 @@
         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):
@@ -472 +489 @@
     def actionSave_Analysis(self):
         """
-        """
-        print("actionSave_Analysis TRIGGERED")
-
-        pass
+        Menu File/Save Analysis
+        """
+        self.communicate.saveAnalysisSignal.emit()
 
     def actionQuit(self):
@@ -510 +526 @@
     def actionReport(self):
         """
-        """
-        print("actionReport TRIGGERED")
-        pass
+        Show the Fit Report dialog.
+        """
+        report_list = None
+        if getattr(self._current_perspective, "currentTab"):
+            try:
+                report_list = self._current_perspective.currentTab.getReport()
+            except Exception as ex:
+                logging.error("Report generation failed with: " + str(ex))
+
+        if report_list is not None:
+            self.report_dialog = ReportDialog(parent=self, report_list=report_list)
+            self.report_dialog.show()
 
     def actionReset(self):