Changeset dea2f6e in sasview

Timestamp:

Mar 24, 2015 10:42:13 PM (9 years ago)

Author:

butler

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:

f552ff3

Parents:

1805b87

Message:

Add Pr Help button linking to new docs and comment out old code (remove
after full testing)

File:

• src/sas/perspectives/pr/inversion_panel.py (modified) (4 diffs)

src/sas/perspectives/pr/inversion_panel.py

@@ -16 +16 @@
 from pr_widgets import DataFileTextCtrl
 from pr_widgets import OutputTextCtrl
+from sas.guiframe.documentation_window import DocumentationWindow
 
 if sys.platform.count("win32") > 0:
@@ -675 +676 @@
         self.Bind(wx.EVT_BUTTON, self._on_invert, id=wx_id)
 
+#        self.button_help = wx.Button(self, -1, "HELP")
+#       app_tip = "Get help on P(r) inversion."
+#        self.button_help.SetToolTipString(app_tip)
+#        self.button_help.Bind(wx.EVT_BUTTON, self.on_help)
+
         self._set_reset_flag(True)
         self._set_save_flag(True)
@@ -680 +686 @@
         sizer_button.Add((20, 20), 1, wx.EXPAND | wx.ADJUST_MINSIZE, 0)
         sizer_button.Add(button_ok, 0, wx.LEFT | wx.ADJUST_MINSIZE, 10)
+#        sizer_button.Add(self.button_help, 0, wx.LEFT | wx.ADJUST_MINSIZE, 10)
 
         iy_vb += 1
@@ -928 +935 @@
                 logging.error(msg)
 
-class HelpDialog(wx.Dialog):
+    def on_help(self, event):
+        """
+        Bring up the P(r) Documentation whenever
+        the HELP button is clicked.
+
+        Calls DocumentationWindow with the path of the location within the
+        documentation tree (after /doc/ ....".  Note that when using old
+        versions of Wx (before 2.9) and thus not the release version of
+        installers, the help comes up at the top level of the file as
+        webbrowser does not pass anything past the # to the browser when it is
+        running "file:///...."
+
+    :param evt: Triggers on clicking the help button
     """
-    """
-    def __init__(self, parent, id):
-        """
-        """
-        from sas.pr.invertor import help
-        wx.Dialog.__init__(self, parent, id, size=(400, 450))
-        self.SetTitle("P(r) help")
-        self.SetWindowVariant(variant=FONT_VARIANT)
-
-        vbox = wx.BoxSizer(wx.VERTICAL)
-
-        explanation = help()
-
-        label_explain = wx.StaticText(self, -1, explanation, size=(360, 350))
-
-        vbox.Add(label_explain, 0, wx.ALL | wx.EXPAND, 15)
-
-
-        static_line = wx.StaticLine(self, -1)
-        vbox.Add(static_line, 0, wx.EXPAND, 0)
-
-        button_ok = wx.Button(self, wx.ID_OK, "OK")
-
-        sizer_button = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_button.Add((20, 20), 1, wx.EXPAND | wx.ADJUST_MINSIZE, 0)
-        sizer_button.Add(button_ok, 0, wx.LEFT | wx.RIGHT | wx.ADJUST_MINSIZE, 10)
-
-        vbox.Add(sizer_button, 0, wx.EXPAND | wx.BOTTOM | wx.TOP, 10)
-
-        self.SetSizer(vbox)
-        self.SetAutoLayout(True)
-
-        self.Layout()
-        self.Centre()
+
+        _TreeLocation = "user/perspectives/pr/pr_help.html"
+        _doc_viewer = DocumentationWindow(self, -1, \
+             _TreeLocation, "P(r) Help")
+
+
+
+#class HelpDialog(wx.Dialog):
+#    """
+#    """
+#    def __init__(self, parent, id):
+#        """
+#        """
+#        from sas.pr.invertor import help
+#        wx.Dialog.__init__(self, parent, id, size=(400, 450))
+#        self.SetTitle("P(r) help")
+#        self.SetWindowVariant(variant=FONT_VARIANT)
+#
+#        vbox = wx.BoxSizer(wx.VERTICAL)
+#
+#       explanation = help()
+#
+#        label_explain = wx.StaticText(self, -1, explanation, size=(360, 350))
+#
+#        vbox.Add(label_explain, 0, wx.ALL | wx.EXPAND, 15)
+#
+#
+#        static_line = wx.StaticLine(self, -1)
+#        vbox.Add(static_line, 0, wx.EXPAND, 0)
+#
+#        button_ok = wx.Button(self, wx.ID_OK, "OK")
+#
+#        sizer_button = wx.BoxSizer(wx.HORIZONTAL)
+#        sizer_button.Add((20, 20), 1, wx.EXPAND | wx.ADJUST_MINSIZE, 0)
+#        sizer_button.Add(button_ok, 0, wx.LEFT | wx.RIGHT | wx.ADJUST_MINSIZE, 10)
+#
+#        vbox.Add(sizer_button, 0, wx.EXPAND | wx.BOTTOM | wx.TOP, 10)
+#
+#        self.SetSizer(vbox)
+#        self.SetAutoLayout(True)
+#
+#        self.Layout()
+#        self.Centre()
 
 class PrDistDialog(wx.Dialog):