songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
105,204 Commits 3 Branches 156 Tags 963 MiB
Commit Graph

1495 Commits

Author SHA1 Message Date
Laurent Rineau 873c3b26cf remove a few occurrences of "qt5" 
There are still a lot!
 2023-09-11 17:46:27 +02:00
Nicolas Saillant a4136707b2 More CMakeLists Updates for QT6 2023-09-11 09:51:06 +02:00
Laurent Rineau 1f13a625b1 restore the OpenGL format in DemosMainWindow 
That still does not work well when the widget is a `QOpenGLWidget`.
We probably need to derive from that class, to call `glClearColor(..)`
in the `paintGL()` method.
 2023-08-30 09:32:31 +02:00
Laurent Rineau 7af862ec8a fix trailing space 2023-08-29 16:55:28 +02:00
Laurent Rineau 3a52549c41 more cleanup of CMake scripts for Qt6 2023-08-29 16:35:15 +02:00
Laurent Rineau 4fbcb93704 a few cleanups 2023-08-28 16:54:30 +02:00
Laurent Rineau 740b57003c Merge remote-tracking branch 'refs/remotes/afabri/CGAL-Qt6-GF' into CGAL-Qt6-GF 2023-08-24 14:20:44 +02:00
Sébastien Loriot 68bc244d02 Merge remote-tracking branch 'cgal/master' into HEAD 2023-08-24 14:14:12 +02:00
Laurent Rineau 48bd7cc0c7 fix deprecation warnings from Qt6 2023-08-24 10:26:21 +02:00
Sébastien Loriot eada3ee8ca Merge branch 'master' into 'sloriot/CGAL-using_c++17_stl' 2023-08-14 14:19:25 +02:00
Sébastien Loriot 69202afc54 fix L1_VD demo 2023-08-04 14:40:13 +02:00
Sébastien Loriot 7f639164c1 update CK2 demo 2023-08-04 11:22:05 +02:00
albert-github 1cce66c343 Spelling corrections 
Spelling corrections `a e...` -> `an e...`
 2023-07-30 12:59:17 +02:00
Andreas Fabri 98fa0c089f Fix for crash on Quit 2023-07-18 09:36:05 +01:00
Andreas Fabri a6330295a6 Fix for deprecated warning 2023-06-30 07:56:10 +01:00
Andreas Fabri 63bf2a85b9 Fix for deprecated warning 2023-06-29 09:54:50 +01:00
Sébastien Loriot 573de7f29e Merge branch 'master' 2023-06-22 13:38:49 +02:00
Sébastien Loriot 9cdfe70abb Merge remote-tracking branch 'sloriot/CGAL-toward_6.0' 2023-06-15 11:34:09 +02:00
Sébastien Loriot 71b4e4f08f boost::shared_ptr => std::shared_ptr 2023-06-15 10:57:01 +02:00
Sébastien Loriot 8966b528fb Merge remote-tracking branch 'cgal/5.5.x-branch' 2023-05-30 19:15:11 +02:00
Sébastien Loriot 0c17d17f62 Merge remote-tracking branch 'cgal/5.4.x-branch' into HEAD 2023-05-30 19:14:44 +02:00
Mael Rouxel-Labbé f1b07a31e3 Add missing include 2023-05-23 19:00:52 +02:00
Laurent Rineau 9bafd13b00 Merge pull request #6721 from efifogel/Aos_2-conics-efif 
Resurect The Conic Traits
 2023-05-11 16:55:35 +02:00
Laurent Rineau d079559577 Merge pull request #7413 from lrineau/CGAL-fix-Qt5-CMake-GF 
Qt5::Svg is now only optional for CGAL_Qt5
 2023-05-11 16:55:28 +02:00
Laurent Rineau 0576e883f9 Merge branch 'CGAL-fix-Qt5-CMake-GF' into CGAL-Qt6-GF 
# Conflicts:
#	AABB_tree/demo/AABB_tree/CMakeLists.txt
#	Alpha_shapes_3/demo/Alpha_shapes_3/CMakeLists.txt
#	Arrangement_on_surface_2/demo/Arrangement_on_surface_2/CMakeLists.txt
#	Circular_kernel_3/demo/Circular_kernel_3/CMakeLists.txt
#	GraphicsView/demo/Alpha_shapes_2/CMakeLists.txt
#	GraphicsView/demo/Apollonius_graph_2/CMakeLists.txt
#	GraphicsView/demo/Bounding_volumes/CMakeLists.txt
#	GraphicsView/demo/Circular_kernel_2/CMakeLists.txt
#	GraphicsView/demo/Generator/CMakeLists.txt
#	GraphicsView/demo/GraphicsView/CMakeLists.txt
#	GraphicsView/demo/L1_Voronoi_diagram_2/CMakeLists.txt
#	GraphicsView/demo/Largest_empty_rect_2/CMakeLists.txt
#	GraphicsView/demo/Periodic_2_triangulation_2/CMakeLists.txt
#	GraphicsView/demo/Polygon/CMakeLists.txt
#	GraphicsView/demo/Segment_Delaunay_graph_2/CMakeLists.txt
#	GraphicsView/demo/Segment_Delaunay_graph_Linf_2/CMakeLists.txt
#	GraphicsView/demo/Snap_rounding_2/CMakeLists.txt
#	GraphicsView/demo/Spatial_searching_2/CMakeLists.txt
#	GraphicsView/demo/Stream_lines_2/CMakeLists.txt
#	GraphicsView/include/CGAL/Qt/DemosMainWindow_impl.h
#	Hyperbolic_triangulation_2/demo/Hyperbolic_triangulation_2/CMakeLists.txt
#	Installation/cmake/modules/CGAL_add_test.cmake
#	Linear_cell_complex/demo/Linear_cell_complex/CMakeLists.txt
#	Optimal_transportation_reconstruction_2/demo/Optimal_transportation_reconstruction_2/CMakeLists.txt
#	Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/CMakeLists.txt
#	Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/CMakeLists.txt
#	Polyhedron/demo/Polyhedron/polyhedron_demo_macros.cmake
#	Polyline_simplification_2/demo/Polyline_simplification_2/CMakeLists.txt
#	Principal_component_analysis/demo/Principal_component_analysis/CMakeLists.txt
#	Triangulation_3/demo/Triangulation_3/CMakeLists.txt
#	Triangulation_on_sphere_2/demo/Triangulation_on_sphere_2/CMakeLists.txt
 2023-04-28 13:49:58 +02:00
Laurent Rineau fe5a36c08e fix all the CMakeLists.txt for Qt5 2023-04-27 17:27:37 +02:00
Laurent Rineau 1a6ece1cea Qt5::Svg is now only optional for CGAL_Qt5 2023-04-27 17:27:23 +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
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
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
Andreas Fabri 97be3701e1 Fix and locally tested 2022-12-14 08:20:56 +00:00