@ -34,9 +34,15 @@
# include "board/UBBoardController.h" # include "board/UBBoardController.h"
# include "core/UBApplication.h" # include "core/UBApplication.h"
# include "core/memcheck.h" # include "core/memcheck.h"
# include "domain/UBGraphicsScene.h"
# include "frameworks/UBGeometryUtils.h"
UBGraphicsStroke : : UBGraphicsStroke ( )
typedef QPair < QPointF , qreal > strokePoint ;
UBGraphicsStroke : : UBGraphicsStroke ( UBGraphicsScene * scene )
: mScene ( scene )
{ {
mAntiScaleRatio = 1. / ( UBApplication : : boardController - > systemScaleFactor ( ) * UBApplication : : boardController - > currentZoom ( ) ) ; mAntiScaleRatio = 1. / ( UBApplication : : boardController - > systemScaleFactor ( ) * UBApplication : : boardController - > currentZoom ( ) ) ;
} }
@ -44,7 +50,10 @@ UBGraphicsStroke::UBGraphicsStroke()
UBGraphicsStroke : : ~ UBGraphicsStroke ( ) UBGraphicsStroke : : ~ UBGraphicsStroke ( )
{ {
// NOOP
foreach ( UBGraphicsPolygonItem * poly , mPolygons )
poly - > setStroke ( NULL ) ;
mPolygons . clear ( ) ;
} }
@ -70,47 +79,51 @@ QList<UBGraphicsPolygonItem*> UBGraphicsStroke::polygons() const
* @ brief Add a point to the curve , interpolating extra points if required * @ brief Add a point to the curve , interpolating extra points if required
* @ return The points ( or point , if none were interpolated ) that were added * @ return The points ( or point , if none were interpolated ) that were added
*/ */
QList < QPointF > UBGraphicsStroke : : addPoint ( const QPointF & point , UBInterpolator : : InterpolationMethod interpolationMethod ) QList < QPair < QP ointF , qreal > > UBGraphicsStroke : : addPoint ( const QPointF & point , qreal width , UBInterpolator : : InterpolationMethod interpolationMethod )
{ {
strokePoint newPoint ( point , width ) ;
int n = mReceivedPoints . size ( ) ; int n = mReceivedPoints . size ( ) ;
if ( n = = 0 ) { if ( n = = 0 ) {
mReceivedPoints < < p oint; mReceivedPoints < < newP oint;
mDrawnPoints < < p oint; mDrawnPoints < < newP oint;
return QList < QPointF > ( ) ; return QList < strokePoint > ( ) ;
} }
if ( interpolationMethod = = UBInterpolator : : NoInterpolation ) { if ( interpolationMethod = = UBInterpolator : : NoInterpolation ) {
QPointF lastPoint = mReceivedPoints . last ( ) ; strokePoint lastPoint = mReceivedPoints . last ( ) ;
mReceivedPoints < < p oint; mReceivedPoints < < newP oint;
mDrawnPoints < < p oint; mDrawnPoints < < newP oint;
return QList < QPointF > ( ) < < lastPoint < < p oint; return QList < strokePoint > ( ) < < lastPoint < < newP oint;
} }
else if ( interpolationMethod = = UBInterpolator : : Bezier ) { else if ( interpolationMethod = = UBInterpolator : : Bezier ) {
// This is a bit special, as th e curve we are interpolating is not between two drawn points;
// The curve we are interpolating is not between two drawn points;
// it is between the midway points of the second-to-last and last point, and last and current point.
// it is between the midway points of the second-to-last and last point, and last and current point.
// Don't draw segments smaller than a certain length. This can help with performance
// Don't draw segments smaller than a certain length. This can help with performance
// (less polygons in a stroke ) but mostly with keeping the curve smooth.
// (less polygons to draw ) but mostly with keeping the curve smooth.
qreal MIN_DISTANCE = 5 * mAntiScaleRatio ; qreal MIN_DISTANCE = 3 * mAntiScaleRatio ;
qreal distance = QLineF ( mReceivedPoints . last ( ) , poin t) . length ( ) ; qreal distance = QLineF ( mReceivedPoints . last ( ) . first , newPoint . firs t) . length ( ) ;
if ( distance < MIN_DISTANCE ) { if ( distance < MIN_DISTANCE ) {
return QList < QPointF > ( ) < < mDrawnPoints . last ( ) ; return QList < strokePoint > ( ) < < mDrawnPoints . last ( ) ;
} }
// The first segment is just a straight line to the first midway point
// The first segment is just a straight line to the first midway point
if ( n = = 1 ) { if ( n = = 1 ) {
QPointF lastPoint = mReceivedPoints [ 0 ] ; QPointF lastPoint = mReceivedPoints [ 0 ] . first ;
mReceivedPoints < < point ; qreal lastWidth = mReceivedPoints [ 0 ] . second ;
mDrawnPoints < < QPointF ( ( lastPoint + point ) / 2.0 ) ; strokePoint p ( ( ( lastPoint + point ) / 2.0 ) , ( lastWidth + width ) / 2.0 ) ;
mReceivedPoints < < newPoint ;
mDrawnPoints < < p ;
return QList < QPointF > ( ) < < lastPoint < < ( ( lastPoint + point ) / 2.0 ) ; return QList < strokePoint > ( ) < < mReceivedPoints [ 0 ] < < p ;
} }
QPointF p0 = mReceivedPoints [ mReceivedPoints . size ( ) - 2 ] ; QPointF p0 = mReceivedPoints [ mReceivedPoints . size ( ) - 2 ] . first ;
QPointF p1 = mReceivedPoints [ mReceivedPoints . size ( ) - 1 ] ; QPointF p1 = mReceivedPoints [ mReceivedPoints . size ( ) - 1 ] . first ;
QPointF p2 = point ; QPointF p2 = point ;
UBQuadraticBezier bz ; UBQuadraticBezier bz ;
@ -120,21 +133,28 @@ QList<QPointF> UBGraphicsStroke::addPoint(const QPointF& point, UBInterpolator::
bz . setPoints ( startPoint , p1 , endPoint ) ; bz . setPoints ( startPoint , p1 , endPoint ) ;
QList < QPointF > newPoints = bz . getPoints ( 10 ) ; QList < QPointF > calculated = bz . getPoints ( 10 ) ;
QList < strokePoint > newPoints ;
qreal startWidth = mDrawnPoints . last ( ) . second ;
for ( int i ( 0 ) ; i < calculated . size ( ) ; + + i ) {
qreal w = startWidth + ( qreal ( i ) / qreal ( calculated . size ( ) - 1 ) ) * ( width - startWidth ) ;
newPoints < < strokePoint ( calculated [ i ] , w ) ;
}
// avoid adding duplicates
// avoid adding duplicates
if ( newPoints . first ( ) = = mDrawnPoints . last ( ) ) if ( newPoints . first ( ) . first = = mDrawnPoints . last ( ) . first )
mDrawnPoints . removeLast ( ) ; mDrawnPoints . removeLast ( ) ;
foreach ( QPointF p , newPoints ) { foreach ( strokePoint p , newPoints )
mDrawnPoints < < p ; mDrawnPoints < < p ;
}
mReceivedPoints < < point ; mReceivedPoints < < strokePoint ( point , width ) ;
return newPoints ; return newPoints ;
} }
return QList < QPointF > ( ) ; return QList < strokePoint > ( ) ;
} }
bool UBGraphicsStroke : : hasPressure ( ) bool UBGraphicsStroke : : hasPressure ( )
@ -179,3 +199,124 @@ void UBGraphicsStroke::clear()
mPolygons . clear ( ) ; mPolygons . clear ( ) ;
} }
} }
/**
* @ brief Return a simplified version of the stroke , with less points and polygons .
*
*/
UBGraphicsStroke * UBGraphicsStroke : : simplify ( )
{
if ( mDrawnPoints . size ( ) < 3 )
return NULL ;
UBGraphicsStroke * newStroke = new UBGraphicsStroke ( ) ;
newStroke - > mDrawnPoints = QList < strokePoint > ( mDrawnPoints ) ;
QList < strokePoint > & points = newStroke - > mDrawnPoints ;
qDebug ( ) < < " Simplifying. Before: " < < points . size ( ) < < " points and " < < polygons ( ) . size ( ) < < " polygons " ;
/* Basic simplifying algorithm: consider A, B and C the current point and the two following ones.
* If the angle between ( AB ) and ( BC ) is lower than a certain threshold ,
* the three points are considered to be aligned and the middle one ( B ) is removed .
*
* We then consider the two following points as the new B and C while keeping the same A , and
* test these three points . As long as they are aligned , B is erased and we start over .
* If not , the current B becomes the new A , and so on .
*
*
* TODO : more advanced algorithm that could also simplify curved sections of the stroke
*/
// angle difference in degrees between AB and BC below which the segments are considered colinear
qreal threshold = UBSettings : : settings ( ) - > boardSimplifyPenStrokesThresholdAngle - > get ( ) . toReal ( ) ;
QList < strokePoint > : : iterator it = points . begin ( ) ;
QList < QList < strokePoint > : : iterator > toDelete ;
while ( it + 2 ! = points . end ( ) ) {
QList < strokePoint > : : iterator b_it ( it + 1 ) ;
while ( b_it + 1 ! = points . end ( ) ) {
qreal angle = qFabs ( QLineF ( it - > first , b_it - > first ) . angle ( ) - QLineF ( b_it - > first , ( b_it + 1 ) - > first ) . angle ( ) ) ;
if ( angle < threshold )
b_it = points . erase ( b_it ) ;
else
break ;
}
if ( b_it + 1 = = points . end ( ) )
break ;
else
it = b_it ;
}
// Next, we iterate over the new points to build the polygons that make up the stroke
QList < UBGraphicsPolygonItem * > newPolygons ;
QList < strokePoint > newStrokePoints ;
int i ( 0 ) ;
while ( i < points . size ( ) ) {
bool drawCurve = false ;
newStrokePoints < < points [ i ] ;
// When a polygon is transparent and it overlaps with itself, it is *sometimes* filled incorrectly.
// Limiting the size of the polygons, and creating new ones when the angle between consecutive points is above a
// certain threshold helps mitigate this issue.
// TODO: fix fill issue
if ( newStrokePoints . size ( ) > 1 & & i < points . size ( ) - 1 ) {
qreal angle = qFabs ( UBGeometryUtils : : angle ( points [ i - 1 ] . first , points [ i ] . first , points [ i + 1 ] . first ) ) ;
qDebug ( ) < < " Angle: " < < angle ;
if ( angle > 40 & & angle < 320 )
drawCurve = true ;
}
if ( newStrokePoints . size ( ) % 20 = = 0 )
drawCurve = true ;
if ( drawCurve ) {
UBGraphicsPolygonItem * poly = mScene - > polygonToPolygonItem ( UBGeometryUtils : : curveToPolygon ( newStrokePoints , true , true ) ) ;
//poly->setColor(QColor(rand()%256, rand()%256, rand()%256, poly->brush().color().alpha()));
// Subtract overlapping polygons if the stroke is translucent
if ( ! poly - > brush ( ) . isOpaque ( ) ) {
foreach ( UBGraphicsPolygonItem * prev , newPolygons )
poly - > subtract ( prev ) ;
}
newPolygons < < poly ;
newStrokePoints . clear ( ) ;
- - i ;
}
+ + i ;
}
if ( newStrokePoints . size ( ) > 0 ) {
UBGraphicsPolygonItem * poly = mScene - > polygonToPolygonItem ( UBGeometryUtils : : curveToPolygon ( newStrokePoints , true , true ) ) ;
if ( ! poly - > brush ( ) . isOpaque ( ) ) {
foreach ( UBGraphicsPolygonItem * prev , newPolygons )
poly - > subtract ( prev ) ;
}
newPolygons < < poly ;
}
newStroke - > mPolygons = QList < UBGraphicsPolygonItem * > ( newPolygons ) ;
foreach ( UBGraphicsPolygonItem * poly , newStroke - > mPolygons ) {
poly - > setFillRule ( Qt : : WindingFill ) ;
poly - > setStroke ( newStroke ) ;
}
qDebug ( ) < < " After: " < < points . size ( ) < < " points and " < < newStroke - > polygons ( ) . size ( ) < < " polygons " ;
return newStroke ;
}
Craig Watson
8 years ago