Re #20302: Renamed DataProcessorPreprocessMap to PreprocessMap.

docs/source/interfaces/DataProcessorWidget.rst

@@ -115,7 +115,7 @@ names and values are pre-processing algorithms. In this example, a pre-process m
 
 .. code-block:: python
 
-    preprocess_map = MantidQt.MantidWidgets.DataProcessorPreprocessMap()
+    preprocess_map = MantidQt.MantidWidgets.PreprocessMap()
     preprocess_map.addElement('Runs', 'Plus')
     preprocess_map.addElement('Transmission Runs', 'CreateTransmissionWorkspaceAuto')
 
@@ -156,7 +156,7 @@ the loaded workspaces. The example below:
 
 .. code-block:: python
 
-    preprocess_map = MantidQt.MantidWidgets.DataProcessorPreprocessMap()
+    preprocess_map = MantidQt.MantidWidgets.PreprocessMap()
     preprocess_map.addElement('Runs', 'Plus', 'TOF_')
     preprocess_map.addElement('Transmission Runs', 'CreateTransmissionWorkspaceAuto', 'TRANS_')
 

qt/python/CMakeLists.txt

@@ -31,7 +31,7 @@ set ( SIP_HDRS
   ../widgets/refdetectorview/inc/MantidQtWidgets/RefDetectorView/RefMatrixWSImageView.h
   ../widgets/common/inc/MantidQtWidgets/Common/FitPropertyBrowser.h
   ../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorWhiteList.h
-  ../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorPreprocessMap.h
+  ../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/PreprocessMap.h
   ../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorProcessingAlgorithm.h
   ../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/PostprocessingAlgorithm.h
   ../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/QDataProcessorWidget.h

qt/python/mantidqt.sip

@@ -1504,13 +1504,13 @@ DataProcessorWhiteList();
 void addElement(const QString &, const QString &, const QString &, bool showValue = false, const QString &prefix = "");
 };
 
-class DataProcessorPreprocessMap
+class PreprocessMap
 {
 %TypeHeaderCode
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorPreprocessMap.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/PreprocessMap.h"
 %End
 public:
-DataProcessorPreprocessMap();
+PreprocessMap();
 void addElement(const QString &, const QString &, const QString &prefix = "", const QString &blacklist = "");
 };
 
