Remove deprecated in visualization

PointCloudLibrary · Oct 9, 2020 · 31dd8f4 · 31dd8f4
1 parent 905f452
commit 31dd8f4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 71 deletions.
diff --git a/visualization/include/pcl/visualization/point_cloud_color_handlers.h b/visualization/include/pcl/visualization/point_cloud_color_handlers.h
@@ -98,28 +98,11 @@ namespace pcl
         getFieldName () const = 0;
 
         /** Obtain the actual color for the input dataset as a VTK data array.
-          * Deriving handlers should override this method. The default implementation is
-          * provided only for backwards compatibility with handlers that were written
-          * before PCL 1.10.0 and will be removed in future.
+          * Deriving handlers should override this method.
           * \return smart pointer to VTK array if the operation was successful (the
           * handler is capable and the input cloud was given), a null pointer otherwise */
         virtual vtkSmartPointer<vtkDataArray>
-        getColor () const {
-          vtkSmartPointer<vtkDataArray> scalars;
-          getColor (scalars);
-          return scalars;
-        }
-
-        /** Obtain the actual color for the input dataset as a VTK data array.
-          * This virtual method should not be overriden or used. The default implementation
-          * is provided only for backwards compatibility with handlers that were written
-          * before PCL 1.10.0 and will be removed in future. */
-        PCL_DEPRECATED(1, 12, "use getColor() without parameters instead")
-        virtual bool
-        getColor (vtkSmartPointer<vtkDataArray> &scalars) const {
-          scalars = getColor ();
-          return scalars.Get() != nullptr;
-        }
+        getColor () const = 0;
 
         /** \brief Set the input cloud to be used.
           * \param[in] cloud the input cloud to be used by the handler
@@ -187,8 +170,6 @@ namespace pcl
         vtkSmartPointer<vtkDataArray>
         getColor () const override;
 
-        using PointCloudColorHandler<PointT>::getColor;
-
       protected:
         // Members derived from the base class
         using PointCloudColorHandler<PointT>::cloud_;
@@ -247,8 +228,6 @@ namespace pcl
         vtkSmartPointer<vtkDataArray>
         getColor () const override;
 
-        using PointCloudColorHandler<PointT>::getColor;
-
       protected:
         // Members derived from the base class
         using PointCloudColorHandler<PointT>::cloud_;
@@ -298,8 +277,6 @@ namespace pcl
         vtkSmartPointer<vtkDataArray>
         getColor () const override;
 
-        using PointCloudColorHandler<PointT>::getColor;
-
         /** \brief Set the input cloud to be used.
           * \param[in] cloud the input cloud to be used by the handler
           */
@@ -348,8 +325,6 @@ namespace pcl
         vtkSmartPointer<vtkDataArray>
         getColor () const override;
 
-        using PointCloudColorHandler<PointT>::getColor;
-
       protected:
         /** \brief Class getName method. */
         virtual std::string
@@ -410,8 +385,6 @@ namespace pcl
         vtkSmartPointer<vtkDataArray>
         getColor () const override;
 
-        using PointCloudColorHandler<PointT>::getColor;
-
         /** \brief Set the input cloud to be used.
           * \param[in] cloud the input cloud to be used by the handler
           */
@@ -474,8 +447,6 @@ namespace pcl
         vtkSmartPointer<vtkDataArray>
         getColor () const override;
 
-        using PointCloudColorHandler<PointT>::getColor;
-
         /** \brief Set the input cloud to be used.
           * \param[in] cloud the input cloud to be used by the handler
           */
@@ -606,22 +577,7 @@ namespace pcl
           * \return smart pointer to VTK array if the operation was successful (the
           * handler is capable and the input cloud was given), a null pointer otherwise */
         virtual vtkSmartPointer<vtkDataArray>
-        getColor () const {
-          vtkSmartPointer<vtkDataArray> scalars;
-          getColor (scalars);
-          return scalars;
-        }
-
-        /** Obtain the actual color for the input dataset as a VTK data array.
-          * This virtual method should not be overriden or used. The default implementation
-          * is provided only for backwards compatibility with handlers that were written
-          * before PCL 1.10.0 and will be removed in future. */
-        PCL_DEPRECATED(1, 12, "use getColor() without parameters instead")
-        virtual bool
-        getColor (vtkSmartPointer<vtkDataArray> &scalars) const {
-          scalars = getColor ();
-          return scalars.Get() != nullptr;
-        }
+          getColor() const = 0;
 
         /** \brief Set the input cloud to be used.
           * \param[in] cloud the input cloud to be used by the handler
@@ -681,8 +637,6 @@ namespace pcl
 
         vtkSmartPointer<vtkDataArray>
         getColor () const override;
-
-        using PointCloudColorHandler<pcl::PCLPointCloud2>::getColor;
     };
 
     //////////////////////////////////////////////////////////////////////////////////////
@@ -722,8 +676,6 @@ namespace pcl
         vtkSmartPointer<vtkDataArray>
         getColor () const override;
 
-        using PointCloudColorHandler<pcl::PCLPointCloud2>::getColor;
-
       protected:
         /** \brief Internal R, G, B holding the values given by the user. */
         double r_, g_, b_;
@@ -755,8 +707,6 @@ namespace pcl
         vtkSmartPointer<vtkDataArray>
         getColor () const override;
 
-        using PointCloudColorHandler<pcl::PCLPointCloud2>::getColor;
-
       protected:
         /** \brief Get the name of the class. */
         virtual std::string
@@ -792,8 +742,6 @@ namespace pcl
         vtkSmartPointer<vtkDataArray>
         getColor () const override;
 
-        using PointCloudColorHandler<pcl::PCLPointCloud2>::getColor;
-
       protected:
         /** \brief Get the name of the class. */
         virtual std::string
@@ -837,8 +785,6 @@ namespace pcl
         vtkSmartPointer<vtkDataArray>
         getColor () const override;
 
-        using PointCloudColorHandler<pcl::PCLPointCloud2>::getColor;
-
       protected:
         /** \brief Get the name of the class. */
         virtual std::string
@@ -879,8 +825,6 @@ namespace pcl
         vtkSmartPointer<vtkDataArray>
         getColor () const override;
 
-        using PointCloudColorHandler<pcl::PCLPointCloud2>::getColor;
-
       protected:
         /** \brief Get the name of the class. */
         virtual std::string
@@ -919,8 +863,6 @@ namespace pcl
         vtkSmartPointer<vtkDataArray>
         getColor () const override;
 
-        using PointCloudColorHandler<pcl::PCLPointCloud2>::getColor;
-
       protected:
         /** \brief Get the name of the class. */
         virtual std::string

diff --git a/visualization/src/pcl_visualizer.cpp b/visualization/src/pcl_visualizer.cpp
@@ -1926,16 +1926,6 @@ pcl::visualization::PCLVisualizer::getCameraFile () const
   return (style_->getCameraFile ());
 }
 
-/////////////////////////////////////////////////////////////////////////////////////////////
-PCL_DEPRECATED(1, 12, "This method can safely not be called anymore as we're just re-rendering all scenes now.")
-void
-pcl::visualization::PCLVisualizer::updateCamera ()
-{
-  rens_->InitTraversal ();
-  // Update the camera parameters
-  win_->Render ();
-}
-
 /////////////////////////////////////////////////////////////////////////////////////////////
 bool
 pcl::visualization::PCLVisualizer::updateShapePose (const std::string &id, const Eigen::Affine3f& pose)