Commit Graph

394 Commits

Author SHA1 Message Date
Guillaume Damiand 8f29e4d323 Rename class graphic buffer 2023-04-27 15:48:42 +02:00
Laurent Rineau 67441a3772 Convert all CMakeLists.txt to Qt6 2023-04-25 17:27:03 +02:00
albert-github b21b984daa issue #7231 Improvement of layout of refines relations.
Adjusted after review
- usage of `Adaptable...Function` instead of `AdapatableFunctor (with... arguments)`
- corrected some incorrect / superfluous `}`
2023-04-12 09:49:53 +02:00
albert-github 2d60f46985 issue #7231 Improvement of layout of refines relations.
- Adjusted cgalRefines according to reviews
- Implemented it in all files
2023-03-14 17:37:50 +01:00
Mael 153c603209
Merge branch 'master' into CGAL-Clean_CMakeLists.txt-GF 2023-01-27 22:09:02 +01:00
Mael 6538b22e06
Merge branch 'master' into CGAL-Clean_CMakeLists.txt-GF 2022-12-05 16:03:41 +01:00
albert-github c32b1f4127 spelling corrections
Some spelling corrections (Directories starting with `S` rest - `W`),
2022-11-16 13:22:39 +01:00
Guillaume Damiand 534e7894b4 replace use of get_local_point 2022-10-19 16:34:08 +02:00
Guillaume Damiand 4377f527bc add missing include 2022-10-19 16:27:11 +02:00
Guillaume Damiand 09eaba2945 move functor for voronoi 2022-10-19 14:10:48 +02:00
Guillaume Damiand 2f07ea2a16 review draw voronoi 2 2022-10-19 13:46:10 +02:00
Guillaume Damiand 09ce35d9ba Correct template specialisation for add_in_graphic_buffer functions, lcc and voronoi 2 2022-10-13 11:18:32 +02:00
Andreas Fabri 0ba4d58a43 Voronoi_diagram_2 2022-10-13 07:58:21 +01:00
Mostafa-ashraf19 f1274c637c Solved custom KeyPressEvent callback. 2022-10-11 18:28:46 +02:00
Mostafa-ashraf19 8141fab21c Initial commit to adding custom KeyPressEvent. 2022-10-09 01:49:45 +02:00
Mostafa-ashraf19 7e1e6d5266 Added custom drawing functor for Voronoi diagram. 2022-10-08 12:33:24 +02:00
Mostafa-ashraf19 cc4aa7cd9d Applied new APIs version in Voronoi 2, with modifications in Basic_viewer_qt. 2022-10-06 17:48:58 +02:00
Mael Rouxel-Labbé 9b265fddf8 Uniformize REQUIRED / QUIET usage:
Following this:
- CGAL: always REQUIRED
- CGAL component: COMPONENT / OPTIONAL_COMPONENT (never QUIET)
- required 3rd party: (not QUIET) + message(NOTICE "") on NOT_FOUND
- optional 3rd party: QUIET + message(STATUS "") except for Polyhedron/demo
- 3rd party components: COMPONENT / OPTIONAL_COMPONENT
                        (QUIET depending on required or optional 3rd party)
2022-09-06 16:24:27 +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
Laurent Rineau 2288225448 Massive update of CMake policies to version 3.23 2022-05-06 09:34:35 +02:00
Laurent Rineau 33635fff6d Fix warning
> test/Mesh_3/test_meshing_polyhedron_with_features.cpp:57:27: warning: type qualifiers ignored on cast result type [-Wignored-qualifiers]
>    57 |       constexpr auto nb = static_cast<decltype(str_size)>(10000);
>       |                           ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2022-02-25 15:28:53 +01:00
Laurent Rineau fc7f67269f Make two programs less verbose
Fix #6353
2022-02-24 15:41:47 +01:00
Andreas Fabri c4da9acd10 Use <sstream> instead of locks in the CMakeLists.txt file 2022-01-24 14:41:26 +00:00
Laurent Rineau 74fef7e06c Merge pull request #6252 from afabri/Voronoi-random_file_name-GF
Voronoi Diagram: Do not run tests simultaneously
2022-01-21 14:39:59 +01:00
Andreas Fabri 39edb66abb Do not run tests simultaneously 2022-01-18 15:17:57 +00: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
Laurent Rineau 7b6855d5c3 Merge pull request #6117 from gdamiand/Polyhedron3-draw_bugfix-gdamiand
Remove -old option for Polyhedron_3 draw
2021-11-18 12:27:14 +01:00
Laurent Rineau a463b904f6 Merge pull request #6118 from lrineau/Voronoi_diagram_2-fix_cpp20_warning-GF
Voronoi_diagram_2: fix C++20 warnings [-Wambiguous-reversed-operator]
2021-11-18 12:27:11 +01:00
Laurent Rineau f0ae53e9d0 Merge pull request #6118 from lrineau/Voronoi_diagram_2-fix_cpp20_warning-GF
Voronoi_diagram_2: fix C++20 warnings [-Wambiguous-reversed-operator]
2021-11-18 12:23:31 +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
Laurent Rineau 2e476304ed Fix warnings
> CGAL/Voronoi_diagram_2/Connected_components.h:103:19: warning: ISO C++20 considers use of overloaded operator '!=' (with operand types 'CGAL::VoronoiDiagram_2::Internal::Connected_components<...>::HAVC') to be ambiguous despite there being a unique best viable function with non-reversed arguments [-Wambiguous-reversed-operator]

