Unverified Commit 478413e2 authored by Antti Soininen's avatar Antti Soininen Committed by GitHub
Browse files

Merge pull request #23689 from mantidproject/23688_Indirect_DisableOutputOptionsWhileRunning

Indirect - Disable output buttons during a fit
parents 27cc21cd bf83c31e
...@@ -26,7 +26,7 @@ Data Analysis Interface ...@@ -26,7 +26,7 @@ Data Analysis Interface
Improvements Improvements
############ ############
- The Run button in the Data Analysis tabs is now above the output options, and is disabled during fitting. - The Run button is now above the output options, and is disabled during fitting along with the output buttons.
- The Fit Single Spectrum buttons in the Data Analysis tabs MSDFit, ConvFit, I(Q,t)Fit and F(Q)Fit are now disabled - The Fit Single Spectrum buttons in the Data Analysis tabs MSDFit, ConvFit, I(Q,t)Fit and F(Q)Fit are now disabled
during fitting. during fitting.
- When the InelasticDiffSphere, InelasticDiffRotDiscreteCircle, ElasticDiffSphere or ElasticDiffRotDiscreteCircle - When the InelasticDiffSphere, InelasticDiffRotDiscreteCircle, ElasticDiffSphere or ElasticDiffRotDiscreteCircle
......
...@@ -192,6 +192,8 @@ void ConvFit::setSaveResultEnabled(bool enabled) { ...@@ -192,6 +192,8 @@ void ConvFit::setSaveResultEnabled(bool enabled) {
void ConvFit::setRunIsRunning(bool running) { void ConvFit::setRunIsRunning(bool running) {
m_uiForm->pbRun->setText(running ? "Running..." : "Run"); m_uiForm->pbRun->setText(running ? "Running..." : "Run");
setRunEnabled(!running); setRunEnabled(!running);
setPlotResultEnabled(!running);
setSaveResultEnabled(!running);
setFitSingleSpectrumEnabled(!running); setFitSingleSpectrumEnabled(!running);
} }
......
...@@ -526,6 +526,8 @@ void Elwin::setSaveResultEnabled(bool enabled) { ...@@ -526,6 +526,8 @@ void Elwin::setSaveResultEnabled(bool enabled) {
void Elwin::setRunIsRunning(bool running) { void Elwin::setRunIsRunning(bool running) {
m_uiForm.pbRun->setText(running ? "Running..." : "Run"); m_uiForm.pbRun->setText(running ? "Running..." : "Run");
setRunEnabled(!running); setRunEnabled(!running);
setPlotResultEnabled(!running);
setSaveResultEnabled(!running);
} }
void Elwin::setPlotResultIsPlotting(bool plotting) { void Elwin::setPlotResultIsPlotting(bool plotting) {
......
...@@ -475,6 +475,9 @@ void Iqt::setSaveResultEnabled(bool enabled) { ...@@ -475,6 +475,9 @@ void Iqt::setSaveResultEnabled(bool enabled) {
void Iqt::setRunIsRunning(bool running) { void Iqt::setRunIsRunning(bool running) {
m_uiForm.pbRun->setText(running ? "Running..." : "Run"); m_uiForm.pbRun->setText(running ? "Running..." : "Run");
setRunEnabled(!running); setRunEnabled(!running);
setPlotResultEnabled(!running);
setSaveResultEnabled(!running);
setTiledPlotEnabled(!running);
} }
void Iqt::setPlotResultIsPlotting(bool plotting) { void Iqt::setPlotResultIsPlotting(bool plotting) {
......
...@@ -149,6 +149,8 @@ void IqtFit::setSaveResultEnabled(bool enabled) { ...@@ -149,6 +149,8 @@ void IqtFit::setSaveResultEnabled(bool enabled) {
void IqtFit::setRunIsRunning(bool running) { void IqtFit::setRunIsRunning(bool running) {
m_uiForm->pbRun->setText(running ? "Running..." : "Run"); m_uiForm->pbRun->setText(running ? "Running..." : "Run");
setRunEnabled(!running); setRunEnabled(!running);
setPlotResultEnabled(!running);
setSaveResultEnabled(!running);
setFitSingleSpectrumEnabled(!running); setFitSingleSpectrumEnabled(!running);
} }
......
...@@ -111,6 +111,8 @@ void JumpFit::setSaveResultEnabled(bool enabled) { ...@@ -111,6 +111,8 @@ void JumpFit::setSaveResultEnabled(bool enabled) {
void JumpFit::setRunIsRunning(bool running) { void JumpFit::setRunIsRunning(bool running) {
m_uiForm->pbRun->setText(running ? "Running..." : "Run"); m_uiForm->pbRun->setText(running ? "Running..." : "Run");
setRunEnabled(!running); setRunEnabled(!running);
setPlotResultEnabled(!running);
setSaveResultEnabled(!running);
setFitSingleSpectrumEnabled(!running); setFitSingleSpectrumEnabled(!running);
} }
......
...@@ -92,6 +92,8 @@ void MSDFit::setSaveResultEnabled(bool enabled) { ...@@ -92,6 +92,8 @@ void MSDFit::setSaveResultEnabled(bool enabled) {
void MSDFit::setRunIsRunning(bool running) { void MSDFit::setRunIsRunning(bool running) {
m_uiForm->pbRun->setText(running ? "Running..." : "Run"); m_uiForm->pbRun->setText(running ? "Running..." : "Run");
setRunEnabled(!running); setRunEnabled(!running);
setPlotResultEnabled(!running);
setSaveResultEnabled(!running);
setFitSingleSpectrumEnabled(!running); setFitSingleSpectrumEnabled(!running);
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment