Changeset ffdfd23 in sasview

Timestamp:

Jun 21, 2012 3:56:56 PM (12 years ago)

Author:

Jae Cho <jhjcho@…>

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

Message:

added +- in fitdialog

Files:

• fittingview/src/sans/perspectives/fitting/fitting.py (modified) (1 diff)
• plottools/src/danse/common/plottools/fitDialog.py (modified) (6 diffs)

fittingview/src/sans/perspectives/fitting/fitting.py

@@ -2115 +2115 @@
             # build residuals
             residuals = Data1D()
-            residuals.y = (fn - gn) / en
+            try:
+                residuals.y = (fn - gn) / en
+            except:
+                msg = "ResidualPlot Error: different # of data points in theory"
+                wx.PostEvent(self.parent, StatusEvent(status=msg, info="error"))
+                residuals.y = (fn - gn[index]) / en
             residuals.x = data_copy.x[index]
             residuals.dy = numpy.ones(len(residuals.y))

plottools/src/danse/common/plottools/fitDialog.py

@@ -187 +187 @@
                 self.I0err_tctr.SetEditable(False)
                 self.I0err_tctr.SetBackgroundColour(_BACKGROUND_COLOR)
-                Rg_stxt = wx.StaticText(self, -1, 'Rg (A)')
+                Rg_stxt = wx.StaticText(self, -1, 'Rg [A]')
                 Rg_stxt.Show(self.yLabel == "ln(y)" )
                 self.Rg_tctr = wx.TextCtrl(self, -1, '')
@@ -197 +197 @@
                 self.Rgerr_tctr.SetBackgroundColour(_BACKGROUND_COLOR)
                 self.Rgerr_tctr.Show(self.yLabel == "ln(y)" )
-                Diameter_stxt = wx.StaticText(self, -1, 'Rod Diameter (A)')
+                self.Rgerr_pm = wx.StaticText(self, -1, '+/-')
+                self.Rgerr_pm.Show(self.yLabel == "ln(y)" )
+                Diameter_stxt = wx.StaticText(self, -1, 'Rod Diameter [A]')
                 Diameter_stxt.Show(self.yLabel == "ln(y*x)")
                 self.Diameter_tctr = wx.TextCtrl(self, -1, '')
@@ -203 +205 @@
                 self.Diameter_tctr.SetBackgroundColour(_BACKGROUND_COLOR)
                 self.Diameter_tctr.Show(self.yLabel == "ln(y*x)")
+                self.Diameter_pm = wx.StaticText(self, -1, '+/-')
+                self.Diameter_pm.Show(self.yLabel == "ln(y*x)")
                 self.Diametererr_tctr = wx.TextCtrl(self, -1, '')
                 self.Diametererr_tctr.SetEditable(False)
@@ -216 +220 @@
                 self.RgQmax_tctr.SetBackgroundColour(_BACKGROUND_COLOR)
 
-                #sizer.Add(wx.StaticLine(self, -1), 0, wx.EXPAND, 0)
                 iy += 2
                 ix = 0
-                sizer.Add(I0_stxt, (iy, ix),(1,1),
+                sizer.Add(I0_stxt, (iy, ix), (1,1),
                                         wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
                 ix += 1
                 sizer.Add(self.I0_tctr, (iy, ix), (1,1),
                                         wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 0)
-        
-                ix += 2
+                ix += 1
+                sizer.Add(wx.StaticText(self, -1, '+/-'), (iy, ix),
+                                        (1, 1), wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+                ix += 1
                 sizer.Add(self.I0err_tctr, (iy, ix), (1,1), 
                                         wx.EXPAND|wx.ADJUST_MINSIZE, 0)
@@ -237 +242 @@
                                         wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 0)
         
-                ix += 2
+                ix += 1
+                sizer.Add(self.Rgerr_pm, (iy, ix),
+                                        (1, 1), wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+                ix += 1
                 sizer.Add(self.Rgerr_tctr, (iy, ix), (1,1), 
                                         wx.EXPAND|wx.ADJUST_MINSIZE, 0)
@@ -248 +256 @@
                                         wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 0)
         
-                ix += 2
+                ix += 1
+                sizer.Add(self.Diameter_pm, (iy, ix),
+                                        (1, 1), wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+                ix += 1
                 sizer.Add(self.Diametererr_tctr, (iy, ix), (1,1), 
                                         wx.EXPAND|wx.ADJUST_MINSIZE, 0)