Commit Graph

667 Commits

Author SHA1 Message Date
Mael Rouxel-Labbé 6b87fe393d Fix various grammar issues 2020-12-05 11:11:33 +01:00
Maxime Gimeno bebd60c12b Merge remote-tracking branch 'cgal/master' into Cmake_improvements-maxGimeno 2020-10-20 09:53:54 +02:00
Sebastien Loriot 9a9acceb10
Merge pull request #4761 from maxGimeno/GraphicsView-Fixes_for_Regular_triangulation_2-maxGimeno
GraphicsView: Regular_triangulation_2 enhancements
2020-10-02 15:20:20 +02:00
Maxime Gimeno 9c15f2c9dc Use FeatureSummary in the demo, and remove CGAL_FOUND 2020-08-04 12:46:17 +02:00
Maxime Gimeno a9795c3562 Fix deprecation warnings 2020-06-11 13:11:36 +02:00
Maxime Gimeno dd701e28fa Fix Delaunay point removal 2020-06-02 14:32:22 +02:00
Maxime Gimeno e28a3ac2cc Fix some edge width and add a double click event to add a 0 wheighted point. 2020-06-02 12:55:25 +02:00
Simon Giraudot 421096fd7f Use imported targets everywhere 2020-04-15 14:06:13 +02: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
Simon Giraudot 6c8fd43ebb Use CGAL_target_use_* mechanism for Eigen, LASLIB, OpenCV, TensorFlow, GLPK, SCIP, Boost IOStreams and Serialization 2020-02-10 11:57:56 +01:00
Sébastien Loriot 585bb8c7d6 fix license issues 2019-11-07 06:22:28 +01:00
Sébastien Loriot 9a0bff4008 remove BOOST_FOREACH added by recent PRs 2019-11-04 10:59:15 +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
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 e6e8d232cb Merge branch 'CGAL_Qt-Fix_deprecation_warnings-GF' into CGAL_Qt-Fix_deprecation_warnings-4.14-GF 2019-07-10 11:52:58 +02:00
Maxime Gimeno 243c7b1c75 Replace matrix with worldTransform 2019-07-08 14:05:42 +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
Laurent Rineau 9cbfcee84f Merge branch 'master' into CGAL-Exact_algebraic-GF 2019-05-13 18:11:00 +02:00
Andreas Fabri ca301e95a9 The divide is only needed for drawing purposes so we call to_double
in case the number type is a ring type
2019-05-03 12:13:50 +02:00
Sebastien Loriot c27e27d8ea
Merge pull request #3853 from afabri/CGAL-cleanup_CMakeLists-GF
CMakeLists.txt: Remove unnecessary include directories
2019-04-29 14:30:13 +02:00
Maxime Gimeno 0ec9d7ec6b Add misisng automoc 2019-04-23 09:01:15 +02:00
Maxime Gimeno aef3c573a3 Fix moc include in P2T2_demo cpp 2019-04-19 15:14:40 +02:00
Maxime Gimeno 8860f12b25 Use automoc as much as possible 2019-04-18 16:11:08 +02:00
Andreas Fabri ab0b6eae36 Remove unnecessary include directories 2019-04-15 12:54:37 +02:00
Maxime GIMENO 41033a80be
Merge branch 'master' into Graphics_view-Fix_demo_IO-GF 2019-04-12 16:10:36 +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
Maxime Gimeno 422cd589c1 Add missing includes to get BOOST_VERSION and BOOST_GCC 2019-04-03 10:27:55 +02: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
Maxime Gimeno 0b31e6e5d8 Merge remote-tracking branch 'cgal/master' into Graphics_view-Fix_demo_IO-GF 2019-03-07 14:01:02 +01:00
Laurent Rineau c9164a0660
Merge branch 'master' into Stream_support-Dont_use_vtk_for_vtu-GF 2019-01-22 12:06:08 +01:00
Laurent Rineau 80717c6f41 Merge pull request #3406 from mglisse/cgal-public-dev/Number_types-boost_mp-glisse-2
Support Boost.Multiprecision
2019-01-18 16:37:49 +01:00
Laurent Rineau 1754057d24 My changes to write_vtu 2019-01-16 16:50:45 +01:00
Maxime Gimeno cb10422e3c Fix indentation and markdown 2019-01-16 10:44:30 +01:00
Maxime Gimeno e107612c31 Fix pre processor test 2019-01-10 08:54:49 +01:00
Maxime Gimeno 743569f854 Also disable WKT if gcc version is <4.5 2019-01-09 16:32:08 +01:00
Maxime Gimeno 3b1b6e2401 Merge remote-tracking branch 'cgal/master' into Graphics_view-Fix_demo_IO-GF 2019-01-09 12:35:04 +01:00
Maxime Gimeno 1006be85bd Fix Conflicts 2019-01-09 12:29:20 +01:00
Maxime Gimeno 46545fd1b1 Move } outside the #ifdef 2018-11-29 11:51:59 +01:00
Maxime Gimeno 7b13f4a969 Add misisng license header, rename vtu functions and update change.md 2018-11-23 10:11:23 +01:00
Laurent Rineau 6c72c9fa06
Remove lines added by error one year ago 2018-11-22 13:20:05 +00:00
Maxime Gimeno d6cfa1a868 Fix CMake warnings about CMP for Visual 2017 2018-11-21 16:17:39 +01:00
Maxime Gimeno 33482dc532 Fix conflicts 2018-11-21 10:55:09 +01:00
Maxime Gimeno 5180876290 Fix ambiguity between 2D and 3D write_VTU and restore gone bool binary in write_VTU 3D 2018-11-21 10:48:16 +01:00
Maxime Gimeno 080f63b1b8 Disable WKT for boost < 1.56 2018-11-07 11:58:50 +01:00
Sébastien Loriot 3dc3659273 fix warnings 2018-11-05 13:29:17 +01:00
Maxime Gimeno 33a3996fa1 Rename write_VTU and write_VTP 2018-10-29 15:02:20 +01:00
Maxime Gimeno 5f38a107a1 Update. 2018-10-29 11:50:57 +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 0bd9088b5a Remove all include( ) and include( CGAL_CreateSingleSourceCGALProgram ) in CMakeLists.txt; they are no more required. 2018-10-17 14:17:08 +02:00
Guillaume Damiand 7f09308d33 Remove all include_directories(BEFORE ../../include) in CMakeLists.txt 2018-10-17 13:07:22 +02:00
Laurent Rineau a7c5c92f2f Check for CMakeLists.txt also in demos 2018-10-16 12:42:49 +02:00
Marc Glisse 962ff6e085 Go through int for enum -> FT. 2018-10-15 17:02:27 +02:00
Maxime Gimeno 49b88e533f Move and split vtk_io.h to Mesh_2 and Mesh_3 to avoid license and dependencies problems. Also fix vtu writer of VTK_io_plugin for polygon meshes. 2018-10-03 11:15:37 +02:00
Maxime Gimeno 223fa687c2 Add function for CDT. and use it in Triangulation_2 demo. Missing Doc 2018-08-27 16:29:47 +02:00
Maxime Gimeno 8e3eebea0d Fix Conflicts 2018-06-26 15:17:58 +02:00
Simon Giraudot 06c0835a3b Add Eigen dependency in CMakeLists of demos that need it 2018-06-19 11:00:02 +02:00
Maxime Gimeno 2779034aa1 Fix Triangulation_2 2018-05-17 10:20:56 +02:00
Laurent Rineau 0bf465dee6
Fix indentation 2018-05-15 15:32:04 +00:00
Maxime Gimeno 76bd923003 Change expected extension for polygon type. 2018-05-15 10:04:24 +02:00
Maxime Gimeno 0d9f89cfbd Reset fstreams with code that is valid even without c++11 2018-05-15 10:04:23 +02:00
Maxime Gimeno df980abff6 Add WKT IO to 2D demos and add saving to stream_lines_2_demo
Also adds traits for Point_3 to be able to interract with weighted points through them.
2018-05-15 10:04:23 +02:00
Maxime Gimeno 6ec085ace0 Fix Triangulation icons and add a way to load wkt polygons in CDT demo 2018-05-15 10:04:23 +02:00
Maxime Gimeno d7905547e9 final poly fixes 2018-05-15 10:00:47 +02:00
Maxime Gimeno 80c7ddd254 change fake poly format to .polygon.cgal 2018-05-15 10:00:47 +02:00
Maxime Gimeno a4b2773879 add filter to spatial serching demo 2018-05-15 10:00:47 +02:00
Maxime Gimeno 0f1af8e92d add a filter to the snap_rounding demo 2018-05-15 10:00:47 +02:00
Maxime Gimeno d8b6cbd7af Add filters to Polygon demo 2018-05-15 10:00:47 +02:00
Maxime Gimeno ab29df058d Add a filter for P2T2 demo 2018-05-15 10:00:47 +02:00
Maxime Gimeno c86701de81 Add a filter for L1_voronoi_diagram_2 demo 2018-05-15 10:00:47 +02:00
Maxime Gimeno 2c424514dd add a filter for bounding_volumes_demo 2018-05-15 10:00:47 +02:00
Maxime Gimeno ad115d9628 Make a working IO for Apolonius_graph Demo 2018-05-15 10:00:47 +02:00
Maxime Gimeno 80eaf9a8dd Add a filter for alpha shapes 2 demo 2018-05-15 10:00:47 +02:00
Maxime Gimeno cf69391221 Make the IO of the Triangulation_2 demos coherent 2018-05-15 10:00:47 +02:00
Andreas Fabri 16e4cc5e4b Fix 2D Constrained Delaunay demo. The hint was outdated after cdt.clear() 2018-05-11 14:42:30 +01:00
Sébastien Loriot 01af331c72 use https for all links to www.cgal.org and doc.cgal.org 2018-03-14 15:59:38 +01:00
Mael Rouxel-Labbé 1378280c79 Revert "Simplified typedef"
This reverts commit fecfaacbaf.

