diff --git a/Code/Mantid/Vates/ParaviewPlugins/ParaViewSources/MDEWSource/vtkMDEWSource.cxx b/Code/Mantid/Vates/ParaviewPlugins/ParaViewSources/MDEWSource/vtkMDEWSource.cxx index a95da9c8ad91..72b9d1da914e 100644 --- a/Code/Mantid/Vates/ParaviewPlugins/ParaViewSources/MDEWSource/vtkMDEWSource.cxx +++ b/Code/Mantid/Vates/ParaviewPlugins/ParaViewSources/MDEWSource/vtkMDEWSource.cxx @@ -15,6 +15,7 @@ #include "MantidVatesAPI/vtkMDHexFactory.h" #include "MantidVatesAPI/vtkMDQuadFactory.h" #include "MantidVatesAPI/vtkMDLineFactory.h" +#include "MantidVatesAPI/vtkMD0DFactory.h" #include "MantidVatesAPI/FilteringUpdateProgressAction.h" #include "MantidVatesAPI/IgnoreZerosThresholdRange.h" @@ -184,12 +185,14 @@ int vtkMDEWSource::RequestData(vtkInformation *, vtkInformationVector **, vtkInf FilterUpdateProgressAction drawingProgressUpdate(this, "Drawing..."); ThresholdRange_scptr thresholdRange(new IgnoreZerosThresholdRange()); + vtkMD0DFactory* zeroDFactory = new vtkMD0DFactory(thresholdRange, "signal"); vtkMDHexFactory* hexahedronFactory = new vtkMDHexFactory(thresholdRange, "signal"); vtkMDQuadFactory* quadFactory = new vtkMDQuadFactory(thresholdRange, "signal"); vtkMDLineFactory* lineFactory = new vtkMDLineFactory(thresholdRange, "signal"); hexahedronFactory->SetSuccessor(quadFactory); quadFactory->SetSuccessor(lineFactory); + lineFactory->SetSuccessor(zeroDFactory); hexahedronFactory->setTime(m_time); vtkDataSet* product = m_presenter->execute(hexahedronFactory, loadingProgressUpdate, drawingProgressUpdate); diff --git a/Code/Mantid/Vates/ParaviewPlugins/ParaViewSources/MDHWSource/vtkMDHWSource.cxx b/Code/Mantid/Vates/ParaviewPlugins/ParaViewSources/MDHWSource/vtkMDHWSource.cxx index 9a902f199978..59539b183729 100644 --- a/Code/Mantid/Vates/ParaviewPlugins/ParaViewSources/MDHWSource/vtkMDHWSource.cxx +++ b/Code/Mantid/Vates/ParaviewPlugins/ParaViewSources/MDHWSource/vtkMDHWSource.cxx @@ -17,6 +17,7 @@ #include "MantidVatesAPI/vtkMDHistoHexFactory.h" #include "MantidVatesAPI/vtkMDHistoQuadFactory.h" #include "MantidVatesAPI/vtkMDHistoLineFactory.h" +#include "MantidVatesAPI/vtkMD0DFactory.h" #include "MantidVatesAPI/FilteringUpdateProgressAction.h" #include "MantidVatesAPI/IgnoreZerosThresholdRange.h" @@ -175,6 +176,7 @@ int vtkMDHWSource::RequestData(vtkInformation *, vtkInformationVector **, vtkInf /* Will attempt to handle drawing in 4D case and then in 3D case if that fails, and so on down to 1D */ + vtkMD0DFactory* zeroDFactory = new vtkMD0DFactory(thresholdRange, "signal"); vtkMDHistoLineFactory* lineFactory = new vtkMDHistoLineFactory(thresholdRange, "signal"); vtkMDHistoQuadFactory* quadFactory = new vtkMDHistoQuadFactory(thresholdRange, "signal"); vtkMDHistoHexFactory* hexFactory = new vtkMDHistoHexFactory(thresholdRange, "signal"); @@ -183,6 +185,7 @@ int vtkMDHWSource::RequestData(vtkInformation *, vtkInformationVector **, vtkInf factory->SetSuccessor(hexFactory); hexFactory->SetSuccessor(quadFactory); quadFactory->SetSuccessor(lineFactory); + lineFactory->SetSuccessor(zeroDFactory); vtkDataSet* product = m_presenter->execute(factory, loadingProgressUpdate, drawingProgressUpdate); diff --git a/Code/Mantid/Vates/VatesAPI/src/vtkMD0DFactory.cpp b/Code/Mantid/Vates/VatesAPI/src/vtkMD0DFactory.cpp index cbaced68cc25..8ebe16bcb07e 100644 --- a/Code/Mantid/Vates/VatesAPI/src/vtkMD0DFactory.cpp +++ b/Code/Mantid/Vates/VatesAPI/src/vtkMD0DFactory.cpp @@ -2,9 +2,15 @@ #include "MantidAPI/IMDWorkspace.h" #include "MantidVatesAPI/vtkNullUnstructuredGrid.h" #include "MantidVatesAPI/ProgressAction.h" +#include "MantidKernel/Logger.h" using namespace Mantid::API; +namespace +{ + Mantid::Kernel::Logger g_log("vtkMD0DFactory"); +} + namespace Mantid { namespace VATES @@ -16,6 +22,7 @@ namespace Mantid */ vtkMD0DFactory::vtkMD0DFactory(ThresholdRange_scptr thresholdRange, const std::string& scalarName) : m_thresholdRange(thresholdRange), m_scalarName(scalarName) { + g_log.warning() << "Creating factory " << this->getFactoryTypeName() << ". You are viewing data with less than three dimensions in the VSI. \n"; } /// Destructor diff --git a/Code/Mantid/Vates/VatesAPI/src/vtkMDHistoLineFactory.cpp b/Code/Mantid/Vates/VatesAPI/src/vtkMDHistoLineFactory.cpp index 87c7f890b2cb..5592e2d13eb5 100644 --- a/Code/Mantid/Vates/VatesAPI/src/vtkMDHistoLineFactory.cpp +++ b/Code/Mantid/Vates/VatesAPI/src/vtkMDHistoLineFactory.cpp @@ -12,11 +12,17 @@ #include "MantidAPI/NullCoordTransform.h" #include "MantidDataObjects/MDHistoWorkspace.h" #include "MantidKernel/ReadLock.h" +#include "MantidKernel/Logger.h" using Mantid::API::IMDWorkspace; using Mantid::DataObjects::MDHistoWorkspace; using Mantid::API::NullCoordTransform; +namespace +{ + Mantid::Kernel::Logger g_log("vtkMDHistoLineFactory"); +} + namespace Mantid { @@ -26,6 +32,7 @@ namespace Mantid vtkMDHistoLineFactory::vtkMDHistoLineFactory(ThresholdRange_scptr thresholdRange, const std::string& scalarName) : m_scalarName(scalarName), m_thresholdRange(thresholdRange) { + g_log.warning() << "Creating factory " << this->getFactoryTypeName() << ". You are viewing data with less than three dimensions in the VSI. \n"; } /** diff --git a/Code/Mantid/Vates/VatesAPI/src/vtkMDHistoQuadFactory.cpp b/Code/Mantid/Vates/VatesAPI/src/vtkMDHistoQuadFactory.cpp index dd30c422155a..e9287a0d424b 100644 --- a/Code/Mantid/Vates/VatesAPI/src/vtkMDHistoQuadFactory.cpp +++ b/Code/Mantid/Vates/VatesAPI/src/vtkMDHistoQuadFactory.cpp @@ -13,19 +13,25 @@ #include "vtkSmartPointer.h" #include #include "MantidKernel/ReadLock.h" +#include "MantidKernel/Logger.h" using Mantid::API::IMDWorkspace; using Mantid::Kernel::CPUTimer; using Mantid::DataObjects::MDHistoWorkspace; +namespace +{ + Mantid::Kernel::Logger g_log("vtkMDHistoQuadFactory"); +} + namespace Mantid { namespace VATES { - vtkMDHistoQuadFactory::vtkMDHistoQuadFactory(ThresholdRange_scptr thresholdRange, const std::string& scalarName) : m_scalarName(scalarName), m_thresholdRange(thresholdRange) { + g_log.warning() << "Creating factory " << this->getFactoryTypeName() << ". You are viewing data with less than three dimensions in the VSI. \n"; } /** diff --git a/Code/Mantid/Vates/VatesAPI/src/vtkMDLineFactory.cpp b/Code/Mantid/Vates/VatesAPI/src/vtkMDLineFactory.cpp index d6b392cc3b06..e9ff185b6030 100644 --- a/Code/Mantid/Vates/VatesAPI/src/vtkMDLineFactory.cpp +++ b/Code/Mantid/Vates/VatesAPI/src/vtkMDLineFactory.cpp @@ -13,9 +13,15 @@ #include #include #include "MantidKernel/ReadLock.h" +#include "MantidKernel/Logger.h" using namespace Mantid::API; +namespace +{ + Mantid::Kernel::Logger g_log("vtkMDLineFactory"); +} + namespace Mantid { namespace VATES @@ -27,6 +33,7 @@ namespace Mantid */ vtkMDLineFactory::vtkMDLineFactory(ThresholdRange_scptr thresholdRange, const std::string& scalarName) : m_thresholdRange(thresholdRange), m_scalarName(scalarName) { + g_log.warning() << "Creating factory " << this->getFactoryTypeName() << ". You are viewing data with less than three dimensions in the VSI. \n"; } /// Destructor diff --git a/Code/Mantid/Vates/VatesAPI/src/vtkMDQuadFactory.cpp b/Code/Mantid/Vates/VatesAPI/src/vtkMDQuadFactory.cpp index b1a096fa9597..3792e8717b3e 100644 --- a/Code/Mantid/Vates/VatesAPI/src/vtkMDQuadFactory.cpp +++ b/Code/Mantid/Vates/VatesAPI/src/vtkMDQuadFactory.cpp @@ -13,9 +13,15 @@ #include #include #include "MantidKernel/ReadLock.h" +#include "MantidKernel/Logger.h" using namespace Mantid::API; +namespace +{ + Mantid::Kernel::Logger g_log("vtkMDQuadFactory"); +} + namespace Mantid { namespace VATES @@ -23,6 +29,7 @@ namespace Mantid /// Constructor vtkMDQuadFactory::vtkMDQuadFactory(ThresholdRange_scptr thresholdRange, const std::string& scalarName) : m_thresholdRange(thresholdRange), m_scalarName(scalarName) { + g_log.warning() << "Creating factory " << this->getFactoryTypeName() << ". You are viewing data with less than three dimensions in the VSI. \n"; } /// Destructor