@@ -1542,7 +1542,9 @@ QDataProcessorWidget(const MantidQt::MantidWidgets::DataProcessor::DataProcessor
                      const MantidQt::MantidWidgets::DataProcessor::DataProcessorProcessingAlgorithm &,
                      QWidget *parent );
 QDataProcessorWidget(const MantidQt::MantidWidgets::DataProcessor::DataProcessorWhiteList &,
-                     const MantidQt::MantidWidgets::DataProcessor::DataProcessorPreprocessMap &,
+                     QWidget *parent );
+QDataProcessorWidget(const MantidQt::MantidWidgets::DataProcessor::DataProcessorWhiteList &,
+                     const MantidQt::MantidWidgets::DataProcessor::PreprocessMap &,
                      const MantidQt::MantidWidgets::DataProcessor::DataProcessorProcessingAlgorithm &,
                      QWidget *parent );
 QDataProcessorWidget(const MantidQt::MantidWidgets::DataProcessor::DataProcessorWhiteList &,
@@ -1550,7 +1552,7 @@ QDataProcessorWidget(const MantidQt::MantidWidgets::DataProcessor::DataProcessor
                      const MantidQt::MantidWidgets::DataProcessor::PostprocessingAlgorithm &,
                      QWidget *parent );
 QDataProcessorWidget(const MantidQt::MantidWidgets::DataProcessor::DataProcessorWhiteList &,
-                     const MantidQt::MantidWidgets::DataProcessor::DataProcessorPreprocessMap &,
+                     const MantidQt::MantidWidgets::DataProcessor::PreprocessMap &,
                      const MantidQt::MantidWidgets::DataProcessor::DataProcessorProcessingAlgorithm &,
                      const MantidQt::MantidWidgets::DataProcessor::PostprocessingAlgorithm &,
                      QWidget *parent );

qt/widgets/common/CMakeLists.txt

@@ -68,7 +68,7 @@
 	src/DataProcessorUI/OneLevelTreeManager.cpp
 	src/DataProcessorUI/PostprocessingAlgorithm.cpp
 	src/DataProcessorUI/PreprocessingAlgorithm.cpp
-	src/DataProcessorUI/DataProcessorPreprocessMap.cpp
+	src/DataProcessorUI/PreprocessMap.cpp
 	src/DataProcessorUI/DataProcessorProcessingAlgorithm.cpp
 	src/DataProcessorUI/DataProcessorProcessingAlgorithmBase.cpp
 	src/DataProcessorUI/TwoLevelTreeManager.cpp
@@ -329,7 +329,7 @@ set ( INC_FILES
 	inc/MantidQtWidgets/Common/DataProcessorUI/PlotRowCommand.h
 	inc/MantidQtWidgets/Common/DataProcessorUI/PostprocessingAlgorithm.h
 	inc/MantidQtWidgets/Common/DataProcessorUI/PreprocessingAlgorithm.h
-	inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorPreprocessMap.h
+	inc/MantidQtWidgets/Common/DataProcessorUI/PreprocessMap.h
 	inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorPresenter.h
 	inc/MantidQtWidgets/Common/DataProcessorUI/ProcessCommand.h
 	inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorProcessingAlgorithm.h
@@ -445,7 +445,7 @@ set( TEST_FILES
    DataProcessorUI/OneLevelTreeManagerTest.h
    DataProcessorUI/PostprocessingAlgorithmTest.h
    DataProcessorUI/PreprocessingAlgorithmTest.h
-   DataProcessorUI/DataProcessorPreprocessMapTest.h
+   DataProcessorUI/PreprocessMapTest.h
    DataProcessorUI/DataProcessorProcessingAlgorithmBaseTest.h
    DataProcessorUI/DataProcessorProcessingAlgorithmTest.h
    DataProcessorUI/TwoLevelTreeManagerTest.h

qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/GenericDataProcessorPresenter.h

@@ -9,7 +9,7 @@
 #include "MantidQtWidgets/Common/DataProcessorUI/OneLevelTreeManager.h"
 #include "MantidQtWidgets/Common/DataProcessorUI/TwoLevelTreeManager.h"
 #include "MantidQtWidgets/Common/DataProcessorUI/PostprocessingAlgorithm.h"
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorPreprocessMap.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/PreprocessMap.h"
 #include "MantidQtWidgets/Common/DataProcessorUI/PreprocessingAlgorithm.h"
 #include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorPresenter.h"
 #include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorProcessingAlgorithm.h"
@@ -102,12 +102,12 @@ public:
   // Delegating constructor: pre-processing, no post-processing
   GenericDataProcessorPresenter(
       const DataProcessorWhiteList &whitelist,
-      const DataProcessorPreprocessMap &preprocessMap,
+      const PreprocessMap &preprocessMap,
       const DataProcessorProcessingAlgorithm &processor);
   // Delegating Constructor: pre-processing and post-processing
   GenericDataProcessorPresenter(
       const DataProcessorWhiteList &whitelist,
-      const DataProcessorPreprocessMap &preprocessMap,
+      const PreprocessMap &preprocessMap,
       const DataProcessorProcessingAlgorithm &processor,
       const PostprocessingAlgorithm &postprocessor);
   virtual ~GenericDataProcessorPresenter() override;

qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorPreprocessMap.h → qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/PreprocessMap.h

@@ -10,9 +10,9 @@
 namespace MantidQt {
 namespace MantidWidgets {
 namespace DataProcessor {
-/** @class DataProcessorPreprocessMap
+/** @class PreprocessMap
 
-DataProcessorPreprocessMap defines a pre-processor algorithm that will
+PreprocessMap defines a pre-processor algorithm that will
 be
 responsible for pre-processsing a specific column in a Data Processor UI.
 
@@ -37,12 +37,12 @@ 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 DataProcessorPreprocessMap {
+class EXPORT_OPT_MANTIDQT_COMMON PreprocessMap {
 public:
   // Default constructor
-  DataProcessorPreprocessMap();
+  PreprocessMap();
   // Destructor
-  virtual ~DataProcessorPreprocessMap();
+  virtual ~PreprocessMap();
   // Add a column to pre-process
   void addElement(const QString &column, const QString &algorithm,
                   const QString &prefix = "", const QString &blacklist = "");

qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/QDataProcessorWidget.h

@@ -16,7 +16,7 @@ namespace DataProcessor {
 
 class QtCommandAdapter;
 class DataProcessorMainPresenter;
-class DataProcessorPreprocessMap;
+class PreprocessMap;
 class DataProcessorProcessingAlgorithm;
 class PostprocessingAlgorithm;
 class DataProcessorWhiteList;
@@ -58,7 +58,7 @@ public:
                        const DataProcessorProcessingAlgorithm &,
                        QWidget *parent);
   QDataProcessorWidget(const DataProcessorWhiteList &,
-                       const DataProcessorPreprocessMap &,
+                       const PreprocessMap &,
                        const DataProcessorProcessingAlgorithm &,
                        QWidget *parent);
   QDataProcessorWidget(const DataProcessorWhiteList &,
@@ -66,7 +66,7 @@ public:
                        const PostprocessingAlgorithm &,
                        QWidget *parent);
   QDataProcessorWidget(const DataProcessorWhiteList &,
-                       const DataProcessorPreprocessMap &,
+                       const PreprocessMap &,
                        const DataProcessorProcessingAlgorithm &,
                        const PostprocessingAlgorithm &,
                        QWidget *parent);

qt/widgets/common/src/DataProcessorUI/DataProcessorPreprocessMap.cpp → qt/widgets/common/src/DataProcessorUI/PreprocessMap.cpp

-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorPreprocessMap.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/PreprocessMap.h"
 
 namespace MantidQt {
 namespace MantidWidgets {
@@ -6,10 +6,10 @@ namespace DataProcessor {
 
 /** Constructor
 */
-DataProcessorPreprocessMap::DataProcessorPreprocessMap() : m_map() {}
+PreprocessMap::PreprocessMap() : m_map() {}
 
 // Destructor
-DataProcessorPreprocessMap::~DataProcessorPreprocessMap() {}
+PreprocessMap::~PreprocessMap() {}
 
 /** Add a column that needs pre-processing
 * @param column :: the name of the column that needs pre-processing
@@ -20,7 +20,7 @@ DataProcessorPreprocessMap::~DataProcessorPreprocessMap() {}
 * @param blacklist :: the list of algorithm properties to black list, as a
 * string
 */
-void DataProcessorPreprocessMap::addElement(const QString &column,
+void PreprocessMap::addElement(const QString &column,
                                             const QString &algorithm,
                                             const QString &prefix,
                                             const QString &blacklist) {
@@ -33,7 +33,7 @@ void DataProcessorPreprocessMap::addElement(const QString &column,
 * @return :: Pre-processing instructions as a map
 */
 std::map<QString, PreprocessingAlgorithm>
-DataProcessorPreprocessMap::asMap() const {
+PreprocessMap::asMap() const {
   return m_map;
 }
 }

qt/widgets/common/src/DataProcessorUI/QDataProcessorWidget.cpp

@@ -54,7 +54,7 @@ QDataProcessorWidget::QDataProcessorWidget(
 */
 QDataProcessorWidget::QDataProcessorWidget(
     const DataProcessorWhiteList &whitelist,
-    const DataProcessorPreprocessMap &preprocessMap,
+    const PreprocessMap &preprocessMap,
     const DataProcessorProcessingAlgorithm &algorithm, QWidget *parent)
     : QDataProcessorWidget(
           Mantid::Kernel::make_unique<GenericDataProcessorPresenter>(
@@ -85,7 +85,7 @@ QDataProcessorWidget::QDataProcessorWidget(
 */
 QDataProcessorWidget::QDataProcessorWidget(
     const DataProcessorWhiteList &whitelist,
-    const DataProcessorPreprocessMap &preprocessMap,
+    const PreprocessMap &preprocessMap,
     const DataProcessorProcessingAlgorithm &algorithm,
     const PostprocessingAlgorithm &postprocessor, QWidget *parent)
     : QDataProcessorWidget(

qt/widgets/common/test/DataProcessorUI/DataProcessorPreprocessMapTest.h → qt/widgets/common/test/DataProcessorUI/PreprocessMapTest.h

@@ -6,7 +6,7 @@
 #include <gtest/gtest.h>
 
 #include "MantidAPI/FrameworkManager.h"
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorPreprocessMap.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/PreprocessMap.h"
 
 using namespace MantidQt::MantidWidgets;
 using namespace MantidQt::MantidWidgets::DataProcessor;
@@ -16,22 +16,22 @@ using namespace testing;
 //=====================================================================================
 // Functional tests
 //=====================================================================================
-class DataProcessorPreprocessMapTest : public CxxTest::TestSuite {
+class PreprocessMapTest : 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 DataProcessorPreprocessMapTest *createSuite() {
-    return new DataProcessorPreprocessMapTest();
+  static PreprocessMapTest *createSuite() {
+    return new PreprocessMapTest();
   }
-  static void destroySuite(DataProcessorPreprocessMapTest *suite) {
+  static void destroySuite(PreprocessMapTest *suite) {
     delete suite;
   }
-  DataProcessorPreprocessMapTest() { FrameworkManager::Instance(); };
+  PreprocessMapTest() { FrameworkManager::Instance(); };
 
   void test_add_element() {
-    DataProcessorPreprocessMap preprocessMap;
+    PreprocessMap preprocessMap;
     preprocessMap.addElement("Runs", "Plus");
     preprocessMap.addElement("Transmission Runs",
                              "CreateTransmissionWorkspaceAuto", "TRANS_",

scripts/Interface/ui/dataprocessorinterface/data_processor_gui.py

@@ -110,7 +110,7 @@ class DataProcessorGui(QtGui.QMainWindow, ui_data_processor_window.Ui_DataProces
         # Third argument is a prefix to name the pre-processed workspace
         # Fourth argument is used if a 'HintingLineEdit' is used in the interface. In this case it indicates
         # the blacklist of properties that should be hidden in the hinting line edit
-        preprocess_map = MantidQt.MantidWidgets.DataProcessorPreprocessMap()
+        preprocess_map = MantidQt.MantidWidgets.PreprocessMap()
         preprocess_map.addElement('Runs', 'Plus', '', '')
         preprocess_map.addElement('Transmission Runs', 'CreateTransmissionWorkspaceAuto', '', '')