diff --git a/docs/source/release/v3.14.0/indirect_inelastic.rst b/docs/source/release/v3.14.0/indirect_inelastic.rst index fd69d1e950e87059675838904f1d1992db9428fa..05a7da3c96d63650d99c9165f53615797ff08b28 100644 --- a/docs/source/release/v3.14.0/indirect_inelastic.rst +++ b/docs/source/release/v3.14.0/indirect_inelastic.rst @@ -26,7 +26,7 @@ Data Analysis Interface 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 during fitting. - When the InelasticDiffSphere, InelasticDiffRotDiscreteCircle, ElasticDiffSphere or ElasticDiffRotDiscreteCircle diff --git a/qt/scientific_interfaces/Indirect/ConvFit.cpp b/qt/scientific_interfaces/Indirect/ConvFit.cpp index cd5426d7d017810eac4704a94926be0e3c31e167..c9fd925851de3c05ee71e296c96bc95c51d33fda 100644 --- a/qt/scientific_interfaces/Indirect/ConvFit.cpp +++ b/qt/scientific_interfaces/Indirect/ConvFit.cpp @@ -192,6 +192,8 @@ void ConvFit::setSaveResultEnabled(bool enabled) { void ConvFit::setRunIsRunning(bool running) { m_uiForm->pbRun->setText(running ? "Running..." : "Run"); setRunEnabled(!running); + setPlotResultEnabled(!running); + setSaveResultEnabled(!running); setFitSingleSpectrumEnabled(!running); } diff --git a/qt/scientific_interfaces/Indirect/Elwin.cpp b/qt/scientific_interfaces/Indirect/Elwin.cpp index f0cf8374b4129ba8970b49d32666465e0905f693..65dad9f3c5e00cbfb05e2a6875650986e852f83a 100644 --- a/qt/scientific_interfaces/Indirect/Elwin.cpp +++ b/qt/scientific_interfaces/Indirect/Elwin.cpp @@ -526,6 +526,8 @@ void Elwin::setSaveResultEnabled(bool enabled) { void Elwin::setRunIsRunning(bool running) { m_uiForm.pbRun->setText(running ? "Running..." : "Run"); setRunEnabled(!running); + setPlotResultEnabled(!running); + setSaveResultEnabled(!running); } void Elwin::setPlotResultIsPlotting(bool plotting) { diff --git a/qt/scientific_interfaces/Indirect/Iqt.cpp b/qt/scientific_interfaces/Indirect/Iqt.cpp index e63ce3d784d2b39f786221fe836a096d79fe93c3..ce34e2a349a7e31fc8523f6b5e0f988a97cfb415 100644 --- a/qt/scientific_interfaces/Indirect/Iqt.cpp +++ b/qt/scientific_interfaces/Indirect/Iqt.cpp @@ -475,6 +475,9 @@ void Iqt::setSaveResultEnabled(bool enabled) { void Iqt::setRunIsRunning(bool running) { m_uiForm.pbRun->setText(running ? "Running..." : "Run"); setRunEnabled(!running); + setPlotResultEnabled(!running); + setSaveResultEnabled(!running); + setTiledPlotEnabled(!running); } void Iqt::setPlotResultIsPlotting(bool plotting) { diff --git a/qt/scientific_interfaces/Indirect/IqtFit.cpp b/qt/scientific_interfaces/Indirect/IqtFit.cpp index 89d6b83d0b35436d001634e08f58534106404e4f..5c31a55662af5da8176717f42eb415b709086527 100644 --- a/qt/scientific_interfaces/Indirect/IqtFit.cpp +++ b/qt/scientific_interfaces/Indirect/IqtFit.cpp @@ -149,6 +149,8 @@ void IqtFit::setSaveResultEnabled(bool enabled) { void IqtFit::setRunIsRunning(bool running) { m_uiForm->pbRun->setText(running ? "Running..." : "Run"); setRunEnabled(!running); + setPlotResultEnabled(!running); + setSaveResultEnabled(!running); setFitSingleSpectrumEnabled(!running); } diff --git a/qt/scientific_interfaces/Indirect/JumpFit.cpp b/qt/scientific_interfaces/Indirect/JumpFit.cpp index 41e2cbc5a62510ff521951e859bafa5434ec41d8..e044a581549c9e4529813cb40cd0674d012a213b 100644 --- a/qt/scientific_interfaces/Indirect/JumpFit.cpp +++ b/qt/scientific_interfaces/Indirect/JumpFit.cpp @@ -111,6 +111,8 @@ void JumpFit::setSaveResultEnabled(bool enabled) { void JumpFit::setRunIsRunning(bool running) { m_uiForm->pbRun->setText(running ? "Running..." : "Run"); setRunEnabled(!running); + setPlotResultEnabled(!running); + setSaveResultEnabled(!running); setFitSingleSpectrumEnabled(!running); } diff --git a/qt/scientific_interfaces/Indirect/MSDFit.cpp b/qt/scientific_interfaces/Indirect/MSDFit.cpp index 74cea77e007797f6f8341e18fe5a645a1d0b235c..2f90d3d87d7b5969aa9b226496319dc87c99bef7 100644 --- a/qt/scientific_interfaces/Indirect/MSDFit.cpp +++ b/qt/scientific_interfaces/Indirect/MSDFit.cpp @@ -92,6 +92,8 @@ void MSDFit::setSaveResultEnabled(bool enabled) { void MSDFit::setRunIsRunning(bool running) { m_uiForm->pbRun->setText(running ? "Running..." : "Run"); setRunEnabled(!running); + setPlotResultEnabled(!running); + setSaveResultEnabled(!running); setFitSingleSpectrumEnabled(!running); }