Changeset 491e916 in sasview

Timestamp:

Mar 1, 2015 2:23:04 AM (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:

9654baf

Parents:

58c125d

Message:

Added help button to slit size calculator and adjusted sizing

File:

• src/sas/perspectives/calculator/slit_length_calculator_panel.py (modified) (5 diffs)

src/sas/perspectives/calculator/slit_length_calculator_panel.py

@@ -20 +20 @@
 from calculator_widgets import InterActiveOutputTextCtrl
 from sas.perspectives.calculator import calculator_widgets as widget   
+from sas.guiframe.documentation_window import DocumentationWindow
 
 _BOX_WIDTH = 76
@@ -25 +26 @@
 if sys.platform.count("win32") > 0:
     PANEL_WIDTH = 500
-    PANEL_HEIGHT = 200
+    PANEL_HEIGHT = 210
     FONT_VARIANT = 0
 else:
@@ -121 +122 @@
         self.bt_close.Bind(wx.EVT_BUTTON, self.on_close)
         self.bt_close.SetToolTipString("Close this window.")
-        self.button_sizer.AddMany([(self.bt_close, 0, wx.LEFT, 390)])
-        
+ 
+        id = wx.NewId()
+        self.button_help = wx.Button(self, id, "HELP")
+        self.button_help.SetToolTipString("Help for slit length calculator.")
+        self.Bind(wx.EVT_BUTTON, self.on_help,id=id)   
+
+        self.button_sizer.AddMany([(self.bt_close, 0, wx.LEFT, 280),
+                                   (self.button_help, 0, wx.LEFT, 20)])
+               
     def _do_layout(self):
         """
@@ -160 +168 @@
         
         return path
+
+    def on_help(self, event):    
+        """
+        Bring up the slit length calculator 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
+    """
+                
+        _TreeLocation = "user/perspectives/calculator/slit_calculator_help.html"
+        _doc_viewer = DocumentationWindow(self, -1, \
+             _TreeLocation,"Slit Length Calculator Help")
 
     def on_close(self, event):
@@ -266 +293 @@
         self.panel = SlitLengthCalculatorPanel(parent=self)
         self.Bind(wx.EVT_CLOSE, self.on_close)
-        self.SetPosition((25, 150))
+        self.SetPosition((25, 10))
         self.Show(True)