Commit Graph

992 Commits

Author SHA1 Message Date
Guillaume Damiand bd04b2a68d Remove space in doc 2023-12-06 17:01:34 +01:00
Guillaume Damiand 03ff679df4 doc draw: move advanced blocks 2023-12-05 14:10:25 +01:00
Guillaume Damiand 711a07dfe9 doc draw surface mesh and polyhedron 2023-12-05 13:49:32 +01:00
Guillaume Damiand b8c5b1ca27 A (last) verification step for all draw functions (nyf). 2023-11-30 12:49:42 +01:00
Guillaume Damiand f8a487d9ef update dependencies 2023-11-29 18:12:09 +01:00
Guillaume Damiand 0655006622 Merge with master: now viewers use Qt6 2023-11-29 14:36:38 +01:00
Sébastien Loriot cfac63f156 Merge remote-tracking branch 'cgal/master' into HEAD 2023-11-16 11:35:35 +01:00
Andreas Fabri 4e5082b6b5 remove _qt 2023-11-14 09:25:00 +00:00
Laurent Rineau bdfe153cd9 Merge pull request #7784 from janetournois/BGL-warning_fixed-jtournois
BGL - no need to workaround boost 1.54 anymore
2023-11-06 12:52:24 +01:00
Guillaume Damiand 761fde02be add_in_graphics_scene -> add_to_graphics_scene; plus remove template parameter NumberType 2023-10-23 01:52:38 +02:00
Guillaume Damiand d74a3dbeac Remove template parameter for graphics scene 2023-10-22 17:12:21 +02:00
Jane Tournois 6b8eaa4e5c remove CGAL workaround from cpp files 2023-10-12 10:12:09 +02:00
Guillaume Damiand a5ee74cb66 Merge branch 'master' into gsoc2022-EBVs-Mostafa-ashraf19 2023-09-29 08:36:37 +02:00
Guillaume Damiand 9f22d67ed0 Rename Graphic_storage in Graphics_scene (Andreas and Sebastien review) 2023-09-28 12:49:00 +02:00
Guillaume Damiand fd115bd321 Rename Graphic_storare into Graphics_scene (Andreas and Sebastien review) 2023-09-28 11:06:53 +02:00
Guillaume Damiand ebd13c8551 Rename Drawing_functor in Graphics_scene_options (following Andreas and Sebastien review) 2023-09-28 09:13:44 +02:00
Laurent Rineau 28632f21fc Merge branch 'master' into CGAL-Qt6-GF
# Conflicts:
#	Installation/CHANGES.md
2023-09-14 17:40:05 +02:00
Laurent Rineau b05e1e9e46 Remove UseCGAL.cmake
and our old CMake macros `use_lib` and `use_component`.
2023-09-14 17:32:55 +02:00
Laurent Rineau 2f6d51b49b Remove a few occurrences of CGAL_Qt5
... and replace by CGAL_Qt6
2023-09-14 16:33:20 +02:00
Sébastien Loriot a54e024a32 start adding dynamic property maps with default
WIP: need updates in all models of face graph
2023-09-13 17:59:52 +02:00
Laurent Rineau 46923342ad Merge pull request #7576 from albert-github/feature/issue_7395
issue #7395 Improvement of layout of model relations

