Changeset b500652 in sasview

Timestamp:

Mar 30, 2010 2:44:30 PM (15 years ago)

Author:

Gervaise Alina <gervyh@…>

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:

328c328

Parents:

378d2eb

Message:

add hint on slit length editor

Location:

calculatorview/perspectives/calculator

Files:

• calculator.py (modified) (1 diff)
• slit_length_calculator_panel.py (modified) (9 diffs)

calculatorview/perspectives/calculator/calculator.py

@@ -109 +109 @@
         slit_length_help = "Provides computation related to Scattering Length density"
         return [("SLD Calculator", sld_help, self.on_calculate_sld),
-                ("Slit Side Calculator", slit_length_help,
+                ("Slit Size Calculator", slit_length_help,
                      self.on_calculate_slit_size)]
               

calculatorview/perspectives/calculator/slit_length_calculator_panel.py

@@ -22 +22 @@
 if sys.platform.count("win32") > 0:
     PANEL_WIDTH = 500
-    PANEL_HEIGHT = 190
+    PANEL_HEIGHT = 200
     FONT_VARIANT = 0
 else:
     PANEL_WIDTH = 530
-    PANEL_HEIGHT = 220
+    PANEL_HEIGHT = 230
     FONT_VARIANT = 1
     
@@ -35 +35 @@
     """
     ## Internal nickname for the window, used by the AUI manager
-    window_name = "Slit Length Calculator"
+    window_name = "Slit Size Calculator"
     ## Name to appear on the window title bar
-    window_caption = "Slit Length Calculator"
+    window_caption = "Slit Size Calculator"
     ## Flag to tell the AUI manager to put this panel in the center pane
     CENTER_PANE = True
@@ -63 +63 @@
         self.data_name_sizer = wx.BoxSizer(wx.HORIZONTAL)
         self.slit_size_sizer = wx.BoxSizer(wx.HORIZONTAL)
+        self.hint_sizer = wx.BoxSizer(wx.HORIZONTAL)
         self.button_sizer = wx.BoxSizer(wx.HORIZONTAL)
        
@@ -84 +85 @@
             Fill the sizer containing slit size information
         """
-        slit_size_txt = wx.StaticText(self, -1, 'Slit Size: ')
+        slit_size_txt = wx.StaticText(self, -1, 'Full Slit Size: ')
         self.slit_size_tcl = OutputTextCtrl(self, -1, size=(_BOX_WIDTH,-1))
         slit_size_hint = " Estimated slit size"
@@ -97 +98 @@
                                       (self.slit_size_unit_tcl, 0, wx.LEFT, 10)])
     
+    def _layout_hint(self):
+        """
+            Fill the sizer containing hint 
+        """
+        hint_msg = "This calculation works only for  SAXSess beam profile data."
+        self.hint_txt = wx.StaticText(self, -1, hint_msg)
+        self.hint_sizer.AddMany([(self.hint_txt, 0, wx.LEFT, 15)])
+    
     def _layout_button(self):  
         """
@@ -103 +112 @@
         self.bt_close = wx.Button(self, wx.ID_CANCEL,'Close')
         self.bt_close.Bind(wx.EVT_BUTTON, self.on_close)
-        self.bt_close.SetToolTipString("Apply current changes to the source.")
+        self.bt_close.SetToolTipString("Close this window.")
         self.button_sizer.AddMany([(self.bt_close, 0, wx.LEFT, 390)])
         
@@ -113 +122 @@
         self._layout_data_name()
         self._layout_slit_size()
+        self._layout_hint()
         self._layout_button()
         self.boxsizer_source.AddMany([(self.data_name_sizer, 0,
                                           wx.EXPAND|wx.TOP|wx.BOTTOM, 5),
                                    (self.slit_size_sizer, 0,
+                                     wx.EXPAND|wx.TOP|wx.BOTTOM, 5),
+                                     (self.hint_sizer, 0,
                                      wx.EXPAND|wx.TOP|wx.BOTTOM, 5)])
         self.main_sizer.AddMany([(self.boxsizer_source, 0, wx.ALL, 10),
                                   (self.button_sizer, 0,
                                     wx.EXPAND|wx.TOP|wx.BOTTOM, 5)])
-        
         self.SetSizer(self.main_sizer)
         self.SetAutoLayout(True)
@@ -203 +214 @@
             if self.parent.parent is None:
                 return 
-            msg = "Slit Length Calculator: %s"%(sys.exc_value)
+            msg = "Slit Size Calculator: %s"%(sys.exc_value)
             wx.PostEvent(self.parent.parent, StatusEvent(status=msg, type='stop'))
             return 
@@ -215 +226 @@
     
 class SlitLengthCalculatorWindow(wx.Frame):
-    def __init__(self, parent=None, id=1, title="Slit Length Calculator"):
+    def __init__(self, parent=None, id=1, title="Slit Size Calculator"):
         wx.Frame.__init__(self, parent, id, title, size=(PANEL_WIDTH,PANEL_HEIGHT))
         self.parent = parent