- Timestamp:
- Jun 21, 2012 3:56:56 PM (13 years ago)
- 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:
- 9e00363
- Parents:
- 9bab141
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
plottools/src/danse/common/plottools/fitDialog.py
r9bab141 rffdfd23 187 187 self.I0err_tctr.SetEditable(False) 188 188 self.I0err_tctr.SetBackgroundColour(_BACKGROUND_COLOR) 189 Rg_stxt = wx.StaticText(self, -1, 'Rg (A)')189 Rg_stxt = wx.StaticText(self, -1, 'Rg [A]') 190 190 Rg_stxt.Show(self.yLabel == "ln(y)" ) 191 191 self.Rg_tctr = wx.TextCtrl(self, -1, '') … … 197 197 self.Rgerr_tctr.SetBackgroundColour(_BACKGROUND_COLOR) 198 198 self.Rgerr_tctr.Show(self.yLabel == "ln(y)" ) 199 Diameter_stxt = wx.StaticText(self, -1, 'Rod Diameter (A)') 199 self.Rgerr_pm = wx.StaticText(self, -1, '+/-') 200 self.Rgerr_pm.Show(self.yLabel == "ln(y)" ) 201 Diameter_stxt = wx.StaticText(self, -1, 'Rod Diameter [A]') 200 202 Diameter_stxt.Show(self.yLabel == "ln(y*x)") 201 203 self.Diameter_tctr = wx.TextCtrl(self, -1, '') … … 203 205 self.Diameter_tctr.SetBackgroundColour(_BACKGROUND_COLOR) 204 206 self.Diameter_tctr.Show(self.yLabel == "ln(y*x)") 207 self.Diameter_pm = wx.StaticText(self, -1, '+/-') 208 self.Diameter_pm.Show(self.yLabel == "ln(y*x)") 205 209 self.Diametererr_tctr = wx.TextCtrl(self, -1, '') 206 210 self.Diametererr_tctr.SetEditable(False) … … 216 220 self.RgQmax_tctr.SetBackgroundColour(_BACKGROUND_COLOR) 217 221 218 #sizer.Add(wx.StaticLine(self, -1), 0, wx.EXPAND, 0)219 222 iy += 2 220 223 ix = 0 221 sizer.Add(I0_stxt, (iy, ix), (1,1),224 sizer.Add(I0_stxt, (iy, ix), (1,1), 222 225 wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15) 223 226 ix += 1 224 227 sizer.Add(self.I0_tctr, (iy, ix), (1,1), 225 228 wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 0) 226 227 ix += 2 229 ix += 1 230 sizer.Add(wx.StaticText(self, -1, '+/-'), (iy, ix), 231 (1, 1), wx.EXPAND|wx.ADJUST_MINSIZE, 0) 232 ix += 1 228 233 sizer.Add(self.I0err_tctr, (iy, ix), (1,1), 229 234 wx.EXPAND|wx.ADJUST_MINSIZE, 0) … … 237 242 wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 0) 238 243 239 ix += 2 244 ix += 1 245 sizer.Add(self.Rgerr_pm, (iy, ix), 246 (1, 1), wx.EXPAND|wx.ADJUST_MINSIZE, 0) 247 ix += 1 240 248 sizer.Add(self.Rgerr_tctr, (iy, ix), (1,1), 241 249 wx.EXPAND|wx.ADJUST_MINSIZE, 0) … … 248 256 wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 0) 249 257 250 ix += 2 258 ix += 1 259 sizer.Add(self.Diameter_pm, (iy, ix), 260 (1, 1), wx.EXPAND|wx.ADJUST_MINSIZE, 0) 261 ix += 1 251 262 sizer.Add(self.Diametererr_tctr, (iy, ix), (1,1), 252 263 wx.EXPAND|wx.ADJUST_MINSIZE, 0)
Note: See TracChangeset
for help on using the changeset viewer.