Changeset 0a3c740 in sasview


Ignore:
Timestamp:
Sep 26, 2017 3:30:27 PM (5 years ago)
Author:
Paul Kienzle <pkienzle@…>
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, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
Children:
5a81885
Parents:
1efbc190
Message:

fix merge errors

File:
1 edited

Legend:

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

    r24d9e84 r0a3c740  
    174174                save_id = self._format_id(save_id) 
    175175                if save_id == model_id: 
    176                     model_map[saved_model.pop('fit_page_source')] = \ 
    177                         model[3].name 
    178                     check = bool(saved_model.pop('checked')) 
    179                     self.model_list[i][0].SetValue(check) 
    180176                    inter_id = str(i)*5 
    181177                    init_map[saved_model.pop('fit_page_source')] = inter_id 
Note: See TracChangeset for help on using the changeset viewer.