Commit Graph

1139 Commits

Author SHA1 Message Date
Laurent Rineau 022b1a71d0 Merge branch 'releases/CGAL-5.0-branch' 2020-07-21 15:27:49 +02:00
Laurent Rineau 2e8a59d570 Merge branch 'releases/CGAL-4.14-branch' into releases/CGAL-5.0-branch 2020-07-21 15:25:54 +02:00
Laurent Rineau 1e6a5ac636 Fix the use of Construct_point_3::result in Periodic_3 2020-07-16 15:11:23 +02:00
Mael Rouxel-Labbé 26355e2e32 Uniformize capital / third person usage of \brief 2020-06-25 15:13:47 +02:00
Laurent Rineau dcc4fb1cc1 Merge remote-tracking branch 'cgal/master' into CGAL-move_semantic_for_triangulations-GF
# Conflicts:
#	STL_Extension/include/CGAL/Compact_container.h
2020-05-20 09:46:26 +02:00
Sébastien Loriot 3b6c100ca6 Merge remote-tracking branch 'cgal/releases/CGAL-5.0-branch' 2020-04-29 14:12:29 +02:00
Maxime Gimeno 627a7b29be Fix warnings 2020-04-27 17:20:50 +02:00
Maxime Gimeno 5b2d46cfa0 Fixes for min/max 2020-04-21 12:04:45 +02:00
Maxime Gimeno 50766d9d03 Fixes for min/max 2020-04-21 11:52:56 +02:00
Maxime Gimeno e9d41d7b7d Fixes for min/max 2020-04-21 11:38:37 +02:00
Sébastien Loriot 86e25f7e71 Update branch from master after trailing whitespaces and tabs removal 2020-03-26 19:23:54 +01:00
Sébastien Loriot 35b83deffd Update branch from master after trailing whitespaces and tabs removal 2020-03-26 19:16:25 +01:00
Sébastien Loriot 8bb22d5b2c extra run of the script to remove tabs and trailing whitespaces
right after the merge of the 5.0 release branch

+ manual fix of the files (indentation was changed in the meantime):
   * Spatial_sorting/include/CGAL/Multiscale_sort.h
   * Spatial_sorting/test/Spatial_sorting/test_multiscale.cpp
2020-03-26 14:26:59 +01:00
Sébastien Loriot 8b153fb495 Merge branch 'cgal/releases/CGAL-5.0-branch'
whitespace+tab removal, merged with option -Xignore-space-change
2020-03-26 14:22:32 +01:00
Sébastien Loriot 0779373835 extra run of the script to remove tabs and trailing whitespaces
right after the  merge of 4.14 release branch

+ manual fix on one line in:
    * Arrangement_on_surface_2/include/CGAL/IO/Arr_text_formatter.h
    * .travis/generate_travis.sh
2020-03-26 14:16:06 +01:00
Sébastien Loriot 0a46621dc6 Merge branch 'cgal/releases/CGAL-4.14-branch'
whitespace+tab removal, merged with option -Xignore-all-space
2020-03-26 13:28:46 +01:00
Sébastien Loriot 590612a563 run the script to remove tabs and trailing whitespaces 2020-03-26 13:25:16 +01:00
Mael Rouxel-Labbé 2556196dad Merge remote-tracking branch 'cgal/master' into CGAL-Optimal_bounding_box-GF 2020-03-23 08:59:49 +01:00
Sébastien Loriot 149c7a4afc Merge remote-tracking branch 'cgal/releases/CGAL-5.0-branch' 2020-03-19 16:29:33 +01:00
Sébastien Loriot d10359d09e Merge remote-tracking branch 'cgal/releases/CGAL-4.14-branch' 2020-03-19 16:27:55 +01:00
Mael Rouxel-Labbé 100304667d Remove CGAL::internal::boost_::function_property_map
This file was duplicated from BOOST 1.64 because it appeared in a boost
release that was younger than the oldest boost release supported by CGAL
when the file was first required.

The minimum boost version (1.57) now required by CGAL is younger
than the version in which the file appeared in boost (1.51)
and it can thus be removed.
2020-03-12 20:58:44 +01:00
Mael Rouxel-Labbé 5a3d877892 Add #include for boost::result_of 2020-03-10 11:54:21 +01:00
Laurent Rineau 378554e5a7 Change the API of `for_compact_container`/`Compact_container_traits`
Now, we have a proper pair of getter/setter, and the `void` pointer is
get by a `reinterpret_cast`, instead of a union.

