Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
cosmetic changes
git-svn-id: http://svn.osgeo.org/qgis/trunk@13442 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef committed May 8, 2010
1 parent 062f329 commit 92e9c55
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 12 deletions.
18 changes: 9 additions & 9 deletions src/app/qgsmaptoolannotation.cpp
Expand Up @@ -25,7 +25,7 @@
#include <QDialog>
#include <QMouseEvent>

QgsMapToolAnnotation::QgsMapToolAnnotation( QgsMapCanvas* canvas ): QgsMapTool( canvas ), \
QgsMapToolAnnotation::QgsMapToolAnnotation( QgsMapCanvas* canvas ): QgsMapTool( canvas ),
mActiveItem( 0 ), mCurrentMoveAction( QgsAnnotationItem::NoAction ), mLastMousePosition( 0, 0 )
{
mCursor = QCursor( Qt::ArrowCursor );
Expand Down Expand Up @@ -158,26 +158,26 @@ void QgsMapToolAnnotation::canvasMoveEvent( QMouseEvent * e )
double xmax = xmin + size.width();
double ymax = ymin + size.height();

if ( mCurrentMoveAction == QgsAnnotationItem::ResizeFrameRight || \
mCurrentMoveAction == QgsAnnotationItem::ResizeFrameRightDown || \
if ( mCurrentMoveAction == QgsAnnotationItem::ResizeFrameRight ||
mCurrentMoveAction == QgsAnnotationItem::ResizeFrameRightDown ||
mCurrentMoveAction == QgsAnnotationItem::ResizeFrameRightUp )
{
xmax += e->posF().x() - mLastMousePosition.x();
}
if ( mCurrentMoveAction == QgsAnnotationItem::ResizeFrameLeft || \
mCurrentMoveAction == QgsAnnotationItem::ResizeFrameLeftDown || \
if ( mCurrentMoveAction == QgsAnnotationItem::ResizeFrameLeft ||
mCurrentMoveAction == QgsAnnotationItem::ResizeFrameLeftDown ||
mCurrentMoveAction == QgsAnnotationItem::ResizeFrameLeftUp )
{
xmin += e->posF().x() - mLastMousePosition.x();
}
if ( mCurrentMoveAction == QgsAnnotationItem::ResizeFrameUp || \
mCurrentMoveAction == QgsAnnotationItem::ResizeFrameLeftUp || \
if ( mCurrentMoveAction == QgsAnnotationItem::ResizeFrameUp ||
mCurrentMoveAction == QgsAnnotationItem::ResizeFrameLeftUp ||
mCurrentMoveAction == QgsAnnotationItem::ResizeFrameRightUp )
{
ymin += e->posF().y() - mLastMousePosition.y();
}
if ( mCurrentMoveAction == QgsAnnotationItem::ResizeFrameDown || \
mCurrentMoveAction == QgsAnnotationItem::ResizeFrameLeftDown || \
if ( mCurrentMoveAction == QgsAnnotationItem::ResizeFrameDown ||
mCurrentMoveAction == QgsAnnotationItem::ResizeFrameLeftDown ||
mCurrentMoveAction == QgsAnnotationItem::ResizeFrameRightDown )
{
ymax += e->posF().y() - mLastMousePosition.y();
Expand Down
4 changes: 2 additions & 2 deletions src/app/qgsmaptoolrotatepointsymbols.cpp
Expand Up @@ -24,8 +24,8 @@
#include <QMessageBox>
#include <QMouseEvent>

QgsMapToolRotatePointSymbols::QgsMapToolRotatePointSymbols( QgsMapCanvas* canvas ): QgsMapToolEdit( canvas ), \
mActiveLayer( 0 ), mFeatureNumber( 0 ), mCurrentMouseAzimut( 0.0 ), mCurrentRotationFeature( 0.0 ), \
QgsMapToolRotatePointSymbols::QgsMapToolRotatePointSymbols( QgsMapCanvas* canvas ): QgsMapToolEdit( canvas ),
mActiveLayer( 0 ), mFeatureNumber( 0 ), mCurrentMouseAzimut( 0.0 ), mCurrentRotationFeature( 0.0 ),
mRotating( false ), mRotationItem( 0 ), mCtrlPressed( false )
{

Expand Down
2 changes: 1 addition & 1 deletion src/app/qgsmaptoolsimplify.cpp
Expand Up @@ -166,7 +166,7 @@ bool QgsMapToolSimplify::calculateSliderBoudaries()
{
count++;
if ( count == 30 && !maximized )
{ //special case when tolerance is tool low to be correct so it's similat to 0
{ //special case when tolerance is too low to be correct so it's near 0
// else in some special cases this algorithm would create infinite loop
found = true;
minTolerance = 0;
Expand Down

0 comments on commit 92e9c55

Please sign in to comment.