Commit Graph

445 Commits

Author SHA1 Message Date
Maxime Gimeno 3b70343590 Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-11-16 16:19:43 +01:00
Maxime Gimeno 97320dbfd2 Fix HDT2 demo cmakelists 2020-10-12 09:10:12 +02:00
Maxime Gimeno 616574e5ab Modernize CMake scripts 2020-10-06 15:44:41 +02:00
Mael Rouxel-Labbé 8682f9bafb Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-08-24 11:45:17 +02:00
Maxime Gimeno 9c15f2c9dc Use FeatureSummary in the demo, and remove CGAL_FOUND 2020-08-04 12:46:17 +02:00
Mael Rouxel-Labbé 275d73e6c1 Fix missing license include 2020-06-23 19:02:19 +02:00
Laurent Rineau 38e7c641d7 Merge pull request #4780 from maxGimeno/GraphicsView-Fix_qt_deprecated_code-maxGimeno
GraphicsView: Fix Qt 5.15 deprecation warnings
2020-06-23 18:50:07 +02:00
Mael Rouxel-Labbé e1e2428abe Fix missing _H in guard + missing license include 2020-06-22 13:42:39 +02:00
Maxime Gimeno 722fa93927 More fixes 2020-06-15 16:05:49 +02:00
Maxime Gimeno 857dcaceb9 Add missing find_package(Qt5) for Hyperbolic_triangulation_2 demo 2020-06-12 09:38:27 +02:00
Maxime Gimeno e9d41d7b7d Fixes for min/max 2020-04-21 11:38:37 +02: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
Sébastien Loriot b13e116919 Manual removal of license notice + fix SPDX flags 2019-10-19 17:00:08 +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
Laurent Rineau 67c3e26859 Merge branch 'releases/CGAL-4.14-branch' 2019-09-10 09:19:06 +02:00
Maxime Gimeno 2f483bb023 Add misisng include_directories to HDT2 demo 2019-09-10 09:05:16 +02:00
Laurent Rineau df99307140 Merge branch 'releases/CGAL-4.14-branch' 2019-09-09 16:48:23 +02:00
Laurent Rineau 9abee11ee8 Merge remote-tracking branch 'cgal/releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch 2019-09-09 16:43:29 +02:00
Laurent Rineau 94d654b9ab Fill CGAL_EXECUTABLE_TARGETS wherever that was missing 2019-09-04 14:19:54 +02:00
Maxime Gimeno 92c9250855 Add some caching in new demos 2019-08-16 12:26:24 +02:00
Maxime Gimeno 3513016dcf Updates for ctest with visual generator 2019-08-16 12:22:11 +02:00
Sébastien Loriot 2e747dd300 Merge remote-tracking branch 'cgal/releases/CGAL-4.14-branch' into HEAD 2019-07-18 17:01:42 +02:00
Maxime Gimeno d21709d0bd More ->matrix() replaced 2019-07-10 11:58:13 +02:00
Sébastien Loriot 983645a51a match @{ and @} 2019-07-05 21:49:46 +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
Andreas Fabri 4581f1b7a8 Morte replacements 2019-06-05 08:39:55 +02:00
Laurent Rineau 90782d4b7f Revert the merge of two pull-requests that target CGAL-4.14-branch
- Revert "Merge pull request #3857 from MaelRL/CGAL-Fix_duplicate_non_manifold_vertices-GF"
- Revert "Merge pull request #3898 from lrineau/Mesh_3-stop_during_protection-lrineau"
2019-05-14 17:50:45 +02:00
Sébastien Loriot 1398af1b0b Merge remote-tracking branch 'cgal/master' into HEAD 2019-04-12 17:44:31 +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
Laurent Rineau 138e1b4d64 Fix the link error on Windows (non header-only) 2019-04-04 13:39:18 +02:00
Maxime Gimeno ecff35a7e9 Replace the CMP0054 spec by the right cmake_required_version 2019-04-03 13:14:40 +02:00
Andreas Fabri 13010e9f13 Fix hyperbolic triangulation example 2019-04-03 11:51:30 +02:00
Maxime Gimeno 22caa66feb Fix CMP0054 warning in hyperbolic triangulation demos 2019-04-03 11:07:13 +02:00
Maxime Gimeno 57692b2ddc Rename executable from demos so it is tested in the testsuite. 2019-04-02 15:18:04 +02:00
Laurent Rineau a576aed133
Merge branch 'master' into CGAL-Exact_algebraic-GF 2019-03-27 10:20:53 +01:00
Laurent Rineau d4e09c1d78 Modernize the CMakeLists.txt that use LEDA
The file `${CGAL_USE_FILE}` must be included before
`find_package(LEDA)` can be called. But that would require to verify
`CGAL_FOUND` first...

