Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
OpenBoard
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lifo
Nicolas Ollinger
OpenBoard
Commits
1ef73a70
Commit
1ef73a70
authored
Apr 05, 2016
by
Craig Watson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Strokes: corrected tracking of last received point
parent
4811d350
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
3 deletions
+6
-3
UBGraphicsStroke.cpp
src/domain/UBGraphicsStroke.cpp
+4
-3
UBGraphicsStroke.h
src/domain/UBGraphicsStroke.h
+2
-0
No files found.
src/domain/UBGraphicsStroke.cpp
View file @
1ef73a70
...
...
@@ -71,6 +71,7 @@ QList<QPointF> UBGraphicsStroke::addPoint(const QPointF& point, UBInterpolator::
int
n
=
mDrawnPoints
.
size
();
if
(
interpolationMethod
==
UBInterpolator
::
NoInterpolation
||
n
==
0
)
{
mLastReceivedPoint
=
point
;
mDrawnPoints
<<
point
;
mAllPoints
<<
point
;
return
QList
<
QPointF
>
()
<<
point
;
...
...
@@ -80,8 +81,7 @@ QList<QPointF> UBGraphicsStroke::addPoint(const QPointF& point, UBInterpolator::
// This is a bit special, as 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.
qreal
MIN_DISTANCE
=
3
;
// TODO: make this dependant on zoom
QPointF
lastPoint
=
mDrawnPoints
.
last
();
qreal
distance
=
QLineF
(
lastPoint
,
point
).
length
();
qreal
distance
=
QLineF
(
mLastReceivedPoint
,
point
).
length
();
//qDebug() << "distance: " << distance;
...
...
@@ -89,7 +89,7 @@ QList<QPointF> UBGraphicsStroke::addPoint(const QPointF& point, UBInterpolator::
// look smoother (e.g shaking slightly won't affect the curve).
if
(
distance
<
MIN_DISTANCE
)
{
// we still keep track of that point to calculate the distance correctly next time around
m
DrawnPoints
<<
point
;
m
LastReceivedPoint
=
point
;
return
QList
<
QPointF
>
();
}
...
...
@@ -101,6 +101,7 @@ QList<QPointF> UBGraphicsStroke::addPoint(const QPointF& point, UBInterpolator::
return
QList
<
QPointF
>
()
<<
((
lastPoint
+
point
)
/
2.0
);
}
QPointF
p0
=
mDrawnPoints
[
mDrawnPoints
.
size
()
-
2
];
QPointF
p1
=
mDrawnPoints
[
mDrawnPoints
.
size
()
-
1
];
QPointF
p2
=
point
;
...
...
src/domain/UBGraphicsStroke.h
View file @
1ef73a70
...
...
@@ -76,6 +76,8 @@ class UBGraphicsStroke
/// All the points (including interpolated) that are used to draw the stroke
QList
<
QPointF
>
mAllPoints
;
QPointF
mLastReceivedPoint
;
};
#endif
/* UBGRAPHICSSTROKE_H_ */
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment