Commit Graph

975 Commits

Author SHA1 Message Date
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
Mael Rouxel-Labbé ba3a0d7d22 Replace SMS::Count_* stop predicates with new Edge/Face_count_* stop predicates 2022-11-02 13:46:45 +01:00
Guillaume Damiand 8e93b8ccbc spaces 2022-10-17 18:02:52 +02:00
Sébastien Loriot e8486bc68e add a convenience overload 2022-10-17 15:28:58 +02:00
Guillaume Damiand 89f7e05dc6 some drawing functor are necessary non null; review of draw for lcc. 2022-10-14 16:03:25 +02:00
Guillaume Damiand 549fe77b63 create examples directory for basic viewer 2022-10-14 15:16:19 +02:00
Guillaume Damiand 0db66d139c example draw sm 2022-10-14 15:09:37 +02:00
Guillaume Damiand afc0eaedf5 Review of draw for face graph, polyhedron and sm 2022-10-14 15:08:32 +02:00
Guillaume Damiand 24a8004ee0
Merge branch 'master' into gsoc2022-EBVs-Mostafa-ashraf19 2022-10-14 08:53:12 +02:00
Mostafa-ashraf19 a00f1c490e Migrated to new viewer APIs version, SM small faces. 2022-10-08 14:58:27 +02:00
Mael Rouxel-Labbé 60e55fbeaa Change default verbosity to false in Surface_mesh element validity checks 2022-10-07 09:54:14 +02:00
Mostafa-ashraf19 6469319870 Surface mesh example. 2022-10-06 21:23:34 +02:00
Mostafa-ashraf19 74a68d4694 Applied new APIs version in face graph. 2022-10-06 21:22:05 +02:00
Mael Rouxel-Labbé b597aa8aab Add is_valid_*_descriptor() overloads for Surface_mesh 2022-10-04 22:19:35 +02:00
Mael Rouxel-Labbé 01e072270f Misc minor fixes 2022-09-07 10:21:46 +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 d729450b00 add missing commas 2022-08-05 13:42:39 +02:00
Sébastien Loriot cc9f183164 fix typedef 2022-08-05 13:42:15 +02:00
Sébastien Loriot 684f48e14c const_cast is useless 2022-08-05 13:41:39 +02:00
Sébastien Loriot d95d834af1 Surface_mesh iterator should not return a reference 2022-08-05 13:40:28 +02:00
Sébastien Loriot 861588abe1 Merge 'sloriot/CGAL-std_type_traits' into master 2022-08-03 20:19:51 +02:00
Sven Oesau 5be7fd53fb removing unused parameters 2022-07-19 14:35:27 +02:00
Sébastien Loriot ff8a28731b unsued variable 2022-06-29 13:10:41 +02:00
Sébastien Loriot 25cacd2237 remove unused typedef 2022-06-29 09:24:22 +02:00
Sven Oesau 7c29cd42ad added missing typename 2022-06-28 09:04:32 +02:00
Sven Oesau 37eb6a5118 fixed saving of face colors using property maps from named parameters 2022-06-28 08:45:31 +02:00
Sébastien Loriot aa9f5215c4 factorize 2022-06-24 17:21:37 +02:00
Sébastien Loriot c9c6b30cf0 Merge sloriot/CGAL-std_type_traits into master 2022-06-23 16:35:37 +02:00
Sébastien Loriot ac8b6d4731 boost::is_same --> std::is_same 2022-06-10 08:18:20 +02:00
Andreas Fabri 06e5884b9c Add documentation 2022-05-24 15:00:02 +01:00
Sebastien Loriot 269a391fa0
Merge pull request #6558 from lrineau/Installation-remove_wd4503-GF
CMake script updates: version of CMake and /wd4503 is only for MSVC 2015
2022-05-13 15:53:36 +02:00
Sebastien Loriot b9fabbe116
Merge pull request #6550 from afabri/BGL-adjacency_iterator-GF
BGL: Add adjacency_iterator for several classes
2022-05-13 15:51:44 +02:00
Niklas Hambüchen 59d70a5018 PLY: Support writing per-face/vertex property lists 2022-05-12 12:51:42 +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 2288225448 Massive update of CMake policies to version 3.23 2022-05-06 09:34:35 +02:00
Andreas Fabri fd20beeef7 Use vertices_around_target() 2022-05-03 15:09:05 +01:00
Andreas Fabri abb54bf0b8 BGL: Add adjacency_iterator for several classes 2022-05-03 14:02:21 +01:00
Laurent Rineau 3072b93942 After review 2022-04-23 16:11:18 +02:00
Laurent Rineau df43db067a Use std::move instead of std::forward 2022-04-20 17:09:35 +02:00
Laurent Rineau 090c61c6b7 Swap capacity_ as well 2022-04-20 17:08:05 +02:00
Laurent Rineau 644b88924d Rewrite the tetst 2022-04-20 17:03:58 +02:00
Laurent Rineau 9e964b0797 Simplify constructors with default member initializers 2022-04-20 17:03:31 +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 5098cad841 Test the move semantics 2022-04-19 16:52:18 +01:00
Sébastien Loriot 514e4de9b7 add no-move copy 2022-04-19 07:18:31 +02:00
Sébastien Loriot 92f7344f3c fix syntax errors 2022-04-18 20:55:56 +02:00
Andreas Fabri 13f00211d3 Surface_mesh: Add move semantics 2022-04-18 16:34:14 +01:00
Laurent Rineau f9c05a0ba1 Merge pull request #6253 from afabri/P2T2-assert-GF
CGAL:   In testcode do not use CGAL_assertion  but assert
2022-02-02 16:38:22 +01: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
Andreas Fabri 79a38d5cb9 CGAL Examples: CGAL_assertion -> assert 2022-01-24 10:19:04 +00:00
Andreas Fabri a6f622b7a1 Deal with Surface_mesh 2022-01-18 18:39:49 +00:00
Sébastien Loriot 07e917ca09 Merge remote-tracking branch 'MaelRL/PMP-Improve_SI_repair-GF' into HEAD 2022-01-18 09:18:20 +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 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 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 54d09a788b fix value 2022-01-07 14:10:23 +01:00
Sébastien Loriot c78dfa3d61 restore too agressive removal 2022-01-07 10:18:12 +01:00
Sébastien Loriot e7dcb31417 replaces overloads with default parameters (Surface_mesh/IO) 2022-01-06 15:11:32 +01:00
Sébastien Loriot a6d9b99466 move macros in BaseDoxyfile 2022-01-04 11:10:09 +01:00
Mael Rouxel-Labbé 515b97d905 Also check the validity of the index in Surface_mesh::is_valid(Element) 2021-12-14 10:42:49 +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 262a04cef2 remove useless POLICY setting 2021-11-09 10:19:14 +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
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 fb9333f0d0 Merge pull request #6028 from MaelRL/CGAL-Fix_typos-GF
Fix typos
2021-10-07 14:27:21 +02:00
Laurent Rineau 94ee9b1613 Merge pull request #6030 from MaelRL/CGAL-Minor_fixes-GF
Fix uninitialized id maps in heat method
2021-10-07 14:27:16 +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 efbd86df7f extra manual fixes 2021-10-05 17:42:21 +02:00
Mael Rouxel-Labbé 863ab7541c Various whitespace fixes 2021-10-05 12:14:03 +02:00
Mael Rouxel-Labbé 625848e629 Fix missing ':' in various namespaces 2021-10-04 13:21:47 +02:00
Sébastien Loriot b5e7d03634 fix runtime issues 2021-10-04 10:22:13 +02:00
Sébastien Loriot 80c2615b38 handle .off in headers 2021-10-04 10:08:24 +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
Sébastien Loriot aea6cf8a9c fixes after incorrectly handled merge 2021-09-23 18:56:10 +02:00
Sébastien Loriot bd345c7f83 remove .cmd files for examples 2021-09-23 18:54:46 +02:00
Sebastien Loriot 4610cf3c66
Merge pull request #5904 from sloriot/CGAL-remove_config_flags
Replace macros with inline functions and remove a config flag
2021-09-10 17:38:50 +02:00
Sébastien Loriot 98e471849b moving files from internal to PKG/internal 2021-08-26 11:33:39 +02:00
Sébastien Loriot a88a84b0f4 remove some cpp0x and cpp11 config macros 2021-08-13 15:46:50 +02:00
Sébastien Loriot 814c9138ef Merge remote-tracking branch 'cgal/5.3.x-branch' 2021-08-12 10:38:11 +02:00
Sebastien Loriot c25c7c4668
Merge pull request #5882 from sloriot/Data-Ply_edge_prop
Update PLY files to valid format
2021-08-12 10:24:32 +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
Sébastien Loriot 8123a841f2 update to valid format 2021-07-30 10:16:58 +02:00
Sébastien Loriot 49e720068f update to valid format 2021-07-30 10:14:38 +02:00
Sébastien Loriot 65f3803bab compatibility for files written with the old code 2021-07-30 10:13:26 +02:00
Dan Bumbarger 149b5af81f Update PLY.h
Aligned Edge property to PLY standard
2021-07-30 10:11:52 +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
Andreas Fabri 526aec740c Fix #5755 2021-06-04 14:05:00 +02:00
Laurent Rineau d6b2c8d9dc Merge pull request #5671 from maxGimeno/CGAL_IO-Add_missing-deprecated_functions-maxGimeno
CGAL_IO: Add missing fallbacks

