Changeset f845454 in sasview for src/sas/sasgui/perspectives/fitting/basepage.py

Timestamp:

Dec 19, 2016 1:52:12 PM (8 years ago)

Author:

GitHub <noreply@…>

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, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

b61bd57

Parents:

99f3e053 (diff), 50f1477 (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:

Jeff Krzywon <krzywon@…> (12/19/16 13:52:12)

git-committer:

GitHub <noreply@…> (12/19/16 13:52:12)

Message:

Merge branch 'master' into ticket-753

File:

• src/sas/sasgui/perspectives/fitting/basepage.py (modified) (1 diff)

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

@@ -1532 +1532 @@
                         val = len(val) if isinstance(val, list) else 1
                         self.Npts_fit.SetValue(str(val))
+
                     else:
                         # No data in the panel