Changeset 18d58a6e in sasview for src/sas

Timestamp:

Mar 1, 2015 1:06:24 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:

517f3d4

Parents:

9654baf

Message:

add help button to resolution calculator panel and do a few adjustments

File:

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

src/sas/perspectives/calculator/resolution_calculator_panel.py

@@ -31 +31 @@
 from math import fabs
 from sas.perspectives.calculator import calculator_widgets as widget   
+from sas.guiframe.documentation_window import DocumentationWindow
 
 _BOX_WIDTH = 100
@@ -533 +534 @@
         Do the layout for the button widgets
         """ 
-        # coordinate selction removed
-        #outerbox_txt = wx.StaticText(self, -1, 'Outer Box')
-        #self.x_y_rb = wx.RadioButton(self, -1,"Cartesian")
-        #self.Bind(wx.EVT_RADIOBUTTON,
-        #          self._on_xy_coordinate, id=self.x_y_rb.GetId())
-        #self.r_phi_rb = wx.RadioButton(self, -1,"Polar")
-        #self.Bind(wx.EVT_RADIOBUTTON,
-        #          self._on_rp_coordinate, id=self.r_phi_rb.GetId())
-        #self.r_phi_rb.SetValue(True)
-        #reset button
+
         id = wx.NewId()
         self.reset_button = wx.Button(self, id, "Reset")
@@ -554 +546 @@
         self.compute_button.SetToolTipString(hint_on_compute)
         self.Bind(wx.EVT_BUTTON, self.on_compute, id=id)
+        #help button
+        id = wx.NewId()
+        self.help_button = wx.Button(self, id, "HELP")
+        hint_on_help = "Help on using the Resolution Calculator"
+        self.help_button.SetToolTipString(hint_on_help)
+        self.Bind(wx.EVT_BUTTON, self.on_help, id=id)
         # close button
         self.bt_close = wx.Button(self, wx.ID_CANCEL,'Close')
         self.bt_close.Bind(wx.EVT_BUTTON, self.on_close)
         self.bt_close.SetToolTipString("Close this window.")
-        """
-        self.button_sizer.AddMany([(self.r_phi_rb,  0, wx.LEFT, 15),
-                                   (self.x_y_rb,  0, wx.LEFT, 15),
-                                   (self.reset_button, 0, wx.LEFT, 50),
-                                   (self.compute_button, 0, wx.LEFT, 15),
-                                   (self.bt_close, 0, wx.LEFT, 15)])#370)])
-        """
+
         self.button_sizer.Add((110, -1))
         self.button_sizer.AddMany([(self.reset_button, 0, wx.LEFT, 50),
                                    (self.compute_button, 0, wx.LEFT, 15),
+                                   (self.help_button, 0, wx.LEFT, 15),
                                    (self.bt_close, 0, wx.LEFT, 15)])
         self.compute_button.SetFocus()
@@ -697 +690 @@
         self.SetAutoLayout(True)
         
+
+    def on_help(self, event):    
+        """
+        Bring up the Resolution 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/resolution_calculator_help.html"
+        _doc_viewer = DocumentationWindow(self, -1, \
+             _TreeLocation,"Resolution Calculator Help")
 
     def on_close(self, event):
@@ -1406 +1418 @@
         self.panel = ResolutionCalculatorPanel(parent=self)
         self.Bind(wx.EVT_CLOSE, self.OnClose)
-        self.SetPosition((25, 150))
+        self.SetPosition((25, 10))
         self.Show(True)