OpenCMT/uLib
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: improve ContainerBox geometry handling and add missing signal disconnections to prevent memory leaks.

Browse Source
This commit is contained in:
AndreaRigoni
2026-04-21 14:06:35 +00:00
parent 503c325f9a
commit 2bf3dc0b6d
7 changed files with 154 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/Vtk/Math/testing/vtkAssemblyTest.cpp
View File

@@ -9,17 +9,17 @@
//////////////////////////////////////////////////////////////////////////////*/
#include "Vtk/Math/vtkAssembly.h"
#include "Math/Units.h"
#include "Vtk/Math/vtkAssembly.h"
#include "Vtk/Math/vtkContainerBox.h"
#include "Vtk/Math/vtkCylinder.h"
#include "Vtk/Math/vtkAssembly.h"
#include "Vtk/vtkObjectsContext.h"
#include "Vtk/uLibVtkViewer.h"
#include "Math/Units.h"
#include "Vtk/vtkObjectsContext.h"
#include <vtkActor.h>
#include <vtkProperty.h>
#include <vtkPropCollection.h>
#include <vtkProperty.h>
#include <iostream>
@@ -54,19 +54,22 @@ int main(int argc, char **argv) {
Vtk::Assembly vtkAsm(&assembly);
Vtk::Viewer viewer;
vtkAsm.AddToViewer(viewer); // This triggers prop3d creation via ConnectRenderer which eventually calls Prop3D::GetProp
vtkAsm.AddToViewer(
viewer); // This triggers prop3d creation via ConnectRenderer which
// eventually calls Prop3D::GetProp
// Explicitly update to ensure prop3ds exist and are added to assemblies
vtkAsm.Update();
// Use the child context to find child prop3ds and set colors
if (auto* childCtx = vtkAsm.GetChildrenContext()) {
auto setProps = [](Vtk::Prop3D* p, float r, float g, float b) {
if (!p) return;
vtkPropCollection* props = p->GetProps();
if (auto *childCtx = vtkAsm.GetChildrenContext()) {
auto setProps = [](Vtk::Prop3D *p, float r, float g, float b) {
if (!p)
return;
vtkPropCollection *props = p->GetProps();
props->InitTraversal();
for (int i=0; i < props->GetNumberOfItems(); ++i) {
if (auto* actor = vtkActor::SafeDownCast(props->GetNextProp())) {
for (int i = 0; i < props->GetNumberOfItems(); ++i) {
if (auto *actor = vtkActor::SafeDownCast(props->GetNextProp())) {
actor->GetProperty()->SetColor(r, g, b);
actor->GetProperty()->SetRepresentationToSurface();
actor->GetProperty()->SetOpacity(0.5);
@@ -79,7 +82,8 @@ int main(int argc, char **argv) {
setProps(childCtx->GetProp3D(&cyl), 0.0, 0.0, 1.0); // Blue
}
std::cout << "Prop3Ds in viewport: " << viewer.getProp3Ds().size() << " (Expected 4: 1 assembly + 3 children)" << std::endl;
std::cout << "Prop3Ds in viewport: " << viewer.getProp3Ds().size()
<< " (Expected 4: 1 assembly + 3 children)" << std::endl;
// ---- 4. Query the bounding box for terminal output ----
Vector3f bbMin, bbMax;
@@ -91,7 +95,8 @@ int main(int argc, char **argv) {
std::cout << "==================================================\n";
std::cout << " vtkAssemblyTest\n";
std::cout << " 2 boxes + 1 cylinder grouped in an assembly\n";
std::cout << "==================================================" << std::endl;
std::cout << "=================================================="
<< std::endl;
if (interactive) {
viewer.ZoomAuto();

5
src/Vtk/Math/testing/vtkContainerBoxTest.cpp
View File

@@ -35,9 +35,8 @@ using namespace uLib;
int main() {
BEGIN_TESTING(vtk ContainerBox Test);
{
ContainerBox* box = new ContainerBox();
box->Scale(Vector3f(1_m, 2_m, 1_m));
box->SetSize(Vector3f(1_m, 2_m, 1_m));
box->SetPosition(Vector3f(0, 0, 0));
Vtk::ContainerBox v_box(box);
@@ -46,9 +45,7 @@ int main() {
v_box.SetRepresentation(Vtk::Prop3D::Surface);
v_box.SetOpacity(0.5);
v_box.SetSelectable(true);
}
Vtk::ContainerBox v_box;
v_box.findOrAddSignal(&Object::Updated)->connect([&v_box]() {
std::cout << "box updated: "
<< v_box.GetWrapped()->GetWorldPoint(HPoint3f(1, 1, 1)) << std::endl;

20
src/Vtk/Math/testing/vtkVoxImageInteractiveTest.cpp
View File

@@ -59,9 +59,9 @@ int main(int argc, char **argv) {
// --- Image 1: Spherical Shell ---
Vector3i dims1(64, 64, 64);
VoxImage<Voxel> img1(dims1);
img1.SetSpacing(Vector3f(1.0, 1.0, 1.0));
img1.SetPosition(Vector3f(-40, -32, -32));
VoxImage<Voxel>* img1 = new VoxImage<Voxel>(dims1);
img1->SetSpacing(Vector3f(1.0, 1.0, 1.0));
img1->SetPosition(Vector3f(-40, -32, -32));
for (int z = 0; z < dims1(2); ++z) {
for (int y = 0; y < dims1(1); ++y) {
@@ -76,16 +76,16 @@ int main(int argc, char **argv) {
} else {
v.Value = 0.0f;
}
img1[Vector3i(x, y, z)] = v;
img1->operator[](Vector3i(x, y, z)) = v;
}
}
}
// --- Image 2: Axes Gradient ---
Vector3i dims2(64, 64, 64);
VoxImage<Voxel> img2(dims2);
img2.SetSpacing(Vector3f(1.0, 1.0, 1.0));
img2.SetPosition(Vector3f(40, -32, -32));
VoxImage<Voxel>* img2 = new VoxImage<Voxel>(dims2);
img2->SetSpacing(Vector3f(1.0, 1.0, 1.0));
img2->SetPosition(Vector3f(40, -32, -32));
for (int z = 0; z < dims2(2); ++z) {
for (int y = 0; y < dims2(1); ++y) {
@@ -96,15 +96,15 @@ int main(int argc, char **argv) {
(float(x) / dims2(0) + float(y) / dims2(1) + float(z) / dims2(2)) /
3.0f;
v.Value = (40.0f * val) / factor;
img2[Vector3i(x, y, z)] = v;
img2->operator[](Vector3i(x, y, z)) = v;
}
}
}
Vtk::VoxImage vtk_img1(&img1);
Vtk::VoxImage vtk_img1(img1);
vtk_img1.setShadingPreset(0);
Vtk::VoxImage vtk_img2(&img2);
Vtk::VoxImage vtk_img2(img2);
vtk_img2.setShadingPreset(1); // Use Composite without MIP for variety
Vtk::Viewer viewer;

10
src/Vtk/Math/testing/vtkVoxImageTest.cpp
View File

@@ -40,12 +40,12 @@ BOOST_AUTO_TEST_CASE(vtkVoxImageConstruction) {
TestVoxel zero = {0, 0};
TestVoxel nonzero = {5.5f * 1e-6f, 100};
VoxImage<TestVoxel> img(Vector3i(10, 10, 10));
img.SetSpacing(Vector3f(3, 3, 3));
img.InitVoxels(zero);
img[Vector3i(3, 3, 3)] = nonzero;
VoxImage<TestVoxel>* img = new VoxImage<TestVoxel>(Vector3i(10, 10, 10));
img->SetSpacing(Vector3f(3, 3, 3));
img->InitVoxels(zero);
(*img)[Vector3i(3, 3, 3)] = nonzero;
Vtk::VoxImage vtk_img(&img);
Vtk::VoxImage vtk_img(img);
vtk_img.SaveToXMLFile("test_vtkvoximage.vti");
if (std::getenv("CTEST_PROJECT_NAME") == nullptr) {

4
src/Vtk/Math/vtkAssembly.cpp
View File

@@ -44,6 +44,10 @@ Assembly::Assembly(uLib::Assembly *content)
}
Assembly::~Assembly() {
if (this->m_model) {
Object::disconnect(this->m_model.get(), &uLib::Assembly::Updated,
this, &Assembly::Update);
}
delete m_ChildContext;
if (m_BBoxActor) m_BBoxActor->Delete();
if (m_VtkAsm) m_VtkAsm->Delete();

108
src/Vtk/Math/vtkContainerBox.cpp
View File

@@ -38,6 +38,8 @@
#include <vtkMatrix4x4.h>
#include <vtkPolyDataMapper.h>
#include <vtkProperty.h>
#include <vtkRenderWindow.h>
#include <vtkRendererCollection.h>
#include <vtkSmartPointer.h>
#include <vtkTransform.h>
@@ -50,25 +52,33 @@ struct ContainerBoxData {
vtkSmartPointer<vtkActor> m_Cube;
vtkSmartPointer<vtkActor> m_Axes;
vtkSmartPointer<vtkAssembly> m_VtkAsm;
vtkSmartPointer<vtkCubeSource> m_CubeSource;
vtkSmartPointer<vtkAxes> m_AxesSource;
uLib::Connection m_UpdateSignal;
ContainerBoxData()
: m_Cube(vtkSmartPointer<vtkActor>::New()),
m_Axes(vtkSmartPointer<vtkActor>::New()),
m_VtkAsm(vtkSmartPointer<vtkAssembly>::New()) {}
~ContainerBoxData() {}
m_VtkAsm(vtkSmartPointer<vtkAssembly>::New()),
m_CubeSource(vtkSmartPointer<vtkCubeSource>::New()),
m_AxesSource(vtkSmartPointer<vtkAxes>::New()) {}
};
ContainerBox::ContainerBox(ContainerBox::Content *content)
: d(new ContainerBoxData()),
ObjectWrapper(content ? content : new Content()) {
ContainerBox::ContainerBox(uLib::ContainerBox *model)
: Prop3D(), d(new ContainerBoxData()) {
this->m_model.reset(model);
this->InstallPipe();
d->m_UpdateSignal = Object::connect(
this->m_model.get(), &uLib::Object::Updated, this, &ContainerBox::Update);
this->Update();
}
ContainerBox::~ContainerBox() { delete d; }
ContainerBox::~ContainerBox() {
uLib::Object::disconnect(this->m_model.get(), &uLib::Object::Updated, this,
&ContainerBox::Update);
delete d;
}
vtkPolyData *ContainerBox::GetPolyData() const {
// TODO
@@ -80,22 +90,35 @@ void ContainerBox::Update() {
if (!this->m_model)
return;
vtkProp3D *prop = vtkProp3D::SafeDownCast(this->GetProp());
if (prop) {
// Apply the TRS matrix to the assembly
vtkNew<vtkMatrix4x4> m;
Matrix4fToVtk(this->m_model->GetMatrix(), m);
prop->SetUserMatrix(m);
prop->Modified();
}
// Update the sources with the model's dimensions.
// This makes the "natural" bounds of the actors correct for VTK gizmos.
Vector3f size = this->m_model->GetSize();
Vector3f origin = this->m_model->GetOrigin();
// Apply the local shape transformation (Size/Origin) to the cube actor
vtkNew<vtkMatrix4x4> localM;
Matrix4fToVtk(this->m_model->GetLocalMatrix(), localM);
d->m_Cube->SetUserMatrix(localM);
// HandlerWidget relies on vtkProp3D::GetBounds() to determine the size
// and position of its transformation gizmos. Previously, we were applying
// the Size of the container using the actor's UserMatrix. While this looks
// correct visually, some VTK utilities (including certain internal paths
// of GetBounds()) may prioritize the bounding box of the input geometry
// (the PolyData) over the UserMatrix. This resulted in the gizmo defaulting
// to a 1x1x1 size because the underlying vtkCubeSource was still 1x1x1.
// Delegate rest of update (appearance, render, etc)
ConnectionBlock blocker(d->m_UpdateSignal);
d->m_CubeSource->SetBounds(origin.x(), origin.x() + size.x(), origin.y(),
origin.y() + size.y(), origin.z(),
origin.z() + size.z());
d->m_CubeSource->Update();
d->m_AxesSource->SetOrigin(origin.x(), origin.y(), origin.z());
d->m_AxesSource->SetScaleFactor(std::max({size.x(), size.y(), size.z()}));
d->m_AxesSource->Update();
// Ensure actors have identity UserMatrix since scaling is in the source.
d->m_Cube->SetUserMatrix(nullptr);
d->m_Axes->SetUserMatrix(nullptr);
// Delegate the rest of the update (appearance, TR, render, etc) to Prop3D.
// Prop3D::Update() applies the "outer" TRS matrix (Position/Rotation/Scaling)
// to the assembly.
this->Prop3D::Update();
}
@@ -104,66 +127,35 @@ void ContainerBox::SyncFromVtk() {
if (!this->m_model)
return;
vtkProp3D *root = this->GetProxyProp();
if (!root)
return;
// VTK -> Model: Extract new world TRS from proxy, which matches the model's
// TRS center
vtkMatrix4x4 *rootMat = root->GetUserMatrix();
Matrix4f vtkWorld = VtkToMatrix4f(rootMat);
// Synchronize TRS property members from the updated local matrix
this->m_model->FromMatrix(vtkWorld);
// Since we modified the model, notify observers, but block the loop back to
// VTK ConnectionBlock blocker(d->m_UpdateSignal);
this->m_model->Updated();
// Sync the "outer" TRS from the assembly's matrix
this->Prop3D::SyncFromVtk();
}
void ContainerBox::InstallPipe() {
if (!this->m_model)
return;
Content *c = this->m_model;
// CUBE
vtkSmartPointer<vtkPolyDataMapper> mapper =
vtkSmartPointer<vtkPolyDataMapper>::New();
vtkSmartPointer<vtkPolyDataMapper> mapper = vtkSmartPointer<vtkPolyDataMapper>::New();
vtkSmartPointer<vtkCubeSource> cube = vtkSmartPointer<vtkCubeSource>::New();
// cube->SetBounds(-0.5, 0.5, -0.5, 0.5, -0.5, 0.5);
mapper->SetInputConnection(cube->GetOutputPort());
mapper->Update();
// CUBE //
mapper->SetInputConnection(d->m_CubeSource->GetOutputPort());
d->m_Cube->SetMapper(mapper);
d->m_Cube->GetProperty()->SetRepresentationToWireframe();
d->m_Cube->GetProperty()->SetAmbient(0.7);
// AXES //
vtkSmartPointer<vtkAxes> axes = vtkSmartPointer<vtkAxes>::New();
axes->SetOrigin(0, 0, 0);
mapper = vtkSmartPointer<vtkPolyDataMapper>::New();
mapper->SetInputConnection(axes->GetOutputPort());
mapper->Update();
mapper->SetInputConnection(d->m_AxesSource->GetOutputPort());
d->m_Axes->SetMapper(mapper);
d->m_Axes->GetProperty()->SetLineWidth(3);
d->m_Axes->GetProperty()->SetAmbient(0.4);
d->m_Axes->GetProperty()->SetSpecular(0);
// PIVOT //
axes = vtkSmartPointer<vtkAxes>::New();
axes->SetOrigin(0, 0, 0);
mapper = vtkSmartPointer<vtkPolyDataMapper>::New();
mapper->SetInputConnection(axes->GetOutputPort());
mapper->Update();
d->m_VtkAsm->AddPart(d->m_Cube);
d->m_VtkAsm->AddPart(d->m_Axes);
this->SetProp(d->m_VtkAsm);
// vtkProp3D* root = d->m_VtkAsm;
// if (root) {
// this->ApplyProp3DTransform(root);
// }
this->Update();
}

6
src/Vtk/vtkObjectsContext.cpp
View File

@@ -36,6 +36,12 @@ ObjectsContext::ObjectsContext(uLib::ObjectsContext *context)
}
ObjectsContext::~ObjectsContext() {
if (m_Context) {
Object::disconnect(m_Context, &uLib::ObjectsContext::ObjectAdded, this,
&ObjectsContext::OnObjectAdded);
Object::disconnect(m_Context, &uLib::ObjectsContext::ObjectRemoved, this,
&ObjectsContext::OnObjectRemoved);
}
for (auto const &[obj, prop3d] : m_Prop3Ds) {
delete prop3d;
}