diff --git a/docs/source/interfaces/DataProcessorWidget.rst b/docs/source/interfaces/DataProcessorWidget.rst
index fe0c6893bf520cd1809e209a36f2e90f42bfc522..606260b27c176b9ebccc64831b0695525a861484 100644
--- a/docs/source/interfaces/DataProcessorWidget.rst
+++ b/docs/source/interfaces/DataProcessorWidget.rst
@@ -299,7 +299,7 @@ algorithm is in this case :ref:`algm-Stitch1DMany`, and can be defined as:
.. code-block:: python
- post_alg = MantidQt.MantidWidgets.DataProcessorPostprocessingAlgorithm('Stitch1DMany', 'IvsQ_')
+ post_alg = MantidQt.MantidWidgets.PostprocessingAlgorithm('Stitch1DMany', 'IvsQ_')
As with pre-processing and processing algorithms, a third parameter indicating the list of properties
to blacklist can be used. As with the pre-process map, you must add manually a hinting line edit
@@ -307,7 +307,7 @@ and link the post-processing black list to it, as this functionality is not avai
.. code-block:: python
- post_alg = MantidQt.MantidWidgets.DataProcessorPostprocessingAlgorithm('Stitch1DMany', 'IvsQ_', 'InputWorkspaces, OutputWorkspaces')
+ post_alg = MantidQt.MantidWidgets.PostprocessingAlgorithm('Stitch1DMany', 'IvsQ_', 'InputWorkspaces, OutputWorkspaces')
.. note::
@@ -391,7 +391,7 @@ Then in the implementation, the following should be enough:
: GenericDataProcessorPresenter(
whitelist,
std::map<std::string, DataProcessorPreprocessingAlgorithm>(),
- processor, DataProcessorPostprocessingAlgorithm(),
+ processor, PostprocessingAlgorithm(),
std::map<std::string, std::string>(), loader) {}
In addition, if you are using the widget in a Python interface, you will have to expose this
@@ -607,7 +607,7 @@ If a post-processing algorithm is defined:
.. code-block:: python
- post_alg = MantidQt.MantidWidgets.DataProcessorPostprocessingAlgorithm('Stitch1DMany', 'stitched_', 'InputWorkspaces, OutputWorkspaces')
+ post_alg = MantidQt.MantidWidgets.PostprocessingAlgorithm('Stitch1DMany', 'stitched_', 'InputWorkspaces, OutputWorkspaces')
the name of the post-processed workspace will start with prefix specified in the post-processing algorithm, stitched in this case,
plus the names of the reduced workspaces without their prefixes joined with "_". That is, in this example we would get a workspace
diff --git a/qt/python/CMakeLists.txt b/qt/python/CMakeLists.txt
index a14598f0b5a6c02a5f80d0f5a061db9daf9fb205..f497efef4f75458fb5fdc0dd7b90a690b5c1e350 100644
--- a/qt/python/CMakeLists.txt
+++ b/qt/python/CMakeLists.txt
@@ -33,7 +33,7 @@ set ( SIP_HDRS
../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorWhiteList.h
../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorPreprocessMap.h
../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorProcessingAlgorithm.h
- ../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorPostprocessingAlgorithm.h
+ ../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/PostprocessingAlgorithm.h
../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/QDataProcessorWidget.h
../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorMainPresenter.h
../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/AppendRowCommand.h
diff --git a/qt/python/mantidqt.sip b/qt/python/mantidqt.sip
index 93d5a928f07c7c8408b786a05b30112daeffc491..2a52b5a141e9a33925c03b6e3dacdd396f9936a5 100644
--- a/qt/python/mantidqt.sip
+++ b/qt/python/mantidqt.sip
@@ -1523,13 +1523,13 @@ public:
DataProcessorProcessingAlgorithm(const QString &, const QString &, const QString &blacklist = "");
};
-class DataProcessorPostprocessingAlgorithm
+class PostprocessingAlgorithm
{
%TypeHeaderCode
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorPostprocessingAlgorithm.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/PostprocessingAlgorithm.h"
%End
public:
-DataProcessorPostprocessingAlgorithm(const QString &, const QString &, const QString &);
+PostprocessingAlgorithm(const QString &, const QString &, const QString &);
};
class QDataProcessorWidget : QWidget
@@ -1547,12 +1547,12 @@ QDataProcessorWidget(const MantidQt::MantidWidgets::DataProcessor::DataProcessor
QWidget *parent );
QDataProcessorWidget(const MantidQt::MantidWidgets::DataProcessor::DataProcessorWhiteList &,
const MantidQt::MantidWidgets::DataProcessor::DataProcessorProcessingAlgorithm &,
- const MantidQt::MantidWidgets::DataProcessor::DataProcessorPostprocessingAlgorithm &,
+ const MantidQt::MantidWidgets::DataProcessor::PostprocessingAlgorithm &,
QWidget *parent );
QDataProcessorWidget(const MantidQt::MantidWidgets::DataProcessor::DataProcessorWhiteList &,
const MantidQt::MantidWidgets::DataProcessor::DataProcessorPreprocessMap &,
const MantidQt::MantidWidgets::DataProcessor::DataProcessorProcessingAlgorithm &,
- const MantidQt::MantidWidgets::DataProcessor::DataProcessorPostprocessingAlgorithm &,
+ const MantidQt::MantidWidgets::DataProcessor::PostprocessingAlgorithm &,
QWidget *parent );
void accept(MantidQt::MantidWidgets::DataProcessor::DataProcessorMainPresenter *);
void setInstrumentList(const QString &instruments, const QString &defaultInstrument);
diff --git a/qt/scientific_interfaces/ISISReflectometry/ReflDataProcessorPresenter.cpp b/qt/scientific_interfaces/ISISReflectometry/ReflDataProcessorPresenter.cpp
index 3102d96929784ab4eb67a034eb6146b9865baec4..5a9cbcd0ccd772ce40e7e77ec50338e9c1963330 100644
--- a/qt/scientific_interfaces/ISISReflectometry/ReflDataProcessorPresenter.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/ReflDataProcessorPresenter.cpp
@@ -22,7 +22,7 @@ namespace CustomInterfaces {
* @param whitelist : The set of properties we want to show as columns
* @param preprocessMap : A map containing instructions for pre-processing
* @param processor : A DataProcessorProcessingAlgorithm
-* @param postprocessor : A DataProcessorPostprocessingAlgorithm
+* @param postprocessor : A PostprocessingAlgorithm
* workspaces
* @param postprocessMap : A map containing instructions for post-processing.
* This map links column name to properties of the post-processing algorithm
@@ -32,7 +32,7 @@ ReflDataProcessorPresenter::ReflDataProcessorPresenter(
const DataProcessorWhiteList &whitelist,
const std::map<QString, DataProcessorPreprocessingAlgorithm> &preprocessMap,
const DataProcessorProcessingAlgorithm &processor,
- const DataProcessorPostprocessingAlgorithm &postprocessor,
+ const PostprocessingAlgorithm &postprocessor,
const std::map<QString, QString> &postprocessMap, const QString &loader)
: GenericDataProcessorPresenter(whitelist, preprocessMap, processor,
postprocessor, postprocessMap, loader) {}
diff --git a/qt/scientific_interfaces/ISISReflectometry/ReflDataProcessorPresenter.h b/qt/scientific_interfaces/ISISReflectometry/ReflDataProcessorPresenter.h
index 588c28060800d9601fe0330d62dd57f0bd466532..48e2f80136b364ab7d864846b3bceefb3f9d3085 100644
--- a/qt/scientific_interfaces/ISISReflectometry/ReflDataProcessorPresenter.h
+++ b/qt/scientific_interfaces/ISISReflectometry/ReflDataProcessorPresenter.h
@@ -48,7 +48,7 @@ public:
const std::map<QString, DataProcessorPreprocessingAlgorithm> &
preprocessMap,
const DataProcessorProcessingAlgorithm &processor,
- const DataProcessorPostprocessingAlgorithm &postprocessor,
+ const PostprocessingAlgorithm &postprocessor,
const std::map<QString, QString> &postprocessMap =
std::map<QString, QString>(),
const QString &loader = "Load");
diff --git a/qt/scientific_interfaces/ISISReflectometry/ReflGenericDataProcessorPresenterFactory.cpp b/qt/scientific_interfaces/ISISReflectometry/ReflGenericDataProcessorPresenterFactory.cpp
index 75d02daac096f1c422a0e0ce8045f4ae177b4dc9..8418c8bfb9cbe82d32e7f91105c537697879bd0b 100644
--- a/qt/scientific_interfaces/ISISReflectometry/ReflGenericDataProcessorPresenterFactory.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/ReflGenericDataProcessorPresenterFactory.cpp
@@ -99,7 +99,7 @@ ReflGenericDataProcessorPresenterFactory::create() {
"OutputWorkspace"})}};
// The post-processing algorithm
- DataProcessorPostprocessingAlgorithm postprocessor(
+ PostprocessingAlgorithm postprocessor(
"Stitch1DMany", "IvsQ_",
std::set<QString>{"InputWorkspaces", "OutputWorkspace"});
diff --git a/qt/widgets/common/CMakeLists.txt b/qt/widgets/common/CMakeLists.txt
index d276afb24b5da04d39a66d0f573fa58ca506c937..f45e4ba0e5e1d803809946fa66cf8f673f5c1f91 100644
--- a/qt/widgets/common/CMakeLists.txt
+++ b/qt/widgets/common/CMakeLists.txt
@@ -66,7 +66,7 @@
src/DataProcessorUI/AbstractTreeModel.cpp
src/DataProcessorUI/GenerateNotebook.cpp
src/DataProcessorUI/OneLevelTreeManager.cpp
- src/DataProcessorUI/DataProcessorPostprocessingAlgorithm.cpp
+ src/DataProcessorUI/PostprocessingAlgorithm.cpp
src/DataProcessorUI/DataProcessorPreprocessingAlgorithm.cpp
src/DataProcessorUI/DataProcessorPreprocessMap.cpp
src/DataProcessorUI/DataProcessorProcessingAlgorithm.cpp
@@ -327,7 +327,7 @@ set ( INC_FILES
inc/MantidQtWidgets/Common/DataProcessorUI/PauseCommand.h
inc/MantidQtWidgets/Common/DataProcessorUI/PlotGroupCommand.h
inc/MantidQtWidgets/Common/DataProcessorUI/PlotRowCommand.h
- inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorPostprocessingAlgorithm.h
+ inc/MantidQtWidgets/Common/DataProcessorUI/PostprocessingAlgorithm.h
inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorPreprocessingAlgorithm.h
inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorPreprocessMap.h
inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorPresenter.h
@@ -443,7 +443,7 @@ set( TEST_FILES
DataProcessorUI/CommandsTest.h
DataProcessorUI/GenerateNotebookTest.h
DataProcessorUI/OneLevelTreeManagerTest.h
- DataProcessorUI/DataProcessorPostprocessingAlgorithmTest.h
+ DataProcessorUI/PostprocessingAlgorithmTest.h
DataProcessorUI/DataProcessorPreprocessingAlgorithmTest.h
DataProcessorUI/DataProcessorPreprocessMapTest.h
DataProcessorUI/DataProcessorProcessingAlgorithmBaseTest.h
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorProcessingAlgorithmBase.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorProcessingAlgorithmBase.h
index f6ca7c1ea4b93b6bcf6e79f1ae3f308988c9a65e..7d688c42a0323381665186ab4509c6732639d6be 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorProcessingAlgorithmBase.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorProcessingAlgorithmBase.h
@@ -17,7 +17,7 @@ namespace DataProcessor {
DataProcessorProcessingAlgorithmBase defines shared code to be used by derived
classes
(DataProcessorPreprocessingAlgorithm, DataProcessorProcessingAlgorithm and
-DataProcessorPostprocessingAlgorithm).
+PostprocessingAlgorithm).
Copyright © 2011-14 ISIS Rutherford Appleton Laboratory, NScD Oak Ridge
National Laboratory & European Spallation Source
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/GenerateNotebook.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/GenerateNotebook.h
index 4683741ba8e02b7f3c7e3f1d8d46a1fa0a2cde59..53cbb59d0e4a652f23ebcb00bc25a221de80dfda 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/GenerateNotebook.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/GenerateNotebook.h
@@ -29,7 +29,7 @@
*/
#include "MantidKernel/System.h"
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorPostprocessingAlgorithm.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/PostprocessingAlgorithm.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorPreprocessingAlgorithm.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorProcessingAlgorithm.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorWhiteList.h"
@@ -58,7 +58,7 @@ QString DLLExport titleString(const QString &wsName);
boost::tuple<QString, QString> DLLExport postprocessGroupString(
const GroupData &rowMap, const DataProcessorWhiteList &whitelist,
const DataProcessorProcessingAlgorithm &processor,
- const DataProcessorPostprocessingAlgorithm &postprocessor,
+ const PostprocessingAlgorithm &postprocessor,
const QString &postprocessingOptions);
QString DLLExport
@@ -104,7 +104,7 @@ public:
const std::map<QString, DataProcessorPreprocessingAlgorithm> &
preprocessMap,
const DataProcessorProcessingAlgorithm &processor,
- const DataProcessorPostprocessingAlgorithm &postprocessor,
+ const PostprocessingAlgorithm &postprocessor,
const std::map<QString, QString> preprocessingInstructionsMap,
const QString processingInstructions,
const QString postprocessingInstructions);
@@ -126,7 +126,7 @@ private:
// The processing (reduction) algorithm
DataProcessorProcessingAlgorithm m_processor;
// The post-processing algorithm
- DataProcessorPostprocessingAlgorithm m_postprocessor;
+ PostprocessingAlgorithm m_postprocessor;
// A map containing pre-processing instructions displayed in the view via
// hinting line edits
std::map<QString, QString> m_preprocessingOptionsMap;
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/GenericDataProcessorPresenter.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/GenericDataProcessorPresenter.h
index 107773ad3927e9ffb8c8f0d6c53a562175a15ae5..9146ae75688f49ac2c88bdb993c3c71f640435fb 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/GenericDataProcessorPresenter.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/GenericDataProcessorPresenter.h
@@ -8,7 +8,7 @@
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorMainPresenter.h"
#include "MantidQtWidgets/Common/DataProcessorUI/OneLevelTreeManager.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorTwoLevelTreeManager.h"
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorPostprocessingAlgorithm.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/PostprocessingAlgorithm.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorPreprocessMap.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorPreprocessingAlgorithm.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorPresenter.h"
@@ -80,7 +80,7 @@ public:
const std::map<QString, DataProcessorPreprocessingAlgorithm> &
preprocessMap,
const DataProcessorProcessingAlgorithm &processor,
- const DataProcessorPostprocessingAlgorithm &postprocessor,
+ const PostprocessingAlgorithm &postprocessor,
const std::map<QString, QString> &postprocessMap =
std::map<QString, QString>(),
const QString &loader = "Load");
@@ -88,7 +88,7 @@ public:
GenericDataProcessorPresenter(
const DataProcessorWhiteList &whitelist,
const DataProcessorProcessingAlgorithm &processor,
- const DataProcessorPostprocessingAlgorithm &postprocessor);
+ const PostprocessingAlgorithm &postprocessor);
// Constructor: pre-processing, no post-processing
GenericDataProcessorPresenter(
const DataProcessorWhiteList &whitelist,
@@ -109,7 +109,7 @@ public:
const DataProcessorWhiteList &whitelist,
const DataProcessorPreprocessMap &preprocessMap,
const DataProcessorProcessingAlgorithm &processor,
- const DataProcessorPostprocessingAlgorithm &postprocessor);
+ const PostprocessingAlgorithm &postprocessor);
virtual ~GenericDataProcessorPresenter() override;
void notify(DataProcessorPresenter::Flag flag) override;
const std::map<QString, QVariant> &options() const override;
@@ -195,7 +195,7 @@ private:
// The data processor algorithm
DataProcessorProcessingAlgorithm m_processor;
// Post-processing algorithm
- DataProcessorPostprocessingAlgorithm m_postprocessor;
+ PostprocessingAlgorithm m_postprocessor;
// Post-processing map
std::map<QString, QString> m_postprocessMap;
// The current queue of groups to be reduced
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorPostprocessingAlgorithm.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/PostprocessingAlgorithm.h
similarity index 90%
rename from qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorPostprocessingAlgorithm.h
rename to qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/PostprocessingAlgorithm.h
index e91d5c455dd2dcc9398bdabfc15d5e437670a3b6..b528d5e4e6bf6e069219c39acbc8db81be984532 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorPostprocessingAlgorithm.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/PostprocessingAlgorithm.h
@@ -35,21 +35,21 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
File change history is stored at: <https://github.com/mantidproject/mantid>.
Code Documentation is available at: <http://doxygen.mantidproject.org>
*/
-class EXPORT_OPT_MANTIDQT_COMMON DataProcessorPostprocessingAlgorithm
+class EXPORT_OPT_MANTIDQT_COMMON PostprocessingAlgorithm
: public DataProcessorProcessingAlgorithmBase {
public:
// Constructor
- DataProcessorPostprocessingAlgorithm(
+ PostprocessingAlgorithm(
const QString &name, const QString &prefix = "",
const std::set<QString> &blacklist = std::set<QString>());
// Delegating constructor
- DataProcessorPostprocessingAlgorithm(const QString &name,
+ PostprocessingAlgorithm(const QString &name,
const QString &prefix,
const QString &blacklist);
// Default constructor
- DataProcessorPostprocessingAlgorithm();
+ PostprocessingAlgorithm();
// Destructor
- virtual ~DataProcessorPostprocessingAlgorithm();
+ virtual ~PostprocessingAlgorithm();
// The name of the input workspace property
QString inputProperty() const;
// The name of the output workspace property
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/QDataProcessorWidget.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/QDataProcessorWidget.h
index 7f592365908f0a7ca7c152b829be2c89360421d1..78b1fd42b0e5e817b448373b12789f4ddef28147 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/QDataProcessorWidget.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/QDataProcessorWidget.h
@@ -18,7 +18,7 @@ class QtCommandAdapter;
class DataProcessorMainPresenter;
class DataProcessorPreprocessMap;
class DataProcessorProcessingAlgorithm;
-class DataProcessorPostprocessingAlgorithm;
+class PostprocessingAlgorithm;
class DataProcessorWhiteList;
/** QDataProcessorWidget : Provides an interface for processing table
@@ -63,12 +63,12 @@ public:
QWidget *parent);
QDataProcessorWidget(const DataProcessorWhiteList &,
const DataProcessorProcessingAlgorithm &,
- const DataProcessorPostprocessingAlgorithm &,
+ const PostprocessingAlgorithm &,
QWidget *parent);
QDataProcessorWidget(const DataProcessorWhiteList &,
const DataProcessorPreprocessMap &,
const DataProcessorProcessingAlgorithm &,
- const DataProcessorPostprocessingAlgorithm &,
+ const PostprocessingAlgorithm &,
QWidget *parent);
~QDataProcessorWidget() override;
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/TreeData.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/TreeData.h
index 8566d1ec0ff5ffe49f5ccb9374fb6c425c170925..ce59624cc0d73543f789f4cf9f64183e26a83bd0 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/TreeData.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/TreeData.h
@@ -27,7 +27,7 @@
*/
#include "MantidKernel/System.h"
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorPostprocessingAlgorithm.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/PostprocessingAlgorithm.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorPreprocessingAlgorithm.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorProcessingAlgorithm.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorWhiteList.h"
diff --git a/qt/widgets/common/src/DataProcessorUI/GenerateNotebook.cpp b/qt/widgets/common/src/DataProcessorUI/GenerateNotebook.cpp
index 8ded1ba2e27c940184806c57a73acc0ab2f8fd96..4dda16fc60ff5f45ab8f72b23ebfa54d35399a01 100644
--- a/qt/widgets/common/src/DataProcessorUI/GenerateNotebook.cpp
+++ b/qt/widgets/common/src/DataProcessorUI/GenerateNotebook.cpp
@@ -53,7 +53,7 @@ GenerateNotebook::GenerateNotebook(
const DataProcessorWhiteList &whitelist,
const std::map<QString, DataProcessorPreprocessingAlgorithm> &preprocessMap,
const DataProcessorProcessingAlgorithm &processor,
- const DataProcessorPostprocessingAlgorithm &postprocessor,
+ const PostprocessingAlgorithm &postprocessor,
const std::map<QString, QString> preprocessingOptionsMap,
const QString processingOptions, const QString postprocessingOptions)
: m_wsName(name), m_instrument(instrument), m_whitelist(whitelist),
@@ -290,7 +290,7 @@ QString tableString(const TreeData &treeData,
boost::tuple<QString, QString> postprocessGroupString(
const GroupData &rowMap, const DataProcessorWhiteList &whitelist,
const DataProcessorProcessingAlgorithm &processor,
- const DataProcessorPostprocessingAlgorithm &postprocessor,
+ const PostprocessingAlgorithm &postprocessor,
const QString &postprocessingOptions) {
QString stitchString;
diff --git a/qt/widgets/common/src/DataProcessorUI/GenericDataProcessorPresenter.cpp b/qt/widgets/common/src/DataProcessorUI/GenericDataProcessorPresenter.cpp
index 87be62cc039e4042f17c8dba8b0c3458cd227d88..b78bc307cf00342e0959b73cb985c11ab1fb0755 100644
--- a/qt/widgets/common/src/DataProcessorUI/GenericDataProcessorPresenter.cpp
+++ b/qt/widgets/common/src/DataProcessorUI/GenericDataProcessorPresenter.cpp
@@ -109,7 +109,7 @@ namespace DataProcessor {
* @param whitelist : The set of properties we want to show as columns
* @param preprocessMap : A map containing instructions for pre-processing
* @param processor : A DataProcessorProcessingAlgorithm
-* @param postprocessor : A DataProcessorPostprocessingAlgorithm
+* @param postprocessor : A PostprocessingAlgorithm
* workspaces
* @param postprocessMap : A map containing instructions for post-processing.
* This map links column name to properties of the post-processing algorithm
@@ -119,7 +119,7 @@ GenericDataProcessorPresenter::GenericDataProcessorPresenter(
const DataProcessorWhiteList &whitelist,
const std::map<QString, DataProcessorPreprocessingAlgorithm> &preprocessMap,
const DataProcessorProcessingAlgorithm &processor,
- const DataProcessorPostprocessingAlgorithm &postprocessor,
+ const PostprocessingAlgorithm &postprocessor,
const std::map<QString, QString> &postprocessMap, const QString &loader)
: WorkspaceObserver(), m_view(nullptr), m_progressView(nullptr),
m_mainPresenter(), m_loader(loader), m_whitelist(whitelist),
@@ -175,18 +175,30 @@ GenericDataProcessorPresenter::GenericDataProcessorPresenter(
* Delegating constructor (no pre-processing needed)
* @param whitelist : The set of properties we want to show as columns
* @param processor : A DataProcessorProcessingAlgorithm
-* @param postprocessor : A DataProcessorPostprocessingAlgorithm
+* @param postprocessor : A PostprocessingAlgorithm
* workspaces
*/
GenericDataProcessorPresenter::GenericDataProcessorPresenter(
const DataProcessorWhiteList &whitelist,
const DataProcessorProcessingAlgorithm &processor,
- const DataProcessorPostprocessingAlgorithm &postprocessor)
+ const PostprocessingAlgorithm &postprocessor)
: GenericDataProcessorPresenter(
whitelist, std::map<QString, DataProcessorPreprocessingAlgorithm>(),
processor, postprocessor) {}
/**
+ * Delegating constructor (only whitelist specified)
+ * @param whitelist : The set of properties we want to show as columns
+ */
+GenericDataProcessorPresenter::GenericDataProcessorPresenter(
+ const DataProcessorWhiteList &whitelist)
+ : GenericDataProcessorPresenter(
+ whitelist, std::map<QString, DataProcessorPreprocessingAlgorithm>(),
+ DataProcessorProcessingAlgorithm(),
+ PostprocessingAlgorithm()) {}
+
+/**
+>>>>>>> c769bca68e... Re #20302: Renamed DataProcessorPostprocessingAlgorithm.
* Delegating constructor (no post-processing needed)
* @param whitelist : The set of properties we want to show as columns
* @param preprocessMap : A map containing instructions for pre-processing
@@ -198,7 +210,7 @@ GenericDataProcessorPresenter::GenericDataProcessorPresenter(
const std::map<QString, DataProcessorPreprocessingAlgorithm> &preprocessMap,
const DataProcessorProcessingAlgorithm &processor)
: GenericDataProcessorPresenter(whitelist, preprocessMap, processor,
- DataProcessorPostprocessingAlgorithm()) {}
+ PostprocessingAlgorithm()) {}
/**
* Delegating constructor (no pre-processing needed, no post-processing needed)
@@ -211,7 +223,7 @@ GenericDataProcessorPresenter::GenericDataProcessorPresenter(
const DataProcessorProcessingAlgorithm &processor)
: GenericDataProcessorPresenter(
whitelist, std::map<QString, DataProcessorPreprocessingAlgorithm>(),
- processor, DataProcessorPostprocessingAlgorithm()) {}
+ processor, PostprocessingAlgorithm()) {}
/**
* Destructor
diff --git a/qt/widgets/common/src/DataProcessorUI/DataProcessorPostprocessingAlgorithm.cpp b/qt/widgets/common/src/DataProcessorUI/PostprocessingAlgorithm.cpp
similarity index 72%
rename from qt/widgets/common/src/DataProcessorUI/DataProcessorPostprocessingAlgorithm.cpp
rename to qt/widgets/common/src/DataProcessorUI/PostprocessingAlgorithm.cpp
index e442d2e0a21786fb0a61c59c8250640541b1b391..c939348ad03f40dd4f3d7f1864bb39215f031f04 100644
--- a/qt/widgets/common/src/DataProcessorUI/DataProcessorPostprocessingAlgorithm.cpp
+++ b/qt/widgets/common/src/DataProcessorUI/PostprocessingAlgorithm.cpp
@@ -1,4 +1,4 @@
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorPostprocessingAlgorithm.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/PostprocessingAlgorithm.h"
namespace MantidQt {
namespace MantidWidgets {
@@ -9,7 +9,7 @@ namespace DataProcessor {
* @param prefix : The prefix that will be added to the output workspace name
* @param blacklist : The list of properties we don't want to show
*/
-DataProcessorPostprocessingAlgorithm::DataProcessorPostprocessingAlgorithm(
+PostprocessingAlgorithm::PostprocessingAlgorithm(
const QString &name, const QString &prefix,
const std::set<QString> &blacklist)
: DataProcessorProcessingAlgorithmBase(name, blacklist), m_prefix(prefix) {
@@ -36,35 +36,35 @@ DataProcessorPostprocessingAlgorithm::DataProcessorPostprocessingAlgorithm(
* @param prefix : The prefix that will be added to the output workspace name
* @param blacklist : The list of properties we don't want to show, as a string
*/
-DataProcessorPostprocessingAlgorithm::DataProcessorPostprocessingAlgorithm(
+PostprocessingAlgorithm::PostprocessingAlgorithm(
const QString &name, const QString &prefix, const QString &blacklist)
- : DataProcessorPostprocessingAlgorithm(name, prefix,
+ : PostprocessingAlgorithm(name, prefix,
convertStringToSet(blacklist)) {}
/** Default constructor: no algorithm defined */
-DataProcessorPostprocessingAlgorithm::DataProcessorPostprocessingAlgorithm()
+PostprocessingAlgorithm::PostprocessingAlgorithm()
: m_prefix(), m_inputProp(), m_outputProp() {}
// Destructor
-DataProcessorPostprocessingAlgorithm::~DataProcessorPostprocessingAlgorithm() {}
+PostprocessingAlgorithm::~PostprocessingAlgorithm() {}
// Returns the name of the input workspace property
-QString DataProcessorPostprocessingAlgorithm::inputProperty() const {
+QString PostprocessingAlgorithm::inputProperty() const {
return m_inputProp;
}
// Returns the name of the output workspace property
-QString DataProcessorPostprocessingAlgorithm::outputProperty() const {
+QString PostprocessingAlgorithm::outputProperty() const {
return m_outputProp;
}
// Returns the number of output workspace properties (currently only 1)
-size_t DataProcessorPostprocessingAlgorithm::numberOfOutputProperties() const {
+size_t PostprocessingAlgorithm::numberOfOutputProperties() const {
return 1;
}
// Returns the prefix that will be added to the output ws
-QString DataProcessorPostprocessingAlgorithm::prefix() const {
+QString PostprocessingAlgorithm::prefix() const {
return m_prefix;
}
}
diff --git a/qt/widgets/common/src/DataProcessorUI/QDataProcessorWidget.cpp b/qt/widgets/common/src/DataProcessorUI/QDataProcessorWidget.cpp
index e047daf4afd84547bc9ef2bd477f28bc9c69bf8d..5083881b39d1af36db9ebc189bf8e318488a53d8 100644
--- a/qt/widgets/common/src/DataProcessorUI/QDataProcessorWidget.cpp
+++ b/qt/widgets/common/src/DataProcessorUI/QDataProcessorWidget.cpp
@@ -70,7 +70,7 @@ QDataProcessorWidget::QDataProcessorWidget(
QDataProcessorWidget::QDataProcessorWidget(
const DataProcessorWhiteList &whitelist,
const DataProcessorProcessingAlgorithm &algorithm,
- const DataProcessorPostprocessingAlgorithm &postprocessor, QWidget *parent)
+ const PostprocessingAlgorithm &postprocessor, QWidget *parent)
: QDataProcessorWidget(
Mantid::Kernel::make_unique<GenericDataProcessorPresenter>(
whitelist, algorithm, postprocessor),
@@ -87,7 +87,7 @@ QDataProcessorWidget::QDataProcessorWidget(
const DataProcessorWhiteList &whitelist,
const DataProcessorPreprocessMap &preprocessMap,
const DataProcessorProcessingAlgorithm &algorithm,
- const DataProcessorPostprocessingAlgorithm &postprocessor, QWidget *parent)
+ const PostprocessingAlgorithm &postprocessor, QWidget *parent)
: QDataProcessorWidget(
Mantid::Kernel::make_unique<GenericDataProcessorPresenter>(
whitelist, preprocessMap.asMap(), algorithm, postprocessor),
diff --git a/qt/widgets/common/test/DataProcessorUI/GenerateNotebookTest.h b/qt/widgets/common/test/DataProcessorUI/GenerateNotebookTest.h
index e9b1769faebdc32a8e6cf4c04ae65043bba58b38..ebc4f209dbb343de11ae19c0f2822d9083bbc0b3 100644
--- a/qt/widgets/common/test/DataProcessorUI/GenerateNotebookTest.h
+++ b/qt/widgets/common/test/DataProcessorUI/GenerateNotebookTest.h
@@ -47,8 +47,8 @@ private:
"FirstTransmissionRun", "SecondTransmissionRun"});
}
- DataProcessorPostprocessingAlgorithm reflPostprocessor() {
- return DataProcessorPostprocessingAlgorithm(
+ PostprocessingAlgorithm reflPostprocessor() {
+ return PostprocessingAlgorithm(
"Stitch1DMany", "IvsQ_",
std::set<QString>{"InputWorkspaces", "OutputWorkspace"});
}
diff --git a/qt/widgets/common/test/DataProcessorUI/GenericDataProcessorPresenterTest.h b/qt/widgets/common/test/DataProcessorUI/GenericDataProcessorPresenterTest.h
index 953d60fdd08989fb29de4b4a4cf42d861a57b512..5cf2fa0fd5056d2c506923afcf5b0fed2846caee 100644
--- a/qt/widgets/common/test/DataProcessorUI/GenericDataProcessorPresenterTest.h
+++ b/qt/widgets/common/test/DataProcessorUI/GenericDataProcessorPresenterTest.h
@@ -37,7 +37,7 @@ public:
const std::map<QString, DataProcessorPreprocessingAlgorithm> &
preprocessMap,
const DataProcessorProcessingAlgorithm &processor,
- const DataProcessorPostprocessingAlgorithm &postprocessor,
+ const PostprocessingAlgorithm &postprocessor,
const std::map<QString, QString> &postprocessMap =
std::map<QString, QString>(),
const QString &loader = "Load")
@@ -48,7 +48,7 @@ public:
GenericDataProcessorPresenterNoThread(
const DataProcessorWhiteList &whitelist,
const DataProcessorProcessingAlgorithm &processor,
- const DataProcessorPostprocessingAlgorithm &postprocessor)
+ const PostprocessingAlgorithm &postprocessor)
: GenericDataProcessorPresenter(
whitelist, std::map<QString, DataProcessorPreprocessingAlgorithm>(),
processor, postprocessor) {}
@@ -132,9 +132,9 @@ private:
"FirstTransmissionRun", "SecondTransmissionRun"});
}
- DataProcessorPostprocessingAlgorithm createReflectometryPostprocessor() {
+ PostprocessingAlgorithm createReflectometryPostprocessor() {
- return DataProcessorPostprocessingAlgorithm(
+ return PostprocessingAlgorithm(
"Stitch1DMany", "IvsQ_",
std::set<QString>{"InputWorkspaces", "OutputWorkspace"});
}
diff --git a/qt/widgets/common/test/DataProcessorUI/DataProcessorPostprocessingAlgorithmTest.h b/qt/widgets/common/test/DataProcessorUI/PostprocessingAlgorithmTest.h
similarity index 69%
rename from qt/widgets/common/test/DataProcessorUI/DataProcessorPostprocessingAlgorithmTest.h
rename to qt/widgets/common/test/DataProcessorUI/PostprocessingAlgorithmTest.h
index 8b70be1756109805a29758f3920ca3e9dc5ec0af..5dbc81e7496fb3403ef322a8b14164e2e393fe0e 100644
--- a/qt/widgets/common/test/DataProcessorUI/DataProcessorPostprocessingAlgorithmTest.h
+++ b/qt/widgets/common/test/DataProcessorUI/PostprocessingAlgorithmTest.h
@@ -6,7 +6,7 @@
#include <gtest/gtest.h>
#include "MantidAPI/FrameworkManager.h"
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorPostprocessingAlgorithm.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/PostprocessingAlgorithm.h"
using namespace MantidQt::MantidWidgets;
using namespace MantidQt::MantidWidgets::DataProcessor;
@@ -16,41 +16,41 @@ using namespace testing;
//=====================================================================================
// Functional tests
//=====================================================================================
-class DataProcessorPostprocessingAlgorithmTest : public CxxTest::TestSuite {
+class PostprocessingAlgorithmTest : public CxxTest::TestSuite {
private:
public:
// This pair of boilerplate methods prevent the suite being created statically
// This means the constructor isn't called when running other tests
- static DataProcessorPostprocessingAlgorithmTest *createSuite() {
- return new DataProcessorPostprocessingAlgorithmTest();
+ static PostprocessingAlgorithmTest *createSuite() {
+ return new PostprocessingAlgorithmTest();
}
- static void destroySuite(DataProcessorPostprocessingAlgorithmTest *suite) {
+ static void destroySuite(PostprocessingAlgorithmTest *suite) {
delete suite;
}
- DataProcessorPostprocessingAlgorithmTest() { FrameworkManager::Instance(); };
+ PostprocessingAlgorithmTest() { FrameworkManager::Instance(); };
void test_invalid_algorithms() {
// Algorithms with no 'str list' property
- TS_ASSERT_THROWS(DataProcessorPostprocessingAlgorithm("StepScan"),
+ TS_ASSERT_THROWS(PostprocessingAlgorithm("StepScan"),
std::invalid_argument);
// Algorithms with more than one 'str list' property
TS_ASSERT_THROWS(
- DataProcessorPostprocessingAlgorithm("PDDetermineCharacterizations"),
+ PostprocessingAlgorithm("PDDetermineCharacterizations"),
std::invalid_argument);
// Algorithms with invalid output ws properties
- TS_ASSERT_THROWS(DataProcessorPostprocessingAlgorithm("GroupWorkspaces"),
+ TS_ASSERT_THROWS(PostprocessingAlgorithm("GroupWorkspaces"),
std::invalid_argument);
}
void test_valid_algorithms() {
// MergeRuns
- TS_ASSERT_THROWS_NOTHING(DataProcessorPostprocessingAlgorithm("MergeRuns"));
+ TS_ASSERT_THROWS_NOTHING(PostprocessingAlgorithm("MergeRuns"));
}
void test_Stitch1DMany() {
- auto stitch = DataProcessorPostprocessingAlgorithm(
+ auto stitch = PostprocessingAlgorithm(
"Stitch1DMany", "IvsQ_",
std::set<QString>{"InputWorkspaces", "OutputWorkspace"});
TS_ASSERT_EQUALS(stitch.name(), "Stitch1DMany");
diff --git a/scripts/Interface/ui/dataprocessorinterface/data_processor_gui.py b/scripts/Interface/ui/dataprocessorinterface/data_processor_gui.py
index c9f9d40deb5a0c448ee02f145efe53e0d811099e..2f955f151932b82f30130813c40a6d72668a5e36 100644
--- a/scripts/Interface/ui/dataprocessorinterface/data_processor_gui.py
+++ b/scripts/Interface/ui/dataprocessorinterface/data_processor_gui.py
@@ -130,7 +130,7 @@ class DataProcessorGui(QtGui.QMainWindow, ui_data_processor_window.Ui_DataProces
# First argument is the name of the algorithm
# Second argument is the prefix to be added to the name of the post-processed workspace
# Third argument is a black list of properties to hide if a hinting line edit is added to the interface
- post_alg = MantidQt.MantidWidgets.DataProcessorPostprocessingAlgorithm('Stitch1DMany', 'IvsQ_', 'InputWorkspaces, OutputWorkspaces')
+ post_alg = MantidQt.MantidWidgets.PostprocessingAlgorithm('Stitch1DMany', 'IvsQ_', 'InputWorkspaces, OutputWorkspaces')
# The table widget
self.data_processor_table = MantidQt.MantidWidgets.QDataProcessorWidget(whitelist, preprocess_map, alg, post_alg, self)