Changeset 9b9ec10 in sasview for src/sas/qtgui/Perspectives/Fitting
- Timestamp:
- Sep 25, 2018 6:35:34 AM (6 years ago)
- Branches:
- ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc
- Children:
- fa762f4, 20f4857
- Parents:
- 085409e3 (diff), 65e76ed (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. - Location:
- src/sas/qtgui/Perspectives/Fitting
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
src/sas/qtgui/Perspectives/Fitting/FittingPerspective.py
r085409e3 r9b9ec10 307 307 page_name = "Page%s"%tab_object.tab_id 308 308 if any([page_name in tab for tab in tabs_for_fitting]): 309 tab_object. setFittingStarted()309 tab_object.disableInteractiveElements() 310 310 311 311 pass … … 324 324 page_name = "Page%s"%tab_object.tab_id 325 325 if any([page_name in tab for tab in tabs_for_fitting]): 326 tab_object. setFittingStopped()326 tab_object.enableInteractiveElements() 327 327 328 328 pass -
src/sas/qtgui/Perspectives/Fitting/FittingUtilities.py
r712db9e r65759c7 484 484 endl = i 485 485 break 486 # make sure we have correct lengths487 assert len(x_current) == len(x_reference[begin:end-endl])488 486 489 487 y = (fn - gn[begin:end-endl])/en -
src/sas/qtgui/Perspectives/Fitting/FittingWidget.py
r085409e3 r9b9ec10 1536 1536 1537 1537 elapsed = result[1] 1538 if self.calc_fit ._interrupting:1538 if self.calc_fit is not None and self.calc_fit._interrupting: 1539 1539 msg = "Fitting cancelled by user after: %s s." % GuiUtils.formatNumber(elapsed) 1540 1540 logger.warning("\n"+msg+"\n") … … 2412 2412 model.setParam(key, value) 2413 2413 # add magnetic params if asked 2414 if self.chkMagnetism.isChecked() :2415 for key, value in self.magnet_params.items() and self._magnet_model.rowCount() > 0:2414 if self.chkMagnetism.isChecked() and self._magnet_model.rowCount() > 0: 2415 for key, value in self.magnet_params.items(): 2416 2416 model.setParam(key, value) 2417 2417 … … 2491 2491 self.enableInteractiveElements() 2492 2492 if return_data is None: 2493 self.calculateDataFailed("Results not available.")2494 2493 return 2495 2494 fitted_data = self.logic.new1DPlot(return_data, self.tab_id) … … 2543 2542 self.enableInteractiveElements() 2544 2543 2544 if return_data is None: 2545 return 2546 2545 2547 fitted_data = self.logic.new2DPlot(return_data) 2548 # assure the current index is set properly for batch 2549 if len(self._logic) > 1: 2550 for i, logic in enumerate(self._logic): 2551 if logic.data.name in fitted_data.name: 2552 self.data_index = i 2553 2546 2554 residuals = self.calculateResiduals(fitted_data) 2547 2555 self.model_data = fitted_data -
src/sas/qtgui/Perspectives/Fitting/SmearingWidget.py
r9a7c81c r8b6e4be 61 61 self.data = None 62 62 self.current_smearer = None 63 self.kernel_model = None 63 64 64 65 # Let only floats in the line edits … … 110 111 if data is None: 111 112 self.setElementsVisibility(False) 112 elif isinstance(data, Data1D): 113 114 def updateKernelModel(self, kernel_model=None): 115 """ 116 Update the model 117 """ 118 self.kernel_model = kernel_model 119 if self.data is None: 120 self.setElementsVisibility(False) 121 return 122 if self.kernel_model is None: 123 return 124 elif isinstance(self.data, Data1D): 113 125 self.cbSmearing.addItems(SMEARING_1D) 114 126 else: 115 127 self.cbSmearing.addItems(SMEARING_2D) 116 128 self.cbSmearing.setCurrentIndex(0) 117 118 def updateKernelModel(self, kernel_model=None):119 """120 Update the model121 """122 self.kernel_model = kernel_model123 129 124 130 def smearer(self):
Note: See TracChangeset
for help on using the changeset viewer.