Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ticket 1406 cancel calculation #1892

Merged
merged 2 commits into from Aug 17, 2021
Merged

Ticket 1406 cancel calculation #1892

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8bccd98
allows the user to cancel the calculation in the generic scattering c…
rjbourne Aug 10, 2021
182399b
added separate tooltip for cancel button
rjbourne Aug 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
30 changes: 25 additions & 5 deletions src/sas/qtgui/Calculators/GenericScatteringCalculator.py
View file
Open in desktop
Expand Up @@ -609,8 +609,12 @@ def onCompute(self):
self._create_default_2d_data()
inputs = [self.data.qx_data, self.data.qy_data]
logging.info("Computation is in progress...")
self.cmdCompute.setText('Wait...')
self.cmdCompute.setEnabled(False)
self.cmdCompute.setText('Cancel')
self.cmdCompute.setToolTip("<html><head/><body><p>Cancel the computation of the scattering calculation.</p></body></html>")
self.cmdCompute.clicked.disconnect()
self.cmdCompute.clicked.connect(self.onCancel)
self.cancelCalculation = False
#self.cmdCompute.setEnabled(False)
d = threads.deferToThread(self.complete, inputs, self._update)
# Add deferred callback for call return
#d.addCallback(self.plot_1_2d)
Expand All @@ -620,6 +624,12 @@ def onCompute(self):
log_msg = "{}. stop".format(sys.exc_info()[1])
logging.info(log_msg)
return

def onCancel(self):
"""Notify the calculation thread that the user has cancelled the calculation.
"""
self.cancelCalculation = True
self.cmdCompute.setEnabled(False) # don't allow user to start a new calculation until this one finishes cancelling

def _update(self, time=None, percentage=None):
"""
Expand Down Expand Up @@ -668,10 +678,20 @@ def complete(self, input, update=None):
input[1][ind:ind + chunk_size]]
outi = self.model.runXY(inputi)
out.append(outi)
out = numpy.hstack(out)
self.data_to_plot = out
logging.info('Gen computation completed.')
if self.cancelCalculation:
update(time=t, percentage=100*(ind + chunk_size)/nq) # ensure final progress shown
self.data_to_plot = numpy.full(nq, numpy.nan)
self.data_to_plot[:ind + chunk_size] = numpy.hstack(out)
logging.info('Gen computation cancelled.')
break
else:
out = numpy.hstack(out)
self.data_to_plot = out
logging.info('Gen computation completed.')
self.cmdCompute.setText('Compute')
self.cmdCompute.setToolTip("<html><head/><body><p>Compute the scattering pattern and display 1D or 2D plot depending on the settings.</p></body></html>")
self.cmdCompute.clicked.disconnect()
self.cmdCompute.clicked.connect(self.onCompute)
self.cmdCompute.setEnabled(True)
return

Expand Down