Changeset b09aee8 in sasview for src/sas/sasgui/perspectives/fitting/fitpage.py

Timestamp:

Mar 20, 2018 10:13:51 AM (7 years ago)

Author:

GitHub <noreply@…>

Branches:

master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, unittest-saveload

Children:

2a24d55, 0863065, fc25457, c16172d, 3b37edc

Parents:

85d98e2 (diff), 39a018b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Andrew Jackson <andrew.jackson@…> (03/20/18 10:13:51)

git-committer:

GitHub <noreply@…> (03/20/18 10:13:51)

Message:

Merge pull request #147 from llimeht/tmp/missing-test-resource

Fix finding of test resource

File:

• src/sas/sasgui/perspectives/fitting/fitpage.py (modified) (2 diffs)

src/sas/sasgui/perspectives/fitting/fitpage.py

@@ -365 +365 @@
         # StaticText for chi2, N(for fitting), Npts + Log/linear spacing
         self.tcChi = BGTextCtrl(self, wx.ID_ANY, "-", size=(75, 20), style=0)
-        self.tcChi.SetToolTipString("Chi2/Npts(Fit)")
+        self.tcChi.SetToolTipString("Chi2/DOF (DOF=Npts-Npar fitted)")
         self.Npts_fit = BGTextCtrl(self, wx.ID_ANY, "-", size=(75, 20), style=0)
         self.Npts_fit.SetToolTipString(
@@ -391 +391 @@
         self.points_sizer.Add(self.pointsbox)
 
-        box_description_1 = wx.StaticText(self, wx.ID_ANY, '   Chi2/Npts')
+        box_description_1 = wx.StaticText(self, wx.ID_ANY, 'Reduced Chi2')
         box_description_2 = wx.StaticText(self, wx.ID_ANY, 'Npts(Fit)')