Commit Graph

8595 Commits

Author SHA1 Message Date
Sébastien Loriot d5db17747c set focus to the ok button 2024-02-13 11:36:49 +01:00
Laurent Rineau 3b4d0cfc3a Merge pull request #8003 from lrineau/Polyhedron_demo-fix_CTest_dependencies-GF
Add a hook CGAL_hook_fix_ctest_dependencies
2024-02-13 11:18:19 +01:00
Laurent Rineau 5137b9831b Merge pull request #8024 from soesau/CGAL_Lab-fix_degenerate_polygons-GF
CGAL Lab: Fix rendering for degenerate polygons
2024-02-13 11:18:05 +01:00
Jane Tournois b48760af26 use do_not_triangulate_faces
a NP that already existed before this PR
2024-02-12 17:08:46 +01:00
Jane Tournois 9f863845c6 add PMP::add_bbox(pmesh) to repair plugin 2024-02-12 16:34:20 +01:00
Sven Oesau a77296fbc4 fix for degenerate polygons for bug introduced by https://github.com/CGAL/cgal/pull/7898 2024-02-08 12:10:53 +01:00
Laurent Rineau 3664fc8fdb fix for MSVC projects 2024-02-08 11:04:28 +01:00
Jane Tournois 7109a282af cleaning 2024-02-05 09:37:15 +01:00
Laurent Rineau 0f59daafb9 Add a hook CGAL_hook_fix_ctest_dependencies
This hook fonction detects dependencies between compilation tests.
2024-01-26 14:56:31 +01:00
Laurent Rineau 47324c1f1c Merge pull request #7919 from hoskillua/icc-todos
Interpolated Curvature remaining TODOs
2024-01-24 16:02:00 +01:00
Laurent Rineau a70e9202f2 Merge pull request #7970 from MaelRL/CGAL-Demo_bugs-GF
Fix some demo bugs
2024-01-24 16:01:52 +01:00
hoskillua 806d1247e6 display plugin ball radius slider update 2024-01-19 14:47:39 +03:00
Sebastien Loriot 2e4139cbb3
Try to fix link issues with qt6 resources (#7915) 2024-01-19 11:42:11 +01:00
Laurent Rineau 1491b754f7 If CGAL_TEST_SUITE, then plugins do not depend on Polyhedron_3 2024-01-11 15:32:20 +01:00
Laurent Rineau 2ccb65f6ea Revert "plugins should not depend on `Polyhedron_3`"
This reverts commit 1f26c03e3b.
2024-01-11 15:17:26 +01:00
Guillaume Damiand 3bc56024d3 Merge branch 'master' into gsoc2022-EBVs-Mostafa-ashraf19 2024-01-11 14:08:05 +01:00
Laurent Rineau 61800d1be7
CGAL Lab: Rendering polygons with ghost edges (#7898)
Polygons and meshes with non-triangular faces that have ghost edges,
i.e., holes connected via two identical edges to the outer border of the
polygon, are now correctly rendered.

The FacetTriangulator now uses mark_domain_in_triangulation to set
is_external property.

## Release Management

* Affected package(s): Polyhedron/demo
2024-01-11 14:01:52 +01:00
Laurent Rineau 1f26c03e3b plugins should not depend on `Polyhedron_3` 2024-01-10 16:23:44 +01:00
Mael Rouxel-Labbé af3608335b Misc indentation fixes 2024-01-10 11:20:29 +01:00
Mael Rouxel-Labbé 53567bd20a Handle non triangulated inputs in the repair plugin 2024-01-10 11:19:43 +01:00
Mael Rouxel-Labbé 83fd1fe2b3 Disable the area smoothing box if Ceres is not available 2024-01-10 11:19:12 +01:00
Mael Rouxel-Labbé a0638f6e0a Use file's completeBaseName for item names 2024-01-10 11:18:50 +01:00
Laurent Rineau aeda27f405 "compilation of demo_framework" should be in the Installation package and Polyhedron 2024-01-09 13:58:03 +01:00
Sven Oesau de17922ca4 removed warnings 2024-01-09 10:26:19 +01:00
Sébastien Loriot 182b2c7792 fix warning 2024-01-08 16:53:52 +01:00
Sébastien Loriot 4a2d0704fc fix warnings 2024-01-04 17:27:10 +01:00
Sebastien Loriot c6eed472fd
fix warning 2024-01-04 17:19:47 +01:00
Sébastien Loriot 6f1b34fa6e restore LGPL for file from another institute than the package owner 2024-01-04 14:05:52 +01:00
Sébastien Loriot c99b69a0e7 add missing license headers 2024-01-04 13:50:15 +01:00
Sébastien Loriot e7c26349f2 move header in a package to GPL 2024-01-04 13:36:34 +01:00
Sebastien Loriot 1a934524ba
CGAL Lab: Transformation of point normals (#7935)
## Summary of Changes

Affine transformation transforms points, but didn't transform their
normals. This PR takes care of normal transformation of point sets.

## Release Management

* Affected package(s): Polyhedron Demo
2023-12-26 17:30:00 +01:00
Sébastien Loriot 6eff89bbc8 Merge pull request #7614 from sloriot/PMP-BF_autorefine
Add autorefine for triangle soup
2023-12-26 12:11:04 +01:00
Jane Tournois 1748dfadbb fix compilation 2023-12-22 14:52:03 +01:00
Sven Oesau 4fe88f8b49 added transformation of normals 2023-12-18 15:35:25 +01:00
Sebastien Loriot a578b40b42
Tetrahedral remeshing - deal with c3t3 complex edges (#7909)
## Summary of Changes

For a mesh generated by Mesh_3, that has complex edges that do not lie
at the intersection of surface patches, automatic detection of these
features is impossible from the input triangulation.
This PR introduces a new named parameter `edge_is_constrained_map` to
`convert_to_triangulation_3()` that sets the edges constrained status
corresponding to their `is_in_complex()` status.

This pmap can then be used straight away in
`tetrahedral_isotropic_remeshing()`.

## Release Management

* Affected package(s): Tetrahedral_remeshing
* License and copyright ownership: unchanged
2023-12-18 13:29:21 +01:00
Sebastien Loriot b9696c2f86
Polyhedron Demo: Add sampling plugin (#7910)
## Summary of Changes

Add a plugin that samples meshes and polygon soups

### Todo

- [x] Add dialog for the various parameters of the sampling function
- [x] Check that the input is triangular.

## Release Management

* Affected package(s): Polyhedron
* License and copyright ownership: unchanged
2023-12-18 13:21:01 +01:00
Sebastien Loriot 1787da400b
Stream_support: Add read_VTK() (#7826)
## Summary of Changes

Add `read_VTK()` so that we can also read non-xml   *.vtk files.

- [x] Document it correctly

## Release Management

* Affected package(s): Stream_support 
* Feature/Small Feature (if any):
* Link to compiled documentation:
[overview](https://cgal.github.io/7826/v0/Stream_support/IOStreamSupportedFileFormats.html#IOStreamVTK)
and
[function](https://cgal.github.io/7826/v0/Stream_support/group__PkgStreamSupportIoFuncsVTK.html#gaad7f1c5c10e8700a4a6de88294c5a620)

* License and copyright ownership:
2023-12-18 13:15:31 +01:00
Laurent Rineau 9a944e563c Merge remote-tracking branch 'cgal/master' into PMP-BF_autorefine
# Conflicts:
#	Installation/CHANGES.md
#	Polygon_mesh_processing/examples/Polygon_mesh_processing/CMakeLists.txt
2023-12-13 15:57:30 +01:00
Andreas Fabri 0f9e446219 static_cast<int> 2023-12-13 08:57:24 +00:00
Andreas Fabri 62a64ae870 Add check that it faces are triangles 2023-12-12 09:28:01 +00:00
Andreas Fabri 796188e351 avoid intermediate vector 2023-12-12 08:52:01 +00:00
Laurent Rineau 222fafc411 Merge pull request #7805 from MaelRL/AW3-Resume_aw3-GF
Alpha wrapping: re-use and resume functionalities
2023-12-11 13:56:29 +01:00
Laurent Rineau 1150d5a01c Merge pull request #7900 from janetournois/Polyhedron_demo-fix_double_edit-jtournois
Polyhedron demo - fix `DoubleEdit`
2023-12-11 13:55:53 +01:00
Andreas Fabri acd03b166c write() operates on const& data 2023-12-08 17:09:00 +00:00
Sébastien Loriot d75e4f2f54 Merge remote-tracking branch 'cgal/master' into PMP-BF_autorefine 2023-12-08 13:26:06 +01:00
Guillaume Damiand bd04b2a68d Remove space in doc 2023-12-06 17:01:34 +01:00
Andreas Fabri 43213ee0e8
Update Polyhedron/demo/Polyhedron/Plugins/Operations_on_polyhedra/Point_set_from_sampling_plugin.cpp
Co-authored-by: Laurent Rineau <Laurent.Rineau@cgal.org>
2023-12-06 16:13:58 +01:00
Jane Tournois d98a6233f0 collect features and use edge_is_constrained_map in demo code 2023-12-05 17:32:26 +01:00
Andreas Fabri bc1f43433e Polyhedron demo: Add sampling plugin 2023-12-05 14:17:38 +00: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
Jane Tournois ac3f6e6892 improve the Mesh_3 log in demo 2023-12-04 13:09:22 +01:00
Sébastien Loriot a8c58f8747 copy the buffer to allow modifications during iteration 2023-12-01 11:52:20 +01:00
Jane Tournois 3fc14d8d56 use QDoubleValidator::fixup() in DoubleEdit::fixup()
with this version the user can write with scientific notation or
standard notation, using . or ,

Note that when input is invalid, value() returns 0
2023-12-01 11:22:39 +01:00
Jane Tournois 1ca77d32af fix DoubleEdit with Qt6
- let the user add as many digits as wanted (using -1 in setRange)
- use standard notation, not scientific (which was the default)
- comment QDoubleValidator::fixup that for some reason blocks the edition of the field
2023-12-01 10:23:44 +01:00
Jane Tournois 642ea59de7 add tooltip for bounds of approximation value 2023-12-01 10:21:57 +01:00
Sven Oesau afc5382c8c removed left-overs from debugging
bugfixes
2023-12-01 08:31:50 +01:00
Sven Oesau 9115847ed4 added handling for rendering of non-triangular faces with ghost edges
ghost edges are not added to cdt in FacetTriangulator
mark_domain_in_triangulation is used to mark holes as external
2023-11-30 16:03:28 +01:00
Guillaume Damiand f8a487d9ef update dependencies 2023-11-29 18:12:09 +01:00
Laurent Rineau 0744eba4bf Merge pull request #7754 from janetournois/Mesh_3-manifold_and_min_size-jtournois
Mesh_3 - use `manifold()` and `facet_min_size` together
2023-11-29 17:23:25 +01:00
Laurent Rineau 95b83b1214 Merge pull request #7845 from puneetmatharu/patch-cgal-dont-override-build-testing
Patch usage of BUILD_TESTING to handle the case that CGAL is a subproject
2023-11-29 17:22:54 +01:00
Mael Rouxel-Labbé 7b7918947a Fix bbox initialization 2023-11-29 16:54:43 +01:00
Mael Rouxel-Labbé 1dc0ba2c3a Merge remote-tracking branch 'cgal/master' into AW3-Resume_aw3-GF 2023-11-29 16:53:37 +01:00
Guillaume Damiand 0655006622 Merge with master: now viewers use Qt6 2023-11-29 14:36:38 +01:00
Sven Oesau 566149c0cc FacetTriangulator: removing ghost edges from cdt and using mark_domain_in_triangulation 2023-11-29 08:22:24 +01:00
Mael Rouxel-Labbé f36693c48e Fix warning 2023-11-28 10:29:46 +01:00
Laurent Rineau eb59cc6105 Merge remote-tracking branch 'cgal/master' into Installation-ITK-jtournois 2023-11-24 10:50:26 +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
Laurent Rineau 9262c6a8b6 Re-add CGAL_ITK_support.cmake
That will allow to be compatible with ITK version 4.13 and 5.x.
2023-11-23 17:25:18 +01:00
Sébastien Loriot 15af7605fe Q_DECL_OVERRIDE -> override 2023-11-22 11:34:27 +01:00
Laurent Rineau 74896b99c0 Use ITK 5.x instead of 4.13 2023-11-16 16:27:23 +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
Jane Tournois 0b73361226 remove CGAL_ITK_support.cmake
and adapt the CMakeLists that were using it
2023-11-13 12:47:39 +01: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
Puneet Matharu 7944441068 Patch usage of BUILD_TESTING to handle the case that CGAL is a subproject. 2023-11-02 18:09:03 +00:00
Laurent Rineau 5f27627e02 Merge remote-tracking branch 'cgal/master' into pr/janetournois/7754
# Conflicts:
#	Polyhedron/demo/Polyhedron/resources/shader_c3t3.frag
2023-11-01 22:59:58 +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
Mael Rouxel-Labbé 3879b13c0e Misc minor improvements 2023-10-30 23:46:46 +01:00
Mael Rouxel-Labbé 21fddd1c13 Fix default values' bbox not being computed for point set items 2023-10-30 23:40:42 +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