1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
|
#include <array>
#include <map>
#include <gtest/gtest.h>
#include "model/Stroke.h"
#include "model/eraser/ErasableStroke.h"
#include "model/eraser/ErasableStrokeOverlapTree.h"
#include "model/eraser/PaddedBox.h"
#include "util/Rectangle.h"
#include "util/SmallVector.h"
using xoj::util::Rectangle;
void assertRangesEq(const Range& r1, const Range& r2) {
ASSERT_EQ(r1.minX, r2.minX);
ASSERT_EQ(r1.minY, r2.minY);
ASSERT_EQ(r1.maxX, r2.maxX);
ASSERT_EQ(r1.maxY, r2.maxY);
}
TEST(ErasableStroke, testOverlapTree) {
// clang format off
std::vector<Point> testPath = {{0, 0}, {2, 2}, {5, 2}, {7, 4}, {3, 6}, {2, 8},
{5, 11}, {7, 10}, {7, 6}, {6, 7}, {4, 4}, {1, 3}};
// clang format on
Stroke stroke;
std::vector<Point>& strokePoints = const_cast<std::vector<Point>&>(stroke.getPointVector());
strokePoints.swap(testPath);
stroke.setWidth(2);
stroke.setFill(-1);
stroke.setToolType(StrokeTool::PEN);
std::array<ErasableStroke::OverlapTree, 6> trees;
trees[0].populate({{0, 0.0}, {3, 0.5}}, stroke);
trees[1].populate({{2, 0.5}, {5, 1.0}}, stroke);
trees[2].populate({{0, 0.5}, {0, 0.75}}, stroke);
trees[3].populate({{5, 0.0}, {9, 0.0}}, stroke);
trees[4].populate({{7, 0.5}, {9, 1.0}}, stroke);
trees[5].populate({{8, 0.0}, {10, 1.0}}, stroke);
auto makeRange = [](double x1, double y1, double width, double height) {
Range r(x1, y1);
r.addPoint(x1 + width, y1 + height);
return r;
};
// clang format off
Range overlapBoxes[2][5] = {{
makeRange(4, 2, 4, 4), // 0 and 1
makeRange(0, 0, 2.5, 2.5), // 0 and 2
makeRange(5, 5, 3, 1), // 0 and 3
makeRange(4, 3, 4, 3), // 0 and 4
makeRange(0, 2, 8, 4) // 0 and 5
},
{
Range(0, 0), // unused
Range(-10000, -10000), // 1 and 2 don't overlap
makeRange(1, 5, 7, 7), // 1 and 3
makeRange(3, 3, 5, 5), // 1 and 4
makeRange(2, 3, 6, 5) // 1 and 5
}};
// clang format on
auto singlePointRangeAtCenter = [](Range range) {
return Range(0.5 * (range.minX + range.maxX), 0.5 * (range.minY + range.maxY));
};
for (size_t i = 0; i < 2; i++) {
for (size_t j = i; j < 5; j++) {
Range range = singlePointRangeAtCenter(overlapBoxes[i][j]);
trees[i].addOverlapsToRange(trees[j + 1], 1, range);
assertRangesEq(range, overlapBoxes[i][j]);
}
}
}
TEST(ErasableStroke, testGetStrokes) {
std::array<Stroke, 3> strokes;
// Normal stroke
strokes[0].addPoint({0, 0, 2});
strokes[0].addPoint({2, 2, 2.5});
strokes[0].addPoint({5, 2, 3});
strokes[0].addPoint({7, 4, 2.5});
strokes[0].addPoint({3, 6, 2});
strokes[0].addPoint({2, 8, 1.5});
strokes[0].addPoint({5, 11, 1});
strokes[0].addPoint({7, 10, 1.5});
strokes[0].addPoint({7, 6, 2});
strokes[0].addPoint({6, 7, 2.5});
strokes[0].addPoint({4, 4, 3});
strokes[0].addPoint({1, 3});
strokes[0].setWidth(3);
strokes[0].setFill(-1);
strokes[0].setToolType(StrokeTool::PEN);
// Closed stroke. Filled. Audio
strokes[1].addPoint({0, 0, 2});
strokes[1].addPoint({2, 2, 2.5});
strokes[1].addPoint({5, 2, 3});
strokes[1].addPoint({1, 4, 2.5});
strokes[1].addPoint({3, 6, 2});
strokes[1].addPoint({0, 0});
strokes[1].setWidth(3);
strokes[1].setFill(123);
strokes[1].setToolType(StrokeTool::PEN);
strokes[1].setAudioFilename("assets/bar.mp3");
// Closed stroke. Highlighter.
strokes[2].addPoint({0, 0, 2});
strokes[2].addPoint({2, 2, 2.5});
strokes[2].addPoint({5, 2, 3});
strokes[2].addPoint({1, 4, 2.5});
strokes[2].addPoint({3, 6, 2});
strokes[2].addPoint({0, 0});
strokes[2].setWidth(3);
strokes[2].setFill(-1);
strokes[2].setToolType(StrokeTool::HIGHLIGHTER);
std::array<ErasableStroke, 3> erasables = {ErasableStroke(strokes[0]), ErasableStroke(strokes[1]),
ErasableStroke(strokes[2])};
std::array<bool, 3> areClosed = {false, true, true};
std::array<IntersectionParametersContainer, 3> fakeIntersections;
fakeIntersections[0] = {{1U, 0.5}, {2U, 0.5}, {3U, 0.5}, {4U, 0.5}};
fakeIntersections[1] = {{1U, 0.5}, {2U, 0.5}, {3U, 0.5}, {4U, 0.5}};
fakeIntersections[2] = {{0U, 0.0}, {2U, 0.5}, {3U, 0.5}, {4U, 1.0}};
std::array<std::vector<std::vector<Point>>, 3> resultingPaths;
resultingPaths[0] = std::vector<std::vector<Point>>(3);
resultingPaths[0][0] = {{0, 0, 2}, {2, 2, 2.5}, {3.5, 2}};
resultingPaths[0][1] = {{6, 3, 3}, {7, 4, 2.5}, {5, 5}};
resultingPaths[0][2] = {{2.5, 7, 2}, {2, 8, 1.5}, {5, 11, 1}, {7, 10, 1.5},
{7, 6, 2}, {6, 7, 2.5}, {4, 4, 3}, {1, 3}};
resultingPaths[1] = std::vector<std::vector<Point>>(2);
resultingPaths[1][0] = {{1.5, 3, 2}, {0, 0, 2}, {2, 2, 2.5}, {3.5, 2}};
resultingPaths[1][1] = {{3, 3, 3}, {1, 4, 2.5}, {2, 5}};
resultingPaths[2] = std::vector<std::vector<Point>>(1);
resultingPaths[2][0] = {{3, 3, 3}, {1, 4, 2.5}, {2, 5}};
unsigned int i = 0;
for (auto& erasable: erasables) {
strokes[i].setErasable(&erasable);
Range range(0, 0);
erasable.beginErasure(fakeIntersections[i], range);
ASSERT_EQ(erasable.isClosedStroke(), areClosed[i]);
auto res = erasable.getStrokes();
ASSERT_EQ(res.size(), resultingPaths[i].size());
for (unsigned int j = 0; j < res.size(); ++j) {
ASSERT_EQ(res[j]->getWidth(), strokes[i].getWidth());
ASSERT_EQ(res[j]->getFill(), strokes[i].getFill());
ASSERT_EQ(res[j]->getToolType(), strokes[i].getToolType());
ASSERT_EQ(res[j]->getAudioFilename(), strokes[i].getAudioFilename());
const auto& pts1 = res[j]->getPointVector();
const auto& pts2 = resultingPaths[i][j];
ASSERT_EQ(pts1.size(), pts2.size());
for (unsigned int k = 0; k < pts1.size(); ++k) {
ASSERT_EQ(pts1[k].x, pts2[k].x);
ASSERT_EQ(pts1[k].y, pts2[k].y);
ASSERT_EQ(pts1[k].z, pts2[k].z);
}
}
++i;
}
}
TEST(ErasableStroke, testIntersectWithPaddedBox) {
Stroke stroke;
stroke.addPoint({0, 0, 2}); // 0
stroke.addPoint({2, 2, 2.5}); // 1
stroke.addPoint({5, 2, 3}); // 2
stroke.addPoint({7, 4, 2.5}); // 3
stroke.addPoint({3, 6, 2}); // 4
stroke.addPoint({2, 8, 1.5}); // 5
stroke.addPoint({5, 11, 1}); // 6
stroke.addPoint({7, 10, 1.5}); // 7
stroke.addPoint({7, 6, 2}); // 8
stroke.addPoint({6, 7, 2.5}); // 9
stroke.addPoint({4, 4, 3}); // 10
stroke.addPoint({1, 3}); // 11 = (10, 1.0)
stroke.setWidth(3);
stroke.setFill(-1);
stroke.setToolType(StrokeTool::PEN);
std::array<PaddedBox, 10> boxes;
std::array<IntersectionParametersContainer, 10> expectedResult;
// Start in padding. Pass by inner box. End in padding, not going toward inner box.
boxes[0] = {Point(1, 1), 0.5, 3};
expectedResult[0] = {{0, 0.0}, {1, 2.0 / 3.0}};
// Start on inner box boundary. Pass inside. End in padding, not going toward inner box.
boxes[1] = {Point(1, 1), 1, 3};
expectedResult[1] = {{0, 0.0}, {1, 2.0 / 3.0}};
// Start in padding. Pass by inner box. End in padding going toward inner box
boxes[2] = {Point(1, 1), 1.9, 3.5};
expectedResult[2] = {{0, 0.0}, {1, 5.0 / 6.0}, {9, 5.0 / 6.0}, {10, 1.0}};
// Start on padding boundary, pass by inner box
boxes[3] = {Point(1, 1), 0.5, 1};
expectedResult[3] = {{0, 0.0}, {0, 1.0}};
// Intersect padding, not inner box
boxes[4] = {Point(2, 11), 1, 2};
expectedResult[4] = {};
// Intersect padding and inner box
boxes[5] = {Point(2, 8), 1, 4};
expectedResult[5] = {{3, 0.25}, {6, 0.5}};
// Intersect inner box and end in padding boundary
boxes[6] = {Point(2.5, 3.5), 0.5, 2};
expectedResult[6] = {{9, 0.75}, {10, 1.0}};
boxes[7] = {Point(6, 6), 1.1, 2};
expectedResult[7] = {{2, 1.0}, {3, .75}, {7, 0.5}, {9, 1.0}};
boxes[8] = {Point(7, 7.5), 1, 1.5};
expectedResult[8] = {{7, .25}, {9, 0.25}};
boxes[9] = {Point(6, 8), 0.5, 1};
expectedResult[9] = {};
for (unsigned int i = 0; i < boxes.size(); ++i) {
auto res = stroke.intersectWithPaddedBox(boxes[i]);
printf("Test box %u: ", i);
for (auto p: res) { printf("(%zu, %4.2f) ", p.index, p.t); }
printf("\n");
EXPECT_EQ(res.size(), expectedResult[i].size());
for (unsigned int j = 0; j < std::min(res.size(), expectedResult[i].size()); ++j) {
printf(" Found (%zu, %4.2f) - expected (%zu, %4.2f)\n", res[j].index, res[j].t,
expectedResult[i][j].index, expectedResult[i][j].t);
EXPECT_EQ(res[j].index, expectedResult[i][j].index);
EXPECT_DOUBLE_EQ(res[j].t, expectedResult[i][j].t);
}
}
}
|
