Rename sampling to frame_sampling

Kitware · Mar 9, 2022 · ff55831 · ff55831
1 parent 7e0f6de
commit ff55831
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/arrows/vtk/applets/color_mesh.cxx b/arrows/vtk/applets/color_mesh.cxx
@@ -196,8 +196,8 @@ class color_mesh::priv : public kwiver::arrows::vtk::mesh_coloration
     }
     if (cmd_args.count("frame-sampling"))
     {
-      sampling_ = cmd_args["frame-sampling"].as<int>();
-      config_->set_value("frame_sampling", sampling_);
+      frame_sampling_ = cmd_args["frame-sampling"].as<int>();
+      config_->set_value("frame_sampling", frame_sampling_);
     }
     if (cmd_args.count("all-frames"))
     {
@@ -236,7 +236,7 @@ class color_mesh::priv : public kwiver::arrows::vtk::mesh_coloration
     }
 
     // set variables from the config
-    sampling_ = config_->get_value("frame_sampling", 1);
+    frame_sampling_ = config_->get_value("frame_sampling", 1);
     frame_ = config_->get_value("frame", -1);
     all_frames_ = config_->get_value("all_frames", false);
     occlusion_threshold_ = config_->get_value("occlusion_threshold", 0.0);

diff --git a/arrows/vtk/mesh_coloration.cxx b/arrows/vtk/mesh_coloration.cxx
@@ -82,7 +82,7 @@ ::mesh_coloration()
 {
   input_ = nullptr;
   output_ = vtkSmartPointer<vtkPolyData>::New();
-  sampling_ = 1;
+  frame_sampling_ = 1;
   frame_ = -1;
   all_frames_ = false;
   occlusion_threshold_ = 0.0;
@@ -184,7 +184,7 @@ ::set_frame_sampling( int sample )
 {
   if( sample > 0 )
   {
-    sampling_ = sample;
+    frame_sampling_ = sample;
   }
 }
 
@@ -579,7 +579,7 @@ ::initialize_data_list( int frame_id )
 
     for( auto const& cam_itr : cam_map )
     {
-      if( ( counter++ ) % sampling_ != 0 )
+      if( ( counter++ ) % frame_sampling_ != 0 )
       {
         continue;
       }

diff --git a/arrows/vtk/mesh_coloration.h b/arrows/vtk/mesh_coloration.h
@@ -143,7 +143,7 @@ class KWIVER_ALGO_VTK_EXPORT mesh_coloration :
 protected:
   vtkSmartPointer< vtkPolyData > input_;
   vtkSmartPointer< vtkPolyData > output_;
-  int sampling_;
+  int frame_sampling_;
   int frame_;
   bool all_frames_;
   float occlusion_threshold_;