songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

do not run random shooting in connected components that already are represented 

during feature protection, most of the connected components, in particular on
the bbox boundary, are already represented and ready to start/hint Delaunay
refinement

if the chosen seed lies in a cell that already belongs (wrt Is_in_domain(cc))
to the right connected component, random shooting is canceled and
the loop continues to next seed
This commit is contained in:
Jane Tournois 2022-10-21 15:05:30 +02:00
parent db6b051973
commit 28a6946070
2 changed files with 31 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
Mesh_3/include/CGAL/Mesh_3/initialize_triangulation_from_labeled_image.h
View File

@ -24,6 +24,7 @@
#include <CGAL/iterator.h>
#include <CGAL/point_generators_3.h>
#include <CGAL/Image_3.h>
#include <CGAL/ImageIO.h>
#include <iostream>
#include <queue>
@ -127,7 +128,11 @@ void initialize_triangulation_from_labeled_image(C3T3& c3t3,
image.vy()),
image.vz());
typedef std::vector<std::pair<Bare_point, std::size_t> > Seeds;
using Point_indices = std::tuple<std::size_t, std::size_t, std::size_t>;
using Seed = std::pair<Point_indices, std::size_t>;
using Seeds = std::vector<Seed>;
using Subdomain_index = typename Mesh_domain::Subdomain_index;
Seeds seeds;
Get_point<Bare_point> get_point(&image);
std::cout << "Searching for connected components..." << std::endl;
@ -135,20 +140,36 @@ void initialize_triangulation_from_labeled_image(C3T3& c3t3,
std::back_inserter(seeds),
CGAL::Emptyset_iterator(),
transform,
get_point,
Image_word_type());
std::cout << " " << seeds.size() << " components were found." << std::endl;
std::cout << "Construct initial points..." << std::endl;
for(typename Seeds::const_iterator it = seeds.begin(), end = seeds.end();
it != end; ++it)
for(const Seed seed : seeds)
{
const double radius = double(it->second + 1)* max_v;
const std::size_t i = get<0>(seed.first);
const std::size_t j = get<1>(seed.first);
const std::size_t k = get<2>(seed.first);
const Bare_point seed_point = get_point(i, j, k);
Cell_handle seed_cell = tr.locate(cwp(seed_point));
const boost::optional<Subdomain_index> seed_label
= domain.is_in_domain_object()(seed_point);
const boost::optional<Subdomain_index> seed_cell_label
= domain.is_in_domain_object()(
seed_cell->weighted_circumcenter(tr.geom_traits()));
if ( seed_label != boost::none
&& seed_cell_label != boost::none
&& seed_label.get() == seed_cell_label.get())
continue; //this means the connected component has already been initialized
const double radius = double(seed.second + 1)* max_v;
CGAL::Random_points_on_sphere_3<Bare_point> points_on_sphere_3(radius);
typename Mesh_domain::Construct_intersection construct_intersection =
domain.construct_intersection_object();
std::vector<Vector_3> directions;
if(it->second < 2) {
if(seed.second < 2) {
// shoot in six directions
directions.push_back(Vector_3(-radius, 0, 0));
directions.push_back(Vector_3(+radius, 0, 0));
@ -166,9 +187,10 @@ void initialize_triangulation_from_labeled_image(C3T3& c3t3,
for(const Vector_3& v : directions)
{
const Bare_point test = it->first + v;
const Bare_point test = seed_point + v;
const typename Mesh_domain::Intersection intersect =
construct_intersection(Segment_3(it->first, test));
construct_intersection(Segment_3(seed_point, test));
if (std::get<2>(intersect) != 0)
{
const Bare_point& bpi = std::get<0>(intersect);

4
Mesh_3/include/CGAL/Mesh_3/search_for_connected_components_in_labeled_image.h
View File

@ -34,14 +34,12 @@
template <typename PointsOutputIterator,
typename DomainsOutputIterator,
typename TransformOperator,
typename Construct_point,
typename Image_word_type>
void
search_for_connected_components_in_labeled_image(const CGAL::Image_3& image,
PointsOutputIterator it,
DomainsOutputIterator dom_it,
TransformOperator transform,
Construct_point point,
Image_word_type)
{
const std::size_t nx = image.xdim();
@ -210,7 +208,7 @@ search_for_connected_components_in_labeled_image(const CGAL::Image_3& image,
{
// if(nb_voxels >= 100)
{
*it++ = std::make_pair(point(i, j, k),
*it++ = std::make_pair(std::make_tuple(i, j, k),
depth+1);
#if CGAL_MESH_3_SEARCH_FOR_CONNECTED_COMPONENTS_IN_LABELED_IMAGE_VERBOSE > 1
std::cerr << boost::format("Found seed %5%, which is voxel "