Skip to content

Mesh_3: Add weighted images#5597

Merged
lrineau merged 79 commits intoCGAL:masterfrom
lrineau:Mesh_3-weighted_images-GF
Oct 29, 2021
Merged

Mesh_3: Add weighted images#5597
lrineau merged 79 commits intoCGAL:masterfrom
lrineau:Mesh_3-weighted_images-GF

Conversation

@lrineau
Copy link
Member

@lrineau lrineau commented Apr 8, 2021 •
edited by sloriot
Loading

Summary of Changes

Add 3D weighted images. For the moment I am not sure we want to document that, because we have no way to create the weighted images.

TODO

  • The API is not final.
  • Documentation?
  • Small feature
  • filter the branch to remove the added and removed images (for @sloriot)

Results

Click to see

Before

Screenshot_20210408_181644

After

Screenshot_20210408_181702

Release Management

@lrineau
Add weighted images
a5aaab6 
The API is not final.
@lrineau lrineau added this to the 5.4-beta milestone Apr 8, 2021
lrineau and others added 14 commits April 8, 2021 18:44
@lrineau
Fix license
71b85f4
@lrineau
Missing header
76d2fcd
@lrineau
Fix the runtime error without arguments
a9c2e07
@janetournois
convert a CGAL::Image_3 to ITK format to generate weights for weighte…
d831724 
…d images

- add ITK as a dependency for mesh_3D_weighted_image.cpp
- WIP
@janetournois
compute indicator images and fit them to [0; 255]
b47cf8e
@janetournois
perform gaussian smoothing
293b28d
@janetournois
fix allocation of image
16db150 
then :
- smooth each indicator function with Gaussian filter
- compute the maximum image of all indicator functions
@janetournois
duplicate image before application of filters
c07c712
@janetournois
fix return type
83c40f2
@janetournois
generate_weights is now working
3b23b56
@janetournois
the Weights_type is unsigned char, not Image_word_type
5828996
@janetournois
wrap debug code in macro CGAL_MESH_3_WEIGHTED_IMAGES_DEBUG
ee6f2f8
@janetournois
remove writeImage from example
445378f
@janetournois
make 'weights' a boost named parameter of create_labeled_image_mesh_d…
89a227a 
…omain()
@janetournois janetournois force-pushed the Mesh_3-weighted_images-GF branch from 143dad7 to d08aba5 Compare July 26, 2021 10:49
@lrineau lrineau mentioned this pull request Jul 26, 2021
Merged
@maxGimeno
Copy link
Contributor

maxGimeno commented Jul 26, 2021

missing typenames :

0:3: error: need 'typename' before 'DuplicatorType::Pointer' because 'DuplicatorType' is a dependent scope
  180 |   DuplicatorType::Pointer duplicator = DuplicatorType::New();

@sloriot
Copy link
Member

sloriot commented Oct 28, 2021

Successfully tested in CGAL-5.4-Ic-82

@lrineau
Copy link
Member Author

lrineau commented Oct 29, 2021

@sloriot, there is a TODO for you:

  • filter the branch to remove the added and removed images

Is it necessary? Was it already done?

@lrineau lrineau added Accepted small feature Not yet approved The feature or pull-request has not yet been approved. and removed Not yet approved The feature or pull-request has not yet been approved. pre-approved For pre-approved small features. After 15 days the feature will be accepted. labels Oct 29, 2021
@sloriot
Copy link
Member

sloriot commented Oct 29, 2021

Yes I forgot to do it. A "big" image was added and then removed. I'll do it this morning

lrineau
lrineau commented Oct 29, 2021
View reviewed changes
@sloriot sloriot force-pushed the Mesh_3-weighted_images-GF branch from 60cff55 to caa8c74 Compare October 29, 2021 12:54
@sloriot sloriot removed the TODO label Oct 29, 2021
@sloriot
Copy link
Member

sloriot commented Oct 29, 2021

I'm done.

@lrineau lrineau added Not yet approved The feature or pull-request has not yet been approved. rm only: ready for master For the release team only: that indicates that a PR is about to be merged in 'master' and removed Not yet approved The feature or pull-request has not yet been approved. labels Oct 29, 2021
@lrineau lrineau merged commit ca89949 into CGAL:master Oct 29, 2021
@lrineau lrineau deleted the Mesh_3-weighted_images-GF branch November 2, 2021 10:04
@lrineau lrineau removed Not yet approved The feature or pull-request has not yet been approved. rm only: ready for master For the release team only: that indicates that a PR is about to be merged in 'master' labels Nov 2, 2021
@lrineau
Copy link
Member Author

lrineau commented Nov 2, 2021

This small feature is now merged, but there is no addition in CHANGES.md. Should it be announced?

@janetournois
Copy link
Member

janetournois commented Nov 2, 2021

That's a mistake, I will add it!

@janetournois janetournois mentioned this pull request Nov 2, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@sloriot sloriot sloriot left review comments

@janetournois janetournois janetournois left review comments

Assignees

@lrineau lrineau

Labels

Accepted small feature Merged_in_5.4-beta1 Merged_in_5.4 Pkg::Mesh_3 Small feature Tested

Projects

None yet

Milestone

5.4-beta

Development

Successfully merging this pull request may close these issues.

4 participants

@lrineau @maxGimeno @janetournois @sloriot