Commit Graph

8464 Commits

Author SHA1 Message Date
Guillaume Damiand bd04b2a68d Remove space in doc 2023-12-06 17:01:34 +01:00
Guillaume Damiand 03ff679df4 doc draw: move advanced blocks 2023-12-05 14:10:25 +01:00
Guillaume Damiand 269f5829c2 try to move advanced 2023-12-05 13:51:45 +01:00
Guillaume Damiand 711a07dfe9 doc draw surface mesh and polyhedron 2023-12-05 13:49:32 +01:00
Guillaume Damiand f8a487d9ef update dependencies 2023-11-29 18:12:09 +01:00
Guillaume Damiand 0655006622 Merge with master: now viewers use Qt6 2023-11-29 14:36:38 +01:00
Sébastien Loriot 05e6889e45 Merge pull request #7397 from afabri/CGAL-Qt6-GF
CGAL:  Qt5 -> Qt6   [ WIP]
2023-11-24 09:36:38 +01:00
Sébastien Loriot 15af7605fe Q_DECL_OVERRIDE -> override 2023-11-22 11:34:27 +01:00
Sébastien Loriot 94d1234913 restore Mael's version 2023-11-16 12:00:35 +01:00
Sébastien Loriot cfac63f156 Merge remote-tracking branch 'cgal/master' into HEAD 2023-11-16 11:35:35 +01:00
Sébastien Loriot 4d834098b8 Merge remote-tracking branch 'cgal/master' into HEAD 2023-11-16 10:39:31 +01:00
Ivan Pađen 34c126839f Address warnings 2023-11-16 09:37:41 +01:00
Sébastien Loriot e885155c22 fix warnings 2023-11-16 09:37:41 +01:00
Ivan Paden 324f133125 Update removed arguments 2023-11-16 09:37:40 +01:00
Andreas Fabri 9ead7b59f5 Address unused variable warnings 2023-11-16 07:26:44 +00:00
Laurent Rineau 69d9025736 Merge pull request #6760 from hoskillua/gsoc2022
GSoC2022 - Interpolated Corrected Curvatures

# Conflicts:
#	Installation/CHANGES.md
2023-11-15 16:00:36 +01:00
Laurent Rineau e4f68a6e22 Merge pull request #7831 from ange-clement/Polyhedron-demo-fix-cells-not-in-complex-aclement
Polyhedron demo : Fix bug in "Show cells not in complex" of a C3t3
2023-11-15 15:44:19 +01:00
Andreas Fabri 3c07d9a591 Add virtual 2023-11-15 10:05:58 +00:00
Andreas Fabri 652f7b26c0 Replace Q_FOREACH 2023-11-15 08:59:17 +00:00
Andreas Fabri dc0cd7f1e6 make ~Show_point_dialog() virtual 2023-11-15 07:51:58 +00:00
Andreas Fabri 4e5082b6b5 remove _qt 2023-11-14 09:25:00 +00:00
Laurent Rineau bdfe153cd9 Merge pull request #7784 from janetournois/BGL-warning_fixed-jtournois
BGL - no need to workaround boost 1.54 anymore
2023-11-06 12:52:24 +01:00
Laurent Rineau e92d42f0dc Merge pull request #7795 from lrineau/CGAL_Lab-fix_VTK_io_plugin-GF
CGAL Lab: fix reading of VTK files
2023-11-06 12:52:21 +01:00
Laurent Rineau 65183a9057 Merge pull request #7800 from ange-clement/Polyhedron-demo-Surface_patch_index-color
Polyhedron demo - Use subdomain's color only when meshing from labeled images

# Conflicts:
#	Polyhedron/demo/Polyhedron/Scene_triangulation_3_item.cpp
2023-11-06 12:51:34 +01:00
Laurent Rineau 51627e3505 Merge remote-tracking branch 'cgal/master' into CGAL-Qt6-GF
# Conflicts:
#	GraphicsView/demo/Bounding_volumes/CMakeLists.txt
2023-11-01 20:59:44 +01:00
Laurent Rineau dda4bf8449 fix regression about MOC compilations
The commit b05e1e9e46 was indeed the
cause of the regression. But the root cause was an incorrect
usage of `qt6_generate_moc`.

The addition of `TARGET ${plugin_name}` triggered the use of the
property `INCLUDE_DIRECTORIES` of the target.

See https://doc.qt.io/qt-6/qt-generate-moc.html#arguments
2023-11-01 20:52:10 +01:00
Laurent Rineau 7dc4b624aa fix a link error about ~Scene_item_with_properties
```
            Creating library C:/CGAL_ROOT/CGAL-6.0-Ic-93/cmake/platforms/MSVC-2022-Community-Release/test/Polyhedron_Demo/Release/scene_points_with_normal_item.lib and object C:/CGAL_ROOT/CGAL-6.0-Ic-93/cmake/platforms/MSVC-2022-Community-Release/test/Polyhedron_Demo/Release/scene_points_with_normal_item.exp
   158>Scene_points_with_normal_item.obj : error LNK2019: unresolved external symbol "__declspec(dllimport) public: virtual __cdecl CGAL::Three::Scene_item_with_properties::~Scene_item_with_properties(void)" (__imp_??1Scene_item_with_properties@Three@CGAL@@UEAA@XZ) referenced in function "int `public: __cdecl Scene_points_with_normal_item::Scene_points_with_normal_item(class dtor$1 const &)'::`1'::dtor$1" (?dtor$1@?0???0Scene_points_with_normal_item@@QEAA@AEBV0@@Z@4HA) [C:\CGAL_ROOT\CGAL-6.0-Ic-93\cmake\platforms\MSVC-2022-Community-Release\test\Polyhedron_Demo\scene_points_with_normal_item.vcxproj]
   158>Scene_points_with_normal_item.obj : error LNK2019: unresolved external symbol "__declspec(dllimport) public: __cdecl CGAL::Three::Scene_item_with_properties::Scene_item_with_properties(void)" (__imp_??0Scene_item_with_properties@Three@CGAL@@QEAA@XZ) referenced in function "public: __cdecl Scene_points_with_normal_item::Scene_points_with_normal_item(class Scene_points_with_normal_item const &)" (??0Scene_points_with_normal_item@@QEAA@AEBV0@@Z) [C:\CGAL_ROOT\CGAL-6.0-Ic-93\cmake\platforms\MSVC-2022-Community-Release\test\Polyhedron_Demo\scene_points_with_normal_item.vcxproj]
   158>C:\CGAL_ROOT\CGAL-6.0-Ic-93\cmake\platforms\MSVC-2022-Community-Release\test\Polyhedron_Demo\Release\scene_points_with_normal_item.dll : fatal error LNK1120: 2 unresolved externals [C:\CGAL_ROOT\CGAL-6.0-Ic-93\cmake\platforms\MSVC-2022-Community-Release\test\Polyhedron_Demo\scene_points_with_normal_item.vcxproj]
