Changeset 9654baf in sasview for src/sas

Timestamp:

Mar 1, 2015 2:46:02 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:

18d58a6e

Parents:

491e916

Message:

• Add help to Kiessig calculator plus some sizing/positioning panel
• change order of buttons on slit length calculator to match the rest of

the panels with close be the furthest right button on panel

Location:

src/sas/perspectives/calculator

Files:

• kiessig_calculator_panel.py (modified) (5 diffs)
• slit_length_calculator_panel.py (modified) (1 diff)

src/sas/perspectives/calculator/kiessig_calculator_panel.py

@@ -17 +17 @@
 from calculator_widgets import InputTextCtrl
 from sas.perspectives.calculator import calculator_widgets as widget   
+from sas.guiframe.documentation_window import DocumentationWindow
 
 _BOX_WIDTH = 77
@@ -22 +23 @@
 if sys.platform.count("win32") > 0:
     PANEL_WIDTH = 500
-    PANEL_HEIGHT = 210
+    PANEL_HEIGHT = 230
     FONT_VARIANT = 0
 else:
@@ -123 +124 @@
         Do the layout for the button widgets
         """ 
+        id = wx.NewId()
+        self.bt_help = wx.Button(self, id,'HELP')
+        self.bt_help.Bind(wx.EVT_BUTTON, self.on_help)
+        self.bt_help.SetToolTipString("Help using the Kiessig fringe calculator.")
+
         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.bt_close, 0, wx.LEFT, 390)])
+        self.button_sizer.AddMany([(self.bt_help, 0, wx.LEFT, 260),
+                                   (self.bt_close, 0, wx.LEFT, 20)])
         
     def _do_layout(self):
@@ -149 +156 @@
         self.SetAutoLayout(True)
 
+    def on_help(self, event):    
+        """
+        Bring up the Kiessig fringe 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/kiessig_calculator_help.html"
+        _doc_viewer = DocumentationWindow(self, -1, \
+             _TreeLocation,"Density/Volume Calculator Help")
+
     def on_close(self, event):
         """
@@ -202 +228 @@
         self.panel = KiessigThicknessCalculatorPanel(parent=self)
         self.Bind(wx.EVT_CLOSE, self.on_close)
-        self.SetPosition((25, 160))
+        self.SetPosition((25, 10))
         self.Show(True)
         

src/sas/perspectives/calculator/slit_length_calculator_panel.py

@@ -128 +128 @@
         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)])
+        self.button_sizer.AddMany([(self.button_help, 0, wx.LEFT, 280),
+                                   (self.bt_close, 0, wx.LEFT, 20)])
                
     def _do_layout(self):