Although this typedef is still useless, it's useful to check the sanity of
the names of template parameters of the periodic traits classes. If some
template paremeters are named like typedefs of the kernel (which is valid code,
but not ideal) some compilers will bug and fail to compile.

See also commit cbde108708
2017-12-13 11:29:12 +01:00
Laurent Rineau 3c6640bf59 Merge pull request #1436 from lrineau/CGAL-new_cmake-GF
Renewal of CMake scripts: header-only, ctest, CMake>=3.1

# Conflicts:
#	Installation/config/testfiles/CGAL_CFG_NESTED_CLASS_FRIEND_DECLARATION_BUG.cpp
2017-12-05 18:20:05 +01:00
Laurent Rineau fefc79dc17 Fix a warning about CMP0071 2017-12-04 11:33:55 +01:00
Laurent Rineau 19c5502ca8 Fix compilation of demos in non-header-only
Now the variables `CGAL_Qt5_MOC_FILES` and `CGAL_Qt5_RESOURCE_FILES` are no
longer used by the definition of `CGAL_Qt5_extras`: other names are used.

`CGAL_Qt5_extras` is not supposed to be used directly by
users/examples/demos' `CMakeLists.txt`.
2017-11-22 12:45:21 +01:00
Laurent Rineau 891a83840e Merge branch 'CMake-parse_CTest_XML_output-lrineau' into CGAL-new_cmake-GF 2017-11-17 15:03:57 +01:00
Laurent Rineau 25dffa1710 Modern usage of Qt5 CMake scripts, to allow CMAKE_WARN_DEPRECATED 2017-11-17 12:54:13 +01:00
Laurent Rineau 21dabf1b1b Add compilation tests for demos 2017-11-16 18:45:33 +01:00
Laurent Rineau bbee705221 Add compilation tests for demos 2017-11-16 18:38:15 +01:00
Laurent Rineau a9365554c9 Merge pull request #2550 from sloriot/CGAL-add_SPDX_tags
Add SPDX License Identifier
2017-11-15 16:48:27 +01:00
Laurent Rineau 86fb40832a Merge pull request #2580 from lrineau/CGAL-Support_CMake_3.10-GF
Renew the handle of policies, for CMake-3.10
2017-11-13 12:01:39 +01:00
Laurent Rineau c6068691fa Merge pull request #2547 from lrineau/CMake-parse_CTest_XML_output-lrineau
CGAL testsuite implemented with CTest plus Python (part.1)
2017-11-13 11:13:54 +01:00
Sébastien Loriot ee57fc2d6c add SPDX identifier for files under the GPL-3+ license 2017-11-12 10:17:51 +01:00
Laurent Rineau 62c70d41ca Renew the handle of policies, for CMake-3.10
Now that we require CMake>=3.1, we can forget a lot of old CMake policies.

`CMP0053` `OLD` behavior is still needed, because of a bug in Qt5 CMake files, but it will
not be set with CMake>=3.10. Let's assume that a recent CMake version means
a recent Qt5 version.
2017-11-06 14:58:36 +01:00
Mael Rouxel-Labbé fecfaacbaf Simplified typedef 2017-08-29 11:21:59 +02:00
Mael Rouxel-Labbé b36154cb7c Fixed P2DT2's traits class in demo 2017-08-24 15:08:28 +02:00
Mael Rouxel-Labbé dba83ba5bf Fixed a few Alpha Shapes 2 headers 2017-08-23 16:40:55 +02:00
Mael Rouxel-Labbé 1fc2282350 Fixed regular triangulation capitalization across CGAL 2017-06-28 10:16:23 +02:00
Mael Rouxel-Labbé 07cefea41f Generated random weights for random regular triangulations
building regular triangulations with non-uniform weights is slightly more
interesting
2017-06-28 10:15:30 +02:00