not working yet

.gitignore

@@ -20,6 +20,3 @@ test_boost.cpp
 .claude/settings.json
 build_output.log
 configure_output.log
-test.xml
-test_ref_smartpointer.xml
-test_ref.xml

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));

app/gcompose/src/ContextPanel.cpp

@@ -10,7 +10,6 @@
 #include <QList>
 #include <QShortcut>
 #include <QItemSelectionModel>
-#include <functional>
 
 ContextPanel::ContextPanel(QWidget* parent) 
     : QWidget(parent)
@@ -59,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);
 
@@ -106,34 +103,15 @@ void ContextPanel::selectObject(uLib::Object* obj) {
         return;
     }
     
-    // Recursive search helper
+    for (int i = 0; i < m_model->rowCount(); ++i) {
-    std::function<QModelIndex(const QModelIndex&)> findIdx = [&](const QModelIndex& parent) -> QModelIndex {
+        QModelIndex idx = m_model->index(i, 0);
-        for (int i = 0; i < m_model->rowCount(parent); ++i) {
+        if (idx.internalPointer() == obj) {
-            QModelIndex idx = m_model->index(i, 0, parent);
+            QSignalBlocker blocker(m_treeView->selectionModel());
-            if (idx.internalPointer() == obj) return idx;
+            m_treeView->selectionModel()->select(idx, QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows);
-            
+            m_treeView->scrollTo(idx);
-            if (m_model->rowCount(idx) > 0) {
+            m_propertiesPanel->setObject(obj); // Explicitly update properties too
-                QModelIndex childIdx = findIdx(idx);
+            return;
-                if (childIdx.isValid()) return childIdx;
-            }
         }
-        return QModelIndex();
-    };
-
-    QModelIndex targetIdx = findIdx(QModelIndex());
-    if (targetIdx.isValid()) {
-        QSignalBlocker blocker(m_treeView->selectionModel());
-        
-        // Expand parents so the selection is visible
-        QModelIndex p = targetIdx.parent();
-        while (p.isValid()) {
-            m_treeView->expand(p);
-            p = p.parent();
-        }
-
-        m_treeView->selectionModel()->select(targetIdx, QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows);
-        m_treeView->scrollTo(targetIdx);
-        m_propertiesPanel->setObject(obj);
     }
 }
 

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);

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");
-        StyleManager::applyStyle(qApp, theme == uLib::Qt::Settings::Dark ? "dark" : "bright", guiFont);
 
-        // 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();
         }
     }

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

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

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

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) {

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;

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);

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) {
+                if (m_Prop->Get() != v) m_Prop->Set(v);
-                    m_Prop->Set(v);
-                    emit updated();
-                }
             });
         }
         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;

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);
+        // Use deleteLater() instead of delete to avoid crashes during repaint cycles
-        delete m_viewport;
+        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");

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

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, 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, QComboBox:focus { border-color: #0078d7; }
+QDoubleSpinBox:focus, QSpinBox:focus, QLineEdit: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; }
 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, 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, QComboBox:focus { border-color: #0078d7; }
+QDoubleSpinBox:focus, QSpinBox:focus, QLineEdit: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; }
 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;
+    if (themeName == "bright") {
-    
+        app->setStyleSheet(BRIGHT_THEME);
-    QString fontStyle = QString(
+    } else {
-        "QWidget { font-family: '%1'; font-size: %2pt; }\n"
+        app->setStyleSheet(DARK_THEME); // default
-    ).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);
 }

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

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");

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);

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();
+    StyleManager::applyStyle(&app, "dark");
-    auto initialGuiFont = uLib::Qt::Settings::Instance().GetGuiFont();
-    StyleManager::applyStyle(&app, theme == uLib::Qt::Settings::Dark ? "dark" : "bright", initialGuiFont);
     std::cout << "Starting gcompose Qt application..." << std::endl;
 
     // ContainerBox world_box(Vector3f(1, 1, 1));

build.log

@@ -1,36 +1 @@
-make: Entering directory '/home/rigoni/devel/cmt/ulib/build'
+ninja: error: loading 'build.ninja': No such file or directory
-[ 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'

condaenv.yml

@@ -9,7 +9,7 @@ dependencies:
   - root
   - vtk=9.4 # VTK 9.4
   - pybind11
-#  - boost=1.86.0 # requested by VTK 9.4
+  #- boost=1.86.0 # requested by VTK 9.4
   - ninja
   - clang
   - clangxx

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
+# 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 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 ).

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

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

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;
 }

src/Core/ObjectFactory.h

@@ -67,25 +67,6 @@ public:
   static uLib::ObjectRegistrar<className> ULIB_REG_CONCAT(                     \
       g_ObjectRegistrar_, __LINE__)(registeredName);
 
