From 94979f7b3a32fda6ce8ade4e27470ce803dcbb2c Mon Sep 17 00:00:00 2001
From: Dan Nixon <dan@dan-nixon.com>
Date: Tue, 22 Jul 2014 11:43:57 +0100
Subject: [PATCH] Fix issues caused by opening both direct and indirect
Refs #9966
---
.../CustomInterfaces/src/DirectConvertToEnergy.cpp | 12 +++++++++---
.../CustomInterfaces/src/IndirectDataReduction.cpp | 11 ++++++++---
2 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/DirectConvertToEnergy.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/DirectConvertToEnergy.cpp
index 8378f43b273..34c04d59637 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/DirectConvertToEnergy.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/DirectConvertToEnergy.cpp
@@ -39,8 +39,9 @@ DirectConvertToEnergy::DirectConvertToEnergy(QWidget *parent) :
m_curInterfaceSetup(""), m_curEmodeType(DirectConvertToEnergy::Undefined), m_settingsGroup("CustomInterfaces/DirectConvertToEnergy"),
m_algRunner(new MantidQt::API::AlgorithmRunner(this))
{
- QObject::connect(m_algRunner, SIGNAL(algorithmComplete(bool)), this, SLOT(instrumentLoadingDone(bool)));
- QObject::connect(m_algRunner, SIGNAL(algorithmProgress(double, const std::string &)), this, SLOT(instrumentLoadProgress(double, const std::string &)));
+ //Signals to report load instrument algo progress
+ connect(m_algRunner, SIGNAL(algorithmComplete(bool)), this, SLOT(instrumentLoadingDone(bool)));
+ connect(m_algRunner, SIGNAL(algorithmProgress(double, const std::string &)), this, SLOT(instrumentLoadProgress(double, const std::string &)));
}
/**
@@ -48,6 +49,9 @@ DirectConvertToEnergy::DirectConvertToEnergy(QWidget *parent) :
*/
DirectConvertToEnergy::~DirectConvertToEnergy()
{
+ //Make sure no algos are sunning after the window has been closed
+ m_algRunner->cancelRunningAlgorithm();
+
saveSettings();
}
@@ -187,7 +191,9 @@ void DirectConvertToEnergy::instrumentSelectChanged(const QString& name)
instLoader->initialize();
instLoader->setProperty("Filename", defFile.toStdString());
instLoader->setProperty("OutputWorkspace", outWS.toStdString());
-
+
+ //Ensure no other algorithm is running
+ m_algRunner->cancelRunningAlgorithm();
m_algRunner->startAlgorithm(instLoader);
}
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/IndirectDataReduction.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/IndirectDataReduction.cpp
index bd6aa8d8e3b..c4191b05362 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/IndirectDataReduction.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/IndirectDataReduction.cpp
@@ -39,8 +39,9 @@ IndirectDataReduction::IndirectDataReduction(QWidget *parent) :
m_curInterfaceSetup(""), m_settingsGroup("CustomInterfaces/IndirectDataReduction"),
m_algRunner(new MantidQt::API::AlgorithmRunner(this))
{
- QObject::connect(m_algRunner, SIGNAL(algorithmComplete(bool)), this, SLOT(instrumentLoadingDone(bool)));
- QObject::connect(m_algRunner, SIGNAL(algorithmProgress(double, const std::string &)), this, SLOT(instrumentLoadProgress(double, const std::string &)));
+ //Signals to report load instrument algo progress
+ connect(m_algRunner, SIGNAL(algorithmComplete(bool)), this, SLOT(instrumentLoadingDone(bool)));
+ connect(m_algRunner, SIGNAL(algorithmProgress(double, const std::string &)), this, SLOT(instrumentLoadProgress(double, const std::string &)));
}
/**
@@ -48,6 +49,9 @@ IndirectDataReduction::IndirectDataReduction(QWidget *parent) :
*/
IndirectDataReduction::~IndirectDataReduction()
{
+ //Make sure no algos are sunning after the window has been closed
+ m_algRunner->cancelRunningAlgorithm();
+
saveSettings();
}
@@ -133,7 +137,6 @@ void IndirectDataReduction::saveSettings()
instrName = m_uiForm.cbInst->currentText();
-
settings.setValue("instrument-name", instrName);
settings.endGroup();
}
@@ -183,6 +186,8 @@ void IndirectDataReduction::instrumentSelectChanged(const QString& name)
instLoader->setProperty("Filename", defFile.toStdString());
instLoader->setProperty("OutputWorkspace", outWS.toStdString());
+ //Ensure no other algorithm is running
+ m_algRunner->cancelRunningAlgorithm();
m_algRunner->startAlgorithm(instLoader);
}
--
GitLab