Actually, now that we require at least CMake 3.1, let's say that CGAL
is `REQUIRED`, but not the components. That is the basic truth, and
that avoids testing for `CGAL_FOUND`.

At the same time, I have modified the `cmake_minimum_required`:
  - placed as the first line,
  - set to `3.1...3.13`:
      https://cmake.org/cmake/help/latest/command/cmake_policy.html#setting-policies-by-cmake-version

I have also removed the comments that says the `CMakeLists.txt` was
generated. That may have been true... but before a lot of modifications.
2019-03-27 09:56:16 +01:00
Andreas Fabri 0c0d5e1cfb Fix my fix 2019-03-26 18:11:38 +01:00
Andreas Fabri 9061510d86 Fix Periodic_4_hyperbolic_triangulation_2 2019-03-26 17:44:22 +01:00
Maxime Gimeno e2becb4e54 Fix warning for CMP0071 2019-03-25 10:24:33 +01:00
Maxime Gimeno 9e71d9fc23 Merge pull request #3744 from afabri/CGAL_backtick_GF
Periodic and Hyperbolic triangulations: backtick
2019-03-12 17:04:12 +01:00
Andreas Fabri a0be3b44af Periodic and Hyperbolic triangulations: backtick 2019-03-08 09:57:57 +01:00
Laurent Rineau 20772a9a44 Fix the notice 2019-03-07 10:22:00 +01:00
Laurent Rineau 2a5ebb2089 Fix the use of resources
The key issue was that the `CMakeLists.txt` was not using
`CGAL_Qt5_RESOURCE_FILES`, and instead the author decided to copy the
resources and qrc files.
2019-03-07 09:22:11 +01:00
albert-github ff3a5174bd CSS properties and values separated by semicolons
CSS properties and values should be separated by semicolons but here the width property was followed by an equal sign.
2019-02-27 18:32:40 +01:00
Sébastien Loriot fe5c2d0bb8 use macros 2019-02-23 11:57:29 +01:00
Iordan Iordanov 7eb7e44b1a added test with degenerate cases for HT2 2019-02-13 23:36:19 +01:00
Iordan Iordanov b9564449ed Fixed 'About' for demo of HT2 2019-02-07 20:02:21 +01:00
Laurent Rineau f37ac9cfc6 Fix non-header-only CGALConfig.cmake as regards to CGAL_Core
... and then fix the `CMakeLists.txt` of HDT2_demo.
2019-02-04 15:09:07 +01:00
Laurent Rineau 7e83c9ddf6 Copy the resources from GraphicsView/demo/icons/
That is:
  - a dirty hack,
  - a fixup of commit 65e115c5230, that started copy the qrc files
    without copying the resources.