Cc: @mglisse
2020-03-09 17:19:58 +01:00
Mael Rouxel-Labbé adec4123a0 Take return of construct_point by reference when possible 2020-03-09 16:33:08 +01:00
Mael Rouxel-Labbé 77a0115dc4 Add missing 'const' 2020-03-09 16:32:54 +01:00
Mael Rouxel-Labbé ab9f158cb0 Merge branch 'TDS-Fix_doc-GF-old' into TDS-Fix_doc-GF 2020-01-15 18:07:51 +01:00
Maxime Gimeno 3b6888e2a9 remove QString.sprintf call 2020-01-14 15:18:47 +01:00
Maxime Gimeno ddbfdfcfa9 Fix sprintf issue 2020-01-13 16:34:00 +01:00
Maxime Gimeno c1acf50252 clean-up P3T3 demo 2020-01-13 16:33:43 +01:00
Maxime Gimeno 93c2247335 Replace all QTimers 2020-01-13 16:33:30 +01:00
Maxime Gimeno 1efca4b19a Fix sprintf issue 2020-01-13 16:25:48 +01:00
Maxime Gimeno 129eae699b clean-up P3T3 demo 2020-01-09 15:01:58 +01:00
Maxime Gimeno 4de511f052 Replace all QTimers 2020-01-09 14:11:50 +01:00
Mael Rouxel-Labbé 801187c642 Clean some tests 2019-12-30 18:30:28 +01:00
Sébastien Loriot 585bb8c7d6 fix license issues 2019-11-07 06:22:28 +01:00
Sébastien Loriot 52164b1fba First pass on removing license notice in header for LGPL files 2019-10-19 15:40:30 +02:00
Sébastien Loriot 254d60f642 First pass on removing license notice in header for GPL files 2019-10-19 15:23:19 +02:00
Sébastien Loriot 7356421d80 introduce Commercial license SPDX tag 2019-10-19 12:15:19 +02:00
Sébastien Loriot 9bd9c68b83 update LGPL[23]+ and GPL[23]+ SPDX tags
ack -l --no-svg "SPDX-License-Identifier: GPL-3.0\+" | xargs sed -i "s/SPDX-License-Identifier: GPL-3.0+/SPDX-License-Identifier: GPL-3.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: LGPL-3.0\+" | xargs sed -i "s/SPDX-License-Identifier: LGPL-3.0+/SPDX-License-Identifier: LGPL-3.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: GPL-2.0\+" | xargs sed -i "s/SPDX-License-Identifier: GPL-2.0+/SPDX-License-Identifier: GPL-2.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: LGPL-2.0\+" | xargs sed -i "s/SPDX-License-Identifier: LGPL-2.0+/SPDX-License-Identifier: LGPL-2.0-or-later/"
2019-10-18 21:57:54 +02:00
Maxime Gimeno 660ebe9e81 Add missing highp and remove unwanted highp 2019-08-05 14:16:02 +02:00
Sébastien Loriot fbafb9d06f fix remaining mismatches and fix bugs 2019-07-10 11:40:45 +02:00
Sébastien Loriot 983645a51a match @{ and @} 2019-07-05 21:49:46 +02:00
Laurent Rineau 32f80cbece Merge pull request #4018 from lrineau/CGAL-refresh_cmake_minimum_required-GF
CMake>=3.13: opt for for new policies up to 3.15
2019-07-01 11:16:30 +02:00
Laurent Rineau 4fbf00fb8a CMake>=3.13: opt for for new policies up to 3.15 2019-06-19 14:34:59 +02:00
Mael Rouxel-Labbé 19de8eda04 Merge branch 'PMP-Generalize_keep_largest_CC-GF-old' into PMP-Generalize_keep_largest_CC-GF 2019-06-17 15:18:33 +02:00
Andreas Fabri e2d19b0c8d Replace NULL and Nullptr_t with nullptr and nullptr_t 2019-06-04 23:45:44 +02:00
Laurent Rineau 5c2df203b4 Merge pull request #3943 from mglisse/Number_types-expression_templates-glisse
Misc fixes for expression templates
2019-05-23 08:50:17 +02:00
Mael Rouxel-Labbé 2848158354 Fix typos 2019-05-20 08:54:04 +02:00
Marc Glisse a676b75ca0 Misc fixes for expression templates 2019-05-17 19:48:41 +02:00
Mael Rouxel-Labbé a2d5ab86cf Fix typo 2019-05-07 11:46:17 +02:00
Maxime Gimeno 62f0a73ea6 Remove useless include_directories for Qt 2019-04-18 16:00:40 +02:00
Sébastien Loriot c8a3fdaff6 Merge pull request #3625 from sgiraudot/Stream_support-Enhance_color-GF
[Small Feature] Reworked CGAL::Color
2019-04-12 15:54:30 +02:00
Sébastien Loriot db65bd8ecc Merge remote-tracking branch 'cgal/releases/CGAL-4.14-branch' 2019-04-11 21:38:48 +02:00
albert-github 1dd7473818 Correction of links
Correction of redirected links and links that moved to another place.
2019-04-11 21:37:05 +02:00
Simon Giraudot d314711eaf Merge remote-tracking branch 'mine/Stream_support-Enhance_color-GF' into Stream_support-Enhance_color-GF 2019-04-09 15:00:56 +02:00
Simon Giraudot 2c1ca1e893 Replace old color API using global const variable with new one using functions 2019-04-03 11:51:29 +02:00
Sébastien Loriot 124012d9f9 replace cpp11::array by std::array 2019-03-29 13:28:33 +01:00
Sébastien Loriot 2ce16d14b5 remove workaround code for cpp11 in triangulation packages 2019-03-29 10:41:50 +01:00
Andreas Fabri a0be3b44af Periodic and Hyperbolic triangulations: backtick 2019-03-08 09:57:57 +01:00
Laurent Rineau 8693f95dac Merge pull request #3619 from albert-github/feature/bug_headers
Update of headers
2019-02-22 16:39:09 +01:00
Laurent Rineau 801376b8cb Merge pull request #3679 from maxGimeno/P3T3_demo-Fix_animation-GF
P3t3 demo: Fix crash
2019-02-16 14:00:23 +01:00
Sébastien Loriot 59bc453b42 first batch of replacement for level 1 in classified ref man
command used:
grep -l  "##" */doc/*/PackageDescription.txt | xargs  sed -i  -E 's/\#\#\s*([[:print:]]+[[:alnum:]])\s*\#\#\s*$/\\cgalCRPSection{\1}/'
2019-02-14 10:32:39 +01:00
Sébastien Loriot 90ad079eb4 use macro for subsections
command used:
grep -l  "###" */doc/*/PackageDescription.txt |  xargs sed -i  -E 's/\#\#\#\s*([[:print:]]+[[:alnum:]])\s*\#\#\#\s*$/\\cgalCRPSubsection{\1}/
2019-02-14 10:32:00 +01:00
Laurent Rineau 87ad97b6ee Merge pull request #3665 from afabri/Regular_triangulation_3-add_range-GF
Regular_triangulation_3: Add Regular_triangulation_cell_base_3::hidden_points()
2019-02-13 15:38:30 +01:00
Laurent Rineau b367aabffd Merge pull request #3670 from afabri/Periodic_T3-initialize_Point_3-GF
Periodic_3_triangulation_3 demo: Initialize Point_3
2019-02-13 15:38:22 +01:00
Maxime Gimeno c6fe1f50b4 Use the Locate_type 2019-02-13 14:04:39 +01:00
Maxime Gimeno 90b6c43cde Toggle the flying ball by default. 2019-02-13 10:19:13 +01:00
Maxime Gimeno b7fbac9bea Fix crash in p3t3_demo when inserting point and drawing conflicts. 2019-02-13 10:04:13 +01:00
Andreas Fabri de77dbd5eb cleanup 2019-02-08 16:49:58 +01:00
Andreas Fabri ce5472de15 Don't test on two files but on random points again 2019-02-08 16:39:42 +01:00
Andreas Fabri 98246c9497 Use centroid 2019-02-08 11:09:43 +01:00
Andreas Fabri 7ee9a8ad06 Periodic_T_3 demo: Initialize Point_3 2019-02-08 10:42:27 +01:00
Andreas Fabri 88add6bc7b Regular_triangulation_3: Add undocumented Regular_triangulation_cell_base_3::hidden_points() 2019-02-07 15:24:00 +01:00
Sébastien Loriot e4cbae525c Merge remote-tracking branch 'cgal/releases/CGAL-4.13-branch' into HEAD 2019-01-31 11:25:26 +01:00
Laurent Rineau a11f6562c6 Support Qt-5.12: qcollectiongenerator merged into qhelpgenerator 2019-01-11 10:54:52 +01:00
Maxime Gimeno d6cfa1a868 Fix CMake warnings about CMP for Visual 2017 2018-11-21 16:17:39 +01:00
Guillaume Damiand 7d406fbb9c
Merge branch 'master' into CGAL-cmake_cleanup-gdamiand 2018-11-05 07:32:58 +01:00
Laurent Rineau d34fb00e08 Merge pull request #3389 from MaelRL/P3T3-Fix_random_shuffle-GF
P3T3: Minor improvements (random_shuffle + determinism)
2018-10-29 10:42:44 +01:00
Laurent Rineau 8c60160697 Merge pull request #3389 from MaelRL/P3T3-Fix_random_shuffle-GF
P3T3: Minor improvements (random_shuffle + determinism)
2018-10-29 10:27:55 +01:00
Guillaume Damiand ef771d0f97 Re-add include({CGAL_USE_FILE}) is demo with core or image io, and set(CMAKE_INCLUDE_CURRENT_DIR ON) in others. 2018-10-19 09:51:14 +02:00
Guillaume Damiand 92ba7fa6c9 Update minimum cmake required version in all CMakeLists.txt 2018-10-18 14:49:23 +02:00
Guillaume Damiand 0c2dcf7208 Re-add include({CGAL_USE_FILE} ) in each CMakeLists.txt where CGAL is used with some component. 2018-10-18 14:38:42 +02:00
Guillaume Damiand 0bd9088b5a Remove all include( ) and include( CGAL_CreateSingleSourceCGALProgram ) in CMakeLists.txt; they are no more required. 2018-10-17 14:17:08 +02:00
Mael Rouxel-Labbé 7b90f28601 Removed redundant call to random_shuffle when using 'is_large_point_set' 2018-10-10 11:03:52 +02:00
Mael Rouxel-Labbé 592d60ff0d There is no need to compare addresses, compare iterators directly
Also needed for determinism
2018-10-10 10:42:31 +02:00
Sébastien Loriot ea240cfac5 use \PkgXXX instead of \PkgXXXSummary 2018-10-08 10:28:44 +02:00
Sébastien Loriot a2e8a1c68f add the suffix Ref to doxygen link to reference 2018-10-08 10:26:56 +02:00
Sébastien Loriot d05df530b3 Merge pull request #2658 from MaelRL/Periodic_3_mesh_3-Feature-MBogdanov
Periodic_3_mesh_3, new package
2018-07-25 18:55:12 +02:00
Sébastien Loriot d514411868 re-add files removed during git filter-branch 2018-07-19 21:47:31 +02:00
Mael Rouxel-Labbé 7c68a8a743 Added a quick return to P3RT3 set_point() if the new position is the current one 2018-07-18 16:51:43 +02:00
Maxime Gimeno fcf16d31e3 Fix Periodic-3 demos 2018-07-10 16:32:22 +02:00
Mael Rouxel-Labbé 980036feaf Fixed p3rt3's operator>> not setting up orthosphere radius bound 2018-07-01 11:35:39 +02:00
Mael Rouxel-Labbé 09cce4384f Use threshold member instead of recomputing it 2018-06-29 16:52:19 +02:00
Mael Rouxel-Labbé 578302f342 Properly test P3T3 copy constructors 2018-06-28 13:02:23 +02:00
Mael Rouxel-Labbé cfad163749 Fixed some issues in the P3T3 constructors
- The copy constructor of P3T3 didn't do anything
- There is no need to duplicate copy_multiple_coverings in P3RT3 and P3DT3,
  it can simply be factorized at P3T3 level, solving the first point.
- P3T3 constructor shouldn't call virtual functions
- Some other minor stuff
2018-06-28 12:59:29 +02:00
Mael Rouxel-Labbé 9b5b558101 Do not take argument of P3T3 operator= by reference
Since we're swapping, it needs to be copy
2018-06-27 17:12:22 +02:00
Mael Rouxel-Labbé 3e1bf168f8 Removed commented code 2018-06-27 16:30:44 +02:00
Mael Rouxel-Labbé 4e256ef80e Fixed deleting only the last newly-created cell during a periodic_remove abort 2018-06-27 16:30:36 +02:00
Mael Rouxel-Labbé 7490f34560 Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov 2018-06-21 10:15:25 +02:00
Mael Rouxel-Labbé 1765d23536 Don't expose P3T3's _cover member 2018-06-18 13:15:28 +02:00