I changed `operator==` into friend functions.
2021-11-10 09:35:10 +01:00
Sébastien Loriot ab48f63e30 update latest cmake version tested 2021-11-09 10:58:47 +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
Sébastien Loriot efbd86df7f extra manual fixes 2021-10-05 17:42:21 +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 e2194d9f72 Merge pull request #5981 from lrineau/Voronoi_diagram_2-fix_Handle_adaptor-issue_5961-GF
VD_2: Make Handle_adaptor a model of Handle
2021-09-20 17:07:04 +02:00
Laurent Rineau e62f836e27 Merge pull request #5981 from lrineau/Voronoi_diagram_2-fix_Handle_adaptor-issue_5961-GF
VD_2: Make Handle_adaptor a model of Handle
2021-09-20 17:02:34 +02:00
Laurent Rineau aea0bdd07c Make Handle_adaptor a model of Handle
Fix issue #5961.
2021-09-13 09:33:35 +02:00
Sébastien Loriot 98e471849b moving files from internal to PKG/internal 2021-08-26 11:33:39 +02:00
Sébastien Loriot 2948b47e66 add missing copyright files 2021-07-29 10:19:02 +02:00
Mael Rouxel-Labbé 4d2bf2f15e Add a test for ToS2-based VD2 2021-07-06 10:12:18 +02:00
Mael Rouxel-Labbé 326a05590f Restore some typedefs to please tests 2021-07-06 10:11:49 +02:00
Mael Rouxel-Labbé 01d6ce249c Minor doc fix 2021-07-06 10:11:39 +02:00
Mael Rouxel-Labbé d5a306b817 Add VD2's removal policy for ToS2 (+ caching) 2021-06-11 17:30:15 +02:00
Laurent Rineau 8dbcd0ec8b Merge pull request #5659 from MaelRL/ToS2-Adapt_ToS2_for_Voronoi_adapter-GF
Make `ToS2` compatible with `Voronoi_diagram_2`
2021-05-18 18:14:04 +02:00
Mael Rouxel-Labbé 942d461e4c Pass a copy of the GT to the VD2 adaptation traits (and not the DTOS)
That's because the previous formulation is awkward:
- VD2 that takes a copy (or a swap) of DT_0 yielding a DT_1;
- adaptation traits requiring a const& to a DT_0, which might then
  go out of scope.

