Changeset cb93b40 in sasview for src/sas


Ignore:
Timestamp:
Aug 24, 2016 8:40:16 AM (8 years ago)
Author:
lewis
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, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
Children:
b61bd57
Parents:
e9f8208
Message:

Load invariant state correctly (fixes #615)

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

Legend:

Unmodified
Added
Removed
  • src/sas/sasgui/perspectives/invariant/invariant_panel.py

    rc12f9b4 rcb93b40  
    250250 
    251251            num = self.state.saved_state['state_num'] 
    252             if num > 0: 
     252            if int(num) > 0: 
    253253                self._set_undo_flag(True) 
    254             if num < len(state.state_list) - 1: 
     254            if int(num) < len(state.state_list) - 1: 
    255255                self._set_redo_flag(True) 
    256256 
     
    18601860                                   (self.button_calculate, 0, 
    18611861                                    wx.RIGHT | wx.TOP | wx.BOTTOM, 10), 
    1862                                    (self.button_help, 0,  
     1862                                   (self.button_help, 0, 
    18631863                                    wx.RIGHT | wx.TOP | wx.BOTTOM, 10),]) 
    18641864    def _do_layout(self): 
     
    18821882        self.SetSizer(self.main_sizer) 
    18831883        self.SetAutoLayout(True) 
    1884          
     1884 
    18851885    def on_help(self, event): 
    18861886        """ 
    1887         Bring up the Invariant Documentation whenever the HELP button is  
     1887        Bring up the Invariant Documentation whenever the HELP button is 
    18881888        clicked. 
    18891889 
  • src/sas/sasgui/perspectives/invariant/invariant_state.py

    rc10d9d6c rcb93b40  
    426426                        if input_field is not None: 
    427427                            temp_state[item] = val 
    428                             self.state_list[ind] = temp_state 
     428                            self.state_list[str(ind)] = temp_state 
    429429 
    430430            # Parse current state (ie, saved_state) 
     
    790790            doc = state.toXML(datainfo.name, doc=doc, entry_node=sasentry) 
    791791        return doc 
    792  
Note: See TracChangeset for help on using the changeset viewer.