Commit Graph

1895 Commits

Author SHA1 Message Date
Sebastien Loriot 7659e881bd Merge pull request #625 from lrineau/Mesh_3-add_assertion-lrineau
Add an assertion in Image_to_labeled_function_wrapper
2016-01-14 14:09:06 +01:00
Sebastien Loriot bd03ac1945 Merge pull request #629 from afabri/CGAL-vtk_in_demo-GF
ImageIO no longer depends on VTK
2016-01-14 14:05:16 +01:00
Andreas Fabri 4a55456fee check for the right version of vtk; improve example 2016-01-13 17:12:30 +01:00
Andreas Fabri 1fa552c1cb Explain usage when called without arguments 2016-01-13 16:16:33 +01:00
Andreas Fabri 57ad151cd4 ImageIO no longer depends on VTK
* The non-documented WITH_VTK is no longer supported.
* The function CGAL::Image_3::read_vtk_image_data
  has been replaced by a global function.
* Added Mesh_3/examples/Mesh_3/mesh_3D_gray_vtk_image.cpp
2016-01-13 15:50:54 +01:00
Sebastien Loriot e3b4e78fe9 Merge pull request #623 from maxGimeno/CMakeLists_clean_up-GF
CMakeLists clean up
2016-01-13 14:52:01 +01:00
Sébastien Loriot 3bbe6e068b Merge pull request #607 from afabri/Mesh_3-avizo_output-GF
Add output to Avizo file format
2016-01-13 14:45:09 +01:00
Laurent Rineau abca7b5390 Add an assertion in Image_to_labeled_function_wrapper
That assertion verifies that the value `value_outside` is considered at
a value *outside* of the domain. Otherwise Mesh_3 will crash with an
assertion saying that "infinite cells should not be in the C3t3".
2016-01-13 11:00:25 +01:00
Maxime Gimeno 7f4fd48d54 Removed commented lines in mesh_3_demo CMakeLists 2016-01-13 10:40:45 +01:00
Andreas Fabri b02a7ed31a no need to funnel io routines through Mesh_complex_3_in_triangulation_3_base 2016-01-13 10:35:59 +01:00
Sebastien Loriot 90057adc10 Merge pull request #618 from janetournois/Mesh_3_tests-fix_memory-leak-GF
Mesh_3 - fix a memory leak in testsuite
2016-01-12 16:03:28 +01:00
Sebastien Loriot 2a4d8e5c9f Merge pull request #590 from lrineau/Mesh_3-manifold_criterion-lrineau
Mesh_3: add the manifold criterion
2016-01-12 16:02:00 +01:00
Sébastien Loriot aa36d50923 remove unused variable 2016-01-11 20:18:54 +01:00
Jane Tournois 58fb135d1c remove useless int* 2016-01-11 17:39:03 +01:00
Andreas Fabri 7cc1543c84 remove unused typedefs 2016-01-11 15:40:36 +01:00
Laurent Rineau f5cbf206b8 Merge branch 'Mesh_3-merge-manifold-meshing-thread' into Mesh_3-manifold_criterion-lrineau 2016-01-11 13:14:25 +01:00
Laurent Rineau f0ed1101c0 Use CGAL_assume instead of CGAL_assertion
That is an attempt to fix a warning:
```
../include/CGAL/utility.h:101:33: warning: 'index2' may be used uninitialized in this function [-Wmaybe-uninitialized]
   : first(a), second(b), third(c)
                                 ^
In file included from ../include/CGAL/Mesh_3/Mesher_3.h:35:0,
                 from ../include/CGAL/refine_mesh_3.h:32,
                 from ../include/CGAL/make_mesh_3.h:30,
                 from ../test/Mesh_3/test_c3t3_extract_subdomains_boundaries.cpp:9:
../include/CGAL/Mesh_3/Refine_facets_manifold_base.h:162:17: note: 'index2' was declared here
     int index1, index2;
                 ^
```
2016-01-11 13:10:04 +01:00
Laurent Rineau d5a5a56ac0 Remove debug ouput
A file `polylines.cgal.txt` was created during the computation.
2016-01-11 12:06:11 +01:00
Sebastien Loriot 8245efd76b Merge pull request #601 from lrineau/Polyhedron-Mesh_3_plugin__add_Meshing_thread-lrineau
Polyhedron, Mesh 3 plugin: add the meshing threads
2016-01-11 11:20:26 +01:00
Sebastien Loriot 02db40d559 Merge pull request #610 from afabri/Polyhedron_demo-missing_include-GF
std::ofstream is used without the header being included
2016-01-11 10:40:07 +01:00
Andreas Fabri 41a30023f9 std::ofstream is used without the header being included 2016-01-09 09:45:36 +01:00
Laurent Rineau 689fcea368 Fix a compilation: <iostream> not included
Anyway, we do not want that file to be created.
2016-01-08 19:01:40 +01:00
Laurent Rineau bd315dc0a5 Merge remote-tracking branch 'lrineau/Polyhedron-Mesh_3_plugin__add_Meshing_thread-lrineau' into Mesh_3-merge-manifold-meshing-thread
Conflicts:
	Polyhedron/demo/Polyhedron/Plugins/Mesh_3_plugin/Mesh_3_plugin.cpp
	Polyhedron/demo/Polyhedron/Plugins/Mesh_3_plugin/Mesh_3_plugin_cgal_code.cpp
