Rotate values to integer degrees in rotate tool

mhugent · mhugent · commit 2ac4ab74caa9 · 2009-09-19T12:16:10.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@11679 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/app/qgsmaptoolrotatepointsymbols.cpp b/src/app/qgsmaptoolrotatepointsymbols.cpp
@@ -128,7 +128,7 @@ void QgsMapToolRotatePointSymbols::canvasPressEvent( QMouseEvent * e )
     mRotationItem->setPointLocation( snapResults.at( 0 ).snappedVertex );
   }
   mCurrentMouseAzimut = calculateAzimut( e->pos() );
-  setPixmapItemRotation( mCurrentMouseAzimut );
+  setPixmapItemRotation( (int)(mCurrentMouseAzimut) );
   mRotating = true;
 }
 
@@ -161,7 +161,7 @@ void QgsMapToolRotatePointSymbols::canvasMoveEvent( QMouseEvent * e )
   {
     mCurrentMouseAzimut -= 360;
   }
-  setPixmapItemRotation( mCurrentRotationFeature );
+  setPixmapItemRotation( (int)(mCurrentRotationFeature) );
 }
 
 void QgsMapToolRotatePointSymbols::canvasReleaseEvent( QMouseEvent * e )
@@ -175,7 +175,7 @@ void QgsMapToolRotatePointSymbols::canvasReleaseEvent( QMouseEvent * e )
     QList<int>::const_iterator it = mCurrentRotationAttributes.constBegin();
     for ( ; it != mCurrentRotationAttributes.constEnd(); ++it )
     {
-      if ( !mActiveLayer->changeAttributeValue( mFeatureNumber, *it, mCurrentRotationFeature, true ) )
+      if ( !mActiveLayer->changeAttributeValue( mFeatureNumber, *it, (int)(mCurrentRotationFeature), true ) )
       {
         rotateSuccess = false;
       }
diff --git a/src/app/qgspointrotationitem.cpp b/src/app/qgspointrotationitem.cpp
@@ -69,7 +69,7 @@ void QgsPointRotationItem::paint( QPainter * painter )
   QFontMetricsF fm( mFont );
   painter->fillRect( mPixmap.width(), 0, mItemSize.width() - mPixmap.width(), mItemSize.height(), QColor( Qt::white ) );
   painter->setFont( mFont );
-  painter->drawText( mPixmap.width(), mPixmap.height() / 2.0 + fm.height() / 2.0, QString::number( mRotation, 'f', 2 ) );
+  painter->drawText( mPixmap.width(), mPixmap.height() / 2.0 + fm.height() / 2.0, QString::number( mRotation) );
 }
 
 void QgsPointRotationItem::setPointLocation( const QgsPoint& p )
@@ -82,7 +82,7 @@ void QgsPointRotationItem::setSymbol( const QString& symbolPath )
 {
   mPixmap = QPixmap( symbolPath );
   QFontMetricsF fm( mFont );
-  mItemSize.setWidth( mPixmap.width() + fm.width( "360.99" ) );
+  mItemSize.setWidth( mPixmap.width() + fm.width( "360" ) );
   double pixmapHeight = mPixmap.height();
   double fontHeight = fm.height();
   if ( pixmapHeight >= fontHeight )
diff --git a/src/app/qgspointrotationitem.h b/src/app/qgspointrotationitem.h
@@ -34,7 +34,7 @@ class QgsPointRotationItem: public QgsMapCanvasItem
 
     /**Sets the rotation of the symbol and displays the new rotation number. \
     Units are degrees, starting from north direction, clockwise direction*/
-    void setSymbolRotation( double r ) {mRotation = r;}
+    void setSymbolRotation( int r ) {mRotation = r;}
 
     /**Sets a symbol from image file*/
     void setSymbol( const QString& symbolPath );
@@ -45,7 +45,7 @@ class QgsPointRotationItem: public QgsMapCanvasItem
     QFont mFont;
     /**Symboll pixmap*/
     QPixmap mPixmap;
-    double mRotation;
+    int mRotation;
 };
 
 #endif // QGSPOINTROTATIONITEM_H

Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ void QgsMapToolRotatePointSymbols::canvasPressEvent( QMouseEvent * e )`
`128`	`128`	`mRotationItem->setPointLocation( snapResults.at( 0 ).snappedVertex );`
`129`	`129`	`}`
`130`	`130`	`mCurrentMouseAzimut = calculateAzimut( e->pos() );`
`131`		`- setPixmapItemRotation( mCurrentMouseAzimut );`
	`131`	`+ setPixmapItemRotation( (int)(mCurrentMouseAzimut) );`
`132`	`132`	`mRotating = true;`
`133`	`133`	`}`
`134`	`134`
`@@ -161,7 +161,7 @@ void QgsMapToolRotatePointSymbols::canvasMoveEvent( QMouseEvent * e )`
`161`	`161`	`{`
`162`	`162`	`mCurrentMouseAzimut -= 360;`
`163`	`163`	`}`
`164`		`- setPixmapItemRotation( mCurrentRotationFeature );`
	`164`	`+ setPixmapItemRotation( (int)(mCurrentRotationFeature) );`
`165`	`165`	`}`
`166`	`166`
`167`	`167`	`void QgsMapToolRotatePointSymbols::canvasReleaseEvent( QMouseEvent * e )`
`@@ -175,7 +175,7 @@ void QgsMapToolRotatePointSymbols::canvasReleaseEvent( QMouseEvent * e )`
`175`	`175`	`QList<int>::const_iterator it = mCurrentRotationAttributes.constBegin();`
`176`	`176`	`for ( ; it != mCurrentRotationAttributes.constEnd(); ++it )`
`177`	`177`	`{`
`178`		`- if ( !mActiveLayer->changeAttributeValue( mFeatureNumber, *it, mCurrentRotationFeature, true ) )`
	`178`	`+ if ( !mActiveLayer->changeAttributeValue( mFeatureNumber, *it, (int)(mCurrentRotationFeature), true ) )`
`179`	`179`	`{`
`180`	`180`	`rotateSuccess = false;`
`181`	`181`	`}`