In theory, we want to have the triangulation to get the nice "dt.point(v)",
but it's too heavy to copy the full triangulation just for the adaptations
traits, so just copy the GT and use old school v->point().
2021-05-05 18:24:54 +02:00
Sébastien Loriot fb6f703b55 IO namespace for files in IO directories 2021-05-04 14:36:06 +02:00
Mael Rouxel-Labbé e94127c23c Add adaptation traits for ToS2 2021-04-30 15:11:41 +02:00
Mael Rouxel-Labbé 3816336a02 Avoid compilation error in Identity_edge_rejector
Some triangulation classes use the same type for all_ and finite_ edges
2021-04-29 23:24:40 +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
Laurent Rineau c5ba414c72 Merge pull request #5336 from maxGimeno/GraphicsView-Use_opengl_4_1_context-maxGImeno
Graphics_view: Upgrade glsl version in basic_viewer_shaders
2021-02-05 16:12:42 +01:00
Laurent Rineau b134ed8246 Merge pull request #5336 from maxGimeno/GraphicsView-Use_opengl_4_1_context-maxGImeno
Graphics_view: Upgrade glsl version in basic_viewer_shaders
2021-02-05 16:07:32 +01:00
Maxime Gimeno a85cf6ed52 Move the include in the ifdef 2021-01-26 09:45:18 +01:00
Andreas Fabri e0dd8bd74a
Update AdaptationTraits_2.h
Add namespace
2021-01-21 15:23:57 +01:00
Maxime Gimeno 04753381e5 Rename file and add ::Qt 2021-01-12 13:22:34 +01:00
Maxime Gimeno 95192d6d4b factorize context initialization 2021-01-12 13:08:58 +01:00
Maxime Gimeno 2a212bb2a8 Upgrade non-compatibility sahders in Basic_viewer to glsl 150 and add a context creation before the creation of the QApp in draw_xxx examples 2021-01-07 13:06:40 +01:00
Maxime Gimeno 9c15f2c9dc Use FeatureSummary in the demo, and remove CGAL_FOUND 2020-08-04 12:46:17 +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
Jing Yang dc737f5ec1
Update draw_voronoi_diagram_2.cpp 2020-03-16 17:21:22 -07: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 2325a08b5d Remove warning 2019-09-16 14:18:19 +02:00
Jasmeet Singh a943d8e479 Specialize draw() function for Nef_3 viewer 2019-07-12 11:12:57 -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 899b6d9e09 Update draw() method call for Voronoi Diagram to be similar to other viewers.
Draw method for P2T2 and Nef_3 needs to be updated if this works.
2019-07-10 17:08:58 -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
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 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
Jasmeet Singh 1401212d14 Remove old name doc file 2019-06-24 12:40:42 -07:00
Jasmeet Singh 1a3ba3d4e0 Change file name to match documentation 2019-06-24 10:28:31 -07:00
Jasmeet Singh 58dec73f74 Update dependencies for Voronoi Diagram package: Add GraphicsView. 2019-06-21 12:17:22 -07:00
Jasmeet Singh 1107041933 Remove header draw_voronoi from vd_2_point_location as a separate example is added. Change CMakLists.txt accordingly. 2019-06-21 11:12:01 -07:00
Jasmeet Singh a48cb941ba Draw Dual Vertices in the voronoi diagram. Update doc image for drawing voronoi diagram.
Toggle with D to view/unview dual vertices. Vertex view should be ON as dual vertices use
the buffer for colored vertices.
2019-06-20 12:09:38 -07:00
Jasmeet Singh ce1b306d00 Add m_buffer_for_mono_lines and m_buffer_for_colored_lines to view lines.
Trying to visualize bisectors. Formatting changes.
2019-06-19 19:49:09 -07:00
Jasmeet Singh 001fda493b Add documentation for voronoi diagram viewer. 2019-06-19 16:30:56 -07:00
Jasmeet Singh 43015b0059 Add special KeyPressEvent for rays. Format typedefs. Set cgal_test_suit = qEnvironmentVariableIsSet("CGAL_TEST_SUITE")
Adding these changes after learning from the viewers generated by GDamiand.
2019-06-19 14:24:40 -07:00
Jasmeet Singh 955a982a5f Add an example for Voronoi diagram basic viewer.
For rays: draw a really big segment without modifying bounding box.
Hence, the initial screen of the viewer is correctly adjusted.
For faces: drawing only bounded faces for now. The function getSecondPoint(Halfedge)
can help to draw unbounded faces. Keypress R to view/unview rays.
2019-06-19 13:43:07 -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
Jasmeet Singh ff5e9a3820 Add compute_face() functionality and get_second_point() to find intersection of ray with bounding box
Show wireframe. Not building successfully as qOpenGLFunctions do not support glPolygonMode(). Comitting to save progress.
2019-06-18 17:51:22 -07:00
Jasmeet Singh 2874ce940c Merge remote-tracking branch 'jasmeet9323/cgal/master' into gsoc2019-add_basic_viewer-jasmeet
Sync my branch with remote to avoid conflicts during PR.
2019-06-18 12:56:28 -07:00
Jasmeet Singh 4f9df720ea Toggle ray display with keypress R. Start adding face viewer 2019-06-17 20:45:04 -07:00
Jasmeet Singh 1d4b6242f4 Show rays upto a bounding box 2019-06-17 20:02:08 -07:00
jasmeet9323 1a04afdae4 Experimenting with bounding box-ray intersection 2019-06-17 14:20:30 -07:00
Jasmeet Singh 1c852ed586 Add several points to display a ray.
The viewer stopped displaying anything.
2019-06-14 21:59:03 -07:00