Laurent Rineau
f1e1878b8d
Merge pull request #7094 from afabri/PMP_named_parameters-GF
...
PMP: Replace parameter with named parameter
2022-12-16 10:52:17 +01:00
Laurent Rineau
ae3ae6e8d6
Merge pull request #7083 from afabri/Demo-readBMP-GF
...
3d Demo: Try to read bmp files
2022-12-14 10:39:53 +01:00
Laurent Rineau
8497dcda55
Merge pull request #7109 from afabri/Three-fix_for_no_deprecated-GF
...
Three, and Polyhedron Demo: Add an #include and remove deprecated code
2022-12-14 10:39:42 +01:00
Andreas Fabri
0ac2d8ec0f
Remove the parameters which have become nps
2022-12-09 07:37:03 +00:00
Andreas Fabri
39ebebdb5b
merge master
2022-12-08 16:49:09 +00:00
Sebastien Loriot
f5c41bd712
Merge pull request #7022 from MaelRL/Weights-v2.0-GF-master
...
Weights fixes (master)
2022-12-08 15:22:19 +01:00
Sebastien Loriot
b9a87af07e
Merge pull request #7023 from MaelRL/Weights-v2.0-GF-5.5.x
...
Weights fixes (5.5.x)
2022-12-08 15:21:58 +01:00
Sebastien Loriot
fa72ad2ad0
Merge pull request #6977 from MaelRL/Weights-v2.0-GF
...
Weights fixes (5.4.x)
2022-12-08 15:21:43 +01:00
Andreas Fabri
da3a3b300d
Upgrade deprecated code
2022-12-07 15:10:01 +00:00
Mael Rouxel-Labbé
b219436ba1
use Stream_support's get_file_extension()
2022-12-07 14:19:48 +01:00
Andreas Fabri
272ffa8e2f
Don't use deprecated code in the demo
2022-12-07 13:03:35 +00:00
Mael Rouxel-Labbé
2cdaa26125
Minor UI update
2022-12-07 12:37:22 +01:00
Mael Rouxel-Labbé
282166307c
Misc minor changes
2022-12-07 12:20:39 +01:00
Mael Rouxel-Labbé
f3ec4653e9
List the main item above its volume plane in item list
2022-12-07 12:20:22 +01:00
Mael Rouxel-Labbé
f7925fdd1a
Reposition DCM / BMP underneath "Load..." (instead of the bottom of "Files")
2022-12-07 12:19:50 +01:00
Mael Rouxel-Labbé
1c04eea703
Refactor DCM / BMP to avoid code duplication + add smoothing selection to GUI
2022-12-07 12:19:24 +01:00
Mael Rouxel-Labbé
c36c54c139
Fix "Planes for unnamed"
2022-12-07 11:42:30 +01:00
Mael Rouxel-Labbé
d90d47fb79
Fix indentation (no real changes)
2022-12-06 22:57:42 +01:00
Mael Rouxel-Labbé
9a607498be
Avoid some code duplication
2022-12-06 22:43:05 +01:00
Mael
0ff7882997
Merge branch 'master' into feature/bug_documentation_spell_20221113
2022-12-06 22:21:06 +01:00
Andreas Fabri
1adb13edc8
Do not use deprecated functions
2022-12-06 12:34:26 +00:00
Mael
6538b22e06
Merge branch 'master' into CGAL-Clean_CMakeLists.txt-GF
2022-12-05 16:03:41 +01:00
Jane Tournois
9fd54baee2
Merge remote-tracking branch 'cgal/master' into Mesh_3-add_minimal_size_criterion_new-jtournois
...
# Conflicts:
# Installation/include/CGAL/config.h
# Mesh_3/doc/Mesh_3/CGAL/Mesh_criteria_3.h
# Mesh_3/include/CGAL/Mesh_cell_criteria_3.h
# Mesh_3/include/CGAL/Mesh_criteria_3.h
2022-12-05 15:33:08 +01:00
Jane Tournois
41508d7541
add facet and cell min size criteria to Mesh_3_plugin in demo
2022-12-05 11:55:16 +00:00
Laurent Rineau
67b5c791e9
Merge pull request #7075 from MaelRL/CGAL-Fix_some_links-GF
...
Update some links + https
2022-12-05 12:22:06 +01:00
Laurent Rineau
7f1486ffb3
Merge pull request #7089 from janetournois/Polyhedron_demo-fix_available_features_for_gray_images-jtournois
...
Polyhedron demo for Mesh_3 - disable features detection for gray level images
2022-12-05 12:21:53 +01:00
Laurent Rineau
ec8262d58c
Merge pull request #7091 from afabri/Demo3D-unamed-GF
...
Polyhedron Demo: unamed
2022-12-05 12:21:48 +01:00
Laurent Rineau
2e2d001d61
Merge pull request #7089 from janetournois/Polyhedron_demo-fix_available_features_for_gray_images-jtournois
...
Polyhedron demo for Mesh_3 - disable features detection for gray level images
2022-12-05 11:57:09 +01:00
Laurent Rineau
50f8c40142
Merge pull request #7091 from afabri/Demo3D-unamed-GF
...
Polyhedron Demo: unamed
2022-12-05 11:57:04 +01:00
Laurent Rineau
464211eb14
Merge pull request #7089 from janetournois/Polyhedron_demo-fix_available_features_for_gray_images-jtournois
...
Polyhedron demo for Mesh_3 - disable features detection for gray level images
2022-12-05 11:03:10 +01:00
Laurent Rineau
3ec2acf731
Merge pull request #7091 from afabri/Demo3D-unamed-GF
...
Polyhedron Demo: unamed
2022-12-05 11:03:05 +01:00
albert-github
f79d8bb542
Spelling corrections
...
After review
2022-11-30 10:31:13 +01:00
Andreas Fabri
2a2e319061
Don't use deprecated code in demo
2022-11-30 08:16:57 +00:00
Andreas Fabri
92a4a4180d
Polyhedron demo: unamed
2022-11-28 14:15:53 +00:00
Jane Tournois
5fbeecaef8
disable sharpFeaturesGroup for gray level images
2022-11-28 10:54:54 +01:00
Laurent Rineau
5c943e558c
Merge pull request #6935 from lrineau/CGAL-fix_autotest_with_ctest-GF
...
Fix autotest_cgal_with_ctest
2022-11-25 10:15:07 +01:00
Laurent Rineau
b363b7e4af
Merge pull request #6935 from lrineau/CGAL-fix_autotest_with_ctest-GF
...
Fix autotest_cgal_with_ctest
2022-11-25 10:14:18 +01:00
Mael Rouxel-Labbé
0f0bd3ff6d
WIP bmp reading
2022-11-25 01:04:45 +01:00
Andreas Fabri
b2f3eedb2f
3d Demo: Try to read bmp files
2022-11-24 16:14:11 +00:00
Sébastien Loriot
c5207cb5ad
Merge remote-tracking branch 'cgal/master' into HEAD
2022-11-24 09:54:56 +01:00
Mael Rouxel-Labbé
b5c21e1f5d
Http -> https + update some dead links
2022-11-23 18:54:37 +01:00
Laurent Rineau
24cc17e152
Merge pull request #7001 from MaelRL/SMS-Add_EF_stop_predicates-GF
2022-11-22 12:55:44 +01:00
hoskillua
dd49b0c0d8
demo fixes
2022-11-19 12:18:28 +02:00
hoskillua
fe8988b650
demo fixes
2022-11-19 12:16:27 +02:00
hoskillua
e302b02f76
Docs: adding bibtex, ack of DGtal, Authors + Renaming vars + minor fix
...
+ removing last commit's approach
2022-11-19 11:02:26 +02:00
albert-github
01a7852f70
Merge branch 'master' into feature/bug_documentation_spell_20221113
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Synchronize with master
2022-11-16 13:58:05 +01:00
hoskillua
e79e34df4f
trim trailing whitespaces
2022-11-16 12:53:43 +02:00
hoskillua
b56500d0fc
4-space -> 2-space indents
2022-11-16 12:51:14 +02:00
albert-github
eed54a0ae5
spelling corrections
...
Some spelling corrections (Directories starting with `O`-`S` , first part),
some backward work
some forward work
2022-11-15 18:45:39 +01:00
Laurent Rineau
5437042f3d
Merge pull request #7018 from janetournois/Polyhedron-demo-read_nrrd-jtournois
...
Polyhedron demo - add *.nrrd reader for images
2022-11-15 17:01:34 +01:00
Laurent Rineau
c5bcb46241
Merge pull request #7020 from janetournois/Polyhedron_demo-mesh_3_plugin_cleaning-jtournois
...
Polyhedron demo - meshing from images of any word type
2022-11-15 17:01:31 +01:00
albert-github
3674c937f7
spelling corrections
...
Some spelling corrections (Directories starting with `M`-` N`),
some backward work
some forward work
2022-11-15 15:21:01 +01:00
albert-github
45478184de
spelling corrections
...
Some spelling corrections (Directories starting with `E`-` L`),
some backward work
some forward work
2022-11-15 13:39:40 +01:00
Laurent Rineau
44f6d1349f
Merge branch 'master' into SMS-Add_EF_stop_predicates-GF
2022-11-15 11:42:03 +01:00
Jane Tournois
f21b8819bc
rename header to match struct capitals
2022-11-14 15:48:47 +01:00
Andreas Fabri
f3f3af10bb
Remove CGAL_USE(dirname) as not defined
2022-11-09 08:18:22 +00:00
Jane Tournois
c42166814b
create_labeled_image_mesh_domain_with_features has been removed
2022-11-08 18:32:30 +01:00
Jane Tournois
4ebbe922bd
Merge remote-tracking branch 'cgal/master' into Mesh_3-triple_line_extraction-GF
...
# Conflicts:
# BGL/include/CGAL/boost/parameter.h
# Installation/CHANGES.md
# Mesh_3/doc/Mesh_3/CGAL/Labeled_mesh_domain_3.h
# Mesh_3/include/CGAL/Labeled_mesh_domain_3.h
+ fix compilation
+ prepare for using detect_features
2022-11-08 16:17:33 +01:00
Laurent Rineau
01f8f1bc1d
Merge pull request #7027 from afabri/Polyhdron_demo-grid_generator-GF
2022-11-08 14:04:35 +01:00
Andreas Fabri
06417e14de
Polyhedron Demo: Fix upper right corner
2022-11-08 12:17:02 +00:00
Mael Rouxel-Labbé
83b0b0bdef
Merge branch 'Weights-v2.0-GF-5.5.x' into Weights-v2.0-GF-master
2022-11-07 14:23:29 +01:00
Mael Rouxel-Labbé
7564b761ac
Merge branch 'Weights-v2.0-GF' into Weights-v2.0-GF-5.5.x
2022-11-07 14:11:10 +01:00
Jane Tournois
26472284e4
the demo can now mesh images with any word type
...
thanks to the new domain constructors that do not
need to be defined explicitly a priori
2022-11-07 12:01:23 +00:00
Jane Tournois
41f1acc465
reorder if/else conditions
2022-11-07 12:41:53 +01:00
Jane Tournois
57c6d59ddc
add vtkNrrd reader to Io_image_plugin
2022-11-07 12:20:14 +01:00
Jane Tournois
b609f5364b
remove duplicate include
2022-11-07 12:19:16 +01:00
Laurent Rineau
8c9281f440
Merge pull request #6642 from sloriot/gsoc2022-boost_np
...
Replace usage of Boost parameters with CGAL named function parameters
2022-11-07 10:08:38 +01:00
hoskillua
aeaf881c49
minor fix max func
2022-11-06 20:35:05 +02:00
hoskillua
4295fd4e07
enum minor fix
2022-11-06 19:49:37 +02:00
Laurent Rineau
8e8153c0ac
Merge pull request #6871 from afabri/CGAL_assertions-GF
...
CGAL: No longer per package assertions
2022-11-03 09:44:48 +01:00
Laurent Rineau
56453b7e9f
Merge pull request #6953 from afabri/CGAL-Wunused-but-set-variable-GF
...
Address -Wunused-but-set-variable
2022-11-03 09:44:45 +01:00
Mael Rouxel-Labbé
ba3a0d7d22
Replace SMS::Count_* stop predicates with new Edge/Face_count_* stop predicates
2022-11-02 13:46:45 +01:00
Laurent Rineau
d24b180293
Merge branch 'master' into gsoc2022-boost_np
2022-10-28 15:39:36 +02:00
Andreas Fabri
cd2210dc90
Addess -Warray-parameter warning in Polyhedron demo code
2022-10-25 07:42:49 +01:00
Andreas Fabri
e3ca157992
Addess -Warray-parameter warning in Polyhedron demo code
2022-10-21 09:04:33 +01:00
Andreas Fabri
9072a9c936
Polyhedron demo code
2022-10-21 09:01:48 +01:00
Mael Rouxel-Labbé
6cd5c24f70
Pass traits to the secure Vor-weighted cotan functor
2022-10-20 17:27:26 +02:00
Sébastien Loriot
bac56d78b4
add convenience functions
2022-10-17 15:34:17 +02:00
Andreas Fabri
c04dceb71d
Merge master
2022-10-14 14:40:58 +01:00
Jane Tournois
3216d64be1
reintroduce weights + features in demo
2022-10-14 11:11:57 +02:00
Jane Tournois
8915ea0024
Merge branch 'Mesh_3-triple_line_extraction-GF' into Mesh_3-triple_line_extraction_and_weights-GF
...
# Conflicts:
# Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Mesh_3_plugin_cgal_code.cpp
2022-10-14 10:27:47 +02:00
Jane Tournois
f60a3a8a33
reorganize demo code with new API
2022-10-14 10:25:53 +02:00
Laurent Rineau
bb62879a4f
Merge pull request #6926 from janetournois/Polyhedron_demo-add_tetra_am_reader-jtournois
...
Polyhedron demo - add C3T3 `.tetra.am` reader
2022-10-13 15:17:44 +02:00
Laurent Rineau
b232f4bcfd
Merge pull request #6942 from sloriot/CGAL-header_clean_up
...
Clean up in headers
2022-10-13 15:17:39 +02:00
hoskillua
2cb8906639
principle -> principal typo fixed
2022-10-07 21:36:30 +02:00
Sébastien Loriot
e8c5de51b7
remove useless header to directly include the right file
2022-10-06 15:40:05 +02:00
Laurent Rineau
ea35fa8f88
Fix autotest_cgal_with_ctest
...
That commit makes the CMake variables `CGAL_TEST_SUITE` (the new one)
and `RUNNING_CGAL_AUTO_TEST` (the legacy one) completely equivalent.
2022-10-05 15:06:02 +02:00
Jane Tournois
91ae41d6ac
update c3t3 "in complex" status after loading
2022-10-04 16:45:48 +02:00
Jane Tournois
a9f4ee7342
reorganize headers to separate tetrahedral and surface meshes IO
2022-10-04 14:22:54 +02:00
Laurent Rineau
7a36d9af83
Merge pull request #6863 from lrineau/Polyhedron-demo_fix_display_of_protecting_spheres-GF
...
Polyhedron demo - Fix the display of protecting balls (second version)
2022-10-04 13:52:56 +02:00
Laurent Rineau
3a0a7fe34e
Merge pull request #6863 from lrineau/Polyhedron-demo_fix_display_of_protecting_spheres-GF
...
Polyhedron demo - Fix the display of protecting balls (second version)
2022-10-04 13:50:20 +02:00
Jane Tournois
8a05e4df23
move header outside demo
2022-10-03 16:00:41 +02:00
Jane Tournois
53d8734ad2
add tetrahedral mesh .tetra.am reader in C3t3_io_plugin
2022-10-03 15:31:14 +02:00
Jane Tournois
bca99f4a18
add detect_features named parameter for create_labeled_image_mesh_domain_with_features
...
todo : move it to create_labeled_image_mesh_domain and remove
create_labeled_image_mesh_domain_with_features as soon as PR on named
parameters is merged
2022-09-27 16:17:25 +02:00
Sébastien Loriot
54a6462273
move code so that we can reinject mesh_3 parameters functions into NFP class
2022-09-26 20:09:58 +02:00
hoskillua
a1e9345a1e
added principal curvatures plugin to test with cmake
2022-09-26 19:59:36 +02:00
Jane Tournois
769d0d146a
labeled image for mesh_3 : use features and weights together in demo
2022-09-26 15:59:49 +02:00
Jane Tournois
9a71c9519a
change default sigma value
2022-09-26 15:32:12 +02:00
hoskillua
7118646bec
typo fix
2022-09-26 09:19:17 +02:00
hoskillua
e0c596d29e
principal curvatures and directions visualization
2022-09-25 22:03:50 +02:00
Mael Rouxel-Labbé
363d1daaef
Some more conversions to non-package specific assertions
2022-09-23 15:20:24 +02:00
Jane Tournois
4cdf1dc722
fix protection of features on bbox, and/or features everywhere
2022-09-22 12:24:37 +02:00
Jane Tournois
aaa50e4a39
this line does not depend on word type
2022-09-22 12:23:29 +02:00
Jane Tournois
b98d6d69aa
Merge branch 'Polyhedron-demo_fix_display_of_protecting_spheres-GF' into Mesh_3-triple_line_extraction-GF
2022-09-22 10:16:30 +01:00
Jane Tournois
5fa3a24041
wip fixing protection of polylines on bbox for meshing of labeled images
2022-09-22 11:14:05 +02:00
Laurent Rineau
3b6b6f9018
Polyhedron demo - Fix the display of protecting balls
2022-09-20 16:15:49 +02:00
hoskillua
3d3b2c30fd
testing init
2022-09-20 11:18:13 +02:00
hoskillua
4f1a5dd194
minor demo updates
2022-09-20 04:18:11 +02:00
Mael Rouxel-Labbé
6f187f332c
Misc minor fixes/improvements
2022-09-14 14:08:23 +02:00
GYuvanShankar
086fb94960
Fixed polyhedral demo not working
2022-09-07 19:12:34 +05:30
GYuvanShankar
7b30693cd7
More testsuite/polyhedron fixes
2022-09-07 17:57:34 +05:30
GYuvanShankar
b9ff787e7b
Testsuite fixes
2022-09-07 11:35:43 +05:30
Mael Rouxel-Labbé
e93b0b28eb
Misc trivial cleaning
2022-09-06 16:25:47 +02:00
Mael Rouxel-Labbé
9b265fddf8
Uniformize REQUIRED / QUIET usage:
...
Following this:
- CGAL: always REQUIRED
- CGAL component: COMPONENT / OPTIONAL_COMPONENT (never QUIET)
- required 3rd party: (not QUIET) + message(NOTICE "") on NOT_FOUND
- optional 3rd party: QUIET + message(STATUS "") except for Polyhedron/demo
- 3rd party components: COMPONENT / OPTIONAL_COMPONENT
(QUIET depending on required or optional 3rd party)
2022-09-06 16:24:27 +02:00
Mael Rouxel-Labbé
4fc486b195
Purge CMakeLists.txts from obsolete code / noise
2022-09-06 16:19:11 +02:00
Mael Rouxel-Labbé
7cb21c24b0
Uniformize message() for missing 3rd party libraries
...
STATUS for non-essential, NOTICE for important stuff
2022-09-06 16:07:31 +02:00
Mael Rouxel-Labbé
28ba446895
Clean (some) CMakeLists.txt indentation
2022-09-06 15:38:18 +02:00
Mael Rouxel-Labbé
468c30a7da
Fix highly disturbing missing vertical spacer in AW3 Plugin
2022-09-03 14:13:44 +02:00
Mael Rouxel-Labbé
3e237758a2
Various improvements to the AW3 plugin
2022-09-03 14:04:31 +02:00
Mael Rouxel-Labbé
db12deb0b2
Misc improvements to stats in the demo
2022-09-03 14:01:10 +02:00
Sven Oesau
80eb8601e6
Merge branch 'CGAL:master' into Region_growing-revision-soesau
2022-09-02 16:42:41 +02:00
Laurent Rineau
6df5509134
Merge pull request #6803 from afabri/Polyhedron_demo-visible_after_boolean-GF
...
Polyhedron Demo: Make input invisible after Boolean operation
2022-08-29 11:35:35 +02:00
Andreas Fabri
834c93af05
Inflate only if a single item is selected
2022-08-19 10:58:09 +01:00
Andreas Fabri
3bd82bcda1
spliited -> split
2022-08-17 19:58:00 +01:00
Andreas Fabri
abb0cebcfe
Polyhedron Demo: Make input invisible after Boolean operation
2022-08-17 19:49:06 +01:00
GYuvanShankar
ce44ebf64d
Documentation change, removed BOOST_PARAMETER_MAX_ARITY macro
2022-08-17 18:03:26 +05:30
Laurent Rineau
d49ee20965
Merge pull request #6665 from sloriot/CGAL-std_type_traits
2022-08-17 13:56:54 +02:00
Sébastien Loriot
ad6329c263
Merge 'cgal/master' into gsoc2022-boost_np
2022-08-16 17:52:18 +02:00
Sebastien Loriot
3ad379bae6
Merge pull request #6787 from sloriot/CGAL-warnings
...
Fix warnings
2022-08-10 18:37:55 +02:00
Sebastien Loriot
d64d243bf5
Merge pull request #6772 from sloriot/PMP-remove_caps_needles_doc
...
Document remove_almost_degenerate_faces()
2022-08-10 18:31:52 +02:00
Sébastien Loriot
ec858b5eff
fix out-of-bound warning
2022-08-04 08:55:58 +02:00
Sébastien Loriot
861588abe1
Merge 'sloriot/CGAL-std_type_traits' into master
2022-08-03 20:19:51 +02:00
Sébastien Loriot
888c64fd74
add PMP region growing function (plane/face)
2022-08-03 20:08:05 +02:00
Sébastien Loriot
801d77ec9b
fix warning
2022-08-02 13:29:05 +02:00
Sébastien Loriot
36161bac4b
fix demo plugin after update
2022-08-02 12:54:23 +02:00
Sébastien Loriot
e564f4eaa5
Merge remote-tracking branch 'cgal/master'
2022-08-02 12:05:51 +02:00
Sebastien Loriot
f4a505ca2a
Merge pull request #6688 from gdamiand/CMap_index-gdamiand
...
CMap/GMap/LCC with index
2022-08-02 10:55:37 +02:00
hoskillua
34b776d6c2
trailing spaces
2022-08-01 08:35:06 +02:00
hoskillua
9635ec1497
minor changes on demo (wip)
2022-07-31 18:55:51 +02:00
hoskillua
22c0859d92
trailing spaces
2022-07-31 00:41:43 +02:00
hoskillua
127c87857c
Use slider radius (after remapping) in curvature computation
2022-07-31 00:32:42 +02:00
hoskillua
db753ee6b5
Demo improvements + minor fixes
...
- Fixed some typos in example file and in comment in display prop plugin
- Added an option in random perturbation plugin to compute normals before hand
- added slider for expanding radius with an exponential range and with max val dependant on max edge length
2022-07-31 00:21:55 +02:00
Jane Tournois
2c88b640e3
separate protection of features on boundaries, and protection of triple+ lines
2022-07-28 16:59:31 +02:00
Jane Tournois
e2f9887ad8
Merge remote-tracking branch 'cgal/master' into Mesh_3-triple_line_extraction-GF
...
# Conflicts:
# Installation/CHANGES.md
2022-07-28 16:07:22 +02:00
Sébastien Loriot
62c91c1479
remove trailing whitespaces
2022-07-27 19:10:52 +02:00
hoskillua
1e49d54c24
Merge remote-tracking branch 'cgal-dev/gsoc2022-ICC-hoskillua' into gsoc2022
2022-07-27 15:43:20 +02:00
hoskillua
19076d38cc
Merge remote-tracking branch 'upstream/master' into gsoc2022
2022-07-27 15:41:48 +02:00
hoskillua
12a627e23f
expanding from and evaluating on vertices instead of faces
2022-07-27 15:40:06 +02:00
hoskillua
41be3688ae
Mean and Gaussian Curvatures + Visualizer (Still wip)
2022-07-26 19:32:17 +02:00
Sébastien Loriot
04d1d60a89
fix warning
2022-07-26 16:47:28 +02:00
Sébastien Loriot
b1ee7ba78e
move outside experimental namespace with a better API and doc
2022-07-26 15:06:49 +02:00
Laurent Rineau
79e064c9cf
Merge pull request #6692 from lrineau/CGAL-fix_cmake-GF
...
Cleanup CMake scripts
2022-07-24 18:08:38 +02:00
Guillaume Damiand
f2630fa4b9
Merge branch 'master' into CMap_index-gdamiand
2022-07-19 09:44:16 +02:00
hoskillua
2778d878ce
Merge remote-tracking branch 'upstream/master' into gsoc2022
2022-07-19 03:10:16 +02:00
hoskillua
5cc75c0bc4
Updated Demo Display property plugin, added to license list,
2022-07-18 21:57:42 +02:00
Sébastien Loriot
2f47bbb599
remove input range from Region_growing parameters
2022-07-11 16:59:48 +02:00
Sebastien Loriot
4b9032f8c6
Merge pull request #6547 from afabri/Skeletoniation-HDS-GF
...
Skeletonization: Replace internally Polyhedron by HDS
2022-07-08 20:24:58 +02:00
Sven Oesau
b6b9cc0854
bugfix Point set shape detection plugin
2022-07-06 15:48:08 +02:00
Sven Oesau
5d5c380c66
Merge branch 'master' into Region_growing-revision-soesau
2022-07-06 15:20:11 +02:00
Sven Oesau
d4c278acd9
fixing namespace errors
2022-07-04 15:13:53 +02:00
Sébastien Loriot
1e364e5516
rename macros
2022-07-04 11:26:49 +02:00
Sebastien Loriot
ee683224fe
Merge pull request #6674 from afabri/Polyhedron-accelerate_delete_items-GF
...
Polyhedron_3: Accelerate removal of many items
2022-07-04 10:48:19 +02:00
Jane Tournois
96407d58ea
fix meshing of image with features in demo
...
3 options :
- automatic detection of features
- given polyline_item was not taken into account
- no features
2022-06-30 10:21:58 +01:00
Jane Tournois
dc01e8d431
add triple lines detection in demo
2022-06-30 10:20:19 +01:00
GYuvanShankar
4457b05350
Removed _new prefix from named parameters
2022-06-29 17:38:54 +05:30
Sébastien Loriot
707b45cb5b
Merge remote-tracking branch 'cgal/5.5.x-branch'
2022-06-29 10:48:00 +02:00
Laurent Rineau
755c9d5d42
Merge pull request #6646 from lrineau/Installation-optional_ASAN-GF
...
Use ASAN optionally
2022-06-29 09:52:15 +02:00
Laurent Rineau
f67032cde1
Merge pull request #6670 from lrineau/Polyhedron_demo-fix_segfaults_at_exit-GF
...
Polyhedron demo: Fix segfaults at exit
2022-06-29 09:50:43 +02:00
Laurent Rineau
499b7794c9
Merge pull request #5693 from janetournois/Mesh_data_structure_3-new_package-jtournois
...
SMDS_3: Mesh_data_structure_3 - new package for C3T3
2022-06-29 09:14:38 +02:00
GYuvanShankar
60f7a5c7cf
New API support and docs for Labeled_mesh_domain_3.h
2022-06-27 20:26:35 +05:30
Sven Oesau
ec26d6b8a9
fix compilation on gcc
2022-06-24 17:09:43 +02:00
Sven Oesau
dc69122844
adapting point_set_shape_detection_plugin to removal of property maps
2022-06-24 12:39:13 +02:00
Sven Oesau
17e0923058
Merge branch 'master' into Region_growing-revision-soesau
2022-06-24 11:06:56 +02:00
Sébastien Loriot
c9c6b30cf0
Merge sloriot/CGAL-std_type_traits into master
2022-06-23 16:35:37 +02:00
Laurent Rineau
9b66094a4b
Create fixture `demo_framework_SetupFixture`
...
That avoids that all targets of CGAL depend on `demo_framework`. Now
only the plugins depend on it.
2022-06-21 21:03:27 +02:00
Sven Oesau
99a711168c
fixing Point_set_shape_detection_plugin
2022-06-21 17:23:19 +02:00
Laurent Rineau
5a038abf34
Fix a CMake bad code
...
https://cmake.org/cmake/help/latest/command/if.html#command:if
> `if(ENV{some_var})` will always evaluate to false.
2022-06-20 09:55:12 +02:00
Andreas Fabri
2942078a3f
Polhedron_3: Accelerate removal of many items
2022-06-16 14:38:12 +01:00
Sébastien Loriot
968e9cf5a9
avoid duplicating properties for Polyhedron
2022-06-16 13:29:20 +02:00
Sébastien Loriot
9de38a13b8
move include directives to graph_traits file
2022-06-16 09:55:13 +02:00
Sébastien Loriot
4400120244
remove non-needed include directives
2022-06-16 09:54:57 +02:00
Laurent Rineau
4f27a0cf3c
Fix segfaults
...
The segfaults at the destruction of plugins were because of uninitialized pointers.
2022-06-15 10:13:44 +02:00
Laurent Rineau
c132b6a11e
Merge remote-tracking branch 'cgal/master' into Mesh_data_structure_3-new_package-jtournois
2022-06-13 16:26:34 +02:00
Sébastien Loriot
3fa436459d
BOOST_MPL_ASSERT -> static_assert
2022-06-10 08:46:01 +02:00
Sébastien Loriot
c46e1d2d24
fix warnings
2022-06-09 16:14:22 +02:00
Sébastien Loriot
eee363df27
Merge cgal/master
2022-06-08 23:23:07 +02:00
Sébastien Loriot
5746e59b34
Merge cgal/master
2022-06-08 23:13:25 +02:00
Jane Tournois
8082df8083
use override instead of Q_DECL_OVERRIDE
2022-06-08 23:03:58 +02:00
Jane Tournois
03a8445b8d
simplify bbox loop
2022-06-08 23:03:58 +02:00
Jane Tournois
03b4e95d0b
add missing parameter
2022-06-08 23:03:50 +02:00
Jane Tournois
660ce6c12e
fix Bbox for c3t3_item
...
far points were making it way too large
2022-06-08 23:03:50 +02:00
Jane Tournois
d7759abbb7
add a hidden parameter to allow non-manifold vertices or edges
...
this is to be used only is advanced code that deals with invalid T3
2022-06-08 23:03:50 +02:00
Jane Tournois
355b52d21f
rename TMDS_3 to SMDS_3, end.
2022-06-08 22:57:25 +02:00
Jane Tournois
55728c5042
avoid using deprecated output_to_medit() function
2022-06-08 22:57:24 +02:00
Jane Tournois
3846eb275c
fix VTK plugin
2022-06-08 22:53:18 +02:00
Sébastien Loriot
c8cbbbfb1d
Merge cgal/master
2022-06-08 22:49:25 +02:00
Sébastien Loriot
5e124e5d5f
Merge cgal/master
2022-06-08 22:43:17 +02:00
Jane Tournois
95b3da51cf
move all MDS_3 to TMDS_3 (with T for Tetrahedral)
2022-06-08 22:35:50 +02:00
Jane Tournois
c7a1137847
use range iterators
2022-06-08 22:15:10 +02:00
Sébastien Loriot
f0fc06b998
Merge cgal/master
2022-06-08 22:10:34 +02:00
Sébastien Loriot
ac8d72ee18
merge master
2022-06-08 22:06:36 +02:00
Jane Tournois
847f9f127e
fix the use of face_patch_map for export_facets_in_complex() in the demo
2022-06-08 22:04:34 +02:00
Sébastien Loriot
871973d370
merge cgal/master
2022-06-08 22:00:35 +02:00
Sébastien Loriot
920c35c30e
Merge cgal/master
2022-06-08 21:56:39 +02:00
Jane Tournois
57439c0235
wip : transfer surface patch indices from c3t3 to Surface_mesh
...
in export_facets_in_complex()
2022-06-08 21:46:52 +02:00
Jane Tournois
dd818412e5
fix compilation
2022-06-08 21:46:52 +02:00
Jane Tournois
5a36e53a4a
move build_triangulation_from_file to MDS_3 namespace
...
and simplify template parameters
2022-06-08 21:46:51 +02:00
Jane Tournois
baba44459b
fix compilation of the demo
2022-06-08 21:46:51 +02:00
Jane Tournois
e86c4027af
move C3T3 headers to MDS_3 new package
...
MDS_3 is "3D Mesh Data Structure"
2022-06-08 21:46:50 +02:00
Mael Rouxel-Labbé
801d966853
Enhance AW3 demo with iteration visualization & snapshot capabilities
2022-06-08 12:17:57 +02:00
Sébastien Loriot
d13f486640
update tests/examples/demos to use the new API
2022-06-04 14:19:00 +02:00
Sven Oesau
52a7c01637
providing shape parameters of detection shapes
...
introducing Primitive typedef to all region types
Outputiterator for region growing now needs to accept std::pair<Primitive, std::vector<std::size_t> >
2022-06-02 17:36:40 +02:00
Mael Rouxel-Labbé
965964e8b8
Visualization with a soup, some colors, alpha shading etc.
2022-06-02 14:25:43 +02:00
Mael Rouxel-Labbé
ae581c865a
Iterative visualization
2022-06-02 02:21:26 +02:00
Sébastien Loriot
ebf9fb025a
Merge remote-tracking branch 'cgal/5.4.x-branch'
2022-05-26 18:13:59 +02:00
Sébastien Loriot
6f84cbebc2
Merge remote-tracking branch 'cgal/5.3.x-branch'
2022-05-26 18:13:19 +02:00
Sebastien Loriot
1e9984633d
Merge pull request #6591 from afabri/Poisson-doxygen-GF
...
Fix doxygen warnings
2022-05-26 18:10:39 +02:00
Sebastien Loriot
ddbe2a9bbb
Merge pull request #6601 from afabri/Polyhedron-fix_save_polyline_in_scene-GF
...
Polyhedron_3: Fix saving a polyline as part of a scene
2022-05-26 18:10:10 +02:00
Sebastien Loriot
565611123c
Merge pull request #6611 from MaelRL/AW3-enhance_demo-GF
...
AW3: Fix overzealous filtering during traversal (+ misc enhancements)
2022-05-26 18:09:18 +02:00
Sven Oesau
cb0f9475dc
renaming Polygon_mesh namespace to Triangle_mesh
...
renaming Region_growing_X subfolders to X
2022-05-24 21:11:32 +02:00
Andreas Fabri
eea9cf7ac4
cleanup
2022-05-24 16:25:27 +01:00
Sven Oesau
c7ae5ab054
adapted partial specialization
2022-05-24 15:10:26 +02:00
Mael Rouxel-Labbé
d56584bf28
Misc minor fixes / improvements
2022-05-24 14:30:42 +02:00
Mael Rouxel-Labbé
9c57413bb9
AW3 demo enhancements (enable segments/points, better dialog, etc.)
2022-05-24 10:10:50 +02:00
Sébastien Loriot
febeb2debc
add ui for self snapping
2022-05-23 17:57:56 +02:00
Sébastien Loriot
38135b884f
be more permissive with orient
2022-05-23 17:57:49 +02:00
Sébastien Loriot
7c4b08e7aa
orient if closed
2022-05-23 17:56:51 +02:00
Sébastien Loriot
789f37e82c
add merge_reversible_connected_components
2022-05-23 17:56:51 +02:00
Sébastien Loriot
7a6b875561
add snap_borders
2022-05-23 17:56:51 +02:00
Andreas Fabri
ef0899445f
Polyhedron_3: Fix saving a polyline as part of a scene
2022-05-23 11:16:11 +01:00
Sébastien Loriot
594d8bf38e
remove tag that is not used and add a way to pass default Point and Normal maps
2022-05-18 15:23:23 +02:00
Andreas Fabri
3ad94a7393
Use \pre
2022-05-17 12:04:52 +01:00
Andreas Fabri
4968d218b5
Fix doxygen warnings
2022-05-17 10:31:07 +01:00
Laurent Rineau
b32619fedd
Fix the picking
2022-05-16 17:12:00 +02:00
Sébastien Loriot
2b547ec58a
Merge remote-tracking branch 'cgal/5.4.x-branch'
2022-05-13 17:26:04 +02:00
Sebastien Loriot
978d83a349
Merge pull request #6573 from sloriot/CGAL-pedantic_warnings
...
Fix pedantic warnings
2022-05-13 15:55:26 +02:00
Laurent Rineau
9211f1768f
Add a generic read_pixel for other pixel readings
2022-05-12 14:15:01 +02:00
Laurent Rineau
225e3c2217
Add a function read_depth_under_pixel
...
The function takes care of HiDPI screen, using `devicePixelRatio()`.
2022-05-12 12:41:58 +02:00
Sébastien Loriot
6465207428
fix warnings
2022-05-11 10:07:31 +02:00
Sébastien Loriot
6486844750
fix pedantic warnings
2022-05-10 11:30:39 +02:00
Sébastien Loriot
4efc5ab2ac
resize color vector if the soup as colors
2022-05-09 14:45:16 +02:00
Laurent Rineau
734c96e951
Merge branch 'master' into pr/lrineau/6558
2022-05-06 16:25:32 +02:00
Laurent Rineau
6da27847c5
Merge pull request #6495 from afabri/Surface_mesh-move-GF
...
Surface_mesh: Add move semantics
2022-05-06 14:22:06 +02:00
Laurent Rineau
90accc92ea
Merge pull request #6499 from MaelRL/STL-Merge_is_defaults-GF
...
Merge parameters::Is_default and parameters::is_default_parameter
2022-05-06 14:22:02 +02:00
Laurent Rineau
1f683e21d8
Merge pull request #6530 from lrineau/Triangulation_3-fix_crash_during_IO-GF
...
Fix crash during binary I/O of Triangulation_3
2022-05-06 14:21:52 +02:00
Laurent Rineau
7c4e43ee1c
Merge pull request #6535 from sloriot/Test-remove_cmake_generator
...
remove mentions to CMAKE_GENERATOR in test scripts
# Conflicts:
# CGAL_ipelets/demo/CGAL_ipelets/cgal_test_with_cmake
# Set_movable_separability_2/test/Set_movable_separability_2/cgal_test_with_cmake
2022-05-06 14:21:25 +02:00
Laurent Rineau
539e2852a1
Merge pull request #6535 from sloriot/Test-remove_cmake_generator
...
remove mentions to CMAKE_GENERATOR in test scripts
# Conflicts:
# CGAL_ipelets/demo/CGAL_ipelets/cgal_test_with_cmake
# Set_movable_separability_2/test/Set_movable_separability_2/cgal_test_with_cmake
2022-05-06 14:19:07 +02:00
Laurent Rineau
2288225448
Massive update of CMake policies to version 3.23
2022-05-06 09:34:35 +02:00
Guillaume Damiand
6a21a73281
handle -> descriptor for lcc in demo
2022-05-05 14:33:36 +02:00
Guillaume Damiand
999a813b35
Rename XXX_handle into XXX_descriptor for CMap, GMap, LCC
2022-05-05 13:34:19 +02:00
Andreas Fabri
8c48ac4aaa
Fix #include
2022-05-03 13:58:00 +01:00
Andreas Fabri
4feef9fbaf
Addd an #include in the MCF plugin
2022-05-03 12:46:00 +01:00
Sébastien Loriot
8e0ed828e7
remove mentions to CMAKE_GENERATOR in test scripts
2022-04-28 13:48:23 +02:00
Laurent Rineau
ceb41bf206
Fix crash during binary I/O of Triangulation_3
2022-04-27 14:19:21 +02:00
Laurent Rineau
6c08c98a4e
Use std::move instead of std::forward
2022-04-20 17:04:13 +02:00
Mael Rouxel-Labbé
477353d5eb
Merge parameters::Is_default and parameters::is_default_parameter
2022-04-20 16:01:02 +02:00
Andreas Fabri
97800865fb
Move Join in the same submenu as Split
2022-04-20 10:06:16 +01:00
Andreas Fabri
3c83a2bb6f
Use move semantcs in the Polyhedron demo
2022-04-19 18:58:18 +01:00
Andreas Fabri
b19dba2b5d
Polyhedron_3: Faster split in the demo
2022-04-13 19:27:33 +01:00
Laurent Rineau
7d9427b17e
Merge branch 'master' into AW3-New_package-GF
2022-04-11 17:19:47 +02:00
Mael Rouxel-Labbé
4ab6e0006d
Fix typo in variable name
2022-04-04 11:33:28 +02:00
Mael Rouxel-Labbé
f2791abe87
Add AW3 polyhedron demo plugin for meshes & soups
2022-04-04 11:33:28 +02:00
Sébastien Loriot
66a893d903
fix warnings
2022-03-23 23:17:48 +01:00
Sébastien Loriot
689da92ae4
Merge remote-tracking branch 'PMP-relax' into master
2022-03-23 22:09:20 +01:00
Laurent Rineau
b7528d45fa
Merge pull request #6360 from lrineau/Polyhedron_demo-fix_issue_6357
...
3D demo offset_meshing_plugin: Fix the use of the manifold criterion
2022-03-02 15:13:44 +01:00
Laurent Rineau
b017379614
Merge pull request #6360 from lrineau/Polyhedron_demo-fix_issue_6357
...
3D demo offset_meshing_plugin: Fix the use of the manifold criterion
2022-03-02 15:13:13 +01:00
Laurent Rineau
3bd0f0d601
Fix the use of the manifold criterion
...
Fix #6357
2022-02-25 14:35:36 +01:00
Laurent Rineau
258d704a90
Merge pull request #6209 from sloriot/PMP-std_instead_of_boost
...
Use features available in std instead of boost
2022-02-24 19:57:17 +01:00
Laurent Rineau
d78a7b9255
Merge pull request #6302 from afabri/P2T2-assert-GF
...
CGAL: In testcode do not use CGAL_assertion but assert
2022-02-08 23:44:24 +01:00
Sébastien Loriot
4ffc949199
replace boost::unordered by std::unordered
...
but in T3, Mesh_3, TDS_3, P3[TM]3
2022-02-03 19:11:12 +01:00
Andreas Fabri
735752bec9
Do the remaining changes after Laurent's check
2022-02-03 08:02:11 +00:00
Laurent Rineau
5b42a501cc
Merge pull request #6266 from afabri/CGAL-assertions_in_examples-GF
...
CGAL Examples: CGAL_assertion -> assert
# Conflicts:
# HalfedgeDS/examples/HalfedgeDS/hds_prog_compact2.cpp
# Triangulation_2/examples/Triangulation_2/triangulation_print_OFF.h
2022-02-02 16:38:01 +01:00
Sébastien Loriot
3b4a406204
fix key type
2022-01-26 18:26:50 +01:00
Sébastien Loriot
08f3d051e8
do not need to know the range type and to store the range
2022-01-26 13:28:57 +01:00
Andreas Fabri
79a38d5cb9
CGAL Examples: CGAL_assertion -> assert
2022-01-24 10:19:04 +00:00
Sébastien Loriot
475cab49e4
Merge remote-tracking branch 'danston/Region_growing-revision-danston' into HEAD
2022-01-21 13:39:25 +01:00
Sébastien Loriot
126b78fecf
Merge remote-tracking branch 'sloriot/PMP-relax' into HEAD
2022-01-19 13:50:46 +01:00
Sébastien Loriot
11c7c56718
Merge remote-tracking branch 'cgal/master' into HEAD
2022-01-18 09:11:52 +01:00
Sébastien Loriot
10b0af3092
rename macro since Named_function_parameter is part of STL_Extension
2022-01-13 14:43:34 +01:00
Sébastien Loriot
c169c41240
Merge remote-tracking branch 'maxGimeno/PMP-Example_of_new_mp_function-maxGimeno' into HEAD
2022-01-12 13:33:49 +01:00
Sébastien Loriot
4fa826b3ed
keep only the static version of is_default_parameter
2022-01-10 18:36:37 +01:00
Sébastien Loriot
75b03e6c0a
use_default_values() -> default_values()
2022-01-10 18:36:37 +01:00
Sébastien Loriot
1c3e09f562
rename internal namespace
...
default_values -> default_values_for_mesh_3
2022-01-10 18:36:32 +01:00
Sébastien Loriot
6d3176e061
move Named_parameters class in STL_extension
...
helpers stay in BGL because it depends on BGL tags
2022-01-07 15:12:22 +01:00
Sébastien Loriot
5f1803489b
replaces overloads with default NamedParameters for Point_set_processing_3
...
+enhancement of the NP for Point_set_processing_3
2022-01-06 15:11:23 +01:00
Sébastien Loriot
fbfff10cb4
fix ambiguous overloads
2022-01-05 15:50:00 +01:00
Sébastien Loriot
e98fc29dda
fix compilation issues
2022-01-04 17:38:46 +01:00
Sébastien Loriot
b04a5f9124
remove overloads with default parameters
2022-01-04 16:14:49 +01:00
Sébastien Loriot
1e7785b427
do not use PMP::parameters namespace
2022-01-04 16:00:38 +01:00
Andreas Fabri
c924cfdc00
merge master
2022-01-04 13:53:50 +00:00
Sébastien Loriot
6848e69987
replace all_default() by use_default_values() in tests and examples
2022-01-04 14:06:26 +01:00
Sébastien Loriot
28ab8e9293
replace CGAL_PMP_NP macros with CGAL_BGL_NP ones
2022-01-04 11:19:05 +01:00
Sébastien Loriot
047ddad86c
remove optional parameter
2022-01-04 10:12:37 +01:00
Laurent Rineau
7cada272e8
Merge pull request #6124 from janetournois/Mesh_3-polyhedral_complex_in_demo-GF
2022-01-03 16:48:37 +01:00
Laurent Rineau
2a047b42df
Merge pull request #6188 from sloriot/Polyhedron_demo-moc_c3t3
...
Remove useless moc include
2022-01-03 16:26:11 +01:00
Laurent Rineau
a1f4a92506
Merge pull request #6193 from sloriot/Demo-fix_shortcut_composition
...
Fix shortcut composition
2022-01-03 16:26:08 +01:00
Laurent Rineau
ef68e0b913
Merge pull request #6207 from sloriot/CGAL-set_but_not_used_variable
...
Fix set but unused variable warning
2022-01-03 16:22:34 +01:00
Laurent Rineau
9905eb29cf
Merge pull request #6193 from sloriot/Demo-fix_shortcut_composition
...
Fix shortcut composition
2022-01-03 16:22:20 +01:00
Jane Tournois
64af231b6e
Merge branch 'master' into PMP-relax
2021-12-28 14:52:48 +01:00
Jane Tournois
02d07278be
fix unused variable warning
2021-12-28 10:24:34 +01:00
Sébastien Loriot
6cc458bbf2
fix set but unused variable warning
2021-12-27 11:23:46 +01:00
Sébastien Loriot
f5a85902a1
fix shortcut composition
...
Seems that I did not understand correctly the doc here:
https://doc.qt.io/qt-5/qkeysequence.html#QKeySequence-2
2021-12-22 12:05:07 +01:00
Laurent Rineau
7906e3928a
Merge pull request #6174 from afabri/CGAL_Discontinue_Geomview-GF
...
Remove Geomview
2021-12-20 18:06:29 +01:00
Sébastien Loriot
3234726da5
remove useless include
...
needed only if Q_OBJECT or other macros are in that file
2021-12-17 16:34:55 +01:00
Sébastien Loriot
62a646ecf3
fix invalid target name
2021-12-15 15:22:30 +01:00
Andreas Fabri
115fa5ab39
Remove Geomview from the manual and the demos
2021-12-14 14:01:21 +00:00
Sébastien Loriot
676c367852
fix warnings cherry-picked from master targetting 5.4
2021-11-29 18:02:31 +01:00
Sébastien Loriot
993a7b29b0
fix warnings about arithmetic operations on enum
...
cherry-pick of 364009
2021-11-29 17:59:12 +01:00
Mael Rouxel-Labbé
b0b6f78a9c
Clear mesh before PS_to_PM as there might be garbage from CGAL::IO::read_PM
2021-11-29 14:20:54 +01:00
Laurent Rineau
4321e776d0
Merge pull request #6149 from albert-github/feature/bug_docu_codeblocks
2021-11-26 14:30:23 +01:00
Laurent Rineau
f02e5cffe9
Merge pull request #6132 from sloriot/Demo-normal_plugin
...
Create normal map only if normal estimation is done
2021-11-25 17:28:37 +01:00
albert-github
3ad2b0ff17
Remove some unintended artifacts from the documentation
...
Some parts were due to to the markdown handling of 4 spaces meaning code converted to code and this was not the intention.
2021-11-25 15:43:21 +01:00
Dmitry Anisimov
0c00a3941f
Merge remote-tracking branch 'origin/master' into Region_growing-revision-danston
2021-11-24 15:50:29 +01:00
Sébastien Loriot
0ff77b2751
simplify connection
2021-11-24 11:08:49 +01:00
Sébastien Loriot
f61b088576
update applicable filters when an item is updated
2021-11-24 10:43:07 +01:00
Laurent Rineau
3e877fa124
Merge pull request #6109 from afabri/CGAL-VC_max_warning-GF
...
PMP: Fix Warnings in Master
2021-11-18 12:27:21 +01:00
Laurent Rineau
4d38f2b7b3
Merge pull request #6114 from sloriot/CGAL-cmake_clean_up
...
Clean cmake scripts of examples and tests
2021-11-18 12:27:19 +01:00
Sébastien Loriot
79757328fe
create normal map only if normal estimation is done
2021-11-16 22:22:45 +01:00
Dmitry Anisimov
930278ec50
Merge remote-tracking branch 'origin/master' into Region_growing-revision-danston
2021-11-16 14:57:16 +01:00
Jane Tournois
0c522b643c
run mesh_3 from a Polyhedral_complex_mesh_domain (as a group)
2021-11-12 13:54:22 +01:00
Jane Tournois
f1c64499b3
store materials data in Qt properties
2021-11-12 11:37:11 +01:00
Guillaume Damiand
2bbcabe71b
The size of argv array is now 2, ending with nullptr.
2021-11-11 17:23:37 +01:00
Guillaume Damiand
ee11c858b5
The size of argv array is changed to 1 in all basic viewers.
2021-11-10 09:59:48 +01:00
Guillaume Damiand
5afc4cd6e2
Remove -old option for Polyhedron_3 draw
2021-11-09 19:02:36 +01:00
Sébastien Loriot
ab48f63e30
update latest cmake version tested
2021-11-09 10:58:47 +01:00
Sébastien Loriot
262a04cef2
remove useless POLICY setting
2021-11-09 10:19:14 +01:00
Andreas Fabri
bd60afc8e5
static cast an enum to int before multiplication
2021-11-03 23:17:01 +01:00
Sébastien Loriot
07421357a7
fix phrasing
2021-11-02 11:52:53 +01:00
Sébastien Loriot
08b1457649
add CGAL::CGAL_Basic_viewer target
2021-11-01 11:07:55 +01:00
Sébastien Loriot
9543deb304
Merge pull request #6046 from MaelRL/PM-Fix_pmaps_reference_types_master-GF
...
Various fixes for property maps (master)
2021-10-29 17:40:15 +02:00
Laurent Rineau
ca89949169
Merge pull request #5597 from lrineau/Mesh_3-weighted_images-GF
...
Mesh_3: Add weighted images
2021-10-29 17:01:33 +02:00
Jane Tournois
0498cace68
add and use CGAL_ITK_support.cmake
2021-10-29 12:27:04 +02:00
Dmitry Anisimov
634b961b1c
Merge remote-tracking branch 'origin/master' into Region_growing-revision-danston
2021-10-21 16:29:48 +02:00
Mael Rouxel-Labbé
131242bb80
Merge branch 'PM-Fix_pmaps_reference_types-GF' into PM-Fix_pmaps_reference_types_5.3-GF
2021-10-12 09:29:23 +02:00
Mael Rouxel-Labbé
8166579e55
Merge branch 'PM-Fix_pmaps_reference_types-GF' into PM-Fix_pmaps_reference_types_master-GF
2021-10-11 19:58:07 +02:00
Mael Rouxel-Labbé
590ddf8015
Various fixes for pmaps:
...
- Use `value_type` when the returned type is not a reference
- Enforce `reference = value_type` if the returned type is not
a reference (to avoid `typename PM::reference r = get(m, k)`,
which will take a ref to a temporary if the `reference`
typedef is an actualy reference)
- Do not use `put_get_helper` if the property map is not a `lvalue`
**mutable** property map: the `put()` is `map[k] = v`, which
is broken if `operator[]` does not return a reference
- The concept `boost::lvalue_property_map_tag` requires `operator[](key)`,
not a reference in `get(map, key)`. You can have a readable property map
returning a reference through its `get(map, key)`, but if there is
no `operator[]`, it's just a `boost::readable_property_map_tag`
- Some const correctness to avoid copying maps with state
or heavy keys in `get(map, key)` / `put(map, key, value)`
- Base the category of a wrapping pmap on what it offers instead
of just forwarding the base property map's category
- Tried to do something like mutable lvalue pmap:
* `value_type& operator[](key&)`
* `ref get(map, const key&)`
* `put(map, const key&, const value_type&)`
and non-mutable lvalue pmap:
* `const value_type& operator[](const key&)`
* `ref get(map, const key&)`
but not everything fits properly...
2021-10-08 15:38:47 +02:00
Mael Rouxel-Labbé
df560987a6
Whitespace & cleaning changes
2021-10-08 12:13:43 +02:00
Laurent Rineau
f581ff74d3
Merge pull request #5427 from sloriot/CGAL_data-moving_files
...
Regroup data: moving files
# Conflicts:
# Nef_3/archive/triangulation/include/CGAL/partition_is_valid_2.h
2021-10-07 14:44:01 +02:00
Laurent Rineau
1ba982096a
Merge pull request #5094 from sgiraudot/Boolean_operations-Use_GPS_based_polylines-GF
...
[Small Feature] Boolean Operations: Use polyline-based GPS
2021-10-07 14:27:23 +02:00
Sébastien Loriot
1857a25d28
Merge remote-tracking branch 'cgal/master' into CGAL_data-moving_files
2021-10-06 13:50:31 +02:00
Jane Tournois
9beac5e039
hide menu when the input is not a labeled image
2021-10-04 16:08:24 +02:00
Mael Rouxel-Labbé
521c72d57e
Fix typos
2021-10-04 13:34:07 +02:00
Jane Tournois
992f55bf3d
fix warning
2021-10-04 12:10:41 +02:00
Jane Tournois
38122ce61a
disable the weights menu when ITK is not available
2021-10-04 12:10:26 +02:00
Sébastien Loriot
47028cd184
automatically move data files in data dir + update paths
...
Done for OFF/OBJ/STL/XYZ/PWN/PLY
2021-10-04 09:42:49 +02:00
Laurent Rineau
804feece28
Merge pull request #5761 from danston/Weights-unification-danston
...
[Small Feature] Weights Unification
2021-09-29 16:59:34 +02:00
Laurent Rineau
0f26960174
Merge pull request #6019 from sloriot/CGAL-enum_arithm_w
...
Fix warnings about arithmetic operations on enum
2021-09-29 16:59:31 +02:00
Sébastien Loriot
3640099261
fix warnings about arithmetic operations on enum
2021-09-28 15:36:51 +02:00
Sébastien Loriot
d25b5d48ae
remove unused variable
2021-09-27 19:49:00 +02:00
Jane Tournois
9f5f5aa7a7
use angle_and_area_smoothing
...
and remove the use of deprecated smooth_mesh()
2021-09-27 17:24:24 +02:00
Sébastien Loriot
71932f2f1e
manual fixes
2021-09-23 18:56:29 +02:00
Sébastien Loriot
420f37a365
fix compilation issues
2021-09-23 16:28:23 +02:00
Jane Tournois
96ff627da4
fix CMakeLists.txt
2021-09-23 14:58:07 +02:00
Jane Tournois
4b3fee813f
ITK is not needed in c3t3_item, and find with the required components only
2021-09-23 14:46:40 +02:00
Jane Tournois
3df8c33330
Merge remote-tracking branch 'cgal/master' into Mesh_3-weighted_images-GF
...
# Conflicts:
# Polyhedron/demo/Polyhedron/CMakeLists.txt
2021-09-23 11:37:35 +02:00
Dmitry Anisimov
0d86275191
Merge remote-tracking branch 'origin/master' into Region_growing-revision-danston
2021-09-22 12:20:28 +02:00
Jane Tournois
4fdd584154
fix indentation
...
Co-authored-by: Laurent Rineau <Laurent.Rineau@cgal.org>
2021-09-21 21:47:40 +02:00
Laurent Rineau
16c0aab3cc
Merge pull request #5809 from maxGimeno/Polyhedron_demo-Filtering_c3t3_item_display-maxGimeno
...
Polyhedron Demo: Filtering c3t3 item display
2021-09-21 09:57:46 +02:00
Jane Tournois
60648b5209
add tangential relaxation to the Smoothing_plugin
2021-09-17 09:48:59 +02:00
Sebastien Loriot
1d4df77129
Merge pull request #5527 from MaelRL/Distance_3-Add_Tri_Tri-GF
...
Add squared_distance(Tri3, Tri3) + Distance_23 general improvements
2021-09-10 17:38:10 +02:00
Sebastien Loriot
464f71d529
Merge pull request #4908 from maxGimeno/Demo-T3_item-mgimeno
...
Polyhedron demo: Scene_triangulation_3_item
2021-09-10 17:37:22 +02:00
Mael Rouxel-Labbé
80c81a2c17
Fix typo
2021-09-08 15:54:32 +02:00
Dmitry Anisimov
936968fb4f
Merge remote-tracking branch 'origin/master' into Weights-unification-danston
2021-09-06 10:38:24 +02:00
Mael Rouxel-Labbé
8a92d51601
Merge branch 'Distance_3-Add_Tri_Tri-GF-old' into Distance_3-Add_Tri_Tri-GF
2021-09-02 17:26:44 +02:00
Sebastien Loriot
fd94f61198
Merge pull request #5785 from maxGimeno/Google-readability-casting-maxGimeno
...
Clang-tidy: google-readability-casting
2021-09-02 15:46:54 +02:00
Sebastien Loriot
a7a1d98aff
Merge pull request #5950 from maxGimeno/Demo-Edit_grid_plugin-maxGimeno
...
Polyhedron Demo: SM's grid in a single item
2021-09-02 15:43:51 +02:00
Maxime Gimeno
08508ff1fc
Merge remote-tracking branch 'cgal/master' into Demo-T3_item-mgimeno
2021-09-02 14:56:07 +02:00
Maxime Gimeno
c095ef2a00
Merge remote-tracking branch 'mine/Demo-T3_item-mgimeno' into Polyhedron_demo-Filtering_c3t3_item_display-maxGimeno
2021-09-02 11:42:28 +02:00
Maxime Gimeno
d83b79aa09
init t_item to nullptr
2021-09-02 08:51:43 +02:00
Maxime Gimeno
77c9ac05be
clean-up
2021-09-01 12:07:43 +02:00
Maxime Gimeno
342fb09f72
fix warning and link to tbb
2021-09-01 12:03:36 +02:00
Maxime Gimeno
6935503b71
Add a check-box to create all the grid in a single item
2021-09-01 10:46:20 +02:00
Sebastien Loriot
6e4f55e1e5
Merge pull request #5407 from maxGimeno/T2-Document_projection_traits_3-maxGimeno
...
Triangulation_2 : Document the `Triangulation_2_projection_traits_3` class
2021-08-31 19:01:33 +02:00
Jane Tournois
e1d4c0df80
rename generate_weights() to generate_label_weights()
2021-08-31 14:58:21 +02:00
Maxime Gimeno
af1a69e193
Merge remote-tracking branch 'cgal/master' into Google-readability-casting-maxGimeno
2021-08-31 10:39:27 +02:00
Maxime Gimeno
3404c2e35d
Fix bool init
2021-08-31 09:58:49 +02:00
Maxime Gimeno
27c832b780
Fix alpha for intersection
2021-08-30 15:42:00 +02:00
Maxime Gimeno
d4b0b49f33
Use "real" extensions and fix loading.
2021-08-30 15:41:52 +02:00
Maxime Gimeno
98bfd2e1b7
fix error in loader
2021-08-30 15:41:40 +02:00
Maxime Gimeno
f5dd1fee69
WIP copyProperties
2021-08-30 15:41:27 +02:00
Maxime Gimeno
0ee3a5dc73
c3t3_item has cnc, stats and is-surface
2021-08-30 15:39:52 +02:00
Maxime Gimeno
e743810349
WIP rewrite c3t3_item
2021-08-30 15:23:59 +02:00
Maxime Gimeno
103a1a8105
WIP : New item doesn't crash when loaded, and displays correctly.
2021-08-30 14:37:41 +02:00
Maxime Gimeno
0109f36610
WIP factorization
2021-08-30 14:37:21 +02:00
Maxime Gimeno
740d819914
Add I/O
2021-08-30 14:37:08 +02:00
Maxime Gimeno
1689b36f94
add an inttersection plane.
2021-08-30 14:36:57 +02:00
Maxime Gimeno
e67a747a5c
WIP t3_item
2021-08-30 14:36:44 +02:00
Maxime Gimeno
bb7895df03
WIP triangulation_3_plugin
2021-08-30 14:35:14 +02:00
Maxime Gimeno
720b2dd090
Fix conflicts and fix Cut_plugin
2021-08-30 12:47:10 +02:00
Sébastien Loriot
4454c5b3ed
Merge remote-tracking branch 'cgal/master' into T2-Document_projection_traits_3-maxGimeno
2021-08-30 12:25:51 +02:00
Sebastien Loriot
20ea9e775f
Merge pull request #4009 from afabri/CGAL-internal-GF
...
CGAL: Move from CGAL/internal to CGAL/Pkg/internal
2021-08-30 11:55:36 +02:00
Sebastien Loriot
1bd8e07743
Merge pull request #5851 from maxGimeno/PMP-Add_a_visitor_to_orient_polygon_soup-maxGimeno
...
PMP: Add a visitor to the orientation function
2021-08-30 10:45:41 +02:00
Maxime Gimeno
f7ec973d69
clean-up remaining debug code
2021-08-30 09:02:57 +02:00
Sébastien Loriot
98e471849b
moving files from internal to PKG/internal
2021-08-26 11:33:39 +02:00
Sébastien Loriot
fb1cef4d8f
Merge remote-tracking branch 'cgal/5.3.x-branch'
2021-08-25 10:46:19 +02:00
Sébastien Loriot
f1aa145fd4
Merge remote-tracking branch 'cgal/5.2.x-branch' into HEAD
2021-08-25 10:45:44 +02:00
Sébastien Loriot
733e7b7823
fix typos
2021-08-25 10:45:05 +02:00
Sébastien Loriot
abc945db89
fix warning
2021-08-19 20:46:32 +02:00
Dmitry Anisimov
c4da891c16
fixed polyhedron demo
2021-08-16 13:26:22 +02:00
Dmitry Anisimov
460c50b142
Merge remote-tracking branch 'origin/master' into Region_growing-revision-danston
2021-08-16 12:28:34 +02:00
Dmitry Anisimov
60804d738e
Merge remote-tracking branch 'origin/master' into Weights-unification-danston
2021-08-14 18:34:47 +02:00
Sébastien Loriot
de6d8c6cbd
Merge pull request #5742 from danston/Shape_regularization-new_package-danston
...
[Feature] Shape Regularization New Package
2021-08-13 18:19:35 +02:00
Sebastien Loriot
6b9892e40d
Merge pull request #5877 from maxGimeno/Demo-Plane_item_change_name_action-maxGimeno
...
Polyhedron Demo: Scene_plane_item
2021-08-13 18:15:32 +02:00
Maxime Gimeno
91e41ad75c
Replace the label by two DoubleEdit to be able to precisely set the interval.o
2021-08-12 16:12:01 +02:00
Maxime Gimeno
fae3d8e6d0
Color for the tets
2021-08-12 14:33:03 +02:00
Maxime Gimeno
f1629ce83a
Add misisng clone()
2021-08-12 13:43:36 +02:00
Dmitry Anisimov
c975eddf13
Merge remote-tracking branch 'origin/master' into Weights-unification-danston
2021-08-12 13:29:26 +02:00
Maxime Gimeno
296453d975
Merge the two plugins
2021-08-12 12:31:24 +02:00
Maxime Gimeno
dbc6e22af2
Robustify more
2021-08-12 11:54:58 +02:00
Maxime Gimeno
bc2a8eb086
Robustify
2021-08-12 11:43:31 +02:00
Maxime Gimeno
14a95a3680
Add a tooltip and some factorization
2021-08-12 11:36:17 +02:00
Maxime Gimeno
1dcf8fde23
Filtering done with an intervalle. Working.
2021-08-12 11:25:13 +02:00
Sébastien Loriot
814c9138ef
Merge remote-tracking branch 'cgal/5.3.x-branch'
2021-08-12 10:38:11 +02:00
Maxime Gimeno
9875c4baca
WIP The sliders don't really ike being equal.
2021-08-12 10:32:56 +02:00
Sébastien Loriot
cff3cdb40e
Merge remote-tracking branch 'cgal/5.2.x-branch' into HEAD
2021-08-12 10:23:57 +02:00
Maxime Gimeno
4f9faf0ed1
Add missing files
2021-08-12 10:09:54 +02:00
Maxime Gimeno
c052440a1c
WIP working filtering, need robustification and nicer widget
2021-08-11 15:18:10 +02:00
Maxime Gimeno
8f1c510c49
WIP program
2021-08-10 15:21:33 +02:00
Maxime Gimeno
3f8375b15f
Baic draw for new item
2021-08-10 14:19:39 +02:00
Maxime Gimeno
f7df517f57
Merge remote-tracking branch 'cgal/master' into T2-Document_projection_traits_3-maxGimeno
2021-08-09 09:14:23 +02:00
Sébastien Loriot
b539d4a301
extend the visitor to report non-manifold vertex in an umbrella without nm edge
2021-08-05 18:13:35 +02:00
Dmitry Anisimov
933940435a
Merge remote-tracking branch 'origin/master' into Shape_regularization-new_package-danston
2021-08-04 15:30:10 +02:00
Sébastien Loriot
0361a83cd3
fix degree of an isolated vertex
2021-08-04 15:22:14 +02:00
Dmitry Anisimov
4126a5feec
Merge branch 'master' into Weights-unification-danston
2021-08-04 13:58:33 +02:00
Sébastien Loriot
bc1fe892d8
remove const&
2021-08-02 10:40:12 +02:00
Maxime Gimeno
eefb449aca
WIP tetrahedra_item and plugin
2021-07-30 15:59:12 +02:00
Maxime Gimeno
c99fdebafe
add a non_manifold_vertex() function to the visitor
2021-07-30 12:17:06 +02:00
Maxime Gimeno
a551d333cf
Change name of an action
2021-07-29 15:49:07 +02:00
Maxime Gimeno
a2c1a268e2
fix plugin
2021-07-29 11:51:26 +02:00
Jane Tournois
53cd9a0247
fix DoubleEdit content
2021-07-28 16:53:08 +02:00
Jane Tournois
a7a9699185
fix tab order
2021-07-28 16:43:52 +02:00
Jane Tournois
d41a8f4bb2
add tooltip to c3t3 generated from image
2021-07-28 16:23:23 +02:00
Jane Tournois
77327b5461
(re)compute weights only if sigma has changed
2021-07-28 15:26:02 +02:00
Jane Tournois
ecdb8730df
move weights to the image_item so that it does not get prematurely deleted
2021-07-28 15:07:06 +02:00
Jane Tournois
f46caacdad
WIP fix weighted images in demo
2021-07-27 16:38:33 +02:00
Laurent Rineau
2599d8e41a
Merge pull request #5863 from MaelRL/BGL-Fix_FFG_nonconst_index_pmaps-GF
...
Fix index maps for non-const Face_filtered_graph
2021-07-27 15:55:11 +02:00
Laurent Rineau
71175aad53
Merge pull request #5863 from MaelRL/BGL-Fix_FFG_nonconst_index_pmaps-GF
...
Fix index maps for non-const Face_filtered_graph
2021-07-27 15:52:23 +02:00
Jane Tournois
2637bf6343
add weighted images to the demo
2021-07-27 09:33:49 +02:00
Maxime Gimeno
22edbbe428
Merge remote-tracking branch 'cgal/master' into PMP-Add_a_visitor_to_orient_polygon_soup-maxGimeno
2021-07-26 11:46:51 +02:00
Mael Rouxel-Labbé
5240e402de
Fix wrong PMap type
2021-07-23 14:26:40 +02:00
Maxime Gimeno
f8315e09b7
DOn't use a pair.
2021-07-22 15:19:58 +02:00
Maxime Gimeno
f36e5eadf9
Remove to_remove
2021-07-22 09:37:48 +02:00
Maxime Gimeno
83e7abf042
Changes after review
2021-07-21 12:48:11 +02:00
Maxime Gimeno
3cfa3e8c86
Use a NP to pass the visitor
2021-07-19 13:40:19 +02:00
Maxime Gimeno
1b04db1fad
Give the visitor by copy (1st step for the Named Parameters)
2021-07-19 13:18:26 +02:00
Maxime Gimeno
36dd5be796
more fixes
2021-07-19 13:05:17 +02:00
Maxime Gimeno
b027d31bfd
remove the "Extract NM Simplicies" action
2021-07-19 12:06:43 +02:00
Maxime Gimeno
67b2fd1454
Fix default visitor mechanism
2021-07-19 11:48:20 +02:00
Maxime Gimeno
05761799e8
Fix the filtering in the plugin
2021-07-19 11:25:37 +02:00
Sebastien Loriot
40f507a1f1
Merge pull request #5800 from MaelRL/SS-Doc_fixes-GF
...
Harmonization of some IO stream documentation
2021-07-19 07:56:48 +02:00