Merge topic 'fix/connectivity_tracer'

bed31eb80 turning off debug prints

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1381

vtkm/rendering/ConnectivityProxy.cxx

@@ -126,6 +126,9 @@ public:
   VTKM_CONT
   void SetCompositeBackground(bool on) { CompositeBackground = on; }
 
+  VTKM_CONT
+  void SetDebugPrints(bool on) { Tracer->SetDebugOn(on); }
+
   VTKM_CONT
   void SetEmissionField(const std::string& fieldName)
   {
@@ -347,5 +350,10 @@ void ConnectivityProxy::Trace(const vtkm::rendering::Camera& camera,
 
   logger->CloseLogEntry(-1.0);
 }
+VTKM_CONT
+void ConnectivityProxy::SetDebugPrints(bool on)
+{
+  Internals->SetDebugPrints(on);
+}
 }
 } // namespace vtkm::rendering

vtkm/rendering/ConnectivityProxy.h

@@ -56,6 +56,7 @@ public:
   void SetScalarRange(const vtkm::Range& range);
   void SetColorMap(vtkm::cont::ArrayHandle<vtkm::Vec<vtkm::Float32, 4>>& colormap);
   void SetCompositeBackground(bool on);
+  void SetDebugPrints(bool on);
 
   vtkm::Bounds GetSpatialBounds();
   vtkm::Range GetScalarRange();

vtkm/rendering/raytracing/ConnectivityBase.h

@@ -61,6 +61,7 @@ public:
   virtual void SetColorMap(
     const vtkm::cont::ArrayHandle<vtkm::Vec<vtkm::Float32, 4>>& colorMap) = 0;
 
+  virtual void SetDebugOn(bool on) = 0;
 }; // class ConnectivityBase
 }
 }

vtkm/rendering/raytracing/ConnectivityTracerBase.cxx

@@ -31,6 +31,7 @@ namespace raytracing
 {
 ConnectivityTracerBase::ConnectivityTracerBase()
   : ConnectivityBase()
+  , CountRayStatus(false)
 {
 }
 
@@ -38,6 +39,11 @@ ConnectivityTracerBase::~ConnectivityTracerBase()
 {
 }
 
+void ConnectivityTracerBase::SetDebugOn(bool on)
+{
+  CountRayStatus = on;
+}
+
 void ConnectivityTracerBase::Init()
 {
   //

vtkm/rendering/raytracing/ConnectivityTracerBase.h

@@ -65,6 +65,8 @@ public:
 
   void SetSampleDistance(const vtkm::Float32& distance) override;
 
+  void SetDebugOn(bool on) override;
+
 protected:
   vtkm::cont::Field ScalarField;
   vtkm::cont::Field EmissionField;