Commit Graph

487 Commits

Author SHA1 Message Date
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
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
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 e4dff1ffaf issue #7395 Improvement of layout of model relations
Corrections after review.
2023-07-21 11:41:27 +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 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 71b4e4f08f boost::shared_ptr => std::shared_ptr 2023-06-15 10:57:01 +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
Guillaume Damiand 519c7cc1a5 rename add_in_graphic_buffer into add_in_graphic_storage 2023-04-28 15:25:40 +02:00
Laurent Rineau 0576e883f9 Merge branch 'CGAL-fix-Qt5-CMake-GF' into CGAL-Qt6-GF
# Conflicts:
#	AABB_tree/demo/AABB_tree/CMakeLists.txt
#	Alpha_shapes_3/demo/Alpha_shapes_3/CMakeLists.txt
#	Arrangement_on_surface_2/demo/Arrangement_on_surface_2/CMakeLists.txt
#	Circular_kernel_3/demo/Circular_kernel_3/CMakeLists.txt
#	GraphicsView/demo/Alpha_shapes_2/CMakeLists.txt
#	GraphicsView/demo/Apollonius_graph_2/CMakeLists.txt
#	GraphicsView/demo/Bounding_volumes/CMakeLists.txt
#	GraphicsView/demo/Circular_kernel_2/CMakeLists.txt
#	GraphicsView/demo/Generator/CMakeLists.txt
#	GraphicsView/demo/GraphicsView/CMakeLists.txt
#	GraphicsView/demo/L1_Voronoi_diagram_2/CMakeLists.txt
#	GraphicsView/demo/Largest_empty_rect_2/CMakeLists.txt
#	GraphicsView/demo/Periodic_2_triangulation_2/CMakeLists.txt
#	GraphicsView/demo/Polygon/CMakeLists.txt
#	GraphicsView/demo/Segment_Delaunay_graph_2/CMakeLists.txt
#	GraphicsView/demo/Segment_Delaunay_graph_Linf_2/CMakeLists.txt
#	GraphicsView/demo/Snap_rounding_2/CMakeLists.txt
#	GraphicsView/demo/Spatial_searching_2/CMakeLists.txt
#	GraphicsView/demo/Stream_lines_2/CMakeLists.txt
#	GraphicsView/include/CGAL/Qt/DemosMainWindow_impl.h
#	Hyperbolic_triangulation_2/demo/Hyperbolic_triangulation_2/CMakeLists.txt
#	Installation/cmake/modules/CGAL_add_test.cmake
#	Linear_cell_complex/demo/Linear_cell_complex/CMakeLists.txt
#	Optimal_transportation_reconstruction_2/demo/Optimal_transportation_reconstruction_2/CMakeLists.txt
#	Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/CMakeLists.txt
#	Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/CMakeLists.txt
#	Polyhedron/demo/Polyhedron/polyhedron_demo_macros.cmake
#	Polyline_simplification_2/demo/Polyline_simplification_2/CMakeLists.txt
#	Principal_component_analysis/demo/Principal_component_analysis/CMakeLists.txt
#	Triangulation_3/demo/Triangulation_3/CMakeLists.txt
#	Triangulation_on_sphere_2/demo/Triangulation_on_sphere_2/CMakeLists.txt
2023-04-28 13:49:58 +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
Laurent Rineau 67441a3772 Convert all CMakeLists.txt to Qt6 2023-04-25 17:27:03 +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
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
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
Sébastien Loriot 464f5a0d46 remove extra cond 2023-01-31 10:49:33 +01:00
Mael 153c603209
Merge branch 'master' into CGAL-Clean_CMakeLists.txt-GF 2023-01-27 22:09:02 +01:00
Mael 0ff7882997
Merge branch 'master' into feature/bug_documentation_spell_20221113 2022-12-06 22:21:06 +01:00
Sébastien Loriot d3b13fb11c Merge branch 'cgal/5.5.x-branch' 2022-12-05 19:00:39 +01:00
Mael 6538b22e06
Merge branch 'master' into CGAL-Clean_CMakeLists.txt-GF 2022-12-05 16:03:41 +01:00
Sébastien Loriot 0fb05d1480 fix warning 2022-11-15 20:04:23 +01: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
Jane Tournois 38fd07dfc4 differentiate has_normal_map() between const and non-const point set 2022-11-08 10:24:43 +01:00
Jane Tournois 826b2a19c4 Merge branch 'PSP-fix_has_normal_map-GF' of https://github.com/janetournois/cgal into PSP-fix_has_normal_map-GF 2022-11-07 13:15:55 +00:00
Jane Tournois 32486e4be8 precise default normal 2022-11-07 14:14:30 +01:00
Jane Tournois a24c6ac84c
Apply suggestions from Mael's code review
Co-authored-by: Mael <mael.rouxel.labbe@geometryfactory.com>
2022-11-07 14:13:18 +01:00
Sebastien Loriot 1a226ed877
Restore [revious API 2022-11-07 10:41:22 +01:00
Jane Tournois 9ed334bcf9 now normal_map is always valid
since it is created before it's used, when not available
2022-11-04 14:27:09 +01:00
Jane Tournois dcf0ea09b3 create normal_map when not already created before usage 2022-11-04 14:12:52 +01:00
Jane Tournois 0ee5493f02 revert unintended change 2022-10-25 12:53:39 +02:00
Jane Tournois e99f442830 NP_helper::has_normal_map should not always return true
look for a normal_map in the point set, and in the named parameters

# Conflicts:
#	BGL/include/CGAL/boost/graph/named_params_helper.h
#	Point_set_processing_3/include/CGAL/jet_estimate_normals.h
2022-10-25 12:12:29 +02:00
Andreas Fabri 1c28b3df45 Point_set_3: Fix typos in the reference manual page 2022-10-24 15:15:50 +01:00
Guillaume Damiand 1b1e6999e1 Review point set 3 2022-10-17 19:44:26 +02:00
Guillaume Damiand 24a8004ee0
Merge branch 'master' into gsoc2022-EBVs-Mostafa-ashraf19 2022-10-14 08:53:12 +02:00
Mostafa-ashraf19 68b031e113 Uses overloading functions instead of different fill_buffer names. 2022-10-04 18:43:14 +02:00
Mostafa-ashraf19 796ec13391 Modified GraphicBuffer class name to snake case. 2022-10-03 13:27:22 +02:00
Mostafa-ashraf19 c1037f9040 Modified Point_set_3 to use new APIs version. 2022-09-23 01:48:59 +02:00
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
Sven Oesau 80eb8601e6
Merge branch 'CGAL:master' into Region_growing-revision-soesau 2022-09-02 16:42:41 +02:00
Sébastien Loriot e3e8545498 switch to Simple 2022-06-24 17:38:12 +02:00
Sven Oesau 17e0923058
Merge branch 'master' into Region_growing-revision-soesau 2022-06-24 11:06:56 +02:00
Sébastien Loriot ac8b6d4731 boost::is_same --> std::is_same 2022-06-10 08:18:20 +02:00
Sven Oesau 7bb0a10027 fixed friend class declaration 2022-06-09 14:27:47 +02:00
Sven Oesau 0baac6f556 bugfix Point_set_3_index is now hashable
moved Index out of Point_set_3
2022-06-09 10:33:02 +02:00
Sébastien Loriot 6691e13f36 fix partial specialization
follow up of 594d8bf38e
2022-05-23 13:50:11 +02: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
Sebastien Loriot 978d83a349
Merge pull request #6573 from sloriot/CGAL-pedantic_warnings
Fix pedantic warnings
2022-05-13 15:55:26 +02:00
Sébastien Loriot 6486844750 fix pedantic warnings 2022-05-10 11:30:39 +02:00
Laurent Rineau 2288225448 Massive update of CMake policies to version 3.23 2022-05-06 09:34:35 +02:00
Mael Rouxel-Labbé b24959c688 Add a typedef to make NP helpers work with Point_set_3 2022-04-04 11:33:27 +02:00
Andreas Fabri 440a8dfb7b Fix file name 2022-02-03 08:41:04 +00:00
Andreas Fabri 735752bec9 Do the remaining changes after Laurent's check 2022-02-03 08:02:11 +00: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 75b03e6c0a use_default_values() -> default_values() 2022-01-10 18:36:37 +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 f7c8e4919a add static function to check for the presence of a normal map 2022-01-07 13:10:29 +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 a6d9b99466 move macros in BaseDoxyfile 2022-01-04 11:10:09 +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
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
Sébastien Loriot ab48f63e30 update latest cmake version tested 2021-11-09 10:58:47 +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
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
Sébastien Loriot 1857a25d28 Merge remote-tracking branch 'cgal/master' into CGAL_data-moving_files 2021-10-06 13:50:31 +02:00
Sébastien Loriot 8350dea94a char* -> std::string 2021-10-04 09:49:24 +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 ad79d37410 Merge pull request #6014 from MaelRL/CGAL-IO_Clarify_binary_text-GF
CGAL IO: Clarify binary warning
2021-09-29 11:46:30 +02:00
Mael Rouxel-Labbé c8cc0747fa Clarify binary warning 2021-09-27 15:33:42 +02:00
Maxime Gimeno 499301c759 More fixes 2021-08-31 16:00:37 +02:00
Sébastien Loriot 98e471849b moving files from internal to PKG/internal 2021-08-26 11:33:39 +02:00
Sébastien Loriot 0da1e5690e copyright.txt -> copyright 2021-07-29 10:07:44 +02:00
Mael Rouxel-Labbé 78ff9185b3 Harmonize ASCII usage across all packages 2021-06-23 23:34:32 +02:00
Mael Rouxel-Labbé a34debc92b Uniformize os/is/s/i stream parameter name in Stream_support/io
+ remove extra backticks in NP doc
2021-06-23 23:32:06 +02:00
Maxime Gimeno c2b7cc8f50 Fix doc 2021-06-03 12:45:38 +02:00
Sébastien Loriot 4e519a3c7a move documented IO functions in IO namespace 2021-05-05 13:15:37 +02:00
Sébastien Loriot 56025fb5f9 fix release number of depreciation 2021-05-04 14:38:47 +02:00
Sébastien Loriot fb6f703b55 IO namespace for files in IO directories 2021-05-04 14:36:06 +02:00
Sébastien Loriot 8005f91c22 add IO namespace for Point_set_3 and Point_set_processing_3 packages 2021-05-03 19:21:57 +02:00