Skip to content

Commit

Permalink
doxygen fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
jef-n committed Aug 17, 2014
1 parent 07165ea commit 4f367f5
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 5 deletions.
12 changes: 8 additions & 4 deletions src/core/pal/feature.cpp
Expand Up @@ -382,10 +382,12 @@ namespace pal
//if (nbp==2)
// beta = M_PI/2;

/*double distlabel = unit_convert( this->distlabel,
#if 0
double distlabel = unit_convert( this->distlabel,
pal::PIXEL,
layer->pal->map_unit,
dpi, scale, delta_width );*/
dpi, scale, delta_width );
#endif

double lx, ly; /* label pos */

Expand Down Expand Up @@ -529,10 +531,12 @@ namespace pal
dpi, scale, delta_width );


/*double distlabel = unit_convert( this->distlabel,
#if 0
double distlabel = unit_convert( this->distlabel,
pal::PIXEL,
layer->pal->map_unit,
dpi, scale, delta_width );*/
dpi, scale, delta_width );
#endif


double *d; // segments lengths distance bw pt[i] && pt[i+1]
Expand Down
3 changes: 3 additions & 0 deletions src/core/pal/feature.h
Expand Up @@ -173,6 +173,7 @@ namespace pal
* \param y y coordinates of the point
* \param scale map scale is 1:scale
* \param lPos pointer to an array of candidates, will be filled by generated candidates
* \param delta_width delta width
* \param angle orientation of the label
* \return the number of generated cadidates
*/
Expand All @@ -189,6 +190,7 @@ namespace pal
* \param scale map scale is 1:scale
* \param lPos pointer to an array of candidates, will be filled by generated candidates
* \param mapShape a pointer to the line
* \param delta_width delta width
* \return the number of generated cadidates
*/
int setPositionForLine( double scale, LabelPosition ***lPos, PointSet *mapShape, double delta_width );
Expand All @@ -207,6 +209,7 @@ namespace pal
* \param scale map scale is 1:scale
* \param lPos pointer to an array of candidates, will be filled by generated candidates
* \param mapShape a pointer to the polygon
* \param delta_width delta width
* \return the number of generated cadidates
*/
int setPositionForPolygon( double scale, LabelPosition ***lPos, PointSet *mapShape, double delta_width );
Expand Down
2 changes: 1 addition & 1 deletion src/gui/qgscolorswatchgrid.h
Expand Up @@ -131,7 +131,7 @@ class GUI_EXPORT QgsColorSwatchGrid: public QWidget
void draw( QPainter &painter );

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

0 comments on commit 4f367f5

Please sign in to comment.