refs #6211. PV Plugins use Integrated Radius and show Spheres.

Code/Mantid/Vates/ParaviewPlugins/ParaViewReaders/PeaksReader/PeaksReader.xml

@@ -10,10 +10,13 @@
         <SimpleStringInformationHelper /> 
        </StringVectorProperty>
 		<DoubleVectorProperty
-         name="Peak Width"
-         command="SetWidth"
+         name="Peak Radius"
+         command="SetRadius"
          number_of_elements="1"
 	     default_values="0.05">
+        <Documentation>
+          Set the Radius of the Peak Marker. This is automatically determined if peaks in the PeaksWorkspace has been integrated.
+        </Documentation>
 	    </DoubleVectorProperty>
        <StringVectorProperty
         name="FileName"

Code/Mantid/Vates/ParaviewPlugins/ParaViewReaders/PeaksReader/vtkPeaksReader.cxx

@@ -8,7 +8,7 @@
 #include "vtkPointData.h"
 #include "vtkTransform.h"
 #include "vtkStreamingDemandDrivenPipeline.h"
-#include <vtkCubeSource.h>
+#include <vtkSphereSource.h>
 
 #include "MantidVatesAPI/FilteringUpdateProgressAction.h"
 #include "MantidVatesAPI/vtkPeakMarkerFactory.h"
@@ -41,9 +41,9 @@ vtkPeaksReader::~vtkPeaksReader()
 }
 
 
-void vtkPeaksReader::SetWidth(double width)
+void vtkPeaksReader::SetRadius(double radius)
 {
-  m_width = width;
+  m_radius = radius;
   this->Modified();
 }
 
@@ -78,18 +78,24 @@ int vtkPeaksReader::RequestData(vtkInformation * vtkNotUsed(request), vtkInforma
   FilterUpdateProgressAction<vtkPeaksReader> drawingProgressUpdate(this, "Drawing...");
   vtkDataSet * structuredMesh = p_peakFactory->create(drawingProgressUpdate);
 
-  vtkCubeSource* cube = vtkCubeSource::New();
-  cube->SetXLength(m_width);
-  cube->SetYLength(m_width);
-  cube->SetZLength(m_width);
+  // Pick the radius up from the factory if possible, otherwise use the user-provided value.
+  double peakRadius = m_radius;
+  if(p_peakFactory->isPeaksWorkspaceIntegrated())
+  {
+    peakRadius = p_peakFactory->getIntegrationRadius();
+  }
 
-  vtkPVGlyphFilter* glyphFilter = vtkPVGlyphFilter::New();
+  vtkSphereSource *sphere = vtkSphereSource::New();
+  sphere->SetRadius(peakRadius);
+
+  vtkPVGlyphFilter *glyphFilter = vtkPVGlyphFilter::New();
   glyphFilter->SetInput(structuredMesh);
-  glyphFilter->SetSource(cube->GetOutput());
+  glyphFilter->SetSource(sphere->GetOutput());
   glyphFilter->Update();
-  vtkPolyData* glyphed = glyphFilter->GetOutput();
+  vtkPolyData *glyphed = glyphFilter->GetOutput();
 
   output->ShallowCopy(glyphed);
+
   glyphFilter->Delete();
 
   return 1;

Code/Mantid/Vates/ParaviewPlugins/ParaViewReaders/PeaksReader/vtkPeaksReader.h

@@ -13,7 +13,7 @@ public:
   vtkSetStringMacro(FileName);
   vtkGetStringMacro(FileName);
   int CanReadFile(const char* fname);
-  void SetWidth(double width);
+  void SetRadius(double width);
   void SetDimensions(int dimensions);
   /// Called by presenter to force progress information updating.
   void updateAlgorithmProgress(double progress, const std::string& message);
@@ -35,7 +35,7 @@ private:
   void operator = (const vtkPeaksReader&);
 
   //Peak width;
-  double m_width;
+  double m_radius;
 
   /// File name from which to read.
   char *FileName;

Code/Mantid/Vates/ParaviewPlugins/ParaViewSources/PeaksSource/PeaksSource.xml

@@ -16,11 +16,14 @@
         information_only="0">
       </StringVectorProperty>
       <DoubleVectorProperty
-        name="Peak Width"
-        command="SetWidth"
+        name="Peak Radius"
+        command="SetRadius"
         number_of_elements="1"
         default_values="0.05"
         information_only="0">
+      <Documentation>
+          Set the Radius of the Peak Marker. This is automatically determined if peaks in the PeaksWorkspace has been integrated.
+      </Documentation>
       </DoubleVectorProperty>
     </SourceProxy>
   </ProxyGroup>

Code/Mantid/Vates/ParaviewPlugins/ParaViewSources/PeaksSource/vtkPeaksSource.cxx

 #include "vtkPeaksSource.h"
 
-#include "vtkCubeSource.h"
+#include "vtkSphereSource.h"
 #include "vtkInformation.h"
 #include "vtkInformationVector.h"
 #include "vtkObjectFactory.h"
@@ -46,9 +46,9 @@ void vtkPeaksSource::SetWsName(std::string name)
   }
 }
 
