Refs #6541. Axis labels for MDWorkspace sources.

mantidproject · Feb 7, 2013 · 4aa20e5 · 4aa20e5
1 parent 8fe88e7
commit 4aa20e5
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 2 deletions.
diff --git a/Code/Mantid/Vates/ParaviewPlugins/ParaViewSources/MDEWSource/vtkMDEWSource.cxx b/Code/Mantid/Vates/ParaviewPlugins/ParaViewSources/MDEWSource/vtkMDEWSource.cxx
@@ -126,6 +126,8 @@ int vtkMDEWSource::RequestData(vtkInformation *, vtkInformationVector **, vtkInf
       outInfo->Get(vtkDataObject::DATA_OBJECT()));
     output->ShallowCopy(clipperOutput);
 
+    m_presenter->setAxisLabels(output);
+
     clipper->Delete();
   }
   return 1;

diff --git a/Code/Mantid/Vates/ParaviewPlugins/ParaViewSources/MDHWSource/vtkMDHWSource.cxx b/Code/Mantid/Vates/ParaviewPlugins/ParaViewSources/MDHWSource/vtkMDHWSource.cxx
@@ -111,6 +111,8 @@ int vtkMDHWSource::RequestData(vtkInformation *, vtkInformationVector **, vtkInf
       outInfo->Get(vtkDataObject::DATA_OBJECT()));
     output->ShallowCopy(clipperOutput);
 
+    m_presenter->setAxisLabels(output);
+
     clipper->Delete();
   }
   return 1;

diff --git a/Code/Mantid/Vates/VatesAPI/inc/MantidVatesAPI/MDEWLoadingPresenter.h b/Code/Mantid/Vates/VatesAPI/inc/MantidVatesAPI/MDEWLoadingPresenter.h
@@ -58,7 +58,6 @@ namespace Mantid
       std::vector<std::string> axisLabels;
       virtual void appendMetadata(vtkDataSet* visualDataSet, const std::string& wsName) ;
       virtual void extractMetadata(Mantid::API::IMDEventWorkspace_sptr eventWs);
-
       virtual bool canLoadFileBasedOnExtension(const std::string& filename, const std::string& expectedExtension) const;
       virtual bool shouldLoad();
       bool m_isSetup;

diff --git a/Code/Mantid/Vates/VatesAPI/inc/MantidVatesAPI/MDHWLoadingPresenter.h b/Code/Mantid/Vates/VatesAPI/inc/MantidVatesAPI/MDHWLoadingPresenter.h
@@ -45,6 +45,7 @@ namespace Mantid
       const std::string& getGeometryXML() const;
       virtual bool hasTDimensionAvailable() const;
       virtual std::vector<double> getTimeStepValues() const;
+      virtual void setAxisLabels(vtkDataSet* visualDataSet);
       virtual ~MDHWLoadingPresenter();
     protected:
       /*---------------------------------------------------------------------------
@@ -54,6 +55,7 @@ namespace Mantid
 
       Mantid::Geometry::MDGeometryBuilderXML<Mantid::Geometry::NoDimensionPolicy> xmlBuilder;
       Mantid::Geometry::IMDDimension_sptr tDimension;
+      std::vector<std::string> axisLabels;
       virtual void appendMetadata(vtkDataSet* visualDataSet, const std::string& wsName) ;
       virtual void extractMetadata(Mantid::API::IMDHistoWorkspace_sptr histoWs);
       virtual bool shouldLoad();

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

diff --git a/Code/Mantid/Vates/VatesAPI/src/MDHWLoadingPresenter.cpp b/Code/Mantid/Vates/VatesAPI/src/MDHWLoadingPresenter.cpp
@@ -7,7 +7,7 @@
 #include "MantidVatesAPI/RebinningKnowledgeSerializer.h"
 #include "MantidVatesAPI/MetadataToFieldData.h"
 #include "MantidVatesAPI/RebinningCutterXMLDefinitions.h"
-
+#include "MantidVatesAPI/Common.h"
 
 #include <vtkFieldData.h>
 #include <vtkDataSet.h>
@@ -54,6 +54,7 @@ namespace Mantid
           max = 1.0;
         }
         //std::cout << "dim " << d << min << " to " <<  max << std::endl;
+        axisLabels.push_back(makeAxisTitle(inDim));
         MDHistoDimension_sptr dim(new MDHistoDimension(inDim->getName(), inDim->getName(), inDim->getUnits(), min, max, inDim->getNBins()));
         dimensions.push_back(dim);
       }
@@ -135,6 +136,18 @@ namespace Mantid
       outputFD->Delete();
     }
 
+    /**
+     * Set the axis labels from the current dimensions
+     * @param visualDataSet: The VTK dataset to update
+     */
+    void MDHWLoadingPresenter::setAxisLabels(vtkDataSet *visualDataSet)
+    {
+      vtkFieldData* fieldData = visualDataSet->GetFieldData();
+      setAxisLabel("AxisTitleForX", axisLabels[0], fieldData);
+      setAxisLabel("AxisTitleForY", axisLabels[1], fieldData);
+      setAxisLabel("AxisTitleForZ", axisLabels[2], fieldData);
+    }
+
     /**
     Gets the geometry in a string format.
     @return geometry string ref.