Changeset 0a3c740 in sasview for src

Timestamp:

Sep 26, 2017 3:30:27 PM (7 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:

• src/sas/sasgui/perspectives/fitting/simfitpage.py (modified) (1 diff)

src/sas/sasgui/perspectives/fitting/simfitpage.py

@@ -174 +174 @@
                 save_id = self._format_id(save_id)
                 if save_id == model_id:
-                    model_map[saved_model.pop('fit_page_source')] = \
-                        model[3].name
-                    check = bool(saved_model.pop('checked'))
-                    self.model_list[i][0].SetValue(check)
                     inter_id = str(i)*5
                     init_map[saved_model.pop('fit_page_source')] = inter_id