From b2d2c3d2790a74986ec2aa0e170db7ab5d0cf56a Mon Sep 17 00:00:00 2001
From: Owen Arnold <owen.arnold@stfc.ac.uk>
Date: Mon, 13 Feb 2012 17:19:13 +0000
Subject: [PATCH] refs #4751. Refactoring. Rename files.
---
.../vtkMDEWRebinningCutter.cxx | 10 +++----
.../vtkRebinningTransformOperator.cxx | 10 +++----
.../EventNexusReader/vtkEventNexusReader.cxx | 2 +-
.../MDEWNexusReader/vtkMDEWNexusReader.cxx | 2 +-
.../SQWEventReader/vtkSQWEventReader.cxx | 2 +-
.../MDEWSource/vtkMDEWSource.cxx | 2 +-
.../MDHWSource/vtkMDHWSource.cxx | 4 +--
Code/Mantid/Vates/VatesAPI/CMakeLists.txt | 30 +++++++++----------
...WHexahedronFactory.h => vtkMDHexFactory.h} | 0
...GridFactory.h => vtkMDHistoHex4DFactory.h} | 2 +-
...hedronFactory.h => vtkMDHistoHexFactory.h} | 0
...gLineFactory.h => vtkMDHistoLineFactory.h} | 0
...gQuadFactory.h => vtkMDHistoQuadFactory.h} | 0
...ahedronFactory.cpp => vtkMDHexFactory.cpp} | 2 +-
...Factory.cpp => vtkMDHistoHex4DFactory.cpp} | 4 +--
...onFactory.cpp => vtkMDHistoHexFactory.cpp} | 2 +-
...eFactory.cpp => vtkMDHistoLineFactory.cpp} | 2 +-
...dFactory.cpp => vtkMDHistoQuadFactory.cpp} | 2 +-
...ronFactoryTest.h => vtkMDHexFactoryTest.h} | 2 +-
...oryTest.h => vtkMDHistoHex4DFactoryTest.h} | 2 +-
...ctoryTest.h => vtkMDHistoHexFactoryTest.h} | 2 +-
...toryTest.h => vtkMDHistoLineFactoryTest.h} | 2 +-
...toryTest.h => vtkMDHistoQuadFactoryTest.h} | 2 +-
23 files changed, 43 insertions(+), 43 deletions(-)
rename Code/Mantid/Vates/VatesAPI/inc/MantidVatesAPI/{vtkMDEWHexahedronFactory.h => vtkMDHexFactory.h} (100%)
rename Code/Mantid/Vates/VatesAPI/inc/MantidVatesAPI/{vtkThresholdingUnstructuredGridFactory.h => vtkMDHistoHex4DFactory.h} (97%)
rename Code/Mantid/Vates/VatesAPI/inc/MantidVatesAPI/{vtkThresholdingHexahedronFactory.h => vtkMDHistoHexFactory.h} (100%)
rename Code/Mantid/Vates/VatesAPI/inc/MantidVatesAPI/{vtkThresholdingLineFactory.h => vtkMDHistoLineFactory.h} (100%)
rename Code/Mantid/Vates/VatesAPI/inc/MantidVatesAPI/{vtkThresholdingQuadFactory.h => vtkMDHistoQuadFactory.h} (100%)
rename Code/Mantid/Vates/VatesAPI/src/{vtkMDEWHexahedronFactory.cpp => vtkMDHexFactory.cpp} (99%)
rename Code/Mantid/Vates/VatesAPI/src/{vtkThresholdingUnstructuredGridFactory.cpp => vtkMDHistoHex4DFactory.cpp} (95%)
rename Code/Mantid/Vates/VatesAPI/src/{vtkThresholdingHexahedronFactory.cpp => vtkMDHistoHexFactory.cpp} (99%)
rename Code/Mantid/Vates/VatesAPI/src/{vtkThresholdingLineFactory.cpp => vtkMDHistoLineFactory.cpp} (98%)
rename Code/Mantid/Vates/VatesAPI/src/{vtkThresholdingQuadFactory.cpp => vtkMDHistoQuadFactory.cpp} (99%)
rename Code/Mantid/Vates/VatesAPI/test/{vtkMDEWHexahedronFactoryTest.h => vtkMDHexFactoryTest.h} (99%)
rename Code/Mantid/Vates/VatesAPI/test/{vtkThresholdingUnstructuredGridFactoryTest.h => vtkMDHistoHex4DFactoryTest.h} (99%)
rename Code/Mantid/Vates/VatesAPI/test/{vtkThresholdingHexahedronFactoryTest.h => vtkMDHistoHexFactoryTest.h} (99%)
rename Code/Mantid/Vates/VatesAPI/test/{vtkThresholdingLineFactoryTest.h => vtkMDHistoLineFactoryTest.h} (99%)
rename Code/Mantid/Vates/VatesAPI/test/{vtkThresholdingQuadFactoryTest.h => vtkMDHistoQuadFactoryTest.h} (99%)
diff --git a/Code/Mantid/Vates/ParaviewPlugins/ParaViewFilters/MDEWRebinningCutterOperator/vtkMDEWRebinningCutter.cxx b/Code/Mantid/Vates/ParaviewPlugins/ParaViewFilters/MDEWRebinningCutterOperator/vtkMDEWRebinningCutter.cxx
index b42de31c9a0..77ab22736f8 100644
--- a/Code/Mantid/Vates/ParaviewPlugins/ParaViewFilters/MDEWRebinningCutterOperator/vtkMDEWRebinningCutter.cxx
+++ b/Code/Mantid/Vates/ParaviewPlugins/ParaViewFilters/MDEWRebinningCutterOperator/vtkMDEWRebinningCutter.cxx
@@ -19,13 +19,13 @@
#include "MantidGeometry/MDGeometry/IMDDimensionFactory.h"
#include "MantidVatesAPI/EscalatingRebinningActionManager.h"
#include "MantidVatesAPI/RebinningCutterXMLDefinitions.h"
-#include "MantidVatesAPI/vtkThresholdingUnstructuredGridFactory.h"
-#include "MantidVatesAPI/vtkThresholdingHexahedronFactory.h"
-#include "MantidVatesAPI/vtkThresholdingQuadFactory.h"
-#include "MantidVatesAPI/vtkThresholdingLineFactory.h"
+#include "MantidVatesAPI/vtkMDHistoHex4DFactory.h"
+#include "MantidVatesAPI/vtkMDHistoHexFactory.h"
+#include "MantidVatesAPI/vtkMDHistoQuadFactory.h"
+#include "MantidVatesAPI/vtkMDHistoLineFactory.h"
#include "MantidVatesAPI/vtkMDLineFactory.h"
#include "MantidVatesAPI/vtkMDQuadFactory.h"
-#include "MantidVatesAPI/vtkMDEWHexahedronFactory.h"
+#include "MantidVatesAPI/vtkMDHexFactory.h"
#include "MantidVatesAPI/TimeToTimeStep.h"
#include "MantidVatesAPI/FilteringUpdateProgressAction.h"
#include "MantidVatesAPI/Common.h"
diff --git a/Code/Mantid/Vates/ParaviewPlugins/ParaViewFilters/RebinningTransformOperator/vtkRebinningTransformOperator.cxx b/Code/Mantid/Vates/ParaviewPlugins/ParaViewFilters/RebinningTransformOperator/vtkRebinningTransformOperator.cxx
index c5baea6a88b..1e4217fb2d9 100644
--- a/Code/Mantid/Vates/ParaviewPlugins/ParaViewFilters/RebinningTransformOperator/vtkRebinningTransformOperator.cxx
+++ b/Code/Mantid/Vates/ParaviewPlugins/ParaViewFilters/RebinningTransformOperator/vtkRebinningTransformOperator.cxx
@@ -20,11 +20,11 @@
#include "MantidVatesAPI/RebinningCutterXMLDefinitions.h"
#include "MantidVatesAPI/vtkMDQuadFactory.h"
#include "MantidVatesAPI/vtkMDLineFactory.h"
-#include "MantidVatesAPI/vtkMDEWHexahedronFactory.h"
-#include "MantidVatesAPI/vtkThresholdingUnstructuredGridFactory.h"
-#include "MantidVatesAPI/vtkThresholdingHexahedronFactory.h"
-#include "MantidVatesAPI/vtkThresholdingQuadFactory.h"
-#include "MantidVatesAPI/vtkThresholdingLineFactory.h"
+#include "MantidVatesAPI/vtkMDHexFactory.h"
+#include "MantidVatesAPI/vtkMDHistoHex4DFactory.h"
+#include "MantidVatesAPI/vtkMDHistoHexFactory.h"
+#include "MantidVatesAPI/vtkMDHistoQuadFactory.h"
+#include "MantidVatesAPI/vtkMDHistoLineFactory.h"
#include "MantidVatesAPI/TimeToTimeStep.h"
#include "MantidVatesAPI/FilteringUpdateProgressAction.h"
#include "MantidVatesAPI/Common.h"
diff --git a/Code/Mantid/Vates/ParaviewPlugins/ParaViewReaders/EventNexusReader/vtkEventNexusReader.cxx b/Code/Mantid/Vates/ParaviewPlugins/ParaViewReaders/EventNexusReader/vtkEventNexusReader.cxx
index a6ad53e1e2d..fd6cf3f3552 100644
--- a/Code/Mantid/Vates/ParaviewPlugins/ParaViewReaders/EventNexusReader/vtkEventNexusReader.cxx
+++ b/Code/Mantid/Vates/ParaviewPlugins/ParaViewReaders/EventNexusReader/vtkEventNexusReader.cxx
@@ -13,7 +13,7 @@
#include "vtkBox.h"
#include "vtkUnstructuredGrid.h"
-#include "MantidVatesAPI/vtkMDEWHexahedronFactory.h"
+#include "MantidVatesAPI/vtkMDHexFactory.h"
#include "MantidVatesAPI/IgnoreZerosThresholdRange.h"
#include "MantidVatesAPI/FilteringUpdateProgressAction.h"
#include "MantidVatesAPI/MDLoadingViewAdapter.h"
diff --git a/Code/Mantid/Vates/ParaviewPlugins/ParaViewReaders/MDEWNexusReader/vtkMDEWNexusReader.cxx b/Code/Mantid/Vates/ParaviewPlugins/ParaViewReaders/MDEWNexusReader/vtkMDEWNexusReader.cxx
index ae1eae3676a..0c8cefba21f 100644
--- a/Code/Mantid/Vates/ParaviewPlugins/ParaViewReaders/MDEWNexusReader/vtkMDEWNexusReader.cxx
+++ b/Code/Mantid/Vates/ParaviewPlugins/ParaViewReaders/MDEWNexusReader/vtkMDEWNexusReader.cxx
@@ -13,7 +13,7 @@
#include "vtkBox.h"
#include "vtkUnstructuredGrid.h"
-#include "MantidVatesAPI/vtkMDEWHexahedronFactory.h"
+#include "MantidVatesAPI/vtkMDHexFactory.h"
#include "MantidVatesAPI/IgnoreZerosThresholdRange.h"
#include "MantidVatesAPI/FilteringUpdateProgressAction.h"
#include "MantidVatesAPI/MDLoadingViewAdapter.h"
diff --git a/Code/Mantid/Vates/ParaviewPlugins/ParaViewReaders/SQWEventReader/vtkSQWEventReader.cxx b/Code/Mantid/Vates/ParaviewPlugins/ParaViewReaders/SQWEventReader/vtkSQWEventReader.cxx
index d5bb132fd12..a793157ba7e 100644
--- a/Code/Mantid/Vates/ParaviewPlugins/ParaViewReaders/SQWEventReader/vtkSQWEventReader.cxx
+++ b/Code/Mantid/Vates/ParaviewPlugins/ParaViewReaders/SQWEventReader/vtkSQWEventReader.cxx
@@ -13,7 +13,7 @@
#include "vtkPVClipDataSet.h"
#include "vtkBox.h"
-#include "MantidVatesAPI/vtkMDEWHexahedronFactory.h"
+#include "MantidVatesAPI/vtkMDHexFactory.h"
#include "MantidVatesAPI/IgnoreZerosThresholdRange.h"
#include "MantidVatesAPI/FilteringUpdateProgressAction.h"
#include "MantidVatesAPI/MDLoadingViewAdapter.h"
diff --git a/Code/Mantid/Vates/ParaviewPlugins/ParaViewSources/MDEWSource/vtkMDEWSource.cxx b/Code/Mantid/Vates/ParaviewPlugins/ParaViewSources/MDEWSource/vtkMDEWSource.cxx
index 468d0b7dee4..60a0ca5e228 100644
--- a/Code/Mantid/Vates/ParaviewPlugins/ParaViewSources/MDEWSource/vtkMDEWSource.cxx
+++ b/Code/Mantid/Vates/ParaviewPlugins/ParaViewSources/MDEWSource/vtkMDEWSource.cxx
@@ -11,7 +11,7 @@
#include "MantidVatesAPI/MDEWInMemoryLoadingPresenter.h"
#include "MantidVatesAPI/MDLoadingViewAdapter.h"
#include "MantidVatesAPI/ADSWorkspaceProvider.h"
-#include "MantidVatesAPI/vtkMDEWHexahedronFactory.h"
+#include "MantidVatesAPI/vtkMDHexFactory.h"
#include "MantidVatesAPI/FilteringUpdateProgressAction.h"
#include "MantidVatesAPI/IgnoreZerosThresholdRange.h"
diff --git a/Code/Mantid/Vates/ParaviewPlugins/ParaViewSources/MDHWSource/vtkMDHWSource.cxx b/Code/Mantid/Vates/ParaviewPlugins/ParaViewSources/MDHWSource/vtkMDHWSource.cxx
index 4677aebc071..74fae2b603e 100644
--- a/Code/Mantid/Vates/ParaviewPlugins/ParaViewSources/MDHWSource/vtkMDHWSource.cxx
+++ b/Code/Mantid/Vates/ParaviewPlugins/ParaViewSources/MDHWSource/vtkMDHWSource.cxx
@@ -12,8 +12,8 @@
#include "MantidVatesAPI/MDLoadingViewAdapter.h"
#include "MantidVatesAPI/ADSWorkspaceProvider.h"
#include "MantidVatesAPI/TimeToTimeStep.h"
-#include "MantidVatesAPI/vtkThresholdingUnstructuredGridFactory.h"
-#include "MantidVatesAPI/vtkThresholdingHexahedronFactory.h"
+#include "MantidVatesAPI/vtkMDHistoHex4DFactory.h"
+#include "MantidVatesAPI/vtkMDHistoHexFactory.h"
#include "MantidVatesAPI/FilteringUpdateProgressAction.h"
#include "MantidVatesAPI/IgnoreZerosThresholdRange.h"
diff --git a/Code/Mantid/Vates/VatesAPI/CMakeLists.txt b/Code/Mantid/Vates/VatesAPI/CMakeLists.txt
index e97cc0e4064..a6b680e2ef8 100644
--- a/Code/Mantid/Vates/VatesAPI/CMakeLists.txt
+++ b/Code/Mantid/Vates/VatesAPI/CMakeLists.txt
@@ -38,12 +38,12 @@ src/vtkDataSetToWsLocation.cpp
src/vtkMDLineFactory.cpp
src/vtkMDQuadFactory.cpp
src/vtkSplatterPlotFactory.cpp
-src/vtkMDEWHexahedronFactory.cpp
+src/vtkMDHexFactory.cpp
src/vtkPeakMarkerFactory.cpp
-src/vtkThresholdingHexahedronFactory.cpp
-src/vtkThresholdingLineFactory.cpp
-src/vtkThresholdingQuadFactory.cpp
-src/vtkThresholdingUnstructuredGridFactory.cpp
+src/vtkMDHistoHexFactory.cpp
+src/vtkMDHistoLineFactory.cpp
+src/vtkMDHistoQuadFactory.cpp
+src/vtkMDHistoHex4DFactory.cpp
src/SQWLoadingPresenter.cpp
)
@@ -95,13 +95,13 @@ inc/MantidVatesAPI/vtkDataSetToWsName.h
inc/MantidVatesAPI/vtkDataSetToWsLocation.h
inc/MantidVatesAPI/vtkMDLineFactory.h
inc/MantidVatesAPI/vtkMDQuadFactory.h
-inc/MantidVatesAPI/vtkMDEWHexahedronFactory.h
+inc/MantidVatesAPI/vtkMDHexFactory.h
inc/MantidVatesAPI/vtkSplatterPlotFactory.h
inc/MantidVatesAPI/vtkPeakMarkerFactory.h
-inc/MantidVatesAPI/vtkThresholdingHexahedronFactory.h
-inc/MantidVatesAPI/vtkThresholdingLineFactory.h
-inc/MantidVatesAPI/vtkThresholdingQuadFactory.h
-inc/MantidVatesAPI/vtkThresholdingUnstructuredGridFactory.h
+inc/MantidVatesAPI/vtkMDHistoHexFactory.h
+inc/MantidVatesAPI/vtkMDHistoLineFactory.h
+inc/MantidVatesAPI/vtkMDHistoQuadFactory.h
+inc/MantidVatesAPI/vtkMDHistoHex4DFactory.h
inc/MantidVatesAPI/WorkspaceProvider.h
)
@@ -117,13 +117,13 @@ test/vtkDataSetFactoryTest.h
test/vtkDataSetToGeometryTest.h
test/vtkMDLineFactoryTest.h
test/vtkMDQuadFactoryTest.h
-test/vtkMDEWHexahedronFactoryTest.h
+test/vtkMDHexFactoryTest.h
test/vtkSplatterPlotFactoryTest.h
test/vtkPeakMarkerFactoryTest.h
-test/vtkThresholdingUnstructuredGridFactoryTest.h
-test/vtkThresholdingHexahedronFactoryTest.h
-test/vtkThresholdingLineFactoryTest.h
-test/vtkThresholdingQuadFactoryTest.h
+test/vtkMDHistoHex4DFactoryTest.h
+test/vtkMDHistoHexFactoryTest.h
+test/vtkMDHistoLineFactoryTest.h
+test/vtkMDHistoQuadFactoryTest.h
test/FieldDataToMetadataTest.h
test/FilteringUpdateProgressActionTest.h
test/MDLoadingViewAdapterTest.h
diff --git a/Code/Mantid/Vates/VatesAPI/inc/MantidVatesAPI/vtkMDEWHexahedronFactory.h b/Code/Mantid/Vates/VatesAPI/inc/MantidVatesAPI/vtkMDHexFactory.h
similarity index 100%
rename from Code/Mantid/Vates/VatesAPI/inc/MantidVatesAPI/vtkMDEWHexahedronFactory.h
rename to Code/Mantid/Vates/VatesAPI/inc/MantidVatesAPI/vtkMDHexFactory.h
diff --git a/Code/Mantid/Vates/VatesAPI/inc/MantidVatesAPI/vtkThresholdingUnstructuredGridFactory.h b/Code/Mantid/Vates/VatesAPI/inc/MantidVatesAPI/vtkMDHistoHex4DFactory.h
similarity index 97%
rename from Code/Mantid/Vates/VatesAPI/inc/MantidVatesAPI/vtkThresholdingUnstructuredGridFactory.h
rename to Code/Mantid/Vates/VatesAPI/inc/MantidVatesAPI/vtkMDHistoHex4DFactory.h
index 4b3f08dd707..f8e6c3461da 100644
--- a/Code/Mantid/Vates/VatesAPI/inc/MantidVatesAPI/vtkThresholdingUnstructuredGridFactory.h
+++ b/Code/Mantid/Vates/VatesAPI/inc/MantidVatesAPI/vtkMDHistoHex4DFactory.h
@@ -31,7 +31,7 @@
#include "MantidAPI/IMDWorkspace.h"
#include "MantidVatesAPI/ThresholdRange.h"
#include "MantidVatesAPI/vtkDataSetFactory.h"
-#include "MantidVatesAPI/vtkThresholdingHexahedronFactory.h"
+#include "MantidVatesAPI/vtkMDHistoHexFactory.h"
#include <vtkCellData.h>
#include <vtkFloatArray.h>
#include <vtkHexahedron.h>
diff --git a/Code/Mantid/Vates/VatesAPI/inc/MantidVatesAPI/vtkThresholdingHexahedronFactory.h b/Code/Mantid/Vates/VatesAPI/inc/MantidVatesAPI/vtkMDHistoHexFactory.h
similarity index 100%
rename from Code/Mantid/Vates/VatesAPI/inc/MantidVatesAPI/vtkThresholdingHexahedronFactory.h
rename to Code/Mantid/Vates/VatesAPI/inc/MantidVatesAPI/vtkMDHistoHexFactory.h
diff --git a/Code/Mantid/Vates/VatesAPI/inc/MantidVatesAPI/vtkThresholdingLineFactory.h b/Code/Mantid/Vates/VatesAPI/inc/MantidVatesAPI/vtkMDHistoLineFactory.h
similarity index 100%
rename from Code/Mantid/Vates/VatesAPI/inc/MantidVatesAPI/vtkThresholdingLineFactory.h
rename to Code/Mantid/Vates/VatesAPI/inc/MantidVatesAPI/vtkMDHistoLineFactory.h
diff --git a/Code/Mantid/Vates/VatesAPI/inc/MantidVatesAPI/vtkThresholdingQuadFactory.h b/Code/Mantid/Vates/VatesAPI/inc/MantidVatesAPI/vtkMDHistoQuadFactory.h
similarity index 100%
rename from Code/Mantid/Vates/VatesAPI/inc/MantidVatesAPI/vtkThresholdingQuadFactory.h
rename to Code/Mantid/Vates/VatesAPI/inc/MantidVatesAPI/vtkMDHistoQuadFactory.h
diff --git a/Code/Mantid/Vates/VatesAPI/src/vtkMDEWHexahedronFactory.cpp b/Code/Mantid/Vates/VatesAPI/src/vtkMDHexFactory.cpp
similarity index 99%
rename from Code/Mantid/Vates/VatesAPI/src/vtkMDEWHexahedronFactory.cpp
rename to Code/Mantid/Vates/VatesAPI/src/vtkMDHexFactory.cpp
index acc30e4aac2..3747afb9d98 100644
--- a/Code/Mantid/Vates/VatesAPI/src/vtkMDEWHexahedronFactory.cpp
+++ b/Code/Mantid/Vates/VatesAPI/src/vtkMDHexFactory.cpp
@@ -1,7 +1,7 @@
#include "MantidAPI/IMDEventWorkspace.h"
#include "MantidKernel/CPUTimer.h"
#include "MantidMDEvents/MDEventFactory.h"
-#include "MantidVatesAPI/vtkMDEWHexahedronFactory.h"
+#include "MantidVatesAPI/vtkMDHexFactory.h"
#include <boost/math/special_functions/fpclassify.hpp>
#include <vtkCellData.h>
#include <vtkFloatArray.h>
diff --git a/Code/Mantid/Vates/VatesAPI/src/vtkThresholdingUnstructuredGridFactory.cpp b/Code/Mantid/Vates/VatesAPI/src/vtkMDHistoHex4DFactory.cpp
similarity index 95%
rename from Code/Mantid/Vates/VatesAPI/src/vtkThresholdingUnstructuredGridFactory.cpp
rename to Code/Mantid/Vates/VatesAPI/src/vtkMDHistoHex4DFactory.cpp
index ce8e579eee8..968091af7fe 100644
--- a/Code/Mantid/Vates/VatesAPI/src/vtkThresholdingUnstructuredGridFactory.cpp
+++ b/Code/Mantid/Vates/VatesAPI/src/vtkMDHistoHex4DFactory.cpp
@@ -3,7 +3,7 @@
#include "MantidMDEvents/MDHistoWorkspace.h"
#include "MantidVatesAPI/TimeStepToTimeStep.h"
#include "MantidVatesAPI/TimeToTimeStep.h"
-#include "MantidVatesAPI/vtkThresholdingUnstructuredGridFactory.h"
+#include "MantidVatesAPI/vtkMDHistoHex4DFactory.h"
#include <boost/math/special_functions/fpclassify.hpp>
using Mantid::API::IMDWorkspace;
@@ -24,7 +24,7 @@ namespace VATES
/**
Assigment operator
- @param other : vtkThresholdingHexahedronFactory to assign to this instance from.
+ @param other : vtkMDHistoHex4DFactory to assign to this instance from.
@return ref to assigned current instance.
*/
template<typename TimeMapper>
diff --git a/Code/Mantid/Vates/VatesAPI/src/vtkThresholdingHexahedronFactory.cpp b/Code/Mantid/Vates/VatesAPI/src/vtkMDHistoHexFactory.cpp
similarity index 99%
rename from Code/Mantid/Vates/VatesAPI/src/vtkThresholdingHexahedronFactory.cpp
rename to Code/Mantid/Vates/VatesAPI/src/vtkMDHistoHexFactory.cpp
index c1e49f5b5cc..973e9779bc8 100644
--- a/Code/Mantid/Vates/VatesAPI/src/vtkThresholdingHexahedronFactory.cpp
+++ b/Code/Mantid/Vates/VatesAPI/src/vtkMDHistoHexFactory.cpp
@@ -1,7 +1,7 @@
#include "MantidAPI/IMDWorkspace.h"
#include "MantidKernel/CPUTimer.h"
#include "MantidMDEvents/MDHistoWorkspace.h"
-#include "MantidVatesAPI/vtkThresholdingHexahedronFactory.h"
+#include "MantidVatesAPI/vtkMDHistoHexFactory.h"
#include <boost/math/special_functions/fpclassify.hpp>
#include <vtkImageData.h>
#include <vtkRectilinearGrid.h>
diff --git a/Code/Mantid/Vates/VatesAPI/src/vtkThresholdingLineFactory.cpp b/Code/Mantid/Vates/VatesAPI/src/vtkMDHistoLineFactory.cpp
similarity index 98%
rename from Code/Mantid/Vates/VatesAPI/src/vtkThresholdingLineFactory.cpp
rename to Code/Mantid/Vates/VatesAPI/src/vtkMDHistoLineFactory.cpp
index 231d184b309..43c76660df0 100644
--- a/Code/Mantid/Vates/VatesAPI/src/vtkThresholdingLineFactory.cpp
+++ b/Code/Mantid/Vates/VatesAPI/src/vtkMDHistoLineFactory.cpp
@@ -1,4 +1,4 @@
-#include "MantidVatesAPI/vtkThresholdingLineFactory.h"
+#include "MantidVatesAPI/vtkMDHistoLineFactory.h"
#include "vtkCellArray.h"
#include "vtkCellData.h"
#include "vtkFloatArray.h"
diff --git a/Code/Mantid/Vates/VatesAPI/src/vtkThresholdingQuadFactory.cpp b/Code/Mantid/Vates/VatesAPI/src/vtkMDHistoQuadFactory.cpp
similarity index 99%
rename from Code/Mantid/Vates/VatesAPI/src/vtkThresholdingQuadFactory.cpp
rename to Code/Mantid/Vates/VatesAPI/src/vtkMDHistoQuadFactory.cpp
index 4d1a66234c0..48c31454d9a 100644
--- a/Code/Mantid/Vates/VatesAPI/src/vtkThresholdingQuadFactory.cpp
+++ b/Code/Mantid/Vates/VatesAPI/src/vtkMDHistoQuadFactory.cpp
@@ -2,7 +2,7 @@
#include "MantidKernel/CPUTimer.h"
#include "MantidMDEvents/MDHistoWorkspace.h"
#include "MantidAPI/NullCoordTransform.h"
-#include "MantidVatesAPI/vtkThresholdingQuadFactory.h"
+#include "MantidVatesAPI/vtkMDHistoQuadFactory.h"
#include "vtkCellArray.h"
#include "vtkCellData.h"
#include "vtkFloatArray.h"
diff --git a/Code/Mantid/Vates/VatesAPI/test/vtkMDEWHexahedronFactoryTest.h b/Code/Mantid/Vates/VatesAPI/test/vtkMDHexFactoryTest.h
similarity index 99%
rename from Code/Mantid/Vates/VatesAPI/test/vtkMDEWHexahedronFactoryTest.h
rename to Code/Mantid/Vates/VatesAPI/test/vtkMDHexFactoryTest.h
index 54ac18cfb1b..43c8e79ee2f 100644
--- a/Code/Mantid/Vates/VatesAPI/test/vtkMDEWHexahedronFactoryTest.h
+++ b/Code/Mantid/Vates/VatesAPI/test/vtkMDHexFactoryTest.h
@@ -9,7 +9,7 @@
#include "MantidDataObjects/TableWorkspace.h"
#include "MantidTestHelpers/MDEventsTestHelper.h"
#include "MantidVatesAPI/UserDefinedThresholdRange.h"
-#include "MantidVatesAPI/vtkMDEWHexahedronFactory.h"
+#include "MantidVatesAPI/vtkMDHexFactory.h"
#include "MantidVatesAPI/NoThresholdRange.h"
#include "MockObjects.h"
#include <cxxtest/TestSuite.h>
diff --git a/Code/Mantid/Vates/VatesAPI/test/vtkThresholdingUnstructuredGridFactoryTest.h b/Code/Mantid/Vates/VatesAPI/test/vtkMDHistoHex4DFactoryTest.h
similarity index 99%
rename from Code/Mantid/Vates/VatesAPI/test/vtkThresholdingUnstructuredGridFactoryTest.h
rename to Code/Mantid/Vates/VatesAPI/test/vtkMDHistoHex4DFactoryTest.h
index 6e7ba82ab07..4e4134c201c 100644
--- a/Code/Mantid/Vates/VatesAPI/test/vtkThresholdingUnstructuredGridFactoryTest.h
+++ b/Code/Mantid/Vates/VatesAPI/test/vtkMDHistoHex4DFactoryTest.h
@@ -6,7 +6,7 @@
#include "MantidTestHelpers/MDEventsTestHelper.h"
#include "MantidVatesAPI/TimeStepToTimeStep.h"
#include "MantidVatesAPI/UserDefinedThresholdRange.h"
-#include "MantidVatesAPI/vtkThresholdingUnstructuredGridFactory.h"
+#include "MantidVatesAPI/vtkMDHistoHex4DFactory.h"
#include "MockObjects.h"
#include <cxxtest/TestSuite.h>
#include <gmock/gmock.h>
diff --git a/Code/Mantid/Vates/VatesAPI/test/vtkThresholdingHexahedronFactoryTest.h b/Code/Mantid/Vates/VatesAPI/test/vtkMDHistoHexFactoryTest.h
similarity index 99%
rename from Code/Mantid/Vates/VatesAPI/test/vtkThresholdingHexahedronFactoryTest.h
rename to Code/Mantid/Vates/VatesAPI/test/vtkMDHistoHexFactoryTest.h
index 2b5a5a6991c..bcb88b33521 100644
--- a/Code/Mantid/Vates/VatesAPI/test/vtkThresholdingHexahedronFactoryTest.h
+++ b/Code/Mantid/Vates/VatesAPI/test/vtkMDHistoHexFactoryTest.h
@@ -4,7 +4,7 @@
#include "MantidMDEvents/MDHistoWorkspace.h"
#include "MantidTestHelpers/MDEventsTestHelper.h"
#include "MantidVatesAPI/UserDefinedThresholdRange.h"
-#include "MantidVatesAPI/vtkThresholdingHexahedronFactory.h"
+#include "MantidVatesAPI/vtkMDHistoHexFactory.h"
#include "MockObjects.h"
#include <cxxtest/TestSuite.h>
#include <gmock/gmock.h>
diff --git a/Code/Mantid/Vates/VatesAPI/test/vtkThresholdingLineFactoryTest.h b/Code/Mantid/Vates/VatesAPI/test/vtkMDHistoLineFactoryTest.h
similarity index 99%
rename from Code/Mantid/Vates/VatesAPI/test/vtkThresholdingLineFactoryTest.h
rename to Code/Mantid/Vates/VatesAPI/test/vtkMDHistoLineFactoryTest.h
index 424646ae677..7dbcd1751f7 100644
--- a/Code/Mantid/Vates/VatesAPI/test/vtkThresholdingLineFactoryTest.h
+++ b/Code/Mantid/Vates/VatesAPI/test/vtkMDHistoLineFactoryTest.h
@@ -4,7 +4,7 @@
#include "MantidAPI/IMDIterator.h"
#include "MantidTestHelpers/MDEventsTestHelper.h"
#include "MantidVatesAPI/UserDefinedThresholdRange.h"
-#include "MantidVatesAPI/vtkThresholdingLineFactory.h"
+#include "MantidVatesAPI/vtkMDHistoLineFactory.h"
#include "MockObjects.h"
#include <cxxtest/TestSuite.h>
#include <gmock/gmock.h>
diff --git a/Code/Mantid/Vates/VatesAPI/test/vtkThresholdingQuadFactoryTest.h b/Code/Mantid/Vates/VatesAPI/test/vtkMDHistoQuadFactoryTest.h
similarity index 99%
rename from Code/Mantid/Vates/VatesAPI/test/vtkThresholdingQuadFactoryTest.h
rename to Code/Mantid/Vates/VatesAPI/test/vtkMDHistoQuadFactoryTest.h
index 0e8a08c9e8d..9a5789ec10b 100644
--- a/Code/Mantid/Vates/VatesAPI/test/vtkThresholdingQuadFactoryTest.h
+++ b/Code/Mantid/Vates/VatesAPI/test/vtkMDHistoQuadFactoryTest.h
@@ -4,7 +4,7 @@
#include "MantidAPI/IMDIterator.h"
#include "MantidTestHelpers/MDEventsTestHelper.h"
#include "MantidVatesAPI/UserDefinedThresholdRange.h"
-#include "MantidVatesAPI/vtkThresholdingQuadFactory.h"
+#include "MantidVatesAPI/vtkMDHistoQuadFactory.h"
#include "MockObjects.h"
#include <cxxtest/TestSuite.h>
#include <vtkStructuredGrid.h>
--
GitLab