not working yet

2026-04-13 07:36:19 +00:00
53 changed files with 187 additions and 824 deletions
--- a/app/gcompose/src/ContextModel.cpp
+++ b/app/gcompose/src/ContextModel.cpp
@@ -148,6 +148,7 @@ QVariant ContextModel::data(const QModelIndex& index, int role) const {
    if (!index.isValid()) return QVariant();

    uLib::Object* obj = static_cast<uLib::Object*>(index.internalPointer());
+    if (!obj) return QVariant();
    
    if (role == Qt::DisplayRole) {
        QString typeName = getDemangledName(typeid(*obj));
--- a/app/gcompose/src/ContextPanel.cpp
+++ b/app/gcompose/src/ContextPanel.cpp
@@ -58,8 +58,6 @@ ContextPanel::ContextPanel(QWidget* parent)

    m_layout->addWidget(m_splitter);

-    connect(m_propertiesPanel, &PropertiesPanel::propertyUpdated, this, &ContextPanel::propertyUpdated);
-
    connect(m_treeView->selectionModel(), &QItemSelectionModel::selectionChanged,
            this, &ContextPanel::onSelectionChanged);

--- a/app/gcompose/src/ContextPanel.h
+++ b/app/gcompose/src/ContextPanel.h
@@ -25,7 +25,6 @@ public:

 signals:
    void objectSelected(uLib::Object* obj);
-    void propertyUpdated();

 private slots:
    void onSelectionChanged(const QItemSelection& selected, const QItemSelection& deselected);
--- a/app/gcompose/src/MainPanel.cpp
+++ b/app/gcompose/src/MainPanel.cpp
@@ -6,8 +6,6 @@
 #include "Core/ObjectsContext.h"
 #include "Vtk/vtkObjectsContext.h"
 #include "Vtk/vtkQViewport.h"
-#include "Vtk/vtkViewportProperties.h"
-#include <Vtk/uLibVtkInterface.h>
 #include <QVBoxLayout>
 #include <QHBoxLayout>
 #include <QSplitter>
@@ -24,7 +22,7 @@
 #include "PreferencesDialog.h"
 #include "Settings.h"

-MainPanel::MainPanel(QWidget* parent) : QWidget(parent), m_context(nullptr), m_mainVtkContext(nullptr), m_viewportProps(nullptr) {
+MainPanel::MainPanel(QWidget* parent) : QWidget(parent), m_context(nullptr), m_mainVtkContext(nullptr) {
    this->setObjectName("MainPanel");
    this->setAttribute(Qt::WA_StyledBackground);
    auto* mainLayout = new QVBoxLayout(this);
@@ -101,13 +99,6 @@ MainPanel::MainPanel(QWidget* parent) : QWidget(parent), m_context(nullptr), m_m
        }
    });

-    connect(m_contextPanel, &ContextPanel::propertyUpdated, [this](){
-        auto viewports = this->findChildren<uLib::Vtk::QViewport*>();
-        for (auto* vp : viewports) {
-            vp->Render();
-        }
-    });
-
    // Set initial sizes: Context(250), Viewport(600), Properties(250)
    QList<int> sizes;
    sizes << 250 << 600 << 250;
@@ -253,21 +244,15 @@ void MainPanel::onExit() {
 void MainPanel::onPreferences() {
    uLib::Qt::PreferencesDialog dlg(this);
    if (dlg.exec() == QDialog::Accepted) {
-        // Apply theme and GUI font
+        // Apply theme
        auto theme = uLib::Qt::Settings::Instance().GetTheme();
-        auto guiFont = uLib::Qt::Settings::Instance().GetGuiFont();
-        StyleManager::applyStyle(qApp, theme == uLib::Qt::Settings::Dark ? "dark" : "bright", guiFont);
+        StyleManager::applyStyle(qApp, theme == uLib::Qt::Settings::Dark ? "dark" : "bright");

-        // Apply rendering and font preferences to all viewports
+        // Apply rendering preference to all viewports
        bool throttled = uLib::Qt::Settings::Instance().GetThrottledRendering();
-        auto font = uLib::Qt::Settings::Instance().GetFont();
-        auto fontColor = uLib::Qt::Settings::Instance().GetFontColor();
-        
        auto viewports = this->findChildren<uLib::Vtk::QViewport*>();
        for (auto* vp : viewports) {
            vp->SetThrottledRendering(throttled);
-            vp->SetFont(font);
-            vp->SetFontColor(fontColor);
            vp->Render();
        }
    }
--- a/app/gcompose/src/MainPanel.h
+++ b/app/gcompose/src/MainPanel.h
@@ -12,7 +12,6 @@ namespace uLib {
    class ObjectsContext;
    namespace Vtk {
        class ObjectsContext;
-        class ViewportProperties;
    }
 }

@@ -41,7 +40,6 @@ private:
    ContextPanel* m_contextPanel;
    uLib::ObjectsContext* m_context;
    uLib::Vtk::ObjectsContext* m_mainVtkContext;
-    uLib::Vtk::ViewportProperties* m_viewportProps;
 };

 #endif // MAINPANEL_H
--- a/app/gcompose/src/PreferencesDialog.cpp
+++ b/app/gcompose/src/PreferencesDialog.cpp
@@ -5,8 +5,6 @@
 #include <QPushButton>
 #include <QLabel>
 #include <QGroupBox>
-#include <QColorDialog>
-#include <QFormLayout>

 namespace uLib {
 namespace Qt {
@@ -66,77 +64,6 @@ PreferencesDialog::PreferencesDialog(QWidget* parent) : QDialog(parent) {

    mainLayout->addWidget(unitsGroup);

-    // ── Font Configuration ──────────────────────────────────────────────────
-    auto* fontGroup = new QGroupBox("Viewport Font Configuration", this);
-    auto* fontLayout = new QFormLayout(fontGroup);
-    fontLayout->setLabelAlignment(::Qt::AlignRight);
-    
-    FontConfig currentFont = Settings::Instance().GetFont();
-    m_currentFontColor = Settings::Instance().GetFontColor();
-
-    m_fontFamilies = new QComboBox(fontGroup);
-    m_fontFamilies->addItems({"Arial", "Courier", "Times"});
-    m_fontFamilies->setCurrentText(QString::fromStdString(currentFont.family));
-    
-    m_fontSize = new QSpinBox(fontGroup);
-    m_fontSize->setRange(6, 72);
-    m_fontSize->setValue(currentFont.size);
-    
-    m_fontBold = new QCheckBox("Bold", fontGroup);
-    m_fontBold->setChecked(currentFont.bold);
-    
-    m_fontItalic = new QCheckBox("Italic", fontGroup);
-    m_fontItalic->setChecked(currentFont.italic);
-    
-    m_fontColorBtn = new QPushButton(fontGroup);
-    m_fontColorBtn->setFixedWidth(60);
-    updateFontColorButton();
-    connect(m_fontColorBtn, &QPushButton::clicked, [this](){
-        QColor c = QColor::fromRgbF(m_currentFontColor.x(), m_currentFontColor.y(), m_currentFontColor.z());
-        QColor selected = QColorDialog::getColor(c, this, "Select Font Color");
-        if (selected.isValid()) {
-            m_currentFontColor = Vector3d(selected.redF(), selected.greenF(), selected.blueF());
-            updateFontColorButton();
-        }
-    });
-
-    fontLayout->addRow("Family:", m_fontFamilies);
-    fontLayout->addRow("Size:", m_fontSize);
-    fontLayout->addRow(m_fontBold);
-    fontLayout->addRow(m_fontItalic);
-    fontLayout->addRow("Color:", m_fontColorBtn);
-
-    mainLayout->addWidget(fontGroup);
-
-    // ── GUI Font Configuration ──────────────────────────────────────────────
-    auto* guiFontGroup = new QGroupBox("GUI Font Configuration", this);
-    auto* guiFontLayout = new QFormLayout(guiFontGroup);
-    guiFontLayout->setLabelAlignment(::Qt::AlignRight);
-    
-    FontConfig currentGuiFont = Settings::Instance().GetGuiFont();
-
-    m_guiFontFamilies = new QComboBox(guiFontGroup);
-    m_guiFontFamilies->setEditable(true);
-    m_guiFontFamilies->addItems({"Inter", "Roboto", "Segoe UI", "Arial", "Ubuntu"});
-    m_guiFontFamilies->setCurrentText(QString::fromStdString(currentGuiFont.family));
-    
-    m_guiFontSize = new QSpinBox(guiFontGroup);
-    m_guiFontSize->setRange(6, 48);
-    m_guiFontSize->setValue(currentGuiFont.size);
-    
-    m_guiFontBold = new QCheckBox("Bold", guiFontGroup);
-    m_guiFontBold->setChecked(currentGuiFont.bold);
-    
-    m_guiFontItalic = new QCheckBox("Italic", guiFontGroup);
-    m_guiFontItalic->setChecked(currentGuiFont.italic);
-
-    guiFontLayout->addRow("Family:", m_guiFontFamilies);
-    guiFontLayout->addRow("Size:", m_guiFontSize);
-    guiFontLayout->addRow(m_guiFontBold);
-    guiFontLayout->addRow(m_guiFontItalic);
-
-    mainLayout->addWidget(guiFontGroup);
-
    mainLayout->addStretch();

    // ── Buttons ─────────────────────────────────────────────────────────────
@@ -165,20 +92,8 @@ void PreferencesDialog::onAccept() {
        Settings::Instance().SetPreferredUnit(pair.first, pair.second->currentText().toStdString());
    }
    
-    FontConfig font(m_fontFamilies->currentText().toStdString(), m_fontSize->value(), m_fontBold->isChecked(), m_fontItalic->isChecked());
-    Settings::Instance().SetFont(font);
-    Settings::Instance().SetFontColor(m_currentFontColor);
-
-    FontConfig guiFont(m_guiFontFamilies->currentText().toStdString(), m_guiFontSize->value(), m_guiFontBold->isChecked(), m_guiFontItalic->isChecked());
-    Settings::Instance().SetGuiFont(guiFont);
-
    accept();
 }

-void PreferencesDialog::updateFontColorButton() {
-    QColor c = QColor::fromRgbF(m_currentFontColor.x(), m_currentFontColor.y(), m_currentFontColor.z());
-    m_fontColorBtn->setStyleSheet(QString("background-color: %1; border: 1px solid #555; height: 18px;").arg(c.name()));
-}
-
 } // namespace Qt
 } // namespace uLib
--- a/app/gcompose/src/PreferencesDialog.h
+++ b/app/gcompose/src/PreferencesDialog.h
@@ -4,8 +4,6 @@
 #include <QDialog>
 #include <QCheckBox>
 #include <QComboBox>
-#include <QSpinBox>
-#include <QPushButton>
 #include <map>
 #include <string>
 #include "Settings.h"
@@ -25,22 +23,6 @@ private:
    QCheckBox* m_throttledRendering;
    QComboBox* m_themeCombo;
    std::map<Settings::Dimension, QComboBox*> m_unitCombos;
-
-    // Font Configuration
-    QComboBox* m_fontFamilies;
-    QSpinBox* m_fontSize;
-    QCheckBox* m_fontBold;
-    QCheckBox* m_fontItalic;
-    QPushButton* m_fontColorBtn;
-    Vector3d m_currentFontColor;
-    
-    // GUI Font Configuration
-    QComboBox* m_guiFontFamilies;
-    QSpinBox* m_guiFontSize;
-    QCheckBox* m_guiFontBold;
-    QCheckBox* m_guiFontItalic;
-
-    void updateFontColorButton();
 };

 } // namespace Qt