2016-01-08 17:55:21 +01:00
Laurent Rineau 4638645a01 Merge PR #597 into Mesh_3-manifold_criterion-lrineau
Conflicts:
	Polyhedron/demo/Polyhedron/Plugins/Mesh_3_plugin/Mesh_3_plugin.cpp
	Polyhedron/demo/Polyhedron/Plugins/Mesh_3_plugin/Mesh_3_plugin_cgal_code.cpp
2016-01-08 17:41:02 +01:00
Andreas Fabri 8d0d9e00c5 Emphasize with * and not with backquote; backquote function calls 2016-01-08 17:23:44 +01:00
Laurent Rineau 006642e32a Fix the commit "Try to fix warnings from VC++"
"-1" is used as a sentinel value for `v->cached_number_of_components()`.
2016-01-08 16:58:11 +01:00
Andreas Fabri 7fa7db80d4 Add output to Avizo file format 2016-01-08 16:30:07 +01:00
Laurent Rineau ccb31e40ff Re-enable the meshing thread
The Mesh_3 plugin is also renamed to Mesh_3_plugin, like the same of its
file.
2016-01-08 15:10:09 +01:00
Laurent Rineau 9730e2bd8e fix a copy-paste error in a comment 2016-01-08 14:34:44 +01:00
Laurent Rineau 5deefd79bf Fix Meshing_thread
- re-add the possibility to stop the thread,
- re-add the display of the meshing progress.

