Ignore:
Timestamp:
Dec 19, 2016 4:40:37 AM (8 years ago)
Author:
jhbakker
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:
e1e41de (diff), 67b0a99 (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.
Message:

Merge branch 'master' into Jurtest2

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    rf668101 r55bc5a7f  
    15401540                        index_data = ((self.qmin_x <= self.data.x) & 
    15411541                                      (self.data.x <= self.qmax_x)) 
    1542                         val = str(len(self.data.x[index_data is True])) 
     1542                        val = str(len([index_data is True])) 
    15431543                        self.Npts_fit.SetValue(val) 
    15441544                    else: 
Note: See TracChangeset for help on using the changeset viewer.