-
-
-
-
-/**
- * @brief Utility wrapper that bridges factory registration and shared ownership.
- * 
- * ObjectWrapper provides a high-level interface to handle objects that can be
- * both registered in the ObjectFactory and managed through shared ownership
- * using SmartPointer.
- * 
- * One of its key roles is static registration: when instantiated with a 
- * class name string, it automatically registers a factory function for type T 
- * in the ObjectFactory singleton. This allows the factory to subsequently 
- * create instances of T dynamically by name.
- * 
- * It supports multiple initialization paths, including factory-based 
- * construction and direct model wrapping.
- */
 template <typename T> class ObjectWrapper {
 public:
   ObjectWrapper(const std::string &className) {
@@ -94,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>>>
@@ -121,7 +101,7 @@ public:
 
   T &operator*() const { return *m_model; }
 
-  T *GetWrapped() const { return m_model.get(); }
+  T *get() const { return m_model.get(); }
 
   bool operator==(const ObjectWrapper &other) const {
     return m_model == other.m_model;

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);

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>

src/Core/SmartPointer.h

@@ -30,14 +30,6 @@
 #include <functional>
 #include <type_traits>
 #include <utility>
-#include <boost/serialization/access.hpp>
-#include <boost/serialization/nvp.hpp>
-#include <boost/serialization/split_member.hpp>
-#include <boost/serialization/vector.hpp>
-#include <boost/serialization/string.hpp>
-
-#include <boost/serialization/access.hpp>
-#include <boost/serialization/nvp.hpp>
 
 namespace uLib {
 
@@ -54,25 +46,16 @@ class SmartPointer {
 public:
     using element_type = T;
 
-    /**
-     * @brief Default constructor.
-     * Allocates a new T following legacy behavior.
-     */
-    SmartPointer() : m_counter(nullptr) {
-        if constexpr (std::is_default_constructible_v<T>) {
-            m_counter = new ReferenceCounter(new T());
-        }
-    }
-
-    /**
-     * @brief Constructor from nullptr.
-     */
-    SmartPointer(std::nullptr_t) noexcept : m_counter(nullptr) {}
-
     /**
      * @brief Constructor from raw pointer.
+     * If ptr is nullptr, a new T is allocated (legacy behavior).
      */
-    explicit SmartPointer(T* ptr) : m_counter(nullptr) {
+    explicit SmartPointer(T* ptr = nullptr) : m_counter(nullptr) {
+        if (!ptr) {
+            if constexpr (std::is_default_constructible_v<T>) {
+                ptr = new T(); 
+            }
+        }
         if (ptr) m_counter = new ReferenceCounter(ptr);
     }
 
@@ -127,11 +110,6 @@ public:
         return *this;
     }
 
-    SmartPointer& operator=(T* ptr) noexcept {
-        reset(ptr);
-        return *this;
-    }
-
     /**
      * @brief Move assignment.
      */
@@ -182,7 +160,6 @@ public:
      * @brief Returns the raw pointer.
      */
     T* get() const noexcept { return m_counter ? m_counter->ptr : nullptr; }
-    T* Get() const noexcept { return get(); }
 
     /**
      * @brief Implicit conversion to raw pointer (legacy compatibility).
@@ -206,25 +183,7 @@ public:
      */
     explicit operator bool() const noexcept { return get() != nullptr; }
 
-    BOOST_SERIALIZATION_SPLIT_MEMBER()
-
-    template <class Archive>
-    void save(Archive& ar, const unsigned int /*version*/) const {
-        ar & boost::serialization::make_nvp("counter", m_counter);
-    }
-
-    template <class Archive>
-    void load(Archive& ar, const unsigned int /*version*/) {
-        release();
-        ar & boost::serialization::make_nvp("counter", m_counter);
-        if (m_counter) {
-            m_counter->count.fetch_add(1, std::memory_order_relaxed);
-        }
-    }
-
 private:
-    friend class boost::serialization::access;
-
     struct ReferenceCounter {
         T* ptr;
         std::atomic<uint32_t> count;
@@ -236,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;

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; 

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;

src/HEP/Geant/Matter.cpp

@@ -12,7 +12,7 @@ Material::Material(const char *name) : m_G4Data(nullptr) {
 }
 
 Material::~Material() {
-    // G4Material is managed by G4MaterialStore
+    if(m_G4Data) delete m_G4Data;
 }
 
 void Material::SetFromNist(const char *name) {

src/HEP/Geant/Matter.h

@@ -76,10 +76,10 @@ public:
     void SetFromNist(const char *name);
 
     template <typename Ar>
-    void serialize(Ar &ar, const unsigned int /*version*/) {
+    void serialize(Ar &ar) {
-        ar & HRP("name", std::string(m_G4Data->GetName()));
+        ar & HRP("name", m_G4Data->GetName());
-        ar & HRP("density", (double)m_G4Data->GetDensity());
+        ar & HRP("density", m_G4Data->GetDensity());
-        ar & serialization::make_hrp_enum("state", (int)m_G4Data->GetState(), {"Undefined", "Solid", "Liquid", "Gas"});
+        ar & serialization::make_hrp_enum("state", m_G4Data->GetState(), {"Undefined", "Solid", "Liquid", "Gas"});
     }
     
     G4Material *GetG4Material() { return m_G4Data; }

src/HEP/Geant/Scene.cpp

@@ -15,12 +15,10 @@
 #include "Solid.h"
 
 #include "Scene.h"
-#include "Matter.h"
 #include "PhysicsList.hh"
 #include "ActionInitialization.hh"
 #include "SimulationContext.h"
 #include "HEP/Detectors/DetectorChamber.h"
-#include "HEP/Geant/EmitterPrimary.hh"
 
 namespace uLib {
 namespace Geant {
@@ -50,14 +48,13 @@ class SceneImpl {
 public:
   SceneImpl() : m_RunManager(G4RunManagerFactory::CreateRunManager(G4RunManagerType::Serial)),
                 m_Emitter(nullptr),
-                m_World(nullptr),
-                m_WorldBox(new ContainerBox()),
                 m_InitCalled(false) {
     m_RunManager->SetUserInitialization(new PhysicsList);
   }
 
   ~SceneImpl() { 
     if (m_RunManager) delete m_RunManager; 
+    // m_World deletion is handled in Scene destructor or here
   }
 
   void Initialize() {
@@ -70,29 +67,17 @@ public:
     m_InitCalled = true;
   }
 
-  Vector<Solid*> m_Solids;
+  Vector<Solid *> m_Solids;
-  Vector<SmartPointer<PhysicalVolume>> m_Volumes;
+  Solid *m_World = nullptr;
-  PhysicalVolume* m_World;
+  ContainerBox m_WorldBox;
-  SmartPointer<ContainerBox> m_WorldBox;
   G4RunManager *m_RunManager;
-  SmartPointer<EmitterPrimary> m_Emitter;
+  EmitterPrimary *m_Emitter;
   SimulationContext m_Context;
   bool m_InitCalled;
 };
 
 G4VPhysicalVolume *SceneDetectorConstruction::Construct() {
-  printf("SceneDetectorConstruction::Construct() called\n");
+  return m_Owner->m_World->GetPhysical();
-  if (!m_Owner->m_World) {
-    printf("ERROR: m_World is NULL in SceneDetectorConstruction::Construct()\n");
-    return nullptr;
-  }
-  G4VPhysicalVolume *pv = m_Owner->m_World->GetG4PhysicalVolume();
-  if (!pv) {
-    printf("ERROR: GetG4PhysicalVolume returned NULL for world!\n");
-  } else {
-    printf("SceneDetectorConstruction::Construct() returns physical volume: %s\n", pv->GetName().c_str());
-  }
-  return pv;
 }
 
 Scene::Scene() {
@@ -101,51 +86,40 @@ Scene::Scene() {
 }
 
 Scene::~Scene() {
+    // Delete solids
+    for(auto s : d->m_Solids) delete s; 
     delete d;
 }
 
-void Scene::AddVolume(PhysicalVolume *volume, PhysicalVolume *parent) { 
+void Scene::AddSolid(Solid *solid, Solid *parent) { 
-  d->m_Volumes.push_back(SmartPointer<PhysicalVolume>(volume));
+  d->m_Solids.push_back(solid);
-  
+  if (!d->m_World) {
-  // Track solids for GetSolids() API
+    d->m_World = solid;
-  if (volume->GetLogical() && volume->GetLogical()->GetSolid()) {
+  } else {
-    d->m_Solids.push_back(volume->GetLogical()->GetSolid());
+    solid->SetParent(parent ? parent : d->m_World);
   }
+}
+
+const Solid* Scene::GetWorld() const { return d->m_World; }
+ContainerBox* Scene::GetWorldBox() const { return &d->m_WorldBox; }
+const Vector<Solid*>& Scene::GetSolids() const { return d->m_Solids; }
+
+void Scene::ConstructWorldBox(const Vector3f &size, const char *material) {
+  d->m_WorldBox.Scale(size);
+  d->m_WorldBox.SetPosition(-size/2.0f);
 
   if (!d->m_World) {
-    d->m_World = volume;
+    d->m_World = new Solid("World");
+    d->m_World->SetNistMaterial(material);
+    AddSolid(d->m_World);
   }
-}
 
-const Solid* Scene::GetWorld() const { 
+  G4Box *solidWorld = new G4Box("World", 0.5 * size(0), 0.5 * size(1), 0.5 * size(2));
-  return d->m_World ? d->m_World->GetLogical()->GetSolid() : nullptr; 
+  G4LogicalVolume *logicWorld = new G4LogicalVolume(solidWorld, d->m_World->GetMaterial(), d->m_World->GetName());
-}
+  d->m_World->SetLogical(logicWorld);
   
-ContainerBox* Scene::GetWorldBox() const { return d->m_WorldBox.Get(); }
+  G4PVPlacement *physWorld = new G4PVPlacement(nullptr, G4ThreeVector(0, 0, 0), logicWorld, d->m_World->GetName(), 0, false, 0, true);
-
+  d->m_World->SetPhysical(physWorld);
-const Vector<Solid*>& Scene::GetSolids() const { 
-    return d->m_Solids; 
-}
-
-const Vector<SmartPointer<PhysicalVolume>>& Scene::GetVolumes() const {
-    return d->m_Volumes;
-}
-
-void Scene::ConstructWorldBox(const Vector3f &size, const char *materialName) {
-  d->m_WorldBox->SetSize(size);
-
-  if (!d->m_World) {
-    BoxSolid *worldSolid = new BoxSolid("World", d->m_WorldBox);
-    Material *material = new Material(materialName);
-    
-    LogicalVolume *worldLogical = new LogicalVolume("World");
-    worldLogical->SetSolid(worldSolid);
-    worldLogical->SetMaterial(material);
-    worldLogical->Update();
-    
-    d->m_World = new PhysicalVolume("World", worldLogical);
-    AddVolume(d->m_World);
-  }
 }
 
 void Scene::SetEmitter(EmitterPrimary *emitter) { d->m_Emitter = emitter; }
@@ -172,8 +146,7 @@ void Scene::RunDetectorSimulation(int nEvents, Vector<MuonEvent> &results) {
   
   // Find detector planes
   d->m_Context.detectorPlanes.clear();
-  for (PhysicalVolume* v : d->m_Volumes) {
+  for (Solid* s : d->m_Solids) {
-      Solid *s = v->GetLogical()->GetSolid();
       if (BoxSolid* bs = dynamic_cast<BoxSolid*>(s)) {
           if (DetectorChamber* dc = dynamic_cast<DetectorChamber*>(bs->GetObject())) {
               d->m_Context.detectorPlanes.push_back(dc->GetWorldProjectionPlane());

src/HEP/Geant/Scene.h

@@ -48,7 +48,7 @@ public:
   Scene();
   ~Scene();
 
-  void AddVolume(PhysicalVolume *volume, PhysicalVolume *parent = nullptr);
+  void AddSolid(Solid *solid, Solid *parent = nullptr);
   
   void ConstructWorldBox(const Vector3f &size, const char *material);
 
@@ -60,9 +60,6 @@ public:
   /// Get the list of solids in the scene
   const Vector<Solid*>& GetSolids() const;
 
-  /// Get the list of physical volumes in the scene
-  const Vector<SmartPointer<PhysicalVolume>>& GetVolumes() const;
-
   /// Set the primary generator (emitter) for the simulation.
   /// The Scene does NOT take ownership of the emitter.
   void SetEmitter(EmitterPrimary *emitter);

src/HEP/Geant/Solid.cpp

@@ -35,14 +35,12 @@
 #include <Geant4/G4TriangularFacet.hh>
 #include <Geant4/G4Box.hh>
 #include <Geant4/G4PVPlacement.hh>
-#include <cstddef>
 
 
 #include "Math/Dense.h"
 #include "Math/Transform.h"
 
 #include "Solid.h"
-#include "uLibInterface.hh"
 
 namespace uLib {
 namespace Geant {
@@ -56,133 +54,143 @@ public:
   
 };
 
-Solid::Solid() {}
+Solid::Solid()
+    : m_Name("unnamed_solid"), m_Material(NULL), m_Logical(NULL), m_Physical(NULL), 
+      m_Position(new G4ThreeVector(0,0,0)), m_Rotation(NULL) {}
 
-Solid::Solid(const char *name) : m_Name(name) {}
+Solid::Solid(const char *name)
+    : m_Name(name), m_Material(NULL), m_Logical(NULL), m_Physical(NULL), 
+      m_Position(new G4ThreeVector(0,0,0)), m_Rotation(NULL) {}
 
-Solid::~Solid() {}
+Solid::~Solid() {
-
+  if (m_Position) delete m_Position;
-void Solid::Update() {}
+  if (m_Rotation) delete m_Rotation;
-
-////////////////////////////////////////////////////////////////////////////////
-//// LOGICAL VOLUME ////////////////////////////////////////////////////////////
-
-LogicalVolume::LogicalVolume() : m_Logical(nullptr) {}
-
-LogicalVolume::LogicalVolume(const char *name) : m_Name(name), m_Logical(nullptr) {}
-
-LogicalVolume::~LogicalVolume() {
-  // G4LogicalVolume is usually managed by G4LogicalVolumeStore
 }
 
-void LogicalVolume::Update() {
+void Solid::SetNistMaterial(const char *name) {
-  if (m_Logical) {
+  G4NistManager *nist = G4NistManager::Instance();
-    if (m_Material) m_Logical->SetMaterial(m_Material->GetG4Material());
+  G4Material *mat = nist->FindOrBuildMaterial(name);
-    if (m_Solid) m_Logical->SetSolid(m_Solid->GetG4Solid());
+  if (mat) SetMaterial(mat);
-  } else {
+}
-    if (m_Material && m_Solid && m_Solid->GetG4Solid()) {
+
-      m_Logical = new G4LogicalVolume(m_Solid->GetG4Solid(), m_Material->GetG4Material(), m_Name);
+void Solid::SetMaterial(G4Material *material) {
+  if (material) {
+    m_Material = material;
+    if (m_Logical) {
+      m_Logical->SetMaterial(material);
+    } else if (GetG4Solid()) {
+      m_Logical = new G4LogicalVolume(GetG4Solid(), m_Material, GetName());
     }
   }
 }
 
-////////////////////////////////////////////////////////////////////////////////
+void Solid::SetTransform(Matrix4f transform) {
-//// PHYSICAL VOLUME ///////////////////////////////////////////////////////////
+    uLib::AffineTransform t;
+  t.SetMatrix(transform);
 
-PhysicalVolume::PhysicalVolume() 
+    // 2. Extract position and rotation for Geant4
-    : m_Name("unnamed_pv"), m_Logical(), m_Physical(nullptr) {}
+    Vector3f pos = t.GetPosition();
+    if (!m_Position) m_Position = new G4ThreeVector();
+    *m_Position = G4ThreeVector(pos(0), pos(1), pos(2));
 
-PhysicalVolume::PhysicalVolume(LogicalVolume *logical) 
+    // Create a G4 rotation matrix from the 4x4 matrix
-    : m_Name("unnamed_pv"), m_Logical(logical), m_Physical(nullptr) {
+    Matrix3f m = t.GetRotation();
-    if (m_Logical) Object::connect(m_Logical.Get(), &Object::Updated, this, &PhysicalVolume::Update);
+    if (!m_Rotation) m_Rotation = new G4RotationMatrix();
+    m_Rotation->set(G4ThreeVector(m(0,0), m(1,0), m(2,0)), 
+                    G4ThreeVector(m(0,1), m(1,1), m(2,1)), 
+                    G4ThreeVector(m(0,2), m(1,2), m(2,2))); 
+
+    // 3. If object is already placed, update its transformation
+    if (m_Physical) {
+        m_Physical->SetTranslation(*m_Position);
+        m_Physical->SetRotation(m_Rotation);
+    }
+
+    std::cout << "Solid " << GetName() << " position: " << pos << " rotation: " << m << std::endl;
 }
 
-PhysicalVolume::PhysicalVolume(const char *name, LogicalVolume *logical)
+void Solid::SetParent(Solid *parent) {
-    : m_Name(name), m_Logical(logical), m_Physical(nullptr) {
+  if (!m_Logical) {
-    if (m_Logical) Object::connect(m_Logical.Get(), &Object::Updated, this, &PhysicalVolume::Update);
+    std::cerr << "logical volume not created for solid " << GetName() << std::endl;
-}
+    return;
-
-PhysicalVolume::~PhysicalVolume() {
-  // G4PVPlacement is usually managed by G4PhysicalVolumeStore
-}
-
-void PhysicalVolume::Update() {
-  if (!m_Logical) return;
-  m_Logical->Update();
-  
-  G4LogicalVolume *g4lv = m_Logical->GetG4LogicalVolume();
-  if (!g4lv) return;
-
-  G4Transform3D t = ToG4Transform(this->GetMatrix());
-  if (m_Physical) {
-    m_Physical->SetTranslation(t.getTranslation());
-    const G4RotationMatrix *oldRot = m_Physical->GetRotation();
-    if (oldRot) delete oldRot;
-    // SetRotation takes the rotation of the object relative to mother
-    // For G4PVPlacement initialized with G4Transform3D, it stores the INVERSE 
-    // of the rotation part of the transform.
-    m_Physical->SetRotation(new G4RotationMatrix(t.getRotation().inverse()));
-    m_Physical->SetLogicalVolume(g4lv);
-  } else {
-    m_Physical = new G4PVPlacement(t, g4lv, m_Name, nullptr, false, 0);
   }
+
+  if(m_Physical) {
+    std::cerr << "physical volume already created for solid " << GetName() << std::endl;
+    return;
+  }
+
+  G4LogicalVolume* parentLogical = nullptr;
+  if (parent) {
+    parentLogical = parent->GetLogical();
+    if (!parentLogical) {
+      std::cerr << "parent logical volume not created for solid " << parent->GetName() << std::endl;
+      return;
+    }
+  }
+
+  // G4PVPlacement
+  m_Physical = new G4PVPlacement(
+      m_Rotation,            // Rotation
+      *m_Position,           // Position (translation) inside the parent
+      m_Logical,             // The logical volume of this solid (the child)
+      GetName(),             // Name of the physical volume
+      parentLogical,         // The logical volume of the parent (nullptr if it's the World volume)
+      false,                 // Boolean operations (usually false)
+      0,                     // Copy number
+      true                   // Check overlaps (useful to enable in debug phase)
+  );
 }
 
-////////////////////////////////////////////////////////////////////////////////
+
-//// TESSELLATED SOLID /////////////////////////////////////////////////////////
+
+
+
+
 
 TessellatedSolid::TessellatedSolid() 
-    : Solid("unnamed_tessellated"), m_Solid(new G4TessellatedSolid("unnamed_tessellated")) {}
+    : BaseClass("unnamed_tessellated"), m_Solid(new G4TessellatedSolid("unnamed_tessellated")) {}
 
 TessellatedSolid::TessellatedSolid(const char *name)
-    : Solid(name), m_Solid(new G4TessellatedSolid(name)) {}
+    : BaseClass(name), m_Solid(new G4TessellatedSolid(name)) {
-
+    }
-void TessellatedSolid::SetMesh(const TriangleMesh *mesh) {
-  this->m_Mesh = const_cast<TriangleMesh*>(mesh);
-  if (!mesh) return;
 
+void TessellatedSolid::SetMesh(TriangleMesh &mesh) {
+  this->m_Mesh = mesh;
   G4TessellatedSolid *ts = this->m_Solid;
-  for (size_t i = 0; i < mesh->Triangles().size(); ++i) {
+  for (int i = 0; i < mesh.Triangles().size(); ++i) {
-    const Vector3i &trg = mesh->Triangles().at(i);
+    const Vector3i &trg = mesh.Triangles().at(i);
     G4TriangularFacet *facet = new G4TriangularFacet(
-        DetectorsSolidImpl::getG4Vector3f(mesh->Points().at(trg(0))),
+        DetectorsSolidImpl::getG4Vector3f(mesh.Points().at(trg(0))),
-        DetectorsSolidImpl::getG4Vector3f(mesh->Points().at(trg(1))),
+        DetectorsSolidImpl::getG4Vector3f(mesh.Points().at(trg(1))),
-        DetectorsSolidImpl::getG4Vector3f(mesh->Points().at(trg(2))), ABSOLUTE);
+        DetectorsSolidImpl::getG4Vector3f(mesh.Points().at(trg(2))), ABSOLUTE);
     ts->AddFacet((G4VFacet *)facet);
   }
-  ts->SetSolidClosed(true);
+  if (this->m_Logical) {
+    this->m_Logical->SetSolid(ts);
+  }
 }
 
-void TessellatedSolid::Update() {}
+void TessellatedSolid::Update() {
+}
+
+
 
-////////////////////////////////////////////////////////////////////////////////
-//// BOX SOLID /////////////////////////////////////////////////////////////////
 
-BoxSolid::BoxSolid() : 
-    Solid(), 
-    m_ContainerBox(new ContainerBox()), 
-    m_Solid(new G4Box("unnamed_box", 1, 1, 1))
-  {}
 
 BoxSolid::BoxSolid(const char *name) : 
-    Solid(name), 
+    BaseClass(name), 
     m_ContainerBox(new ContainerBox()), 
     m_Solid(new G4Box(name, 1, 1, 1))
   {}
 
-BoxSolid::BoxSolid(const char *name, ContainerBox *box) : 
+BoxSolid::BoxSolid(const char *name, ContainerBox *box) : BaseClass(name) {
-    Solid(name),
+  m_Solid = new G4Box(name, 1, 1, 1);
-    m_ContainerBox(box),
+  m_ContainerBox = box;
-    m_Solid(new G4Box(name, 1, 1, 1)) {
+  Object::connect(box, &ContainerBox::Updated, this, &BoxSolid::Update);
-  if (box) Object::connect(box, &ContainerBox::Updated, this, &BoxSolid::Update);
+  if (m_Logical) {
-  Update();
+    m_Logical->SetSolid(m_Solid);
-}
+  }
-
-BoxSolid::BoxSolid(const char *name, SmartPointer<ContainerBox> box) : 
-    Solid(name),
-    m_ContainerBox(box),
-    m_Solid(new G4Box(name, 1, 1, 1)) {
-  if (box) Object::connect(box.Get(), &ContainerBox::Updated, this, &BoxSolid::Update);
   Update();
 }
 
@@ -192,7 +200,25 @@ void BoxSolid::Update() {
     m_Solid->SetXHalfLength(size(0) * 0.5);
     m_Solid->SetYHalfLength(size(1) * 0.5);
     m_Solid->SetZHalfLength(size(2) * 0.5);
+    
+    // Geant4 placement is relative to center. uLib Box is anchored at corner.
+    // 1. Get position and rotation (clean, without scale)
+    Vector3f pos = m_ContainerBox->GetPosition();
+    Matrix3f rot = m_ContainerBox->GetRotation();
+
+    // 2. Center = Corner + Rotation * (Half-Size)
+    // We must rotate the offset vector because uLib box can be rotated.
+    Vector3f center = pos + rot * (size * 0.5);
+
+    uLib::AffineTransform t;
+    t.SetPosition(center);
+    t.SetRotation(rot);
+    
+    this->SetTransform(t.GetMatrix());
   }
+
+
+
 }
 
 

src/HEP/Geant/Solid.h

@@ -28,15 +28,11 @@
 
 #include "Core/Object.h"
 #include "Geant/Matter.h"
-#include "Math/Transform.h"
 #include <Geant4/G4LogicalVolume.hh>
 #include "Math/ContainerBox.h"
 #include "Math/Dense.h"
 #include "Math/TriangleMesh.h"
 
-
-
-
 class G4Material;
 class G4LogicalVolume;
 class G4TessellatedSolid;
@@ -46,131 +42,54 @@ namespace uLib {
 namespace Geant {
 
 class Solid : public Object {
-
-  uLibTypeMacro(Solid, Object)
-  ULIB_SERIALIZE_ACCESS
-  ULIB_DECLARE_PROPERTIES(Solid)
-  
 public:
+  uLibTypeMacro(Solid, Object)
 
   Solid();
   Solid(const char *name);
   virtual ~Solid();
 
+  void SetNistMaterial(const char *name);
+  void SetMaterial(G4Material *material);
+  
+  void SetSizeUnit(const char *unit);
+  // Implementiamo SetParent qui, per tutti.
+  virtual void SetParent(Solid *parent); 
+
+  // Setters per la posizione (necessari per il piazzamento)
+  void SetTransform(Matrix4f transform); 
+
+  uLibGetMacro(Material, G4Material *) 
+  uLibGetSetMacro(Logical, G4LogicalVolume *)
+  uLibGetSetMacro(Physical, G4VPhysicalVolume *)
+
   virtual G4VSolid* GetG4Solid() const { return nullptr; }
 
-  inline const char *GetName() const { 
-    return m_Name.c_str(); 
-  }
-
-  template < typename Ar >
-  void serialize(Ar &ar, const unsigned int version) {
-    ar & HRP("Name", m_Name);
-  }
-
-
-public slots:
-  virtual void Update();
-
-protected:
-  std::string m_Name;
-};
-
-
-class LogicalVolume : public Object {
-  
-  uLibTypeMacro(LogicalVolume, Object)
-  ULIB_SERIALIZE_ACCESS
-  ULIB_DECLARE_PROPERTIES(LogicalVolume)
-  
-public:
-
-  LogicalVolume();
-  LogicalVolume(const char *name);
-  virtual ~LogicalVolume();
-  
-  virtual G4VSolid* GetG4Solid() const { return m_Solid ? m_Solid->GetG4Solid() : nullptr; }
-  Solid* GetSolid() const { return m_Solid.Get(); }
-
   inline const char *GetName() const { 
     return m_Logical ? m_Logical->GetName().c_str() : m_Name.c_str(); 
   }
 
-  void SetSolid(Solid *solid) { m_Solid = solid; }
-  void SetSolid(SmartPointer<Solid> solid) { m_Solid = solid; }
-  void SetMaterial(Material *material) { m_Material = material; }
-  void SetMaterial(SmartPointer<Material> material) { m_Material = material; }
-  
-  G4LogicalVolume* GetG4LogicalVolume() const { return m_Logical; }
-
   template < typename Ar >
   void serialize(Ar &ar, const unsigned int version) {
-    ar & HRP("Name", m_Name);
+    ar & m_Name;
-    ar & HRP("Material", m_Material);
-    ar & HRP("Solid", m_Solid);
   }
     
     
-public slots:
+
-  virtual void Update();
 
 protected:
-  std::string m_Name;
-  SmartPointer<Material> m_Material;
-  SmartPointer<Solid>    m_Solid;
 
+  std::string m_Name;
+  G4Material *m_Material;
   G4LogicalVolume *m_Logical;
+  G4VPhysicalVolume *m_Physical; // <-- Memorizza l'oggetto posizionato
+  G4ThreeVector *m_Position;      // <-- Offset rispetto al centro del padre
+  G4RotationMatrix* m_Rotation;  // <-- Rotazione rispetto al padre
 };
 
 
 
 
-class PhysicalVolume : public TRS {
-  
-  uLibTypeMacro(PhysicalVolume, TRS)
-  ULIB_SERIALIZE_ACCESS
-
-public:
-
-  PhysicalVolume();
-  PhysicalVolume(LogicalVolume *logical);
-  PhysicalVolume(const char *name, LogicalVolume *logical);
-  virtual ~PhysicalVolume();
-  
-  LogicalVolume* GetLogical() const { return m_Logical.Get(); }
-  
-  virtual G4VPhysicalVolume* GetG4PhysicalVolume() { 
-    if (!m_Physical) Update();
-    return m_Physical; 
-  }
-
-  const char* GetName() const { return m_Name.c_str(); }
-
-  template <typename Ar>
-  void serialize(Ar &ar, const unsigned int version) {
-    ar & boost::serialization::base_object<TRS>(*this);
-    ar & HRP("Name", m_Name);
-    ar & HRP("Logical", m_Logical);
-  }
-
-public slots:
-  void Update();
-
-
-protected:
-  std::string m_Name;
-  SmartPointer<LogicalVolume>  m_Logical;
-
-  G4VPhysicalVolume *m_Physical;
-
-  // ULIB_DECLARE_PROPERTIES(PhysicalVolume)
-};
-
-
-
-
-
-
 
 class TessellatedSolid : public Solid {
 public:
@@ -178,49 +97,47 @@ public:
 
   TessellatedSolid();
   TessellatedSolid(const char *name);
-  
+  void SetMesh(TriangleMesh &mesh);
-  void SetMesh(const TriangleMesh *mesh);
   uLibGetMacro(Solid, G4TessellatedSolid *) 
-  
   virtual G4VSolid* GetG4Solid() const override { return (G4VSolid*)m_Solid; }
   
-  const TriangleMesh* GetMesh() const { return m_Mesh.get(); }
+  const TriangleMesh& GetMesh() const { return m_Mesh; }
 
-  virtual void Update() override;
+public slots:
+  void Update();
 
-protected:
+private : 
-  SmartPointer<TriangleMesh> m_Mesh;
+  TriangleMesh        m_Mesh;
   G4TessellatedSolid *m_Solid;
 };
 
 
-////////////////////////////////////////////////////////////////////////////////
+
-//// BOX SOLID /////////////////////////////////////////////////////////////////
+
+
 
 class BoxSolid : public Solid {
+  
 public:
   uLibTypeMacro(BoxSolid, Solid)
 
-  BoxSolid();
+  BoxSolid(const char *name = "");
-  BoxSolid(const char *name);
   BoxSolid(const char *name, ContainerBox *box);
-  BoxSolid(const char *name, SmartPointer<ContainerBox> box);
-  
   virtual G4VSolid* GetG4Solid() const override { return (G4VSolid*)m_Solid; }
   
-  virtual void Update() override;
   ContainerBox* GetObject() const { return m_ContainerBox; }
 
   template < typename Ar >
   void serialize(Ar &ar, const unsigned int version) {
-    ar & boost::serialization::base_object<Solid>(*this);
+    ar & boost::serialization::base_object<BaseClass>(*this);
-    ar & HRP("Container", m_ContainerBox);
+    ar & m_ContainerBox;
   }
 
+public slots:
+  void Update();
+
 private:
-  
+  ContainerBox *m_ContainerBox;
-  SmartPointer<ContainerBox> m_ContainerBox;
-
   G4Box *m_Solid;
 };
 

src/HEP/Geant/testing/CMakeLists.txt

@@ -5,7 +5,6 @@ set(TESTS
        GeantApp
        ActionInitialization
        SkyPlaneEmitterTest
-       MaterialTest
 )
 
 set(LIBRARIES

src/HEP/Geant/testing/EventTest.cpp

@@ -25,17 +25,11 @@ int main() {
         scene.ConstructWorldBox(Vector3f(30_m, 30_m, 30_m), "G4_AIR");
 
         // 2. Create iron cube (1m x 1m x 1m) at center
-        ContainerBox *iron_box = new ContainerBox(Vector3f(1000, 1000, 1000)); // mm
+        ContainerBox iron_box(Vector3f(1000, 1000, 1000)); // mm
-        Geant::BoxSolid *iron_cube = new Geant::BoxSolid("IronCube", iron_box);
+        Geant::BoxSolid *iron_cube = new Geant::BoxSolid("IronCube", &iron_box);
-        
+        iron_cube->SetNistMaterial("G4_Fe");
-        Geant::Material *iron_mat = new Geant::Material("G4_Fe");
+        iron_cube->Update(); // apply dimensions
-        Geant::LogicalVolume *iron_lv = new Geant::LogicalVolume("IronCube_lv");
+        scene.AddSolid(iron_cube);
-        iron_lv->SetSolid(iron_cube);
-        iron_lv->SetMaterial(iron_mat);
-        iron_lv->Update();
-
-        Geant::PhysicalVolume *iron_pv = new Geant::PhysicalVolume("IronCube", iron_lv);
-        scene.AddVolume(iron_pv);
 
         // 3. Set up emitter (default: mu- at 1 GeV, from z=+10m downward)
         Geant::EmitterPrimary *emitter = new Geant::EmitterPrimary();

src/HEP/Geant/testing/MaterialTest.cpp

@@ -1,64 +0,0 @@
-/*//////////////////////////////////////////////////////////////////////////////
-// CMT Cosmic Muon Tomography project //////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-
-  Copyright (c) 2014, Universita' degli Studi di Padova, INFN sez. di Padova
-  All rights reserved
-
-  Authors: Andrea Rigoni Garola < andrea.rigoni@pd.infn.it >
-
-  ------------------------------------------------------------------
-  This library is free software;  you  can  redistribute  it  and/or
-  modify it  under the  terms  of  the  GNU  Lesser  General  Public
-  License as published  by  the  Free  Software  Foundation;  either
-  version 3.0 of the License, or (at your option) any later version.
-
-  This library is  distributed in  the hope that it will  be useful,
-  but  WITHOUT ANY WARRANTY;  without  even  the implied warranty of
-  MERCHANTABILITY  or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of  the GNU Lesser General  Public
-  License along with this library.
-
-//////////////////////////////////////////////////////////////////////////////*/
-
-#include <iostream>
-#include "HEP/Geant/Matter.h"
-#include "testing-prototype.h"
-
-using namespace uLib::Geant;
-
-int test_nist_materials() {
-    Material air("G4_AIR");
-    if (!air.GetG4Material()) {
-        std::cerr << "Failed to find G4_AIR" << std::endl;
-        return 0;
-    }
-    std::cout << "Air name: " << air.GetG4Material()->GetName() << std::endl;
-    std::cout << "Air density: " << air.GetG4Material()->GetDensity() << " g/cm3" << std::endl;
-
-    Material lead("G4_Pb");
-    if (!lead.GetG4Material()) {
-        std::cerr << "Failed to find G4_Pb" << std::endl;
-        return 0;
-    }
-    std::cout << "Lead name: " << lead.GetG4Material()->GetName() << std::endl;
-    std::cout << "Lead density: " << lead.GetG4Material()->GetDensity() << " g/cm3" << std::endl;
-
-    Material water("G4_WATER");
-    if (!water.GetG4Material()) {
-        std::cerr << "Failed to find G4_WATER" << std::endl;
-        return 0;
-    }
-    std::cout << "Water name: " << water.GetG4Material()->GetName() << std::endl;
-    std::cout << "Water density: " << water.GetG4Material()->GetDensity() << " g/cm3" << std::endl;
-
-    return 1;
-}
-
-int main() {
-    BEGIN_TESTING(Material);
-    TEST1(test_nist_materials());
-    END_TESTING;
-}

src/HEP/Geant/testing/SkyPlaneEmitterTest.cpp

@@ -15,7 +15,7 @@ using namespace uLib;
 
 int main(int argc, char** argv) {
 
-    int nEvents = 100;
+    int nEvents = 10000;
     if (argc > 1) {
         nEvents = std::stoi(argv[1]);
     }
@@ -24,16 +24,13 @@ int main(int argc, char** argv) {
     Geant::Scene scene;
     scene.ConstructWorldBox(Vector3f(30_m, 30_m, 30_m), "G4_AIR");
 
-    ContainerBox *iron_box = new ContainerBox();
+    ContainerBox iron_box;
-    iron_box->Scale(Vector3f(18_m, 10_cm, 18_m));
+    iron_box.Scale(Vector3f(18_m, 10_cm, 18_m));
-    iron_box->SetPosition(Vector3f(-9_m, -5_cm, -9_m));
+    iron_box.SetPosition(Vector3f(-9_m, -5_cm, -9_m));
-    Geant::BoxSolid *iron_cube = new Geant::BoxSolid("IronCube", iron_box);
+    Geant::BoxSolid* iron_cube = new Geant::BoxSolid("IronCube", &iron_box);
-    Geant::Material *iron_mat = new Geant::Material("G4_Fe");
+    iron_cube->SetNistMaterial("G4_Fe");
-    Geant::LogicalVolume *iron_lv = new Geant::LogicalVolume("IronCube_lv");
+    iron_cube->Update();
-    iron_lv->SetSolid(iron_cube);
+    scene.AddSolid(iron_cube);
-    iron_lv->SetMaterial(iron_mat);
-    iron_lv->Update();
-    scene.AddVolume(new Geant::PhysicalVolume("IronCube", iron_lv));
 
     // Top Detector Chamber (along Y axis)
     DetectorChamber* top_chamber_box = new DetectorChamber();
@@ -41,12 +38,9 @@ int main(int argc, char** argv) {
     top_chamber_box->Rotate(90_deg, Vector3f(1, 0, 0));
     top_chamber_box->SetPosition(Vector3f(-10_m, 12_m, -10_m));
     Geant::BoxSolid* top_chamber = new Geant::BoxSolid("TopChamber", top_chamber_box);
-    SmartPointer<Geant::Material> air_mat(new Geant::Material("G4_AIR"));
+    top_chamber->SetNistMaterial("G4_AIR");
-    Geant::LogicalVolume* top_chamber_lv = new Geant::LogicalVolume("TopChamber_lv");
+    top_chamber->Update();
-    top_chamber_lv->SetSolid(top_chamber);
+    scene.AddSolid(top_chamber);
-    top_chamber_lv->SetMaterial(air_mat);
-    top_chamber_lv->Update();
-    scene.AddVolume(new Geant::PhysicalVolume("TopChamber", top_chamber_lv));
 
     // Bottom Detector Chamber (along Y axis)
     DetectorChamber* bottom_chamber_box = new DetectorChamber();
@@ -54,11 +48,9 @@ int main(int argc, char** argv) {
     bottom_chamber_box->Rotate(90_deg, Vector3f(1, 0, 0));
     bottom_chamber_box->SetPosition(Vector3f(-10_m, -12_m, -10_m));
     Geant::BoxSolid* bottom_chamber = new Geant::BoxSolid("BottomChamber", bottom_chamber_box);
-    Geant::LogicalVolume* bottom_chamber_lv = new Geant::LogicalVolume("BottomChamber_lv");
+    bottom_chamber->SetNistMaterial("G4_AIR");
-    bottom_chamber_lv->SetSolid(bottom_chamber);
+    bottom_chamber->Update();
-    bottom_chamber_lv->SetMaterial(air_mat);
+    scene.AddSolid(bottom_chamber);
-    bottom_chamber_lv->Update();
-    scene.AddVolume(new Geant::PhysicalVolume("BottomChamber", bottom_chamber_lv));
 
     // Setup SkyPlaneEmitterPrimary
     Geant::SkyPlaneEmitterPrimary* emitter = new Geant::SkyPlaneEmitterPrimary();

src/HEP/Geant/testing/SolidTest.cpp

@@ -1,6 +1,8 @@
 #include "Geant/Solid.h"
 #include "Math/TriangleMesh.h"
 #include "testing-prototype.h"
+#include <Geant4/G4Material.hh>
+#include <Geant4/G4NistManager.hh>
 #include <Geant4/G4LogicalVolume.hh>
 #include <Geant4/G4TessellatedSolid.hh>
 #include <string.h>
@@ -10,51 +12,62 @@ using namespace uLib;
 int main() {
     BEGIN_TESTING(Geant Solid);
 
-    // Test Solid initialization //
+    // Test Solid initialization and NIST material //
     {
         Geant::Solid solid("test_solid");
-        TEST1(strcmp(solid.GetName(), "test_solid") == 0);
+        // Logical volume is not created until material and solid are set
+        TEST1(solid.GetLogical() == nullptr);
+        
+        solid.SetNistMaterial("G4_AIR");
+        // Still null because base Solid has no GetG4Solid()
+        TEST1(solid.GetLogical() == nullptr);
+        TEST1(solid.GetMaterial() != nullptr);
+        TEST1(solid.GetMaterial()->GetName() == "G4_AIR");
     }
 
-    // Test BoxSolid //
+    // Test TessellatedSolid with a simple mesh //
-    {
-        Geant::BoxSolid boxsolid("test_boxsolid");
-        TEST1(boxsolid.GetG4Solid() != nullptr);
-    }
-
-    // Test LogicalVolume //
-    {
-        Geant::BoxSolid *box = new Geant::BoxSolid("box");
-        Geant::Material *mat = new Geant::Material("G4_AIR");
-        Geant::LogicalVolume lv("test_lv");
-        
-        lv.SetSolid(box);
-        lv.SetMaterial(mat);
-        lv.Update();
-        
-        TEST1(lv.GetG4LogicalVolume() != nullptr);
-        TEST1(strcmp(lv.GetName(), "test_lv") == 0);
-    }
-
-    // Test PhysicalVolume //
-    {
-        Geant::LogicalVolume *lv = new Geant::LogicalVolume("lv");
-        Geant::PhysicalVolume pv("test_pv", lv);
-        
-        TEST1(pv.GetLogical() == lv);
-        TEST1(strcmp(pv.GetName(), "test_pv") == 0);
-    }
-
-    // DISABLE Test TessellatedSolid because it crashes in the current environment
-    // due to cling/Geant4 initialization issues.
-    /*
     {
         Geant::TessellatedSolid tsolid("test_tessellated");
-...
+        tsolid.SetNistMaterial("G4_AIR");
-        TEST1(((G4TessellatedSolid*)tsolid.GetG4Solid())->GetNumberOfFacets() == 12);
+        TEST1(tsolid.GetLogical() != nullptr);
+        TEST1(tsolid.GetSolid() != nullptr);
+
+        // cube mesh //
+        TriangleMesh mesh;
+        mesh.AddPoint(Vector3f(0,0,0));
+        mesh.AddPoint(Vector3f(1,0,0));
+        mesh.AddPoint(Vector3f(0,1,0));
+        mesh.AddPoint(Vector3f(1,1,0));
+        mesh.AddPoint(Vector3f(0,0,1));
+        mesh.AddPoint(Vector3f(1,0,1));
+        mesh.AddPoint(Vector3f(0,1,1));
+        mesh.AddPoint(Vector3f(1,1,1));
+        
+        // create triangles (consistent outward winding) //
+        // bottom (z=0)
+        mesh.AddTriangle(Vector3i(0,2,3));
+        mesh.AddTriangle(Vector3i(0,3,1));
+        // top (z=1)
+        mesh.AddTriangle(Vector3i(4,5,7));
+        mesh.AddTriangle(Vector3i(4,7,6));
+        // left (x=0)
+        mesh.AddTriangle(Vector3i(0,4,6));
+        mesh.AddTriangle(Vector3i(0,6,2));
+        // right (x=1)
+        mesh.AddTriangle(Vector3i(1,3,7));
+        mesh.AddTriangle(Vector3i(1,7,5));
+        // front (y=0)
+        mesh.AddTriangle(Vector3i(0,1,5));
+        mesh.AddTriangle(Vector3i(0,5,4));
+        // back (y=1)
+        mesh.AddTriangle(Vector3i(2,6,7));
+        mesh.AddTriangle(Vector3i(2,7,3));
+
+
+
+        tsolid.SetMesh(mesh);
+        TEST1(tsolid.GetSolid()->GetNumberOfFacets() == 12);
     }
-    */
-    printf("All Tests Passed Successfully!\n");
 
     END_TESTING
 }

src/HEP/Geant/uLibInterface.hh

@@ -1,55 +0,0 @@
-#ifndef ULIB_GEANT_ULIB_INTERFACE_HH
-#define ULIB_GEANT_ULIB_INTERFACE_HH
-
-#include "Math/Transform.h"
-#include <Geant4/G4Transform3D.hh>
-#include <Geant4/G4ThreeVector.hh>
-#include <Geant4/G4RotationMatrix.hh>
-
-namespace uLib {
-namespace Geant {
-
-/**
- * @brief Converts a uLib::Matrix3f to a Geant4 G4RotationMatrix.
- */
-inline G4RotationMatrix ToG4Rotation(const Matrix3f& m) {
-    G4RotationMatrix rot;
-    rot.set(G4ThreeVector(m(0, 0), m(1, 0), m(2, 0)),
-            G4ThreeVector(m(0, 1), m(1, 1), m(2, 1)),
-            G4ThreeVector(m(0, 2), m(1, 2), m(2, 2)));
-    return rot;
-}
-
-/**
- * @brief Converts a uLib::Matrix4f to a Geant4 G4Transform3D.
- */
-inline G4Transform3D ToG4Transform(const Matrix4f& m) {
-    G4RotationMatrix rot = ToG4Rotation(m.block<3, 3>(0, 0));
-    G4ThreeVector pos(m(0, 3), m(1, 3), m(2, 3));
-    return G4Transform3D(rot, pos);
-}
-
-inline void ToG4Transform(const Matrix4f& m, G4Transform3D& g4m) {
-    g4m = ToG4Transform(m);
-}
-
-/**
- * @brief Converts a uLib::AffineTransform to a Geant4 G4Transform3D.
- */
-inline G4Transform3D ToG4Transform(const AffineTransform& at) {
-    return ToG4Transform(at.GetMatrix());
-}
-
-/**
- * @brief Converts a uLib::Vector3f to a Geant4 G4ThreeVector.
- */
-inline G4ThreeVector ToG4Vector(const Vector3f& v) {
-    return G4ThreeVector(v(0), v(1), v(2));
-}
-
-
-
-} // namespace Geant
-} // namespace uLib
-
-#endif // ULIB_GEANT_ULIB_INTERFACE_HH

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

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)
 };

src/Math/Transform.h

@@ -246,7 +246,6 @@ uLibTypeMacro(TRS, AffineTransform) ULIB_SERIALIZE_ACCESS
   }
 
   Matrix4f GetMatrix() const { return this->GetAffineMatrix().matrix(); }
-
 };
 
 inline std::ostream &operator<<(std::ostream &os, const TRS &trs) {

src/Vtk/HEP/Geant/testing/vtkCylinderEmitterPrimaryTest.cpp

@@ -75,23 +75,13 @@ int main(int argc, char** argv) {
     Geant::Scene scene;
     scene.ConstructWorldBox(Vector3f(30_m, 30_m, 30_m), "G4_AIR");
 
-    // Iron Cube
+    ContainerBox iron_box;
-    SmartPointer<ContainerBox> iron_box(new ContainerBox());
+    iron_box.Scale(Vector3f(10_m, 10_m, 10_m));
-    iron_box->Scale(Vector3f(10_m, 10_m, 10_m));
+    iron_box.SetPosition(Vector3f(0, 0, 0));
-    iron_box->SetPosition(Vector3f(0, 0, 0));
+    Geant::BoxSolid* iron_cube = new Geant::BoxSolid("IronCube", &iron_box);
-    
+    iron_cube->SetNistMaterial("G4_Fe");
-    SmartPointer<Geant::BoxSolid> iron_solid(new Geant::BoxSolid("IronSolid", iron_box));
+    iron_cube->Update();
-    iron_solid->Update();
+    scene.AddSolid(iron_cube);
-
-    SmartPointer<Geant::Material> iron_mat(new Geant::Material("IronMat"));
-    iron_mat->SetFromNist("G4_Fe");
-
-    SmartPointer<Geant::LogicalVolume> iron_lv(new Geant::LogicalVolume("IronLV"));
-    iron_lv->SetSolid(iron_solid);
-    iron_lv->SetMaterial(iron_mat);
-
-    SmartPointer<Geant::PhysicalVolume> iron_pv(new Geant::PhysicalVolume("IronPV", iron_lv));
-    scene.AddVolume(iron_pv);
 
     // Use CylinderEmitterPrimary
     Geant::CylinderEmitterPrimary* emitter = new Geant::CylinderEmitterPrimary();
@@ -113,7 +103,7 @@ int main(int argc, char** argv) {
     vtkWorld->SetSelectable(false);
     viewer.AddProp3D(*vtkWorld);
     
-    Vtk::ContainerBox* vtkIron = new Vtk::ContainerBox(iron_box.Get());
+    Vtk::ContainerBox* vtkIron = new Vtk::ContainerBox(&iron_box);
     vtkIron->SetOpacity(0.2);
     vtkIron->SetRepresentation(Vtk::Prop3D::Surface);
     viewer.AddProp3D(*vtkIron);

src/Vtk/HEP/Geant/testing/vtkEmitterPrimaryTest.cpp

@@ -69,56 +69,31 @@ int main(int argc, char** argv) {
     Geant::Scene scene;
     scene.ConstructWorldBox(Vector3f(30_m, 30_m, 30_m), "G4_AIR");
 
-    // Iron Cube
+    ContainerBox iron_box;
-    SmartPointer<ContainerBox> iron_box(new ContainerBox());
+    iron_box.Scale(Vector3f(10_m, 10_m, 10_m));
-    iron_box->Scale(Vector3f(10_m, 10_m, 10_m));
+    iron_box.SetPosition(Vector3f(-5_m, -5_m, -5_m));
-    iron_box->SetPosition(Vector3f(-5_m, -5_m, -5_m));
+    Geant::BoxSolid* iron_cube = new Geant::BoxSolid("IronCube", &iron_box);
-    
+    iron_cube->SetNistMaterial("G4_Fe");
-    SmartPointer<Geant::BoxSolid> iron_solid(new Geant::BoxSolid("IronSolid", iron_box));
+    iron_cube->Update();
-    iron_solid->Update();
+    scene.AddSolid(iron_cube);
-
-    SmartPointer<Geant::Material> iron_mat(new Geant::Material("IronMat"));
-    iron_mat->SetFromNist("G4_Fe");
-
-    SmartPointer<Geant::LogicalVolume> iron_lv(new Geant::LogicalVolume("IronLV"));
-    iron_lv->SetSolid(iron_solid);
-    iron_lv->SetMaterial(iron_mat);
-
-    SmartPointer<Geant::PhysicalVolume> iron_pv(new Geant::PhysicalVolume("IronPV", iron_lv));
-    scene.AddVolume(iron_pv);
 
     // Top Detector Chamber
-    SmartPointer<DetectorChamber> top_chamber_box(new DetectorChamber());
+    DetectorChamber* top_chamber_box = new DetectorChamber();
     top_chamber_box->Scale(Vector3f(10_m, 10_m, 40_cm));
     top_chamber_box->SetPosition(Vector3f(-5_m, -5_m, 7_m));
-
+    Geant::BoxSolid* top_chamber = new Geant::BoxSolid("TopChamber", top_chamber_box);
-    SmartPointer<Geant::BoxSolid> top_solid(new Geant::BoxSolid("TopSolid", top_chamber_box));
+    top_chamber->SetNistMaterial("G4_AIR");
-    top_solid->Update();
+    top_chamber->Update();
-
+    scene.AddSolid(top_chamber);
-    SmartPointer<Geant::Material> air_mat(new Geant::Material("AirMat"));
-    air_mat->SetFromNist("G4_AIR");
-
-    SmartPointer<Geant::LogicalVolume> top_lv(new Geant::LogicalVolume("TopLV"));
-    top_lv->SetSolid(top_solid);
-    top_lv->SetMaterial(air_mat);
-
-    SmartPointer<Geant::PhysicalVolume> top_pv(new Geant::PhysicalVolume("TopPV", top_lv));
-    scene.AddVolume(top_pv);
 
     // Bottom Detector Chamber
-    SmartPointer<DetectorChamber> bottom_chamber_box(new DetectorChamber());
+    DetectorChamber* bottom_chamber_box = new DetectorChamber();
     bottom_chamber_box->Scale(Vector3f(10_m, 10_m, 40_cm));
     bottom_chamber_box->SetPosition(Vector3f(-5_m, -5_m, -7.1_m));
-
+    Geant::BoxSolid* bottom_chamber = new Geant::BoxSolid("BottomChamber", bottom_chamber_box);
-    SmartPointer<Geant::BoxSolid> bottom_solid(new Geant::BoxSolid("BottomSolid", bottom_chamber_box));
+    bottom_chamber->SetNistMaterial("G4_AIR");
-    bottom_solid->Update();
+    bottom_chamber->Update();
-
+    scene.AddSolid(bottom_chamber);
-    SmartPointer<Geant::LogicalVolume> bottom_lv(new Geant::LogicalVolume("BottomLV"));
-    bottom_lv->SetSolid(bottom_solid);
-    bottom_lv->SetMaterial(air_mat);
-
-    SmartPointer<Geant::PhysicalVolume> bottom_pv(new Geant::PhysicalVolume("BottomPV", bottom_lv));
-    scene.AddVolume(bottom_pv);
 
     Geant::EmitterPrimary* emitter = new Geant::EmitterPrimary();
     emitter->SetPosition(Vector3f(0, 0, 14_m));
@@ -137,20 +112,20 @@ int main(int argc, char** argv) {
     viewer.AddProp3D(*vtkWorld);
     
     // Visualize iron cube
-    Vtk::ContainerBox* vtkIron = new Vtk::ContainerBox(iron_box.Get());
+    Vtk::ContainerBox* vtkIron = new Vtk::ContainerBox(&iron_box);
     vtkIron->SetOpacity(0.2);
     vtkIron->SetRepresentation(Vtk::Prop3D::Surface);
     viewer.AddProp3D(*vtkIron);
 
     // Visualize Top Chamber
-    Vtk::DetectorChamber* vtkTop = new Vtk::DetectorChamber(top_chamber_box.Get());
+    Vtk::DetectorChamber* vtkTop = new Vtk::DetectorChamber(top_chamber_box);
     vtkTop->SetOpacity(0.5);
     vtkTop->SetColor(0.2, 0.8, 0.2);
     vtkTop->SetRepresentation(Vtk::Prop3D::Surface);
     viewer.AddProp3D(*vtkTop);
 
     // Visualize Bottom Chamber
-    Vtk::DetectorChamber* vtkBottom = new Vtk::DetectorChamber(bottom_chamber_box.Get());
+    Vtk::DetectorChamber* vtkBottom = new Vtk::DetectorChamber(bottom_chamber_box);
     vtkBottom->SetOpacity(0.5);
     vtkBottom->SetColor(0.2, 0.8, 0.2);
     vtkBottom->SetRepresentation(Vtk::Prop3D::Surface);

src/Vtk/HEP/Geant/testing/vtkGeantEventTest.cpp

@@ -100,22 +100,13 @@ int main(int argc, char** argv) {
     Geant::Scene scene;
     scene.ConstructWorldBox(Vector3f(30_m, 30_m, 30_m), "G4_AIR");
 
-    SmartPointer<ContainerBox> iron_box(new ContainerBox());
+    ContainerBox iron_box;
-    iron_box->Scale(Vector3f(10_m, 10_m, 10_m));
+    iron_box.Scale(Vector3f(10_m, 10_m, 10_m));
-    iron_box->SetPosition(Vector3f(-5_m, -5_m, -5_m));
+    iron_box.SetPosition(Vector3f(-5_m, -5_m, -5_m));
-
+    Geant::BoxSolid* iron_cube = new Geant::BoxSolid("IronCube", &iron_box);
-    SmartPointer<Geant::BoxSolid> iron_solid(new Geant::BoxSolid("IronSolid", iron_box));
+    iron_cube->SetNistMaterial("G4_Fe");
-    iron_solid->Update();
+    iron_cube->Update();
-
+    scene.AddSolid(iron_cube);
-    SmartPointer<Geant::Material> iron_mat(new Geant::Material("IronMat"));
-    iron_mat->SetFromNist("G4_Fe");
-
-    SmartPointer<Geant::LogicalVolume> iron_lv(new Geant::LogicalVolume("IronLV"));
-    iron_lv->SetSolid(iron_solid);
-    iron_lv->SetMaterial(iron_mat);
-
-    SmartPointer<Geant::PhysicalVolume> iron_pv(new Geant::PhysicalVolume("IronPV", iron_lv));
-    scene.AddVolume(iron_pv);
 
     RandomEmitter* emitter = new RandomEmitter();
     scene.SetEmitter(emitter);
@@ -132,7 +123,7 @@ int main(int argc, char** argv) {
     viewer.AddProp3D(*vtkWorld);
     
     // Visualize iron cube
-    Vtk::ContainerBox* vtkIron = new Vtk::ContainerBox(iron_box.Get());
+    Vtk::ContainerBox* vtkIron = new Vtk::ContainerBox(&iron_box);
     vtkIron->SetOpacity(0.2);
     vtkIron->SetRepresentation(Vtk::Prop3D::Surface);
     viewer.AddProp3D(*vtkIron);

src/Vtk/HEP/Geant/testing/vtkGeantSceneTest.cpp

@@ -33,22 +33,13 @@ int main(int argc, char** argv) {
     scene.ConstructWorldBox(Vector3f(30_m, 30_m, 30_m), "G4_AIR");
 
     // Add an iron cube inside the world
-    SmartPointer<ContainerBox> iron_box(new ContainerBox());
+    ContainerBox iron_box;
-    iron_box->Scale(Vector3f(10_m, 10_m, 10_m));
+    iron_box.Scale(Vector3f(10_m, 10_m, 10_m));
-    iron_box->SetPosition(Vector3f(-5_m, -5_m, -5_m));
+    iron_box.SetPosition(Vector3f(-5_m, -5_m, -5_m));
-    
+    Geant::BoxSolid* iron_cube = new Geant::BoxSolid("IronCube", &iron_box);
-    SmartPointer<Geant::BoxSolid> iron_solid(new Geant::BoxSolid("IronSolid", iron_box));
+    iron_cube->SetNistMaterial("G4_Fe");
-    iron_solid->Update();
+    iron_cube->Update();
-
+    scene.AddSolid(iron_cube);
-    SmartPointer<Geant::Material> iron_mat(new Geant::Material("IronMat"));
-    iron_mat->SetFromNist("G4_Fe");
-
-    SmartPointer<Geant::LogicalVolume> iron_lv(new Geant::LogicalVolume("IronLV"));
-    iron_lv->SetSolid(iron_solid);
-    iron_lv->SetMaterial(iron_mat);
-
-    SmartPointer<Geant::PhysicalVolume> iron_pv(new Geant::PhysicalVolume("IronPV", iron_lv));
-    scene.AddVolume(iron_pv);
     scene.Initialize();
 
     // 2. Build VTK scene representation

src/Vtk/HEP/Geant/testing/vtkSkyPlaneEmitterPrimaryTest.cpp

@@ -66,58 +66,33 @@ int main(int argc, char** argv) {
     Geant::Scene scene;
     scene.ConstructWorldBox(Vector3f(30_m, 30_m, 30_m), "G4_AIR");
 
-    // Iron Cube
+    ContainerBox iron_box;
-    SmartPointer<ContainerBox> iron_box(new ContainerBox());
+    iron_box.Scale(Vector3f(18_m, 18_m, 18_m));
-    iron_box->Scale(Vector3f(18_m, 18_m, 18_m));
+    iron_box.SetPosition(Vector3f(-9_m, -9_m, -9_m));
-    iron_box->SetPosition(Vector3f(-9_m, -9_m, -9_m));
+    Geant::BoxSolid* iron_cube = new Geant::BoxSolid("IronCube", &iron_box);
-    
+    iron_cube->SetNistMaterial("G4_Fe");
-    SmartPointer<Geant::BoxSolid> iron_solid(new Geant::BoxSolid("IronSolid", iron_box));
+    iron_cube->Update();
-    iron_solid->Update();
+    scene.AddSolid(iron_cube);
-
-    SmartPointer<Geant::Material> iron_mat(new Geant::Material("IronMat"));
-    iron_mat->SetFromNist("G4_Fe");
-
-    SmartPointer<Geant::LogicalVolume> iron_lv(new Geant::LogicalVolume("IronLV"));
-    iron_lv->SetSolid(iron_solid);
-    iron_lv->SetMaterial(iron_mat);
-
-    SmartPointer<Geant::PhysicalVolume> iron_pv(new Geant::PhysicalVolume("IronPV", iron_lv));
-    scene.AddVolume(iron_pv);
 
     // Top Detector Chamber (along Y axis)
-    SmartPointer<DetectorChamber> top_chamber_box(new DetectorChamber());
+    DetectorChamber* top_chamber_box = new DetectorChamber();
     top_chamber_box->Scale(Vector3f(20_m, 40_cm, 20_m));
     top_chamber_box->Rotate(90_deg, Vector3f(1, 0, 0));
     top_chamber_box->SetPosition(Vector3f(-10_m, 12_m, -10_m));
-
+    Geant::BoxSolid* top_chamber = new Geant::BoxSolid("TopChamber", top_chamber_box);
-    SmartPointer<Geant::BoxSolid> top_solid(new Geant::BoxSolid("TopSolid", top_chamber_box));
+    top_chamber->SetNistMaterial("G4_AIR");
-    top_solid->Update();
+    top_chamber->Update();
-
+    scene.AddSolid(top_chamber);
-    SmartPointer<Geant::Material> air_mat(new Geant::Material("AirMat"));
-    air_mat->SetFromNist("G4_AIR");
-
-    SmartPointer<Geant::LogicalVolume> top_lv(new Geant::LogicalVolume("TopLV"));
-    top_lv->SetSolid(top_solid);
-    top_lv->SetMaterial(air_mat);
-
-    SmartPointer<Geant::PhysicalVolume> top_pv(new Geant::PhysicalVolume("TopPV", top_lv));
-    scene.AddVolume(top_pv);
 
     // Bottom Detector Chamber (along Y axis)
-    SmartPointer<DetectorChamber> bottom_chamber_box(new DetectorChamber());
+    DetectorChamber* bottom_chamber_box = new DetectorChamber();
     bottom_chamber_box->Scale(Vector3f(20_m, 40_cm, 20_m));
     bottom_chamber_box->Rotate(90_deg, Vector3f(1, 0, 0));
     bottom_chamber_box->SetPosition(Vector3f(-10_m, -12_m, -10_m));
-
+    Geant::BoxSolid* bottom_chamber = new Geant::BoxSolid("BottomChamber", bottom_chamber_box);
-    SmartPointer<Geant::BoxSolid> bottom_solid(new Geant::BoxSolid("BottomSolid", bottom_chamber_box));
+    bottom_chamber->SetNistMaterial("G4_AIR");
-    bottom_solid->Update();
+    bottom_chamber->Update();
-
+    scene.AddSolid(bottom_chamber);
-    SmartPointer<Geant::LogicalVolume> bottom_lv(new Geant::LogicalVolume("BottomLV"));
-    bottom_lv->SetSolid(bottom_solid);
-    bottom_lv->SetMaterial(air_mat);
-
-    SmartPointer<Geant::PhysicalVolume> bottom_pv(new Geant::PhysicalVolume("BottomPV", bottom_lv));
-    scene.AddVolume(bottom_pv);
 
     // Use SkyPlaneEmitterPrimary instead of EmitterPrimary
     Geant::SkyPlaneEmitterPrimary* emitter = new Geant::SkyPlaneEmitterPrimary();
@@ -138,20 +113,20 @@ int main(int argc, char** argv) {
     vtkWorld->SetSelectable(false);
     viewer.AddProp3D(*vtkWorld);
     
-    Vtk::ContainerBox* vtkIron = new Vtk::ContainerBox(iron_box.Get());
+    Vtk::ContainerBox* vtkIron = new Vtk::ContainerBox(&iron_box);
     vtkIron->SetOpacity(0.2);
     vtkIron->SetRepresentation(Vtk::Prop3D::Surface);
     viewer.AddProp3D(*vtkIron);
 
     // Visualize Top Chamber
-    Vtk::DetectorChamber* vtkTop = new Vtk::DetectorChamber(top_chamber_box.Get());
+    Vtk::DetectorChamber* vtkTop = new Vtk::DetectorChamber(top_chamber_box);
     vtkTop->SetOpacity(0.5);
     vtkTop->SetColor(0.2, 0.8, 0.2);
     vtkTop->SetRepresentation(Vtk::Prop3D::Surface);
     viewer.AddProp3D(*vtkTop);
 
     // Visualize Bottom Chamber
-    Vtk::DetectorChamber* vtkBottom = new Vtk::DetectorChamber(bottom_chamber_box.Get());
+    Vtk::DetectorChamber* vtkBottom = new Vtk::DetectorChamber(bottom_chamber_box);
     vtkBottom->SetOpacity(0.5);
     vtkBottom->SetColor(0.2, 0.8, 0.2);
     vtkBottom->SetRepresentation(Vtk::Prop3D::Surface);

src/Vtk/HEP/Geant/testing/vtkSolidsTest.cpp

@@ -25,59 +25,53 @@ using namespace uLib;
 int main(int argc, char** argv) {
     bool interactive = (argc > 1 && std::string(argv[1]) == "-i");
 
-    // 3. Visualization setup
-    Vtk::Viewer viewer;
-
     // 1. Create a BoxSolid
-    SmartPointer<ContainerBox> box(new ContainerBox());
+    ContainerBox box;
-    box->Scale(Vector3f(1_m, 2_m, 3_m));
+    box.Scale(Vector3f(1_m, 2_m, 3_m));
-    SmartPointer<Geant::BoxSolid> gBox(new Geant::BoxSolid("MyBox", box));
+    Geant::BoxSolid gBox("MyBox", &box);
-    gBox->Update();
+    gBox.Update();
 
-    SmartPointer<Geant::LogicalVolume> lvBox(new Geant::LogicalVolume("BoxLV"));
+    Vtk::BoxSolid vtkBox(&gBox);
-    lvBox->SetSolid(gBox);
-    SmartPointer<Geant::PhysicalVolume> pvBox(new Geant::PhysicalVolume("BoxPV", lvBox));
-    Vtk::BoxSolid vtkBox(pvBox);
-    vtkBox.AddToViewer(viewer);
 
     // 2. Create a TessellatedSolid
-    SmartPointer<Geant::TessellatedSolid> gTess(new Geant::TessellatedSolid("MyTess"));
+    Geant::TessellatedSolid gTess("MyTess");
-    SmartPointer<TriangleMesh> mesh(new TriangleMesh());
+    TriangleMesh mesh;
-    // ... same points ...
+    // Create a simple pyramid
-    mesh->Points().push_back(Vector3f(0, 0, 1_m));   // apex
+    mesh.Points().push_back(Vector3f(0, 0, 1_m));   // apex
-    mesh->Points().push_back(Vector3f(-1_m, -1_m, 0));
+    mesh.Points().push_back(Vector3f(-1_m, -1_m, 0));
-    mesh->Points().push_back(Vector3f( 1_m, -1_m, 0));
+    mesh.Points().push_back(Vector3f( 1_m, -1_m, 0));
-    mesh->Points().push_back(Vector3f( 1_m,  1_m, 0));
+    mesh.Points().push_back(Vector3f( 1_m,  1_m, 0));
-    mesh->Points().push_back(Vector3f(-1_m,  1_m, 0));
+    mesh.Points().push_back(Vector3f(-1_m,  1_m, 0));
     
-    mesh->Triangles().push_back(Vector3i(1, 2, 0));
+    mesh.Triangles().push_back(Vector3i(1, 2, 0));
-    mesh->Triangles().push_back(Vector3i(2, 3, 0));
+    mesh.Triangles().push_back(Vector3i(2, 3, 0));
-    mesh->Triangles().push_back(Vector3i(3, 4, 0));
+    mesh.Triangles().push_back(Vector3i(3, 4, 0));
-    mesh->Triangles().push_back(Vector3i(4, 1, 0));
+    mesh.Triangles().push_back(Vector3i(4, 1, 0));
-    mesh->Triangles().push_back(Vector3i(1, 3, 2)); // base
+    mesh.Triangles().push_back(Vector3i(1, 3, 2)); // base
-    mesh->Triangles().push_back(Vector3i(1, 4, 3)); // base
+    mesh.Triangles().push_back(Vector3i(1, 4, 3)); // base
     
-    gTess->SetMesh(mesh.Get());
+    gTess.SetMesh(mesh);
-    gTess->Update();
+    gTess.Update();
 
-    SmartPointer<Geant::LogicalVolume> lvTess(new Geant::LogicalVolume("TessLV"));
+    Vtk::TessellatedSolid vtkTess(&gTess);
-    lvTess->SetSolid(gTess);
+
-    SmartPointer<Geant::PhysicalVolume> pvTess(new Geant::PhysicalVolume("TessPV", lvTess));
+    // 3. Visualization setup
-    Vtk::TessellatedSolid vtkTess(pvTess);
+    Vtk::Viewer viewer;
+    vtkBox.AddToViewer(viewer);
     vtkTess.AddToViewer(viewer);
 
     // Color them differently
     vtkBox.SetColor(0.8, 0.2, 0.2);  // Redish box
     vtkTess.SetColor(0.2, 0.8, 0.2); // Greenish tess
     
-    // Position tessellated solid away from box using the PhysicalVolume
+    // Position tessellated solid away from box
     Matrix4f trans = Matrix4f::Identity();
     trans.block<3,1>(0,3) = Vector3f(5_m, 0, 0);
-    pvTess->SetMatrix(trans);
+    gTess.SetTransform(trans);
     vtkTess.Update();
 
     std::cout << "..:: Testing vtkSolidsTest ::.." << std::endl;
-    std::cout << "Box and Tessellated solids (placed via PhysicalVolumes) initialized." << std::endl;
+    std::cout << "Box and Tessellated solids initialized." << std::endl;
 
     if (interactive) {
         viewer.ZoomAuto();

src/Vtk/HEP/Geant/vtkBoxSolid.cpp

@@ -24,28 +24,54 @@
 namespace uLib {
 namespace Vtk {
 
-BoxSolid::BoxSolid(Geant::PhysicalVolume *content)
+BoxSolid::BoxSolid(Geant::BoxSolid *content)
-    : GeantSolid(content), m_BoxSolid(nullptr) {
+    : GeantSolid(content), m_BoxContent(content) {
-  if (content && content->GetLogical()) {
+  this->InstallPipe();
-    m_BoxSolid = dynamic_cast<Geant::BoxSolid *>(content->GetLogical()->GetSolid());
-  }
-}
  
-BoxSolid::BoxSolid(Geant::BoxSolid *solid)
+  // Connect the model's Updated event to updateTransform to ensure VTK sync
-    : GeantSolid(solid), m_BoxSolid(solid) {
+  m_UpdateConnection = Object::connect(m_BoxContent, &uLib::Object::Updated, this, &BoxSolid::Update);
+
+  // Initial sync
+  this->Update();
 }
 
 BoxSolid::~BoxSolid() {
 }
 
+void BoxSolid::Update() {
+  ConnectionBlock blocker(m_UpdateConnection);
+  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));
+      }
+  }
+}
+
+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
   this->Prop3D::serialize_display(ar, version);
-  if (m_BoxSolid) {
+  if (m_BoxContent) {
-    ar & NVP("Box", *m_BoxSolid);
+    ar & NVP("Box", *m_BoxContent);
-    if (m_BoxSolid->GetObject()) {
+    if (m_BoxContent->GetObject()) {
-      ar & NVP("Container", *m_BoxSolid->GetObject());
+      ar & NVP("Container", *m_BoxContent->GetObject());
     }
   }
 }

src/Vtk/HEP/Geant/vtkBoxSolid.h

@@ -45,22 +45,31 @@ class BoxSolid : public GeantSolid {
   uLibTypeMacro(BoxSolid, uLib::Vtk::GeantSolid)
 
 public:
-  BoxSolid(Geant::PhysicalVolume *content);
+  BoxSolid(Geant::BoxSolid *content);
-  BoxSolid(Geant::BoxSolid *solid);
   virtual ~BoxSolid();
 
+  virtual void Update() override;
+  virtual void UpdateGeometry() override;
+  virtual void UpdateTransform() override;
+  virtual void SyncFromVtk() override;
+
+  virtual uLib::Object *GetContent() const override { 
+    return m_BoxContent ? (::uLib::Object*)m_BoxContent->GetObject() : nullptr; 
+  }
+
   virtual void serialize_display(uLib::Archive::display_properties_archive &ar,
                                  const unsigned int version = 0) override;
 
   template <typename Ar>
   void serialize(Ar &ar, const unsigned int version) {
-    ar & NVP("BoxSolid", *m_BoxSolid);
+    ar & NVP("BoxSolid", *m_BoxContent);
   }
 
 protected:
   virtual void InstallPipe() override;
 
-  Geant::BoxSolid *m_BoxSolid;
+  Geant::BoxSolid *m_BoxContent;
+  uLib::Connection m_UpdateConnection;
 
   ULIB_DECLARE_PROPERTIES(BoxSolid)
 };

src/Vtk/HEP/Geant/vtkGeantScene.cpp

@@ -45,29 +45,25 @@ GeantScene::GeantScene(Geant::Scene *scene)
     m_WorldProp3D->ShowScaleMeasures(true);
   }
 
-  // 2. Create prop3ds for each physical volume in the scene
+  // 2. Create prop3ds for each non-world solid
-  const Vector<SmartPointer<Geant::PhysicalVolume>> &volumes = m_Scene->GetVolumes();
+  const Geant::Solid *world = m_Scene->GetWorld();
-
+  const Vector<Geant::Solid *> &solids = m_Scene->GetSolids();
-  for (auto &volume : volumes) {
-    if (!volume || !volume->GetLogical() || !volume->GetLogical()->GetSolid())
-      continue;
-
-    Geant::PhysicalVolume *pv = volume.Get();
-    Geant::Solid *solid = pv->GetLogical()->GetSolid();
 
+  for (Geant::Solid *solid : solids) {
     // Skip the world volume itself — it's already shown as the wireframe box
-    if (solid == m_Scene->GetWorld())
+    if (solid == world)
       continue;
 
     // Only create a prop3d if the solid has a valid G4VSolid
     if (solid->GetG4Solid()) {
       GeantSolid *vtkSolid = nullptr;
       if (auto *box = dynamic_cast<Geant::BoxSolid *>(solid)) {
-        vtkSolid = new BoxSolid(pv);
+        vtkSolid = new BoxSolid(box);
       } else if (auto *tess = dynamic_cast<Geant::TessellatedSolid *>(solid)) {
-        vtkSolid = new TessellatedSolid(pv);
+        vtkSolid = new TessellatedSolid(tess);
       } else {
-        vtkSolid = new GeantSolid(pv);
+        vtkSolid = new GeantSolid(solid);
+        vtkSolid->Update();
       }
       
       if (vtkSolid) {

src/Vtk/HEP/Geant/vtkGeantSolid.cpp

@@ -24,7 +24,6 @@
 //////////////////////////////////////////////////////////////////////////////*/
 
 #include "vtkGeantSolid.h"
-#include "Core/Monitor.h"
 
 #include <vtkActor.h>
 #include <vtkPolyData.h>
@@ -35,7 +34,6 @@
 #include <vtkSmartPointer.h>
 #include <vtkTransform.h>
 #include <vtkMatrix4x4.h>
-#include "Vtk/Math/vtkDense.h"
 
 #include <Geant4/G4VSolid.hh>
 #include <Geant4/G4Polyhedron.hh>
@@ -44,28 +42,9 @@
 namespace uLib {
 namespace Vtk {
 
-GeantSolid::GeantSolid(Geant::PhysicalVolume *content)
+GeantSolid::GeantSolid(Content *content)
-    : m_SolidActor(vtkActor::New()), m_Volume(content), m_Solid(nullptr) {
+    : m_SolidActor(vtkActor::New()), m_Content(content) {
   this->InstallPipe();
-  if (m_Volume) {
-    m_UpdateConnection = Object::connect(m_Volume, &uLib::Object::Updated, [this]() {
-      this->Update();
-    });
-    // Mandatory initial update
-    this->Update();
-  }
-}
-
-GeantSolid::GeantSolid(Geant::Solid *solid)
-    : m_SolidActor(vtkActor::New()), m_Volume(nullptr), m_Solid(solid) {
-  this->InstallPipe();
-  if (m_Solid) {
-    m_UpdateConnection = Object::connect(m_Solid, &uLib::Object::Updated, [this]() {
-      this->Update();
-    });
-    // Mandatory initial update
-    this->Update();
-  }
 }
 
 GeantSolid::~GeantSolid() {
@@ -79,32 +58,15 @@ vtkPolyData *GeantSolid::GetPolyData() const {
 }
 
 void GeantSolid::Update() {
-  ConnectionBlock blocker(m_UpdateConnection);
   this->UpdateGeometry();
   this->UpdateTransform();
-  this->Prop3D::Update();
-}
-
-void GeantSolid::SyncFromVtk() {
-  if (!m_Volume) return;
-  this->Prop3D::SyncFromVtk();
-  
-  if (auto* proxy = vtkProp3D::SafeDownCast(this->GetProxyProp())) {
-      if (vtkMatrix4x4* mat = proxy->GetUserMatrix()) {
-          m_Volume->SetMatrix(VtkToMatrix4f(mat));
-      }
-  }
 }
 
 void GeantSolid::UpdateGeometry() {
-  Geant::Solid *solid = m_Solid;
+  if (!m_Content)
-  if (m_Volume && m_Volume->GetLogical()) {
+    return;
-    solid = m_Volume->GetLogical()->GetSolid();
-  }
 
-  if (!solid) return;
+  G4VSolid *g4solid = m_Content->GetG4Solid();
-
-  G4VSolid *g4solid = solid->GetG4Solid();
   if (!g4solid)
     return;
 
@@ -149,19 +111,35 @@ void GeantSolid::UpdateGeometry() {
 }
 
 void GeantSolid::UpdateTransform() {
-  if (!m_SolidActor)
+  if (!m_Content || !m_SolidActor)
     return;
 
-  if (m_Volume) {
+  // Apply the Geant4 transform (position/rotation) if placed
-    // Apply the TRS transform directly from the PhysicalVolume
+  if (m_Content->GetPhysical()) {
-    vtkNew<vtkMatrix4x4> vtkMat;
+    auto *phys = m_Content->GetPhysical();
-    Matrix4fToVtk(m_Volume->GetMatrix(), vtkMat);
+    G4ThreeVector pos = phys->GetTranslation();
-    m_SolidActor->SetUserMatrix(vtkMat);
+    const G4RotationMatrix *rot = phys->GetRotation();
-  } else {
+
-    // Identity for unplaced solids
+    vtkSmartPointer<vtkTransform> transform = vtkSmartPointer<vtkTransform>::New();
-    m_SolidActor->SetUserMatrix(nullptr);
+    transform->Identity();
+    transform->Translate(pos.x(), pos.y(), pos.z());
+
+    if (rot) {
+      // G4RotationMatrix stores the inverse of the rotation for placement
+      G4RotationMatrix invRot = rot->inverse();
+      double elements[16] = {
+        invRot.xx(), invRot.xy(), invRot.xz(), 0,
+        invRot.yx(), invRot.yy(), invRot.yz(), 0,
+        invRot.zx(), invRot.zy(), invRot.zz(), 0,
+        0, 0, 0, 1
+      };
+      vtkSmartPointer<vtkMatrix4x4> mat = vtkSmartPointer<vtkMatrix4x4>::New();
+      mat->DeepCopy(elements);
+      transform->Concatenate(mat);
+    }
+
+    m_SolidActor->SetUserTransform(transform);
   }
-  m_SolidActor->Modified();
 }
 
 void GeantSolid::InstallPipe() {

src/Vtk/HEP/Geant/vtkGeantSolid.h

@@ -43,30 +43,24 @@ namespace Vtk {
  * a valid G4VSolid via GetG4Solid().
  */
 class GeantSolid : public Prop3D, public Polydata {
+  typedef Geant::Solid Content;
+
 public:
-  GeantSolid(Geant::PhysicalVolume *content);
+  GeantSolid(Content *content);
-  GeantSolid(Geant::Solid *solid);
   ~GeantSolid();
 
   virtual class vtkPolyData *GetPolyData() const override;
 
   virtual void Update() override;
-  virtual void SyncFromVtk() override;
 
   virtual void UpdateGeometry();
   virtual void UpdateTransform();
 
-  virtual uLib::Object *GetContent() const override { 
-    return m_Volume ? (uLib::Object*)m_Volume : (uLib::Object*)m_Solid; 
-  }
-
 protected:
   virtual void InstallPipe();
 
-  Geant::PhysicalVolume *m_Volume;
+  vtkActor *m_SolidActor;
-  Geant::Solid          *m_Solid;
+  Content  *m_Content;
-  vtkActor              *m_SolidActor;
-  uLib::Connection       m_UpdateConnection;
 };
 
 } // namespace Vtk

src/Vtk/HEP/Geant/vtkTessellatedSolid.cpp

@@ -18,11 +18,9 @@
 namespace uLib {
 namespace Vtk {
 
-TessellatedSolid::TessellatedSolid(Geant::PhysicalVolume *content)
+TessellatedSolid::TessellatedSolid(Geant::TessellatedSolid *content)
-    : GeantSolid(content), m_TessSolid(nullptr) {
+    : GeantSolid(content), m_TessContent(content) {
-  if (content && content->GetLogical()) {
+  this->Update();
-    m_TessSolid = dynamic_cast<Geant::TessellatedSolid *>(content->GetLogical()->GetSolid());
-  }
 }
 
 TessellatedSolid::~TessellatedSolid() {}
@@ -33,13 +31,13 @@ void TessellatedSolid::Update() {
 }
 
 void TessellatedSolid::UpdateGeometry() {
-  if (!m_TessSolid || !m_TessSolid->GetMesh() || m_TessSolid->GetMesh()->Points().empty()) {
+  if (!m_TessContent || m_TessContent->GetMesh().Points().empty()) {
     // Fallback to base tessellation if no model mesh
     GeantSolid::UpdateGeometry();
     return;
   }
 
-  const TriangleMesh &mesh = *m_TessSolid->GetMesh();
+  const TriangleMesh &mesh = m_TessContent->GetMesh();
   
   vtkNew<vtkPoints> points;
   for (const auto& pt : mesh.Points()) {

src/Vtk/HEP/Geant/vtkTessellatedSolid.h

@@ -22,14 +22,14 @@ namespace Vtk {
  */
 class TessellatedSolid : public GeantSolid {
 public:
-  TessellatedSolid(Geant::PhysicalVolume *content);
+  TessellatedSolid(Geant::TessellatedSolid *content);
   virtual ~TessellatedSolid();
 
   virtual void Update() override;
   virtual void UpdateGeometry() override;
 
 protected:
-  Geant::TessellatedSolid *m_TessSolid;
+  Geant::TessellatedSolid *m_TessContent;
 };
 
 } // namespace Vtk

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 ----
+    // ---- 1. Build model objects on the heap (expected by uLib SmartPointer) ----
-    ContainerBox box1;
+    auto* box1 = new ContainerBox();
-    box1.Scale(Vector3f(1_m, 2_m, 0.5_m));
+    box1->Scale(Vector3f(1, 2, 0.5));
-    box1.SetPosition(Vector3f(0, 0, 0));
+    // box1->SetPosition(Vector3f(0, 0, 0));
 
-    ContainerBox box2;
+    auto* box2 = new ContainerBox();
-    box2.Scale(Vector3f(0.5_m, 0.5_m, 3_m));
+    box2->Scale(Vector3f(0.5, 0.5, 3));
-    box2.SetPosition(Vector3f(2_m, 0, 0));
+    box2->SetPosition(Vector3f(2, 0, 0));
 
-    Cylinder cyl(0.3_m, 1.5_m, 1);
+    auto* cyl = new Cylinder(1, 1.5, 1);
-    cyl.SetPosition(Vector3f(0, 3_m, 0));
+    cyl->SetPosition(Vector3f(0, 3, 0));
 
     // ---- 2. Create an Assembly and add objects ----
-    Assembly assembly;
+    auto* assembly = new Assembly();
-    assembly.AddObject(&box1);
+    assembly->AddObject(box1);
-    assembly.AddObject(&box2);
+    assembly->AddObject(box2);
-    assembly.AddObject(&cyl);
+    assembly->AddObject(cyl);
-    assembly.SetShowBoundingBox(true);
+    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(box1), 1.0, 0.0, 0.0); // Red
-        setProps(childCtx->GetProp3D(&box2), 0.0, 1.0, 0.0); // Green
+        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(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;

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
+    // 1. Setup the internal VTK assembly
-    m_VtkAsm = ::vtkAssembly::New();
+    m_VtkAsm = vtkSmartPointer<::vtkAssembly>::New();
-    m_VtkAsm->PickableOff();
+    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) {
+    // Delegate to Prop3D to handle standard transformation application (uses GetContent())
-        // Apply world matrix from the assembly content
-        vtkNew<vtkMatrix4x4> m;
-        Matrix4fToVtk(this->m_model->GetMatrix(), m);
-        m_VtkAsm->SetUserMatrix(m);
-        m_VtkAsm->Modified();
-    }
-
     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)
+    // Sync the group-level transformation from VTK to the domain model
-    if (vtkProp3D* proxy = this->GetProxyProp()) {
+    this->Prop3D::SyncFromVtk();
-        this->m_model->SetWorldMatrix(VtkToMatrix4f(proxy->GetUserMatrix()));
-        this->m_model->FromMatrix(this->m_model->GetMatrix());
-    }
     
-    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

src/Vtk/Math/vtkAssembly.h

@@ -16,8 +16,9 @@
 #include "Math/Assembly.h"
 #include "Vtk/uLibVtkInterface.h"
 
-class vtkActor;
+#include <vtkSmartPointer.h>
-class vtkAssembly;  // VTK library forward declaration (must be before namespace)
+#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 visualization context for children. */
-     * @brief Returns the prop3d managing child objects.
+    uLib::Vtk::ObjectsContext* GetChildrenContext() const { return m_ChildContext; }
-     */
 
-    /** @brief Returns the prop3d managing child objects. */
+    /** @brief Property serialization for Display Properties Panel. */
-    ObjectsContext *GetChildrenContext() const;
+    void serialize_display(Archive::display_properties_archive &ar, const unsigned int version = 0) override;
 
 private:
     void UpdateBoundingBox();
     void InstallPipe();
 
-    ObjectsContext  *m_ChildContext;
+    vtkSmartPointer<::vtkAssembly>    m_VtkAsm;
-    vtkActor           *m_BBoxActor;
+    vtkSmartPointer<::vtkActor>       m_BBoxActor;
-    ::vtkAssembly      *m_VtkAsm; // VTK library assembly — NOT this class
+
-    bool                m_InUpdate;    // re-entrancy guard
+    uLib::Vtk::ObjectsContext *m_ChildContext;
+    bool m_InUpdate;
 };
 
 } // namespace Vtk

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)

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();

src/Vtk/Math/vtkCylinder.cpp

@@ -44,8 +44,7 @@ Cylinder::Cylinder(Cylinder::Content *content)
 }
 
 Cylinder::~Cylinder() {
-  if (m_Actor) m_Actor->Delete();
+  m_UpdateSignal.disconnect();
-  if (m_VtkAsm) m_VtkAsm->Delete();
 }
 
 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);
 

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;
+  vtkSmartPointer<vtkActor> m_Actor;
-  ::vtkAssembly *m_VtkAsm;
+  vtkSmartPointer<::vtkAssembly> m_VtkAsm;
   uLib::Connection m_UpdateSignal;
 };
 

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())) {

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;
 

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

src/Vtk/vtkObjectsContext.cpp

@@ -6,7 +6,6 @@
 
 #include "Vtk/HEP/Detectors/vtkDetectorChamber.h"
 #include "Vtk/HEP/Geant/vtkBoxSolid.h"
-#include "Vtk/HEP/Geant/vtkTessellatedSolid.h"
 
 #include <cstring>
 #include <iostream>
@@ -27,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;
   }
@@ -151,20 +152,8 @@ Prop3D *ObjectsContext::CreateProp3D(uLib::Object *obj) {
     return new Cylinder(cylinder);
   } else if (auto *assembly = dynamic_cast<uLib::Assembly *>(obj)) {
     return new Assembly(assembly);
-  } else if (auto *pv = dynamic_cast<uLib::Geant::PhysicalVolume *>(obj)) {
-    uLib::Geant::Solid *solid = pv->GetLogical()->GetSolid();
-    if (auto *box = dynamic_cast<uLib::Geant::BoxSolid *>(solid)) {
-      return new BoxSolid(pv);
-    } else if (auto *tess = dynamic_cast<uLib::Geant::TessellatedSolid *>(solid)) {
-      return new TessellatedSolid(pv);
-    } else {
-      return new GeantSolid(pv);
-    }
   } else if (auto *box = dynamic_cast<uLib::Geant::BoxSolid *>(obj)) {
     return new BoxSolid(box);
-  } else if (auto *solid = dynamic_cast<uLib::Geant::Solid *>(obj)) {
-    // Unplaced solid visualization
-    return new GeantSolid(solid);
   }
 
   // Fallback if we don't know the exact class but it might be a context itself

src/Vtk/vtkObjectsContext.h

@@ -33,8 +33,6 @@ public:
   /** @brief Synchronizes all managed prop3ds back to their models. */
   virtual void SyncFromVtk() override;
 
-  virtual Object* GetContent() const override { return (Object*)m_Context; }
-
   public:
   virtual void Prop3DAdded(Prop3D* prop3d);
   virtual void Prop3DRemoved(Prop3D* prop3d);
@@ -53,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

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()

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));
+    pv->m_Annotation->GetTextProperty()->SetColor(1, 1, 1);
-    SetFont(FontConfig("Arial", 10));
+    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;

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);
 

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