Skip to content

Commit

Permalink
Simplify angle correction
Browse files Browse the repository at this point in the history
  • Loading branch information
jdugge committed Feb 20, 2019
1 parent 29a5bd9 commit 9d530e1
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions src/gui/qgsadvanceddigitizingcanvasitem.cpp
Expand Up @@ -128,20 +128,24 @@ void QgsAdvancedDigitizingCanvasItem::paint( QPainter *painter )
double a0, a;
if ( mAdvancedDigitizingDockWidget->constraintAngle()->relative() && nPoints > 2 )
{
a0 = std::atan2( -( prevPoint.y() - penulPoint.y() ), prevPoint.x() - penulPoint.x() ) + canvasRotationRad;
a0 = std::atan2( -( prevPoint.y() - penulPoint.y() ), prevPoint.x() - penulPoint.x() );
}
else
{
a0 = canvasRotationRad;
a0 = 0;
}
if ( mAdvancedDigitizingDockWidget->constraintAngle()->isLocked() )
{
a = a0 - mAdvancedDigitizingDockWidget->constraintAngle()->value() * M_PI / 180;
}
else
{
a = std::atan2( -( curPoint.y() - prevPoint.y() ), curPoint.x() - prevPoint.x() ) + canvasRotationRad;
a = std::atan2( -( curPoint.y() - prevPoint.y() ), curPoint.x() - prevPoint.x() );
}

a0 += canvasRotationRad;
a += canvasRotationRad;

painter->setPen( mConstruction2Pen );
painter->drawArc( QRectF( prevPointPix.x() - 20,
prevPointPix.y() - 20,
Expand Down

0 comments on commit 9d530e1

Please sign in to comment.