# Conflicts:
#	Kernel_23/doc/Kernel_23/CGAL/Vector_2.h
2023-09-07 10:48:34 +02:00
Laurent Rineau c50c72fd28 Merge pull request #7648 from albert-github/feature/bug_pkgdesc_incl
Better showing of `#include`
2023-09-07 10:46:32 +02:00
Mael Rouxel-Labbé 5425d089da Merge remote-tracking branch 'cgal/master' into PMP-Remove_degen_faces-no-clear-GF 2023-09-05 14:52:16 +02:00
Guillaume Damiand 467e55f10d Merge branch 'master' into gsoc2022-EBVs-Mostafa-ashraf19 2023-08-28 14:38:58 +02:00
Sébastien Loriot 608d0c81c4 use a macro 2023-08-24 14:56:48 +02:00
Sébastien Loriot 68bc244d02 Merge remote-tracking branch 'cgal/master' into HEAD 2023-08-24 14:14:12 +02:00
albert-github 93001308f4 Merge branch 'master' into feature/issue_7395
# Conflicts:
#	Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementPointLocation_2.h
#	Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementVerticalRayShoot_2.h
2023-08-18 11:10:42 +02:00
Sébastien Loriot 28f904f4e2 Merge remote-tracking branch 'cgal/master' 2023-08-15 07:16:14 +02:00
Sébastien Loriot eada3ee8ca Merge branch 'master' into 'sloriot/CGAL-using_c++17_stl' 2023-08-14 14:19:25 +02:00
albert-github 0ce82c0bd5 Better showing of `#include`
Getting a better (and consistent) output for the include file to be used with some functions.
Normally `#include` are sown as in a typewrite font, but the `#include` in these cases were shown in a code block way.
2023-08-13 18:22:07 +02:00
albert-github 1cce66c343 Spelling corrections
Spelling corrections `a e...` -> `an e...`
2023-07-30 12:59:17 +02:00
Mael Rouxel-Labbé 7f85651e82 Merge remote-tracking branch 'cgal/master' into PMP-Remove_degen_faces-no-clear-GF 2023-07-19 13:55:35 +02:00
Mael Rouxel-Labbé 146f9ecb21 Add specializations for Surface_mesh and Polyhedron_3 2023-07-19 13:48:34 +02:00
Sébastien Loriot 125542eb62 Merge remote-tracking branch 'cgal/master' 2023-07-11 12:59:21 +02:00
albert-github 301728a8a9 issue #7395 Improvement of layout of model relations
- Completed the cgalModels part
2023-07-09 12:43:36 +02:00
Sébastien Loriot b66afab814 Merge remote-tracking branch 'sloriot/CGAL-using_c++17_stl' into HEAD 2023-07-05 11:29:35 +02:00
Guillaume Damiand 6664339b3f Update drawing functor for surface mesh 2023-06-27 09:56:06 +02:00
Guillaume Damiand fe23441eab Merge master 2023-06-26 14:42:33 +02:00
Guillaume Damiand 7da9812bda Rename graphic_buffer into graphic_storage. 2023-06-22 15:18:34 +02:00
Sébastien Loriot 573de7f29e Merge branch 'master' 2023-06-22 13:38:49 +02:00
Sébastien Loriot f936680600 Merge remote-tracking branch 'cgal/master' into HEAD 2023-06-15 18:48:39 +02:00
Sébastien Loriot 9cdfe70abb Merge remote-tracking branch 'sloriot/CGAL-toward_6.0' 2023-06-15 11:34:09 +02:00
Sébastien Loriot 9a0bdb5d96 boost::variant ---> std::variant 2023-06-15 10:57:10 +02:00
Sébastien Loriot 604dcdc435 boost::optional => std::optional 2023-06-15 10:57:09 +02:00
Sébastien Loriot 1e6519e51a Merge remote-tracking branch 'cgal/5.5.x-branch' 2023-05-11 17:28:21 +02:00
Laurent Rineau 4f6398a4e2 Merge pull request #6575 from nh2/ply-property-lists
PLY: Support writing per-face/vertex property lists
2023-05-11 17:01:44 +02:00
Laurent Rineau 1b84329710 Merge pull request #7229 from GilesBathgate/General-safe_bool_idiom-GilesBathgate
Remove use of the safe-bool idiom, replace with explicit operator bool
2023-05-03 15:05:45 +02:00
Guillaume Damiand 519c7cc1a5 rename add_in_graphic_buffer into add_in_graphic_storage 2023-04-28 15:25:40 +02:00
Guillaume Damiand 4df2edd9c1 Replace draw_buffer by draw_graphic_storage 2023-04-28 12:26:31 +02:00
Guillaume Damiand 8f29e4d323 Rename class graphic buffer 2023-04-27 15:48:42 +02:00
Guillaume Damiand 5709abc61c example basic viewer 2023-04-27 14:53:48 +02:00
Guillaume Damiand cb2d50654c Rename package basic viewer; move example 2023-04-27 12:25:56 +02:00
Guillaume Damiand d780acb988 Example for basic viewer draw small faces 2023-04-25 17:05:13 +02:00
Sébastien Loriot 2f7d150531 boost::begin/end/empty/size -> std::begin/end/empty/size 2023-04-23 23:01:35 +02:00
Sébastien Loriot a04035879d boost::is_const -> std::is_const 2023-04-23 22:37:07 +02:00
Sébastien Loriot a88af6c0c6 boost::array -> std::array 2023-04-23 22:37:07 +02:00
Sébastien Loriot 99e7f4806a boost::int -> std::int 2023-04-23 18:43:10 +02:00
Sébastien Loriot fc034c6a5d boost::unit -> std::uint 2023-04-23 18:40:39 +02:00
Andreas Fabri b1040de076 Surface_mesh example works as well 2023-04-19 14:46:31 +01:00
Sébastien Loriot 0668ef8cb3 test reading of arbitrary properties + list 2023-04-12 13:42:40 +02:00
Sébastien Loriot c6e65964ec handle list attribute while reading PLY 2023-04-12 13:42:24 +02:00
Laurent Rineau ac58449af5 Merge pull request #7342 from oleg-alexandrov/master
Add example of printing vertex coordinates
2023-03-31 11:10:42 +02:00
Laurent Rineau 41f0e07022 Merge pull request #7343 from afabri/Surface_mesh-points-GF
Surface_mesh: Add example for accessing points
2023-03-31 11:10:39 +02:00
Andreas Fabri 1ac310daa1 Add to dependencies 2023-03-21 16:59:58 +01:00
Andreas Fabri 81761ea5a3 Add to examples.txt 2023-03-21 16:59:17 +01:00
Andreas Fabri fcef17c918 Surface_mesh: Add example for accessing points 2023-03-21 09:44:49 +01:00
Oleg Alexandrov aa4b2fcfd4
Add example of printing vertex coordinates 2023-03-20 09:01:29 -07:00
Andreas Fabri 161f1b83d4 Surface_mesh: Document join() 2023-03-10 16:43:52 +00:00
Laurent Rineau ea016d7f5b Merge pull request #6702 from soesau/Region_growing-revision-soesau
[Small Feature] Region growing revision soesau
2023-03-02 13:42:32 +01:00
Laurent Rineau 5a20fd8567 Merge pull request #7238 from albert-github/feature/bug_author_consistency
Making description of author(s)  of a package consistent
2023-02-24 16:14:43 +01:00
Sébastien Loriot 640910288b Merge remote-tracking branch 'cgal/master' into Region_growing-revision-soesau 2023-02-16 14:18:17 +01:00
Laurent Rineau a5052f4cd8 Merge pull request #6835 from MaelRL/CGAL-Clean_CMakeLists.txt-GF
Some CMakeLists.txts cleaning
2023-02-16 10:52:29 +01:00
Sébastien Loriot 9242a810c4 Merge remote-tracking branch 'cgal/master' into Region_growing-revision-soesau 2023-02-07 11:31:55 +01:00
albert-github 57e900b47c Making description of author(s) of a package consistent
- use `\cgalPckAuthor` in case of one author
- use of `\cgalPckAuthors` in case of multiple authors
- using in case of multiple authors always `, and `
- in the 1.9.6 `BaseDoxyfile.in` let the `\cgalPckAuthors` point to `\cgalPckAuthor` to get consistent output (not done for other versions as in the past the `ALIASES` could not call one another).
2023-02-02 18:40:44 +01:00
Laurent Rineau b32457efb3 Merge pull request #6816 from maximecharriere/dev/drawGraphColor
Draw mesh color in SimpleFaceGraphViewerQt
2023-02-02 10:58:32 +01:00
Giles Bathgate 2c7f7751a8 Add equal operator to Properties.h 2023-01-30 20:47:18 +00:00
Giles Bathgate ff6b741afc Is a comparison operator needed 2023-01-30 20:31:19 +00:00
Giles Bathgate 679ee1f870 Remove use of the safe-bool idiom, replace with explicit operator bool 2023-01-30 19:39:42 +00:00
Mael 153c603209
Merge branch 'master' into CGAL-Clean_CMakeLists.txt-GF 2023-01-27 22:09:02 +01:00
Laurent Rineau fc61b42864 Merge pull request #6858 from sloriot/Doc-exclude_internal
Ignore internal directories
2023-01-27 21:02:29 +01:00
Mael 4a477c248e
Merge branch 'master' into dev/drawGraphColor 2023-01-19 14:37:45 +01:00
Mael 07646a4140
Fix warning 2023-01-03 16:38:27 +01:00
Sébastien Loriot fef1a43d35 remove internal from generated doc 2022-12-15 10:43:27 +01:00
Mostafa-ashraf19 803fc71fb7 Path handled 2022-12-09 14:07:48 +02:00
Mostafa-ashraf19 5948fc19fe Initial Commit 2022-12-09 14:05:38 +02:00
Mael Rouxel-Labbé a8c792c4e9 Anticipate some warnings 2022-12-08 10:29:04 +01:00
Mael Rouxel-Labbé 9833bcf9f0 Use some color property maps in the surface_mesh basic draw example 2022-12-08 01:14:15 +01:00
Mael Rouxel-Labbé c670c24e3a Add an element coloring functor for Surface_mesh that checks for internal pmaps 2022-12-08 01:08:07 +01:00
Mael 6538b22e06
Merge branch 'master' into CGAL-Clean_CMakeLists.txt-GF 2022-12-05 16:03:41 +01:00
Sébastien Loriot c5207cb5ad Merge remote-tracking branch 'cgal/master' into HEAD 2022-11-24 09:54:56 +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
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
albert-github c32b1f4127 spelling corrections
Some spelling corrections (Directories starting with `S` rest - `W`),
2022-11-16 13:22:39 +01:00
Laurent Rineau 746c2d438e Merge pull request #7017 from afabri/Stream_support-ply_color-GF
Surface_mesh: Deal with PLY files with vertex and face color of type float
2022-11-15 17:01:36 +01:00
Laurent Rineau 44f6d1349f
Merge branch 'master' into SMS-Add_EF_stop_predicates-GF 2022-11-15 11:42:03 +01:00
Andreas Fabri 178bc9e905 More static cast 2022-11-10 09:24:26 +00:00
Andreas Fabri fa6a2bddac static_cast to avoid warning 2022-11-09 08:32:59 +00:00
Andreas Fabri 3f9f7429b8
Update Surface_mesh/include/CGAL/Surface_mesh/IO/PLY.h
Co-authored-by: Sebastien Loriot <sloriot.ml@gmail.com>
2022-11-07 10:20:13 +01:00
Andreas Fabri b8e96fef84 Surface_mesh: Deal with PLY files with vertex and face color which is float instead of unsigned char 2022-11-07 09:11:19 +00:00
Laurent Rineau 987391d8ee Merge pull request #6930 from MaelRL/BGL-Use_is_valid_descriptor-GF
BGL graph validity improvements
2022-11-07 10:08:34 +01:00