# Conflicts:
#	BGL/include/CGAL/boost/graph/IO/INP.h
#	Point_set_processing_3/include/CGAL/IO/write_xyz_points.h
2021-05-18 18:13:38 +02:00
Maxime Gimeno cf69d32269 add missing const in read_OFF 2021-05-12 11:40:20 +02:00
Maxime Gimeno 9acf3d4b19 Add missing fallbacks for IO functions and result_of 2021-05-07 12:50:51 +02:00
Maxime Gimeno 23be65772d remove useless overload 2021-05-06 12:32:45 +02:00
Maxime Gimeno cd7b635abd Also Fix Surface_mesh 2021-05-06 10:53:58 +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
Sebastien Loriot b7323389c7
Merge pull request #5622 from maxGimeno/CMake-Update_versions_in_scripts-maxGimeno
Update maximum cmake versions
2021-04-17 10:58:14 +02:00
Maxime Gimeno c49152359c update max version of cmake and announce the new minimal in CHANGE.md 2021-04-15 15:08:54 +02:00
Maxime Gimeno 17602e589e Merge remote-tracking branch 'cgal/master' into CGAL-clang_tidy__nullptr_on_Mesh_2-GF 2021-04-07 09:17:51 +02:00
Timo Koch af81a6e1e5
[cleanup][surface_mesh] Fix include order from local to global 2021-03-31 12:16:46 +02:00
Timo Koch 94f969149d
[cleanup][surface_mesh] Remove unused and duplicate includes
The includes became unnecessary after a735e84.
2021-03-31 10:50:05 +02:00
Laurent Rineau a72fdb7b3c Merge pull request #5352 from lrineau/CGAL-fix_CGAL_IO-GF
Fixes after the PR "CGAL I/O
2021-02-18 15:23:43 +01:00
Maxime Gimeno d5811d0a41 clang-tidy on tests 2021-02-18 15:15:12 +01:00
Laurent Rineau a735e849c0 Merge pull request #5152 from sloriot/CGAL-remove_bind
Replace usages of boost::bind
2021-02-05 16:14:04 +01:00