--- a/app/gcompose/src/PropertiesPanel.cpp
+++ b/app/gcompose/src/PropertiesPanel.cpp
@@ -30,10 +30,6 @@ PropertiesPanel::PropertiesPanel(QWidget* parent) : QWidget(parent) {
    // Editor
    m_editor = new uLib::Qt::PropertyEditor(this);
    m_layout->addWidget(m_editor, 1);
-
-    connect(m_editor, &uLib::Qt::PropertyEditor::propertyUpdated, [this](uLib::PropertyBase*){
-        emit propertyUpdated();
-    });
 }

 void PropertiesPanel::setObject(uLib::Object* obj) {
--- a/app/gcompose/src/PropertiesPanel.h
+++ b/app/gcompose/src/PropertiesPanel.h
@@ -24,9 +24,6 @@ public:
    /** @brief Sets the object to be inspected. */
    void setObject(uLib::Object* obj);

-signals:
-    void propertyUpdated();
-
 private:
    QVBoxLayout* m_layout;
    QWidget* m_titleBar;
--- a/app/gcompose/src/PropertyWidgets.cpp
+++ b/app/gcompose/src/PropertyWidgets.cpp
@@ -11,7 +11,6 @@
 #include <QColorDialog>
 #include <QFrame>
 #include <QSlider>
-#include <QFontDialog>
 #include "Settings.h"

 namespace uLib {
@@ -152,7 +151,7 @@ DoublePropertyWidget::DoublePropertyWidget(Property<double>* prop, QWidget* pare
    }
    m_Edit->setValue(prop->Get());
    m_Layout->addWidget(m_Edit, 1);
-    connect(m_Edit, &UnitLineEdit::valueManualChanged, [this](double val){ m_Prop->Set(val); emit updated(); });
+    connect(m_Edit, &UnitLineEdit::valueManualChanged, [this](double val){ m_Prop->Set(val); });
    m_Connection = uLib::Object::connect(m_Prop, &Property<double>::Updated, [this](){
        m_Edit->setValue(m_Prop->Get());
    });
@@ -170,7 +169,7 @@ FloatPropertyWidget::FloatPropertyWidget(Property<float>* prop, QWidget* parent)
    }
    m_Edit->setValue(prop->Get());
    m_Layout->addWidget(m_Edit, 1);
-    connect(m_Edit, &UnitLineEdit::valueManualChanged, [this](double val){ m_Prop->Set((float)val); emit updated(); });
+    connect(m_Edit, &UnitLineEdit::valueManualChanged, [this](double val){ m_Prop->Set((float)val); });
    m_Connection = uLib::Object::connect(m_Prop, &Property<float>::Updated, [this](){
        m_Edit->setValue((double)m_Prop->Get());
    });
@@ -189,7 +188,7 @@ IntPropertyWidget::IntPropertyWidget(Property<int>* prop, QWidget* parent)
    }
    m_Edit->setValue(prop->Get());
    m_Layout->addWidget(m_Edit, 1);
-    connect(m_Edit, &UnitLineEdit::valueManualChanged, [this](double val){ m_Prop->Set((int)val); emit updated(); });
+    connect(m_Edit, &UnitLineEdit::valueManualChanged, [this](double val){ m_Prop->Set((int)val); });
    m_Connection = uLib::Object::connect(m_Prop, &Property<int>::Updated, [this](){
        m_Edit->setValue((double)m_Prop->Get());
    });
@@ -200,7 +199,7 @@ BoolPropertyWidget::BoolPropertyWidget(Property<bool>* prop, QWidget* parent)
    m_CheckBox = new QCheckBox(this);
    m_CheckBox->setChecked(prop->Get());
    m_Layout->addWidget(m_CheckBox, 1);
