Changeset 58c125d in sasview for src/sas/perspectives

Timestamp:

Mar 1, 2015 1:55:51 AM (10 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:

491e916

Parents:

33f551f

Message:

Added Help button to density/Volume calculator panel and replace screen
shot in help file.

Location:

src/sas/perspectives/calculator

Files:

• density_panel.py (modified) (5 diffs)
• media/density_tutor.gif (modified) (previous)

src/sas/perspectives/calculator/density_panel.py

@@ -11 +11 @@
 from periodictable import formula as Formula
 from sas.perspectives.calculator import calculator_widgets as widget
+from sas.guiframe.documentation_window import DocumentationWindow
        
 AVOGADRO =  6.02214129e23
@@ -205 +206 @@
         self.Bind(wx.EVT_BUTTON, self.calculate, id=id)   
         
-        sizer_button.Add((250, 20), 1, wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+        id = wx.NewId()
+        self.button_help = wx.Button(self, id, "HELP")
+        self.button_help.SetToolTipString("Help for density calculator.")
+        self.Bind(wx.EVT_BUTTON, self.on_help, id=id)   
+        
+        sizer_button.Add((150, 20), 1, wx.EXPAND|wx.ADJUST_MINSIZE, 0)
         sizer_button.Add(self.button_calculate, 0, 
+                                        wx.RIGHT|wx.ADJUST_MINSIZE, 20)
+        sizer_button.Add(self.button_help, 0, 
                                         wx.RIGHT|wx.ADJUST_MINSIZE, 20)
         sizer3.Add(sizer_button)
@@ -352 +360 @@
             event.Skip()
             
+    def on_help(self, event):    
+        """
+        Bring up the density/volume 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/density_calculator_help.html"
+        _doc_viewer = DocumentationWindow(self, -1, \
+             _TreeLocation,"Density/Volume Calculator Help")
+
     def clear_outputs(self):
         """
@@ -377 +404 @@
     def __init__(self, parent=None, title="Density/Volume Calculator",
                   base=None, manager=None, 
-                  size=(PANEL_SIZE, PANEL_SIZE/1.7), *args, **kwds):
+                  size=(PANEL_SIZE*1.05, PANEL_SIZE/1.55), *args, **kwds):
         """
         """
@@ -388 +415 @@
         self.panel = DensityPanel(self, base=base)
         self.Bind(wx.EVT_CLOSE, self.on_close)
-        self.SetPosition((25, 160))
+        self.SetPosition((25, 10))
         self.Show(True)