Commit Graph

1620 Commits

Author SHA1 Message Date
Laurent Rineau 1a6ece1cea Qt5::Svg is now only optional for CGAL_Qt5 2023-04-27 17:27:23 +02:00
Guillaume Damiand 8f29e4d323 Rename class graphic buffer 2023-04-27 15:48:42 +02:00
Sébastien Loriot 3e07f88ab5 catch more 2023-04-24 12:01:17 +02:00
Andreas Fabri ab1d7990d2 various fixes [skip ci] 2023-04-20 11:14:11 +01:00
Andreas Fabri 370e81ef08 AABB Tree demo works 2023-04-19 15:05:33 +01:00
Andreas Fabri 42a9757f2f Fix to have a weak order 2023-04-19 15:05:12 +01:00
Andreas Fabri 47683f2dea The Truiangulation_2/examples which use draw() compile and visualize but have an assertion in a QMap 2023-04-19 14:27:45 +01:00
Andreas Fabri c6ce5fb120 Switch to QT6 for the GraphicsView demos 2023-04-19 12:19:38 +01:00
Mael Rouxel-Labbé 1a5826f11a Merge remote-tracking branch 'cgal/master' into SLS-Weighted_skeleton-GF 2023-04-17 12:48:30 +02:00
Luiz Georg fafef018ef Fix documentation for Qt/Converter.h 2023-04-06 10:05:06 -03:00
Luiz Georg 42752d0c53 Add converter to QPolygonF 2023-03-29 11:39:37 -03:00
Mael Rouxel-Labbé a7e0226bfa Merge remote-tracking branch 'cgal/master' into SLS-Weighted_skeleton-GF 2023-03-23 11:45:12 +01:00
Mael Rouxel-Labbé 85911f1b64 Merge remote-tracking branch 'cgal/master' into SLS-Weighted_skeleton-GF 2023-03-20 10:06:38 +01:00
Laurent Rineau 5c339515cf Merge branch 'CGAL-rename_ctest_test_names-GF' into Triangulation_3-CDT_3-lrineau
# Conflicts:
#	Polygon_mesh_processing/examples/Polygon_mesh_processing/CMakeLists.txt
#	Triangulation_3/benchmark/Triangulation_3/CMakeLists.txt
2023-03-15 14:32:28 +01:00
SaillantNicolas ea7adb83e1
Remove ImageInterface.ui from resources 2023-03-09 14:19:54 +01:00
Nicolas Saillant 8b90cb40b2 Move ImagerInterface.ui into QT folders 2023-03-09 13:29:46 +01:00
Laurent Rineau a5052f4cd8 Merge pull request #6835 from MaelRL/CGAL-Clean_CMakeLists.txt-GF
Some CMakeLists.txts cleaning
2023-02-16 10:52:29 +01:00
Mael Rouxel-Labbé 68067c039f Merge remote-tracking branch 'cgal/master' into SLS-Weighted_skeleton-GF 2023-02-14 12:26:50 +01:00
Laurent Rineau f48443c91c Merge pull request #7185 from afabri/Largest_empty_iso_rectangle-Add_load_to_demo-GF
Largest_empty_iso_rectangle: Improve Demo
2023-02-10 15:40:47 +01:00
Mael Rouxel-Labbé a346c80a4f Remove obsolete comment 2023-02-09 23:10:34 +01:00
Laurent Rineau cddb01ab68 Merge pull request #7253 from lrineau/Triangulation_2-improve-CDT_2_debugging-GF
STL_Extension/Triangulation_2: improve CDT_2 debug messages
2023-02-06 14:17:40 +01:00
Mael 153c603209
Merge branch 'master' into CGAL-Clean_CMakeLists.txt-GF 2023-01-27 22:09:02 +01:00
Laurent Rineau 5f8930db8c Merge branch '5.5.x-branch'
# Conflicts:
#	Convex_hull_2/test/Convex_hull_2/ch_test_CH.cpp
#	Convex_hull_2/test/Convex_hull_2/ch_test_SC.cpp
#	Convex_hull_2/test/Convex_hull_2/ch_test_SH.cpp
#	Convex_hull_2/test/Convex_hull_2/ch_test_SS.cpp
#	Straight_skeleton_2/include/CGAL/constructions/Straight_skeleton_cons_ftC2.h
#	Straight_skeleton_2/include/CGAL/predicates/Straight_skeleton_pred_ftC2.h
2023-01-27 21:16:14 +01:00
Laurent Rineau afd56fe52b Merge pull request #7112 from afabri/T2_demo-read_WKT-GF
Triangulation_2 Demo: Read files with many WKT entities
2023-01-27 20:52:32 +01:00
Andreas Fabri 8c0d5bd59b Largest_empty_iso_rectangle: Improve Demo 2023-01-13 10:48:28 +00:00
Mael 4d22c90474
Merge branch 'master' into feature/bug_documentation_spell_20221113 2023-01-04 10:06:45 +01:00
Laurent Rineau bf6815256b move edg files to Data/data 2022-12-19 12:20:03 +01:00
Andreas Fabri 97be3701e1 Fix and locally tested 2022-12-14 08:20:56 +00:00
Andreas Fabri aa8da893c2 Fix and simplify code 2022-12-14 08:20:44 +00:00
Andreas Fabri 8da2cd9a34 Triangulation_2 Demo: Read files with many WKT entities 2022-12-14 08:20:26 +00:00
Andreas Fabri c7fb2f56ae Three: Add an #include# 2022-12-07 09:47:41 +00:00
Mael 0ff7882997
Merge branch 'master' into feature/bug_documentation_spell_20221113 2022-12-06 22:21:06 +01:00
Mael 6538b22e06
Merge branch 'master' into CGAL-Clean_CMakeLists.txt-GF 2022-12-05 16:03:41 +01:00
Mael Rouxel-Labbé b5c21e1f5d Http -> https + update some dead links 2022-11-23 18:54:37 +01:00
albert-github 9d709b12e5 spelling corrections
After review
2022-11-21 10:40:28 +01:00
albert-github 45478184de spelling corrections
Some spelling corrections (Directories starting with `E`-` L`),
some backward work
some forward work
2022-11-15 13:39:40 +01:00
Laurent Rineau d24b180293 Merge branch 'master' into gsoc2022-boost_np 2022-10-28 15:39:36 +02:00
Guillaume Damiand 534e7894b4 replace use of get_local_point 2022-10-19 16:34:08 +02:00
Guillaume Damiand 14848d4508 Add a class allowing to create a qt application and a basic viewer, which can be ran latter. This allows modification of the viewer (for example add shortcuts description). 2022-10-19 13:44:36 +02:00
Guillaume Damiand 0d49e61847 add missing include 2022-10-18 13:15:21 +02:00
Guillaume Damiand 89f7e05dc6 some drawing functor are necessary non null; review of draw for lcc. 2022-10-14 16:03:25 +02:00
Guillaume Damiand 9c77619fde Remove unused constructor; move function that does not depend on Qt 2022-10-14 15:08:05 +02:00
Guillaume Damiand 47f01c77bc Remove enum duplication 2022-10-14 11:32:58 +02:00
Guillaume Damiand 744986f2a1 spaces 2022-10-14 09:34:51 +02:00
Guillaume Damiand 331bc5c305 add missing licence header 2022-10-14 09:07:19 +02:00
Guillaume Damiand 62201124d3 Merge branch 'EBVs-Mostafa-ashraf19-cgal-dev-OLD' into gsoc2022-EBVs-Mostafa-ashraf19 2022-10-14 09:03:30 +02:00
Guillaume Damiand 24a8004ee0
Merge branch 'master' into gsoc2022-EBVs-Mostafa-ashraf19 2022-10-14 08:53:12 +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
Guillaume Damiand 91016007cd Some cleanup 2022-10-13 11:11:57 +02:00
Guillaume Damiand 733711384b review + comment 2022-10-13 08:51:41 +02:00
Guillaume Damiand 61a3711c19 Review and indent. 2022-10-13 08:48:11 +02: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 0e2586f83d Added template arg. 2022-10-08 12:34:46 +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
Mostafa-ashraf19 7a2f8902ff Added CGAL namespace, new line at EOF. 2022-10-06 15:13:21 +02:00
Laurent Rineau be28464cdc Merge pull request #6838 from MaelRL/Polyhedron_Demo-Fix_grid_axes_scaling-GF
Demo: Fix grid axes scaling + use basic shader
2022-10-04 13:53:26 +02:00
Laurent Rineau 7a36d9af83 Merge pull request #6863 from lrineau/Polyhedron-demo_fix_display_of_protecting_spheres-GF
Polyhedron demo - Fix the display of protecting balls (second version)
2022-10-04 13:52:56 +02:00
Laurent Rineau 3a0a7fe34e Merge pull request #6863 from lrineau/Polyhedron-demo_fix_display_of_protecting_spheres-GF
Polyhedron demo - Fix the display of protecting balls (second version)
2022-10-04 13:50:20 +02:00
Mostafa-ashraf19 7886775996 Changed Guard Name 2022-10-03 14:27:40 +02:00
Mostafa-ashraf19 796ec13391 Modified GraphicBuffer class name to snake case. 2022-10-03 13:27:22 +02:00
Mostafa-ashraf19 cb4c77f1eb changed functor names. 2022-09-23 22:23:10 +02:00
Mostafa-ashraf19 bf59ef5003 Generic_functor.h renamed to Drawing_functor.h 2022-09-23 22:23:10 +02:00
Mostafa-ashraf19 6c95908e6c Renamed functors and GB, added handles to test functors. 2022-09-23 18:03:11 +02:00
Mostafa-ashraf19 d78819d54d GraphicBuffer.h renamed to Graphic_buffer.h 2022-09-23 17:50:44 +02:00
Mostafa-ashraf19 79d5e09df7 Initial commit Generic functor. 2022-09-22 17:31:50 +02:00
Laurent Rineau 3b6b6f9018 Polyhedron demo - Fix the display of protecting balls 2022-09-20 16:15:49 +02:00
Mael Rouxel-Labbé 6f187f332c Misc minor fixes/improvements 2022-09-14 14:08:23 +02:00
Guillaume Damiand 899b8eaa82 Bugfix for negate normal 2022-09-12 15:58:04 +02:00
Guillaume Damiand 6076849ea5 Update for basic viewer 2022-09-12 10:55:37 +02:00
Mostafa-ashraf19 b61722fb1c Added template inheritance. 2022-09-10 21:22:18 +02:00
Mael cf06114d97
Comment out unused variable 2022-09-09 22:21:35 +02:00
Mael Rouxel-Labbé 5c8f36e0ca Fix grid axes scaling + use basic shader 2022-09-07 20:54:21 +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
Mael Rouxel-Labbé 28ba446895 Clean (some) CMakeLists.txt indentation 2022-09-06 15:38:18 +02:00
Sébastien Loriot ad6329c263 Merge 'cgal/master' into gsoc2022-boost_np 2022-08-16 17:52:18 +02:00
Laurent Rineau e5ab367d6c Merge pull request #6770 from sloriot/Basic_viewer-typo
Fix copy/paste error
2022-07-28 14:41:34 +02:00
Mostafa-ashraf19 c8c068ecff Moved draw_buffer function. 2022-07-25 19:45:45 +02:00
Sébastien Loriot 0b63b76008 fix copy/paste error 2022-07-25 16:51:38 +02:00
Mostafa-ashraf19 b8509e4da1 Fixed bugs, migrated variables to graphics buffer, and removes unneeded variables. 2022-07-25 15:08:18 +02:00
Mostafa-ashraf19 1dcca825bd Move vector of texts 2022-07-25 15:05:35 +02:00
Laurent Rineau 0f7749432c Merge pull request #6412 from afabri/Triangulation_2-mark_domains-GF
Triangulation_2: Add CGAL::mark_domain_in_triangulation
2022-07-24 18:08:41 +02:00
Mostafa-ashraf19 02cf9a1999 Trying to solve warning 2022-07-20 18:00:40 +02:00
Mostafa-ashraf19 01289f6221 Trying to solve warninggit add GraphicsView/include/CGAL/GraphicBuffer.h 2022-07-20 17:59:37 +02:00
Mostafa-ashraf19 0bc2f1050f Small modifications 2022-07-20 12:48:29 +02:00
Mostafa-ashraf19 e050176613 Removed forward declaration. 2022-07-20 12:47:29 +02:00
Mostafa-ashraf19 2cc082e2ad Fixed typo, added local kernel. 2022-07-20 12:13:04 +02:00
Mostafa-ashraf19 5d7bb68480 Fixed typo, added forward declaration at basic viewers. 2022-07-20 11:46:30 +02:00
Mostafa-ashraf19 2a3144b7f3 Dealing bounding box from the graphic buffer. TODO for expected would remove 2022-07-20 10:04:47 +02:00
Mostafa-ashraf19 46e1bc7fca Got member elements of basic viewer. added needed methods to work externally. 2022-07-20 10:02:17 +02:00
Mostafa-ashraf19 8778d1c4b4 Handled constructor. 2022-07-20 09:50:38 +02:00
Mostafa-ashraf19 6768426af6 Moved the graphical store elements, and used elements from the graphic buffer.
Moved m_texts, arrays, m_bounding_box.
Handled methods that use basic viewer arrays to use them from the graphic buffer.
Moved a few methods.
2022-07-20 09:40:17 +02:00
Guillaume Damiand a303529e17 small correctioin 2022-07-19 10:47:51 +02:00
Mostafa-ashraf19 e51c41d7d6 Handled buffers check. 2022-07-19 09:39:10 +02:00
Mostafa-ashraf19 a859f50716 fixes bugs, WIP constructor 2022-07-19 09:36:45 +02:00
Guillaume Damiand e92373740e Add constant for init size of window 2022-07-13 10:15:50 +02:00
Mostafa-ashraf19 79a8ed3d24 CGAL: Initial commit for buffer dealing. 2022-07-04 10:28:18 +02:00
Mostafa-ashraf19 32ecb11947 CGAL: Initial commit to handle GraphicBuffer with Basic viewers. 2022-07-04 10:25:59 +02:00
Guillaume Damiand 1d9280afae Update basic viewer to set camera mode ealier (following Efi issue). TODO: test if this solves the bug. 2022-07-04 10:04:20 +02:00
Laurent Rineau 1ba31d6e3f Merge branch 'master' into Triangulation_2-mark_domains-GF
# Conflicts:
#	Installation/CHANGES.md
2022-06-17 11:00:12 +02:00
Mael Rouxel-Labbé 37390bb6b8 Add dialog-less QGLviewer::saveSnapshot 2022-06-08 12:03:25 +02:00
Sébastien Loriot d13f486640 update tests/examples/demos to use the new API 2022-06-04 14:19:00 +02:00
Sébastien Loriot ebf9fb025a Merge remote-tracking branch 'cgal/5.4.x-branch' 2022-05-26 18:13:59 +02:00
Sébastien Loriot 6f84cbebc2 Merge remote-tracking branch 'cgal/5.3.x-branch' 2022-05-26 18:13:19 +02:00
Andreas Fabri 8204007c11 Use named parameters in demo 2022-05-18 10:08:57 +01:00
Laurent Rineau b32619fedd Fix the picking 2022-05-16 17:12:00 +02:00
Laurent Rineau 213da3115f Fix the display of the pivot point 2022-05-16 16:20:13 +02:00
Laurent Rineau 9211f1768f Add a generic read_pixel for other pixel readings 2022-05-12 14:15:01 +02:00
Laurent Rineau 225e3c2217 Add a function read_depth_under_pixel
The function takes care of HiDPI screen, using `devicePixelRatio()`.
2022-05-12 12:41:58 +02:00
Laurent Rineau 9ade574b1a Add devicePixelRatio() to Camera 2022-05-12 12:13:08 +02:00
Laurent Rineau 2288225448 Massive update of CMake policies to version 3.23 2022-05-06 09:34:35 +02:00
Laurent Rineau 6d28829737 Merge pull request #6316 from sloriot/CGAL-boost_progress
Use non-deprecated API for boost progress
2022-02-22 18:24:47 +01:00
Laurent Rineau 98f7d25a20 Merge pull request #6316 from sloriot/CGAL-boost_progress
Use non-deprecated API for boost progress
2022-02-22 18:23:37 +01:00
Sébastien Loriot 0dca23cbf8 progress_display is replaced starting boost 1.72 2022-02-18 15:53:54 +01:00
Sébastien Loriot b4d37aff47 use non-deprecated API 2022-02-18 15:53:54 +01:00
Andreas Fabri 440a8dfb7b Fix file name 2022-02-03 08:41:04 +00:00
Andreas Fabri 735752bec9 Do the remaining changes after Laurent's check 2022-02-03 08:02:11 +00:00
Sébastien Loriot 993a7b29b0 fix warnings about arithmetic operations on enum
cherry-pick of 364009
2021-11-29 17:59:12 +01:00
Mael Rouxel-Labbé 625848e629 Fix missing ':' in various namespaces 2021-10-04 13:21:47 +02:00
Sébastien Loriot 3640099261 fix warnings about arithmetic operations on enum 2021-09-28 15:36:51 +02:00
Laurent Rineau 2cbc381554 Merge pull request #5997 from gdamiand/GraphicsView-is_facet_convex-gdamiand
GraphicsView: Bug Fix in Buffer_for_vao::is_facet_convex()
2021-09-23 16:13:57 +02:00
Laurent Rineau c891f60eb4 Merge branch '5.2.x-branch' into 5.3.x-branch 2021-09-23 16:12:46 +02:00
Guillaume Damiand 0700e56168 Fix the previous fix in is_facet_convex() 2021-09-17 11:21:23 +02:00
Sébastien Loriot 6f7fd79a1e Merge remote-tracking branch 'cgal/5.3.x-branch' 2021-08-31 19:03:26 +02:00
Maxime Gimeno 66f92a336e Restore compatibility shader code 2021-08-30 11:11:57 +02:00
Maxime Gimeno f7df517f57 Merge remote-tracking branch 'cgal/master' into T2-Document_projection_traits_3-maxGimeno 2021-08-09 09:14:23 +02:00
Maxime Gimeno a3d1765ab4 Merge remote-tracking branch 'cgal/master' into CGAL-Clean_up_boost_versions-maxGimeno 2021-07-19 14:18:40 +02:00
Guillaume Damiand c71138c3b0 Regenerate clipping plane in initialize_buffers, to adapt it to the possible new bounding box; add methods to retreive the clipping plane as a cgal plane_3. 2021-06-30 18:40:13 +02:00
Guillaume Damiand 29d54bb66b trailling 2021-06-29 19:54:13 +02:00
Guillaume Damiand 53cdabe0c3 Do not delete clipping plane frame, but only hide it, to keep its position. 2021-06-29 17:39:30 +02:00
Guillaume Damiand 1ab891ee35 Do not clear pos buffer of clipping plane. 2021-06-29 15:49:05 +02:00
Maxime Gimeno 2d5f91f763 Merge remote-tracking branch 'cgal/master' into T2-Document_projection_traits_3-maxGimeno 2021-05-27 09:06:59 +02:00
Maxime Gimeno e6c767d5c9 Simplify the GNUC versions tests 2021-05-12 15:45:07 +02:00
Maxime Gimeno 393ae7dae6 Clean-up boost_version reqs 2021-05-12 15:03:53 +02:00
Sébastien Loriot 12f0e412b5 write_vtu -> write_VTU 2021-05-04 15:12:36 +02:00
Sébastien Loriot fb6f703b55 IO namespace for files in IO directories 2021-05-04 14:36:06 +02:00
Sebastien Loriot b7323389c7
Merge pull request #5622 from maxGimeno/CMake-Update_versions_in_scripts-maxGimeno
Update maximum cmake versions
2021-04-17 10:58:14 +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
Maxime Gimeno 17602e589e Merge remote-tracking branch 'cgal/master' into CGAL-clang_tidy__nullptr_on_Mesh_2-GF 2021-04-07 09:17:51 +02:00
Laurent Rineau c453420dd6 Merge pull request #5513 from maxGimeno/Demo-Fixes-maxGimeno
Polyhedron_demo: Move LAS code from item to plugin
2021-03-24 15:05:20 +01:00
Maxime Gimeno 735567531b RENAME 2021-03-19 12:00:08 +01:00
Maxime Gimeno 5066d5ae4b Fix Qt::midbutton deprecation warning 2021-03-16 13:28:00 +01:00
Dmitry Anisimov 6346767cb2 added = default to the Lipschitz sizing field 2021-03-16 12:12:49 +01:00
Laurent Rineau 2d5678bc91
Merge pull request #5406 from gdamiand/gsoc2020-basic-viewer-jyang-gdamiand 2021-03-08 09:21:39 +01:00
Laurent Rineau f712a2a3a0 Merge pull request #5473 from maxGimeno/Demo-Fixes-maxGimeno
Polyhedron demo: Fixes for 5.1

Conflicts:
	Polyhedron/demo/Polyhedron/resources/compatibility_shaders/shader_spheres.vert
	Polyhedron/demo/Polyhedron/resources/shader_spheres.vert
2021-03-03 18:27:33 +01:00
Laurent Rineau 3ab3b10d47 Merge pull request #5247 from MaelRL/SDG-Fix_doc-GF
Doc improvements for TDS-related classes
2021-03-03 17:38:18 +01:00
Laurent Rineau 22b823f066 Merge pull request #5434 from maxGimeno/Doc-Dont_use_small_caps-maxGimeno
Doc: Don't use small caps
2021-03-03 17:32:57 +01:00
Laurent Rineau 11e3c689ed Merge pull request #5473 from maxGimeno/Demo-Fixes-maxGimeno
Polyhedron demo: Fixes for 5.1
2021-03-03 16:39:47 +01:00
Maxime Gimeno a16bd23d04 Replace Qt::MidButton by Qt::MiddleButton, qhich is the same thing but not deprecated 2021-03-02 09:56:14 +01:00