Changeset c44bb26a in sasview for src/sas/sasgui/perspectives/fitting/fitting.py
- Timestamp:
- Apr 11, 2017 9:41: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, costrafo411, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
- Children:
- fc6651c
- Parents:
- 426df2e (diff), 97c60f8 (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. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
src/sas/sasgui/perspectives/fitting/fitting.py
r7432acb r426df2e 359 359 'Add a new model function') 360 360 wx.EVT_MENU(owner, wx_id, self.make_new_model) 361 361 362 362 wx_id = wx.NewId() 363 363 self.edit_model_menu.Append(wx_id, 'Sum|Multi(p1, p2)', … … 381 381 '(Re)Load all models present in user plugin_models folder') 382 382 wx.EVT_MENU(owner, wx_id, self.load_plugin_models) 383 383 384 384 def set_edit_menu_helper(self, owner=None, menu=None): 385 385 """ … … 1747 1747 data_id="Data " + data.name + " unsmeared", 1748 1748 dy=unsmeared_error) 1749 # Comment this out until we can get P*S models with correctly populated parameters 1750 #if sq_model is not None and pq_model is not None: 1751 # self.create_theory_1D(x, sq_model, page_id, model, data, state, 1752 # data_description=model.name + " S(q)", 1753 # data_id=str(page_id) + " " + data.name + " S(q)") 1754 # self.create_theory_1D(x, pq_model, page_id, model, data, state, 1755 # data_description=model.name + " P(q)", 1756 # data_id=str(page_id) + " " + data.name + " P(q)") 1749 if sq_model is not None and pq_model is not None: 1750 self.create_theory_1D(x, sq_model, page_id, model, data, state, 1751 data_description=model.name + " S(q)", 1752 data_id=str(page_id) + " " + data.name + " S(q)") 1753 self.create_theory_1D(x, pq_model, page_id, model, data, state, 1754 data_description=model.name + " P(q)", 1755 data_id=str(page_id) + " " + data.name + " P(q)") 1757 1756 1758 1757 current_pg = self.fit_panel.get_page_by_id(page_id) … … 1910 1909 ## and may be the cause of other noted instabilities 1911 1910 ## 1912 ## -PDB August 12, 2014 1911 ## -PDB August 12, 2014 1913 1912 while self.calc_2D.isrunning(): 1914 1913 time.sleep(0.1) … … 1952 1951 if (self.calc_1D is not None) and self.calc_1D.isrunning(): 1953 1952 self.calc_1D.stop() 1954 ## stop just raises the flag -- the thread is supposed to 1953 ## stop just raises the flag -- the thread is supposed to 1955 1954 ## then kill itself but cannot. Paul Kienzle came up with 1956 1955 ## this fix to prevent threads from stepping on each other … … 1964 1963 ## a request to stop the computation. 1965 1964 ## It seems thus that the whole thread approach used here 1966 ## May need rethinking 1965 ## May need rethinking 1967 1966 ## 1968 1967 ## -PDB August 12, 2014 … … 2129 2128 residuals.dxw = None 2130 2129 residuals.ytransform = 'y' 2131 # For latter scale changes 2130 # For latter scale changes 2132 2131 residuals.xaxis('\\rm{Q} ', 'A^{-1}') 2133 2132 residuals.yaxis('\\rm{Residuals} ', 'normalized')
Note: See TracChangeset
for help on using the changeset viewer.