Refs #6541. Adding axis labels for the rebinners.

mantidproject · Feb 11, 2013 · ca75a6e · ca75a6e
1 parent 4aa20e5
commit ca75a6e
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 2 deletions.
diff --git a/...es/ParaviewPlugins/ParaViewFilters/MDEWRebinningCutterOperator/vtkMDEWRebinningCutter.cxx b/...es/ParaviewPlugins/ParaViewFilters/MDEWRebinningCutterOperator/vtkMDEWRebinningCutter.cxx
@@ -285,7 +285,7 @@ int vtkMDEWRebinningCutter::RequestData(vtkInformation* vtkNotUsed(request), vtk
     delete p_1dMDFactory;
 
     output->ShallowCopy(outData);
-
+    m_presenter->setAxisLabels(output);
   }
   return 1;
 }

diff --git a/...aviewPlugins/ParaViewFilters/RebinningTransformOperator/vtkRebinningTransformOperator.cxx b/...aviewPlugins/ParaViewFilters/RebinningTransformOperator/vtkRebinningTransformOperator.cxx
@@ -285,7 +285,7 @@ int vtkRebinningTransformOperator::RequestData(vtkInformation* vtkNotUsed(reques
     delete p_1dMDFactory;
 
     output->ShallowCopy(outData);
-
+    m_presenter->setAxisLabels(output);
   }
   return 1;
 }

diff --git a/Code/Mantid/Vates/VatesAPI/inc/MantidVatesAPI/MDEWRebinningPresenter.h b/Code/Mantid/Vates/VatesAPI/inc/MantidVatesAPI/MDEWRebinningPresenter.h
@@ -62,6 +62,8 @@ namespace Mantid
 
       std::vector<double> getTimeStepValues() const;
 
+      virtual void setAxisLabels(vtkDataSet* visualDataSet);
+
       /*-----------------------------------End MDRebinningPresenter methods -------------------------------------*/
 
       MDEWRebinningPresenter(vtkDataSet* input, RebinningActionManager* request, MDRebinningView* view, const WorkspaceProvider& wsProvider);

diff --git a/Code/Mantid/Vates/VatesAPI/inc/MantidVatesAPI/MDRebinningPresenter.h b/Code/Mantid/Vates/VatesAPI/inc/MantidVatesAPI/MDRebinningPresenter.h
@@ -48,6 +48,7 @@ namespace Mantid
       virtual const std::string& getAppliedGeometryXML() const = 0;
       virtual bool hasTDimensionAvailable() const = 0;
       virtual std::vector<double> getTimeStepValues() const = 0;
+      virtual void setAxisLabels(vtkDataSet* visualDataSet) = 0;
       virtual ~MDRebinningPresenter(){}
     };
 

diff --git a/Code/Mantid/Vates/VatesAPI/inc/MantidVatesAPI/NullRebinningPresenter.h b/Code/Mantid/Vates/VatesAPI/inc/MantidVatesAPI/NullRebinningPresenter.h
@@ -21,6 +21,8 @@ namespace Mantid
 
       virtual bool hasTDimensionAvailable() const;
 
+      virtual void setAxisLabels(vtkDataSet* visualDataSet);
+
       virtual ~NullRebinningPresenter();
 
     private:

diff --git a/Code/Mantid/Vates/VatesAPI/src/MDEWRebinningPresenter.cpp b/Code/Mantid/Vates/VatesAPI/src/MDEWRebinningPresenter.cpp
@@ -15,6 +15,7 @@
 #include "MantidVatesAPI/vtkDataSetToImplicitFunction.h"
 #include "MantidVatesAPI/vtkDataSetToWsLocation.h"
 #include "MantidVatesAPI/vtkDataSetToWsName.h"
+#include "MantidVatesAPI/Common.h"
 #include "MantidAPI/AlgorithmManager.h"
 #include "MantidAPI/ImplicitFunctionFactory.h"
 #include "MantidKernel/VMD.h"
@@ -416,6 +417,19 @@ namespace Mantid
       return timeStepValues;
     }
 
+    void MDEWRebinningPresenter::setAxisLabels(vtkDataSet *visualDataSet)
+    {
+      Mantid::Geometry::MDGeometryXMLParser sourceGeometry(m_view->getAppliedGeometryXML());
+      sourceGeometry.execute();
+      vtkFieldData* fieldData = visualDataSet->GetFieldData();
+      setAxisLabel("AxisTitleForX",
+                   makeAxisTitle(sourceGeometry.getXDimension()), fieldData);
+      setAxisLabel("AxisTitleForY",
+                   makeAxisTitle(sourceGeometry.getYDimension()), fieldData);
+      setAxisLabel("AxisTitleForZ",
+                   makeAxisTitle(sourceGeometry.getZDimension()), fieldData);
+    }
+
     void MDEWRebinningPresenter::persistReductionKnowledge(vtkDataSet* out_ds, const
       RebinningKnowledgeSerializer& xmlGenerator, const char* id)
     {

diff --git a/Code/Mantid/Vates/VatesAPI/src/NullRebinningPresenter.cpp b/Code/Mantid/Vates/VatesAPI/src/NullRebinningPresenter.cpp
@@ -38,5 +38,10 @@ namespace Mantid
       throw std::runtime_error("NullRebinningPresenter does not implement this method. Misused");
     }
 
+    void NullRebinningPresenter::setAxisLabels(vtkDataSet *visualDataSet)
+    {
+      UNUSED_ARG(visualDataSet);
+      throw std::runtime_error("NullRebinningPresenter does not implement this method. Misused");
+    }
   }
 }