```
https://cgal.geometryfactory.com/CGAL/testsuite/CGAL-6.0-Ic-93/Polyhedron_Demo/TestReport_Christo_MSVC-2022-Community-Release.gz
2023-10-30 15:04:24 +01:00
ange-clement 8aa8fb9397 Fixed issue (minimal) 2023-10-26 14:22:38 +02:00
Sébastien Loriot 39ad72706e Merge remote-tracking branch 'cgal/5.6.x-branch' 2023-10-26 08:59:18 +02:00
Sebastien Loriot b82958377f
fix demo warnings (#7806)
Fix warnings
[here](https://cgal.geometryfactory.com/CGAL/testsuite/CGAL-6.0-I-85/Polyhedron_Demo/TestReport_lrineau_Fedora-with-LEDA.gz)
2023-10-25 08:33:15 -07:00
Sebastien Loriot 9e6abb7291
Mesh 3 : improved meshing with selected polylines (#7750)
## Summary of Changes

Added a drop-down item "Input polyline only" in "Protect sharp edges"
when a polyline item is selected.
Fixed polyline item not working depending on the order of selection.

## Release Management

* Affected package(s): Mesh_3
* Issue(s) solved (if any): 
* Feature/Small Feature (if any):
* License and copyright ownership:
2023-10-25 08:31:50 -07:00
Sebastien Loriot dfb9b3407f
Mesh_3 Polyhedron demo : Added support for vtk images (vti format) (#7729)
## Summary of Changes

Added support for vtk image (.vti files) opening in the demo in the
plugin Mesh_3/Io_image_plugin

## Release Management

* Affected package(s): Mesh_3
* Issue(s) solved (if any): 
* Feature/Small Feature (if any):
* License and copyright ownership:
2023-10-25 08:29:58 -07:00
Guillaume Damiand 4332889259 remove template for Buffer_for_vao 2023-10-23 02:03:48 +02:00
Guillaume Damiand 761fde02be add_in_graphics_scene -> add_to_graphics_scene; plus remove template parameter NumberType 2023-10-23 01:52:38 +02:00
Guillaume Damiand cbe7ef2b40 Merge branch 'master' into gsoc2022-EBVs-Mostafa-ashraf19 2023-10-22 17:18:04 +02:00
Guillaume Damiand d74a3dbeac Remove template parameter for graphics scene 2023-10-22 17:12:21 +02:00
Sébastien Loriot 18e233c036 fix warnings 2023-10-18 11:56:00 +02:00
ange-clement b4188a5011 Fix intersection not having color +
Domains colors better follow item color
2023-10-17 15:02:16 +02:00
Laurent Rineau 3ec0c7e186 Merge pull request #7737 from ange-clement/Polyhedron-demo-Clipping-box-more-support-aclement
Polyhedron demo : Add clip box plugin support for more items
2023-10-16 11:13:26 +02:00
ange-clement 4aa796bcab Only use subdomain's color when meshing from labeled images 2023-10-13 17:43:15 +02:00
Laurent Rineau ff095fe31e fix loading of a polygon mesh from VTK
- fix a memory leak
- allow to read a polygon soup, in addition to surface meshes
2023-10-12 16:50:55 +02:00
Laurent Rineau 4c2bbb812d remove a fake dependency 2023-10-12 16:50:55 +02:00
Jane Tournois 6b8eaa4e5c remove CGAL workaround from cpp files 2023-10-12 10:12:09 +02:00
Sébastien Loriot ffea30946f fix the second demo plugin 2023-10-09 18:55:33 -07:00
Sébastien Loriot 5b67e30e86 fix demo 2023-10-09 17:08:49 -07:00
ange-clement abedd731a7 Fix warning (i, j and k can be negative) 2023-10-06 16:31:54 +02:00
Laurent Rineau a5d44aa808 fix the random appearance of clip plane
For the `Scene_c3t3_item` (and probably `Scene_triangulation_item` as
well) most of the time the clip plane was not shown. This is because of
Boolean data member `cut_plane_enabled` that was not initialized.
2023-10-06 16:04:21 +02:00
ange-clement 40f5ac0023 Fixed warnings +
deleted unsused variables
2023-10-05 15:56:59 +02:00
ange-clement 41617958c6 Fixed wrong initialization 2023-10-05 15:00:04 +02:00
ange-clement f088028fea Renamed visible_biteset to visible_bitset +
Fixed warnings
2023-10-05 14:43:45 +02:00