Changeset 7945367 in sasview for src/sas/perspectives

Timestamp:

Aug 21, 2015 6:17:40 PM (9 years ago)

Author:

Paul Kienzle <pkienzle@…>

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:

600bea1

Parents:

a342928

Message:

make Fit Options dialog persistent and add Help button [NB: awaiting new bumps release]

File:

• src/sas/perspectives/fitting/fitting.py (modified) (2 diffs)

src/sas/perspectives/fitting/fitting.py

@@ -44 +44 @@
 from sas.perspectives.calculator.model_editor import EditorWindow
 from sas.guiframe.gui_manager import MDIFrame
+from sas.guiframe.documentation_window import DocumentationWindow
 
 MAX_NBR_DATA = 4
@@ -748 +749 @@
         Open the bumps options panel.
         """
-        from bumps.gui.fit_dialog import OpenFitOptions
-        OpenFitOptions()
+        try:
+            from bumps.gui.fit_dialog import show_fit_config
+            show_fit_config(self.parent, help=self.on_help)
+        except ImportError:
+            # CRUFT: Bumps 0.7.5.6 and earlier do not have the help button
+            from bumps.gui.fit_dialog import OpenFitOptions
+            OpenFitOptions()
+
+    def on_help(self, algorithm_id):
+        _TreeLocation = "user/perspectives/fitting/optimizer.html"
+        _anchor = "#fit-"+algorithm_id
+        DocumentationWindow(self.parent, -1, _TreeLocation, _anchor, "Optimizer Help")
+
 
     def on_fit_results(self, event=None):