Changeset 406644a in sasview for src


Ignore:
Timestamp:
Nov 30, 2016 3:29:47 PM (8 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:
7602675
Parents:
db5294e
Message:

#795: A few more models have been properly converted and tested to work. Still to do: 4 models not loading, custom models, and fix an error thrown when negative values are loaded.

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

Legend:

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

    rdb5294e r406644a  
    15831583                    ordered_list.append(param) 
    15841584                    break 
    1585         if len(ordered_list) != len(statelist): 
     1585        if len(ordered_list) != len(statelist) \ 
     1586                and len(ordered_list) != len(listtorestore): 
    15861587            return 
    15871588        statelist = ordered_list 
    15881589 
     1590        #FIXME: Get rid of check above and simple assign params based on name 
    15891591        for j in range(len(statelist)) if len(statelist) < len(listtorestore) \ 
    15901592                else range(len(listtorestore)): 
     
    15981600                item_page[0].SetValue(item_page_info[0]) 
    15991601            if item_page[2] is not None: 
     1602                # TODO: On loading save state, should try to coerce length and 
     1603                # TODO: scale params to positive values 
    16001604                item_page[2].SetValue(item_page_info[2]) 
    16011605                if item_page[2].__class__.__name__ == "ComboBox": 
  • src/sas/sasgui/perspectives/fitting/pagestate.py

    r8898558b r406644a  
    412412                    pass 
    413413                else: 
    414                     fittable = params.get(name + ".fittable") 
    415                     std = params.get(name + ".std") 
    416                     upper = params.get(name + ".upper") 
    417                     lower = params.get(name + ".lower") 
     414                    fittable = params.get(name + ".fittable", True) 
     415                    std = params.get(name + ".std", '0.0') 
     416                    upper = params.get(name + ".upper", 'inf') 
     417                    lower = params.get(name + ".lower", '-inf') 
    418418                    units = params.get(name + ".units") 
    419419                    if std is not None and std is not numpy.nan: 
Note: See TracChangeset for help on using the changeset viewer.