Commit Graph

330 Commits

Author SHA1 Message Date
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
Guillaume Damiand 853010afa4 Add missing #include; remove an unused variable. 2019-11-20 09:26:50 +01:00
Sébastien Loriot 1bf02b2d94 remove license statements 2019-11-13 15:32:23 +01:00
Guillaume Damiand f42c9ab89d Update licences 2019-11-13 14:44:45 +01:00
Guillaume Damiand d638c80b5a
Merge branch 'master' into gsoc2019-add_basic_viewer-jasmeet 2019-11-12 22:13:10 +01: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
Guillaume Damiand 2b381af544 Remove more warnings 2019-09-16 17:19:49 +02:00
Jasmeet Singh 63d1838b60 Merge remote-tracking branch 'cgal/master' into gsoc2019-add_basic_viewer-jasmeet 2019-07-23 12:27:41 -07:00
Sébastien Loriot 1f8065c6c3 Merge pull request #3885 from MaelRL/PMP-Locate-GF
PMP: Add locate.h and rewrite Triangulation_2 graph traits
2019-07-18 16:40:49 +02:00
Jasmeet Singh 4eea525929 Merge remote-tracking branch 'jasmeet9323/cgal/gsoc2019-add_basic_viewer-jasmeet' into gsoc2019-add_basic_viewer-jasmeet 2019-07-12 11:50:21 -07:00
Jasmeet Singh 1565773fda Specialization of draw() function for P2T2, can be called together with another viewer now. 2019-07-12 10:46:48 -07:00
Jasmeet Singh a542fbdb45 Merge remote-tracking branch 'cgal/master' into gsoc2019-add_basic_viewer-jasmeet and resolve conflicts 2019-07-10 11:48:38 -07: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
Jasmeet Singh 2047eaa7db
Add code of example to P2T2 documentation 2019-07-03 15:28:02 -07:00
Jasmeet Singh 35008aeeea
Update draw_periodic_2_triangulation_2.h 2019-07-03 15:14:57 -07:00
Jasmeet Singh ff2a498d9e Add documentation for Nef Polyhedron Viewer. 2019-07-03 15:06:13 -07:00
Jasmeet Singh ae40ed9343
Update dependencies 2019-07-02 16:32:59 -07:00
Mael Rouxel-Labbé f68141a6d3 Merge branch 'PMP-Locate-GF-old' into PMP-Locate-GF 2019-07-01 11:28:25 +02:00
Jasmeet Singh d28a767b77 Merge branch 'gsoc2019-add_basic_viewer-jasmeet' of github.com:CGAL/cgal-public-dev into gsoc2019-add_basic_viewer-jasmeet 2019-06-25 11:47:36 -07:00
Jasmeet Singh 02254e998e Add dependency in Voronoi doc. Add draw_periodic_2_triangulation_2.h 2019-06-25 11:47:13 -07:00
Guillaume Damiand 6c5bbe002e Small modifs in doc of new viewers. 2019-06-25 09:48:47 +02:00
Jasmeet Singh 628b24e57f Update headers, trying to deal with Travis CI errors. 2019-06-24 18:14:13 -07:00
Jasmeet Singh 720a0ad815 Merge branch 'gsoc2019-add_basic_viewer-jasmeet' of github.com:CGAL/cgal-public-dev into gsoc2019-add_basic_viewer-jasmeet 2019-06-24 16:36:47 -07:00
Jasmeet Singh e661cfb261 Update documentation. 2019-06-24 16:33:33 -07:00
Jasmeet Singh c412d3b0f7 Fix bugs in Voronoi Diagram Viewer. Format code. Fix bug in voronoi diagram documentation.
Faces have the same color after toggling vertices - fixed.
Rays and dual vertices have different colors from edges and voronoi vertices - fixed.
Toggle for Voronoi vertices created, now V would only toggle vornoi vertices, not all vertices - fixed
2019-06-24 15:21:16 -07:00
Guillaume Damiand 8af3ab8f77 Change test of keys in periodic triangulation 2 viewer to solve a problem with azerty keyboards. 2019-06-24 10:24:32 +02:00
Jasmeet Singh 8096f38336 Add documentation for 2D Periodic Triangulation viewer. 2019-06-22 19:29:30 -07:00
Jasmeet Singh f8bc47dbf6 Check visualization for Periodic Delaunay Triangulation as well. Change example to a delaunay triangulation.
Add is_triangulation_in_1_sheet() check and then convert to 9-sheet if the triangulation isn't so already.
2019-06-22 18:49:54 -07:00
Jasmeet Singh a9eae8a297 Add Key description for Key D which displays the domain. 2019-06-22 18:00:01 -07:00
Jasmeet Singh 677cbc7c07 Add Periodic_2_triangulation_2 viewer. Add example - draw_periodic_2_triangulation_2.cpp.
Keypress 1-UNIQUE, 2-UNIQUE_COVER_DOMAIN, 3-STORED, 4-STORED_COVER_DOMAIN, D-draw the domain.
Color values for faces are fixed for now. Boundaries of faces are also viewed with a light gray
color so as to properly display a triangular face.
2019-06-22 17:53:18 -07: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é 7f6cb0411c Merge branch 'PMP-Locate-GF-old' into PMP-Locate-GF 2019-06-18 08:20:16 +02:00
Andreas Fabri e2d19b0c8d Replace NULL and Nullptr_t with nullptr and nullptr_t 2019-06-04 23:45:44 +02:00
Mael Rouxel-Labbé 1e9ca61fba Doc fixes 2019-05-10 11:45:49 +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 ce126b87c6 remove cpp11::copy_n, cpp11::prev, and cpp11::next and use std instead 2019-03-29 13:28:32 +01:00
Sébastien Loriot 2ce16d14b5 remove workaround code for cpp11 in triangulation packages 2019-03-29 10:41:50 +01:00
Laurent Rineau 1014687627
Merge pull request #3775 from MaelRL/Doc_fixes-GF
Doc fixes
2019-03-25 12:24:49 +01:00
Laurent Rineau 9d40c3e1fc Merge pull request #3769 from sloriot/CGAL-doc_fixes
Various doc fixes
2019-03-19 18:30:36 +01:00
Mael Rouxel-Labbé a6af52755a Fixed bad alias usage 2019-03-15 21:00:44 +01:00
Sébastien Loriot e8d1e11cc8 fix formula 2019-03-14 16:56:46 +01:00