Changeset b4fc0f9 in sasview for src/sas/sasgui


Ignore:
Timestamp:
Nov 15, 2016 2:29:45 PM (7 years ago)
Author:
krzywon
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:
377c19a2
Parents:
600005c
Message:

#795: Orientation parameters returned by sasmodels are now handled properly.

Location:
src/sas/sasgui/perspectives/fitting
Files:
2 edited

Legend:

Unmodified
Added
Removed

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

    r64c7f39 rb4fc0f9  
    15721572        if len(statelist) == 0 or len(listtorestore) == 0: 
    15731573            return 
    1574         if len(statelist) != len(listtorestore): 
    1575             return 
    15761574 
    15771575        ordered_list = [] 
    … …  
    15811579                    ordered_list.append(param) 
    15821580                    break 
     1581        if len(ordered_list) != len(statelist): 
     1582            return 
    15831583        statelist = ordered_list 
    15841584 
    1585         for j in range(len(listtorestore)): 
     1585        for j in range(len(statelist)) if len(statelist) < len(listtorestore) \ 
     1586                else range(len(listtorestore)): 
    15861587            item_page = listtorestore[j] 
    15871588            item_page_info = statelist[j] 
     1589            if (item_page_info[1] == "theta" or item_page_info[1] == "phi") \ 
     1590                and not self._is_2D(): 
     1591                break 
    15881592            # change the state of the check box for simple parameters 
    15891593            if item_page[0] is not None: 

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

    r64c7f39 rb4fc0f9  
    401401                    lower = params.get(name + ".lower") 
    402402                    units = params.get(name + ".units") 
    403                     if std is not None: 
     403                    if std is not None and std is not numpy.nan: 
    404404                        std = [True, str(std)] 
    405405                    else: 
Note: See TracChangeset for help on using the changeset viewer.