Changeset 6a8adb0 in sasview

Timestamp:

May 29, 2008 12:55:08 PM (16 years ago)

Author:

Mathieu Doucet <doucetm@…>

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:

052a66bc

Parents:

ab6098f

Message:

Cleaned up dialogs

Location:

guitools

Files:

• PropertyDialog.py (modified) (3 diffs)
• fitDialog.py (modified) (4 diffs)

guitools/PropertyDialog.py

@@ -7 +7 @@
 class Properties(wx.Dialog):
     def __init__(self, parent, id, title):
-        wx.Dialog.__init__(self, parent, id, title, size=(350, 200))
+        wx.Dialog.__init__(self, parent, id, "Select the scale of the graph", size=(350, 190))
         """
             for the properties window
@@ -16 +16 @@
         sizer = wx.GridBagSizer(5,0)
         vbox.Add(panel, 1, wx.EXPAND | wx.ALL)
-     
+
         ix = 1
         iy = 1
@@ -34 +34 @@
         self.view =wx.ComboBox(panel, -1)
         sizer.Add(self.view,(iy,ix))
-        ix =3
-        iy +=3
-        btCancel=wx.Button(panel, wx.ID_CANCEL,'Cancel' )
-        sizer.Add(btCancel,(iy,ix))
-        ix +=2
-        btOk = wx.Button(panel, wx.ID_OK, "Ok")
-        sizer.Add(btOk,(iy, ix))
+        
+       
+        btCancel=wx.Button(self, wx.ID_CANCEL,'Cancel' )
+        btOk = wx.Button(self, wx.ID_OK, "OK")
+
+        sizer_button = wx.BoxSizer(wx.HORIZONTAL)
+        sizer_button.Add((20, 20), 1, wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+        sizer_button.Add(btOk, 0, wx.LEFT|wx.RIGHT|wx.ADJUST_MINSIZE, 10)
+        sizer_button.Add(btCancel, 0, wx.LEFT|wx.RIGHT|wx.ADJUST_MINSIZE, 10)        
+        vbox.Add(sizer_button, 0, wx.EXPAND|wx.BOTTOM|wx.TOP, 10)
+ 
         
         # scale value for x

guitools/fitDialog.py

@@ -56 +56 @@
         self.tcChi.SetToolTipString("Chi^2 over degrees of freedom.")
         self.xminFit  = wx.TextCtrl(self,-1,size=(_BOX_WIDTH,20))
-        self.xminFit.SetToolTipString("Enter the minimum value on the axis to be included in the fit.")
+        self.xminFit.SetToolTipString("Enter the minimum value on the x-axis to be included in the fit.")
         self.xmaxFit  = wx.TextCtrl(self,-1,size=(_BOX_WIDTH,20))
-        self.xmaxFit.SetToolTipString("Enter the maximum value on the axis to be included in the fit.")
+        self.xmaxFit.SetToolTipString("Enter the maximum value on the x-axis to be included in the fit.")
         self.xminTransFit = wx.TextCtrl(self,-1,size=(_BOX_WIDTH,20))
+        self.xminTransFit.SetToolTipString("Minimum value on the x-axis for the plotted data.")
         self.xmaxTransFit = wx.TextCtrl(self,-1,size=(_BOX_WIDTH,20))
+        self.xmaxTransFit.SetToolTipString("Maximum value on the x-axis for the plotted data.")
         self.initXmin = wx.TextCtrl(self,-1,size=(_BOX_WIDTH,20))
+        self.initXmin.SetToolTipString("Minimum value available on the x-axis for the plotted data.")
         self.initXmax = wx.TextCtrl(self,-1,size=(_BOX_WIDTH,20))
+        self.initXmax.SetToolTipString("Maximum value available on the x-axis for the plotted data.")
 
         # Make the info box not editable
@@ -126 +130 @@
         iy += 1
         ix = 0
-        sizer.Add(wx.StaticText(self, -1, 'Plotted Range'),(iy, ix),(1,1),\
+        sizer.Add(wx.StaticText(self, -1, 'Plotted range'),(iy, ix),(1,1),\
                    wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
         ix +=1
@@ -136 +140 @@
         iy += 1
         ix = 0
-        sizer.Add(wx.StaticText(self, -1, 'Fit Range of '+self.xLabel),(iy, ix),(1,1),\
+        sizer.Add(wx.StaticText(self, -1, 'Fit range of '+self.xLabel),(iy, ix),(1,1),\
                    wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
         ix += 1
@@ -146 +150 @@
         iy += 1
         ix = 0
-        sizer.Add(wx.StaticText(self, -1, 'Fit Range of x'),(iy, ix),(1,1),\
+        sizer.Add(wx.StaticText(self, -1, 'Fit range of x'),(iy, ix),(1,1),\
                    wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
         ix += 1