-void vtkPeaksSource::SetWidth(double width)
+void vtkPeaksSource::SetRadius(double radius)
 {
-  m_width = width;
+  m_radius = radius;
   this->Modified();
 }
 
@@ -60,7 +60,6 @@ int vtkPeaksSource::RequestData(vtkInformation *, vtkInformationVector **,
   {
     vtkInformation *outInfo = outputVector->GetInformationObject(0);
 
-    //FilterUpdateProgressAction<vtkPeaksSource> loadingProgressUpdate(this, "Loading...");
     FilterUpdateProgressAction<vtkPeaksSource> drawingProgressUpdate(this, "Drawing...");
 
     vtkPolyData *output = vtkPolyData::SafeDownCast(
@@ -72,14 +71,19 @@ int vtkPeaksSource::RequestData(vtkInformation *, vtkInformationVector **,
     p_peakFactory->initialize(m_PeakWS);
     vtkDataSet *structuredMesh = p_peakFactory->create(drawingProgressUpdate);
 
-    vtkCubeSource *cube = vtkCubeSource::New();
-    cube->SetXLength(m_width);
-    cube->SetYLength(m_width);
-    cube->SetZLength(m_width);
+    // Pick the radius up from the factory if possible, otherwise use the user-provided value.
+    double peakRadius = m_radius;
+    if(p_peakFactory->isPeaksWorkspaceIntegrated())
+    {
+      peakRadius = p_peakFactory->getIntegrationRadius();
+    }
+
+    vtkSphereSource *sphere = vtkSphereSource::New();
+    sphere->SetRadius(peakRadius);
 
     vtkPVGlyphFilter *glyphFilter = vtkPVGlyphFilter::New();
     glyphFilter->SetInput(structuredMesh);
-    glyphFilter->SetSource(cube->GetOutput());
+    glyphFilter->SetSource(sphere->GetOutput());
     glyphFilter->Update();
     vtkPolyData *glyphed = glyphFilter->GetOutput();
 

Code/Mantid/Vates/ParaviewPlugins/ParaViewSources/PeaksSource/vtkPeaksSource.h

@@ -41,7 +41,7 @@ public:
   vtkTypeRevisionMacro(vtkPeaksSource,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
   
-  void SetWidth(double width);
+  void SetRadius(double radius);
   void SetWsName(std::string wsName);
   /// Update the algorithm progress.
   void updateAlgorithmProgress(double progress, const std::string& message);
@@ -59,7 +59,7 @@ private:
   std::string m_wsName;
 
   /// Width of the glyphs
-  double m_width;
+  double m_radius;
 
   /// Cache for the workspace type name
   std::string m_wsTypeName;