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

src/Vtk/Math/vtkContainerBox.cpp

@@ -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();
+  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();
 }