-    connect(m_CheckBox, &QCheckBox::toggled, [this](bool val){ if (m_Prop->Get() != val) { m_Prop->Set(val); emit updated(); } });
+    connect(m_CheckBox, &QCheckBox::toggled, [this](bool val){ if (m_Prop->Get() != val) m_Prop->Set(val); });
    m_Connection = uLib::Object::connect(m_Prop, &Property<bool>::Updated, [this](){
        if (m_CheckBox->isChecked() != m_Prop->Get()) {
            QSignalBlocker blocker(m_CheckBox);
@@ -223,7 +222,7 @@ RangePropertyWidget::RangePropertyWidget(Property<double>* prop, QWidget* parent
    m_Layout->addWidget(m_Edit, 0);

    connect(m_Slider, &QSlider::valueChanged, this, &RangePropertyWidget::onSliderChanged);
-    connect(m_Edit, &UnitLineEdit::valueManualChanged, [this](double val){ m_Prop->Set(val); emit updated(); });
+    connect(m_Edit, &UnitLineEdit::valueManualChanged, [this](double val){ m_Prop->Set(val); });
    
    m_Connection = uLib::Object::connect(m_Prop, &Property<double>::Updated, [this](){
        this->updateUi();
@@ -245,7 +244,6 @@ void RangePropertyWidget::updateUi() {
 void RangePropertyWidget::onSliderChanged(int val) {
    double realVal = m_Prop->GetMin() + (val / 100.0) * (m_Prop->GetMax() - m_Prop->GetMin());
    m_Prop->Set(realVal);
-    emit updated();
 }

 ColorPropertyWidget::ColorPropertyWidget(Property<Vector3d>* prop, QWidget* parent) 
@@ -278,7 +276,6 @@ void ColorPropertyWidget::onClicked() {
    QColor selected = QColorDialog::getColor(current, this, "Select Color");
    if (selected.isValid()) {
        m_Prop->Set(Vector3d(selected.redF(), selected.greenF(), selected.blueF()));
-        emit updated();
    }
 }

@@ -289,7 +286,7 @@ StringPropertyWidget::StringPropertyWidget(Property<std::string>* prop, QWidget*
    m_Layout->addWidget(m_LineEdit, 1);
    connect(m_LineEdit, &QLineEdit::editingFinished, [this](){
        std::string val = m_LineEdit->text().toStdString();
-        if (m_Prop->Get() != val) { m_Prop->Set(val); emit updated(); }
+        if (m_Prop->Get() != val) m_Prop->Set(val);
    });
    m_Connection = uLib::Object::connect(m_Prop, &Property<std::string>::Updated, [this](){
        if (m_LineEdit->text().toStdString() != m_Prop->Get()) {
@@ -300,40 +297,6 @@ StringPropertyWidget::StringPropertyWidget(Property<std::string>* prop, QWidget*
 }
 StringPropertyWidget::~StringPropertyWidget() {}

-FontPropertyWidget::FontPropertyWidget(Property<FontConfig>* prop, QWidget* parent)
-    : PropertyWidgetBase(prop, parent), m_Prop(prop) {
-    m_Button = new QPushButton(this);
-    m_Button->setMinimumWidth(100);
-    this->updateButtonText();
-    m_Layout->addWidget(m_Button, 1);
-    
-    connect(m_Button, &QPushButton::clicked, this, &FontPropertyWidget::onClicked);
-    m_Connection = uLib::Object::connect(m_Prop, &Property<FontConfig>::Updated, [this](){
-        this->updateButtonText();
-    });
-}
-FontPropertyWidget::~FontPropertyWidget() {}
-
-void FontPropertyWidget::updateButtonText() {
-    FontConfig f = m_Prop->Get();
-    m_Button->setText(QString::fromStdString(f.family) + " " + QString::number(f.size));
-}
-
-void FontPropertyWidget::onClicked() {
-    FontConfig current = m_Prop->Get();
-    QFont font(QString::fromStdString(current.family), current.size);
-    font.setBold(current.bold);
-    font.setItalic(current.italic);
-    
-    bool ok;
-    QFont selected = QFontDialog::getFont(&ok, font, this, "Select Font");
-    if (ok) {
-        FontConfig newF(selected.family().toStdString(), selected.pointSize(), selected.bold(), selected.italic());
-        m_Prop->Set(newF);
-        emit updated();
-    }
-}
-
 class GroupHeaderWidget : public QWidget {
 public:
    GroupHeaderWidget(const QString& name, QWidget* parent = nullptr) : QWidget(parent) {
@@ -369,9 +332,8 @@ public:
        // Get initial value
        if (auto* p = dynamic_cast<Property<int>*>(prop)) {
            m_Combo->setCurrentIndex(p->Get());
-            connect(m_Combo, &QComboBox::currentIndexChanged, [this, p](int index){
+            connect(m_Combo, &QComboBox::currentIndexChanged, [p](int index){
                p->Set(index);
-                emit updated();
            });
            // Store connection in base m_Connection so it's auto-disconnected on destruction.
            m_Connection = uLib::Object::connect(p, &Property<int>::Updated, [this, p](){
@@ -412,9 +374,6 @@ PropertyEditor::PropertyEditor(QWidget* parent) : QWidget(parent), m_Object(null
    registerFactory<std::string>([](PropertyBase* p, QWidget* parent){
        return new StringPropertyWidget(static_cast<Property<std::string>*>(p), parent);
    });
-    registerFactory<FontConfig>([](PropertyBase* p, QWidget* parent){
-        return new FontPropertyWidget(static_cast<Property<FontConfig>*>(p), parent);
-    });
    
    // Register EnumProperty specifically (needs to check type since it holds Property<int> but is EnumProperty)
    m_Factories[std::type_index(typeid(EnumProperty))] = [](PropertyBase* p, QWidget* parent) {
@@ -503,12 +462,6 @@ void PropertyEditor::setObject(::uLib::Object* obj, bool displayOnly) {
            }

            if (widget) {
-                if (auto* propWidget = qobject_cast<PropertyWidgetBase*>(widget)) {
-                    connect(propWidget, &PropertyWidgetBase::updated, [this, prop](){
-                        emit propertyUpdated(prop);
-                    });
-                }
-
                if (!groupName.empty()) {
                    // Indent grouped properties
                    widget->setContentsMargins(16, 0, 0, 0);
--- a/app/gcompose/src/PropertyWidgets.h
+++ b/app/gcompose/src/PropertyWidgets.h
@@ -17,7 +17,6 @@ class QSlider;
 #include "Core/Property.h"
 #include "Core/Object.h"
 #include "Core/Signal.h"
-#include "Core/FontConfig.h"
 #include "Math/Dense.h"
 #include "Settings.h"

@@ -33,9 +32,6 @@ public:
    virtual ~PropertyWidgetBase();
    PropertyBase* getProperty() const { return m_BaseProperty; }

-signals:
-    void updated();
-
 protected:
    PropertyBase* m_BaseProperty;
    QHBoxLayout* m_Layout;
@@ -125,10 +121,7 @@ public:
            connect(m_Edits[i], &UnitLineEdit::valueManualChanged, [this, i](double val){
                VecT v = m_Prop->Get();
                v(i) = (typename VecT::Scalar)val;
-                if (m_Prop->Get() != v) {
-                    m_Prop->Set(v);
-                    emit updated();
-                }
+                if (m_Prop->Get() != v) m_Prop->Set(v);
            });
        }
        updateEdits();
@@ -198,19 +191,6 @@ private:
    QLineEdit* m_LineEdit;
 };

-class FontPropertyWidget : public PropertyWidgetBase {
-    Q_OBJECT
-public:
-    FontPropertyWidget(Property<FontConfig>* prop, QWidget* parent = nullptr);
-    virtual ~FontPropertyWidget();
-private slots:
-    void onClicked();
-private:
-    void updateButtonText();
-    Property<FontConfig>* m_Prop;
-    QPushButton* m_Button;
-};
-
 class PropertyEditor : public QWidget {
    Q_OBJECT
 public:
@@ -222,9 +202,6 @@ public:
        m_Factories[std::type_index(typeid(T))] = factory;
    }

-signals:
-    void propertyUpdated(PropertyBase* prop = nullptr);
-
 private:
    void clear();
    uLib::Object* m_Object;
--- a/app/gcompose/src/QViewportPane.cpp
+++ b/app/gcompose/src/QViewportPane.cpp
@@ -94,8 +94,8 @@ void QViewportPane::setObject(uLib::Object* obj) {

 void QViewportPane::setViewport(QWidget* viewport, const QString& title) {
    if (m_viewport) {
-        m_viewport->parentWidget()->layout()->removeWidget(m_viewport);
-        delete m_viewport;
+        // Use deleteLater() instead of delete to avoid crashes during repaint cycles
+        m_viewport->deleteLater();
    }
    m_viewport = viewport;
    m_titleLabel->setText(title);
@@ -105,21 +105,8 @@ void QViewportPane::setViewport(QWidget* viewport, const QString& title) {
    mainAreaLayout->insertWidget(0, m_viewport);
 }

-
 QViewportPane::~QViewportPane() {}

-void QViewportPane::setViewport(QWidget* viewport, const QString& title) {
-    if (m_viewport) {
-        m_layout->removeWidget(m_viewport);
-        delete m_viewport;
-    }
-    m_viewport = viewport;
-    m_titleLabel->setText(title);
-
-    m_viewport->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
-    m_layout->addWidget(m_viewport);
-}
-
 void QViewportPane::addVtkViewport() {
    auto* viewport = new uLib::Vtk::QViewport(this);
    setViewport(viewport, "VTK Viewport");
--- a/app/gcompose/src/Settings.h
+++ b/app/gcompose/src/Settings.h
@@ -4,8 +4,6 @@
 #include <string>
 #include <map>
 #include "Math/Units.h"
-#include "Core/FontConfig.h"
-#include "Math/Dense.h"

 namespace uLib {
 namespace Qt {
@@ -77,23 +75,11 @@ public:
    Theme GetTheme() const { return m_Theme; }
    void SetTheme(Theme theme) { m_Theme = theme; }

-    FontConfig GetFont() const { return m_Font; }
-    void SetFont(const FontConfig& font) { m_Font = font; }
-
-    FontConfig GetGuiFont() const { return m_GuiFont; }
-    void SetGuiFont(const FontConfig& font) { m_GuiFont = font; }
-
-    Vector3d GetFontColor() const { return m_FontColor; }
-    void SetFontColor(const Vector3d& color) { m_FontColor = color; }
-
 private:
-    Settings() : m_ThrottledRendering(true), m_Theme(Dark), m_Font("Arial", 10), m_GuiFont("Inter", 9), m_FontColor(1.0, 1.0, 1.0) {}
+    Settings() : m_ThrottledRendering(true), m_Theme(Dark) {}
    std::map<Dimension, std::string> m_PreferredUnits;
    bool m_ThrottledRendering;
    Theme m_Theme;
-    FontConfig m_Font;
-    FontConfig m_GuiFont;
-    Vector3d m_FontColor;
 };

 } // namespace Qt
--- a/app/gcompose/src/StyleManager.cpp
+++ b/app/gcompose/src/StyleManager.cpp
@@ -1,15 +1,11 @@
 #include "StyleManager.h"
 #include <QApplication>
-#include "Core/FontConfig.h"

 static const QString DARK_THEME = R"(
 QWidget#MenuPanel { background-color: #2b2b2b; border-bottom: 1px solid #111; }
 QLabel#LogoLabel { font-weight: bold; color: #0078d7; font-size: 14px; letter-spacing: 1px; }
 QPushButton#MenuButton { background: transparent; color: #ccc; border: none; padding: 5px 10px; }
 QPushButton#MenuButton:hover { background: #3c3c3c; color: white; border-radius: 4px; }
-QPushButton { background-color: #3e3e42; color: white; border: 1px solid #555; padding: 4px 12px; border-radius: 2px; }
-QPushButton:hover { background-color: #505050; border-color: #0078d7; }
-QPushButton:pressed { background-color: #0078d7; }
 QWidget#PaneTitleBar { background-color: #333; color: white; border-bottom: 2px solid #222; }
 QLabel#TitleLabel { font-weight: bold; margin-left: 2px; }
 QToolButton#PaneCloseButton { border: none; font-weight: bold; background: transparent; color: #ccc; }
@@ -27,11 +23,8 @@ QScrollArea > QWidget > QWidget { background: transparent; }

 /* Property Widgets Styling */
 QLabel { color: #cccccc; }
-QDoubleSpinBox, QSpinBox, QLineEdit, QComboBox { background: #3c3c3c; color: #f1f1f1; border: 1px solid #3e3e42; padding: 2px 4px; border-radius: 2px; selection-background-color: #0078d7; }
-QDoubleSpinBox:focus, QSpinBox:focus, QLineEdit:focus, QComboBox:focus { border-color: #0078d7; }
-QComboBox::drop-down { border-left-width: 1px; border-left-color: #3e3e42; border-left-style: solid; width: 20px; border-top-right-radius: 2px; border-bottom-right-radius: 2px; }
-QComboBox::down-arrow { image: none; border: 5px solid transparent; border-top-color: #ccc; margin-top: 5px; }
-QAbstractItemView { background-color: #2b2b2b; color: white; border: 1px solid #3e3e42; selection-background-color: #0078d7; outline: 0; }
+QDoubleSpinBox, QSpinBox, QLineEdit { background: #3c3c3c; color: #f1f1f1; border: 1px solid #3e3e42; padding: 2px 4px; border-radius: 2px; selection-background-color: #0078d7; }
+QDoubleSpinBox:focus, QSpinBox:focus, QLineEdit:focus { border-color: #0078d7; }
 QCheckBox { color: #cccccc; spacing: 5px; }
 QCheckBox::indicator { width: 14px; height: 14px; border: 1px solid #3e3e42; background: #333337; border-radius: 2px; }
 QCheckBox::indicator:checked { background: #0078d7; border-color: #005a9e; }
@@ -49,11 +42,6 @@ QScrollBar:vertical { background: #1e1e1e; width: 12px; margin: 0px; }
 QScrollBar::handle:vertical { background: #3e3e42; min-height: 20px; border-radius: 6px; margin: 2px; }
 QScrollBar::handle:vertical:hover { background: #505050; }
 QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical { height: 0px; }
-
-/* Dialogs & Preferences */
-QDialog { background-color: #252526; color: #f1f1f1; }
-QGroupBox { font-weight: bold; color: #0078d7; border: 1px solid #3e3e42; margin-top: 1.1em; padding-top: 0.5em; border-radius: 4px; }
-QGroupBox::title { subcontrol-origin: margin; subcontrol-position: top left; padding: 0 3px; left: 10px; }
 )";

 static const QString BRIGHT_THEME = R"(
@@ -61,9 +49,6 @@ QWidget#MenuPanel { background-color: #f3f3f3; border-bottom: 1px solid #ccc; }
 QLabel#LogoLabel { font-weight: bold; color: #005a9e; font-size: 14px; letter-spacing: 1px; }
 QPushButton#MenuButton { background: transparent; color: #333; border: none; padding: 5px 10px; }
 QPushButton#MenuButton:hover { background: #e5e5e5; color: black; border-radius: 4px; }
-QPushButton { background-color: #ffffff; color: #333; border: 1px solid #cccccc; padding: 4px 12px; border-radius: 2px; }
-QPushButton:hover { background-color: #f2f2f2; border-color: #0078d7; }
-QPushButton:pressed { background-color: #0078d7; color: white; }
 QWidget#PaneTitleBar { background-color: #eeeeee; color: black; border-bottom: 2px solid #ddd; }
 QLabel#TitleLabel { font-weight: bold; margin-left: 2px; }
 QToolButton#PaneCloseButton { border: none; font-weight: bold; background: transparent; color: #666; }
@@ -81,11 +66,8 @@ QScrollArea > QWidget > QWidget { background: transparent; }

 /* Property Widgets Styling */
 QLabel { color: #333333; }
-QDoubleSpinBox, QSpinBox, QLineEdit, QComboBox { background: #ffffff; color: #333333; border: 1px solid #cccccc; padding: 2px 4px; border-radius: 2px; selection-background-color: #0078d7; }
-QDoubleSpinBox:focus, QSpinBox:focus, QLineEdit:focus, QComboBox:focus { border-color: #0078d7; }
-QComboBox::drop-down { border-left-width: 1px; border-left-color: #cccccc; border-left-style: solid; width: 20px; border-top-right-radius: 2px; border-bottom-right-radius: 2px; }
-QComboBox::down-arrow { image: none; border: 5px solid transparent; border-top-color: #666; margin-top: 5px; }
-QAbstractItemView { background-color: #ffffff; color: #333; border: 1px solid #cccccc; selection-background-color: #0078d7; outline: 0; }
+QDoubleSpinBox, QSpinBox, QLineEdit { background: #ffffff; color: #333333; border: 1px solid #cccccc; padding: 2px 4px; border-radius: 2px; selection-background-color: #0078d7; }
+QDoubleSpinBox:focus, QSpinBox:focus, QLineEdit:focus { border-color: #0078d7; }
 QCheckBox { color: #333333; spacing: 5px; }
 QCheckBox::indicator { width: 14px; height: 14px; border: 1px solid #cccccc; background: #ffffff; border-radius: 2px; }
 QCheckBox::indicator:checked { background: #0078d7; border-color: #005a9e; }
@@ -103,26 +85,14 @@ QScrollBar:vertical { background: #ffffff; width: 12px; margin: 0px; }
 QScrollBar::handle:vertical { background: #cccccc; min-height: 20px; border-radius: 6px; margin: 2px; }
 QScrollBar::handle:vertical:hover { background: #aaaaaa; }
 QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical { height: 0px; }
-
-/* Dialogs & Preferences */
-QDialog { background-color: #f3f3f3; color: #333; }
-QGroupBox { font-weight: bold; color: #005a9e; border: 1px solid #cccccc; margin-top: 1.1em; padding-top: 0.5em; border-radius: 4px; }
-QGroupBox::title { subcontrol-origin: margin; subcontrol-position: top left; padding: 0 3px; left: 10px; }
 )";

-void StyleManager::applyStyle(QApplication* app, const QString& themeName, const uLib::FontConfig& fontCfg) {
+void StyleManager::applyStyle(QApplication* app, const QString& themeName) {
    if (!app) return;
    
-    QString baseStyle = (themeName == "bright") ? BRIGHT_THEME : DARK_THEME;
-    
-    QString fontStyle = QString(
-        "QWidget { font-family: '%1'; font-size: %2pt; }\n"
-    ).arg(QString::fromStdString(fontCfg.family))
-     .arg(fontCfg.size);
-     
-    // If bold/italic are needed globally
-    if (fontCfg.bold) fontStyle += "QWidget { font-weight: bold; }\n";
-    if (fontCfg.italic) fontStyle += "QWidget { font-style: italic; }\n";
-
-    app->setStyleSheet(fontStyle + baseStyle);
+    if (themeName == "bright") {
+        app->setStyleSheet(BRIGHT_THEME);
+    } else {
+        app->setStyleSheet(DARK_THEME); // default
+    }
 }
--- a/app/gcompose/src/StyleManager.h
+++ b/app/gcompose/src/StyleManager.h
@@ -5,11 +5,9 @@

 class QApplication;

-namespace uLib { class FontConfig; }
-
 class StyleManager {
 public:
-    static void applyStyle(QApplication* app, const QString& themeName, const uLib::FontConfig& font);
+    static void applyStyle(QApplication* app, const QString& themeName);
 };

 #endif // STYLEMANAGER_H
--- a/app/gcompose/src/ViewportPane.cpp
+++ b/app/gcompose/src/ViewportPane.cpp
@@ -115,7 +115,7 @@ void ViewportPane::setObject(uLib::Object* obj) {

 void ViewportPane::setViewport(QWidget* viewport, const QString& title) {
    if (m_viewport) {
-        delete m_viewport;
+        m_viewport->deleteLater();
    }
    m_viewport = viewport;
    m_titleLabel->setText(title);
@@ -125,10 +125,6 @@ void ViewportPane::setViewport(QWidget* viewport, const QString& title) {
    m_areaSplitter->setStretchFactor(0, 1);
 }

-uLib::Vtk::Viewport* ViewportPane::viewport() const {
-    return dynamic_cast<uLib::Vtk::Viewport*>(m_viewport);
-}
-
 void ViewportPane::addVtkViewport() {
    auto* viewport = new uLib::Vtk::QViewport(this);
    setViewport(viewport, "VTK Viewport");
--- a/app/gcompose/src/ViewportPane.h
+++ b/app/gcompose/src/ViewportPane.h
@@ -8,7 +8,6 @@
 namespace uLib {
    class Object;
    namespace Qt { class PropertyEditor; }
-    namespace Vtk { class Viewport; }
 }

 class QSplitter;
@@ -25,7 +24,6 @@ public:
    void addRootCanvas();

    QWidget* currentViewport() const { return m_viewport; }
-    uLib::Vtk::Viewport* viewport() const;
    
    /** @brief Update the display properties for the given object. */
    void setObject(uLib::Object* obj);
--- a/app/gcompose/src/main.cpp
+++ b/app/gcompose/src/main.cpp
@@ -3,8 +3,6 @@
 #include "MainPanel.h"
 #include "ViewportPane.h"
 #include "StyleManager.h"
-#include "Settings.h"
-#include "Core/FontConfig.h"

 #include "Math/ContainerBox.h"
 #include <HEP/Geant/Scene.h>
@@ -31,9 +29,7 @@ using namespace uLib::literals;

 int main(int argc, char** argv) {
    QApplication app(argc, argv);
-    auto theme = uLib::Qt::Settings::Instance().GetTheme();
-    auto initialGuiFont = uLib::Qt::Settings::Instance().GetGuiFont();
-    StyleManager::applyStyle(&app, theme == uLib::Qt::Settings::Dark ? "dark" : "bright", initialGuiFont);
+    StyleManager::applyStyle(&app, "dark");
    std::cout << "Starting gcompose Qt application..." << std::endl;

    // ContainerBox world_box(Vector3f(1, 1, 1));
--- a/build.log
+++ b/build.log
@@ -1,36 +1 @@
-make: Entering directory '/home/rigoni/devel/cmt/ulib/build'
-[ 30%] Building CXX object src/Math/CMakeFiles/mutomMath.dir/VoxImage.cpp.o
-[ 30%] Building CXX object src/Math/CMakeFiles/mutomMath.dir/TriangleMesh.cpp.o
-[ 30%] Building CXX object src/Core/CMakeFiles/mutomCore.dir/Options.cpp.o
-[ 30%] Building CXX object src/Math/CMakeFiles/mutomMath.dir/Dense.cpp.o
-[ 30%] Building CXX object src/Math/CMakeFiles/mutomMath.dir/StructuredGrid.cpp.o
-[ 30%] Building CXX object src/Math/CMakeFiles/mutomMath.dir/VoxRaytracer.cpp.o
-[ 30%] Building CXX object src/Math/CMakeFiles/mutomMath.dir/StructuredData.cpp.o
-[ 30%] Building CXX object src/Math/CMakeFiles/mutomMath.dir/Structured2DGrid.cpp.o
-[ 30%] Building CXX object src/Math/CMakeFiles/mutomMath.dir/Structured4DGrid.cpp.o
-[ 33%] Linking CXX shared library libmutomCore.so
-[ 33%] Built target mutomCore
-[ 36%] Linking CXX shared library libmutomMath.so
-[ 36%] Built target mutomMath
-[ 63%] Building CXX object src/Vtk/CMakeFiles/mutomVtk.dir/vtkContainerBox.cpp.o
-[ 63%] Building CXX object src/Vtk/CMakeFiles/mutomVtk.dir/uLibVtkInterface.cxx.o
-[ 63%] Building CXX object src/Vtk/CMakeFiles/mutomVtk.dir/vtkStructuredGrid.cpp.o
-[ 63%] Building CXX object src/Vtk/CMakeFiles/mutomVtk.dir/vtkMuonScatter.cxx.o
-[ 63%] Building CXX object src/Vtk/CMakeFiles/mutomVtk.dir/uLibVtkViewer.cpp.o
-[ 63%] Generating mutomRootDict.cxx, libmutomRootDict_rdict.pcm, libmutomRootDict.rootmap
-[ 63%] Building CXX object src/Vtk/CMakeFiles/mutomVtk.dir/vtkVoxImage.cpp.o
-[ 63%] Building CXX object src/Vtk/CMakeFiles/mutomVtk.dir/vtkVoxRaytracerRepresentation.cpp.o
-[ 90%] Building CXX object src/Root/CMakeFiles/mutomRoot.dir/muCastorSkinHit.cpp.o
-[ 90%] Building CXX object src/Root/CMakeFiles/mutomRoot.dir/muCastorHit.cpp.o
-[ 90%] Building CXX object src/Root/CMakeFiles/mutomRoot.dir/muCastorMCTrack.cpp.o
-[ 90%] Building CXX object src/Root/CMakeFiles/mutomRoot.dir/muCastorInfo.cpp.o
-[ 90%] Building CXX object src/Root/CMakeFiles/mutomRoot.dir/RootMuonScatter.cpp.o
-[ 90%] Building CXX object src/Root/CMakeFiles/mutomRoot.dir/muCastorPrimaryVertex.cpp.o
-[ 90%] Building CXX object src/Root/CMakeFiles/mutomRoot.dir/muCastorMuDetDIGI.cpp.o
-[ 90%] Building CXX object src/Root/CMakeFiles/mutomRoot.dir/SkinDetectorWriter.cpp.o
-[ 93%] Building CXX object src/Root/CMakeFiles/mutomRoot.dir/mutomRootDict.cxx.o
-[ 96%] Linking CXX shared library libmutomVtk.so
-[ 96%] Built target mutomVtk
-[100%] Linking CXX shared library libmutomRoot.so
-[100%] Built target mutomRoot
-make: Leaving directory '/home/rigoni/devel/cmt/ulib/build'
+ninja: error: loading 'build.ninja': No such file or directory
--- a/docs/geant_integration.md
+++ b/docs/geant_integration.md
@@ -3,32 +3,9 @@
 Geant4 integration in uLib is done through the `HEP/Geant` module.
 The module represets a set of wrapper for geant objects that are also deriving from uLib::Object so they can be used in the uLib::Object tree and visualized with the uLib::Vtk module and driven py properties.

-# Geant Solid Integration
-
-Geant4 solids in `uLib` are encapsulated within the `uLib::Geant::Solid` hierarchy, with primary implementations such as `BoxSolid` and `TessellatedSolid`. These classes act as reactive wrappers around native Geant4 `G4VSolid` objects, bridging the gap between Geant4's static geometry and `uLib`'s dynamic property system.
-
-### Property Mapping and Synchronization
-The integration relies on a mapping between `uLib` properties and Geant4 parameters. This allows geometry to be driven by Qt-based property panels or interactive VTK handles. When a property is modified, the library handles the update through the following mechanism:
-
-*   **Parameter Application**: If the underlying Geant4 object supports dynamic updates (e.g., changing box dimensions via `SetXHalfLength`), `uLib` applies the change directly to the existing object.
-*   **Solid Re-instantiation**: In cases where Geant4 does not support on-the-fly parameter changes, the library transparently recreates the underlying `G4VSolid`. This ensures that the simulation model always reflects the current state of the design environment.
-*   **Global Signaling**: Once the underlying Geant4 state is synchronized, the `uLib::Geant::Solid` emits an `updated()` signal. This triggers cascading updates across all dependent observers, such as the VTK rendering pipeline and the Geant4 scene manager, ensuring visual and logical consistency.
-
-## VTK Visualization Layer
-
-The visualization of Geant4 solids in VTK is managed by the `uLib::Vtk::GeantSolid` class and its specializations (e.g., `vtkBoxSolid`). This class serves as a bridge between the domain model (`uLib::Geant::Solid`) and the VTK rendering pipeline, inheriting from `uLib::Vtk::Prop3D` to leverage the framework's standard transformation and property management features.
-
-### Geometry Extraction and Rendering
-Since Geant4 solids are defined by analytical or tessellated boundary representations, `GeantSolid` converts them into a format suitable for VTK:
-1.  **Faceted Representation**: It retrieves the `G4Polyhedron` tessellation from the underlying `G4VSolid`.
-2.  **PolyData Mapping**: The vertices and facets of the polyhedron are extracted and mapped to a `vtkPolyData` object.
-3.  **Actor Configuration**: This geometry is assigned to a `vtkActor`, which is then added to the `Prop3D`. Default visual properties—such as semi-transparent surfaces and edge visibility—are applied to aid in debugging and design.
-
-### Transform Synchronization
-The spatial state (Translation, Rotation, and Scale) is synchronized between the Geant4 geometry tree and the VTK viewer ensuring a consistent representation across both domains.
-
-*   **Geant4 to VTK (Forward)**: When a solid's placement is updated in Geant4, `GeantSolid` extracts the translation and rotation from the associated `G4VPhysicalVolume`. These are converted into a `vtkTransform` and applied to the actor, aligning the visual model with the simulation's coordinate system.
-*   **VTK to Geant4 (Interactive)**: Interaction in the viewer (e.g., using a transformation handler) triggers the `SyncFromVtk()` method. This pushes the new transformation matrix back to the `uLib::Geant::Solid` domain object, which then updates the Geant4 physical volume.
-*   **Feedback Loop Prevention**: To avoid infinite recursion during interactive updates, the synchronization logic utilizes temporary signal blocking. This ensures that a transform update originating from VTK does not trigger a redundant re-update of the VTK representation from the domain model.
+# Geant Solid integration

+Geant solid in uLib is represented by the `uLib::Geant::Solid` class and mainly BoxSolid and TessellatedSolid. The solids in Geant does not have the possibility to set properties on the fly so we need to create a new solid every time we want to change the properties of a solid. This is done by creating a new `uLib::Geant::Solid` object and setting the properties of the new solid. The new solid is then added to the `uLib::Geant::Solid` object as a child. The old solid is then removed from the `uLib::Geant::Solid` object as a child. The old solid is then deleted. However id some of the properties can be set then the library will drive the change in the solid update.

+The idea is to have a mapping of solid properties that can be used in uLib for Qt representation or vtk representation. then when the property is changed the signaling will update the property in uLib and then the solid will be updated. If the Geant property can be applied to the G4 object underneath then the update will apply the change, in case it is not possible to apply the change to the G4 object underneath then the G4 element will be recreated. 
+In any case a updated singal is emitted and the related element that use that solid is updated ( for instance the scene ).
--- a/src/Core/DataAllocator.h
+++ b/src/Core/DataAllocator.h
@@ -46,6 +46,8 @@ public:
  DataAllocator(size_t size = 0, bool owns_objects = true)
      : m_Size(size), m_RamData(nullptr), m_VramData(nullptr),
        m_Device(MemoryDevice::RAM), m_OwnsObjects(owns_objects) {
+    if (m_Size >= (static_cast<size_t>(1) << 60))
+        throw std::invalid_argument("DataAllocator: absurdly large size requested");
    if (m_Size > 0) {
      if (m_OwnsObjects)
        m_RamData = new T[m_Size]();
@@ -139,7 +141,7 @@ public:
  void MoveToRAM() {
    if (m_Device == MemoryDevice::RAM)
      return;
-    if (!m_RamData && m_Size > 0) {
+    if (!m_RamData && m_Size > 0 && m_Size < (static_cast<size_t>(1) << 60)) {
      if (m_OwnsObjects)
        m_RamData = new T[m_Size]();
      else
@@ -178,7 +180,7 @@ public:
    T *newRam = nullptr;
    T *newVram = nullptr;

-    if (size > 0) {
+    if (size > 0 && size < (static_cast<size_t>(1) << 60)) {
      if (m_OwnsObjects)
        newRam = new T[size]();
      else
--- a/src/Core/FontConfig.h
+++ b/src/Core/FontConfig.h
@@ -1,48 +0,0 @@
-#ifndef U_CORE_FONTCONFIG_H
-#define U_CORE_FONTCONFIG_H
-
-#include <string>
-#include <ostream>
-#include <boost/serialization/nvp.hpp>
-
-namespace uLib {
-
-/**
- * @struct FontConfig
- * @brief Basic font configuration for text properties.
- */
-struct FontConfig {
-    std::string family;
-    int size;
-    bool bold;
-    bool italic;
-
-    FontConfig() : family("Arial"), size(10), bold(false), italic(false) {}
-    FontConfig(const std::string& fam, int sz, bool b = false, bool i = false)
-        : family(fam), size(sz), bold(b), italic(i) {}
-
-    bool operator==(const FontConfig& other) const {
-        return family == other.family && size == other.size && 
-               bold == other.bold && italic == other.italic;
-    }
-    bool operator!=(const FontConfig& other) const { return !(*this == other); }
-
-    template<class Archive>
-    void serialize(Archive& ar, const unsigned int version) {
-        ar & boost::serialization::make_nvp("family", family);
-        ar & boost::serialization::make_nvp("size", size);
-        ar & boost::serialization::make_nvp("bold", bold);
-        ar & boost::serialization::make_nvp("italic", italic);
-    }
-};
-
-inline std::ostream& operator<<(std::ostream& os, const FontConfig& f) {
-    os << f.family << " " << f.size;
-    if (f.bold) os << " Bold";
-    if (f.italic) os << " Italic";
-    return os;
-}
-
-} // namespace uLib
-
-#endif // U_CORE_FONTCONFIG_H
--- a/src/Core/Object.cpp
+++ b/src/Core/Object.cpp
@@ -208,7 +208,8 @@ void Object::PrintSelf(std::ostream &o) const {

 bool Object::addSignalImpl(SignalBase *sig, GenericMFPtr fptr,
                           const char *name) {
-  ObjectPrivate::Signal s = {fptr, std::string(name), sig};
+  if (!d) return false;
+  ObjectPrivate::Signal s = {fptr, std::string(name ? name : "unnamed"), sig};
  d->sigv.push_back(s);
  return true;
 }
--- a/src/Core/ObjectFactory.h
+++ b/src/Core/ObjectFactory.h
@@ -67,12 +67,6 @@ public:
  static uLib::ObjectRegistrar<className> ULIB_REG_CONCAT(                     \
      g_ObjectRegistrar_, __LINE__)(registeredName);

-
-
-
-
-// Object Wrapper
-
 template <typename T> class ObjectWrapper {
 public:
  ObjectWrapper(const std::string &className) {
@@ -81,7 +75,6 @@ public:
  }

  ObjectWrapper(T *model) : m_model(model) {}
-  ObjectWrapper(T &model) : m_model(model) {}

  template <typename U = T,
            typename = std::enable_if_t<std::is_default_constructible_v<U>>>
--- a/src/Core/ObjectsContext.cpp
+++ b/src/Core/ObjectsContext.cpp
@@ -8,7 +8,9 @@ ObjectsContext::ObjectsContext() : Object() {}
 ObjectsContext::~ObjectsContext() {}

 void ObjectsContext::AddObject(Object* obj) {
-    if (obj && std::find(m_objects.begin(), m_objects.end(), obj) == m_objects.end()) {
+    if (!obj || obj == this) return;
+    
+    if (std::find(m_objects.begin(), m_objects.end(), obj) == m_objects.end()) {
        m_objects.push_back(obj);
        // Connect child's update to context's update to trigger re-renders
        Object::connect(obj, &Object::Updated, this, &Object::Updated);
--- a/src/Core/Serializable.h
+++ b/src/Core/Serializable.h
@@ -42,8 +42,6 @@ TODO:
 #include <boost/mpl/for_each.hpp>
 #include <boost/mpl/remove_if.hpp>
 #include <boost/serialization/nvp.hpp>
-#include <boost/serialization/shared_ptr.hpp>
-#include <boost/serialization/unique_ptr.hpp>

 // #include <boost/archive/xml_iarchive.hpp>
 // #include <boost/archive/xml_oarchive.hpp>
--- a/src/Core/SmartPointer.h
+++ b/src/Core/SmartPointer.h
@@ -31,9 +31,6 @@
 #include <type_traits>
 #include <utility>

-#include <boost/serialization/access.hpp>
-#include <boost/serialization/nvp.hpp>
-
 namespace uLib {

 /**
@@ -187,19 +184,6 @@ public:
    explicit operator bool() const noexcept { return get() != nullptr; }

 private:
-    friend class boost::serialization::access;
-
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int /*version*/) {
-        if (Archive::is_loading::value) {
-            release();
-        }
-        ar & boost::serialization::make_nvp("counter", m_counter);
-        if (Archive::is_loading::value && m_counter) {
-            m_counter->count.fetch_add(1, std::memory_order_relaxed);
-        }
-    }
-
    struct ReferenceCounter {
        T* ptr;
        std::atomic<uint32_t> count;
@@ -211,16 +195,6 @@ private:
        template <typename D>
        ReferenceCounter(T* p, D d, uint32_t initial_count = 1)
            : ptr(p), count(initial_count), deleter(d) {}
-
-        ReferenceCounter() 
-            : ptr(nullptr), count(0), deleter([](T* p) { delete p; }) {}
-
-        private:
-        friend class boost::serialization::access;
-        template <class Archive>
-        void serialize(Archive& ar, const unsigned int /*version*/) {
-            ar & boost::serialization::make_nvp("ptr", ptr);
-        }
    };

    ReferenceCounter* m_counter;
--- a/src/Core/testing/ObjectWrapperTest.cpp
+++ b/src/Core/testing/ObjectWrapperTest.cpp
@@ -16,7 +16,7 @@ int main() {
    
    std::cout << "Testing ObjectWrapper with Non-Default Constructible type..." << std::endl;
    NonDefault nd(10);
-    uLib::ObjectWrapper<NonDefault> w2(nd);
+    uLib::ObjectWrapper<NonDefault> w2(&nd);
    
    // The following would NOT compile without SFINAE:
    // uLib::ObjectWrapper<NonDefault> w3; 
--- a/src/Core/testing/SerializeTest.cpp
+++ b/src/Core/testing/SerializeTest.cpp
@@ -150,97 +150,11 @@ int testing_hrt_class() {



-
-
-class B : public virtual Object {
-  uLibTypeMacro(B, Object)
-  ULIB_SERIALIZE_ACCESS
-  
-public:
-  B() : m_b(1234567), m_a(nullptr) {}  
-
-  int m_b;
-
-  // reference to A (serializes through ID)
-  A *m_a;
-};
-
-ULIB_SERIALIZABLE_OBJECT(B)
-ULIB_SERIALIZE_OBJECT(B, Object) {
-  ar & "Object B : " & "--> m_b = " & AR(m_b) & "--> m_a = " & AR(m_a);
-}
-
-
-
-class C : public virtual Object {
-  uLibTypeMacro(C, Object)
-  ULIB_SERIALIZE_ACCESS
-  
-public:
-  C() : m_c(1234566) {}
-
-  int m_c;
-
-  // reference to A (serializes through ID)
-  SmartPointer<A> m_a;
-};
-
-ULIB_SERIALIZABLE_OBJECT(C)
-ULIB_SERIALIZE_OBJECT(C, Object) {
-  ar & "Object C : " & "--> m_c = " & AR(m_c) & "--> m_a = " & AR(m_a);
-}
-
-
-
-int test_referece_serialization() {  
-  A a;
-  {
-    B b,b2  ;
-    b.m_a = &a;
-    b2.m_a = &a;
-
-    std::ofstream file("test_ref.xml");
-    Archive::xml_oarchive(file) << NVP(b) << NVP(b2);
-  }
-  
-  
-  B b,b2;
-  {
-    std::ifstream file("test_ref.xml");
-    Archive::xml_iarchive(file) >> NVP(b) >> NVP(b2);
-  }
-
-  return (b.m_a->a() == a.a() && b2.m_a->a() == a.a());
-}
-
-int test_referece_smartpointer_serialization() {
-  SmartPointer<A> a;
-  a->init_properties();
-  {
-    C c, c2; c.m_a = a; c2.m_a = a; 
-    
-    std::ofstream file("test_ref_smartpointer.xml");
-    Archive::xml_oarchive(file) << NVP(c) << NVP(c2);
-  }
-  
-  
-  C c, c2;
-  {
-    std::ifstream file("test_ref_smartpointer.xml");
-    Archive::xml_iarchive(file) >> NVP(c) >> NVP(c2);
-  }
-
-  return (c.m_a->a() == a->a() && c2.m_a->a() == a->a());
-}
-
-
 int main() {
  BEGIN_TESTING(Serialize Test);

  TEST1(test_V3f());
  TEST1(testing_xml_class());
-  TEST1(test_referece_serialization());
-  TEST1(test_referece_smartpointer_serialization());
  // TEST1(testing_hrt_class());

  END_TESTING;
--- a/src/HEP/Geant/Solid.cpp
+++ b/src/HEP/Geant/Solid.cpp
@@ -107,8 +107,6 @@ void Solid::SetTransform(Matrix4f transform) {
    }

    std::cout << "Solid " << GetName() << " position: " << pos << " rotation: " << m << std::endl;
-
-    this->Updated();
 }

 void Solid::SetParent(Solid *parent) {
@@ -183,14 +181,11 @@ void TessellatedSolid::Update() {
 BoxSolid::BoxSolid(const char *name) : 
    BaseClass(name), 
    m_ContainerBox(new ContainerBox()), 
-    m_Solid(new G4Box(name, 0.5, 0.5, 0.5))
-  {
-    Object::connect(m_ContainerBox, &ContainerBox::Updated, this, &BoxSolid::Update);
-    Update();
-  }
+    m_Solid(new G4Box(name, 1, 1, 1))
+  {}

 BoxSolid::BoxSolid(const char *name, ContainerBox *box) : BaseClass(name) {
-  m_Solid = new G4Box(name, 0.5, 0.5, 0.5);
+  m_Solid = new G4Box(name, 1, 1, 1);
  m_ContainerBox = box;
  Object::connect(box, &ContainerBox::Updated, this, &BoxSolid::Update);
  if (m_Logical) {
--- a/src/HEP/Geant/Solid.h
+++ b/src/HEP/Geant/Solid.h
@@ -53,7 +53,6 @@ public:
  void SetMaterial(G4Material *material);
  
  void SetSizeUnit(const char *unit);
-  
  // Implementiamo SetParent qui, per tutti.
  virtual void SetParent(Solid *parent); 

@@ -72,9 +71,12 @@ public:

  template < typename Ar >
  void serialize(Ar &ar, const unsigned int version) {
-    ar & boost::serialization::make_nvp("Name", m_Name);
+    ar & m_Name;
  }
    
+    
+
+
 protected:

  std::string m_Name;
@@ -121,7 +123,6 @@ public:

  BoxSolid(const char *name = "");
  BoxSolid(const char *name, ContainerBox *box);
-
  virtual G4VSolid* GetG4Solid() const override { return (G4VSolid*)m_Solid; }
  
  ContainerBox* GetObject() const { return m_ContainerBox; }
--- a/src/HEP/Geant/testing/SolidTest.cpp
+++ b/src/HEP/Geant/testing/SolidTest.cpp
@@ -25,32 +25,6 @@ int main() {
        TEST1(solid.GetMaterial()->GetName() == "G4_AIR");
    }

-    // Test BoxSolid //
-    {
-        Geant::BoxSolid boxsolid("test_boxsolid");
-        boxsolid.SetNistMaterial("G4_AIR");
-        TEST1(boxsolid.GetLogical() != nullptr);
-        // TEST1(boxsolid.GetSolid() != nullptr);
-    }
-
-    // Test BoxSolid with a container box //
-    {
-        ContainerBox box;
-        
-        // box.SetPosition(Vector3f(1,1,1));
-        // box.SetRotation(Rotation(Vector3f(0,1,0), 45_deg));
-        
-        Geant::BoxSolid boxsolid("test_boxsolid", &box);
-        boxsolid.SetNistMaterial("G4_AIR");
-        TEST1(boxsolid.GetLogical() != nullptr);
-        // TEST1(boxsolid.GetSolid() != nullptr);
-        // TEST1(boxsolid.GetSolid()->GetXHalfLength() == 0.5);
-        // TEST1(boxsolid.GetSolid()->GetYHalfLength() == 0.5);
-        // TEST1(boxsolid.GetSolid()->GetZHalfLength() == 0.5);
-
-        
-    }
-
    // Test TessellatedSolid with a simple mesh //
    {
        Geant::TessellatedSolid tsolid("test_tessellated");
--- a/src/Math/Assembly.cpp
+++ b/src/Math/Assembly.cpp
@@ -37,27 +37,18 @@ Assembly::Assembly(const Assembly &copy)
      m_GroupSelection(copy.m_GroupSelection) {}

 Assembly::~Assembly() {
-    for (auto const& [obj, conn] : m_ChildConnections) {
-        conn.disconnect();
-    }
-    m_ChildConnections.clear();
 }

 void Assembly::AddObject(Object *obj) {
+    if (!obj || obj == this) return;
+
    if (auto *at = dynamic_cast<AffineTransform *>(obj)) {
        at->SetParent(this);
    }
+    
+    // Base class already handles the list and child->parent update connection
    ObjectsContext::AddObject(obj);
    
-    // Connect to child updates to recompute AABB
-    m_ChildConnections[obj] = Object::connect(obj, &Object::Updated, [this](){
-        this->ComputeBoundingBox();
-        this->Updated(); // Signal that assembly itself changed (AABB-wise)
-    });
-
-    // Parent -> Child propagation for world matrix updates
-    Object::connect(this, &Object::Updated, obj, &Object::Updated);
-
    this->ComputeBoundingBox();
 }

@@ -67,12 +58,6 @@ void Assembly::RemoveObject(Object *obj) {
            at->SetParent(nullptr);
    }
    
-    auto itConn = m_ChildConnections.find(obj);
-    if (itConn != m_ChildConnections.end()) {
-        itConn->second.disconnect();
-        m_ChildConnections.erase(itConn);
-    }
-    
    ObjectsContext::RemoveObject(obj);
    this->ComputeBoundingBox();
 }
--- a/src/Math/Assembly.h
+++ b/src/Math/Assembly.h
@@ -31,6 +31,7 @@
 #include "Math/Transform.h"

 namespace uLib {
+namespace Vtk { class Assembly; }

 /**
 * @brief Assembly groups geometric objects (ContainerBox, Cylinder, etc.)
@@ -46,6 +47,7 @@ namespace uLib {
 class Assembly : public ObjectsContext, public TRS {
 public:
    uLibTypeMacro(Assembly, ObjectsContext, TRS)
+    friend class Vtk::Assembly;
    

    Assembly();
@@ -112,7 +114,6 @@ private:
    bool     m_ShowBoundingBox;
    bool     m_GroupSelection;
    bool     m_InUpdated = false;
-    std::map<Object*, Connection> m_ChildConnections;

    ULIB_DECLARE_PROPERTIES(Assembly)
 };
--- a/src/Vtk/HEP/Geant/vtkBoxSolid.cpp
+++ b/src/Vtk/HEP/Geant/vtkBoxSolid.cpp
@@ -40,15 +40,13 @@ BoxSolid::~BoxSolid() {

 void BoxSolid::Update() {
  ConnectionBlock blocker(m_UpdateConnection);
-  // Ensure base GeantSolid logic (G4Polyhedron and Transform) runs
-  this->GeantSolid::Update();
-  // Ensure base Prop3D properties (color, opacity, etc) are applied
+  this->UpdateGeometry();
+  // Ensure base Prop3D properties (color, opacity, etc) and transform are applied
  this->Prop3D::Update();
 }

 void BoxSolid::SyncFromVtk() {
  this->Prop3D::SyncFromVtk();
-  
  if (auto* proxy = vtkProp3D::SafeDownCast(this->GetProxyProp())) {
      if (vtkMatrix4x4* mat = proxy->GetUserMatrix()) {
          m_BoxContent->SetTransform(VtkToMatrix4f(mat));
@@ -56,6 +54,16 @@ void BoxSolid::SyncFromVtk() {
  }
 }

+void BoxSolid::UpdateGeometry() {
+  // Sync geometry from G4VSolid provided by GeantSolid (tessellation)
+  GeantSolid::UpdateGeometry();
+}
+
+void BoxSolid::UpdateTransform() {
+  // Take transform from Prop3D base (which uses GetContent() -> ContainerBox TRS)
+  this->Prop3D::Update();
+}
+
 void BoxSolid::serialize_display(uLib::Archive::display_properties_archive &ar,
                                    const unsigned int version) {
  // Expose Geant solid properties and underlying Box/TRS properties
--- a/src/Vtk/HEP/Geant/vtkBoxSolid.h
+++ b/src/Vtk/HEP/Geant/vtkBoxSolid.h
@@ -49,6 +49,8 @@ public:
  virtual ~BoxSolid();

  virtual void Update() override;
+  virtual void UpdateGeometry() override;
+  virtual void UpdateTransform() override;
  virtual void SyncFromVtk() override;

  virtual uLib::Object *GetContent() const override { 
--- a/src/Vtk/Math/testing/vtkAssemblyTest.cpp
+++ b/src/Vtk/Math/testing/vtkAssemblyTest.cpp
@@ -28,33 +28,33 @@ using namespace uLib;
 int main(int argc, char **argv) {
    bool interactive = (argc > 1 && std::string(argv[1]) == "-i");

-    // ---- 1. Build model objects ----
-    ContainerBox box1;
-    box1.Scale(Vector3f(1_m, 2_m, 0.5_m));
-    box1.SetPosition(Vector3f(0, 0, 0));
+    // ---- 1. Build model objects on the heap (expected by uLib SmartPointer) ----
+    auto* box1 = new ContainerBox();
+    box1->Scale(Vector3f(1, 2, 0.5));
+    // box1->SetPosition(Vector3f(0, 0, 0));

-    ContainerBox box2;
-    box2.Scale(Vector3f(0.5_m, 0.5_m, 3_m));
-    box2.SetPosition(Vector3f(2_m, 0, 0));
+    auto* box2 = new ContainerBox();
+    box2->Scale(Vector3f(0.5, 0.5, 3));
+    box2->SetPosition(Vector3f(2, 0, 0));

-    Cylinder cyl(0.3_m, 1.5_m, 1);
-    cyl.SetPosition(Vector3f(0, 3_m, 0));
+    auto* cyl = new Cylinder(1, 1.5, 1);
+    cyl->SetPosition(Vector3f(0, 3, 0));

    // ---- 2. Create an Assembly and add objects ----
-    Assembly assembly;
-    assembly.AddObject(&box1);
-    assembly.AddObject(&box2);
-    assembly.AddObject(&cyl);
-    assembly.SetShowBoundingBox(true);
+    auto* assembly = new Assembly();
+    assembly->AddObject(box1);
+    assembly->AddObject(box2);
+    assembly->AddObject(cyl);
+    assembly->SetShowBoundingBox(true);

    // ---- 3. Apply a group transform ----
-    assembly.SetPosition(Vector3f(1_m, 1_m, 0));
+    // assembly->SetPosition(Vector3f(1_m, 1_m, 0));

    // ---- 5. Visualize (create prop3ds to set properties) ----
-    Vtk::Assembly vtkAsm(&assembly);
+    Vtk::Assembly vtkAsm(assembly); // Vtk::Assembly takes ownership of the model wrapper

    Vtk::Viewer viewer;
-    vtkAsm.AddToViewer(viewer); // This triggers prop3d creation via ConnectRenderer which eventually calls Prop3D::GetProp
+    vtkAsm.AddToViewer(viewer); 
    
    // Explicitly update to ensure prop3ds exist and are added to assemblies
    vtkAsm.Update();
@@ -74,16 +74,16 @@ int main(int argc, char **argv) {
            }
        };

-        setProps(childCtx->GetProp3D(&box1), 1.0, 0.0, 0.0); // Red
-        setProps(childCtx->GetProp3D(&box2), 0.0, 1.0, 0.0); // Green
-        setProps(childCtx->GetProp3D(&cyl),  0.0, 0.0, 1.0); // Blue
+        setProps(childCtx->GetProp3D(box1), 1.0, 0.0, 0.0); // Red
+        setProps(childCtx->GetProp3D(box2), 0.0, 1.0, 0.0); // Green
+        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;

    // ---- 4. Query the bounding box for terminal output ----
    Vector3f bbMin, bbMax;
-    assembly.GetBoundingBox(bbMin, bbMax);
+    assembly->GetBoundingBox(bbMin, bbMax);
    std::cout << "Assembly bounding box:" << std::endl;
    std::cout << "  min = " << bbMin.transpose() << std::endl;
    std::cout << "  max = " << bbMax.transpose() << std::endl;
--- a/src/Vtk/Math/vtkAssembly.cpp
+++ b/src/Vtk/Math/vtkAssembly.cpp
@@ -45,15 +45,13 @@ Assembly::Assembly(uLib::Assembly *content)

 Assembly::~Assembly() {
    delete m_ChildContext;
-    if (m_BBoxActor)  m_BBoxActor->Delete();
-    if (m_VtkAsm)     m_VtkAsm->Delete();
 }

 // ------------------------------------------------------------------ //
 void Assembly::InstallPipe() {
-    // 1. Create the VTK library assembly that groups everything
-    m_VtkAsm = ::vtkAssembly::New();
-    m_VtkAsm->PickableOff();
+    // 1. Setup the internal VTK assembly
+    m_VtkAsm = vtkSmartPointer<::vtkAssembly>::New();
+    m_BBoxActor = vtkSmartPointer<::vtkActor>::New();
    this->SetProp(m_VtkAsm);

    // 2. Create the bounding-box wireframe actor
@@ -64,7 +62,6 @@ void Assembly::InstallPipe() {
    vtkNew<vtkPolyDataMapper> mapper;
    mapper->SetInputConnection(cube->GetOutputPort());

-    m_BBoxActor = vtkActor::New();
    m_BBoxActor->SetMapper(mapper);
    m_BBoxActor->GetProperty()->SetRepresentationToWireframe();
    m_BBoxActor->GetProperty()->SetColor(1.0, 0.85, 0.0);   // gold wireframe
@@ -93,14 +90,7 @@ void Assembly::Update() {
    if (m_InUpdate) return;
    m_InUpdate = true;
    
-    if (this->m_model && m_VtkAsm) {
-        // Apply world matrix from the assembly content
-        vtkNew<vtkMatrix4x4> m;
-        Matrix4fToVtk(this->m_model->GetMatrix(), m);
-        m_VtkAsm->SetUserMatrix(m);
-        m_VtkAsm->Modified();
-    }
-
+    // Delegate to Prop3D to handle standard transformation application (uses GetContent())
    this->Prop3D::Update();
    this->UpdateBoundingBox();
    if (m_ChildContext)
@@ -110,25 +100,29 @@ void Assembly::Update() {

 void Assembly::SyncFromVtk() {
    if (m_InUpdate) return;
-    if (!this->m_model || !m_VtkAsm) return;
-
    m_InUpdate = true;
    
-    // VTK -> Model: Update world matrix (accounting for model parents)
-    if (vtkProp3D* proxy = this->GetProxyProp()) {
-        this->m_model->SetWorldMatrix(VtkToMatrix4f(proxy->GetUserMatrix()));
-        this->m_model->FromMatrix(this->m_model->GetMatrix());
-    }
+    // Sync the group-level transformation from VTK to the domain model
+    this->Prop3D::SyncFromVtk();
    
-    this->UpdateBoundingBox();
+    // Propagate sync to children
    if (m_ChildContext)
        m_ChildContext->SyncFromVtk();
    
-    this->m_model->Updated(); // Notify change in model
-
    m_InUpdate = false;
 }

+
+void Assembly::serialize_display(uLib::Archive::display_properties_archive &ar, const unsigned int version) {
+    // 1. Register base class appearance/transform
+    this->Prop3D::serialize_display(ar, version);
+
+    // 2. Map domain model properties (Bounding Box visibility, etc.)
+    if (this->m_model) {
+        ar & HRP("ShowBoundingBox", m_model->m_ShowBoundingBox);
+    }
+}
+
 // ------------------------------------------------------------------ //
 void Assembly::UpdateBoundingBox() {
    if (!this->m_model || !m_BBoxActor) return;
@@ -188,10 +182,6 @@ void Assembly::UpdateBoundingBox() {
    m_BBoxActor->Modified();
 }

-// ------------------------------------------------------------------ //
-ObjectsContext *Assembly::GetChildrenContext() const {
-    return m_ChildContext;
-}

 } // namespace Vtk
 } // namespace uLib
--- a/src/Vtk/Math/vtkAssembly.h
+++ b/src/Vtk/Math/vtkAssembly.h
@@ -16,8 +16,9 @@
 #include "Math/Assembly.h"
 #include "Vtk/uLibVtkInterface.h"

-class vtkActor;
-class vtkAssembly;  // VTK library forward declaration (must be before namespace)
+#include <vtkSmartPointer.h>
+#include <vtkActor.h>
+#include <vtkAssembly.h>

 namespace uLib {
 namespace Vtk {
@@ -39,33 +40,36 @@ class Assembly : public Prop3D, public uLib::ObjectWrapper<uLib::Assembly> {
 public:
    uLibTypeMacro(Assembly, Prop3D)

-    Assembly(uLib::Assembly *content);
+    /**
+     * @brief Constructor.
+     * @param content Pointer to the domain assembly model.
+     */
+    explicit Assembly(uLib::Assembly *content);
    virtual ~Assembly();

    /** @brief Updates the VTK representation from the model (model→VTK). */
    virtual void Update() override;

-    /** @brief Synchronizes the model from the VTK representation (VTK→model). */
    virtual void SyncFromVtk() override;

    virtual uLib::Object* GetContent() const override { return (uLib::Object*)m_model.get(); }
    virtual uLib::ObjectsContext* GetChildren() override { return (uLib::ObjectsContext*)m_model.get(); }

-    /**
-     * @brief Returns the prop3d managing child objects.
-     */
+    /** @brief Returns the visualization context for children. */
+    uLib::Vtk::ObjectsContext* GetChildrenContext() const { return m_ChildContext; }

-    /** @brief Returns the prop3d managing child objects. */
-    ObjectsContext *GetChildrenContext() const;
+    /** @brief Property serialization for Display Properties Panel. */
+    void serialize_display(Archive::display_properties_archive &ar, const unsigned int version = 0) override;

 private:
    void UpdateBoundingBox();
    void InstallPipe();

-    ObjectsContext  *m_ChildContext;
-    vtkActor           *m_BBoxActor;
-    ::vtkAssembly      *m_VtkAsm; // VTK library assembly — NOT this class
-    bool                m_InUpdate;    // re-entrancy guard
+    vtkSmartPointer<::vtkAssembly>    m_VtkAsm;
+    vtkSmartPointer<::vtkActor>       m_BBoxActor;
+
+    uLib::Vtk::ObjectsContext *m_ChildContext;
+    bool m_InUpdate;
 };

 } // namespace Vtk
--- a/src/Vtk/Math/vtkContainerBox.cpp
+++ b/src/Vtk/Math/vtkContainerBox.cpp
@@ -56,7 +56,9 @@ struct ContainerBoxData {
      : m_Cube(vtkSmartPointer<vtkActor>::New()),
        m_Axes(vtkSmartPointer<vtkActor>::New()),
        m_VtkAsm(vtkSmartPointer<vtkAssembly>::New()) {}
-  ~ContainerBoxData() {}
+  ~ContainerBoxData() {
+    m_UpdateSignal.disconnect();
+  }
 };

 ContainerBox::ContainerBox(ContainerBox::Content *content)
@@ -93,27 +95,7 @@ void ContainerBox::Update() {
  this->Prop3D::Update();
 }

-void ContainerBox::SyncFromVtk() {
-  RecursiveMutex::ScopedLock lock(this->m_UpdateMutex);
-  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();
-}

 void ContainerBox::InstallPipe() {
  if (!this->m_model)
--- a/src/Vtk/Math/vtkContainerBox.h
+++ b/src/Vtk/Math/vtkContainerBox.h
@@ -59,7 +59,7 @@ public:
  /**
   * @brief Synchronizes the model from the VTK representation (VTK→model).
   */
-  virtual void SyncFromVtk() override;
+

  virtual uLib::Object *GetContent() const override {
    return (uLib::Object *)m_model.get();
--- a/src/Vtk/Math/vtkCylinder.cpp
+++ b/src/Vtk/Math/vtkCylinder.cpp
@@ -44,8 +44,7 @@ Cylinder::Cylinder(Cylinder::Content *content)
 }

 Cylinder::~Cylinder() {
-  if (m_Actor) m_Actor->Delete();
-  if (m_VtkAsm) m_VtkAsm->Delete();
+  m_UpdateSignal.disconnect();
 }

 void Cylinder::Update() {
@@ -85,26 +84,13 @@ void Cylinder::Update() {
  this->Prop3D::Update();
 }

-void Cylinder::SyncFromVtk() {
-  if (!this->m_model) return;

-  vtkProp3D* root = this->GetProxyProp();
-  if (!root) return;
-
-  // VTK -> Model: Extract new world TRS from proxy
-  vtkMatrix4x4* rootMat = root->GetUserMatrix();  
-  Matrix4f vtkWorld = VtkToMatrix4f(rootMat);
-  
-  // Directly sync model from the world matrix
-  this->m_model->FromMatrix(vtkWorld);
-  this->m_model->Updated(); 
-}

 void Cylinder::InstallPipe() {
  if (!this->m_model)
    return;

-  m_VtkAsm = ::vtkAssembly::New();
+  m_VtkAsm = vtkSmartPointer<::vtkAssembly>::New();
  this->SetProp(m_VtkAsm);

  vtkNew<vtkCylinderSource> cylinder;
@@ -112,7 +98,7 @@ void Cylinder::InstallPipe() {
  cylinder->SetHeight(1.0);
  cylinder->SetResolution(32);

-  m_Actor = vtkActor::New();
+  m_Actor = vtkSmartPointer<vtkActor>::New();
  vtkNew<vtkTransform> alignment;
  m_Actor->SetUserTransform(alignment);

--- a/src/Vtk/Math/vtkCylinder.h
+++ b/src/Vtk/Math/vtkCylinder.h
@@ -30,6 +30,7 @@
 #include "Math/Cylinder.h"
 #include "Vtk/uLibVtkInterface.h"
 #include <vtkActor.h>
+#include <vtkSmartPointer.h>
 class vtkAssembly;

 namespace uLib {
@@ -53,7 +54,7 @@ public:
  virtual void Update() override;

  /** Synchronizes the uLib model matrix with the VTK actor specifically for gizmo interactions */
-  virtual void SyncFromVtk() override;
+

  virtual uLib::Object *GetContent() const override {
    return (uLib::Object *)m_model.get();
@@ -63,8 +64,8 @@ protected:
  /** Sets up the VTK visualization pipeline */
  virtual void InstallPipe();

-  vtkActor *m_Actor;
-  ::vtkAssembly *m_VtkAsm;
+  vtkSmartPointer<vtkActor> m_Actor;
+  vtkSmartPointer<::vtkAssembly> m_VtkAsm;
  uLib::Connection m_UpdateSignal;
 };

--- a/src/Vtk/Math/vtkVoxImage.cpp
+++ b/src/Vtk/Math/vtkVoxImage.cpp
@@ -308,17 +308,7 @@ void VoxImage::serialize_display(uLib::Archive::display_properties_archive & ar,
      {"MIP", "Composite", "Composite Shaded", "MIP Bone", "MIP Hot", "Additive"});
 }

-void VoxImage::SyncFromVtk() {
-  if (auto *root = this->GetProxyProp()) {
-    vtkMatrix4x4 *rootMat = root->GetUserMatrix();
-    if (rootMat) {
-      Matrix4f vtkLocal = VtkToMatrix4f(rootMat);
-      // Synchronize TRS from VTK, compensating for local volume offset
-      this->m_model->FromMatrix(vtkLocal); // * this->m_model->GetLocalMatrix().inverse());
-      this->m_model->Updated();
-    }
-  }
-}
+

 void VoxImage::Update() {
  if (auto *root = vtkProp3D::SafeDownCast(this->GetProp())) {
--- a/src/Vtk/Math/vtkVoxImage.h
+++ b/src/Vtk/Math/vtkVoxImage.h
@@ -77,7 +77,7 @@ public:
  void RescaleShaderRange();

  void Update() override;
-  void SyncFromVtk() override;
+
  void serialize_display(uLib::Archive::display_properties_archive &ar,
                         const unsigned int version = 0) override;

--- a/src/Vtk/uLibVtkInterface.cxx
+++ b/src/Vtk/uLibVtkInterface.cxx
@@ -97,11 +97,24 @@ public:
        m_HighlightMode(Prop3D::HighlightPlain)
    {
        m_Color = Vector3d(-1, -1, -1);
+        m_PrevMatrix = vtkSmartPointer<vtkMatrix4x4>::New();
+        m_PrevMatrix->Identity();
    }

    ~Prop3DData() {
-        // No manual Delete needed for smart pointers
-
+        if (m_Renderers) {
+            m_Renderers->InitTraversal();
+            for (int i = 0; i < m_Renderers->GetNumberOfItems(); ++i) {
+                vtkRenderer* ren = m_Renderers->GetNextItem();
+                if (ren) {
+                    if (m_Prop) ren->RemoveViewProp(m_Prop);
+                    if (m_OutlineActor) ren->RemoveActor(m_OutlineActor);
+                    if (m_CubeAxesActor) ren->RemoveActor(m_CubeAxesActor);
+                    if (m_HighlightActor) ren->RemoveActor(m_HighlightActor);
+                }
+            }
+            m_Renderers->RemoveAllItems();
+        }
    }

    Prop3D *m_Prop3D;
@@ -128,6 +141,8 @@ public:

    int  m_HighlightMode; // 0: Plain, 1: Corners

+    vtkSmartPointer<vtkMatrix4x4> m_PrevMatrix;
+
    // 
    TRS m_Transform;

@@ -289,6 +304,7 @@ public:
                        vtkNew<vtkMatrix4x4> vwm;
                        Matrix4fToVtk(tr->GetWorldMatrix(), vwm);
                        m_HighlightActor->SetUserMatrix(vwm);
+                        m_PrevMatrix->DeepCopy(vwm);
                    }
                }
            }
@@ -620,6 +636,7 @@ void Prop3D::ApplyProp3DTransform(vtkProp3D* prop)
            Matrix4fToVtk(tr->GetMatrix(), m);
            prop->SetUserMatrix(m);
            prop->Modified();
+            pd->m_PrevMatrix->DeepCopy(m);
        }
    }
 }
@@ -630,7 +647,18 @@ void Prop3D::SyncFromVtk()
        if (auto* tr = dynamic_cast<uLib::TRS*>(content)) {
            if (auto* proxy = this->GetProxyProp()) {
                if (vtkMatrix4x4* mat = proxy->GetUserMatrix()) {
-                    tr->FromMatrix(VtkToMatrix4f(mat));
+                    // Calculate Delta: currentMatrix * Inv(m_PrevMatrix)
+                    vtkNew<vtkMatrix4x4> invPrev;
+                    vtkMatrix4x4::Invert(pd->m_PrevMatrix, invPrev);
+                    
+                    vtkNew<vtkMatrix4x4> delta;
+                    vtkMatrix4x4::Multiply4x4(mat, invPrev, delta);
+
+                    // Apply delta to world matrix
+                    Matrix4f nextWorldMatrix = VtkToMatrix4f(delta) * tr->GetWorldMatrix();
+                    tr->SetWorldMatrix(nextWorldMatrix);
+                    
+                    pd->m_PrevMatrix->DeepCopy(mat);
                    content->Updated();
                }
            }
--- a/src/Vtk/vtkObjectsContext.cpp
+++ b/src/Vtk/vtkObjectsContext.cpp
@@ -26,15 +26,17 @@ ObjectsContext::ObjectsContext(uLib::ObjectsContext *context)
    : m_Context(context), m_Assembly(::vtkAssembly::New()) {
  this->SetProp(m_Assembly);
  if (m_Context) {
-    Object::connect(m_Context, &uLib::ObjectsContext::ObjectAdded, this,
+    m_AddedConnection = Object::connect(m_Context, &uLib::ObjectsContext::ObjectAdded, this,
                    &ObjectsContext::OnObjectAdded);
-    Object::connect(m_Context, &uLib::ObjectsContext::ObjectRemoved, this,
+    m_RemovedConnection = Object::connect(m_Context, &uLib::ObjectsContext::ObjectRemoved, this,
                    &ObjectsContext::OnObjectRemoved);
    this->Synchronize();
  }
 }

 ObjectsContext::~ObjectsContext() {
+  m_AddedConnection.disconnect();
+  m_RemovedConnection.disconnect();
  for (auto const &[obj, prop3d] : m_Prop3Ds) {
    delete prop3d;
  }
--- a/src/Vtk/vtkObjectsContext.h
+++ b/src/Vtk/vtkObjectsContext.h
@@ -51,6 +51,8 @@ private:
  uLib::ObjectsContext *m_Context;
  std::map<uLib::Object*, Prop3D*> m_Prop3Ds;
  vtkAssembly *m_Assembly;
+  uLib::Connection m_AddedConnection;
+  uLib::Connection m_RemovedConnection;
 };

 } // namespace Vtk
--- a/src/Vtk/vtkQViewport.cpp
+++ b/src/Vtk/vtkQViewport.cpp
@@ -104,6 +104,9 @@ QViewport::QViewport(QWidget* parent)

 QViewport::~QViewport()
 {
+    if (m_VtkWidget && m_VtkWidget->renderWindow()) {
+        m_VtkWidget->renderWindow()->RemoveRenderer(this->GetRenderer());
+    }
 }

 void QViewport::SetupPipeline()
--- a/src/Vtk/vtkViewport.cpp
+++ b/src/Vtk/vtkViewport.cpp
@@ -123,9 +123,10 @@ void Viewport::SetupPipeline(vtkRenderWindowInteractor* iren)
    iren->SetInteractorStyle(style);

    // Corner annotation
-    SetFontColor(Vector3d(1.0, 1.0, 1.0));
-    SetFont(FontConfig("Arial", 10));
+    pv->m_Annotation->GetTextProperty()->SetColor(1, 1, 1);
+    pv->m_Annotation->GetTextProperty()->SetFontFamilyToArial();
    pv->m_Annotation->GetTextProperty()->SetOpacity(0.5);
+    pv->m_Annotation->SetMaximumFontSize(10);
    pv->m_Annotation->SetText(0, "uLib VTK viewer.");
    pv->m_Renderer->AddViewProp(pv->m_Annotation);

@@ -602,44 +603,6 @@ bool Viewport::GetParallelProjection() const
    return false;
 }

-void Viewport::SetFont(const FontConfig& font) {
-    if (!pv->m_Annotation) return;
-    auto* prop = pv->m_Annotation->GetTextProperty();
-    if (font.family == "Arial") prop->SetFontFamilyToArial();
-    else if (font.family == "Courier") prop->SetFontFamilyToCourier();
-    else if (font.family == "Times") prop->SetFontFamilyToTimes();
-    else prop->SetFontFamilyToArial(); // fallback
-
-    pv->m_Annotation->SetMaximumFontSize(font.size);
-    prop->SetBold(font.bold);
-    prop->SetItalic(font.italic);
-    this->Render();
-}
-
-FontConfig Viewport::GetFont() const {
-    if (!pv->m_Annotation) return FontConfig();
-    auto* prop = pv->m_Annotation->GetTextProperty();
-    FontConfig f;
-    f.family = prop->GetFontFamilyAsString();
-    f.size = pv->m_Annotation->GetMaximumFontSize();
-    f.bold = prop->GetBold();
-    f.italic = prop->GetItalic();
-    return f;
-}
-
-void Viewport::SetFontColor(const Vector3d& color) {
-    if (!pv->m_Annotation) return;
-    pv->m_Annotation->GetTextProperty()->SetColor(color.x(), color.y(), color.z());
-    this->Render();
-}
-
-Vector3d Viewport::GetFontColor() const {
-    if (!pv->m_Annotation) return Vector3d(1,1,1);
-    double c[3];
-    pv->m_Annotation->GetTextProperty()->GetColor(c);
-    return Vector3d(c[0], c[1], c[2]);
-}
-
 void Viewport::SetGridAxis(Axis axis)
 {
    m_GridAxis = axis;
--- a/src/Vtk/vtkViewport.h
+++ b/src/Vtk/vtkViewport.h
@@ -4,8 +4,6 @@
 #include "uLibVtkInterface.h"
 #include <vector>
 #include <map>
-#include "Core/FontConfig.h"
-#include "Math/Dense.h"

 namespace uLib { class Object; }

@@ -85,12 +83,6 @@ public:
    void SetParallelProjection(bool parallel);
    bool GetParallelProjection() const;

-    // Font configuration
-    void SetFont(const FontConfig& font);
-    FontConfig GetFont() const;
-    void SetFontColor(const Vector3d& color);
-    Vector3d GetFontColor() const;
-
 protected:
    void SetupPipeline(vtkRenderWindowInteractor* iren);

--- a/src/Vtk/vtkViewportProperties.h
+++ b/src/Vtk/vtkViewportProperties.h
@@ -1,56 +0,0 @@
-#ifndef ULIB_VTK_VIEWPORTPROPERTIES_H
-#define ULIB_VTK_VIEWPORTPROPERTIES_H
-
-#include "uLibVtkInterface.h"
-#include "vtkViewport.h"
-#include "Core/Property.h"
-
-namespace uLib {
-namespace Vtk {
-
-/**
- * @class ViewportProperties
- * @brief Exposes Viewport settings as a uLib::Object for the properties panel.
- */
-class ViewportProperties : public uLib::Object {
-public:
-    uLibTypeMacro(ViewportProperties, uLib::Object)
-
-    ViewportProperties(Viewport* vp) : m_Viewport(vp)
-    {
-        SetInstanceName("Viewport Settings");
-
-        // Initialize properties from viewport
-        Font.Set(vp->GetFont());
-        Color.Set(vp->GetFontColor());
-        GridVisible.Set(vp->GetGridVisible());
-        Parallel.Set(vp->GetParallelProjection());
-
-        // Connect properties to viewport setters
-        uLib::Object::connect(&Font, &Property<FontConfig>::Updated, [this](){
-            if (m_Viewport) m_Viewport->SetFont(Font.Get());
-        });
-        uLib::Object::connect(&Color, &Property<Vector3d>::Updated, [this](){
-            if (m_Viewport) m_Viewport->SetFontColor(Color.Get());
-        });
-        uLib::Object::connect(&GridVisible, &Property<bool>::Updated, [this](){
-            if (m_Viewport) m_Viewport->SetGridVisible(GridVisible.Get());
-        });
-        uLib::Object::connect(&Parallel, &Property<bool>::Updated, [this](){
-            if (m_Viewport) m_Viewport->SetParallelProjection(Parallel.Get());
-        });
-    }
-
-    ULIB_PROPERTY(FontConfig, Font, FontConfig())
-    ULIB_PROPERTY(Vector3d, Color, Vector3d(1.0, 1.0, 1.0))
-    ULIB_PROPERTY(bool, GridVisible, true)
-    ULIB_PROPERTY(bool, Parallel, false)
-
-private:
-    Viewport* m_Viewport;
-};
-
-} // namespace Vtk
-} // namespace uLib
-
-#endif // ULIB_VTK_VIEWPORTPROPERTIES_H