Refs #7091. Change threshold parameter to double.

mantidproject · May 29, 2013 · 93cde90 · 93cde90
1 parent 43f31c1
commit 93cde90
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/Code/Mantid/Vates/ParaviewPlugins/ParaViewFilters/SplatterPlot/SplatterPlot.xml b/Code/Mantid/Vates/ParaviewPlugins/ParaViewFilters/SplatterPlot/SplatterPlot.xml
@@ -19,16 +19,16 @@
          number_of_elements="1"
          default_values="150000">
        </IntVectorProperty>
-      <IntVectorProperty
+      <DoubleVectorProperty
          name="Top Percentile"
          command="SetTopPercentile"
          number_of_elements="1"
          default_values="5">
-         <IntRangeDomain name="range" min="1" max="100" />
+         <DoubleRangeDomain name="range" min="0.1" max="100" />
          <Documentation>
             The set the viewing limit to the top percentile of the denses boxes.
          </Documentation>
-      </IntVectorProperty>
+      </DoubleVectorProperty>
     </SourceProxy>
   </ProxyGroup>
   <!-- End SplatterPlot -->

diff --git a/Code/Mantid/Vates/ParaviewPlugins/ParaViewFilters/SplatterPlot/vtkSplatterPlot.cxx b/Code/Mantid/Vates/ParaviewPlugins/ParaViewFilters/SplatterPlot/vtkSplatterPlot.cxx
@@ -52,7 +52,7 @@ void vtkSplatterPlot::SetNumberOfPoints(int nPoints)
  * Set the threshold for the top percentile of most dense boxes to view
  * @param topPercentile : the limit on the percentile of boxes to show
  */
-void vtkSplatterPlot::SetTopPercentile(int topPercentile)
+void vtkSplatterPlot::SetTopPercentile(double topPercentile)
 {
   if (topPercentile > 0)
   {
@@ -81,7 +81,7 @@ int vtkSplatterPlot::RequestData(vtkInformation *, vtkInformationVector **, vtkI
 
   std::string scalarName = "signal";
   vtkSplatterPlotFactory vtkGridFactory(ThresholdRange_scptr(new NoThresholdRange), scalarName, m_numberPoints,
-                                        static_cast<double>(m_topPercentile));
+                                        m_topPercentile);
   vtkGridFactory.initialize(result);
 
   FilterUpdateProgressAction<vtkSplatterPlot> drawUpdateProgress(this, "Drawing...");

diff --git a/Code/Mantid/Vates/ParaviewPlugins/ParaViewFilters/SplatterPlot/vtkSplatterPlot.h b/Code/Mantid/Vates/ParaviewPlugins/ParaViewFilters/SplatterPlot/vtkSplatterPlot.h
@@ -9,7 +9,7 @@ class VTK_EXPORT vtkSplatterPlot : public vtkUnstructuredGridAlgorithm
   vtkTypeMacro(vtkSplatterPlot, vtkUnstructuredGridAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
   void SetNumberOfPoints(int nPoints);
-  void SetTopPercentile(int topPercentile);
+  void SetTopPercentile(double topPercentile);
   void updateAlgorithmProgress(double progress, const std::string& message);
 protected:
 
@@ -22,6 +22,6 @@ class VTK_EXPORT vtkSplatterPlot : public vtkUnstructuredGridAlgorithm
   vtkSplatterPlot(const vtkSplatterPlot&);
   void operator = (const vtkSplatterPlot&);
   size_t m_numberPoints;
-  int m_topPercentile;
+  double m_topPercentile;
 };
 #endif