Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Polygon repair #7608

Merged
merged 188 commits into from
Mar 22, 2024
Merged
Changes from 1 commit
Commits
Show all changes
188 commits
Select commit Hold shift + click to select a range
98ae089
Add package 2D Polygon Repair
afabri May 17, 2023
1f92944
Merge remote-tracking branch 'cgal/master' into HEAD
sloriot May 24, 2023
3d0fc60
fix minimal doc
sloriot May 24, 2023
da558be
initial api proposal
kenohori Jun 7, 2023
5426708
defined rest of API based on meeting today
kenohori Jun 7, 2023
bd3cf86
skeleton with compiling code
kenohori Jun 14, 2023
a2ed96d
added insertion of odd-even constraints and creation from different p…
kenohori Jun 24, 2023
7c60fad
<<operator for Multipolygon_with_holes_2
kenohori Jul 5, 2023
b46e3e8
reconstruction of multipolygon using new face base with repair info
kenohori Jul 5, 2023
868dd54
sketch of new labelling method (untested)
kenohori Jul 6, 2023
173b91b
polygon reconstruction + fixed labelling method
kenohori Jul 12, 2023
aefce52
simplified labelling code + fixed bugs, corrected reconstruction of h…
kenohori Jul 14, 2023
3517005
drawing multipolygon with holes
kenohori Jul 14, 2023
b296459
interior face iterators
kenohori Jul 14, 2023
2f1f793
fixed simple version
kenohori Jul 15, 2023
e1319a9
mostly fixed documentation
kenohori Jul 19, 2023
0cc9b43
fix cmake target name
kenohori Jul 19, 2023
31ad1cb
added licence line
kenohori Jul 19, 2023
5998fc0
trimmed trailing whitespace
kenohori Jul 19, 2023
6d9579a
The word 'Polygon' is reserved by Microsoft
afabri Jul 20, 2023
46bd5dd
Add needed #include of base class
afabri Jul 20, 2023
24ca8b4
Add needed #includes
afabri Jul 20, 2023
879b7ea
Add WKT support for Multipolygon_with_holes
afabri Jul 20, 2023
12d420f
Fix Stream_support/dependencies
afabri Jul 20, 2023
6c85e54
Fix doc typos
afabri Jul 20, 2023
59d3b21
deterministic order from lexicographically smallest vertex, hole and …
kenohori Jul 21, 2023
65ea5a5
random colours for each drawn polygon
kenohori Jul 21, 2023
eeb441f
add Guillaume since he was the author of drawing of polygons with holes
kenohori Jul 21, 2023
5361499
using instead of typedefs
kenohori Jul 24, 2023
d79c53d
less instead of compare, reuse polygon less
kenohori Jul 24, 2023
59433d9
shorter definitions with using
kenohori Jul 25, 2023
0461ded
use wkt reader instead of manually constructed examples
kenohori Jul 25, 2023
8dea133
more examples
kenohori Jul 25, 2023
3df83bc
new code for hole nesting
kenohori Jul 25, 2023
842bd85
Testing using reference files
kenohori Jul 25, 2023
c0135ea
reorganise examples and tests
kenohori Jul 26, 2023
9a28bcb
resize for vectors
kenohori Jul 26, 2023
6286ef8
direct comparison to detect polygon/multipolygon
kenohori Jul 26, 2023
0ff6dcc
comments in American English + fix typo
kenohori Jul 26, 2023
db0cb2a
spread code a bit after }
kenohori Jul 26, 2023
53ae5f8
bugfixes, empty output works now
kenohori Jul 27, 2023
61fe1f4
more unit tests
kenohori Jul 27, 2023
4c3cbc8
unit tests with empty input (breaks wkt reader)
kenohori Jul 27, 2023
7fd3bad
easy check for empty polygons
kenohori Jul 28, 2023
49177f7
new nesting code + reconstruction fix
kenohori Jul 28, 2023
60a7ef6
ref output for nesting unit test
kenohori Jul 28, 2023
9d8309f
code to write labelled triangulation
kenohori Jul 28, 2023
cca727f
c++17
kenohori Jul 28, 2023
4fc0727
consistent polygon vs hole orientation -> no need for nesting
kenohori Jul 29, 2023
eeea56a
cleanup test files
kenohori Jul 29, 2023
372244c
more unit tests
kenohori Jul 29, 2023
1f98ff2
nesting spike reference file
kenohori Jul 29, 2023
cbed7ce
remove trailing whitespaces
sloriot Aug 1, 2023
d33a2b2
fix change of meaning errors
sloriot Aug 1, 2023
45dc0be
add missing dependencies
sloriot Aug 1, 2023
bc858b3
remove vertices in collinear segments
kenohori Aug 2, 2023
a290df2
spikes test
kenohori Aug 2, 2023
c559d6d
preprocessing to get unique edges
kenohori Aug 3, 2023
ffeeb58
trailing whitespaces
kenohori Aug 3, 2023
506d51f
code to repair and generate svgs from the clipart files
kenohori Aug 4, 2023
f1b2adb
start vertex search from face incident to last insertion
kenohori Aug 4, 2023
a688d1a
init bbox
kenohori Aug 4, 2023
26d2517
started with user manual
kenohori Aug 9, 2023
cab7deb
fix citation
kenohori Aug 9, 2023
ff1b359
more manual
kenohori Aug 11, 2023
88a4322
insert all vertices first, then all constrained edges
kenohori Aug 11, 2023
59f2cb0
renamed functions with repair method
kenohori Aug 11, 2023
0083250
simple multipolygon example
kenohori Aug 12, 2023
5a9e002
Update Polygon_repair_2/doc/Polygon_repair_2/Polygon_repair_2.txt
kenohori Aug 20, 2023
634fb06
Update Polygon_repair_2/doc/Polygon_repair_2/Polygon_repair_2.txt
kenohori Aug 20, 2023
4ef71dc
Update Polygon_repair_2/include/CGAL/Polygon_repair_2/Multipolygon_wi…
kenohori Aug 20, 2023
5ee8cda
draw multipolygon doc
kenohori Aug 20, 2023
58f80a2
Merge remote-tracking branch 'kenohori-cgal/gsoc2023-polygon_repair-k…
kenohori Aug 20, 2023
72c38e4
rest of draw_multipolygon example
kenohori Aug 21, 2023
6db7abb
put wkt directly in example
kenohori Aug 21, 2023
c20d01c
Merge branch 'CGAL:master' into gsoc2023-polygon_repair-kenohori
kenohori Aug 21, 2023
55d2fe8
c++17 from master
kenohori Aug 21, 2023
b9ffb31
clipart in test
kenohori Aug 21, 2023
96007f2
data for example
kenohori Aug 21, 2023
28cfa7e
step by step example
kenohori Aug 21, 2023
edfa190
more of the manual
kenohori Aug 22, 2023
f356259
more details about algorithm
kenohori Aug 23, 2023
6c703f7
Polygon_repair_2 -> Polygon_repair
sloriot Aug 24, 2023
1e77a29
add bibtex and fix cite
sloriot Aug 24, 2023
4613aa7
move multipolygon to polygon package
kenohori Aug 24, 2023
9bfe91f
missed draw function for multipolygons
kenohori Aug 24, 2023
3e1537d
move old examples to tests
kenohori Aug 24, 2023
9820595
doc with history and w/o triangulation, mp
kenohori Aug 24, 2023
5c4e48e
fix dependencies
kenohori Aug 24, 2023
8192774
info about multipolygons in polygon manual
kenohori Aug 25, 2023
9ae9f54
remove old figs
kenohori Aug 25, 2023
188188e
svg
kenohori Aug 25, 2023
f4c6021
in/out will be in table
kenohori Aug 25, 2023
ca3ad80
valid and invalid examples
kenohori Aug 25, 2023
fff924b
in/out examples
kenohori Aug 25, 2023
db09bc9
some performance info
kenohori Aug 29, 2023
4231565
detect kernel automatically
kenohori Aug 29, 2023
69a01c7
unique_edges should be in class, clear all variables
kenohori Aug 30, 2023
79edf30
explain counting
kenohori Aug 30, 2023
d174f6a
doc formatting
kenohori Aug 30, 2023
f2cb4ed
draft (multi)polygon validation
kenohori Aug 30, 2023
d5f0f77
missed a part
kenohori Aug 30, 2023
fdc5fa5
trim whitespace
kenohori Aug 30, 2023
6626b52
better approach reusing existing functions + testing more cases
kenohori Aug 30, 2023
448e611
images for doc
kenohori Aug 30, 2023
1b4ce1c
put is_valid outside, bugfixes
kenohori Aug 31, 2023
bc16dda
label region static, bugfixes
kenohori Aug 31, 2023
e331136
polygons can be in any hole, not just exterior
kenohori Aug 31, 2023
2ab6ad8
some more checks
kenohori Aug 31, 2023
c402ba7
wkt validation
kenohori Aug 31, 2023
dc3e195
test for clipart files
kenohori Sep 1, 2023
e9fc58b
get rid of hashes for exact kernels
kenohori Sep 2, 2023
3386efd
test showing exact kernel
kenohori Sep 2, 2023
a5cea61
exact_test needs qt too
kenohori Sep 2, 2023
fbf3e08
test_clipart not needed
kenohori Sep 2, 2023
091511b
test clipart files directly instead
kenohori Sep 2, 2023
23c4e10
remove default kernel
kenohori Sep 2, 2023
0cf0131
update dependencies
kenohori Sep 4, 2023
31ca1f1
package details
kenohori Sep 6, 2023
015e2ba
repair is odd-even
kenohori Sep 6, 2023
12d3505
remove undocumented classes
kenohori Sep 6, 2023
e06422a
logo draft
kenohori Sep 6, 2023
35d56ae
todo for exact kernels
kenohori Sep 6, 2023
6a20390
svg logo for the future
kenohori Sep 6, 2023
d954161
capitalisation
kenohori Sep 6, 2023
c1e1e72
narrower figure
kenohori Sep 6, 2023
6c9bc49
triangulation should be passed by reference
kenohori Sep 7, 2023
467dcf9
Merge remote-tracking branch 'cgal/master' into HEAD
sloriot Oct 6, 2023
52e9196
use new macros
sloriot Oct 6, 2023
be2ccc2
typo
afabri Oct 6, 2023
1416ddf
No <b>
afabri Oct 6, 2023
455c632
labelled -> labeled
afabri Oct 6, 2023
4f9dd85
PolygonContainer -> Container
afabri Oct 6, 2023
55c5645
Move code to internal folder/namespace
afabri Oct 6, 2023
2f9535d
no concepts, export->insert in a stream, capitalize
afabri Oct 6, 2023
be6fa67
120x120 logo
kenohori Oct 11, 2023
cc04b10
remove non-author of one file
afabri Oct 17, 2023
9f5a217
fix ingroup
afabri Oct 17, 2023
4b9544d
Fix doc of the parameters of the multipolygon
afabri Oct 17, 2023
1fb664a
Document Size
afabri Oct 17, 2023
f06f102
holes -> polygons
afabri Oct 17, 2023
950ed67
remove sentence about ability to store
afabri Oct 17, 2023
d760c40
Be precise
afabri Oct 17, 2023
6d51db7
Change filename
afabri Oct 17, 2023
f1c14d5
fix example
afabri Oct 17, 2023
7ed78a0
mark holes with red edges
kenohori Oct 25, 2023
04264b5
Add non const iterator in the doc
afabri Nov 16, 2023
43bf7ed
no concepts in this package
afabri Jan 4, 2024
ef67654
Ken did more than prototyping
afabri Jan 4, 2024
d1f19a7
Add to CHANGES.md
afabri Jan 4, 2024
c3d4d11
Merge remote-tracking branch 'cgal/master' into gsoc2023-polygon_repa…
afabri Jan 5, 2024
be89ad2
Qt5 -> Qt6
afabri Jan 5, 2024
6edfffe
update doc to qt6
sloriot Jan 5, 2024
c5a186b
Add Even_odd_rule
afabri Jan 18, 2024
e890992
Fix clipart.cpp
afabri Jan 18, 2024
ef8d274
Document the rule
afabri Jan 18, 2024
1d8b017
Fix package description
afabri Jan 18, 2024
db6f210
Fix one input path
afabri Jan 18, 2024
c21a988
Add the file
afabri Jan 18, 2024
a0ad182
Fixes after Guillaume's review
afabri Feb 6, 2024
458c52e
Fixes after Guillaume's review
afabri Feb 6, 2024
edc721e
wording
afabri Feb 6, 2024
653bc36
wording
afabri Feb 6, 2024
5e01914
C++ comment doxygen command
afabri Feb 6, 2024
1c31cfd
Fix path
afabri Feb 7, 2024
5333c6f
#define CGAL_NO_CDT_2_WARNING
afabri Feb 7, 2024
aa6ff65
Change #include order to check dependencies
afabri Feb 7, 2024
8007536
Only compile some of the test cases so that we can have it in a tests…
afabri Feb 7, 2024
38c43ce
Fix multipolygon.cpp
afabri Feb 23, 2024
25b084e
Fix operator<< for Multipolygon_with_holes
afabri Feb 23, 2024
2324d61
Rename header file
afabri Mar 4, 2024
263db4f
Merge master
afabri Mar 4, 2024
b0f4e73
Make the Even_odd_rule a default
afabri Mar 4, 2024
7edadee
fix code
afabri Mar 4, 2024
181cec6
conversion warning
afabri Mar 5, 2024
b13b01a
Remove argc, argv
afabri Mar 6, 2024
b9f3e35
Address warning and assert the Rule type
afabri Mar 6, 2024
5e3cf43
flush
afabri Mar 8, 2024
6744cc1
Add operator==() for Multipolygon_wih_holes
afabri Mar 11, 2024
cf0c917
fix unused variables
afabri Mar 12, 2024
a3fab59
fix unused variables
afabri Mar 12, 2024
511cc50
Do not compare strings, and do a write/read back in order to round
afabri Mar 12, 2024
79ec446
Add #includes
afabri Mar 13, 2024
b0ac1d1
Move files from test to benchmark
afabri Mar 13, 2024
fcbf327
workaround absence of <filesystem>
sloriot Mar 13, 2024
5331c7e
move after definition of function used
sloriot Mar 13, 2024
151b343
readd figs
sloriot Mar 21, 2024
30c303f
Update CHANGES.md
lrineau Mar 21, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
move after definition of function used
sloriot committed Mar 13, 2024
commit 5331c7e7443e071d9cd0e3d00d84741d0b990c57
14 changes: 7 additions & 7 deletions Stream_support/include/CGAL/IO/WKT.h
Original file line number Diff line number Diff line change
@@ -355,13 +355,6 @@ bool read_multi_polygon_WKT(std::istream& in,
}


template<typename Kernel, typename Container>
std::ostream& write_multi_polygon_WKT(std::ostream& out,
Multipolygon_with_holes_2<Kernel,Container>& mp)
{
return write_multi_polygon_WKT(out, mp.polygons_with_holes());
}

//! \ingroup PkgStreamSupportIoFuncsWKT
//!
//! \brief writes `point` into a WKT stream.
@@ -465,6 +458,13 @@ std::ostream& write_multi_polygon_WKT(std::ostream& out,
return out;
}

template<typename Kernel, typename Container>
std::ostream& write_multi_polygon_WKT(std::ostream& out,
Multipolygon_with_holes_2<Kernel,Container>& mp)
{
return write_multi_polygon_WKT(out, mp.polygons_with_holes());
}

//! \ingroup PkgStreamSupportIoFuncsWKT
//!
//! \brief writes the content of `mls` into a WKT stream.