That disappeared when the parallelism was merged into CGAL.
2016-01-08 14:34:44 +01:00
Laurent Rineau 25b2330fb0 Try to fix warnings from VC++
> CGAL/Mesh_3/Mesh_complex_3_in_triangulation_3_base.h(227): warning C4267: 'initializing': conversion from 'size_t' to 'const int', possible loss of data
> CGAL/Mesh_3/Mesh_complex_3_in_triangulation_3_base.h(227): warning C4267: 'initializing': conversion from 'size_t' to 'int', possible loss of data
> CGAL/Mesh_3/Mesh_complex_3_in_triangulation_3_base.h(503): warning C4267: 'initializing': conversion from 'size_t' to 'const int', possible loss of data
> CGAL/Mesh_3/Mesh_complex_3_in_triangulation_3_base.h(503): warning C4267: 'initializing': conversion from 'size_t' to 'int', possible loss of data
> CGAL/Mesh_3/Mesh_complex_3_in_triangulation_3_base.h(517): warning C4267: 'initializing': conversion from 'size_t' to 'const int', possible loss of data
> CGAL/Mesh_3/Mesh_complex_3_in_triangulation_3_base.h(517): warning C4267: 'initializing': conversion from 'size_t' to 'int', possible loss of data
> CGAL/Mesh_3/Mesh_complex_3_in_triangulation_3_base.h(518): warning C4267: 'return': conversion from 'size_t' to 'int', possible loss of data
> CGAL/Mesh_3/Mesh_complex_3_in_triangulation_3_base.h(561): warning C4267: 'initializing': conversion from 'size_t' to 'const int', possible loss of data
> CGAL/Mesh_3/Mesh_complex_3_in_triangulation_3_base.h(561): warning C4267: 'initializing': conversion from 'size_t' to 'int', possible loss of data
> CGAL/Mesh_3/Mesh_complex_3_in_triangulation_3_base.h(814): warning C4267: 'initializing': conversion from 'size_t' to 'const int', possible loss of data
> CGAL/Mesh_3/Mesh_complex_3_in_triangulation_3_base.h(814): warning C4267: 'initializing': conversion from 'size_t' to 'int', possible loss of data
> CGAL/Mesh_3/Mesh_complex_3_in_triangulation_3_base.h(815): warning C4267: 'initializing': conversion from 'size_t' to 'const int', possible loss of data
> CGAL/Mesh_3/Mesh_complex_3_in_triangulation_3_base.h(815): warning C4267: 'initializing': conversion from 'size_t' to 'int', possible loss of data
> CGAL/Mesh_3/Mesh_complex_3_in_triangulation_3_base.h(855): warning C4267: 'initializing': conversion from 'size_t' to 'const int', possible loss of data
> CGAL/Mesh_3/Mesh_complex_3_in_triangulation_3_base.h(855): warning C4267: 'initializing': conversion from 'size_t' to 'int', possible loss of data
> CGAL/Mesh_3/Mesh_complex_3_in_triangulation_3_base.h(857): warning C4267: 'initializing': conversion from 'size_t' to 'const int', possible loss of data
> CGAL/Mesh_3/Mesh_complex_3_in_triangulation_3_base.h(857): warning C4267: 'initializing': conversion from 'size_t' to 'int', possible loss of data
2016-01-07 16:38:11 +01:00
Sebastien Loriot f3bc10ef81 Merge pull request #549 from afabri/Polyhedron-clipping_in_shader-GF
Improve C3T3 item and meshing of a segmented image
2016-01-07 13:49:16 +01:00
Sébastien Loriot e64ae35a6e Merge pull request #542 from bo0ts/Documentation-release_build2-pmoeller
Allow to build the documentation in a release
2016-01-07 09:21:46 +01:00
Sébastien Loriot e354ba6d37 remove examples that are in dont_submit 2016-01-07 09:19:06 +01:00
Laurent Rineau b1a0f01027 Fix compilation error with clang, again 2016-01-06 17:35:25 +01:00
Laurent Rineau 8542eb2fe9 Fix compilation error (clang)
> /Mesh_3/include/CGAL/Mesh_3/Refine_facets_3.h:632:25: error: declaration of 'Tr' shadows template parameter
>         template<class Tr, class Cr, class MD, class C3T3_, class Ct, class C_>
2016-01-06 17:28:52 +01:00
Laurent Rineau 2a7fb19d3e Fix compilation error (missing header) 2016-01-06 16:50:08 +01:00
Laurent Rineau 772772d7b7 Fix the -Wsign-compare
There was a warning in a CGAL_assertion.
2016-01-06 15:50:27 +01:00
Andreas Fabri a776df173b fix license header 2016-01-06 15:25:01 +01:00
Sébastien Loriot dd8f33adc5 Merge pull request #559 from lrineau/Mesh_3-remove_estimated_bbox-lrineau
Add bbox() to MeshDomain_3
2016-01-06 14:35:01 +01:00
Andreas Fabri d3e610f188 harcode again that the image word type is unsigned char for a segmented image and perform static_cast 2016-01-06 13:06:51 +01:00
Laurent Rineau 6eacaa7868 cosmetic fix: display the iterations on 1 line only 2016-01-05 17:41:56 +01:00
Laurent Rineau b023f6c33a Test the manifold criterion, in Sequential mode 2016-01-05 17:41:28 +01:00
Laurent Rineau 8324d8eceb bug-fix: invalidate the "manifold info" after refine().
The global optimizers destroy the manifold info. It must be invalidated.
2016-01-05 17:40:40 +01:00
Laurent Rineau 432b52636a Override the debuginfo too
That way, the manifold mesher level displays also the number of bad
edges/vertices.
2016-01-05 17:40:01 +01:00
Andreas Fabri 56bfaa2746 merge 2016-01-05 17:06:04 +01:00
Andreas Fabri b116b8ed5b move polylines_to_protect.h into CGAL/Mesh_3/ 2016-01-05 16:42:07 +01:00
Laurent Rineau 7b53a337af Merge pull-request #483 from 'janetournois/Mesh_3-gray_level_image_oracle-lrineau'
Conflicts:
	.gitignore
	Mesh_3/include/CGAL/IO/File_medit.h
2016-01-05 14:58:18 +01:00
Laurent Rineau d34b240e5e WIP: seems to work
I will test with the 3D gray level images...
2016-01-05 14:55:42 +01:00
Laurent Rineau 397ac28143 WIP, new milestone: compiles with Refine_facets_manifold_base 2016-01-05 12:45:22 +01:00