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

Merge pull request #7533 from janetournois/Polyhedron_demo-fix_default_sigma-jtournois 

Polyhedron demo - fix Mesh_3 dialog initialization
This commit is contained in:
Laurent Rineau 2023-06-22 11:59:16 +02:00
parent cce3dfd075 3a33bc8330
commit 1a47c45688
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Mesh_3_plugin.cpp
View File

@ -685,9 +685,8 @@ void Mesh_3_plugin::mesh_3(const Mesh_type mesh_type,
connect(ui.useWeights_checkbox, SIGNAL(toggled(bool)),
ui.weightsSigma_label, SLOT(setEnabled(bool)));
ui.labeledImgGroup->setVisible(input_is_labeled_img);
ui.weightsSigma->setValue((std::max)(image_item->image()->vx(),
(std::max)(image_item->image()->vy(),
image_item->image()->vz())));
if(image_item != nullptr && input_is_labeled_img)
ui.weightsSigma->setValue(image_item->default_sigma_weights());
#ifndef CGAL_USE_ITK
if (input_is_labeled_img)

11
Polyhedron/demo/Polyhedron/Scene_image_item.cpp
View File

@ -542,7 +542,16 @@ Scene_image_item::sigma_weights() const
{
return d->m_sigma_weights;
}
float
Scene_image_item::default_sigma_weights() const
{
if(!m_image)
return 0.f;
else
return (std::max)(m_image->image()->vx,
(std::max)(m_image->image()->vy,
m_image->image()->vz));
}
void
Scene_image_item::draw(Viewer_interface* viewer) const

1
Polyhedron/demo/Polyhedron/Scene_image_item.h
View File

@ -48,6 +48,7 @@ public:
Image* image_weights() const;
void set_image_weights(const Image& img, const float sigma);
float sigma_weights() const;
float default_sigma_weights() const;
void invalidateOpenGLBuffers();
void initializeBuffers(Viewer_interface *) const;