Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove deprecated functions and variables from SAC module #2071

Merged
merged 1 commit into from
Nov 10, 2017
Merged

Remove deprecated functions and variables from SAC module #2071

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 0 additions & 33 deletions sample_consensus/include/pcl/sample_consensus/model_types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,6 @@
#ifndef PCL_SAMPLE_CONSENSUS_MODEL_TYPES_H_
#define PCL_SAMPLE_CONSENSUS_MODEL_TYPES_H_

#include <map>

namespace pcl
{
enum SacModel
Expand All @@ -68,35 +66,4 @@ namespace pcl
};
}

typedef std::map<pcl::SacModel, unsigned int>::value_type SampleSizeModel;
// Warning: sample_size_pairs is deprecated and is kept only to prevent breaking existing user code.
// Starting from PCL 1.8.0 model sample size is a protected member of the SampleConsensusModel class.
const static SampleSizeModel sample_size_pairs[] = {SampleSizeModel (pcl::SACMODEL_PLANE, 3),
SampleSizeModel (pcl::SACMODEL_LINE, 2),
SampleSizeModel (pcl::SACMODEL_CIRCLE2D, 3),
SampleSizeModel (pcl::SACMODEL_CIRCLE3D, 3),
SampleSizeModel (pcl::SACMODEL_SPHERE, 4),
SampleSizeModel (pcl::SACMODEL_CYLINDER, 2),
SampleSizeModel (pcl::SACMODEL_CONE, 3),
//SampleSizeModel (pcl::SACMODEL_TORUS, 2),
SampleSizeModel (pcl::SACMODEL_PARALLEL_LINE, 2),
SampleSizeModel (pcl::SACMODEL_PERPENDICULAR_PLANE, 3),
//SampleSizeModel (pcl::PARALLEL_LINES, 2),
SampleSizeModel (pcl::SACMODEL_NORMAL_PLANE, 3),
SampleSizeModel (pcl::SACMODEL_NORMAL_SPHERE, 4),
SampleSizeModel (pcl::SACMODEL_REGISTRATION, 3),
SampleSizeModel (pcl::SACMODEL_REGISTRATION_2D, 3),
SampleSizeModel (pcl::SACMODEL_PARALLEL_PLANE, 3),
SampleSizeModel (pcl::SACMODEL_NORMAL_PARALLEL_PLANE, 3),
SampleSizeModel (pcl::SACMODEL_STICK, 2)};

namespace pcl
{
const static std::map<pcl::SacModel, unsigned int>
PCL_DEPRECATED("This map is deprecated and is kept only to prevent breaking "
"existing user code. Starting from PCL 1.8.0 model sample size "
"is a protected member of the SampleConsensusModel class")
SAC_SAMPLE_SIZE (sample_size_pairs, sample_size_pairs + sizeof (sample_size_pairs) / sizeof (SampleSizeModel));
}

#endif //#ifndef PCL_SAMPLE_CONSENSUS_MODEL_TYPES_H_
7 changes: 0 additions & 7 deletions sample_consensus/include/pcl/sample_consensus/sac_model_cone.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@

#include <pcl/sample_consensus/sac_model.h>
#include <pcl/sample_consensus/model_types.h>
#include <pcl/pcl_macros.h>
#include <pcl/common/common.h>
#include <pcl/common/distances.h>
#include <limits.h>
Expand Down Expand Up @@ -282,12 +281,6 @@ namespace pcl
double
pointToAxisDistance (const Eigen::Vector4f &pt, const Eigen::VectorXf &model_coefficients);

/** \brief Get a string representation of the name of this class. */
PCL_DEPRECATED ("[pcl::SampleConsensusModelCone::getName] getName is deprecated. Please use getClassName instead.")
std::string
getName () const { return (model_name_); }

protected:
/** \brief Check whether a model is valid given the user constraints.
* \param[in] model_coefficients the set of model coefficients
*/
Expand Down
7 changes: 0 additions & 7 deletions sample_consensus/include/pcl/sample_consensus/sac_model_cylinder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@

#include <pcl/sample_consensus/sac_model.h>
#include <pcl/sample_consensus/model_types.h>
#include <pcl/pcl_macros.h>
#include <pcl/common/common.h>
#include <pcl/common/distances.h>

Expand Down Expand Up @@ -282,12 +281,6 @@ namespace pcl
const Eigen::VectorXf &model_coefficients,
Eigen::Vector4f &pt_proj);

/** \brief Get a string representation of the name of this class. */
PCL_DEPRECATED ("[pcl::SampleConsensusModelCylinder::getName] getName is deprecated. Please use getClassName instead.")
std::string
getName () const { return (model_name_); }

protected:
/** \brief Check whether a model is valid given the user constraints.
* \param[in] model_coefficients the set of model coefficients
*/
Expand Down