Skip to content

Commit 2d4864e

Browse files
author
Heiko Thiel
committed
Format doxygen comments
1 parent 73f77da commit 2d4864e

File tree

13 files changed

+176
-94
lines changed

13 files changed

+176
-94
lines changed

apps/in_hand_scanner/include/pcl/apps/in_hand_scanner/icp.h

Lines changed: 42 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,9 @@ class PCL_EXPORTS ICP {
7171
/** @{ */
7272
/** \brief Convergence is detected when the change of the fitness between the current
7373
* and previous iteration becomes smaller than the given epsilon (set in cm^2). The
74-
* fitness is the mean squared euclidean distance between corresponding points. \note
75-
* Only accepted if it is greater than 0.
74+
* fitness is the mean squared euclidean distance between corresponding points.
75+
*
76+
* \note Only accepted if it is greater than 0.
7677
*/
7778
void
7879
setEpsilon(const float epsilon);
@@ -83,7 +84,9 @@ class PCL_EXPORTS ICP {
8384

8485
/** @{ */
8586
/** \brief The registration fails if the number of iterations exceeds the maximum
86-
* number of iterations. \note Must be greater than 0. Smaller values are set to 1.
87+
* number of iterations.
88+
*
89+
* \note Must be greater than 0. Smaller values are set to 1.
8790
*/
8891
void
8992
setMaxIterations(const unsigned int max_iter);
@@ -96,6 +99,7 @@ class PCL_EXPORTS ICP {
9699
/** \brief The registration fails at the state of convergence if the overlap between
97100
* the model and data shape is smaller than a minimum overlap. The overlap is the
98101
* fraction of correspondences (after rejection) to the initial number of data points.
102+
*
99103
* \note Must be between zero and one. Values outside this range are clamped to the
100104
* nearest valid value.
101105
*/
@@ -108,7 +112,9 @@ class PCL_EXPORTS ICP {
108112

109113
/** @{ */
110114
/** \brief The registration fails at the state of convergence if the fitness is bigger
111-
* than this threshold (set in cm^2) \note Must be greater than zero.
115+
* than this threshold (set in cm^2)
116+
*
117+
* \note Must be greater than zero.
112118
*/
113119
void
114120
setMaxFitness(const float fitness);
@@ -121,8 +127,9 @@ class PCL_EXPORTS ICP {
121127
/** \brief Correspondences are rejected if the squared distance is above a threshold.
122128
* This threshold is initialized with infinity (all correspondences are accepted in
123129
* the first iteration). The threshold of the next iterations is set to the fitness of
124-
* the current iteration multiplied by the factor set by this method. \note Must be
125-
* greater or equal one. Smaller values are set to one.
130+
* the current iteration multiplied by the factor set by this method.
131+
*
132+
* \note Must be greater or equal one. Smaller values are set to one.
126133
*/
127134
void
128135
setCorrespondenceRejectionFactor(const float factor);
@@ -133,8 +140,10 @@ class PCL_EXPORTS ICP {
133140

134141
/** @{ */
135142
/** \brief Correspondences are rejected if the angle between the normals is bigger
136-
* than this threshold. Set in degrees. \note Must be between 180 degrees and 0.
137-
* Values outside this range are clamped to the nearest valid value.
143+
* than this threshold. Set in degrees.
144+
*
145+
* \note Must be between 180 degrees and 0. Values outside this range are clamped to
146+
* the nearest valid value.
138147
*/
139148
void
140149
setMaxAngle(const float angle);
@@ -144,9 +153,13 @@ class PCL_EXPORTS ICP {
144153
/** @} */
145154

146155
/** \brief Find the transformation that aligns the data cloud (source) to the model
147-
* mesh (target). \param[in] mesh_model Model mesh (target). \param[in] cloud_data
148-
* Data cloud (source). \param[in] T_init Initial guess for the transformation.
149-
* \paran[out] T_final The computed transformation.
156+
* mesh (target).
157+
*
158+
* \param[in] mesh_model Model mesh (target).
159+
* \param[in] cloud_data Data cloud (source).
160+
* \param[in] T_init Initial guess for the transformation.
161+
* \param[out] T_final The computed transformation.
162+
*
150163
* \return true if success.
151164
*/
152165
bool
@@ -166,27 +179,38 @@ class PCL_EXPORTS ICP {
166179
using KdTreeConstPtr = KdTree::ConstPtr;
167180

168181
/** \brief Selects the model points that are pointing towards to the camera (data
169-
* coordinate system = camera coordinate system). \param[in] mesh_model Input mesh.
182+
* coordinate system = camera coordinate system).
183+
*
184+
* \param[in] mesh_model Input mesh.
170185
* \param[in] T_inv Transformation that brings the model mesh into the camera
171-
* coordinate system. \return Cloud containing the selected points (the connectivity
186+
* coordinate system.
187+
*
188+
* \return Cloud containing the selected points (the connectivity
172189
* information of the mesh is currently not used during the registration).
173190
*/
174191
CloudNormalConstPtr
175192
selectModelPoints(const MeshConstPtr& mesh_model, const Eigen::Matrix4f& T_inv) const;
176193

177194
/** \brief Selects the valid data points. The input cloud is organized -> contains
178-
* nans which are removed \param[in] cloud_data Input cloud. \return Cloud containing
179-
* the selected points.
195+
* nans which are removed
196+
*
197+
* \param[in] cloud_data Input cloud.
198+
*
199+
* \return Cloud containing the selected points.
180200
*/
181201
CloudNormalConstPtr
182202
selectDataPoints(const CloudXYZRGBNormalConstPtr& cloud_data) const;
183203

184204
/** \brief Finds the transformation that minimizes the point to plane distance from
185205
* the source to the target cloud. The input clouds must be arranged to have one to
186206
* one correspondences (point 0 in source corresponds to point 0 in target, point 1 in
187-
* source to point 1 in target and so on). \param[in] cloud_source Source cloud
188-
* (data). \param[in] cloud_target Target cloud (model). \param[out] T The computed
189-
* transformation. \return true if success
207+
* source to point 1 in target and so on).
208+
*
209+
* \param[in] cloud_source Source cloud (data).
210+
* \param[in] cloud_target Target cloud (model).
211+
* \param[out] T The computed transformation.
212+
*
213+
* \return true if success
190214
*/
191215
bool
192216
minimizePointPlane(const CloudNormal& cloud_source,

apps/in_hand_scanner/include/pcl/apps/in_hand_scanner/impl/common_types.hpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -119,15 +119,12 @@ struct PointIHS : public pcl::ihs::_PointIHS {
119119
this->directions = 0;
120120
}
121121

122-
// inline Eigen::Vector3i getRGBVector3i () {return (Eigen::Vector3i (r,
123-
// g, b));}
124122
inline const Eigen::Vector3i
125123
getRGBVector3i() const
126124
{
127125
return (Eigen::Vector3i(r, g, b));
128126
}
129-
// inline Eigen::Vector4i getRGBVector4i () {return (Eigen::Vector4i (r,
130-
// g, b, a));}
127+
131128
inline const Eigen::Vector4i
132129
getRGBVector4i() const
133130
{

apps/in_hand_scanner/include/pcl/apps/in_hand_scanner/in_hand_scanner.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,7 @@ public Q_SLOTS:
186186
reset();
187187

188188
/** \brief Saves the model mesh in a file with the given filename and filetype.
189+
*
189190
* \note The extension of the filename is ignored!
190191
*/
191192
void

apps/in_hand_scanner/include/pcl/apps/in_hand_scanner/input_data_processing.h

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,21 +71,28 @@ class PCL_EXPORTS InputDataProcessing {
7171
InputDataProcessing();
7272

7373
/** \brief Apply the segmentation on the input cloud (XYZ and HSV).
74+
*
7475
* \param[in] cloud_in The input cloud.
7576
* \param[out] cloud_out The segmented cloud.
7677
* \param[out] cloud_discarded Cloud containing all points that were removed during
77-
* the HSV segmentation. The points in the XYZ segmentation are NOT used! \return true
78-
* if success. \note Converts from m to cm.
78+
* the HSV segmentation. The points in the XYZ segmentation are NOT used!
79+
*
80+
* \return true if success.
81+
*
82+
* \note Converts from m to cm.
7983
*/
8084
bool
8185
segment(const CloudXYZRGBAConstPtr& cloud_in,
8286
CloudXYZRGBNormalPtr& cloud_out,
8387
CloudXYZRGBNormalPtr& cloud_discarded) const;
8488

8589
/** \brief Calculate the normals of the input cloud.
90+
*
8691
* \param[in] cloud_in The input cloud.
8792
* \param[out] cloud_out Input cloud with normals appended.
93+
*
8894
* \return true if success.
95+
*
8996
* \note Converts from m to cm.
9097
*/
9198
bool
@@ -167,7 +174,9 @@ class PCL_EXPORTS InputDataProcessing {
167174
/** @{ */
168175
/** \brief Simple color segmentation in the HSV color space. Points inside of H - S -
169176
* V min / max are discarded. H must be in the range 0 and 360, S and V in the range 0
170-
* and 1. \note If you set values outside of the allowed range the member variables
177+
* and 1.
178+
*
179+
* \note If you set values outside of the allowed range the member variables
171180
* are clamped to the next best value. E.g. H is set to 0 if you pass -1.
172181
*/
173182
inline void
@@ -316,10 +325,12 @@ class PCL_EXPORTS InputDataProcessing {
316325
dilate(MatrixXb& mask, const int k) const;
317326

318327
/** \brief Calculates the manhattan distance map for the input matrix.
319-
* \param[in] mat Input matrix.
328+
*
329+
* \param[in] mat Input matrix.
320330
* \param[in] comp Compared value. mat==comp will have zero distance.
331+
*
321332
* \return Matrix containing the distances to mat==comp
322-
* \see http://ostermiller.org/dilate_and_erode.html
333+
* \see http://ostermiller.org/dilate_and_erode.html
323334
*/
324335
MatrixXi
325336
manhattan(const MatrixXb& mat, const bool comp) const;

apps/in_hand_scanner/include/pcl/apps/in_hand_scanner/integration.h

Lines changed: 32 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -73,18 +73,22 @@ class PCL_EXPORTS Integration {
7373
Integration();
7474

7575
/** \brief Reconstructs a mesh from an organized cloud.
76+
*
7677
* \param[in] cloud_data Input cloud. Must be organized.
7778
* \param[in] mesh_model Reconstructed mesh.
79+
*
7880
* \return true if success.
7981
*/
8082
bool
8183
reconstructMesh(const CloudXYZRGBNormalConstPtr& cloud_data,
8284
MeshPtr& mesh_model) const;
8385

84-
/** \brief Merge the organized cloud into the mesh.
86+
/** \brief Merge the organized cloud into the mesh.#
87+
*
8588
* \param[in] cloud_data Input cloud. Must be organized.
8689
* \param[in,out] mesh_model Mesh with new points integrated.
8790
* \param[in] T Transformation that aligns the data cloud with the model mesh.
91+
*
8892
* \return true if success.
8993
*/
9094
bool
@@ -96,22 +100,27 @@ class PCL_EXPORTS Integration {
96100
* again age by one iteration. Points that are observed again get an age of 0. Once a
97101
* point reaches the maximum age it is decided if the point is removed or kept in the
98102
* mesh. A point is removed if it has not been observed from a minimum number of
99-
* directions. \param[in,out] mesh The mesh which should be processed. \param[in]
100-
* cleanup Calls mesh.cleanup () if true.
103+
* directions.
104+
*
105+
* \param[in,out] mesh The mesh which should be processed.
106+
* \param[in] cleanup Calls mesh.cleanup() if true.
101107
*/
102108
void
103109
age(const MeshPtr& mesh, const bool cleanup = true) const;
104110

105111
/** \brief Removes unfit vertices regardless of their age. Unfit vertices are those
106-
* that have not been observed from enough directions. \param[in,out] mesh The which
107-
* should be processed. \param[in] cleanup Calls mesh.cleanup () if true.
112+
* that have not been observed from enough directions.
113+
*
114+
* \param[in,out] mesh The which should be processed.
115+
* \param[in] cleanup Calls mesh.cleanup() if true.
108116
*/
109117
void
110118
removeUnfitVertices(const MeshPtr& mesh, const bool cleanup = true) const;
111119

112120
/** @{ */
113121
/** \brief Corresponding points are averaged out if their distance is below a distance
114122
* threshold. Else the points are added to the mesh as new vertices (Set in cm^2).
123+
*
115124
* \note Must be greater than zero.
116125
*/
117126
void
@@ -122,28 +131,34 @@ class PCL_EXPORTS Integration {
122131

123132
/** @{ */
124133
/** \brief Corresponding points are only averaged out if the angle between the normals
125-
* is smaller than an angle threshold. \note Must be between 0 and 180. Values outside
126-
* this range are clamped to the nearest valid value.
134+
* is smaller than an angle threshold.
135+
*
136+
* \note Must be between 0 and 180. Values outside this range are clamped to the
137+
* nearest valid value.
127138
*/
128139
void
129140
setMaxAngle(const float angle);
130141
float
131142
getMaxAngle() const;
132143
/** @} */
133144

134-
/** @{ */
145+
/** @{ */
135146
/** \brief Once a point reaches the maximum age it is decided if the point is removed
136-
* or kept in the mesh. \note Must be greater than zero.
147+
* or kept in the mesh.
148+
*
149+
* \note Must be greater than zero.
137150
*/
138151
void
139152
setMaxAge(const unsigned int age);
140153
unsigned int
141154
getMaxAge() const;
142155
/** @} */
143156

144-
/** @{ */
157+
/** @{ */
145158
/** \brief A point is removed if it has not been observed from a minimum number of
146-
* directions. \note Must be greater than zero.
159+
* directions.
160+
*
161+
* \note Must be greater than zero.
147162
*/
148163
void
149164
setMinDirections(const unsigned int directions);
@@ -217,18 +232,21 @@ class PCL_EXPORTS Integration {
217232
float max_squared_distance_;
218233

219234
/** \brief Maximum angle between normals below which points are averaged out. In
220-
* degrees. */
235+
* degrees.
236+
*/
221237
float max_angle_;
222238

223239
/** \brief Minimum weight above which points are added. */
224240
float min_weight_;
225241

226242
/** \brief Once a point reaches the maximum age it is decided if the point is removed
227-
* or kept in the mesh. */
243+
* or kept in the mesh.
244+
*/
228245
unsigned int max_age_;
229246

230247
/** \brief A point is removed if it has not been observed from a minimum number of
231-
* directions. */
248+
* directions.
249+
*/
232250
unsigned int min_directions_;
233251
};
234252
} // End namespace ihs

apps/in_hand_scanner/include/pcl/apps/in_hand_scanner/mesh_processing.h

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,10 @@
4545
namespace pcl {
4646
namespace ihs {
4747
/** \brief Contains methods that take advantage of the connectivity information in the
48-
* mesh. \author Martin Saelzle \ingroup apps
48+
* mesh.
49+
*
50+
* \author Martin Saelzle
51+
* \ingroup apps
4952
*/
5053
class MeshProcessing {
5154
public:
@@ -59,9 +62,11 @@ class MeshProcessing {
5962
MeshProcessing();
6063

6164
/** \brief Inserts triangles into jagged boundaries, removes isolated triangles and
62-
* closes triangular holes. \param[in,out] mesh The mesh which should be processed.
65+
* closes triangular holes.
66+
*
67+
* \param[in,out] mesh The mesh which should be processed.
6368
* \param[in] boundary_collection Collection of boundary half-edges.
64-
* \param[in] cleanup Calls mesh.cleanup () if true.
69+
* \param[in] cleanup Calls mesh.cleanup() if true.
6570
*/
6671
void
6772
processBoundary(Mesh& mesh,

0 commit comments

Comments
 (0)