Changeset 69363c7 in sasview for src/sas/sasgui/perspectives/fitting/fitpage.py
- Timestamp:
- Sep 22, 2017 8:29:48 AM (7 years ago)
- 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:
- ab0b93f
- Parents:
- 1386b2f (diff), d76c43a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent. - git-author:
- Paul Kienzle <pkienzle@…> (09/22/17 08:28:48)
- git-committer:
- Paul Kienzle <pkienzle@…> (09/22/17 08:29:48)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
src/sas/sasgui/perspectives/fitting/fitpage.py
r277257f r69363c7 1163 1163 is_poly_enabled = None 1164 1164 1165 self._on_select_model_helper() 1165 try: 1166 self._on_select_model_helper() 1167 except Exception as e: 1168 evt = StatusEvent(status=e.message, info="error") 1169 wx.PostEvent(self._manager.parent, evt) 1170 # Set S(Q) to None 1171 self.structurebox.SetSelection(0) 1172 self._on_select_model() 1173 return 1166 1174 self.set_model_param_sizer(self.model) 1167 1175 if self.model is None: … … 1254 1262 # if mod_cat == CUSTOM_MODEL: 1255 1263 # temp = self.parent.update_model_list() 1264 # for v in self.parent.model_dictionary.values(): 1265 # if v.id == self.model.id: 1266 # self.model = v() 1267 # break 1256 1268 # if temp: 1257 1269 # self.model_list_box = temp … … 2188 2200 self.save_current_state() 2189 2201 2202 if not self.is_mac: 2203 self.Layout() 2204 self.Refresh() 2190 2205 # plot model ( when drawing, do not update chisqr value again) 2191 2206 self._draw_model(update_chisqr=False, source='fit')
Note: See TracChangeset
for help on using the changeset viewer.