Ignore:
Timestamp:
Oct 6, 2016 3:47:28 PM (5 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:
1dbdb83
Parents:
ef3e09b
Message:

#189: Can now open the simultaneous and constrained fit panel through a save state, but the constraint loading is still broken.

File:
1 edited

Legend:

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

    rca4d985 re89aed5  
    593593        : param datainfo: data 
    594594        """ 
    595         #state = self.state_reader.get_state() 
    596         if state != None: 
     595        from pagestate import PageState 
     596        from simfitpage import SimFitPageState 
     597        if isinstance(state, PageState): 
    597598            state = state.clone() 
    598             # store fitting state in temp_state 
    599599            self.temp_state.append(state) 
     600        elif isinstance(state, SimFitPageState): 
     601            state.load_from_save_state(self) 
    600602        else: 
    601603            self.temp_state = [] 
Note: See TracChangeset for help on using the changeset viewer.