Changeset c558b47 in sasview

Timestamp:

Mar 1, 2015 12:16:32 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:

fc8f132

Parents:

f1e80df

Message:

added Help button to Data Operator Tool Panel and updated Help file with
new screen shot showing the new button

Location:

src/sas/perspectives/calculator

Files:

• data_operator.py (modified) (4 diffs)
• media/data_oper_pic.png (modified) (previous)

src/sas/perspectives/calculator/data_operator.py

@@ -12 +12 @@
 from matplotlib.font_manager import FontProperties
 from sas.guiframe.events import StatusEvent 
-from sas.perspectives.calculator import calculator_widgets as widget   
+from sas.perspectives.calculator import calculator_widgets as widget
+from sas.guiframe.documentation_window import DocumentationWindow
+   
 #Control panel width 
 if sys.platform.count("win32") > 0:
@@ -430 +432 @@
         self.bt_apply.Bind(wx.EVT_BUTTON, self.on_click_apply)
         
+        self.bt_help = wx.Button(self, -1, "HELP")
+        app_tip = "Get help on Data Operations."
+        self.bt_help.SetToolTipString(app_tip)
+        self.bt_help.Bind(wx.EVT_BUTTON, self.on_help)
+        
         self.bt_close = wx.Button(self, -1, 'Close', size=(_BOX_WIDTH/2, -1))
         self.bt_close.Bind(wx.EVT_BUTTON, self.on_close)
@@ -436 +443 @@
         self.button_sizer.AddMany([(PANEL_WIDTH/2, 25),
                                    (self.bt_apply, 0, wx.RIGHT, 10),
+                                   (self.bt_help, 0, wx.RIGHT, 10),
                                    (self.bt_close, 0, wx.RIGHT, 10)])
         
@@ -609 +617 @@
         event.Skip()
     
+    def on_help(self, event):    
+        """
+        Bring up the General scattering 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/data_operator_help.html"
+        _doc_viewer = DocumentationWindow(self, -1, \
+             _TreeLocation,"Data Operation Help")
+
     def disconnect_panels(self):
         """