Changeset 70c5d490 in sasview for src/sas/sasgui/perspectives/calculator

Timestamp:

Jun 19, 2016 12:34:03 PM (8 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:

1941e6a

Parents:

6dd6e32

Message:

Fix wx button positioning and edit tooltips and title pars of parameter
input boxes to make more clear to user what to do.

File:

• src/sas/sasgui/perspectives/calculator/model_editor.py (modified) (4 diffs)

src/sas/sasgui/perspectives/calculator/model_editor.py

@@ -719 +719 @@
         Do the layout for parameter related widgets
         """
-        param_txt = wx.StaticText(self, -1, 'Fit Parameters (if any): ')
-
-        param_tip = "#Set the parameters and initial values.\n"
+        param_txt = wx.StaticText(self, -1, 'Fit Parameters NOT requiring' + \
+                                  ' polydispersity (if any): ')
+
+        param_tip = "#Set the parameters NOT requiring polydispersity " + \
+        "and their initial values.\n"
         param_tip += "#Example:\n"
         param_tip += "A = 1\nB = 1"
@@ -736 +738 @@
         
         # Parameters with polydispersity
-        pd_param_txt = wx.StaticText(self, -1, 'Fit Parameters requiring polydispersity (if any): ')
-
-        pd_param_tip = "#Set the parameters and initial values.\n"
+        pd_param_txt = wx.StaticText(self, -1, 'Fit Parameters requiring ' + \
+                                     'polydispersity (if any): ')
+
+        pd_param_tip = "#Set the parameters requiring polydispersity and " + \
+        "their initial values.\n"
         pd_param_tip += "#Example:\n"
         pd_param_tip += "C = 2\nD = 2"
@@ -803 +807 @@
         self.bt_close.SetToolTipString("Close this panel.")
 
-        self.button_sizer.AddMany([(self.bt_apply, 0,
-                                    wx.LEFT, EDITOR_WIDTH * 0.8),
-                                   (self.bt_help, 0,
-                                    wx.LEFT,15),
-                                   (self.bt_close, 0,
-                                    wx.LEFT | wx.BOTTOM, 15)])
+        self.button_sizer.AddMany([(self.bt_apply, 0,0),
+                                   (self.bt_help, 0, wx.LEFT | wx.BOTTOM,15),
+                                   (self.bt_close, 0, wx.LEFT | wx.RIGHT, 15)])
 
     def _do_layout(self):
@@ -835 +836 @@
                                   wx.ALL | wx.EXPAND, 5),
                                  (self.msg_sizer, 0, wx.EXPAND | wx.ALL, 5),
-                                 (self.button_sizer, 0, wx.EXPAND | wx.ALL, 5)])
+                                 (self.button_sizer, 0, wx.ALIGN_RIGHT)])
         self.SetSizer(self.main_sizer)
         self.SetAutoLayout(True)