Skip to content

Commit 4f367f5

Browse files
committed
doxygen fixes
1 parent 07165ea commit 4f367f5

File tree

3 files changed

+12
-5
lines changed

3 files changed

+12
-5
lines changed

src/core/pal/feature.cpp

+8-4
Original file line numberDiff line numberDiff line change
@@ -382,10 +382,12 @@ namespace pal
382382
//if (nbp==2)
383383
// beta = M_PI/2;
384384

385-
/*double distlabel = unit_convert( this->distlabel,
385+
#if 0
386+
double distlabel = unit_convert( this->distlabel,
386387
pal::PIXEL,
387388
layer->pal->map_unit,
388-
dpi, scale, delta_width );*/
389+
dpi, scale, delta_width );
390+
#endif
389391

390392
double lx, ly; /* label pos */
391393

@@ -529,10 +531,12 @@ namespace pal
529531
dpi, scale, delta_width );
530532

531533

532-
/*double distlabel = unit_convert( this->distlabel,
534+
#if 0
535+
double distlabel = unit_convert( this->distlabel,
533536
pal::PIXEL,
534537
layer->pal->map_unit,
535-
dpi, scale, delta_width );*/
538+
dpi, scale, delta_width );
539+
#endif
536540

537541

538542
double *d; // segments lengths distance bw pt[i] && pt[i+1]

src/core/pal/feature.h

+3
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,7 @@ namespace pal
173173
* \param y y coordinates of the point
174174
* \param scale map scale is 1:scale
175175
* \param lPos pointer to an array of candidates, will be filled by generated candidates
176+
* \param delta_width delta width
176177
* \param angle orientation of the label
177178
* \return the number of generated cadidates
178179
*/
@@ -189,6 +190,7 @@ namespace pal
189190
* \param scale map scale is 1:scale
190191
* \param lPos pointer to an array of candidates, will be filled by generated candidates
191192
* \param mapShape a pointer to the line
193+
* \param delta_width delta width
192194
* \return the number of generated cadidates
193195
*/
194196
int setPositionForLine( double scale, LabelPosition ***lPos, PointSet *mapShape, double delta_width );
@@ -207,6 +209,7 @@ namespace pal
207209
* \param scale map scale is 1:scale
208210
* \param lPos pointer to an array of candidates, will be filled by generated candidates
209211
* \param mapShape a pointer to the polygon
212+
* \param delta_width delta width
210213
* \return the number of generated cadidates
211214
*/
212215
int setPositionForPolygon( double scale, LabelPosition ***lPos, PointSet *mapShape, double delta_width );

src/gui/qgscolorswatchgrid.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ class GUI_EXPORT QgsColorSwatchGrid: public QWidget
131131
void draw( QPainter &painter );
132132

133133
/**Calculate swatch corresponding to a position within the widget
134-
* @param pos position
134+
* @param position position
135135
* @returns swatch number (starting at 0), or -1 if position is outside a swatch
136136
*/
137137
int swatchForPosition( const QPoint &position ) const;

0 commit comments

Comments
 (0)