Changeset 09fdc89 in sasview


Ignore:
Timestamp:
Dec 19, 2016 11:52:35 AM (7 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, 06a4306
Parents:
50f1477 (diff), f845454 (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 11:52:35)
git-committer:
GitHub <noreply@…> (12/19/16 11:52:35)
Message:

Merge pull request #18 from SasView?/ticket-753

Enforce callbacks for the Fitting group box. Fixes #753

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/sas/sasgui/perspectives/fitting/basepage.py

    r345e7e4 rf845454  
    14351435                    self.qmax_x = tempmax 
    14361436                    is_modified = True 
    1437  
    14381437                if is_2Ddata: 
    1439                     # set mask 
    14401438                    is_modified = self._validate_Npts() 
    1441  
     1439                else: 
     1440                    is_modified = self._validate_Npts_1D() 
    14421441            else: 
    14431442                self.fitrange = False 
     
    14541453                # Theory case: need to get npts value to draw 
    14551454                self.npts_x = float(self.Npts_total.GetValue()) 
     1455                self.Npts_fit.SetValue(str(self.Npts_total.GetValue())) 
     1456                self._save_plotting_range() 
    14561457                self.create_default_data() 
    14571458                self.state_change = True 
     
    15281529                        index_data = ((self.qmin_x <= self.data.x) & 
    15291530                                      (self.data.x <= self.qmax_x)) 
    1530                         val = str(len([index_data is True])) 
    1531                         self.Npts_fit.SetValue(val) 
     1531                        val = self.data.x[index_data is True] 
     1532                        val = len(val) if isinstance(val, list) else 1 
     1533                        self.Npts_fit.SetValue(str(val)) 
     1534 
    15321535                    else: 
    15331536                        # No data in the panel 
     
    21672170                flag = False 
    21682171            else: 
    2169                 self.Npts_fit.SetValue(str(len(index_data[index_data is True]))) 
     2172                val = index_data[index_data is True] 
     2173                val = len(val) if isinstance(val, list) else 1 
     2174                self.Npts_fit.SetValue(str(val)) 
    21702175                self.fitrange = True 
    21712176 
Note: See TracChangeset for help on using the changeset viewer.