Skip to content

Commit

Permalink
Remove unused includes and functions
Browse files Browse the repository at this point in the history
  • Loading branch information
robertapplin committed May 9, 2024
1 parent 2f58618 commit 34aa777
Show file tree
Hide file tree
Showing 7 changed files with 0 additions and 17 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
#include "MantidAPI/MatrixWorkspace_fwd.h"
#include "MantidQtWidgets/Common/InstrumentSelector.h"
#include "MantidQtWidgets/Common/MantidWidget.h"
#include "MantidQtWidgets/Common/QtAlgorithmRunner.h"

#include <QWidget>

Expand Down
8 changes: 0 additions & 8 deletions qt/scientific_interfaces/Indirect/Reduction/DataReduction.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -41,22 +41,14 @@ DECLARE_SUBWINDOW(DataReduction)

DataReduction::DataReduction(QWidget *parent)
: InelasticInterface(parent), m_settingsGroup("CustomInterfaces/DataReduction"),
m_algRunner(new MantidQt::API::QtAlgorithmRunner(this)),
m_changeObserver(*this, &DataReduction::handleConfigChange), m_ipfFilename(""),
m_idfDirectory(Mantid::Kernel::ConfigService::Instance().getString("instrumentDefinition.directory")),
m_instDetails() {
// Signals to report load instrument algo result
connect(m_algRunner, SIGNAL(algorithmComplete(bool)), this, SLOT(instrumentLoadingDone(bool)));

Mantid::Kernel::ConfigService::Instance().addObserver(m_changeObserver);
}

DataReduction::~DataReduction() {
Mantid::Kernel::ConfigService::Instance().removeObserver(m_changeObserver);

// Make sure no algos are running after the window has been closed
m_algRunner->cancelRunningAlgorithm();

saveSettings();
}

Expand Down
3 changes: 0 additions & 3 deletions qt/scientific_interfaces/Indirect/Reduction/DataReduction.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
#include "MantidAPI/MatrixWorkspace.h"
#include "MantidGeometry/IComponent.h"
#include "MantidQtWidgets/Common/AlgorithmRunner.h"
#include "MantidQtWidgets/Common/QtAlgorithmRunner.h"
#include "MantidQtWidgets/Common/QtJobRunner.h"

#include <QRegExp>
Expand Down Expand Up @@ -190,8 +189,6 @@ private slots:
Ui::DataReduction m_uiForm;
/// The settings group
QString m_settingsGroup;
/// Runner for insturment load algorithm
MantidQt::API::QtAlgorithmRunner *m_algRunner;

// All indirect tabs
QMap<QString, QPair<QWidget *, DataReductionTab *>> m_tabs;
Expand Down
1 change: 0 additions & 1 deletion qt/scientific_interfaces/Inelastic/Common/InelasticTab.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
#include "MantidAPI/ITableWorkspace.h"
#include "MantidKernel/DateAndTime.h"
#include "MantidQtWidgets/Common/BatchAlgorithmRunner.h"
#include "MantidQtWidgets/Common/QtAlgorithmRunner.h"
#include "MantidQtWidgets/Common/QtPropertyBrowser/QtIntPropertyManager"
#include "MantidQtWidgets/Common/QtPropertyBrowser/QtTreePropertyBrowser"
#include "MantidQtWidgets/Common/QtPropertyBrowser/qteditorfactory.h"
Expand Down
1 change: 0 additions & 1 deletion qt/widgets/common/inc/MantidQtWidgets/Common/IJobRunner.h
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,5 @@ class EXPORT_OPT_MANTIDQT_COMMON IJobRunner {
virtual void executeAlgorithmQueue() = 0;
virtual void executeAlgorithm(MantidQt::API::IConfiguredAlgorithm_sptr algorithm) = 0;
virtual void cancelAlgorithmQueue() = 0;
virtual std::size_t queueLength() = 0;
};
} // namespace MantidQt::API
1 change: 0 additions & 1 deletion qt/widgets/common/inc/MantidQtWidgets/Common/QtJobRunner.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ class EXPORT_OPT_MANTIDQT_COMMON QtJobRunner : public QObject, public IJobRunner
void executeAlgorithmQueue() override;
void executeAlgorithm(MantidQt::API::IConfiguredAlgorithm_sptr algorithm) override;
void cancelAlgorithmQueue() override;
std::size_t queueLength() override;

private slots:
void onBatchComplete(bool error);
Expand Down
2 changes: 0 additions & 2 deletions qt/widgets/common/src/QtJobRunner.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,6 @@ void QtJobRunner::executeAlgorithm(IConfiguredAlgorithm_sptr algorithm) {
m_batchAlgoRunner.executeAlgorithmAsync(std::move(algorithm));
}

std::size_t QtJobRunner::queueLength() { return m_batchAlgoRunner.queueLength(); }

void QtJobRunner::cancelAlgorithmQueue() { m_batchAlgoRunner.cancelBatch(); }

void QtJobRunner::connectBatchAlgoRunnerSlots() {
Expand Down

0 comments on commit 34aa777

Please sign in to comment.