Changeset 505706a in sasview for src/sas/sasgui/perspectives/fitting/basepage.py
- Timestamp:
- Dec 20, 2016 7:59:08 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.1.1, release-4.1.2, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
- Children:
- b61bd57
- Parents:
- d3911e3 (diff), 06a4306 (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/basepage.py
rd3911e3 r505706a 52 52 FONT_VARIANT = 1 53 53 ON_MAC = True 54 55 54 56 55 class BasicPage(ScrolledPanel, PanelBase): … … 1042 1041 disp_model = POLYDISPERSITY_MODELS['array']() 1043 1042 if hasattr(state, "values") and \ 1044 self.disp_cb_dict[item].GetValue() is True:1043 self.disp_cb_dict[item].GetValue(): 1045 1044 if len(state.values) > 0: 1046 1045 self.values = state.values … … 1435 1434 self.qmax_x = tempmax 1436 1435 is_modified = True 1437 1438 1436 if is_2Ddata: 1439 # set mask1440 1437 is_modified = self._validate_Npts() 1441 1438 else: 1439 is_modified = self._validate_Npts_1D() 1442 1440 else: 1443 1441 self.fitrange = False … … 1454 1452 # Theory case: need to get npts value to draw 1455 1453 self.npts_x = float(self.Npts_total.GetValue()) 1454 self.Npts_fit.SetValue(str(self.Npts_total.GetValue())) 1455 self._save_plotting_range() 1456 1456 self.create_default_data() 1457 1457 self.state_change = True 1458 1458 self._draw_model() 1459 # Time delay has been introduced to prevent _handle error 1460 # on Windows 1461 # This part of code is executed when model is selected and 1462 # it's parameters are changed (with respect to previously 1463 # selected model). There are two Iq evaluations occuring one 1464 # after another and therefore there may be compilation error 1465 # if model is calculated for the first time. 1466 # This seems to be Windows only issue - haven't tested on Linux 1467 # though.The proper solution (other than time delay) requires 1468 # more fundemental code refatoring 1469 # Wojtek P. Nov 7, 2016 1470 if not ON_MAC: 1471 time.sleep(0.1) 1459 1472 self.Refresh() 1460 1473 … … 2167 2180 flag = False 2168 2181 else: 2169 self.Npts_fit.SetValue(str(len(index_data[index_data is True])))2182 self.Npts_fit.SetValue(str(len(index_data[index_data]))) 2170 2183 self.fitrange = True 2171 2184 … … 2391 2404 2392 2405 # Redraw the model 2393 self._draw_model() 2406 # Wojtek P. Nov 7, 2016: Redrawing seems to be unnecessary here 2407 # self._draw_model() 2394 2408 # self._undo.Enable(True) 2395 2409 event = PageInfoEvent(page=self) … … 2610 2624 Layout after self._draw_model 2611 2625 """ 2612 if ON_MAC is True:2626 if ON_MAC: 2613 2627 time.sleep(1) 2614 2628
Note: See TracChangeset
for help on using the changeset viewer.