2019-02-04 15:07:38 +01:00
Maxime Gimeno 7932cf1372 Remove the required in find_package boost 2019-02-01 11:22:03 +01:00
Maxime Gimeno 121526fc21 Add Boost thread to HDT2 demo. 2019-01-31 09:34:00 +01:00
Maxime Gimeno 0cbb165b9f Add missing files 2019-01-30 10:15:31 +01:00
Maxime Gimeno 5a236a5bf8 Add a test for Boost_FOUND and reduce hyperbolic_delaunay_triangulation_2_demo to HDT2 for paths 2019-01-25 09:49:13 +01:00
Maxime Gimeno 8cbede3b0b Add link to CGAL_Core 2019-01-24 09:03:59 +01:00
Maxime Gimeno c143c657eb Fix permisisons 2019-01-23 16:45:55 +01:00
Maxime Gimeno d40fb37b45 Link with CGAL and Qt5 and add NOTICE if no Qt5. 2019-01-23 10:44:39 +01:00
Maxime Gimeno c418829a5d Fix errors on MSVC for H2t2 demo 2019-01-22 10:06:32 +01:00
Maxime Gimeno d657fe0e1e Add a test for Qt5 in the demos. 2019-01-21 10:27:56 +01:00
Maxime Gimeno 732bfb756d Fix CMakelists for demo. 2019-01-18 10:14:28 +01:00
Andreas Fabri de55c69cd3 Do not include Expr.h Remove arc and argv where not used 2019-01-17 16:34:03 +01:00
Iordan Iordanov 8e1dfa329e Fixes for a few more warnings in the testsuite 2019-01-16 16:46:56 +01:00
Andreas Fabri 97129f35a9 Fix warnings in Hyperbolic_triangulation_2 testsuite 2019-01-15 08:15:35 +01:00
Iordan Iordanov 9792b241dd Changes to replace Cartesian<Expr> with EPICK_with_sqrt, plus code cleanup, plus documentation fixes 2019-01-14 18:29:42 +01:00
Iordan Iordanov f84a4b0405 Bugfix for operator= test 2019-01-10 13:57:55 +01:00
Iordan Iordanov 00b65e83d8 Bugfix for documentation compilation 2019-01-10 13:13:34 +01:00
Iordan Iordanov 2356b3fde8 various fixes for the testsuite 2019-01-10 11:47:32 +01:00
Andreas Fabri 4b9ba3b800 Address warning: no newline at end of file 2019-01-10 08:41:31 +01:00
Iordan Iordanov 1c3fb64985 Fixes to test files to please testsuite 2019-01-09 20:42:30 +01:00
Iordan Iordanov 1c7f056c27 Added resource files and edited CMakeFiles.txt for demo to please testsuite 2019-01-09 20:41:49 +01:00
Iordan Iordanov 38ec4cf946 A couple of fixes for the hyperbolic vertex circulator; (failed) attempt to fix operator= 2019-01-09 20:41:06 +01:00
Iordan Iordanov 5ad3f1126c Added default parameters to example files to please the testsuite 2019-01-09 20:39:53 +01:00
Iordan Iordanov dc223c231e Moved tests to _correct_ folder 2019-01-09 09:52:20 +01:00
Iordan Iordanov bac71bc844 Corected name of test folder 2019-01-08 20:58:50 +01:00
Iordan Iordanov fefcca5bca Modified CMakeFiles.txt for Travis 2019-01-08 17:36:24 +01:00
Iordan Iordanov 4f47904264 added test for adjacent vertices circulator 2019-01-08 17:25:16 +01:00
Iordan Iordanov 843ce26596 Fixed to hyperbolic vertex circulator (used for 'adjacent_vertices') 2019-01-08 17:24:50 +01:00
Iordan Iordanov c0f0d474a9 Bugfix for 'locate' function 2019-01-08 12:31:02 +01:00
Iordan Iordanov feec488f84 Added another test 2019-01-08 11:38:52 +01:00
Iordan Iordanov c6b8dfdb30 fix for demo cmake file to make Travis happy 2019-01-08 10:31:56 +01:00
Iordan Iordanov 2342b037b2 Preliminary testsuite 2019-01-08 10:23:23 +01:00
Iordan Iordanov a4a44553b8 Fixed wrong member name in traits class 2019-01-08 08:42:35 +01:00
Mael Rouxel-Labbé 3ba22c866c Minor fixes 2019-01-07 09:42:14 +01:00
Iordan Iordanov e9abcec1df Removed old traits class (moved to branch INRIA/Periodic_2g_hyperbolic_triangulation_2-IIordanov) 2019-01-02 14:01:38 +01:00
Iordan Iordanov 71327aad01 Modified CK traits class to follow the modifs made by Mael; factorized code in the two traits classes 2018-12-30 22:19:18 +01:00
Iordan Iordanov 3e8f19bc7c Changed declaration of Construct_segment_2 object (plus _object() function) 2018-12-30 18:14:25 +01:00
Iordan Iordanov 650fbdd131 Modifications to demo to use new point functions 2018-12-30 17:47:55 +01:00
Iordan Iordanov 21b841c9f4 Added new functions point(Vertex_handle) and point(Face_handle, int) 2018-12-30 17:47:29 +01:00
Iordan Iordanov e5eab9fe46 Resolved a few todo's 2018-12-30 17:21:15 +01:00
Iordan Iordanov 4d106b4dd9 Added file long_description.txt; small typo fix in file description.txt 2018-12-30 17:12:21 +01:00
Iordan Iordanov bacf3055ef Modified demo title 2018-12-30 17:11:41 +01:00
Iordan Iordanov fed99670a5 Updated TODO file 2018-12-30 17:11:17 +01:00
Iordan Iordanov bda63046e1 Modified documentation to remove completed todo items 2018-12-27 20:55:28 +01:00
Iordan Iordanov 3e9ad7ea94 Added missing functions (todo list in documentation) 2018-12-27 20:54:52 +01:00
Iordan Iordanov 0971a25b03 deleted unused benchmark files 2018-12-27 08:54:27 +01:00
Iordan Iordanov 89a8ee1003 Fixes for CMake files include directive 2018-12-27 08:01:41 +01:00
Mael Rouxel-Labbé 94e9ae9667 Cleaned P4HT2 tests 2018-12-20 10:20:21 +01:00
Mael Rouxel-Labbé 5084e6db5b Fixed Periodic/Weighted triangulation tags 2018-12-20 09:48:07 +01:00
Mael Rouxel-Labbé 4931c6f7bf Added dependencies files 2018-12-20 09:46:53 +01:00
Mael Rouxel-Labbé 0055cb5a0b Added missing functors for in HDTTraits (needed by P4HT2) 2018-12-20 09:29:48 +01:00
Mael Rouxel-Labbé b380cdbe6d Fixed mixed up project names... 2018-12-19 23:07:12 +01:00
Mael Rouxel-Labbé f3c1f7afc0 Fixed wrong project name 2018-12-19 22:56:00 +01:00
Mael Rouxel-Labbé 663bf96c05 Fixed project names for HT2/P4HT2 2018-12-19 22:54:48 +01:00
Mael Rouxel-Labbé 322ddd50c8 Fixed headers / licenses in HT2 / P4_HT2 2018-12-19 20:31:49 +01:00
Mael Rouxel-Labbé 42e151372e Fixed HT_2 includes 2018-12-19 19:36:37 +01:00
Mael Rouxel-Labbé 33908ab7a2 Code improvements in HT_2
- Fixed missing consts
- Fixed warnings
- Rewrote the most common traits class (others to do)
- Various tiny improvements
- ...
2018-12-19 16:08:27 +01:00
Mael Rouxel-Labbé 6ae24f75cc Removed illegal 'dont_submit_file 2018-12-19 14:05:10 +01:00
Mael Rouxel-Labbé 2b580e7a21 Cleaned HT_2 code 2018-12-19 13:13:17 +01:00
Iordan Iordanov 964775d43e changes to demo for better images 2018-12-12 18:05:11 +01:00
Iordan Iordanov 49cae75c36 Small changes to user manual + new header image 2018-12-12 18:04:45 +01:00
Monique Teillaud 6b0c22866c small fixes following the review 2018-12-12 17:45:31 +01:00
Iordan Iordanov 1c62012365 Modifications to user manual to account for Mael's lates review; new figures included 2018-12-12 15:03:44 +01:00
Iordan Iordanov 54353573e5 small change to demo 2018-12-12 15:02:55 +01:00
Iordan Iordanov bd502b5020 Typo fix in user Manual: fo -> of 2018-12-06 11:22:32 +01:00
Iordan Iordanov 816d513be4 added new bench file, deleted old one 2018-12-05 07:57:09 +01:00
Iordan Iordanov 61d06363b4 added performance figures in the doc 2018-12-05 07:53:07 +01:00
Iordan Iordanov 4c9c51a561 Changed default value for the kernel in the doc 2018-12-05 07:52:52 +01:00
Iordan Iordanov c3116b0d59 changed default template parameter for the kernel 2018-12-05 07:52:15 +01:00
Iordan Iordanov b0c08470f6 minor edits to account for Andreas' remarks: converted image files to svg, changed 'allows' to 'enables' 2018-11-24 09:34:50 +01:00
Iordan Iordanov 1063082da0 Cleanup: removed CGAL modification macros from documentation files 2018-11-22 20:51:55 +01:00
Iordan Iordanov 8101aad0d3 Corrected anchor name 2018-11-22 15:51:23 +01:00
Monique Teillaud f419073fc1 minor fix 2018-11-22 15:05:58 +01:00
Monique Teillaud 1cfd259f99 changes after Andreas' comments 2018-11-22 11:34:04 +01:00
Iordan Iordanov 494a5cd97c Changed documentation to follow new naming convention for anchors of packages; Added list of examples to the package documentation 2018-11-16 23:26:48 +01:00
Iordan Iordanov 2f7e21c767 Modifications to User Manual (figures, refs, added two examples) 2018-11-16 18:37:38 +01:00
Iordan Iordanov c4f687ef6a Fixed access modified for class Hyperbolic_faces_iterator 2018-11-16 18:36:58 +01:00
Monique Teillaud c0361e4670 draft of the user manual 2018-11-16 15:05:08 +01:00
Iordan Iordanov 7ed8cf9d49 small modifications to documentation owed to discussions with Monique 2018-11-15 13:45:35 +01:00
Iordan Iordanov bde17c5537 eliminate empty square appearing in Creation section 2018-11-14 22:22:01 +01:00
Iordan Iordanov 6d4e6a6bc6 added functions is_valid and remove() with range; modified typedefs; other modifications indicated by Mael 2018-11-14 18:54:53 +01:00
Iordan Iordanov c417db5907 Changed text in intro; removed ref to inexistent model 2018-11-14 18:53:50 +01:00
Iordan Iordanov 1ab5d08f5b Added FT and Triangle typedefs; Added phrase from front page of Ref Manual 2018-11-14 18:52:19 +01:00
Iordan Iordanov 4ac1a924ce Corrections from Mael; correct names for types and better text 2018-11-14 18:50:27 +01:00
Iordan Iordanov b978582803 Removed unneeded typedefs and constructors 2018-11-14 18:48:36 +01:00
Iordan Iordanov 9db9bcbc5d Modification to first page of Reference Manual according to Mael's comments 2018-11-14 18:47:17 +01:00
Iordan Iordanov 8148420b49 Removed 'Construct_hyperbolic_point_2' and _object() functions from traits classes 2018-11-14 18:46:20 +01:00
Iordan Iordanov e361edc4c4 Documentation modifications to account for Andreas' and Marc's comments (4th round) 2018-11-08 10:06:06 +01:00
Iordan Iordanov 6fa8ba5c25 removed class Mark_face and relative calls 2018-09-24 14:56:47 +02:00
Iordan Iordanov deb10cab5f fixed type (wrong Kernel name) 2018-09-16 19:09:39 +02:00
Iordan Iordanov 5f11148551 added object Construct_hyperbolic_point (traits class and concept) 2018-09-08 10:33:22 +02:00
Iordan Iordanov b55a57ccae fixed broken link to user manual (thanks Mael); fixed figure not appearing in user manual (thanks again Mael) 2018-09-06 09:36:06 +02:00
Iordan Iordanov 457a907327 Fixed names for point and Voronoi point types 2018-09-03 14:01:33 +02:00
Iordan Iordanov 4bed2fd3f9 added 'Hyperbolic' to point, triangle and Voronoi_point type names; removed 'Orientation_2' object; fixed refinement issue; addes phrase to explain refinement 2018-09-03 13:54:53 +02:00
Iordan Iordanov 20a57472d7 small change to traits class description; changed models for faces from plural to singular 2018-09-03 13:52:51 +02:00
Iordan Iordanov e6fc0250de modifications to demo to account for changes in triangulation class 2018-09-03 13:51:50 +02:00
Iordan Iordanov 7f231a3f96 changed geometryc types according to the renames in the Traits classes; removed 'is_infinite' functions (now using Base::is_infinite where appropriate) 2018-09-03 13:49:54 +02:00
Iordan Iordanov af3b43b4db added 'Hyperbolic' to point, triangle, and Voronoi_point types 2018-09-03 13:46:30 +02:00