refactor: add override specifier to type_name method in Core/Types.h

Merges all work from andrea-geo branch:
- Geant material management classes
- Serialization enhancements (read-only, NVP/HRP macros)
- Transform/assembly system improvements
- VTK puppet/viewport updates (orthographic toggle, voxel rendering)
- Property grouping, dynamic properties, NotifyPropertiesUpdated
- Object type identification via uLibTypeMacro
- New tests (PropertyGrouping, ReadOnly, vtkQViewport, PuppetParenting)
- Various gcompose UI fixes

Conflict resolved in CMakePresets.json: kept both 'fast' (clang/lld)
and 'mutom' (stub) presets.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

.agents/rules/micromamba.md

@@ -0,0 +1,7 @@
+---
+trigger: always_on
+---
+
+build in build directory using always micromamba "mutom" env.
+build with make flag -j$(nproc).
+

.clangd

@@ -1,7 +1,7 @@
 CompileFlags:
   CompilationDatabase: build
   Add: 
-    - -I/home/rigoni/devel/cmt/ulib/src
+    - -I/home/rigoni/devel/cmt/uLib/src
     - -isystem/home/share/micromamba/envs/mutom/include
     - -isystem/home/share/micromamba/envs/mutom/include/eigen3
     - -isystem/home/share/micromamba/envs/mutom/targets/x86_64-linux/include
@@ -27,7 +27,7 @@ Diagnostics:
 
 ---
 If:
-  PathExclude: [/home/rigoni/devel/cmt/ulib/src/.*]
+  PathExclude: [/home/rigoni/devel/cmt/uLib/src/.*]
 Diagnostics:
   Suppress: ["*"]
 

.gitattributes

@@ -0,0 +1,2 @@
+*.vtk filter=lfs diff=lfs merge=lfs -text
+*.vti filter=lfs diff=lfs merge=lfs -text

.gitignore

@@ -1,6 +1,7 @@
 CMakeFiles/
-build/
+build*/
 .cache/
+CMakeUserPresets.json
 build_warnings*.log
 final_build.log
 cmake_configure.log
@@ -13,3 +14,7 @@ src/Python/uLib/*.pyd
 src/Python/uLib/*.pyc
 src/Python/uLib/__pycache__
 src/Python/uLib/.nfs*
+test_props.xml
+test_props2.xml
+test_boost.cpp
+.claude/settings.json

.vscode/settings.json

@@ -1,6 +1,6 @@
 {
     "clangd.fallbackFlags": [
-        "-I/home/rigoni/devel/cmt/ulib/src",
+        "-I/home/rigoni/devel/cmt/uLib/src",
         "-isystem/home/share/micromamba/envs/mutom/include",
         "-isystem/home/share/micromamba/envs/mutom/include/eigen3",
         "-isystem/home/share/micromamba/envs/mutom/targets/x86_64-linux/include",
@@ -19,8 +19,7 @@
     "clangd.semanticHighlighting.enable": true,
     "clangd.arguments": [
         "--compile-commands-dir=build",
-        "--query-driver=/home/share/micromamba/envs/mutom/bin/g++,/home/share/micromamba/envs/mutom/bin/gcc,/home/share/micromamba/envs/mutom/bin/nvcc",
+        "--query-driver=/home/share/micromamba/envs/mutom/bin/*",
-        "--suppress-system-warnings",
         "--all-scopes-completion",
         "--completion-style=detailed",
         "--header-insertion=never",

CLAUDE.md

@@ -0,0 +1,102 @@
+
+# CLAUDE.md
+
+This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
+
+## Build Commands
+
+```bash
+# Activate the conda environment (required before any build/run)
+export MAMBA_EXE="/home/share/micromamba/bin/micromamba"
+export MAMBA_ROOT_PREFIX="/home/share/micromamba"
+eval "$(/home/share/micromamba/bin/micromamba shell hook --shell bash)"
+micromamba activate mutom
+
+# Configure (from repo root, using Conan preset — uses Ninja + ccache)
+cmake --preset conan-release
+
+# Build everything
+cmake --build build -j$(nproc)
+
+# Build a specific target
+cmake --build build --target gcompose -j$(nproc)
+
+# Run tests
+cmake --build build --target test
+# or
+ctest --test-dir build
+
+# Run a single test binary (example)
+./build/src/Core/testing/CoreTest
+
+# Run the gcompose GUI app
+./build/app/gcompose/gcompose
+```
+
+First-time setup (if `build/` does not exist):
+```bash
+conan profile detect
+conan install . --output-folder=build --build=missing
+cmake --preset conan-release
+```
+
+### Build acceleration (already configured)
+- **Ninja** generator — used automatically via the conan default profile (`~/.conan2/profiles/default`)
+- **ccache** — enabled via `CMAKE_CXX_COMPILER_LAUNCHER=ccache`; cached rebuilds are nearly instant (~0.3s vs ~25s cold)
+- **Clang 22 + lld** profile available (`~/.conan2/profiles/fast`) but blocked by template overload ambiguities in `src/Core/Archives.h` that need fixing for full compatibility
+
+To reconfigure with the fast profile once Archives.h is fixed:
+```bash
+conan install . --output-folder=build --build=missing --profile=fast
+cmake -B build -G Ninja -DCMAKE_TOOLCHAIN_FILE=build/conan_toolchain.cmake -DCMAKE_BUILD_TYPE=Release
+cmake --build build -j$(nproc)
+```
+
+## Architecture
+
+**uLib** is a C++ framework for Cosmic Muon Tomography (CMT), structured as layered shared libraries:
+
+```
+mutomCore  →  mutomMath  →  mutomDetectors  →  mutomGeant
+                                              ↘
+                                           mutomVtk  →  gcompose (Qt6 GUI app)
+                                           mutomRoot
+```
+
+### Core Object Model (`src/Core/`)
+- All framework objects inherit from `uLib::Object`
+- **Property system**: `Property<T>` wraps member pointers with change notification via `PropertyChanged` signal
+- **Signal/slot**: `uLib::Object::connect(sender, &Sender::Signal, callback)` — resembles Qt but works for non-QObject classes
+- **Serialization**: Boost archives (`xml_oarchive`, `text_oarchive`, `hrt_oarchive`); `hrp<T>` marks fields as "human-readable properties"
+- `ObjectsContext` is a container owning a list of `Object*` pointers; signals `ObjectAdded`/`ObjectRemoved`
+
+### VTK Layer (`src/Vtk/`)
+- `Puppet` (inherits `uLib::Object`): wraps a VTK `vtkProp` for rendering. Has `GetContent()` returning the underlying domain object. Display-only properties are registered via `ULIB_ACTIVATE_DISPLAY_PROPERTIES` macro.
+- `Viewport`: base class managing the VTK renderer, picking, selection logic. Maintains `m_Puppets` vector and `m_ObjectToPuppet` map.
+- `QViewport` (inherits `QWidget` + `Viewport`): Qt-embedded VTK widget. Emits Qt signal `puppetSelected(Puppet*)` on click-selection via `OnSelectionChanged`.
+- `vtkObjectsContext`: wraps `ObjectsContext`, creating/destroying `Puppet`s as objects come/go. Emits `PuppetAdded`/`PuppetRemoved`.
+- Display properties: `serialize_display()` + `display_properties_archive` registers selected `hrp<T>` fields as `PropertyBase*` in the puppet's `m_DisplayProperties`. `PropertyEditor::setObject(obj, displayOnly=true)` shows only those.
+
+### gcompose GUI App (`app/gcompose/src/`)
+- `MainPanel`: top-level widget. Owns `ContextPanel` (left) and `ViewportPane` (right). Wires together viewport↔context selection via signals.
+- `ContextPanel`: tree view of `ObjectsContext`. Emits `objectSelected(Object*)`. Contains an embedded `PropertiesPanel`.
+- `PropertiesPanel`: shows `uLib::Object` properties via `PropertyEditor`.
+- `ViewportPane`: embeds `QViewport` + a slide-out "Display Properties" panel (`PropertyEditor` in display-only mode).
+- `PropertyEditor`: populates widgets from `Object::GetProperties()` (all) or `Puppet::GetDisplayProperties()` (display-only mode).
+
+### Selection Sync Flow
+```
+Viewport click  →  Viewport::SelectPuppet()  →  QViewport::OnSelectionChanged()
+                →  emit puppetSelected(p)
+                →  MainPanel: contextPanel->selectObject(p->GetContent())  [updates tree + PropertiesPanel]
+                →  MainPanel: firstPane->setObject(p)  [updates Display Properties panel]
+
+ContextPanel tree click  →  emit objectSelected(obj)
+                →  MainPanel: viewport->SelectPuppet(puppet)  [visual selection in VTK]
+                →  MainPanel: firstPane->setObject(puppet)  [updates Display Properties panel]
+```
+
+### Key Patterns
+- **Two signal systems coexist**: Qt signals (`Q_OBJECT`, `connect(...)`) for GUI; `uLib::Object::connect(...)` for domain signals.
+- **Display properties** flow: `Puppet::serialize_display()` → `display_properties_archive` → `RegisterDisplayProperty()` → `PropertyEditor(displayOnly=true)`. Must call `ULIB_ACTIVATE_DISPLAY_PROPERTIES` in the puppet constructor.
+- **Puppet ↔ Object map**: `Viewport::m_ObjectToPuppet` allows lookup by domain object; `vtkObjectsContext::GetPuppet(obj)` does the same.

CMake/uLibTargetMacros.cmake

@@ -84,6 +84,7 @@ macro(uLib_add_tests name)
     foreach(tn ${TESTS})
         add_executable(${tn} ${tn}.cpp)
         add_test(NAME ${tn} COMMAND ${tn})
+        set_tests_properties(${tn} PROPERTIES ENVIRONMENT "CTEST_PROJECT_NAME=uLib;QT_QPA_PLATFORM=offscreen")
 
         target_link_libraries(${tn} ${LIBRARIES})
 

CMakeLists.txt

@@ -21,7 +21,7 @@ endif()
 project(uLib)
 
 # CUDA Toolkit seems to be missing locally. Toggle ON if nvcc is made available.
-option(USE_CUDA "Enable CUDA support" ON)
+option(USE_CUDA "Enable CUDA support" OFF)
 if(USE_CUDA)
     set(CMAKE_CUDA_FLAGS "${CMAKE_CUDA_FLAGS} -allow-unsupported-compiler")
     set(CMAKE_CUDA_FLAGS "${CMAKE_CUDA_FLAGS} --expt-relaxed-constexpr")
@@ -38,7 +38,7 @@ endif()
 
 # The version number.
 set(PROJECT_VERSION_MAJOR 0)
-set(PROJECT_VERSION_MINOR 6)
+set(PROJECT_VERSION_MINOR 7)
 set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}")
 set(PROJECT_SOVERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}")
 
@@ -103,6 +103,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_WARNING_OPTION}")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -UULIB_SERIALIZATION_ON -Wno-cpp")
 
 # CTEST framework
+set(CTEST_PROJECT_NAME "uLib")
 include(CTest)
 enable_testing()
 
@@ -114,7 +115,7 @@ set(Boost_USE_MULTITHREADED ON)
 set(Boost_USE_STATIC_RUNTIME OFF)
 message(STATUS "CMAKE_PREFIX_PATH is ${CMAKE_PREFIX_PATH}")
 
-find_package(HDF5 REQUIRED CONFIG)
+find_package(HDF5 REQUIRED)
 
 find_package(Boost 1.45.0 COMPONENTS program_options serialization unit_test_framework REQUIRED)
 include_directories(${Boost_INCLUDE_DIRS})
@@ -168,6 +169,26 @@ if(Geant4_FOUND)
     add_compile_definitions(HAVE_GEANT4)
     set(HAVE_GEANT4 1)
 
+    # Workaround: Geant4's G4EXPATShim creates EXPAT::EXPAT (uppercase) with
+    # IMPORTED_LOCATION "${EXPAT_LIBRARY}", but EXPAT_LIBRARY is empty when using
+    # conda's config-mode expat package (which installs as expat::expat lowercase).
+    # Resolve the actual library path from expat::expat or via find_library.
+    if(TARGET EXPAT::EXPAT)
+        get_target_property(_expat_loc EXPAT::EXPAT IMPORTED_LOCATION)
+        if(NOT _expat_loc OR _expat_loc MATCHES "NOTFOUND|^$")
+            if(TARGET expat::expat)
+                get_target_property(_expat_loc expat::expat IMPORTED_LOCATION_NOCONFIG)
+            endif()
+            if(NOT _expat_loc OR _expat_loc MATCHES "NOTFOUND|^$")
+                find_library(_expat_loc NAMES expat)
+            endif()
+            if(_expat_loc)
+                set_target_properties(EXPAT::EXPAT PROPERTIES IMPORTED_LOCATION "${_expat_loc}")
+            endif()
+        endif()
+        unset(_expat_loc)
+    endif()
+
     # Sanitize Geant4 targets to remove Qt5 dependencies that conflict with VTK/Qt6
     if(TARGET Geant4::G4interfaces)
         set_target_properties(Geant4::G4interfaces PROPERTIES 

CMakePresets.json

@@ -11,6 +11,28 @@
                 "CMAKE_BUILD_TYPE": "Debug",
                 "CMAKE_INSTALL_PREFIX": "${sourceDir}/out/install/${presetName}"
             }
+        },
+        {
+            "name": "fast",
+            "displayName": "Fast build: Ninja + clang + ccache",
+            "description": "Uses Ninja generator, clang/lld compiler, and ccache",
+            "generator": "Ninja",
+            "binaryDir": "${sourceDir}/build",
+            "cacheVariables": {
+                "CMAKE_BUILD_TYPE": "Release",
+                "CMAKE_C_COMPILER": "clang",
+                "CMAKE_CXX_COMPILER": "clang++",
+                "CMAKE_EXE_LINKER_FLAGS": "-fuse-ld=lld",
+                "CMAKE_SHARED_LINKER_FLAGS": "-fuse-ld=lld",
+                "CMAKE_CXX_COMPILER_LAUNCHER": "ccache",
+                "CMAKE_C_COMPILER_LAUNCHER": "ccache"
+            }
+        },
+        {
+            "name": "mutom",
+            "description": "",
+            "displayName": "",
+            "inherits": []
         }
     ]
-}
+}

CMakeUserPresets.json

@@ -1,9 +0,0 @@
-{
-    "version": 4,
-    "vendor": {
-        "conan": {}
-    },
-    "include": [
-        "build/CMakePresets.json"
-    ]
-}

README.md

@@ -41,7 +41,11 @@ conda activate mutom
 
 ### Configure and Build
 
-1. **Configure Conan profile (if you haven't yet on your machine):**
+#### Standard build (GCC + Ninja + ccache)
+
+The default conan profile uses **Ninja** as the generator and **ccache** for compiler caching, dramatically speeding up incremental rebuilds.
+
+1. **Configure Conan profile (first time only):**
 ```bash
 conan profile detect
 ```
@@ -51,17 +55,39 @@ conan profile detect
 conan install . --output-folder=build --build=missing
 ```
 
-3. **Configure the project with CMake:**
+3. **Configure with CMake:**
 ```bash
 cmake --preset conan-release
 ```
-*(Alternatively: `cd build && cmake .. -DCMAKE_TOOLCHAIN_FILE=conan_toolchain.cmake -DCMAKE_BUILD_TYPE=Release`)*
 
-4. **Build the project:**
+4. **Build:**
 ```bash
-cmake --build build -j10
+cmake --build build -j$(nproc)
 ```
 
+#### LLVM/Clang build (clang + lld + ccache — fastest)
+
+A `fast` conan profile is provided that uses **clang**, **lld** (LLVM linker), and **ccache**. Install them into your environment first:
+
+```bash
+micromamba install -n mutom -y clang clangxx lld -c conda-forge
+```
+
+Then build using the `fast` profile:
+
+```bash
+conan install . --output-folder=build --build=missing --profile=fast
+cmake -B build -G Ninja \
+      -DCMAKE_TOOLCHAIN_FILE=build/conan_toolchain.cmake \
+      -DCMAKE_BUILD_TYPE=Release
+cmake --build build -j$(nproc)
+```
+
+The `fast` profile is defined at `~/.conan2/profiles/fast` and sets:
+- `CMAKE_C_COMPILER=clang` / `CMAKE_CXX_COMPILER=clang++`
+- `CMAKE_EXE_LINKER_FLAGS=-fuse-ld=lld`
+- `CMAKE_CXX_COMPILER_LAUNCHER=ccache`
+
 ### Make python package
 
 ```bash

Testing/Temporary/CTestCostData.txt

@@ -0,0 +1 @@
+---

Testing/Temporary/LastTest.log

@@ -0,0 +1,3 @@
+Start testing: Mar 25 18:59 UTC
+----------------------------------------------------------
+End testing: Mar 25 18:59 UTC

app/gcompose/src/ContextModel.cpp

@@ -4,6 +4,11 @@
 #include <cxxabi.h>
 #include <functional>
 #include "Core/Object.h"
+#include <QMimeData>
+#include <QDataStream>
+#include <QIODevice>
+#include <vector>
+#include <algorithm>
 
 ContextModel::ContextModel(QObject* parent) 
     : QAbstractItemModel(parent), m_rootContext(nullptr) {}
@@ -11,15 +16,34 @@ ContextModel::ContextModel(QObject* parent)
 ContextModel::~ContextModel() {}
 
 void ContextModel::setContext(uLib::ObjectsContext* context) {
+    m_isReseting = true;
     beginResetModel();
     m_rootContext = context;
     if (m_rootContext) {
-        uLib::Object::connect(m_rootContext, &uLib::Object::Updated, [this]() {
+        auto refresh = [this]() {
+            if (this->m_isReseting) return;
+            this->m_isReseting = true;
             this->beginResetModel();
             this->endResetModel();
+            this->m_isReseting = false;
+        };
+
+        uLib::Object::connect(m_rootContext, &uLib::Object::Updated, refresh);
+        uLib::Object::connect(m_rootContext, &uLib::ObjectsContext::ObjectAdded, [this, refresh](uLib::Object* obj) {
+            uLib::Object::connect(obj, &uLib::Object::Updated, refresh);
+            refresh();
         });
+        uLib::Object::connect(m_rootContext, &uLib::ObjectsContext::ObjectRemoved, [this, refresh](uLib::Object* obj) {
+            refresh();
+        });
+
+        // Connect existing objects
+        for (auto* obj : m_rootContext->GetObjects()) {
+            uLib::Object::connect(obj, &uLib::Object::Updated, refresh);
+        }
     }
     endResetModel();
+    m_isReseting = false;
 }
 
 QModelIndex ContextModel::index(int row, int column, const QModelIndex& parent) const {
@@ -33,8 +57,8 @@ QModelIndex ContextModel::index(int row, int column, const QModelIndex& parent)
         }
     } else {
         uLib::Object* parentObj = static_cast<uLib::Object*>(parent.internalPointer());
-        uLib::ObjectsContext* parentCtx = dynamic_cast<uLib::ObjectsContext*>(parentObj);
+        uLib::ObjectsContext* parentCtx = parentObj->GetChildren();
-        if (parentCtx && row < parentCtx->GetCount()) {
+        if (parentCtx && row < (int)parentCtx->GetCount()) {
             return createIndex(row, column, parentCtx->GetObject(row));
         }
     }
@@ -50,36 +74,37 @@ QModelIndex ContextModel::parent(const QModelIndex& child) const {
     
     // Finding the parent of childObj is O(N) since there is no parent pointer.
     // We just do a recursive search starting from root context.
-    std::function<uLib::ObjectsContext*(uLib::ObjectsContext*, uLib::Object*)> findParent = 
+    std::function<uLib::Object*(uLib::Object*, uLib::Object*)> findParent = 
-        [&findParent](uLib::ObjectsContext* ctx, uLib::Object* target) -> uLib::ObjectsContext* {
+        [&findParent](uLib::Object* current, uLib::Object* target) -> uLib::Object* {
-        for (const auto& obj : ctx->GetObjects()) {
+        uLib::ObjectsContext* ctx = current->GetChildren();
-            if (obj == target) return ctx;
+        if (ctx) {
-            if (auto subCtx = dynamic_cast<uLib::ObjectsContext*>(obj)) {
+            for (const auto& obj : ctx->GetObjects()) {
-                if (auto p = findParent(subCtx, target)) return p;
+                if (obj == target) return current;
+                if (auto p = findParent(obj, target)) return p;
             }
         }
         return nullptr;
     };
 
-    uLib::ObjectsContext* parentCtx = findParent(m_rootContext, childObj);
+    uLib::Object* parentObj = findParent(m_rootContext, childObj);
-    if (!parentCtx || parentCtx == m_rootContext) {
+    if (!parentObj || parentObj == m_rootContext) {
         return QModelIndex(); // Root items have invalid parent index
     }
 
-    // Now need to find the row of parentCtx in its own parent Context.
+    // Now need to find the row of parentObj in its own parent Context.
-    uLib::ObjectsContext* grandParentCtx = findParent(m_rootContext, parentCtx);
+    uLib::Object* grandParentObj = findParent(m_rootContext, parentObj);
-    if (!grandParentCtx) grandParentCtx = m_rootContext;
+    uLib::ObjectsContext* grandParentCtx = grandParentObj ? grandParentObj->GetChildren() : m_rootContext;
 
     int row = -1;
     for (size_t i = 0; i < grandParentCtx->GetCount(); ++i) {
-        if (grandParentCtx->GetObject(i) == parentCtx) {
+        if (grandParentCtx->GetObject(i) == parentObj) {
             row = (int)i;
             break;
         }
     }
 
     if (row != -1) {
-        return createIndex(row, 0, parentCtx);
+        return createIndex(row, 0, parentObj);
     }
     return QModelIndex();
 }
@@ -92,8 +117,8 @@ int ContextModel::rowCount(const QModelIndex& parent) const {
     }
 
     uLib::Object* parentObj = static_cast<uLib::Object*>(parent.internalPointer());
-    if (auto parentCtx = dynamic_cast<uLib::ObjectsContext*>(parentObj)) {
+    if (auto parentCtx = parentObj->GetChildren()) {
-        return parentCtx->GetCount();
+        return (int)parentCtx->GetCount();
     }
     return 0; // leaf node
 }
@@ -146,8 +171,98 @@ QVariant ContextModel::headerData(int section, Qt::Orientation orientation, int
 }
 
 Qt::ItemFlags ContextModel::flags(const QModelIndex& index) const {
-    if (!index.isValid()) return Qt::NoItemFlags;
+    if (!index.isValid()) return m_rootContext ? Qt::ItemIsDropEnabled : Qt::NoItemFlags;
-    return Qt::ItemIsEditable | Qt::ItemIsSelectable | Qt::ItemIsEnabled;
+    
+    Qt::ItemFlags f = Qt::ItemIsEditable | Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsDragEnabled;
+    uLib::Object* obj = static_cast<uLib::Object*>(index.internalPointer());
+    if (dynamic_cast<uLib::ObjectsContext*>(obj)) {
+        f |= Qt::ItemIsDropEnabled;
+    }
+    return f;
+}
+
+Qt::DropActions ContextModel::supportedDropActions() const {
+    return Qt::MoveAction;
+}
+
+QStringList ContextModel::mimeTypes() const {
+    return {"application/x-ulib-object-ptr"};
+}
+
+QMimeData* ContextModel::mimeData(const QModelIndexList& indexes) const {
+    QMimeData* mimeData = new QMimeData();
+    QByteArray encodedData;
+    QDataStream stream(&encodedData, QIODevice::WriteOnly);
+    for (const auto& idx : indexes) {
+        if (idx.isValid() && idx.column() == 0) {
+            void* ptr = idx.internalPointer();
+            stream << reinterpret_cast<qlonglong>(ptr);
+        }
+    }
+    mimeData->setData("application/x-ulib-object-ptr", encodedData);
+    return mimeData;
+}
+
+bool ContextModel::dropMimeData(const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent) {
+    if (action != Qt::MoveAction || !data->hasFormat("application/x-ulib-object-ptr")) return false;
+
+    uLib::ObjectsContext* targetCtx = m_rootContext;
+    if (parent.isValid()) {
+        uLib::Object* parentObj = static_cast<uLib::Object*>(parent.internalPointer());
+        targetCtx = dynamic_cast<uLib::ObjectsContext*>(parentObj);
+    }
+    if (!targetCtx) return false;
+
+    QByteArray encodedData = data->data("application/x-ulib-object-ptr");
+    QDataStream stream(&encodedData, QIODevice::ReadOnly);
+    std::vector<uLib::Object*> objectsToMove;
+    while (!stream.atEnd()) {
+        qlonglong ptrVal;
+        stream >> ptrVal;
+        objectsToMove.push_back(reinterpret_cast<uLib::Object*>(ptrVal));
+    }
+
+    if (objectsToMove.empty()) return false;
+
+    // Helper to find and remove from current parent
+    std::function<void(uLib::Object*, uLib::Object*)> findAndRemoveRecursive = 
+        [&findAndRemoveRecursive](uLib::Object* current, uLib::Object* target) {
+        if (auto ctx = current->GetChildren()) {
+            ctx->RemoveObject(target);
+            for (auto* obj : ctx->GetObjects()) {
+                findAndRemoveRecursive(obj, target);
+            }
+        }
+    };
+
+    m_isReseting = true;
+    beginResetModel();
+    for (auto* obj : objectsToMove) {
+        // Don't drop onto itself or its descendants
+        bool invalid = (obj == targetCtx || obj == (uLib::Object*)targetCtx);
+        if (!invalid) {
+             // check if targetCtx is descendant of obj
+             std::function<bool(uLib::Object*, uLib::Object*)> isDescendant = 
+                [&isDescendant](uLib::Object* root, uLib::Object* target) -> bool {
+                 if (auto ctx = root->GetChildren()) {
+                     for (auto* child : ctx->GetObjects()) {
+                         if (child == target) return true;
+                         if (isDescendant(child, target)) return true;
+                     }
+                 }
+                 return false;
+             };
+             if (isDescendant(obj, (uLib::Object*)targetCtx)) invalid = true;
+        }
+        
+        if (!invalid) {
+            findAndRemoveRecursive(m_rootContext, obj);
+            targetCtx->AddObject(obj);
+        }
+    }
+    endResetModel();
+    m_isReseting = false;
+    return true;
 }
 
 bool ContextModel::setData(const QModelIndex& index, const QVariant& value, int role) {

app/gcompose/src/ContextModel.h

@@ -21,8 +21,15 @@ public:
     Qt::ItemFlags flags(const QModelIndex& index) const override;
     bool setData(const QModelIndex& index, const QVariant& value, int role = Qt::EditRole) override;
 
+    // Drag and Drop support
+    Qt::DropActions supportedDropActions() const override;
+    QStringList mimeTypes() const override;
+    QMimeData* mimeData(const QModelIndexList& indexes) const override;
+    bool dropMimeData(const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent) override;
+
 private:
     uLib::ObjectsContext* m_rootContext;
+    bool m_isReseting = false;
 };
 
 #endif // CONTEXT_MODEL_H

app/gcompose/src/ContextPanel.cpp

@@ -38,6 +38,10 @@ ContextPanel::ContextPanel(QWidget* parent)
     m_treeView = new QTreeView(this);
     m_treeView->setObjectName("ContextTree");
     m_treeView->setHeaderHidden(false);
+    m_treeView->setDragEnabled(true);
+    m_treeView->setAcceptDrops(true);
+    m_treeView->setDropIndicatorShown(true);
+    m_treeView->setDragDropMode(QAbstractItemView::DragDrop);
     
     m_model = new ContextModel(this);
     m_treeView->setModel(m_model);
@@ -92,3 +96,27 @@ void ContextPanel::onSelectionChanged(const QItemSelection& selected, const QIte
     emit objectSelected(target);
     m_propertiesPanel->setObject(target);
 }
+
+void ContextPanel::selectObject(uLib::Object* obj) {
+    if (!obj) {
+        clearSelection();
+        return;
+    }
+    
+    for (int i = 0; i < m_model->rowCount(); ++i) {
+        QModelIndex idx = m_model->index(i, 0);
+        if (idx.internalPointer() == obj) {
+            QSignalBlocker blocker(m_treeView->selectionModel());
+            m_treeView->selectionModel()->select(idx, QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows);
+            m_treeView->scrollTo(idx);
+            m_propertiesPanel->setObject(obj); // Explicitly update properties too
+            return;
+        }
+    }
+}
+
+void ContextPanel::clearSelection() {
+    QSignalBlocker blocker(m_treeView->selectionModel());
+    m_treeView->selectionModel()->clearSelection();
+    m_propertiesPanel->setObject(nullptr);
+}

app/gcompose/src/ContextPanel.h

@@ -20,6 +20,8 @@ public:
     ~ContextPanel();
 
     void setContext(uLib::ObjectsContext* context);
+    void selectObject(uLib::Object* obj);
+    void clearSelection();
 
 signals:
     void objectSelected(uLib::Object* obj);

app/gcompose/src/MainPanel.cpp

@@ -14,7 +14,10 @@
 #include <QMenu>
 #include <QAction>
 #include <QApplication>
+#include <QFileDialog>
+#include <QFileInfo>
 #include "StyleManager.h"
+#include "Math/VoxImage.h"
 
 MainPanel::MainPanel(QWidget* parent) : QWidget(parent), m_context(nullptr), m_mainVtkContext(nullptr) {
     this->setObjectName("MainPanel");
@@ -124,6 +127,17 @@ void MainPanel::setContext(uLib::ObjectsContext* context) {
             m_mainVtkContext = new uLib::Vtk::vtkObjectsContext(context);
             // viewport->AddPuppet(*m_mainVtkContext); // redundant
 
+            auto syncSelection = [this](uLib::Vtk::Puppet* p) {
+                if (!p) {
+                    m_contextPanel->clearSelection();
+                    m_firstPane->setObject(nullptr);
+                } else {
+                    m_contextPanel->selectObject(p->GetContent());
+                    m_firstPane->setObject(p);
+                }
+            };
+            connect(viewport, &uLib::Vtk::QViewport::puppetSelected, syncSelection);
+
             uLib::Object::connect(m_mainVtkContext, &uLib::Vtk::vtkObjectsContext::PuppetAdded, [this](uLib::Vtk::Puppet* p) {
                 if (p) {
                     auto panes = this->findChildren<ViewportPane*>();
@@ -179,7 +193,35 @@ void MainPanel::onCreateObject(const std::string& className) {
 }
 
 void MainPanel::onOpen() {
-    // Placeholder for open logic
+    QString fileName = QFileDialog::getOpenFileName(this, "Open File", "", 
+        "VTK/VTI Images (*.vtk *.vti);;All Files (*.*)");
+    
+    if (fileName.isEmpty()) return;
+
+    QFileInfo info(fileName);
+    QString ext = info.suffix().toLower();
+
+    if (ext == "vti" || ext == "vtk") {
+        auto* obj = uLib::ObjectFactory::Instance().Create("VoxImage");
+        auto* vox = dynamic_cast<uLib::Abstract::VoxImage*>(obj);
+        if (vox) {
+            bool success = false;
+            if (ext == "vti") {
+                success = vox->ImportFromVti(fileName.toStdString().c_str());
+            } else {
+                success = vox->ImportFromVtk(fileName.toStdString().c_str());
+            }
+
+            if (success) {
+                obj->SetInstanceName(info.fileName().toStdString());
+                m_context->AddObject(obj);
+            } else {
+                delete obj;
+            }
+        } else {
+            delete obj;
+        }
+    }
 }
 
 void MainPanel::onSave() {

app/gcompose/src/PropertyWidgets.cpp

@@ -2,9 +2,16 @@
 #include <QSignalBlocker>
 #include <QRegularExpression>
 #include <QRegularExpressionMatch>
+#include <QComboBox>
+#include <QCheckBox>
 #include "Vtk/uLibVtkInterface.h"
 #include "Math/Units.h"
 #include "Math/Dense.h"
+#include <QPushButton>
+#include <QColorDialog>
+#include <QFrame>
+#include <QSlider>
+#include "Settings.h"
 
 namespace uLib {
 namespace Qt {
@@ -13,21 +20,38 @@ PropertyWidgetBase::PropertyWidgetBase(PropertyBase* prop, QWidget* parent)
     : QWidget(parent), m_BaseProperty(prop) {
     m_Layout = new QHBoxLayout(this);
     m_Layout->setContentsMargins(4, 2, 4, 2);
-    m_Label = new QLabel(QString::fromStdString(prop->GetName()), this);
+    
-    m_Label->setMinimumWidth(100);
+    std::string unit = prop->GetUnits();
+    QString labelText = QString::fromStdString(prop->GetName());
+    if (!unit.empty() && unit != "color") {
+        auto dim = Settings::Instance().IdentifyDimension(unit);
+        std::string pref = Settings::Instance().GetPreferredUnit(dim);
+        if (!pref.empty()) {
+            labelText += " [" + QString::fromStdString(pref) + "]";
+        } else {
+            labelText += " [" + QString::fromStdString(unit) + "]";
+        }
+    }
+    
+    m_Label = new QLabel(labelText, this);
+    m_Label->setMinimumWidth(120);
     m_Layout->addWidget(m_Label);
+
+    this->setEnabled(!prop->IsReadOnly());
+}
+PropertyWidgetBase::~PropertyWidgetBase() {
+    m_Connection.disconnect();
 }
-PropertyWidgetBase::~PropertyWidgetBase() {}
 
 // Helper for unit parsing
-static double parseWithUnits(const QString& text, double* factorOut = nullptr, QString* suffixOut = nullptr) {
+double parseWithUnits(const QString& text, double* factorOut, QString* suffixOut) {
     static QRegularExpression re("^\\s*([-+]?[0-9]*\\.?[0-9]+([eE][-+]?[0-9]+)?)\\s*(_?[a-zA-Z]+)?\\s*$");
     QRegularExpressionMatch match = re.match(text);
     if (!match.hasMatch()) return 0.0;
 
     double num = match.captured(1).toDouble();
     QString unit = match.captured(3);
-    double factor = 1.0;
+    double factor = factorOut ? *factorOut : 1.0;
 
     if (!unit.isEmpty()) {
         QString u = unit.startsWith('_') ? unit.mid(1) : unit;
@@ -57,14 +81,23 @@ static double parseWithUnits(const QString& text, double* factorOut = nullptr, Q
 }
 
 // UnitLineEdit implementation
-UnitLineEdit::UnitLineEdit(QWidget* parent) : QLineEdit(parent), m_Value(0), m_Factor(1.0), m_Suffix("mm"), m_IsInteger(false) {
+UnitLineEdit::UnitLineEdit(QWidget* parent) : QLineEdit(parent), m_Value(0), m_Factor(1.0), m_Suffix(""), m_IsInteger(false) {
     connect(this, &QLineEdit::editingFinished, this, &UnitLineEdit::onEditingFinished);
 }
 
+void UnitLineEdit::setUnits(const QString& suffix, double factor) {
+    m_Suffix = suffix;
+    m_Factor = factor;
+    updateText();
+}
+
 void UnitLineEdit::setValue(double val) {
     if (m_Value != val) {
         m_Value = val;
-        // Initial heuristic for unit if it was mm and value becomes large
+        // Suffix heuristic ONLY if it was mm and no explicit unit was given?
+        // Actually, if m_Suffix is empty or we have a specific one, we should respect it.
+        // The original code had a heuristic, but it's better to let property decide.
+        // Let's keep it ONLY if m_Suffix was mm (legacy behavior)
         if (!m_IsInteger && m_Suffix == "mm" && std::abs(val) >= 1000.0) { m_Suffix = "m"; m_Factor = CLHEP::meter; }
         updateText();
     }
@@ -74,10 +107,6 @@ void UnitLineEdit::onEditingFinished() {
     double factor = m_Factor;
     QString suffix = m_Suffix;
     double parsedVal = parseWithUnits(text(), &factor, &suffix);
-    if (!suffix.isEmpty()) {
-        m_Suffix = suffix;
-        m_Factor = factor;
-    }
     if (m_IsInteger) {
         parsedVal = std::round(parsedVal);
     }
@@ -91,12 +120,18 @@ void UnitLineEdit::onEditingFinished() {
 
 void UnitLineEdit::updateText() {
     QSignalBlocker blocker(this);
+    QString s;
     if (m_IsInteger) {
-        setText(QString::number((int)m_Value));
+        s = QString::number((int)m_Value);
+        if (s.isEmpty()) s = "0";
     } else {
         double displayVal = m_Value / m_Factor;
-        setText(QString::number(displayVal, 'g', 6) + " " + m_Suffix);
+        s = QString::number(displayVal, 'g', 6);
+        if (!s.contains('.') && !s.contains('e')) {
+            s += ".0";
+        }
     }
+    setText(s);
 }
 
 void UnitLineEdit::setIntegerOnly(bool integerOnly) {
@@ -107,10 +142,17 @@ void UnitLineEdit::setIntegerOnly(bool integerOnly) {
 DoublePropertyWidget::DoublePropertyWidget(Property<double>* prop, QWidget* parent)
     : PropertyWidgetBase(prop, parent), m_Prop(prop) {
     m_Edit = new UnitLineEdit(this);
-    m_Layout->addWidget(m_Edit, 1);
+    std::string unit = prop->GetUnits();
+    if (!unit.empty()) {
+        auto dim = Settings::Instance().IdentifyDimension(unit);
+        std::string pref = Settings::Instance().GetPreferredUnit(dim);
+        double factor = Settings::Instance().GetUnitFactor(pref);
+        m_Edit->setUnits(QString::fromStdString(pref), factor);
+    }
     m_Edit->setValue(prop->Get());
+    m_Layout->addWidget(m_Edit, 1);
     connect(m_Edit, &UnitLineEdit::valueManualChanged, [this](double val){ m_Prop->Set(val); });
-    uLib::Object::connect(m_Prop, &Property<double>::PropertyChanged, [this](){
+    m_Connection = uLib::Object::connect(m_Prop, &Property<double>::Updated, [this](){
         m_Edit->setValue(m_Prop->Get());
     });
 }
@@ -118,10 +160,17 @@ DoublePropertyWidget::DoublePropertyWidget(Property<double>* prop, QWidget* pare
 FloatPropertyWidget::FloatPropertyWidget(Property<float>* prop, QWidget* parent)
     : PropertyWidgetBase(prop, parent), m_Prop(prop) {
     m_Edit = new UnitLineEdit(this);
-    m_Layout->addWidget(m_Edit, 1);
+    std::string unit = prop->GetUnits();
+    if (!unit.empty()) {
+        auto dim = Settings::Instance().IdentifyDimension(unit);
+        std::string pref = Settings::Instance().GetPreferredUnit(dim);
+        double factor = Settings::Instance().GetUnitFactor(pref);
+        m_Edit->setUnits(QString::fromStdString(pref), factor);
+    }
     m_Edit->setValue(prop->Get());
+    m_Layout->addWidget(m_Edit, 1);
     connect(m_Edit, &UnitLineEdit::valueManualChanged, [this](double val){ m_Prop->Set((float)val); });
-    uLib::Object::connect(m_Prop, &Property<float>::PropertyChanged, [this](){
+    m_Connection = uLib::Object::connect(m_Prop, &Property<float>::Updated, [this](){
         m_Edit->setValue((double)m_Prop->Get());
     });
 }
@@ -130,10 +179,17 @@ IntPropertyWidget::IntPropertyWidget(Property<int>* prop, QWidget* parent)
     : PropertyWidgetBase(prop, parent), m_Prop(prop) {
     m_Edit = new UnitLineEdit(this);
     m_Edit->setIntegerOnly(true);
-    m_Layout->addWidget(m_Edit, 1);
+    std::string unit = prop->GetUnits();
+    if (!unit.empty()) {
+        auto dim = Settings::Instance().IdentifyDimension(unit);
+        std::string pref = Settings::Instance().GetPreferredUnit(dim);
+        double factor = Settings::Instance().GetUnitFactor(pref);
+        m_Edit->setUnits(QString::fromStdString(pref), factor);
+    }
     m_Edit->setValue(prop->Get());
+    m_Layout->addWidget(m_Edit, 1);
     connect(m_Edit, &UnitLineEdit::valueManualChanged, [this](double val){ m_Prop->Set((int)val); });
-    uLib::Object::connect(m_Prop, &Property<int>::PropertyChanged, [this](){
+    m_Connection = uLib::Object::connect(m_Prop, &Property<int>::Updated, [this](){
         m_Edit->setValue((double)m_Prop->Get());
     });
 }
@@ -144,7 +200,7 @@ BoolPropertyWidget::BoolPropertyWidget(Property<bool>* prop, QWidget* parent)
     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); });
-    uLib::Object::connect(m_Prop, &Property<bool>::PropertyChanged, [this](){
+    m_Connection = uLib::Object::connect(m_Prop, &Property<bool>::Updated, [this](){
         if (m_CheckBox->isChecked() != m_Prop->Get()) {
             QSignalBlocker blocker(m_CheckBox);
             m_CheckBox->setChecked(m_Prop->Get());
@@ -153,16 +209,86 @@ BoolPropertyWidget::BoolPropertyWidget(Property<bool>* prop, QWidget* parent)
 }
 BoolPropertyWidget::~BoolPropertyWidget() {}
 
+RangePropertyWidget::RangePropertyWidget(Property<double>* prop, QWidget* parent) 
+    : PropertyWidgetBase(prop, parent), m_Prop(prop) {
+    m_Slider = new QSlider(::Qt::Horizontal, this);
+    m_Slider->setRange(0, 100);
+    m_Slider->setMinimumWidth(80);
+    
+    m_Edit = new UnitLineEdit(this);
+    m_Edit->setFixedWidth(50);
+    
+    m_Layout->addWidget(m_Slider, 1);
+    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); });
+    
+    m_Connection = uLib::Object::connect(m_Prop, &Property<double>::Updated, [this](){
+        this->updateUi();
+    });
+    updateUi();
+}
+RangePropertyWidget::~RangePropertyWidget() { m_Connection.disconnect(); }
+
+void RangePropertyWidget::updateUi() {
+    double val = m_Prop->Get();
+    m_Edit->setValue(val);
+    if (m_Prop->GetMax() != m_Prop->GetMin()) {
+        int sliderVal = (int)((val - m_Prop->GetMin()) / (m_Prop->GetMax() - m_Prop->GetMin()) * 100.0);
+        QSignalBlocker blocker(m_Slider);
+        m_Slider->setValue(sliderVal);
+    }
+}
+
+void RangePropertyWidget::onSliderChanged(int val) {
+    double realVal = m_Prop->GetMin() + (val / 100.0) * (m_Prop->GetMax() - m_Prop->GetMin());
+    m_Prop->Set(realVal);
+}
+
+ColorPropertyWidget::ColorPropertyWidget(Property<Vector3d>* prop, QWidget* parent) 
+    : PropertyWidgetBase(prop, parent), m_Prop(prop) {
+    m_Button = new QPushButton(this);
+    m_Button->setFixedWidth(60);
+    this->updateButtonColor();
+    m_Layout->addWidget(m_Button, 0, ::Qt::AlignRight);
+    
+    connect(m_Button, &QPushButton::clicked, this, &ColorPropertyWidget::onClicked);
+    m_Connection = uLib::Object::connect(m_Prop, &Property<Vector3d>::Updated, [this](){
+        this->updateButtonColor();
+    });
+}
+ColorPropertyWidget::~ColorPropertyWidget() {}
+
+void ColorPropertyWidget::updateButtonColor() {
+    Vector3d c = m_Prop->Get();
+    QColor color = QColor::fromRgbF(std::max(0.0, std::min(1.0, c.x())), 
+                                    std::max(0.0, std::min(1.0, c.y())), 
+                                    std::max(0.0, std::min(1.0, c.z())));
+    m_Button->setStyleSheet(QString("background-color: %1; border: 1px solid #555; height: 18px;").arg(color.name()));
+}
+
+void ColorPropertyWidget::onClicked() {
+    Vector3d c = m_Prop->Get();
+    QColor current = QColor::fromRgbF(std::max(0.0, std::min(1.0, c.x())), 
+                                      std::max(0.0, std::min(1.0, c.y())), 
+                                      std::max(0.0, std::min(1.0, c.z())));
+    QColor selected = QColorDialog::getColor(current, this, "Select Color");
+    if (selected.isValid()) {
+        m_Prop->Set(Vector3d(selected.redF(), selected.greenF(), selected.blueF()));
+    }
+}
+
 StringPropertyWidget::StringPropertyWidget(Property<std::string>* prop, QWidget* parent)
     : PropertyWidgetBase(prop, parent), m_Prop(prop) {
     m_LineEdit = new QLineEdit(this);
     m_LineEdit->setText(QString::fromStdString(prop->Get()));
     m_Layout->addWidget(m_LineEdit, 1);
-    connect(m_LineEdit, &QLineEdit::editingFinished, [this](){ 
+    connect(m_LineEdit, &QLineEdit::editingFinished, [this](){
         std::string val = m_LineEdit->text().toStdString();
-        if (m_Prop->Get() != val) m_Prop->Set(val); 
+        if (m_Prop->Get() != val) m_Prop->Set(val);
     });
-    uLib::Object::connect(m_Prop, &Property<std::string>::PropertyChanged, [this](){
+    m_Connection = uLib::Object::connect(m_Prop, &Property<std::string>::Updated, [this](){
         if (m_LineEdit->text().toStdString() != m_Prop->Get()) {
             QSignalBlocker blocker(m_LineEdit);
             m_LineEdit->setText(QString::fromStdString(m_Prop->Get()));
@@ -171,6 +297,57 @@ StringPropertyWidget::StringPropertyWidget(Property<std::string>* prop, QWidget*
 }
 StringPropertyWidget::~StringPropertyWidget() {}
 
+class GroupHeaderWidget : public QWidget {
+public:
+    GroupHeaderWidget(const QString& name, QWidget* parent = nullptr) : QWidget(parent) {
+        auto* layout = new QVBoxLayout(this);
+        layout->setContentsMargins(0, 8, 0, 4);
+        auto* line = new QFrame(this);
+        line->setFrameShape(QFrame::HLine);
+        line->setFrameShadow(QFrame::Sunken);
+        line->setStyleSheet("color: #555;");
+        layout->addWidget(line);
+        auto* label = new QLabel(name, this);
+        QFont font = label->font();
+        font.setBold(true);
+        font.setPointSize(font.pointSize() + 1);
+        label->setFont(font);
+        label->setStyleSheet("color: #aaa; text-transform: uppercase;");
+        layout->addWidget(label);
+    }
+};
+
+class EnumPropertyWidget : public PropertyWidgetBase {
+    PropertyBase* m_Prop;
+    QComboBox* m_Combo;
+public:
+    EnumPropertyWidget(PropertyBase* prop, QWidget* parent)
+        : PropertyWidgetBase(prop, parent), m_Prop(prop) {
+        m_Combo = new QComboBox(this);
+        const auto& labels = prop->GetEnumLabels();
+        for (const auto& label : labels) {
+            m_Combo->addItem(QString::fromStdString(label));
+        }
+
+        // Get initial value
+        if (auto* p = dynamic_cast<Property<int>*>(prop)) {
+            m_Combo->setCurrentIndex(p->Get());
+            connect(m_Combo, &QComboBox::currentIndexChanged, [p](int index){
+                p->Set(index);
+            });
+            // Store connection in base m_Connection so it's auto-disconnected on destruction.
+            m_Connection = uLib::Object::connect(p, &Property<int>::Updated, [this, p](){
+                if (m_Combo->currentIndex() != p->Get()) {
+                    QSignalBlocker blocker(m_Combo);
+                    m_Combo->setCurrentIndex(p->Get());
+                }
+            });
+        }
+
+        m_Layout->addWidget(m_Combo, 1);
+    }
+};
+
 PropertyEditor::PropertyEditor(QWidget* parent) : QWidget(parent), m_Object(nullptr) {
     m_MainLayout = new QVBoxLayout(this);
     m_MainLayout->setContentsMargins(0, 0, 0, 0);
@@ -197,6 +374,11 @@ 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);
     });
+    
+    // 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) {
+        return new EnumPropertyWidget(p, parent);
+    };
 
     // Vector Registration
     registerFactory<Vector2i>([](PropertyBase* p, QWidget* parent){ return new VectorPropertyWidget<Vector2i, 2>(static_cast<Property<Vector2i>*>(p), parent); });
@@ -229,15 +411,63 @@ void PropertyEditor::setObject(::uLib::Object* obj, bool displayOnly) {
         }
     }
 
+    // Group properties by their group string
+    std::map<std::string, std::vector<::uLib::PropertyBase*>> groupedProps;
+    std::vector<std::string> groupOrder;
+    
     for (auto* prop : *props) {
-        auto it = m_Factories.find(prop->GetTypeIndex());
+        std::string group = prop->GetGroup();
-        if (it != m_Factories.end()) {
+        if (groupedProps.find(group) == groupedProps.end()) {
-            QWidget* widget = it->second(prop, m_Container);
+            groupOrder.push_back(group);
-            m_ContainerLayout->addWidget(widget);
+        }
-        } else {
+        groupedProps[group].push_back(prop);
-            QWidget* fallback = new PropertyWidgetBase(prop, m_Container);
+    }
-            fallback->layout()->addWidget(new QLabel("(Read-only: " + QString::fromStdString(prop->GetValueAsString()) + ")"));
+
-            m_ContainerLayout->addWidget(fallback);
+    for (const auto& groupName : groupOrder) {
+        if (!groupName.empty()) {
+            m_ContainerLayout->addWidget(new GroupHeaderWidget(QString::fromStdString(groupName), m_Container));
+        }
+
+        for (auto* prop : groupedProps[groupName]) {
+            QWidget* widget = nullptr;
+            
+            // Priority 1: Check if it provides enum labels
+            if (!prop->GetEnumLabels().empty()) {
+                widget = new EnumPropertyWidget(prop, m_Container);
+            } else if (prop->GetUnits() == "color") {
+                // Color Picker for Vector3d
+                if (auto* pvec = dynamic_cast<Property<Vector3d>*>(prop)) {
+                    widget = new ColorPropertyWidget(pvec, m_Container);
+                }
+            } else if (prop->HasRange()) {
+                // Slider for ranged doubles
+                if (auto* pdbl = dynamic_cast<Property<double>*>(prop)) {
+                    widget = new RangePropertyWidget(pdbl, m_Container);
+                } else if (auto* pflt = dynamic_cast<Property<float>*>(prop)) {
+                     // widget = new RangePropertyWidget<float>(pflt, m_Container);
+                }
+            } else {
+                // Priority 2: Standard factory lookup
+                    auto it = m_Factories.find(prop->GetTypeIndex());
+                    if (it != m_Factories.end()) {
+                        widget = it->second(prop, m_Container);
+                    } else {
+                    // Debug info for unknown types
+                    std::cout << "PropertyEditor: No factory for " << prop->GetQualifiedName() 
+                              << " (Type: " << prop->GetTypeName() << ")" << std::endl;
+
+                        widget = new PropertyWidgetBase(prop, m_Container);
+                    widget->layout()->addWidget(new QLabel("(Read-only: " + QString::fromStdString(prop->GetValueAsString()) + ")"));
+                    }
+            }
+
+            if (widget) {
+                if (!groupName.empty()) {
+                    // Indent grouped properties
+                    widget->setContentsMargins(16, 0, 0, 0);
+                }
+                m_ContainerLayout->addWidget(widget);
+            }
         }
     }
     m_ContainerLayout->addStretch(1);

app/gcompose/src/PropertyWidgets.h

@@ -2,6 +2,8 @@
 #define PROPERTY_WIDGETS_H
 
 #include <QWidget>
+class QPushButton;
+class QSlider;
 #include <QLabel>
 #include <QHBoxLayout>
 #include <QVBoxLayout>
@@ -14,11 +16,15 @@
 
 #include "Core/Property.h"
 #include "Core/Object.h"
+#include "Core/Signal.h"
 #include "Math/Dense.h"
+#include "Settings.h"
 
 namespace uLib {
 namespace Qt {
 
+double parseWithUnits(const QString& text, double* factorOut = nullptr, QString* suffixOut = nullptr);
+
 class PropertyWidgetBase : public QWidget {
     Q_OBJECT
 public:
@@ -30,6 +36,9 @@ protected:
     PropertyBase* m_BaseProperty;
     QHBoxLayout* m_Layout;
     QLabel* m_Label;
+    // Stores the uLib signal connection so it can be disconnected on destruction,
+    // preventing use-after-free when PropertyEditor::clear() deletes widgets.
+    Connection m_Connection;
 };
 
 class UnitLineEdit : public QLineEdit {
@@ -37,6 +46,7 @@ class UnitLineEdit : public QLineEdit {
 public:
     UnitLineEdit(QWidget* parent = nullptr);
     void setValue(double val);
+    void setUnits(const QString& suffix, double factor = 1.0);
     double getValue() const { return m_Value; }
     void setIntegerOnly(bool b);
 
@@ -86,11 +96,26 @@ class VectorPropertyWidget : public PropertyWidgetBase {
 public:
     VectorPropertyWidget(Property<VecT>* prop, QWidget* parent = nullptr)
         : PropertyWidgetBase(prop, parent), m_Prop(prop) {
+        
+        std::string unit = prop->GetUnits();
+        double factor = 1.0;
+        QString prefSuffix;
+        if (!unit.empty()) {
+            auto dim = Settings::Instance().IdentifyDimension(unit);
+            std::string pref = Settings::Instance().GetPreferredUnit(dim);
+            factor = Settings::Instance().GetUnitFactor(pref);
+            prefSuffix = QString::fromStdString(pref);
+        }
+
         for (int i = 0; i < Size; ++i) {
             m_Edits[i] = new UnitLineEdit(this);
             if (std::is_integral<typename VecT::Scalar>::value) {
                 m_Edits[i]->setIntegerOnly(true);
             }
+            if (!prefSuffix.isEmpty()) {
+               m_Edits[i]->setUnits(prefSuffix, factor);
+            }
+            m_Edits[i]->setEnabled(!prop->IsReadOnly());
             m_Layout->addWidget(m_Edits[i], 1);
             
             connect(m_Edits[i], &UnitLineEdit::valueManualChanged, [this, i](double val){
@@ -100,10 +125,11 @@ public:
             });
         }
         updateEdits();
-        uLib::Object::connect(m_Prop, &Property<VecT>::PropertyChanged, [this](){
+        m_Connection = uLib::Object::connect(m_Prop, &Property<VecT>::Updated, [this](){
             updateEdits();
         });
     }
+    ~VectorPropertyWidget() { m_Connection.disconnect(); }
 
 private:
     void updateEdits() {
@@ -118,6 +144,20 @@ private:
     UnitLineEdit* m_Edits[Size];
 };
 
+class RangePropertyWidget : public PropertyWidgetBase {
+    Q_OBJECT
+public:
+    RangePropertyWidget(Property<double>* prop, QWidget* parent = nullptr);
+    virtual ~RangePropertyWidget();
+private slots:
+    void onSliderChanged(int val);
+private:
+    void updateUi();
+    Property<double>* m_Prop;
+    QSlider* m_Slider;
+    UnitLineEdit* m_Edit;
+};
+
 class BoolPropertyWidget : public PropertyWidgetBase {
     Q_OBJECT
 public:
@@ -128,6 +168,19 @@ private:
     QCheckBox* m_CheckBox;
 };
 
+class ColorPropertyWidget : public PropertyWidgetBase {
+    Q_OBJECT
+public:
+    ColorPropertyWidget(Property<Vector3d>* prop, QWidget* parent = nullptr);
+    virtual ~ColorPropertyWidget();
+private slots:
+    void onClicked();
+private:
+    void updateButtonColor();
+    Property<Vector3d>* m_Prop;
+    QPushButton* m_Button;
+};
+
 class StringPropertyWidget : public PropertyWidgetBase {
     Q_OBJECT
 public:

app/gcompose/src/Settings.h

@@ -0,0 +1,75 @@
+#ifndef GCOMPOSE_SETTINGS_H
+#define GCOMPOSE_SETTINGS_H
+
+#include <string>
+#include <map>
+#include "Math/Units.h"
+
+namespace uLib {
+namespace Qt {
+
+class Settings {
+public:
+    static Settings& Instance() {
+        static Settings instance;
+        return instance;
+    }
+
+    enum Dimension {
+        Length,
+        Angle,
+        Energy,
+        Time,
+        Dimensionless
+    };
+
+    void SetPreferredUnit(Dimension dim, const std::string& unit) {
+        m_PreferredUnits[dim] = unit;
+    }
+
+    std::string GetPreferredUnit(Dimension dim) const {
+        auto it = m_PreferredUnits.find(dim);
+        if (it != m_PreferredUnits.end()) return it->second;
+        
+        switch(dim) {
+            case Length: return "mm";
+            case Angle: return "deg";
+            case Energy: return "MeV";
+            case Time: return "ns";
+            default: return "";
+        }
+    }
+
+    double GetUnitFactor(const std::string& unit) const {
+        if (unit == "m") return CLHEP::meter;
+        if (unit == "cm") return CLHEP::centimeter;
+        if (unit == "mm") return CLHEP::millimeter;
+        if (unit == "um") return CLHEP::micrometer;
+        if (unit == "deg") return CLHEP::degree;
+        if (unit == "rad") return CLHEP::radian;
+        if (unit == "ns") return CLHEP::nanosecond;
+        if (unit == "s") return CLHEP::second;
+        if (unit == "ms") return CLHEP::millisecond;
+        if (unit == "MeV") return CLHEP::megaelectronvolt;
+        if (unit == "GeV") return CLHEP::gigaelectronvolt;
+        if (unit == "eV") return CLHEP::electronvolt;
+        return 1.0;
+    }
+
+    Dimension IdentifyDimension(const std::string& unit) const {
+        if (unit == "m" || unit == "cm" || unit == "mm" || unit == "um" || unit == "nm") return Length;
+        if (unit == "deg" || unit == "rad") return Angle;
+        if (unit == "MeV" || unit == "GeV" || unit == "eV" || unit == "keV" || unit == "TeV") return Energy;
+        if (unit == "ns" || unit == "s" || unit == "ms" || unit == "us") return Time;
+        return Dimensionless;
+    }
+
+private:
+    Settings() {}
+    std::map<Dimension, std::string> m_PreferredUnits;
+};
+
+} // namespace Qt
+} // namespace uLib
+
+#endif

app/gcompose/src/ViewportPane.cpp

@@ -46,23 +46,25 @@ ViewportPane::ViewportPane(QWidget* parent) : QWidget(parent), m_viewport(nullpt
 
     m_layout->addWidget(m_titleBar);
 
-    // Main horizontal container for viewport and display panel
+    // Main area with splitter for viewport and display panel
-    QWidget* mainArea = new QWidget(this);
+    m_areaSplitter = new QSplitter(Qt::Horizontal, this);
-    QHBoxLayout* hLayout = new QHBoxLayout(mainArea);
+    m_areaSplitter->setObjectName("ViewportAreaSplitter");
-    hLayout->setContentsMargins(0, 0, 0, 0);
+    m_layout->addWidget(m_areaSplitter, 1);
-    hLayout->setSpacing(0);
-    m_layout->addWidget(mainArea);
 
     // Viewport will be added here via setViewport
-    m_viewport = new uLib::Vtk::QViewport(mainArea);
+    m_viewport = new uLib::Vtk::QViewport(m_areaSplitter);
-    hLayout->addWidget(m_viewport);
+    m_areaSplitter->addWidget(m_viewport);
 
     // Display Panel (Overlay/Slide-out)
-    m_displayPanel = new QFrame(mainArea);
+    m_displayPanel = new QFrame(m_areaSplitter);
     m_displayPanel->setObjectName("DisplayPropertiesPanel");
-    m_displayPanel->setFixedWidth(250);
+    m_displayPanel->setMinimumWidth(150);
     m_displayPanel->hide();
     
+    m_areaSplitter->addWidget(m_displayPanel);
+    m_areaSplitter->setStretchFactor(0, 1);
+    m_areaSplitter->setStretchFactor(1, 0);
+    
     QVBoxLayout* panelLayout = new QVBoxLayout(m_displayPanel);
     panelLayout->setContentsMargins(5, 5, 5, 5);
     
@@ -72,8 +74,6 @@ ViewportPane::ViewportPane(QWidget* parent) : QWidget(parent), m_viewport(nullpt
 
     m_displayEditor = new uLib::Qt::PropertyEditor(m_displayPanel);
     panelLayout->addWidget(m_displayEditor);
-    
-    hLayout->addWidget(m_displayPanel);
 
     connect(m_toggleBtn, &QPushButton::toggled, this, &ViewportPane::toggleDisplayPanel);
     connect(m_titleBar, &QWidget::customContextMenuRequested, this, &ViewportPane::showContextMenu);
@@ -85,7 +85,15 @@ ViewportPane::ViewportPane(QWidget* parent) : QWidget(parent), m_viewport(nullpt
 ViewportPane::~ViewportPane() {}
 
 void ViewportPane::toggleDisplayPanel() {
-    m_displayPanel->setVisible(m_toggleBtn->isChecked());
+    bool visible = m_toggleBtn->isChecked();
+    m_displayPanel->setVisible(visible);
+    if (visible && m_areaSplitter->sizes().value(1, 0) == 0) {
+        QList<int> sizes = m_areaSplitter->sizes();
+        int total = sizes[0] + sizes[1];
+        sizes[1] = 250;
+        sizes[0] = total - 250;
+        m_areaSplitter->setSizes(sizes);
+    }
 }
 
 void ViewportPane::setObject(uLib::Object* obj) {
@@ -107,15 +115,14 @@ void ViewportPane::setObject(uLib::Object* obj) {
 
 void ViewportPane::setViewport(QWidget* viewport, const QString& title) {
     if (m_viewport) {
-        m_viewport->parentWidget()->layout()->removeWidget(m_viewport);
         delete m_viewport;
     }
     m_viewport = viewport;
     m_titleLabel->setText(title);
 
     m_viewport->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
-    auto* mainAreaLayout = static_cast<QHBoxLayout*>(m_displayPanel->parentWidget()->layout());
+    m_areaSplitter->insertWidget(0, m_viewport);
-    mainAreaLayout->insertWidget(0, m_viewport);
+    m_areaSplitter->setStretchFactor(0, 1);
 }
 
 void ViewportPane::addVtkViewport() {

app/gcompose/src/ViewportPane.h

@@ -10,6 +10,7 @@ namespace uLib {
     namespace Qt { class PropertyEditor; }
 }
 
+class QSplitter;
 class QVBoxLayout;
 class QLabel;
 
@@ -39,6 +40,7 @@ private:
     QVBoxLayout* m_layout;
     QWidget* m_titleBar;
     QLabel* m_titleLabel;
+    QSplitter* m_areaSplitter;
     QWidget* m_viewport;
 
     // Display Properties Overlay

docs/archives.md

@@ -0,0 +1,84 @@
+# Serialization and Archives Internals
+
+This document explains the internal design of the `uLib` serialization system, which is built on top of **Boost.Serialization**. It provides custom archive implementations for various formats (XML, Text, Logging) and introduces **Human Readable Pairs (HRP)** for metadata-rich serialization.
+
+---
+
+## Architecture Overview
+
+The `uLib` archive system extends the standard `boost::archive` templates to add domain-specific features. The main components are:
+
+1.  **Custom Interface Layer**: Extends the default Boost archive API with additional operators and utilities.
+2.  **Specialized Archive Implementations**: Specialized classes for XML, Text, and Logging.
+3.  **HRP Support**: First-class support for `hrp` (Human Readable Pair) wrappers, which carry units, ranges, and descriptions.
+4.  **Static Registration System**: Macros and explicit instantiations to handle polymorphic types and compilation isolation.
+
+---
+
+## Custom Interface Layer
+
+All `uLib` archives use a custom interface defined in `Archives.h` via `uLib_interface_iarchive` and `uLib_interface_oarchive`. These templates add several key features:
+
+| Feature | Operator/Method | Description |
+|---|---|---|
+| **Mapping Operator** | `operator==` | Aliased to `operator&` (Boost's standard mapping operator). |
+| **Trace Operator** | `operator!=` | Used for trace/debug output of strings during serialization. |
+| **Type Registration** | `register_type<T>()` | Registers a class type with the archive's internal serializer map. |
+| **Standard IO** | `operator<<` / `operator>>` | Standard redirect for saving and loading. |
+
+These interfaces are applied to the archives using template specialization of `boost::archive::detail::interface_iarchive` and `interface_oarchive`.
+
+---
+
+## Archive Variants
+
+### XML Archives (`xml_iarchive`, `xml_oarchive`)
+These inherit from `boost::archive::xml_iarchive_impl` and `xml_oarchive_impl`. 
+- **Internals**: They override `load_override` and `save_override` to handle `boost::serialization::hrp<T>` specifically. 
+- **XML Mapping**: When saving an `hrp`, it uses `save_start(name)` and `save_end(name)` to wrap the value in a named XML tag.
+
+### Text Archives (`text_iarchive`, `text_oarchive`)
+Standard text-based archives used for compact serialization. They use `StringReader` to consume decorative text markers during loading.
+
+### Human Readable Text (`hrt_iarchive`, `hrt_oarchive`)
+These are "naked" text archives that suppress most of Boost's internal metadata (object IDs, class IDs, versions).
+- **Goal**: Produce text output that is easy for humans to read and edit.
+- **Internals**: All overrides for Boost internal types (like `object_id_type`, `version_type`, etc.) are implemented as no-ops.
+
+### Log Archive (`log_archive`)
+An XML-based output archive specifically for debug logging.
+- **Internals**: It forces every object into a Name-Value Pair (NVP) even if not provided by the user, and strips all technical metadata to keep the logs clean.
+
+---
+
+## HRP (Human Readable Pair) Integration
+
+`hrp` is a core `uLib` wrapper (defined in `Serializable.h`) that extends Boost's `nvp`:
+
+```cpp
+// Example of HRP usage
+ar & HRP2("Energy", m_energy, "MeV").range(0, 100);
+```
+
+### Internal Handling in Archives
+Archives in `Archives.h` provide specific `save_override`/`load_override` for `hrp<T>`:
+- **XML**: Maps the `name()` to an XML tag.
+- **HRT**: Formats as `name: value [units]\n`.
+- **Log**: Converts it to a standard Boost `nvp` for consistent XML logging.
+
+---
+
+## Registration and Polymorphism
+
+### Registration Macro
+The `ULIB_SERIALIZATION_REGISTER_ARCHIVE(Archive)` macro is crucial for polymorphic serialization. It instantiates the necessary template machinery to link the custom `Archive` type with any `Serializable` class exported via `BOOST_CLASS_EXPORT`.
+
+### Explicit Instantiation
+To reduce compilation times and provide a single point of failure for link-time issues, `uLib` uses explicit instantiations in `src/Core/Archives.cpp`. This file includes the `.ipp` implementation files from Boost and instantiates the `archive_serializer_map` and implementation classes for all `uLib` archive types.
+
+---
+
+## Utility: StringReader
+The `StringReader` utility is used internally by text-based archives to parse and skip literals. For example:
+- When loading a string literal from a text archive, `StringReader` consumes whitespace and ensures the stream matches the expected string, failing if there is a mismatch.
+- This is vital for maintaining the structure of human-readable formats.

docs/geant_integration.md

@@ -0,0 +1,11 @@
+# Geant integration
+
+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 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 ).

docs/update_properties.md

@@ -0,0 +1,94 @@
+
+# Properties and the vtk-gui representation
+
+This is the rationale behind the connection between TRS properties and Puppet Transformation.
+
+The properties from model get propoagated via Object signalling system (the Update signal) to the vtkRepresentation and to the Qt widgets so that the overall transformation of the model reflects into a modification of its representation in vtk and in the gui. 
+
+In addition the properties need to be adjusted also from vtk, for example if user uses handlerwidget to change the transformation this is eventually applied to Puppet and Puppet should propagate the transformation change to the vtk representation object (for instance vtkContainerBox) and the latter eventually propagates the change into the model.
+
+the Puppet or the vtk representation wrapper ( vtkContainerBox for instance is the wrapper od ContainerBox ) should not directly show the transformation of the handlerwidget but it should show the transformation of the model once applied so we are always seeing the actual aspect of the model reflected to the vtk representation and not the other way around.
+
+So in syntesis the model is the master and the vtk representation and the gui are the slaves of any modification, but the vtkHandlerWidget is able to apply a transform that should be applied to the model and then the model should propagate the transformation change to the vtk representation and to the gui.
+
+## The Puppet
+
+The puppet is the proxy of the spatial placement of objects in the scene. Puppets should have an internal ContainerBox that is shown in the scene around the content to be able to pick Puppet from vtkViewport using the handler widget. The HandlerWidget moves the Puppet ContainerBox (the red Highlight element whe selected) to reflect the handler current transformation, but the transformation is propagated to the derived Puppet classes like vtkContainerBox. 
+
+The vtkHandlerWidget should handle the transformation of the puppet internal ContainerBox. The changes of the ContainerBox will be propagated to the derived classes and eventually to the model. 
+
+
+
+
+
+
+## ACTIVATE PROPERTIES
+
+ULIB_ACTIVATE_PROPERTIES must run after all member initialization, with the vtable pointing to the most-derived type. This is why it has to be in each constructor — in C++, virtual dispatch only works correctly after a class's vtable is installed, which happens at the start of each level's constructor body.
+
+### Option 1 — End-of-class macro (no constructor boilerplate)
+Declare a private member activator as the last member of the class. Its constructor runs after all other members, and at that point the vtable is already Derived's:
+
+
+// In Property.h, add alongside ULIB_ACTIVATE_PROPERTIES:
+#define ULIB_DECLARE_PROPERTIES(SelfType) \
+private: \
+    struct _PropActivator { \
+        _PropActivator(SelfType* self) { \
+            uLib::Archive::property_register_archive ar(self); \
+            ar & *self; \
+        } \
+    } _prop_activator{this};
+Usage in ContainerBox.h — place it just before the closing brace:
+
+
+class ContainerBox : public TRS {
+public:
+    // ... all constructors, no more ULIB_ACTIVATE_PROPERTIES(*this)
+
+    ULIB_DECLARE_PROPERTIES(ContainerBox)  // ← replaces all 3 constructor calls
+};
+Tradeoff: Works perfectly for single-level classes. For hierarchies where multiple levels use the macro, RegisterDynamicProperty must deduplicate by name (skip if already registered). Requires one line per class in the class body, but zero lines in constructors.
+
+### Option 2 — Lazy init via virtual InitProperties() in Object
+Modify Object to call a virtual hook on first GetProperties():
+
+
+// In Object.h:
+class Object {
+protected:
+    virtual void InitProperties() {}   // override in derived
+public:
+    const std::vector<PropertyBase*>& GetProperties() const {
+        if (!m_propertiesInitialized) {
+            const_cast<Object*>(this)->m_propertiesInitialized = true;
+            const_cast<Object*>(this)->InitProperties();
+        }
+        return m_properties;
+    }
+};
+Then a CRTP base handles the rest without any macro:
+
+
+template<typename Derived>
+class PropertyObject : public Object {
+protected:
+    void InitProperties() override {
+        uLib::Archive::property_register_archive ar(this);
+        ar & *static_cast<Derived*>(this);
+    }
+};
+Usage — just change the base class:
+
+
+class ContainerBox : public PropertyObject<ContainerBox>, public TRS { ... };
+// Nothing else needed — properties activated on first GetProperties() call
+Tradeoff: Most "automatic" — pure inheritance, no constructor or class-body macros. But requires modifying Object (adding m_propertiesInitialized flag + virtual hook), and lazy init means properties aren't available until first access. Also doesn't work well with multiple inheritance (which TRS likely involves).
+
+Option 3 — CRTP doesn't work from the base constructor
+Just to be explicit: a CRTP base that calls ULIB_ACTIVATE_PROPERTIES in its own constructor won't work, because when PropertyObject<Derived>'s constructor runs, the vtable is PropertyObject<Derived>'s — Derived::serialize() hasn't been installed yet. So ar & *self calls Object::serialize() (a no-op).
+
+Recommendation
+Option 1 is the least invasive and safest. Add deduplication to RegisterDynamicProperty in Object.cpp to guard against re-registration when hierarchies stack activators, then replace every ULIB_ACTIVATE_PROPERTIES(*this) in constructors with a single ULIB_DECLARE_PROPERTIES(ClassName) at the end of the class body.
+
+Option 2 is cleaner to use but requires changing the Object interface and has the lazy-init semantic change — only worth it if you want zero-touch activation across the entire framework.

src/Core/Archives.h

@@ -28,6 +28,8 @@
 
 #include <boost/archive/detail/basic_pointer_iserializer.hpp>
 #include <boost/archive/detail/basic_pointer_oserializer.hpp>
+#include <boost/archive/text_oarchive.hpp>
+#include <cstring>
 #include <iostream>
 
 #include <boost/archive/text_iarchive.hpp>
@@ -59,6 +61,8 @@ class xml_iarchive;
 class xml_oarchive;
 class text_iarchive;
 class text_oarchive;
+class hrt_iarchive;
+class hrt_oarchive;
 class log_archive;
 
 } // namespace Archive
@@ -150,7 +154,7 @@ public:
   Archive *This() { return static_cast<Archive *>(this); }
 
   template <class T>
-  const basic_pointer_iserializer *register_type(T * = NULL) {
+  const basic_pointer_iserializer *register_type(T * = nullptr) {
     const basic_pointer_iserializer &bpis = boost::serialization::singleton<
         pointer_iserializer<Archive, T>>::get_const_instance();
     this->This()->register_basic_serializer(bpis.get_basic_serializer());
@@ -161,15 +165,36 @@ public:
     return *this->This();
   }
 
+  template <class T>
+  Archive &operator>>(const boost::serialization::nvp<T> &t) {
+    this->This()->load_override(t);
+    return *this->This();
+  }
+
+  template <class T>
+  Archive &operator>>(const boost::serialization::hrp<T> &t) {
+    this->This()->load_override(const_cast<boost::serialization::hrp<T> &>(t));
+    return *this->This();
+  }
+
   // the & operator
   template <class T> Archive &operator&(T &t) { return *(this->This()) >> t; }
 
+  template <class T>
+  Archive &operator&(const boost::serialization::nvp<T> &t) {
+    return *(this->This()) >> t;
+  }
+
+  template <class T>
+  Archive &operator&(const boost::serialization::hrp<T> &t) {
+    return *(this->This()) >> t;
+  }
+
   // the == operator
   template <class T> Archive &operator==(T &t) { return this->operator&(t); }
 
   // the != operator for human readable access
   template <class T> Archive &operator!=(T &t) {
-    std::cerr << std::flush << "cauch string: " << t << "\n"; // REMOVE THIS !
     return *this->This();
   }
 };
@@ -191,7 +216,7 @@ public:
   Archive *This() { return static_cast<Archive *>(this); }
 
   template <class T>
-  const basic_pointer_oserializer *register_type(const T * = NULL) {
+  const basic_pointer_oserializer *register_type(const T * = nullptr) {
     const basic_pointer_oserializer &bpos = boost::serialization::singleton<
         pointer_oserializer<Archive, T>>::get_const_instance();
     this->This()->register_basic_serializer(bpos.get_basic_serializer());
@@ -215,7 +240,6 @@ public:
 
   // the != operator for human readable access
   template <class T> Archive &operator!=(T &t) {
-    std::cerr << std::flush << "cauch string: " << t << "\n"; // REMOVE THIS !
     return *this->This();
   }
 };
@@ -240,23 +264,22 @@ template <>
 class interface_oarchive<uLib::Archive::text_oarchive>
     : public uLib_interface_oarchive<uLib::Archive::text_oarchive> {};
 
+template <>
+class interface_iarchive<uLib::Archive::hrt_iarchive>
+    : public uLib_interface_iarchive<uLib::Archive::hrt_iarchive> {};
+
+template <>
+class interface_oarchive<uLib::Archive::hrt_oarchive>
+    : public uLib_interface_oarchive<uLib::Archive::hrt_oarchive> {};
+
+template <>
+class interface_iarchive<uLib::Archive::log_archive>
+    : public uLib_interface_iarchive<uLib::Archive::log_archive> {};
+
 template <>
 class interface_oarchive<uLib::Archive::log_archive>
     : public uLib_interface_oarchive<uLib::Archive::log_archive> {};
 
-//// Veritical repetition macro // FINIRE !!!!!!!!!!!!!!!!!!!!!!!!!
-// #define _DECL_INTERFACE_ARCHIVE_V(vz,vn,vdata)           \
-//     template <class TypeSeq>                             \
-//     struct inherit_nofold<TypeSeq,BOOST_PP_INC(vn)> :    \
-//     BOOST_PP_REPEAT(BOOST_PP_INC(vn),_INERIT_NOFOLD_H,~) \
-//     {};
-
-//// Multiple size declaration //
-// BOOST_PP_REPEAT(ULIB_CFG_MPL_INERIT_NOFOLD_MAXSIZE,_INERIT_NOFOLD_V,~)
-
-// #undef  _INERIT_NOFOLD_H
-// #undef  _INERIT_NOFOLD_V
-
 } // namespace detail
 } // namespace archive
 } // namespace boost
@@ -275,36 +298,6 @@ class interface_oarchive<uLib::Archive::log_archive>
 namespace boost {
 namespace archive {
 
-// template<class Archive>
-// inline void load_const_override(Archive & ar, const char *t ){
-//     typedef typename mpl::identity<detail::load_non_pointer_type<Archive>
-//     >::type typex; typex::invoke(ar, t);
-// }
-
-// template<class Archive, class T>
-// inline void load(Archive & ar, T &t){
-//     // if this assertion trips. It means we're trying to load a
-//     // const object with a compiler that doesn't have correct
-//     // funtion template ordering.  On other compilers, this is
-//     // handled below.
-//     //    detail::check_const_loading< T >();
-//     typedef
-//         BOOST_DEDUCED_TYPENAME mpl::eval_if<is_pointer< T >,
-//             mpl::identity<detail::load_pointer_type<Archive> >
-//         ,//else
-//         BOOST_DEDUCED_TYPENAME mpl::eval_if<is_array< T >,
-//             mpl::identity<detail::load_array_type<Archive> >
-//         ,//else
-//         BOOST_DEDUCED_TYPENAME mpl::eval_if<is_enum< T >,
-//             mpl::identity<detail::load_enum_type<Archive> >
-//         ,//else
-//             mpl::identity<detail::load_non_pointer_type<Archive> >
-//         >
-//         >
-//         >::type typex;
-//     typex::invoke(ar, t);
-// }
-
 } // namespace archive
 } // namespace boost
 
@@ -312,42 +305,38 @@ namespace uLib {
 
 namespace Archive {
 
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-// POLYMORPHIC //
-
-// class polymorphic_iarchive :
-//         public boost::archive::polymorphic_iarchive {
-
-// public:
-//     void load_override(const char *t, BOOST_PFTO int)
-//     {
-//         boost::archive::load_const_override(* this->This(),
-//         const_cast<char*>(t));
-//     }
-
-//};
 
 ////////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////
 // XML //
 
+// ULIB_SERIALIZATION_VERSION should be get from the build system
+#ifndef ULIB_SERIALIZATION_VERSION
+#define ULIB_SERIALIZATION_VERSION "0.0"
+#endif
+
 class xml_iarchive : public boost::archive::xml_iarchive_impl<xml_iarchive> {
   typedef xml_iarchive Archive;
   typedef boost::archive::xml_iarchive_impl<Archive> base;
 
+  unsigned int m_flags;
+
   // give serialization implementation access to this class
   friend class boost::archive::detail::interface_iarchive<Archive>;
   friend class boost::archive::basic_xml_iarchive<Archive>;
   friend class boost::archive::load_access;
-
 public:
   xml_iarchive(std::istream &is, unsigned int flags = 0)
-      : xml_iarchive_impl<xml_iarchive>(is, flags) {}
+      : boost::archive::xml_iarchive_impl<xml_iarchive>(
-
+            is, flags | boost::archive::no_header), m_flags(flags) {
-  using basic_xml_iarchive::load_override;
+    if (0 == (flags & boost::archive::no_header)) {
+      std::string line;
+      std::getline(is, line); // <?xml ... ?>
+      std::getline(is, line); // <!DOCTYPE ...>
+      std::getline(is, line); // <ulib_serialization ...>
+    }
+  }
 
   // Anything not an attribute should be a name value pair as nvp or hrp
   typedef boost::archive::detail::common_iarchive<Archive>
@@ -366,20 +355,19 @@ public:
   // class_name_type can't be handled here as it depends upon the
   // char type used by the stream.  So require the derived implementation.
   // derived in this case is xml_iarchive_impl or base ..
+  // Note: using base::load_override covers all basic_xml_iarchive overloads
+  // transitively, so a separate 'using basic_xml_iarchive::load_override'
+  // is redundant and creates ambiguity with clang.
   using base::load_override;
 
   void load_override(const char *str) {
-    //        StringReader sr(basic_text_iprimitive::is);
+    // StringReader sr(basic_text_iprimitive::is);
-    //        sr >> str;
+    // sr >> str;
   }
 
-  ~xml_iarchive() {};
+  virtual ~xml_iarchive() {}
 };
 
-// typedef boost::archive::detail::polymorphic_iarchive_route<
-// boost::archive::xml_iarchive_impl<xml_iarchive>
-//> polymorphic_xml_iarchive;
-
 template <class ArchiveImpl>
 struct polymorphic_iarchive_route
     : boost::archive::detail::polymorphic_iarchive_route<ArchiveImpl> {
@@ -389,31 +377,39 @@ struct polymorphic_iarchive_route
 class polymorphic_xml_iarchive
     : public polymorphic_iarchive_route<
           boost::archive::xml_iarchive_impl<xml_iarchive>> {
-  // give serialization implementation access to this class
-  //    friend class boost::archive::detail::interface_iarchive<Archive>;
-  //    friend class boost::archive::basic_xml_iarchive<Archive>;
-  //    friend class boost::archive::load_access;
 public:
-  virtual void load_override(const char *str) { ; }
+  virtual void load_override(const char *str) {}
 };
 
 class xml_oarchive : public boost::archive::xml_oarchive_impl<xml_oarchive> {
   typedef xml_oarchive Archive;
   typedef boost::archive::xml_oarchive_impl<Archive> base;
 
+  unsigned int m_flags;
+
   // give serialization implementation access to this class
   friend class boost::archive::detail::interface_oarchive<Archive>;
   friend class boost::archive::basic_xml_oarchive<Archive>;
   friend class boost::archive::save_access;
-
 public:
   xml_oarchive(std::ostream &os, unsigned int flags = 0)
-      : boost::archive::xml_oarchive_impl<xml_oarchive>(os, flags) {}
+      : boost::archive::xml_oarchive_impl<xml_oarchive>(
+            os, flags | boost::archive::no_header), m_flags(flags) {
+    if (0 == (flags & boost::archive::no_header)) {
+      this->This()->put(
+          "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\" ?>\n");
+      this->This()->put("<!DOCTYPE ulib_serialization>\n");
+      this->This()->put("<ulib_serialization signature=\"serialization::archive\" ");
+      this->write_attribute("version", (const char *)ULIB_SERIALIZATION_VERSION);
+      this->This()->put(">\n");
+    }
+  }
 
-  // example of implementing save_override for const char* //
+  virtual ~xml_oarchive() {
-  //    void save_override(const char *t, int) {
+    if (0 == (m_flags & boost::archive::no_header)) {
-  //        std::cout << "found char: " << t << "\n";
+      this->This()->put("</ulib_serialization>\n");
-  //    }
+    }
+  }
 
   using basic_xml_oarchive::save_override;
 
@@ -433,10 +429,8 @@ public:
 
   void save_override(const char *str) {
     // Do not save any human decoration string //
-    //        basic_text_oprimitive::save(str);
+    // basic_text_oprimitive::save(str);
   }
-
-  ~xml_oarchive() {}
 };
 
 // typedef boost::archive::detail::polymorphic_oarchive_route<
@@ -471,15 +465,11 @@ public:
     sr >> str;
   }
 
-  ~text_iarchive() {};
+  virtual ~text_iarchive() {}
 };
 
 typedef text_iarchive naked_text_iarchive;
 
-// typedef boost::archive::detail::polymorphic_iarchive_route<
-// naked_text_iarchive
-//> polymorphic_text_iarchive;
-
 class text_oarchive : public boost::archive::text_oarchive_impl<text_oarchive> {
   typedef text_oarchive Archive;
   typedef boost::archive::text_oarchive_impl<Archive> base;
@@ -497,13 +487,9 @@ public:
 
   void save_override(const char *str) { basic_text_oprimitive::save(str); }
 
-  ~text_oarchive() {}
+  virtual ~text_oarchive() {}
 };
 
-// typedef boost::archive::detail::polymorphic_oarchive_route<
-// boost::archive::text_oarchive_impl<text_oarchive>
-//> polymorphic_text_oarchive;
-
 ////////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////
@@ -540,7 +526,7 @@ public:
     sr >> str;
   }
 
-  ~hrt_iarchive() {};
+  virtual ~hrt_iarchive() {}
 };
 
 class hrt_oarchive : public boost::archive::text_oarchive_impl<hrt_oarchive> {
@@ -576,7 +562,7 @@ public:
     *this << "\n";
   }
 
-  ~hrt_oarchive() {}
+  virtual ~hrt_oarchive() {}
 };
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -605,17 +591,9 @@ public:
   }
 
   template <class T> void save_override(const T &t) {
-    base::save_override(boost::serialization::make_nvp(NULL, t));
+    base::save_override(boost::serialization::make_nvp(nullptr, t));
   }
 
-  // activate this if you want to trap non nvp objects //
-  //    template<class T>
-  //    void save_override(T & t)
-  //    {
-  //        BOOST_MPL_ASSERT((boost::serialization::is_wrapper< T >));
-  //        //        this->detail_common_oarchive::save_override(t);
-  //    }
-
   template <class T> void save_override(const boost::serialization::nvp<T> &t) {
     base::save_override(t);
   }
@@ -640,11 +618,9 @@ public:
   log_archive(std::ostream &os, unsigned int flags = 0)
       : boost::archive::xml_oarchive_impl<log_archive>(
             os, flags | boost::archive::no_header) {}
-};
 
-// typedef boost::archive::detail::polymorphic_oarchive_route<
+  virtual ~log_archive() {}
-// boost::archive::xml_oarchive_impl<log_archive>
+};
-//> polymorphic_log_archive;
 
 } // namespace Archive
 
@@ -658,10 +634,4 @@ ULIB_SERIALIZATION_REGISTER_ARCHIVE(uLib::Archive::hrt_iarchive)
 ULIB_SERIALIZATION_REGISTER_ARCHIVE(uLib::Archive::hrt_oarchive)
 ULIB_SERIALIZATION_REGISTER_ARCHIVE(uLib::Archive::log_archive)
 
-// ULIB_SERIALIZATION_REGISTER_ARCHIVE(uLib::Archive::polymorphic_xml_iarchive)
-// ULIB_SERIALIZATION_REGISTER_ARCHIVE(uLib::Archive::polymorphic_xml_oarchive)
-// ULIB_SERIALIZATION_REGISTER_ARCHIVE(uLib::Archive::polymorphic_text_iarchive)
-// ULIB_SERIALIZATION_REGISTER_ARCHIVE(uLib::Archive::polymorphic_text_oarchive)
-// ULIB_SERIALIZATION_REGISTER_ARCHIVE(uLib::Archive::polymorphic_log_archive)
-
 #endif // U_CORE_ARCHIVES_H

src/Core/CMakeLists.txt

@@ -58,6 +58,7 @@ if(USE_CUDA)
 endif()
 
 target_link_libraries(${libname} ${LIBRARIES})
+target_compile_definitions(${libname} PUBLIC ULIB_SERIALIZATION_VERSION="${PROJECT_VERSION}")
 
 install(TARGETS ${libname}
         EXPORT "uLibTargets"

src/Core/DataAllocator.h

@@ -52,6 +52,7 @@ public:
       else
         m_RamData = static_cast<T *>(::operator new(m_Size * sizeof(T)));
     }
+    // std::cout << "DataAllocator Constructor: ptr=" << m_RamData << " size=" << m_Size << " own=" << m_OwnsObjects << std::endl;
   }
 
   DataAllocator(const DataAllocator<T> &other)
@@ -63,7 +64,12 @@ public:
           m_RamData = new T[m_Size];
         else
           m_RamData = static_cast<T *>(::operator new(m_Size * sizeof(T)));
-        std::memcpy(m_RamData, other.m_RamData, m_Size * sizeof(T));
+        
+        if (m_OwnsObjects) {
+            std::copy(other.m_RamData, other.m_RamData + m_Size, m_RamData);
+        } else {
+            std::memcpy(m_RamData, other.m_RamData, m_Size * sizeof(T));
+        }
       }
 #ifdef USE_CUDA
       if (other.m_VramData) {
@@ -73,14 +79,17 @@ public:
       }
 #endif
     }
+    // std::cout << "DataAllocator CopyConstructor: from=" << other.m_RamData << " to=" << m_RamData << " size=" << m_Size << " own=" << m_OwnsObjects << std::endl;
   }
 
   ~DataAllocator() {
+    // std::cout << "DataAllocator Destructor: ptr=" << m_RamData << " size=" << m_Size << " own=" << m_OwnsObjects << std::endl;
     if (m_RamData) {
       if (m_OwnsObjects)
         delete[] m_RamData;
       else
         ::operator delete(m_RamData);
+      m_RamData = nullptr;
     }
 #ifdef USE_CUDA
     if (m_VramData) {
@@ -91,6 +100,13 @@ public:
 
   DataAllocator &operator=(const DataAllocator &other) {
     if (this != &other) {
+      if (m_Size == other.m_Size && m_OwnsObjects != other.m_OwnsObjects) {
+          // Ownership changed but size is same: we must force reallocation
+          // to avoid using the wrong delete operator later.
+          size_t oldSize = m_Size;
+          m_Size = 0; 
+          resize(oldSize); // This will free the old buffer with the OLD ownership
+      }
       m_OwnsObjects = other.m_OwnsObjects;
       resize(other.m_Size);
       m_Device = other.m_Device;
@@ -101,7 +117,11 @@ public:
           else
             m_RamData = static_cast<T *>(::operator new(m_Size * sizeof(T)));
         }
-        std::memcpy(m_RamData, other.m_RamData, m_Size * sizeof(T));
+        if (m_OwnsObjects) {
+            std::copy(other.m_RamData, other.m_RamData + m_Size, m_RamData);
+        } else {
+            std::memcpy(m_RamData, other.m_RamData, m_Size * sizeof(T));
+        }
       }
 #ifdef USE_CUDA
       if (other.m_VramData) {
@@ -112,6 +132,7 @@ public:
       }
 #endif
     }
+    // std::cout << "DataAllocator AssigmentOp: otherPtr=" << other.m_RamData << " thisPtr=" << m_RamData << " size=" << m_Size << " own=" << m_OwnsObjects << std::endl;
     return *this;
   }
 
@@ -152,6 +173,8 @@ public:
     if (m_Size == size)
       return;
 
+    // std::cout << "DataAllocator Resize: from=" << m_Size << " to=" << size << " ptr=" << m_RamData << " own=" << m_OwnsObjects << std::endl;
+
     T *newRam = nullptr;
     T *newVram = nullptr;
 
@@ -162,7 +185,11 @@ public:
         newRam = static_cast<T *>(::operator new(size * sizeof(T)));
 
       if (m_RamData) {
-        std::memcpy(newRam, m_RamData, std::min(m_Size, size) * sizeof(T));
+        if (m_OwnsObjects) {
+            std::copy(m_RamData, m_RamData + std::min(m_Size, size), newRam);
+        } else {
+            std::memcpy(newRam, m_RamData, std::min(m_Size, size) * sizeof(T));
+        }
       }
 
 #ifdef USE_CUDA

src/Core/Debug.h

@@ -38,6 +38,76 @@
 #include <boost/any.hpp>
 
 
+
+/**
+ * @file Debug.h
+ * @brief Unified Debugging and Monitoring System for uLib.
+ *
+ * # Debug System Documentation
+ *
+ * The `Debug` system provides a flexible, adapter-based mechanism for monitoring
+ * and outputting internal variables and states without hardcoding output logic
+ * into core classes. 
+ *
+ * ## Architecture
+ * 
+ * The system follows an adapter pattern:
+ * 
+ * - **`DebugAdapterInterface`**: The base interface for all output targets. 
+ *   Subclasses define how primitive types and strings are handled (e.g., printing 
+ *   to `std::cout`, writing to a log file, or updating a real-time UI widget).
+ *
+ * - **`Debug` Class**: The central registry. It stores:
+ *   1.  A list of "Adapters" (`DebugAdapterInterface`).
+ *   2.  A list of "Items" to monitor. Each item is a reference to a variable 
+ *       associated with a name.
+ *
+ * - **Type Safety**: Although variables are stored using `boost::any` (type erasure), 
+ *   the system automatically preserves the original type information via 
+ *   internal template adapters (`AnyCastAdapter`), ensuring that the correct 
+ *   overload of the adapter interface is called.
+ *
+ * ## Core Components
+ * 
+ * | Component | Description |
+ * | :--- | :--- |
+ * | `Debug` | The main controller used to add adapters and register variables. |
+ * | `DebugAdapterInterface` | Virtual base for creating new output methods. |
+ * | `DebugAdapterText` | A simple built-in adapter for `std::ostream` output. |
+ *
+ * ## How to Use
+ *
+ * ### 1. Initialize the Debug Object
+ * ```cpp
+ * uLib::Debug dbg;
+ * ```
+ *
+ * ### 2. Add an Adapter
+ * ```cpp
+ * uLib::DebugAdapterText console(std::cout);
+ * dbg.AddAdapter(console);
+ * ```
+ *
+ * ### 3. Register Variables to Monitor
+ * Use the `operator()` to bind a variable by reference.
+ * ```cpp
+ * int frameCount = 0;
+ * std::string state = "Initializing";
+ * dbg("Frames", frameCount);
+ * dbg("Status", state);
+ * ```
+ *
+ * ### 4. Update
+ * Call `Update()` periodically (e.g., once per frame) to push the current 
+ * values of all registered variables to all connected adapters.
+ * ```cpp
+ * while(running) {
+ *    frameCount++;
+ *    dbg.Update(); // This triggers the output
+ * }
+ * ```
+ */
+
 namespace uLib {
 
 
@@ -107,7 +177,6 @@ public:
 
 
 
-
 class Debug {
     typedef detail::DebugAdapterInterface AdapterInterface;
     typedef SmartPointer<detail::DebugAdapterInterface> Adapter;

src/Core/Object.cpp

@@ -61,8 +61,8 @@ public:
   };
   
   std::string m_InstanceName;
-  Vector<Signal> sigv;
+  std::vector<Signal> sigv;
-  Vector<Slot> slov;
+  std::vector<Slot> slov;
   std::vector<PropertyBase*> m_Properties;
   std::vector<PropertyBase*> m_DynamicProperties;
   bool m_SignalsBlocked;
@@ -70,14 +70,18 @@ public:
 
 // Implementations of Property methods
 void Object::RegisterProperty(PropertyBase* prop) {
-    if (prop) d->m_Properties.push_back(prop);
+    if (prop) {
+        d->m_Properties.push_back(prop);
+    }
 }
 
 void Object::RegisterDynamicProperty(PropertyBase* prop) {
     if (prop) {
+        for (auto* existing : d->m_DynamicProperties) {
+            if (existing == prop) return;
+            if (existing->GetQualifiedName() == prop->GetQualifiedName()) return;
+        }
         d->m_DynamicProperties.push_back(prop);
-        // Note: prop already added itself to m_Properties 
-        // during its own constructor call to owner->RegisterProperty()
     }
 }
 
@@ -85,6 +89,21 @@ const std::vector<PropertyBase*>& Object::GetProperties() const {
     return d->m_Properties;
 }
 
+PropertyBase* Object::GetProperty(const std::string& name) const {
+    for (auto* p : d->m_Properties) {
+        if (p->GetName() == name || p->GetQualifiedName() == name) return p;
+    }
+    for (auto* p : d->m_DynamicProperties) {
+        if (p->GetName() == name || p->GetQualifiedName() == name) return p;
+    }
+    return nullptr;
+}
+
+void Object::NotifyPropertiesUpdated() {
+    for (auto* p : d->m_Properties) p->Updated();
+    for (auto* p : d->m_DynamicProperties) p->Updated();
+}
+
 // In Object.h, the template serialize needs to be updated to call property serialization.
 // However, since Object::serialize is a template in the header, we might need a helper here.
 
@@ -97,18 +116,11 @@ void Object::serialize(ArchiveT &ar, const unsigned int version) {
 }
 
 void Object::Updated() { ULIB_SIGNAL_EMIT(Object::Updated); }
+void Object::PropertyUpdated() { ULIB_SIGNAL_EMIT(Object::PropertyUpdated); }
 
 template <class ArchiveT>
 void Object::save_override(ArchiveT &ar, const unsigned int version) {}
 
-// Explicitly instantiate for all uLib archives
-template void Object::serialize(Archive::xml_oarchive &, const unsigned int);
-template void Object::serialize(Archive::xml_iarchive &, const unsigned int);
-template void Object::serialize(Archive::text_oarchive &, const unsigned int);
-template void Object::serialize(Archive::text_iarchive &, const unsigned int);
-template void Object::serialize(Archive::hrt_oarchive &, const unsigned int);
-template void Object::serialize(Archive::hrt_iarchive &, const unsigned int);
-template void Object::serialize(Archive::log_archive &, const unsigned int);
 
 ////////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////
@@ -125,6 +137,18 @@ Object::Object(const Object &copy) : d(new ObjectPrivate) {
     }
 }
 
+Object& Object::operator=(const Object &other) {
+    // Intentionally does NOT share 'd'. Each Object owns its own ObjectPrivate.
+    // Without this, the compiler-generated operator= would copy the 'd' pointer,
+    // causing two objects to share the same ObjectPrivate. When both are
+    // destroyed, 'd' would be deleted twice, corrupting the heap.
+    if (this != &other && other.d) {
+        d->m_InstanceName = other.d->m_InstanceName;
+        d->m_SignalsBlocked = other.d->m_SignalsBlocked;
+    }
+    return *this;
+}
+
 Object::~Object() {
     for (auto* p : d->m_DynamicProperties) {
         delete p;
@@ -135,6 +159,7 @@ Object::~Object() {
 void Object::DeepCopy(const Object &copy) {
     if (this == &copy) return;
     if (copy.d) d->m_InstanceName = copy.d->m_InstanceName;
+    std::cout << "Object DeepCopy: from d=" << copy.d << " to d=" << d << std::endl;
     // Note: signals, slots and properties are intentionally not copied 
     // to maintain instance uniquely and avoid duplicate registrations.
     this->Updated();
@@ -161,9 +186,8 @@ void Object::LoadConfig(std::istream &is, int version) {
 
 void Object::PrintSelf(std::ostream &o) const {
   o << "OBJECT signals: ------------------\n";
-  Vector<ObjectPrivate::Signal>::Iterator itr;
+  for (const auto& sig : d->sigv) {
-  for (itr = d->sigv.begin(); itr < d->sigv.end(); itr++) {
+    o << "  signal:[ " << sig.sigstr << " ]\n";
-    o << "  signal:[ " << itr->sigstr << " ]\n";
   }
   o << "--------------------------------------\n\n";
 }

src/Core/Object.h

@@ -52,6 +52,7 @@ class polymorphic_oarchive;
 namespace uLib {
 
 class PropertyBase;
+class ObjectsContext;
 
 class Version {
 public:
@@ -75,9 +76,10 @@ public:
 
   Object();
   Object(const Object &copy);
-  ~Object();
+  virtual ~Object();
 
-  virtual const char * GetClassName() const { return "Object"; }
+  virtual const char * GetClassName() const { return type_name(); }
+  virtual const char * type_name() const { return "Object"; }
 
   const std::string& GetInstanceName() const;
   void SetInstanceName(const std::string& name);
@@ -93,6 +95,10 @@ public:
   void RegisterProperty(PropertyBase* prop);
   void RegisterDynamicProperty(PropertyBase* prop);
   const std::vector<PropertyBase*>& GetProperties() const;
+  PropertyBase* GetProperty(const std::string& name) const;
+
+  /** @brief Sends an Updated signal for all properties of this object. useful for real-time UI refresh. */
+  void NotifyPropertiesUpdated();
 
   ////////////////////////////////////////////////////////////////////////////
   // PARAMETERS //
@@ -100,6 +106,9 @@ public:
   // FIXX !!!
   virtual void DeepCopy(const Object &copy);
 
+  /** @brief Returns a nested context for children objects, if any. */
+  virtual ObjectsContext* GetChildren() { return nullptr; }
+
   ////////////////////////////////////////////////////////////////////////////
   // SERIALIZATION //
 
@@ -128,6 +137,7 @@ public:
 
   signals:
   virtual void Updated();
+  virtual void PropertyUpdated();
 
   // Qt4 style connector //
   static bool connect(const Object *ob1, const char *signal_name,
@@ -227,10 +237,7 @@ public:
 
   void PrintSelf(std::ostream &o) const;
 
-  inline const Object &operator=(const Object &copy) {
+  Object &operator=(const Object &other);
-    this->DeepCopy(copy);
-    return *this;
-  }
 
 private:
   bool addSignalImpl(SignalBase *sig, GenericMFPtr fptr, const char *name);

src/Core/ObjectsContext.h

@@ -9,24 +9,25 @@ namespace uLib {
 /**
  * @brief ObjectsContext represents a collection of Object instances.
  */
-class ObjectsContext : public Object {
+class ObjectsContext : virtual public Object {
 public:
     ObjectsContext();
     virtual ~ObjectsContext();
 
-    virtual const char * GetClassName() const { return "ObjectsContext"; }
+    uLibTypeMacro(ObjectsContext, Object)
+    virtual ObjectsContext* GetChildren() override { return this; }
 
     /**
      * @brief Adds an object to the context.
      * @param obj Pointer to the object to add.
      */
-    void AddObject(Object* obj);
+    virtual void AddObject(Object* obj);
 
     /**
      * @brief Removes an object from the context.
      * @param obj Pointer to the object to remove.
      */
-    void RemoveObject(Object* obj);
+    virtual void RemoveObject(Object* obj);
 
     /**
      * @brief Clears all objects from the context.

src/Core/Property.h

@@ -2,11 +2,16 @@
 #define U_CORE_PROPERTY_H
 
 #include <string>
+#include <vector>
 #include <sstream>
 #include <typeinfo>
 #include <typeindex> // Added
 #include <boost/serialization/nvp.hpp>
 #include <boost/lexical_cast.hpp>
+#include <vector>
+#include <boost/type_traits/is_class.hpp>
+#include <boost/mpl/bool.hpp>
+#include <boost/serialization/serialization.hpp>
 #include "Core/Archives.h"
 #include "Core/Signal.h"
 #include "Core/Object.h"
@@ -23,21 +28,48 @@ public:
   virtual const char* GetTypeName() const = 0;
   virtual std::string GetValueAsString() const = 0;
   virtual std::type_index GetTypeIndex() const = 0; // Added
+  virtual const std::string& GetUnits() const = 0;
+  virtual void SetUnits(const std::string& units) = 0;
+  virtual const std::vector<std::string>& GetEnumLabels() const {
+      static std::vector<std::string> empty;
+      return empty;
+  }
+  virtual const std::string& GetGroup() const = 0;
+  virtual void SetGroup(const std::string& group) = 0;
+
+  virtual bool HasRange() const { return false; }
+  virtual double GetMin() const { return 0; }
+  virtual double GetMax() const { return 0; }
+  virtual bool HasDefault() const { return false; }
+  virtual std::string GetDefaultValueAsString() const { return ""; }
+  virtual bool IsReadOnly() const = 0;
+
+  std::string GetQualifiedName() const {
+      if (GetGroup().empty()) return GetName();
+      return GetGroup() + "." + GetName();
+  }
 
   // Signal support
   signals:
   virtual void Updated() override { ULIB_SIGNAL_EMIT(PropertyBase::Updated); }
 
   // Serialization support for different uLib archives
-  virtual void serialize(Archive::xml_oarchive & ar, const unsigned int version) = 0;
+  virtual void serialize(Archive::xml_oarchive & ar, const unsigned int version) override = 0;
-  virtual void serialize(Archive::xml_iarchive & ar, const unsigned int version) = 0;
+  virtual void serialize(Archive::xml_iarchive & ar, const unsigned int version) override = 0;
-  virtual void serialize(Archive::text_oarchive & ar, const unsigned int version) = 0;
+  virtual void serialize(Archive::text_oarchive & ar, const unsigned int version) override = 0;
-  virtual void serialize(Archive::text_iarchive & ar, const unsigned int version) = 0;
+  virtual void serialize(Archive::text_iarchive & ar, const unsigned int version) override = 0;
-  virtual void serialize(Archive::hrt_oarchive & ar, const unsigned int version) = 0;
+  virtual void serialize(Archive::hrt_oarchive & ar, const unsigned int version) override = 0;
-  virtual void serialize(Archive::hrt_iarchive & ar, const unsigned int version) = 0;
+  virtual void serialize(Archive::hrt_iarchive & ar, const unsigned int version) override = 0;
-  virtual void serialize(Archive::log_archive & ar, const unsigned int version) = 0;
+  virtual void serialize(Archive::log_archive & ar, const unsigned int version) override = 0;
 };
 
+
+
+
+
+
+
+
 /**
  * @brief Template class for typed properties.
  */
@@ -45,16 +77,18 @@ template <typename T>
 class Property : public PropertyBase {
 public:
   // PROXY: Use an existing variable as back-end storage
-  Property(Object* owner, const std::string& name, T* valuePtr)
+  Property(Object* owner, const std::string& name, T* valuePtr, const std::string& units = "", const std::string& group = "")
-    : m_owner(owner), m_name(name), m_value(valuePtr), m_own(false) {
+    : m_owner(owner), m_name(name), m_units(units), m_group(group), m_value(valuePtr), m_own(false),
+      m_HasRange(false), m_HasDefault(false), m_ReadOnly(false) {
       if (m_owner) {
           m_owner->RegisterProperty(this);
       }
   }
 
   // MANAGED: Create and own internal storage
-  Property(Object* owner, const std::string& name, const T& defaultValue = T())
+  Property(Object* owner, const std::string& name, const T& defaultValue = T(), const std::string& units = "", const std::string& group = "")
-    : m_owner(owner), m_name(name), m_value(new T(defaultValue)), m_own(true) {
+    : m_owner(owner), m_name(name), m_units(units), m_group(group), m_value(new T(defaultValue)), m_own(true),
+      m_HasRange(false), m_HasDefault(true), m_Default(defaultValue), m_ReadOnly(false) {
       if (m_owner) {
           m_owner->RegisterProperty(this);
       }
@@ -68,6 +102,10 @@ public:
   virtual const std::string& GetName() const override { return m_name; }
   virtual const char* GetTypeName() const override { return typeid(T).name(); }
   virtual std::type_index GetTypeIndex() const override { return std::type_index(typeid(T)); }
+  virtual const std::string& GetUnits() const override { return m_units; }
+  virtual void SetUnits(const std::string& units) override { m_units = units; }
+  virtual const std::string& GetGroup() const override { return m_group; }
+  virtual void SetGroup(const std::string& group) override { m_group = group; }
 
   
   std::string GetValueAsString() const override {
@@ -82,15 +120,64 @@ public:
 
   // Accessors
   const T& Get() const { return *m_value; }
+  template<typename U = T>
+  typename std::enable_if<std::is_arithmetic<U>::value, void>::type
+  ValidateT(T& val) {
+    if (m_HasRange) {
+        if (val < m_Min) val = m_Min;
+        if (val > m_Max) val = m_Max;
+    }
+  }
+
+  template<typename U = T>
+  typename std::enable_if<!std::is_arithmetic<U>::value, void>::type
+  ValidateT(T& val) {
+  }
+
   void Set(const T& value) {
-    if (*m_value != value) {
+    T val = value;
-      *m_value = value;
+    ValidateT<T>(val);
+    if (*m_value != val) {
+      *m_value = val;
       ULIB_SIGNAL_EMIT(Property<T>::PropertyChanged);
       this->Updated();
       if (m_owner) m_owner->Updated();
     }
   }
 
+  void SetRange(const T& min, const T& max) { m_Min = min; m_Max = max; m_HasRange = true; }
+  void SetDefault(const T& def) { m_Default = def; m_HasDefault = true; }
+  void SetReadOnly(bool ro) { m_ReadOnly = ro; }
+
+  virtual bool IsReadOnly() const override { return m_ReadOnly; }
+
+  virtual bool HasRange() const override { return m_HasRange; }
+
+  template<typename U = T>
+  typename std::enable_if<std::is_arithmetic<U>::value, double>::type
+  GetMinT() const { return (double)m_Min; }
+
+  template<typename U = T>
+  typename std::enable_if<!std::is_arithmetic<U>::value, double>::type
+  GetMinT() const { return 0.0; }
+
+  template<typename U = T>
+  typename std::enable_if<std::is_arithmetic<U>::value, double>::type
+  GetMaxT() const { return (double)m_Max; }
+
+  template<typename U = T>
+  typename std::enable_if<!std::is_arithmetic<U>::value, double>::type
+  GetMaxT() const { return 0.0; }
+
+  virtual double GetMin() const override { return GetMinT<T>(); }
+  virtual double GetMax() const override { return GetMaxT<T>(); }
+
+  virtual bool HasDefault() const override { return m_HasDefault; }
+  virtual std::string GetDefaultValueAsString() const override {
+      try { return boost::lexical_cast<std::string>(m_Default); } 
+      catch (...) { return ""; }
+  }
+
   // Operators for seamless usage
   operator const T&() const { return *m_value; }
   Property& operator=(const T& value) {
@@ -116,11 +203,24 @@ public:
   void serialize(Archive::hrt_iarchive & ar, const unsigned int v) override { serialize_impl(ar, v); }
   void serialize(Archive::log_archive & ar, const unsigned int v) override { serialize_impl(ar, v); }
 
+  virtual void Updated() override {
+      PropertyBase::Updated();
+      this->PropertyChanged();
+  }
+
 private:
   std::string m_name;
+  std::string m_units;
+  std::string m_group;
   T* m_value;
   bool m_own;
   Object* m_owner;
+  bool m_HasRange;
+  T m_Min;
+  T m_Max;
+  bool m_HasDefault;
+  T m_Default;
+  bool m_ReadOnly;
 };
 
 /**
@@ -133,7 +233,34 @@ typedef Property<long>          LongProperty;
 typedef Property<unsigned long> ULongProperty;
 typedef Property<float>         FloatProperty;
 typedef Property<double>        DoubleProperty;
-typedef Property<Bool_t>      BoolProperty;
+typedef Property<Bool_t>        BoolProperty;
+
+
+/**
+ * @brief Property specialized for enumerations, providing labels for GUI representations.
+ */
+class EnumProperty : public Property<int> {
+public:
+  EnumProperty(Object* owner, const std::string& name, int* valuePtr, const std::vector<std::string>& labels, const std::string& units = "", const std::string& group = "")
+    : Property<int>(owner, name, valuePtr, units, group), m_Labels(labels) {}
+
+  const std::vector<std::string>& GetEnumLabels() const override { return m_Labels; }
+  const char* GetTypeName() const override { return "Enum"; }
+  virtual std::type_index GetTypeIndex() const override { return std::type_index(typeid(EnumProperty)); }
+
+private:
+  std::vector<std::string> m_Labels;
+};
+
+
+
+
+
+
+
+
+
+
 
 /**
  * @brief Macro to simplify property declaration within a class.
@@ -184,25 +311,84 @@ public:
         boost::archive::detail::common_oarchive<property_register_archive>(boost::archive::no_header),
         m_Object(obj) {}
     
+    std::string GetCurrentGroup() const {
+        std::string group;
+        for (const auto& g : m_GroupStack) {
+            if (!group.empty()) group += ".";
+            group += g;
+        }
+        return group;
+    }
+
     // Core logic: encounter HRP -> Create Dynamic Property
     template<class T>
     void save_override(const boost::serialization::hrp<T> &t) {
         if (m_Object) {
-            // We use const_cast because we are just creating a proxy to the member
+            Property<T>* p = new Property<T>(m_Object, t.name(), &const_cast<boost::serialization::hrp<T>&>(t).value(), t.units() ? t.units() : "", GetCurrentGroup());
-            m_Object->RegisterDynamicProperty(
+            if (t.has_range()) p->SetRange(t.min_val(), t.max_val());
-                new Property<T>(m_Object, t.name(), &const_cast<boost::serialization::hrp<T>&>(t).value())
+            if (t.has_default()) p->SetDefault(t.default_val());
-            );
+            p->SetReadOnly(t.is_read_only());
+            m_Object->RegisterDynamicProperty(p);
+        }
+    }
+
+    template<class T>
+    void save_override(const boost::serialization::hrp_val<T> &t) {
+        if (m_Object) {
+            // Note: hrp_val stores by value. Property usually points to existing data.
+            // But here we are registering properties from HRP wrappers.
+            // If it's hrp_val, it means it's an rvalue from a getter. 
+            // The hrp_val wrapper itself owns the value.
+            // However, the property_register_archive is temporary.
+            // This is a bit tricky. Usually HRP(rvalue) is meant for read-only display.
+            // Let's use the address of the value in the wrapper, but mark it read-only.
+            Property<T>* p = new Property<T>(m_Object, t.name(), &const_cast<boost::serialization::hrp_val<T>&>(t).value(), t.units() ? t.units() : "", GetCurrentGroup());
+            if (t.has_range()) p->SetRange(t.min_val(), t.max_val());
+            if (t.has_default()) p->SetDefault(t.default_val());
+            p->SetReadOnly(t.is_read_only());
+            m_Object->RegisterDynamicProperty(p);
+        }
+    }
+
+    template<class T>
+    void save_override(const boost::serialization::hrp_enum<T> &t) {
+        if (m_Object) {
+            EnumProperty* p = new EnumProperty(m_Object, t.name(), (int*)&const_cast<boost::serialization::hrp_enum<T>&>(t).value(), t.labels(), t.units() ? t.units() : "", GetCurrentGroup());
+            p->SetReadOnly(t.is_read_only());
+            m_Object->RegisterDynamicProperty(p);
+        }
+    }
+
+    template<class T>
+    void save_override(const boost::serialization::hrp_enum_val<T> &t) {
+        if (m_Object) {
+            EnumProperty* p = new EnumProperty(m_Object, t.name(), (int*)&const_cast<boost::serialization::hrp_enum_val<T>&>(t).value(), t.labels(), t.units() ? t.units() : "", GetCurrentGroup());
+            p->SetReadOnly(t.is_read_only());
+            m_Object->RegisterDynamicProperty(p);
         }
     }
 
     // Handle standard NVPs by recursing (important for base classes)
     template<class T>
     void save_override(const boost::serialization::nvp<T> &t) {
-        boost::archive::detail::common_oarchive<property_register_archive>::save_override(t.const_value());
+        if (t.name()) m_GroupStack.push_back(t.name());
+        this->save_helper(t.const_value(), typename boost::is_class<T>::type());
+        if (t.name()) m_GroupStack.pop_back();
     }
 
-    // Ignore everything else
+    // Recursion for nested classes, ignore primitives
-    template<class T> void save_override(const T &t) {}
+    template<class T>
+    void save_override(const T &t) {
+        this->save_helper(t, typename boost::is_class<T>::type());
+    }
+
+    template<class T>
+    void save_helper(const T &t, boost::mpl::true_) {
+        boost::serialization::serialize_adl(*this, const_cast<T&>(t), 0);
+    }
+
+    template<class T>
+    void save_helper(const T &t, boost::mpl::false_) {}
 
     // Required attribute overrides for common_oarchive
     void save_override(const boost::archive::object_id_type & t) {}
@@ -213,14 +399,39 @@ public:
     void save_override(const boost::archive::class_id_reference_type & t) {}
     void save_override(const boost::archive::class_name_type & t) {}
     void save_override(const boost::archive::tracking_type & t) {}
+
+private:
+    std::vector<std::string> m_GroupStack;
 };
 
+
+
 /**
- * @brief Convenience macro to automatically activate and register all HRP members 
+ * @brief Convenience macro to automatically activate and register all HRP members
  * as uLib properties. Usage: ULIB_ACTIVATE_PROPERTIES(obj)
  */
 #define ULIB_ACTIVATE_PROPERTIES(obj) \
-    { uLib::Archive::property_register_archive _ar_tmp(&(obj)); (obj).serialize(_ar_tmp, 0); }
+    { uLib::Archive::property_register_archive _ar_tmp(&(obj)); _ar_tmp & (obj); }
+
+/**
+ * @brief Declares a private member that automatically calls ULIB_ACTIVATE_PROPERTIES
+ * in every constructor of the class. Place this macro as the last declaration
+ * inside the class body (before the closing brace).
+ *
+ * Usage: ULIB_DECLARE_PROPERTIES(ClassName)
+ *
+ * This replaces per-constructor ULIB_ACTIVATE_PROPERTIES(*this) calls.
+ * RegisterDynamicProperty deduplicates by qualified name, so re-registration
+ * from inherited activators in a hierarchy is safe.
+ */
+#define ULIB_DECLARE_PROPERTIES(SelfType) \
+private: \
+    struct _PropActivator { \
+        _PropActivator(SelfType* self) { \
+            uLib::Archive::property_register_archive _ar(self); \
+            _ar & *self; \
+        } \
+    } _prop_activator{this};
 
 } // namespace Archive
 } // namespace uLib

src/Core/Serializable.h

@@ -71,19 +71,39 @@ namespace serialization {
 // ACCESS 2 //
 template <class T> struct access2 {};
 
-// NON FUNZIONA ... SISTEMARE !!!! // ------------------------------------------
 template <class T>
 class hrp : public boost::serialization::wrapper_traits<hrp<T>> {
+  
   const char *m_name;
+  const char *m_units;
   T &m_value;
+  
+  bool m_has_range;
+  T m_min, m_max;
+
+  bool m_has_default;
+  T m_default;
 
 public:
-  explicit hrp(const char *name_, T &t) : m_name(name_), m_value(t) {}
+  explicit hrp(const char *name_, T &t, const char* units_ = nullptr) 
+    : m_name(name_), m_units(units_), m_value(t), m_has_range(false), m_has_default(false) {}
+
+  hrp& range(const T& min_val, const T& max_val) { m_min = min_val; m_max = max_val; m_has_range = true; return *this; }
+  hrp& set_default(const T& def_val) { m_default = def_val; m_has_default = true; return *this; }
 
   const char *name() const { return this->m_name; }
+  const char *units() const { return this->m_units; }
   T &value() { return this->m_value; }
   const T &const_value() const { return this->m_value; }
 
+  bool has_range() const { return m_has_range; }
+  const T& min_val() const { return m_min; }
+  const T& max_val() const { return m_max; }
+  bool has_default() const { return m_has_default; }
+  const T& default_val() const { return m_default; }
+
+  static constexpr bool is_read_only() { return false; }
+
   BOOST_SERIALIZATION_SPLIT_MEMBER()
 
   template <class Archivex>
@@ -98,11 +118,158 @@ public:
 };
 
 template <class T>
-inline hrp<T> make_hrp(const char *name, T &t) {
+class hrp_enum : public boost::serialization::wrapper_traits<hrp_enum<T>> {
-  return hrp<T>(name, t);
+  const char *m_name;
+  const char *m_units;
+  T &m_value;
+  std::vector<std::string> m_labels;
+  bool m_has_default;
+  T m_default;
+
+public:
+  explicit hrp_enum(const char *name_, T &t, const std::vector<std::string>& labels, const char* units_ = nullptr) 
+    : m_name(name_), m_units(units_), m_value(t), m_labels(labels), m_has_default(false) {}
+
+  hrp_enum& set_default(const T& def_val) { m_default = def_val; m_has_default = true; return *this; }
+
+  const char *name() const { return this->m_name; }
+  const char *units() const { return this->m_units; }
+  T &value() { return this->m_value; }
+  const std::vector<std::string>& labels() const { return m_labels; }
+
+  bool has_default() const { return m_has_default; }
+  const T& default_val() const { return m_default; }
+
+  static constexpr bool is_read_only() { return false; }
+
+  BOOST_SERIALIZATION_SPLIT_MEMBER()
+
+  template <class Archivex>
+  void save(Archivex &ar, const unsigned int /* version */) const {
+    ar << boost::serialization::make_nvp(m_name, m_value);
+  }
+
+  template <class Archivex>
+  void load(Archivex &ar, const unsigned int /* version */) {
+    ar >> boost::serialization::make_nvp(m_name, m_value);
+  }
+};
+
+template <class T>
+class hrp_val : public boost::serialization::wrapper_traits<hrp_val<T>> {
+  const char *m_name;
+  const char *m_units;
+  T m_value;
+  bool m_has_range;
+  T m_min, m_max;
+  bool m_has_default;
+  T m_default;
+  
+public:
+  explicit hrp_val(const char *name_, T t, const char* units_ = nullptr) 
+    : m_name(name_), m_units(units_), m_value(t), m_has_range(false), m_has_default(false) {}
+
+  hrp_val& range(const T& min_val, const T& max_val) { m_min = min_val; m_max = max_val; m_has_range = true; return *this; }
+  hrp_val& set_default(const T& def_val) { m_default = def_val; m_has_default = true; return *this; }
+
+  const char *name() const { return this->m_name; }
+  const char *units() const { return this->m_units; }
+  T &value() { return this->m_value; }
+  const T &const_value() const { return this->m_value; }
+
+  bool has_range() const { return m_has_range; }
+  const T& min_val() const { return m_min; }
+  const T& max_val() const { return m_max; }
+  bool has_default() const { return m_has_default; }
+  const T& default_val() const { return m_default; }
+
+  static constexpr bool is_read_only() { return true; }
+
+  BOOST_SERIALIZATION_SPLIT_MEMBER()
+
+  template <class Archivex>
+  void save(Archivex &ar, const unsigned int /* version */) const {
+    ar << boost::serialization::make_nvp(m_name, m_value);
+  }
+
+  template <class Archivex>
+  void load(Archivex &ar, const unsigned int /* version */) {
+    // Only for output archives
+  }
+};
+
+template <class T>
+class hrp_enum_val : public boost::serialization::wrapper_traits<hrp_enum_val<T>> {
+  const char *m_name;
+  const char *m_units;
+  T m_value;
+  std::vector<std::string> m_labels;
+  bool m_has_default;
+  T m_default;
+
+public:
+  explicit hrp_enum_val(const char *name_, T t, const std::vector<std::string>& labels, const char* units_ = nullptr) 
+    : m_name(name_), m_units(units_), m_value(t), m_labels(labels), m_has_default(false) {}
+
+  hrp_enum_val& set_default(const T& def_val) { m_default = def_val; m_has_default = true; return *this; }
+
+  const char *name() const { return this->m_name; }
+  const char *units() const { return this->m_units; }
+  T &value() { return this->m_value; }
+  const std::vector<std::string>& labels() const { return m_labels; }
+
+  bool has_default() const { return m_has_default; }
+  const T& default_val() const { return m_default; }
+
+  static constexpr bool is_read_only() { return true; }
+
+  BOOST_SERIALIZATION_SPLIT_MEMBER()
+
+  template <class Archivex>
+  void save(Archivex &ar, const unsigned int /* version */) const {
+    ar << boost::serialization::make_nvp(m_name, m_value);
+  }
+
+  template <class Archivex>
+  void load(Archivex &ar, const unsigned int /* version */) {
+    // Only for output archives
+  }
+};
+
+template <class T>
+inline hrp<T> make_hrp(const char *name, T &t, const char* units = nullptr) {
+  return hrp<T>(name, t, units);
 }
 
-#define HRP(name) boost::serialization::make_hrp(BOOST_PP_STRINGIZE(name), name)
+// Specialization for rvalues (value-based storage)
+template <class T>
+inline hrp_val<T> make_hrp(const char *name, T &&t, const char* units = nullptr) {
+  return hrp_val<T>(name, t, units);
+}
+
+template <class T>
+inline hrp_enum<T> make_hrp_enum(const char *name, T &t, const std::vector<std::string>& labels, const char* units = nullptr) {
+  return hrp_enum<T>(name, t, labels, units);
+}
+
+// Specialization for rvalues (value-based storage)
+template <class T>
+inline hrp_enum_val<T> make_hrp_enum(const char *name, T &&t, const std::vector<std::string>& labels, const char* units = nullptr) {
+  return hrp_enum_val<T>(name, t, labels, units);
+}
+
+template <class T>
+inline hrp<T> make_nvp(const char *name, T &t, const char* units) {
+  return hrp<T>(name, t, units);
+}
+
+// Specialization for rvalues (value-based storage)
+template <class T>
+inline hrp_val<T> make_nvp(const char *name, T &&t, const char* units) {
+  return hrp_val<T>(name, t, units);
+}
+
+
 
 } // namespace serialization
 } // namespace boost
@@ -122,7 +289,41 @@ namespace uLib {
 
 #define _AR_OP(r, data, elem) data &BOOST_SERIALIZATION_BASE_OBJECT_NVP(elem);
 
-#define NVP(data) BOOST_SERIALIZATION_NVP(data)
+// NAME VALUE PAIR //
+#define NVP_GET_MACRO(_1, _2, _3, NAME, ...) NAME
+#define NVP(...) NVP_GET_MACRO(__VA_ARGS__, NVP3, NVP2, NVP1)(__VA_ARGS__)
+
+#define NVP1(data) BOOST_SERIALIZATION_NVP(data)
+#define NVP2(name, data) boost::serialization::make_nvp(name, data)
+#define NVP3(name, data, units) boost::serialization::make_nvp(name, data, units)
+
+
+// HUMAN READABLE PROPERTY //
+#define HRP_GET_MACRO(_1, _2, _3, _4, _5, _6, NAME, ...) NAME
+#define HRP(...) HRP_GET_MACRO(__VA_ARGS__, HRP6, HRP5, HRP4, HRP3, HRP2, HRP1)(__VA_ARGS__)
+
+#define HRP1(data) boost::serialization::make_hrp(BOOST_PP_STRINGIZE(data), data)
+#define HRP2(name, data) boost::serialization::make_hrp(name, data)
+#define HRP3(name, data, units) boost::serialization::make_hrp(name, data, units)
+#define HRP4(name, data, units, default) boost::serialization::make_hrp(name, data, units).set_default(default)
+#define HRP5(name, data, units, min, max) boost::serialization::make_hrp(name, data, units).range(min, max)
+#define HRP6(name, data, units, default, min, max) boost::serialization::make_hrp(name, data, units).set_default(default).range(min, max)
+
+#define HRPE(name, data, labels) boost::serialization::make_hrp_enum(name, data, labels)
+
+// LEFT FOR BACKWARD COMPATIBILITY
+#define HRPU(name, units) boost::serialization::make_hrp(BOOST_PP_STRINGIZE(name), name, units)
+
+
+
+
+
+namespace serialization {
+using boost::serialization::make_nvp;
+using boost::serialization::make_hrp;
+using boost::serialization::make_hrp_enum;
+} // serialization
+
 
 ////////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////
@@ -150,7 +351,7 @@ namespace uLib {
 #define ULIB_SERIALIZE_OBJECT(_Ob, ...)                                        \
   _ULIB_DETAIL_UNINTRUSIVE_SERIALIZE_OBJECT(_Ob, __VA_ARGS__)
 #define AR(_name) _ULIB_DETAIL_UNINTRUSIVE_AR_(_name)
-#define HR(_name) _ULIB_DETAIL_UNINTRUSIVE_AR_(_name)
+#define HR(_name) _ULIB_DETAIL_UNINTRUSIVE_HR_(_name)
 #endif
 
 #define ULIB_SERIALIZE_ACCESS                                                  \
@@ -163,14 +364,14 @@ namespace uLib {
 #define ULIB_CLASS_EXPORT_OBJECT_KEY(_FullNamespaceClass)                      \
   BOOST_CLASS_EXPORT_KEY(_FullNamespaceClass)
 
-#define _SERIALIZE_IMPL_SEQ                                                                   \
+#define _SERIALIZE_IMPL_SEQ  \
-  (uLib::Archive::text_iarchive)(uLib::Archive::text_oarchive)(                               \
+  (uLib::Archive::text_iarchive) \
-      uLib::Archive::                                                                         \
+  (uLib::Archive::text_oarchive) \
-          hrt_iarchive)(uLib::Archive::                                                       \
+  (uLib::Archive::hrt_iarchive)  \
-                            hrt_oarchive)(uLib::Archive::                                     \
+  (uLib::Archive::hrt_oarchive)  \
-                                              xml_iarchive)(uLib::Archive::                   \
+  (uLib::Archive::xml_iarchive)  \
-                                                                xml_oarchive)(uLib::Archive:: \
+  (uLib::Archive::xml_oarchive)  \
-                                                                                  log_archive)
+  (uLib::Archive::log_archive)
 
 /** Solving virtual class check problem */
 #define _ULIB_DETAIL_SPECIALIZE_IS_VIRTUAL_BASE(_Base, _Derived)               \
@@ -241,6 +442,11 @@ namespace uLib {
   template <class ArchiveT>                                                    \
   void _Ob::save_override(ArchiveT &ar, const unsigned int version)
 
+
+
+
+
+  
 ////////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////
@@ -345,7 +551,8 @@ namespace uLib {
   void serialize_parents(ArchiveT &ar, _Ob &ob, const unsigned int v) {        \
     /* PP  serialize */ BOOST_PP_SEQ_FOR_EACH(                                 \
         _UNAR_OP, ob, BOOST_PP_TUPLE_TO_SEQ((__VA_ARGS__)));                   \
-  /* MPL serialize */ /*uLib::mpl::for_each<_Ob::BaseList>(uLib::detail::Serializable::serialize_baseobject<_Ob,ArchiveT>(ob,ar) );*/ }                                                          \
+  /* MPL serialize */ /*uLib::mpl::for_each<_Ob::BaseList>                     \
+  (uLib::detail::Serializable::serialize_baseobject<_Ob,ArchiveT>(ob,ar) );*/ }\
   template <class ArchiveT>                                                    \
   inline void load_construct_data(ArchiveT &ar, _Ob *ob,                       \
                                   const unsigned int file_version) {           \
@@ -368,10 +575,18 @@ namespace uLib {
                         _SERIALIZE_IMPL_SEQ)                                   \
   template <class ArchiveT>                                                    \
   void boost::serialization::access2<_Ob>::save_override(                      \
-      ArchiveT &ar, _Ob &ob, const unsigned int version)
+      ArchiveT &ar, _Ob &ob, const unsigned int version) 
 
+    
 #define _ULIB_DETAIL_UNINTRUSIVE_AR_(name)                                     \
   boost::serialization::make_nvp(BOOST_PP_STRINGIZE(name), ob.name)
+#define _ULIB_DETAIL_UNINTRUSIVE_HR_(name)                                     \
+  boost::serialization::make_hrp(BOOST_PP_STRINGIZE(name), ob.name)
+
+
+
+
+
 
 ////////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////

src/Core/Signal.h

@@ -95,6 +95,8 @@ namespace uLib {
 
 typedef boost::signals2::signal_base SignalBase;
 typedef boost::signals2::connection Connection;
+typedef boost::signals2::shared_connection_block ConnectionBlock;
+
 
 template <typename T> struct Signal {
   typedef boost::signals2::signal<T> type;

src/Core/Types.h

@@ -182,7 +182,7 @@ typedef bool Bool_t; // Boolean (0=false, 1=true) (bool)
                                                                                \
 public:                                                                        \
   typedef type_info::BaseClass BaseClass;                                      \
-  virtual const char *type_name() const { return type_info::name; }            \
+  virtual const char *type_name() const override { return type_info::name; }            \
   /**/
 
 /**

src/Core/testing/CMakeLists.txt

@@ -23,11 +23,13 @@ set( TESTS
         VectorMetaAllocatorTest
         PropertyTypesTest
         HRPTest
+        PropertyGroupingTest
         MutexTest
         ThreadsTest
         OpenMPTest
         TeamTest
         AffinityTest
+        ReadOnlyPropertyTest
 )
 
 set(LIBRARIES

src/Core/testing/MutexTest.cpp

@@ -1,5 +1,6 @@
 #include "Core/Monitor.h"
 #include <iostream>
+#include <chrono>
 #include <thread>
 #include <vector>
 #include <cassert>

src/Core/testing/PropertiesTest.cpp

@@ -23,74 +23,138 @@
 
 //////////////////////////////////////////////////////////////////////////////*/
 
-
-
-
 #include <iostream>
-
+#include <fstream>
-#include <boost/signals2/signal.hpp>
+#include <string>
-
 
 #include "Core/Object.h"
+#include "Core/Property.h"
+#include "Core/Archives.h"
+#include "Core/Serializable.h"
 #include "testing-prototype.h"
 
-#define emit
+using namespace uLib;
-
-
-
-
-template <typename T, bool copyable = true>
-class property
-{
-    typedef boost::signals2::signal<void(const property<T>& )> signal_t;
 
+/**
+ * @brief A test class to demonstrate property registration via SERIALIZE_OBJECT.
+ */
+class TestObject : public Object {
 public:
-    property() : m_changed(new signal_t) {}
+    uLibTypeMacro(TestObject, Object)
-    property(const T in) : value(in) , m_changed(new signal_t) {}
 
-    inline operator T const & () const { return value; }
+    TestObject() : m_Value(10.5f), m_Status("Initialized"), m_Counter(0) {}
-    inline operator T & () { return value; }
+
-    inline T & operator = (const T &i) { value = i; return value; }
+    float m_Value;
-    template <typename T2> T2 & operator = (const T2 &i) { T2 &guard = value; }    // Assign exact identical types only.
+    std::string m_Status;
-    inline signal_t & valueChanged() { return *m_changed; }
+    int m_Counter;
+
+    // Static properties (registered in constructor/initializer)
+    ULIB_PROPERTY(int, StaticProp, 42)
+
+    ULIB_SERIALIZE_ACCESS
+
+    template <typename Ar>
+    void serialize(Ar& ar, unsigned int version) {
+        ar & HRP("value", m_Value, "mm").range(0, 100).set_default(1.);
+        ar & HRP("status", m_Status);
+        ar & HRP("counter", m_Counter);
+    }
 
-private:
-    T value;
-    boost::shared_ptr<signal_t> m_changed;
 };
 
 
-//template <typename T>
+class TestObject2 : public TestObject {
-//class property <T,false> {
+public:
-//    typedef boost::signals2::signal<void( T )> signal_t;
+    uLibTypeMacro(TestObject2, TestObject)
 
-//public:
+    TestObject2() : TestObject(), m_Value2(20.5f) {}
-//    property() : m_changed() {}
-//    property(const T in) : value(in) , m_changed() {}
 
-//    inline operator T const & () const { return value; }
+    float m_Value2;
-//    inline operator T & () { valueChanged()(value); return value; }
-//    inline T & operator = (const T &i) { value = i; valueChanged()(value); return value; }
-//    template <typename T2> T2 & operator = (const T2 &i) { T2 &guard = value; }     // Assign exact identical types only.
-//    inline signal_t &valueChanged() { return m_changed; }
-
-//private:
-//    property(const property<T> &);
-//    property<T> &operator = (const property<T>&);
-
-//    T value;
-//    signal_t m_changed;
-//};
-
-// test generic void function slot //
-void PrintSlot(const property<int> &i) { std::cout << "slot called, new value = " << i << "!\n"; }
-
-
-
-
-
-int main()
-{    
 
+    ULIB_SERIALIZE_ACCESS
+};
 
+ULIB_SERIALIZABLE_OBJECT(TestObject2)
+ULIB_SERIALIZE_OBJECT(TestObject2, TestObject) { 
+    std::cout << "Serializing TestObject2" << std::endl;
+    // ar & boost::serialization::make_hrp("value2", ob.m_Value2, "mm").set_default(1.);
+    ar & HRP("value2", ob.m_Value2, "mm").set_default(1.);
+}
+
+
+int main() {
+    BEGIN_TESTING(Properties Serialization)
+
+    TestObject obj;
+    
+    // 1. Initial state: check static property
+    ASSERT_EQUAL(obj.StaticProp, 42);
+    
+    // 2. Activate dynamic properties via the property_register_archive
+    // This calls the serialize method with a special archive that populates m_DynamicProperties
+    ULIB_ACTIVATE_PROPERTIES(obj);
+    
+    const auto& props = obj.GetProperties();
+    // This is problematic because GetProperties currently returns d->m_Properties (only static) 
+    
+    // For now, let's just assert on the dynamic property presence if possible
+    PropertyBase* pVal = obj.GetProperty("value");
+    ASSERT_NOT_NULL(pVal);
+    ASSERT_EQUAL(pVal->GetValueAsString(), "10.5");
+    ASSERT_EQUAL(pVal->GetUnits(), "mm");
+
+    // Check other dynamic properties
+    ASSERT_NOT_NULL(obj.GetProperty("status"));
+    ASSERT_NOT_NULL(obj.GetProperty("counter"));
+
+    // 4. Serialization round-trip (XML)
+    {
+        std::ofstream ofs("test_props.xml");
+        Archive::xml_oarchive(ofs) << NVP("test_obj", obj);
+    }
+
+    TestObject obj2;
+    obj2.m_Value = 0;
+    obj2.m_Status = "";
+    {
+        std::ifstream ifs("test_props.xml");
+        Archive::xml_iarchive(ifs) >> NVP("test_obj", obj2);
+    }
+
+    ASSERT_EQUAL(obj2.m_Value, 10.5f);
+    ASSERT_EQUAL(obj2.m_Status, "Initialized");
+
+    TestObject2 obj3;
+    obj3.m_Value = 12.5;
+    obj3.m_Status = "Initialized";
+    obj3.m_Value2 = 22.5;
+
+    ULIB_ACTIVATE_PROPERTIES(obj3);
+
+    PropertyBase* pVal3 = obj3.GetProperty("value2");
+    ASSERT_NOT_NULL(pVal3);
+    ASSERT_EQUAL(pVal3->GetValueAsString(), "22.5");
+    ASSERT_EQUAL(pVal3->GetUnits(), "mm");
+
+    // 5. Serialization round-trip (XML)
+    {   
+        std::ofstream ofs("test_props2.xml");
+        Archive::xml_oarchive(ofs) << NVP("test_obj2", obj3);
+    }
+
+    TestObject2 obj4;
+    obj4.m_Value = 0;
+    obj4.m_Status = "";
+    obj4.m_Value2 = 0;
+    ULIB_ACTIVATE_PROPERTIES(obj4);
+    {   
+        std::ifstream ifs("test_props2.xml");
+        Archive::xml_iarchive(ifs) >> NVP("test_obj2", obj4);
+    }
+    ASSERT_EQUAL(obj4.m_Value, 12.5f);
+    ASSERT_EQUAL(obj4.m_Status, "Initialized");
+    ASSERT_EQUAL(obj4.m_Value2, 22.5f);
+
+
+    END_TESTING
 }

src/Core/testing/PropertyGroupingTest.cpp

@@ -0,0 +1,78 @@
+#include <iostream>
+#include <vector>
+#include <string>
+#include <cassert>
+#include "Core/Object.h"
+#include "Core/Property.h"
+
+using namespace uLib;
+
+struct Nested {
+    float x = 1.0f;
+    float y = 2.0f;
+
+    ULIB_SERIALIZE_ACCESS
+    template<class Archive>
+    void serialize(Archive & ar, const unsigned int version) {
+        ar & HRP(x);
+        ar & HRP(y);
+    }
+};
+
+class GroupObject : public Object {
+    uLibTypeMacro(GroupObject, Object)
+public:
+    Nested position;
+    Nested orientation;
+    float weight = 50.0f;
+
+    ULIB_SERIALIZE_ACCESS
+    template<class Archive>
+    void serialize(Archive & ar, const unsigned int version) {
+        ar & boost::serialization::make_nvp("Position", position);
+        ar & boost::serialization::make_nvp("Orientation", orientation);
+        ar & HRP(weight);
+    }
+};
+
+int main() {
+    std::cout << "Testing Property Grouping..." << std::endl;
+
+    GroupObject obj;
+    ULIB_ACTIVATE_PROPERTIES(obj);
+
+    auto props = obj.GetProperties();
+    std::cout << "Registered " << props.size() << " properties." << std::endl;
+
+    for (auto* p : props) {
+        std::cout << "Prop: " << p->GetName() 
+                  << " Group: " << p->GetGroup() 
+                  << " Qualified: " << p->GetQualifiedName() << std::endl;
+    }
+
+    // Check if nested properties are registered
+    PropertyBase* p1 = obj.GetProperty("Position.x");
+    PropertyBase* p2 = obj.GetProperty("Position.y");
+    PropertyBase* p3 = obj.GetProperty("Orientation.x");
+    PropertyBase* p4 = obj.GetProperty("Orientation.y");
+    PropertyBase* p5 = obj.GetProperty("weight");
+
+    assert(p1 != nullptr && "Position.x not found");
+    assert(p2 != nullptr && "Position.y not found");
+    assert(p3 != nullptr && "Orientation.x not found");
+    assert(p4 != nullptr && "Orientation.y not found");
+    assert(p5 != nullptr && "weight not found");
+
+    assert(p1->GetGroup() == "Position");
+    assert(p2->GetGroup() == "Position");
+    assert(p3->GetGroup() == "Orientation");
+    assert(p4->GetGroup() == "Orientation");
+    assert(p5->GetGroup() == "");
+
+    assert(p1->GetQualifiedName() == "Position.x");
+    assert(p5->GetQualifiedName() == "weight");
+
+    std::cout << "Property Grouping Tests PASSED!" << std::endl;
+
+    return 0;
+}

src/Core/testing/PropertySystemTest.cpp

@@ -8,13 +8,12 @@ using namespace uLib;
 
 class TestObject : public Object {
 public:
+  uLibTypeMacro(TestObject, Object)
   TestObject() : Object(), 
     IntProp(this, "IntProp", 10),
     StringProp(this, "StringProp", "Initial") 
   {}
 
-  virtual const char* GetClassName() const override { return "TestObject"; }
-
   Property<int> IntProp;
   Property<std::string> StringProp;
 };

src/Core/testing/PropertyTypesTest.cpp

@@ -9,10 +9,9 @@ using namespace uLib;
 
 class TestObject : public Object {
 public:
+  uLibTypeMacro(TestObject, Object)
   TestObject() : Object() {}
 
-  virtual const char* GetClassName() const override { return "TestObject"; }
-
   // Use new typedefs
   StringProperty  StringProp = StringProperty(this, "StringProp", "Initial");
   IntProperty     IntProp    = IntProperty(this, "IntProp", 42);

src/Core/testing/ReadOnlyPropertyTest.cpp

@@ -0,0 +1,82 @@
+#include <iostream>
+#include <vector>
+#include <string>
+#include <cassert>
+#include "Core/Object.h"
+#include "Core/Property.h"
+#include "Core/Serializable.h"
+
+#include "Core/Serializable.h"
+
+using namespace uLib;
+
+class ReadOnlyTestObject : public Object {
+public:
+    int m_value;
+    int getValue() const { return m_value; }
+    
+    enum State { State1, State2 };
+    State m_state;
+    State getState() const { return m_state; }
+
+    ReadOnlyTestObject() : m_value(10), m_state(State1) {
+        ULIB_ACTIVATE_PROPERTIES(*this);
+    }
+
+    template<class Archive>
+    void serialize(Archive & ar, const unsigned int version) {
+        // Lvalue reference - should be NOT read-only
+        ar & HRP("lvalue_prop", m_value);
+        
+        // Rvalue from getter - should be read-only
+        ar & HRP("rvalue_prop", getValue());
+        
+        // Enum lvalue - should be NOT read-only
+        ar & boost::serialization::make_hrp_enum("lvalue_enum", (int&)m_state, {"State1", "State2"});
+        
+        // Enum rvalue - should be read-only
+        ar & boost::serialization::make_hrp_enum("rvalue_enum", (int)getState(), {"State1", "State2"});
+    }
+};
+
+int main() {
+    std::cout << "Testing Read-Only Property Feature..." << std::endl;
+    
+    ReadOnlyTestObject obj;
+    const auto& props = obj.GetProperties();
+    
+    std::cout << "Registered Properties in ReadOnlyTestObject:" << std::endl;
+    bool found_lvalue = false;
+    bool found_rvalue = false;
+    bool found_lvalue_enum = false;
+    bool found_rvalue_enum = false;
+
+    for (auto* p : props) {
+        bool ro = p->IsReadOnly();
+        std::cout << "  - Name: " << p->GetName() 
+                  << " | Type: " << p->GetTypeName() 
+                  << " | ReadOnly: " << (ro ? "YES" : "NO") << std::endl;
+        
+        if (p->GetName() == "lvalue_prop") {
+            if (ro) { std::cerr << "FAIL: lvalue_prop should NOT be read-only" << std::endl; return 1; }
+            found_lvalue = true;
+        } else if (p->GetName() == "rvalue_prop") {
+            if (!ro) { std::cerr << "FAIL: rvalue_prop SHOULD be read-only" << std::endl; return 1; }
+            found_rvalue = true;
+        } else if (p->GetName() == "lvalue_enum") {
+            if (ro) { std::cerr << "FAIL: lvalue_enum should NOT be read-only" << std::endl; return 1; }
+            found_lvalue_enum = true;
+        } else if (p->GetName() == "rvalue_enum") {
+            if (!ro) { std::cerr << "FAIL: rvalue_enum SHOULD be read-only" << std::endl; return 1; }
+            found_rvalue_enum = true;
+        }
+    }
+    
+    if (found_lvalue && found_rvalue && found_lvalue_enum && found_rvalue_enum) {
+        std::cout << "TEST PASSED SUCCESSFULLY!" << std::endl;
+        return 0;
+    } else {
+        std::cerr << "TEST FAILED: Some properties were not found!" << std::endl;
+        return 1;
+    }
+}

src/Core/testing/SerializeDreadDiamondTest.cpp

@@ -40,7 +40,7 @@ struct A : Object {
 };
 
 ULIB_SERIALIZABLE_OBJECT(A)
-ULIB_SERIALIZE_OBJECT(A, Object) { ar &AR(numa); }
+ULIB_SERIALIZE_OBJECT(A, Object) { ar & AR(numa); }
 
 struct B : virtual Object {
   uLibTypeMacro(B, Object) B() : numb(5552369) {}
@@ -48,7 +48,7 @@ struct B : virtual Object {
 };
 
 ULIB_SERIALIZABLE_OBJECT(B)
-ULIB_SERIALIZE_OBJECT(B, Object) { ar &AR(numb); }
+ULIB_SERIALIZE_OBJECT(B, Object) { ar & AR(numb); }
 
 struct C : B {
   uLibTypeMacro(C, B) C() : numc(5552370) {}
@@ -56,7 +56,7 @@ struct C : B {
 };
 
 ULIB_SERIALIZABLE_OBJECT(C)
-ULIB_SERIALIZE_OBJECT(C, B) { ar &AR(numc); }
+ULIB_SERIALIZE_OBJECT(C, B) { ar & AR(numc); }
 
 struct D : A, B {
   uLibTypeMacro(D, A, B)
@@ -67,10 +67,33 @@ struct D : A, B {
 };
 
 ULIB_SERIALIZABLE_OBJECT(D)
-ULIB_SERIALIZE_OBJECT(D, A, B) { ar &AR(numd); }
+ULIB_SERIALIZE_OBJECT(D, A, B) { ar & AR(numd); }
 
 int main() {
-  A o;
+  BEGIN_TESTING(DreadDiamond Serialization)
-
+  
-  Archive::xml_oarchive(std::cout) << NVP(o);
+  D o;
+  C c;
+  c.numb = 123;
+  {
+    std::ofstream file("test.xml");
+    Archive::xml_oarchive(file) << NVP("dd_test", o) << NVP("c", c);
+  }
+  {
+    D o2;
+    C c2;
+    std::ifstream file("test.xml");
+    Archive::xml_iarchive(file) >> NVP("dd_test", o2) >> NVP("c", c2);
+    
+    // D //
+    ASSERT_EQUAL(o.numa, o2.numa);
+    ASSERT_EQUAL(o.numb, o2.numb);
+    ASSERT_EQUAL(o.numd, o2.numd);
+    
+    // C //
+    ASSERT_EQUAL(c.numb, c2.numb);
+    ASSERT_EQUAL(c.numc, c2.numc);
+  }
+  
+  END_TESTING
 }

src/Core/testing/SerializeTest.cpp

@@ -143,22 +143,19 @@ int testing_hrt_class() {
   }
   a.a() = 0;
   a.p_a = "zero string";
-  {
-    // ERRORE FIX !
-    //        std::ifstream file("test.xml");
-    //        Archive::hrt_iarchive(file) >> NVP(a);
-  }
 
   Archive::hrt_oarchive(std::cout) << NVP(a);
   return (a.a() == 5552368 && a.p_a == "A property string");
 }
 
+
+
 int main() {
   BEGIN_TESTING(Serialize Test);
 
   TEST1(test_V3f());
   TEST1(testing_xml_class());
-  //    testing_hrt_class(); ///// << ERRORE in HRT with properties
+  // TEST1(testing_hrt_class());
 
   END_TESTING;
 }

src/Core/testing/testing-prototype.h

@@ -33,5 +33,7 @@ printf("..:: Testing " #name " ::..\n");
 
 #define TEST1(val) _fail += (val)==0
 #define TEST0(val) _fail += (val)!=0
+#define ASSERT_EQUAL(a,b) if((a)!=(b)) { printf("Assertion failed: " #a " != " #b " at line %d\n", __LINE__); _fail++; }
+#define ASSERT_NOT_NULL(ptr) if((ptr)==NULL) { printf("Assertion failed: " #ptr " is NULL at line %d\n", __LINE__); _fail++; }
 #define END_TESTING return _fail;
 

src/HEP/Detectors/DetectorChamber.h

@@ -39,13 +39,11 @@ namespace uLib {
 
 
 class DetectorChamber : public ContainerBox {
-
-  typedef ContainerBox BaseClass;
   
-
 public:
+  uLibTypeMacro(DetectorChamber, ContainerBox)
 
-  virtual const char * GetClassName() const { return "DetectorChamber"; }
+  
 
   DetectorChamber() : BaseClass() {
     m_ProjectionPlane.origin = HPoint3f(0, 0, 0);

src/HEP/Geant/ActionInitialization.cpp

@@ -12,6 +12,15 @@ ActionInitialization::ActionInitialization(EmitterPrimary *emitter, SimulationCo
 {}
 
 ActionInitialization::~ActionInitialization() {}
+  
+// Lightweight wrapper to avoid double-free in Geant4 EventManager
+class SteppingActionWrapper : public G4UserSteppingAction {
+public:
+  SteppingActionWrapper(SteppingAction *real) : m_Real(real) {}
+  virtual void UserSteppingAction(const G4Step* step) override { m_Real->UserSteppingAction(step); }
+private:
+  SteppingAction *m_Real;
+};
 
 void ActionInitialization::BuildForMaster() const {}
 
@@ -21,10 +30,12 @@ void ActionInitialization::Build() const {
   } else {
     SetUserAction(new EmitterPrimary());
   }
-
+  
   SteppingAction *sa = new SteppingAction(m_Context);
-  SetUserAction(static_cast<G4UserSteppingAction*>(sa));
+  // EventManager will delete sa via this slot
   SetUserAction(static_cast<G4UserEventAction*>(sa));
+  // EventManager will delete the wrapper, leaving sa alive to be deleted once.
+  SetUserAction(new SteppingActionWrapper(sa));
 }
 
 } // namespace Geant

src/HEP/Geant/CMakeLists.txt

@@ -27,6 +27,8 @@ set(SOURCES
     Scene.cpp
     Solid.cpp
     EmitterPrimary.cpp
+    Matter.cpp
+    GeantRegistration.cpp
     DetectorConstruction.cpp
     PhysicsList.cpp
     ActionInitialization.cpp

src/HEP/Geant/DetectorActionInitialization.cpp

@@ -17,6 +17,14 @@ DetectorActionInitialization::DetectorActionInitialization(EmitterPrimary *emitt
 {}
 
 DetectorActionInitialization::~DetectorActionInitialization() {}
+  
+class DetectorSteppingActionWrapper : public G4UserSteppingAction {
+public:
+  DetectorSteppingActionWrapper(DetectorSteppingAction *real) : m_Real(real) {}
+  virtual void UserSteppingAction(const G4Step* step) override { m_Real->UserSteppingAction(step); }
+private:
+  DetectorSteppingAction *m_Real;
+};
 
 void DetectorActionInitialization::BuildForMaster() const {}
 
@@ -34,8 +42,10 @@ void DetectorActionInitialization::Build() const {
   if (m_Output) {
     DetectorSteppingAction *sa = new DetectorSteppingAction(m_Output, m_Planes);
     sa->SetVerbosity(m_Verbosity);
-    SetUserAction(static_cast<G4UserSteppingAction*>(sa));
+    // EventManager will delete sa via the Event slot
     SetUserAction(static_cast<G4UserEventAction*>(sa));
+    // EventManager will delete the wrapper, leaving sa alive for the other deletion.
+    SetUserAction(new DetectorSteppingActionWrapper(sa));
   }
 }
 

src/HEP/Geant/EmitterPrimary.hh

@@ -23,11 +23,10 @@ class G4Event;
 namespace uLib {
 namespace Geant {
 
-class EmitterPrimary : public G4VUserPrimaryGeneratorAction, public Object, public AffineTransform
+class EmitterPrimary : public G4VUserPrimaryGeneratorAction, public AffineTransform
 {
   public:
-
+    uLibTypeMacro(EmitterPrimary, Object)
-    virtual const char* GetClassName() const override { return "Geant.EmitterPrimary"; }
 
     EmitterPrimary();    
     virtual ~EmitterPrimary();
@@ -47,8 +46,7 @@ class EmitterPrimary : public G4VUserPrimaryGeneratorAction, public Object, publ
 class SkyPlaneEmitterPrimary : public EmitterPrimary
 {
   public:
-
+    uLibTypeMacro(SkyPlaneEmitterPrimary, EmitterPrimary)
-    virtual const char* GetClassName() const override { return "Geant.SkyPlaneEmitterPrimary"; }
 
     SkyPlaneEmitterPrimary();
     virtual ~SkyPlaneEmitterPrimary();
@@ -69,8 +67,7 @@ class SkyPlaneEmitterPrimary : public EmitterPrimary
 class CylinderEmitterPrimary : public EmitterPrimary
 {
   public:
-
+    uLibTypeMacro(CylinderEmitterPrimary, EmitterPrimary)
-    virtual const char* GetClassName() const override { return "Geant.CylinderEmitterPrimary"; }
 
     CylinderEmitterPrimary();
     virtual ~CylinderEmitterPrimary();
@@ -98,8 +95,7 @@ class CylinderEmitterPrimary : public EmitterPrimary
 class QuadMeshEmitterPrimary : public EmitterPrimary
 {
   public:
-
+    uLibTypeMacro(QuadMeshEmitterPrimary, EmitterPrimary)
-    virtual const char* GetClassName() const override { return "Geant.QuadMeshEmitterPrimary"; }
 
     QuadMeshEmitterPrimary();    
     virtual ~QuadMeshEmitterPrimary();

src/HEP/Geant/GeantEvent.h

@@ -50,8 +50,7 @@ class SteppingAction;
 class GeantEvent : public Object {
   
 public:
-
+  uLibTypeMacro(GeantEvent, Object)
-  virtual const char* GetClassName() const override { return "Geant.GeantEvent"; }
 
   /// A single interaction step along the muon path.
   struct Delta {

src/HEP/Geant/GeantRegistration.cpp

@@ -0,0 +1,22 @@
+#include "Core/ObjectFactory.h"
+#include "HEP/Geant/Matter.h"
+#include "HEP/Geant/Solid.h"
+#include "HEP/Geant/Scene.h"
+#include "HEP/Geant/EmitterPrimary.hh"
+#include "HEP/Geant/GeantEvent.h"
+
+namespace uLib {
+namespace Geant {
+
+ULIB_REGISTER_OBJECT(Material)
+ULIB_REGISTER_OBJECT(Solid)
+ULIB_REGISTER_OBJECT(TessellatedSolid)
+ULIB_REGISTER_OBJECT(BoxSolid)
+ULIB_REGISTER_OBJECT(Scene)
+ULIB_REGISTER_OBJECT(SkyPlaneEmitterPrimary)
+ULIB_REGISTER_OBJECT(CylinderEmitterPrimary)
+ULIB_REGISTER_OBJECT(QuadMeshEmitterPrimary)
+ULIB_REGISTER_OBJECT(GeantEvent)
+
+} // namespace Geant
+} // namespace uLib

src/HEP/Geant/Matter.cpp

@@ -0,0 +1,21 @@
+
+#include "HEP/Geant/Matter.h"
+#include <Geant4/G4Material.hh>
+#include <Geant4/G4NistManager.hh>
+
+using namespace uLib::Geant;
+
+Material::Material() : m_G4Data(nullptr) {}
+
+Material::Material(const char *name) : m_G4Data(nullptr) {
+    this->SetFromNist(name);
+}
+
+Material::~Material() {
+    if(m_G4Data) delete m_G4Data;
+}
+
+void Material::SetFromNist(const char *name) {
+    G4NistManager* man = G4NistManager::Instance();
+    m_G4Data = man->FindOrBuildMaterial(name);
+}

src/HEP/Geant/Matter.h

@@ -29,9 +29,10 @@
 #define MATTER_H
 
 #include "Core/Object.h"
+#include <Geant4/G4Material.hh>
+#include <Geant4/G4NistManager.hh>
 
 class G4Element;
-class G4Material;
 
 namespace uLib {
 namespace Geant {
@@ -55,19 +56,54 @@ private:
 //// MATERIAL //////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////
 
+// TODO: finish from G4NistMaterialBuilder
 
 class Material : public Object {
 public:
+    uLibTypeMacro(Material, Object)
 
-    virtual const char* GetClassName() const override { return "Geant.Material"; }
+    enum State  {
+        Undefined = 0,
+        Solid,
+        Liquid,
+        Gas
+    };
+
+    Material();
+    Material(const char *name);
+    ~Material();
+
+    void SetFromNist(const char *name);
+
+    template <typename Ar>
+    void serialize(Ar &ar) {
+        ar & HRP("name", m_G4Data->GetName());
+        ar & HRP("density", m_G4Data->GetDensity());
+        ar & serialization::make_hrp_enum("state", m_G4Data->GetState(), {"Undefined", "Solid", "Liquid", "Gas"});
+    }
+    
+    G4Material *GetG4Material() { return m_G4Data; }
 
-    uLibRefMacro(G4Data,G4Material *)
 private:
     G4Material *m_G4Data;
+
 };
 
+// class MaterialCompound : public Material {
+// public:
 
-
+//     MaterialCompound(const char *name) {}
+        
+//     void AddMaterial(Material *m, double fractionmass) { m_Materials.push_back(std::make_pair(m, fractionmass)); }
+//     void AddElement(Element *e, double fractionmass) { m_Elements.push_back(std::make_pair(e, fractionmass)); }
+//     void SetDensity(double density) { m_Density = density; }
+    
+// private:
+//     std::vector<std::pair<Material *, double>> m_Materials;
+//     std::vector<std::pair<Element *, double>> m_Elements;
+//     double m_Density;
+// };
+    
 }
 }
 

src/HEP/Geant/Scene.cpp

@@ -46,7 +46,7 @@ static void CheckGeant4Environment() {
 
 class SceneImpl {
 public:
-  SceneImpl() : m_RunManager(G4RunManagerFactory::CreateRunManager(G4RunManagerType::Default)),
+  SceneImpl() : m_RunManager(G4RunManagerFactory::CreateRunManager(G4RunManagerType::Serial)),
                 m_Emitter(nullptr),
                 m_InitCalled(false) {
     m_RunManager->SetUserInitialization(new PhysicsList);
@@ -102,6 +102,7 @@ void Scene::AddSolid(Solid *solid, Solid *parent) {
 
 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);

src/HEP/Geant/Scene.h

@@ -43,8 +43,7 @@ class EmitterPrimary;
 
 class Scene : public Object {
 public:
-
+  uLibTypeMacro(Scene, Object)
-  virtual const char* GetClassName() const override { return "Geant.Scene"; }
 
   Scene();
   ~Scene();
@@ -58,6 +57,9 @@ public:
   
   ContainerBox* GetWorldBox() const;
 
+  /// Get the list of solids in the scene
+  const Vector<Solid*>& GetSolids() 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

@@ -85,7 +85,7 @@ void Solid::SetMaterial(G4Material *material) {
 }
 
 void Solid::SetTransform(Matrix4f transform) {
-  uLib::AffineTransform t;
+    uLib::AffineTransform t;
   t.SetMatrix(transform);
 
     // 2. Extract position and rotation for Geant4
@@ -146,11 +146,15 @@ void Solid::SetParent(Solid *parent) {
 
 
 
+TessellatedSolid::TessellatedSolid() 
+    : BaseClass("unnamed_tessellated"), m_Solid(new G4TessellatedSolid("unnamed_tessellated")) {}
+
 TessellatedSolid::TessellatedSolid(const char *name)
     : BaseClass(name), m_Solid(new G4TessellatedSolid(name)) {
     }
 
 void TessellatedSolid::SetMesh(TriangleMesh &mesh) {
+  this->m_Mesh = mesh;
   G4TessellatedSolid *ts = this->m_Solid;
   for (int i = 0; i < mesh.Triangles().size(); ++i) {
     const Vector3i &trg = mesh.Triangles().at(i);
@@ -165,13 +169,22 @@ void TessellatedSolid::SetMesh(TriangleMesh &mesh) {
   }
 }
 
+void TessellatedSolid::Update() {
+}
 
 
 
 
+
+BoxSolid::BoxSolid(const char *name) : 
+    BaseClass(name), 
+    m_ContainerBox(new ContainerBox()), 
+    m_Solid(new G4Box(name, 1, 1, 1))
+  {}
+
 BoxSolid::BoxSolid(const char *name, ContainerBox *box) : BaseClass(name) {
-  m_Solid = new G4Box(name, 1,1,1);
+  m_Solid = new G4Box(name, 1, 1, 1);
-  m_Object = box;
+  m_ContainerBox = box;
   Object::connect(box, &ContainerBox::Updated, this, &BoxSolid::Update);
   if (m_Logical) {
     m_Logical->SetSolid(m_Solid);
@@ -180,16 +193,16 @@ BoxSolid::BoxSolid(const char *name, ContainerBox *box) : BaseClass(name) {
 }
 
 void BoxSolid::Update() {
-  if (m_Object) {
+  if (m_ContainerBox) {
-    Vector3f size = m_Object->GetSize();
+    Vector3f size = m_ContainerBox->GetSize();
     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_Object->GetPosition();
+    Vector3f pos = m_ContainerBox->GetPosition();
-    Matrix3f rot = m_Object->GetRotation();
+    Matrix3f rot = m_ContainerBox->GetRotation();
 
     // 2. Center = Corner + Rotation * (Half-Size)
     // We must rotate the offset vector because uLib box can be rotated.
@@ -201,6 +214,9 @@ void BoxSolid::Update() {
     
     this->SetTransform(t.GetMatrix());
   }
+
+
+
 }
 
 

src/HEP/Geant/Solid.h

@@ -43,8 +43,7 @@ namespace Geant {
 
 class Solid : public Object {
 public:
-
+  uLibTypeMacro(Solid, Object)
-  virtual const char* GetClassName() const override { return "Geant.Solid"; }
 
   Solid();
   Solid(const char *name);
@@ -52,6 +51,7 @@ public:
 
   void SetNistMaterial(const char *name);
   void SetMaterial(G4Material *material);
+  
   void SetSizeUnit(const char *unit);
   // Implementiamo SetParent qui, per tutti.
   virtual void SetParent(Solid *parent); 
@@ -69,6 +69,14 @@ public:
     return m_Logical ? m_Logical->GetName().c_str() : m_Name.c_str(); 
   }
 
+  template < typename Ar >
+  void serialize(Ar &ar, const unsigned int version) {
+    ar & m_Name;
+  }
+    
+    
+
+
 protected:
 
   std::string m_Name;
@@ -84,20 +92,22 @@ protected:
 
 
 class TessellatedSolid : public Solid {
-  typedef Solid BaseClass;
 public:
+  uLibTypeMacro(TessellatedSolid, Solid)
 
-  virtual const char* GetClassName() const override { return "Geant.TessellatedSolid"; }
+  TessellatedSolid();
-
   TessellatedSolid(const char *name);
   void SetMesh(TriangleMesh &mesh);
   uLibGetMacro(Solid, G4TessellatedSolid *) 
   virtual G4VSolid* GetG4Solid() const override { return (G4VSolid*)m_Solid; }
+  
+  const TriangleMesh& GetMesh() const { return m_Mesh; }
 
 public slots:
   void Update();
 
 private : 
+  TriangleMesh        m_Mesh;
   G4TessellatedSolid *m_Solid;
 };
 
@@ -107,22 +117,27 @@ private :
 
 
 class BoxSolid : public Solid {
-  typedef Solid BaseClass;
+  
-
 public:
+  uLibTypeMacro(BoxSolid, Solid)
 
-  virtual const char* GetClassName() const override { return "Geant.BoxSolid"; }
+  BoxSolid(const char *name = "");
-
   BoxSolid(const char *name, ContainerBox *box);
   virtual G4VSolid* GetG4Solid() const override { return (G4VSolid*)m_Solid; }
   
-  ContainerBox* GetObject() const { return m_Object; }
+  ContainerBox* GetObject() const { return m_ContainerBox; }
+
+  template < typename Ar >
+  void serialize(Ar &ar, const unsigned int version) {
+    ar & boost::serialization::base_object<BaseClass>(*this);
+    ar & m_ContainerBox;
+  }
 
 public slots:
   void Update();
 
 private:
-  ContainerBox *m_Object;
+  ContainerBox *m_ContainerBox;
   G4Box *m_Solid;
 };
 

src/Math/Assembly.cpp

@@ -0,0 +1,170 @@
+/*//////////////////////////////////////////////////////////////////////////////
+// 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 >
+
+//////////////////////////////////////////////////////////////////////////////*/
+
+#include "Math/Assembly.h"
+#include "Math/ContainerBox.h"
+#include "Math/Cylinder.h"
+
+#include <limits>
+#include <algorithm>
+#include <cstring>
+
+namespace uLib {
+
+Assembly::Assembly()
+    : ObjectsContext(),
+      TRS(),
+      m_BBoxMin(Vector3f::Zero()),
+      m_BBoxMax(Vector3f::Zero()),
+      m_ShowBoundingBox(false),
+      m_GroupSelection(true) {
+}
+
+Assembly::Assembly(const Assembly &copy)
+    : ObjectsContext(copy),
+      TRS(copy),
+      m_BBoxMin(copy.m_BBoxMin),
+      m_BBoxMax(copy.m_BBoxMax),
+      m_ShowBoundingBox(copy.m_ShowBoundingBox),
+      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 (auto *at = dynamic_cast<AffineTransform *>(obj)) {
+        at->SetParent(this);
+    }
+    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();
+}
+
+void Assembly::RemoveObject(Object *obj) {
+    if (auto *at = dynamic_cast<AffineTransform *>(obj)) {
+        if (at->GetParent() == this)
+            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();
+}
+
+void Assembly::ComputeBoundingBox() {
+    const auto &objects = this->GetObjects();
+    if (objects.empty()) {
+        m_BBoxMin = Vector3f::Zero();
+        m_BBoxMax = Vector3f::Zero();
+        return;
+    }
+
+    float inf = std::numeric_limits<float>::max();
+    m_BBoxMin = Vector3f(inf, inf, inf);
+    m_BBoxMax = Vector3f(-inf, -inf, -inf);
+
+    for (Object *obj : objects) {
+        if (auto *box = dynamic_cast<ContainerBox *>(obj)) {
+            // ContainerBox: wm is matrix from unit cube [0,1] to local space
+            // Since it is parented to 'this', GetMatrix() is sufficient.
+            Matrix4f m = box->GetMatrix();
+            for (int i = 0; i < 8; ++i) {
+                float x = (i & 1) ? 1.0f : 0.0f;
+                float y = (i & 2) ? 1.0f : 0.0f;
+                float z = (i & 4) ? 1.0f : 0.0f;
+                Vector4f corner = m * Vector4f(x, y, z, 1.0f);
+                for (int a = 0; a < 3; ++a) {
+                    m_BBoxMin(a) = std::min(m_BBoxMin(a), corner(a));
+                    m_BBoxMax(a) = std::max(m_BBoxMax(a), corner(a));
+                }
+            }
+        } else if (auto *cyl = dynamic_cast<Cylinder *>(obj)) {
+            // Cylinder: centered [-1, 1] radial, [-0.5, 0.5] height
+            Matrix4f m = cyl->GetMatrix();
+            for (int i = 0; i < 8; ++i) {
+                float x = (i & 1) ? 1.0f : -1.0f;
+                float y = (i & 2) ? 0.5f : -0.5f;
+                float z = (i & 4) ? 1.0f : -1.0f;
+                Vector4f corner = m * Vector4f(x, y, z, 1.0f);
+                for (int a = 0; a < 3; ++a) {
+                    m_BBoxMin(a) = std::min(m_BBoxMin(a), corner(a));
+                    m_BBoxMax(a) = std::max(m_BBoxMax(a), corner(a));
+                }
+            }
+        } else if (auto *subAsm = dynamic_cast<Assembly *>(obj)) {
+            // Recursive AABB for nested assemblies
+            subAsm->ComputeBoundingBox();
+            Vector3f subMin, subMax;
+            subAsm->GetBoundingBox(subMin, subMax);
+            Matrix4f m = subAsm->GetMatrix();
+            for (int i = 0; i < 8; ++i) {
+                float x = (i & 1) ? subMax(0) : subMin(0);
+                float y = (i & 2) ? subMax(1) : subMin(1);
+                float z = (i & 4) ? subMax(2) : subMin(2);
+                Vector4f corner = m * Vector4f(x, y, z, 1.0f);
+                for (int a = 0; a < 3; ++a) {
+                    m_BBoxMin(a) = std::min(m_BBoxMin(a), corner(a));
+                    m_BBoxMax(a) = std::max(m_BBoxMax(a), corner(a));
+                }
+            }
+        }
+    }
+}
+
+void Assembly::GetBoundingBox(Vector3f &bbMin, Vector3f &bbMax) const {
+    bbMin = m_BBoxMin;
+    bbMax = m_BBoxMax;
+}
+
+ContainerBox Assembly::GetBoundingBoxAsContainer() const {
+    ContainerBox bb;
+    Vector3f size = m_BBoxMax - m_BBoxMin;
+    bb.SetSize(size);
+    bb.SetPosition(m_BBoxMin);
+    return bb;
+}
+
+void Assembly::SetShowBoundingBox(bool show) {
+    m_ShowBoundingBox = show;
+    this->Updated();
+}
+
+bool Assembly::GetShowBoundingBox() const {
+    return m_ShowBoundingBox;
+}
+
+void Assembly::SetGroupSelection(bool group) {
+    m_GroupSelection = group;
+}
+
+bool Assembly::GetGroupSelection() const {
+    return m_GroupSelection;
+}
+
+} // namespace uLib

src/Math/Assembly.h

@@ -0,0 +1,122 @@
+/*//////////////////////////////////////////////////////////////////////////////
+// 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.
+
+//////////////////////////////////////////////////////////////////////////////*/
+
+#ifndef U_ASSEMBLY_H
+#define U_ASSEMBLY_H
+
+#include "Core/ObjectsContext.h"
+#include "Math/ContainerBox.h"
+#include "Math/Transform.h"
+
+namespace uLib {
+
+/**
+ * @brief Assembly groups geometric objects (ContainerBox, Cylinder, etc.)
+ * under a common transformation.
+ *
+ * Assembly derives from ObjectsContext so objects can be added/removed
+ * dynamically. It also inherits AffineTransform to provide a group-level
+ * transformation that is applied on top of each child's own transform.
+ *
+ * A bounding box is automatically computed from all contained objects and
+ * can be queried or shown/hidden through the VTK puppet.
+ */
+class Assembly : public ObjectsContext, public TRS {
+public:
+    uLibTypeMacro(Assembly, ObjectsContext, TRS)
+    
+
+    Assembly();
+    Assembly(const Assembly &copy);
+    virtual ~Assembly();
+
+    template <class ArchiveT>
+    void serialize(ArchiveT & ar, const unsigned int version) {
+        ar & boost::serialization::make_nvp("TRS", boost::serialization::base_object<TRS>(*this));
+        ar & boost::serialization::make_hrp("GroupSelection", m_GroupSelection);
+    }
+
+    virtual void AddObject(Object* obj) override;
+    virtual void RemoveObject(Object* obj) override;
+
+    /**
+     * @brief Recomputes the axis-aligned bounding box enclosing all children.
+     * Stores the result internally.
+     */
+    void ComputeBoundingBox();
+
+    /**
+     * @brief Returns the bounding box as min/max corners (in assembly-local
+     * coordinates).
+     */
+    void GetBoundingBox(Vector3f &bbMin, Vector3f &bbMax) const;
+
+    /**
+     * @brief Returns the bounding box as a ContainerBox (positioned
+     * at bbMin, sized bbMax-bbMin, parented to this transform).
+     */
+    ContainerBox GetBoundingBoxAsContainer() const;
+
+    /**
+     * @brief Controls whether the bounding box wireframe should be shown
+     * in the viewer (used by the VTK puppet).
+     */
+    void SetShowBoundingBox(bool show);
+    bool GetShowBoundingBox() const;
+    
+    /**
+     * @brief Controls selection behavior.
+     * If true (default), clicking any child within the assembly will select 
+     * the assembly itself. If false, individual children can be picked.
+     */
+    void SetGroupSelection(bool group);
+    bool GetGroupSelection() const;
+
+signals:
+    virtual void Updated() override {
+        if (m_InUpdated) return; 
+        m_InUpdated = true;
+        
+        // Synchronize TRS part
+        this->TRS::Updated();
+        
+        this->ComputeBoundingBox();
+        m_InUpdated = false;
+    }
+
+private:
+    Vector3f m_BBoxMin;
+    Vector3f m_BBoxMax;
+    bool     m_ShowBoundingBox;
+    bool     m_GroupSelection;
+    bool     m_InUpdated = false;
+    std::map<Object*, Connection> m_ChildConnections;
+
+    ULIB_DECLARE_PROPERTIES(Assembly)
+};
+
+} // namespace uLib
+
+#endif // U_ASSEMBLY_H

src/Math/CMakeLists.txt

@@ -1,6 +1,7 @@
 
 set(HEADERS ContainerBox.h
             Cylinder.h
+            Assembly.h
             Dense.h
             Geometry.h
             Transform.h
@@ -33,6 +34,7 @@ set(SOURCES VoxRaytracer.cpp
             VoxImage.cpp
             TriangleMesh.cpp
             QuadMesh.cpp
+            Assembly.cpp
             Dense.cpp
             Structured2DGrid.cpp
             Structured4DGrid.cpp

src/Math/ContainerBox.h

@@ -29,31 +29,31 @@
 #include "Geometry.h"
 #include "Core/Object.h"
 #include "Core/Property.h"
+#include "Core/Serializable.h"
 #include "Math/Dense.h"
 #include "Math/Transform.h"
 #include <utility>
 
+#include <iostream>
+
 namespace uLib {
 
 /**
  * @brief Represents an oriented bounding box (OBB) within a hierarchical
  * transformation system.
  *
- * ContainerBox inherits from AffineTransform, which defines its parent
+ * ContainerBox inherits from TRS, which defines its parent
  * coordinate system. It contains an internal local transformation (m_LocalT)
  * that defines the box's specific origin and size relative to its own
  * coordinate system.
  */
-class ContainerBox : public AffineTransform, public Object {
+class ContainerBox : public TRS {
 
-  typedef AffineTransform BaseClass;
+  uLibTypeMacro(ContainerBox, TRS)
+  ULIB_SERIALIZE_ACCESS
+  ULIB_DECLARE_PROPERTIES(ContainerBox)
 
 public:
-  ////////////////////////////////////////////////////////////////////////////
-  // PROPERTIES //
-  Property<Vector3f> p_Size;
-  Property<Vector3f> p_Origin;
-  virtual const char * GetClassName() const { return "ContainerBox"; }
 
   /**
    * @brief Default constructor.
@@ -61,10 +61,9 @@ public:
    */
   ContainerBox()
       : m_LocalT(this), // BaseClass is Parent of m_LocalTransform
-        p_Size(this, "Size", Vector3f(1.0f, 1.0f, 1.0f)),
+        Size(1.0f, 1.0f, 1.0f),
-        p_Origin(this, "Origin", Vector3f(0.0f, 0.0f, 0.0f)) {
+        Origin(0.0f, 0.0f, 0.0f) {
-    Object::connect(&p_Size, &Property<Vector3f>::PropertyChanged, this, &ContainerBox::SyncSize);
+    this->Sync();
-    Object::connect(&p_Origin, &Property<Vector3f>::PropertyChanged, this, &ContainerBox::SyncOrigin);
   }
 
   /**
@@ -73,11 +72,9 @@ public:
    */
   ContainerBox(const Vector3f &size)
       : m_LocalT(this),
-        p_Size(this, "Size", size),
+        Size(size),
-        p_Origin(this, "Origin", Vector3f(0.0f, 0.0f, 0.0f)) {
+        Origin(0.0f, 0.0f, 0.0f) {
-    Object::connect(&p_Size, &Property<Vector3f>::PropertyChanged, this, &ContainerBox::SyncSize);
+    this->Sync();
-    Object::connect(&p_Origin, &Property<Vector3f>::PropertyChanged, this, &ContainerBox::SyncOrigin);
-    this->SetSize(size);
   }
 
   /**
@@ -85,12 +82,21 @@ public:
    * @param copy The ContainerBox instance to copy from.
    */
   ContainerBox(const ContainerBox &copy)
-      : m_LocalT(this), // BaseClass is Parent of m_LocalTransform
+      : m_LocalT(this), // Reset parent to the new object
-        AffineTransform(copy),
+        TRS(copy),
-        p_Size(this, "Size", copy.p_Size),
+        Size(copy.Size),
-        p_Origin(this, "Origin", copy.p_Origin) {
+        Origin(copy.Origin) {
-    Object::connect(&p_Size, &Property<Vector3f>::PropertyChanged, this, &ContainerBox::SyncSize);
+    this->Sync();
-    Object::connect(&p_Origin, &Property<Vector3f>::PropertyChanged, this, &ContainerBox::SyncOrigin);
+  }
+
+  // /**
+  //  * @brief Serialization template for property registration and persistence.
+  //  */
+  template <class ArchiveT>
+  void serialize(ArchiveT & ar, const unsigned int version) {
+    ar & HRP(Size);
+    ar & HRP(Origin);
+    ar & NVP("TRS", boost::serialization::base_object<TRS>(*this));
   }
 
   /**
@@ -98,7 +104,7 @@ public:
    * @param v The origin position vector.
    */
   void SetOrigin(const Vector3f &v) { 
-    p_Origin = v;
+    Origin = v;
     m_LocalT.SetPosition(v); 
   }
 
@@ -114,7 +120,7 @@ public:
    * @param v The size vector (width, height, depth).
    */
   void SetSize(const Vector3f &v) {
-    p_Size = v;
+    Size = v;
     Vector3f pos = this->GetOrigin();
     m_LocalT = AffineTransform(this); // regenerate local transform
     m_LocalT.Scale(v);
@@ -193,33 +199,43 @@ public:
   }
 
   /** Translate using transformation chain */
-  using BaseClass::Translate;
+  using AffineTransform::Translate;
 
   /** Rotate using transformation chain */
-  using BaseClass::Rotate;
+  using AffineTransform::Rotate;
 
   /** Scale using transformation chain */
-  using BaseClass::Scale;
+  using AffineTransform::Scale;
 
 signals:
 
-  // signal to emit when the box is updated //
+  /** Signal emitted when properties change */
-  virtual void Updated() override { ULIB_SIGNAL_EMIT(ContainerBox::Updated); }
+  virtual void Updated() override { 
-
+      // 1. Synchronize local box part (Size/Origin -> m_LocalT)
-private slots:
+      this->Sync();
-  void SyncSize() {
+      
-      this->SetSize(p_Size);
+      // 2. Synchronize TRS part (position/rotation/scaling -> m_T) and emit signal
+      this->TRS::Updated();
+      
+      // std::cout << "ContainerBox::Updated()" << std::endl;
   }
 
-  void SyncOrigin() {
+private:
-      this->SetOrigin(p_Origin);
+  /** Synchronizes internal transformation with properties */
+  void Sync() {
+      this->SetOrigin(Origin);
+      this->SetSize(Size);
   }
 
 
 private:
+  Vector3f Size;
+  Vector3f Origin;
   AffineTransform m_LocalT;
+
 };
 
 } // namespace uLib
 
+
 #endif // CONTAINERBOX_H

src/Math/Cylinder.h

@@ -39,37 +39,43 @@ namespace uLib {
  * The cylinder orientation is defined by the Axis property (0=X, 1=Y, 2=Z).
  * By default, it is aligned with the Y axis (Axis=1).
  */
-class Cylinder : public AffineTransform, public Object {
+class Cylinder : public TRS {
+
+    uLibTypeMacro(Cylinder, TRS)
+    ULIB_DECLARE_PROPERTIES(Cylinder)
 
 public:
-    uLibTypeMacro(Cylinder, Object)
 
-    virtual const char * GetClassName() const override { return "Cylinder"; }
+    /**
+     * @brief PROPERTIES
+     */
+    float Radius;
+    float Height;
+    int Axis;
+
+    
 
     /**
      * @brief Default constructor. Aligns with Y by default.
      */
     Cylinder() : m_LocalT(this), Radius(1.0), Height(1.0), Axis(1) {
-        ULIB_ACTIVATE_PROPERTIES(*this);
+        this->Sync();
-        UpdateLocalMatrix();
     }
 
     /**
      * @brief Constructor with radius and height.
      */
-    Cylinder(float radius, float height, int axis = 1) 
+    Cylinder(float radius, float height, int axis = 1)
         : m_LocalT(this), Radius(radius), Height(height), Axis(axis) {
-        ULIB_ACTIVATE_PROPERTIES(*this);
+        this->Sync();
-        UpdateLocalMatrix();
     }
 
     /**
      * @brief Copy constructor.
      */
     Cylinder(const Cylinder &copy)
-        : m_LocalT(this), AffineTransform(copy), Radius(copy.Radius), Height(copy.Height), Axis(copy.Axis) {
+        : m_LocalT(this), TRS(copy), Radius(copy.Radius), Height(copy.Height), Axis(copy.Axis) {
-        ULIB_ACTIVATE_PROPERTIES(*this);
+        this->Sync();
-        this->UpdateLocalMatrix();
     }
 
     /**
@@ -79,13 +85,14 @@ public:
     void serialize(ArchiveT & ar, const unsigned int version) {
         ar & HRP(Radius);
         ar & HRP(Height);
-        ar & HRP(Axis);
+        ar & boost::serialization::make_hrp_enum("Axis", Axis, {"X", "Y", "Z"});
+        ar & NVP("TRS", boost::serialization::base_object<TRS>(*this));
     }
 
     /** Sets the radius of the cylinder */
     inline void SetRadius(float r) { 
         Radius = r; 
-        UpdateLocalMatrix(); 
+        this->Sync(); 
     }
     
     /** Gets the radius of the cylinder */
@@ -94,7 +101,7 @@ public:
     /** Sets the height of the cylinder */
     inline void SetHeight(float h) { 
         Height = h; 
-        UpdateLocalMatrix(); 
+        this->Sync(); 
     }
     
     /** Gets the height of the cylinder */
@@ -103,7 +110,7 @@ public:
     /** Sets the main axis (0=X, 1=Y, 2=Z) */
     inline void SetAxis(int axis) {
         Axis = axis;
-        UpdateLocalMatrix();
+        this->Sync();
     }
 
     /** Gets the main axis */
@@ -157,25 +164,36 @@ public:
         return Vector3f(r, theta, h);
     }
 
+    /** Translate using transformation chain */
+    using AffineTransform::Translate;
+
+    /** Rotate using transformation chain */
+    using AffineTransform::Rotate;
+
+    /** Scale using transformation chain */
+    using AffineTransform::Scale;
+
 signals:
     /** Signal emitted when properties change */
     virtual void Updated() override { 
-        this->UpdateLocalMatrix();
+        // 1. Synchronize local cylinder part (Radius/Height/Axis -> m_LocalT)
-        ULIB_SIGNAL_EMIT(Cylinder::Updated); 
+        this->Sync();
+        
+        // 2. Synchronize TRS part (position/rotation/scaling -> m_T) and emit signal
+        this->TRS::Updated();
     }
 
 private:
-    /** Recalculates the internal local matrix based on dimensions and axis */
+  /** Synchronizes internal transformation with properties */
-    void UpdateLocalMatrix() {
+  void Sync() {
-        m_LocalT = AffineTransform(this);
+      m_LocalT = AffineTransform(this);
-        if (Axis == 0) m_LocalT.Scale(Vector3f(Height, Radius, Radius));
+      if (Axis == 0) m_LocalT.Scale(Vector3f(Height, Radius, Radius));
-        else if (Axis == 1) m_LocalT.Scale(Vector3f(Radius, Height, Radius));
+      else if (Axis == 1) m_LocalT.Scale(Vector3f(Radius, Height, Radius));
-        else m_LocalT.Scale(Vector3f(Radius, Radius, Height));
+      else m_LocalT.Scale(Vector3f(Radius, Radius, Height));
-    }
+  }
 
-    float Radius;
+
-    float Height;
+private:
-    int Axis;
     AffineTransform m_LocalT;
 };
 

src/Math/Geometry.h

@@ -35,10 +35,21 @@
 
 namespace uLib {
 
-class Geometry : public AffineTransform, public Object {
-public:
 
-    virtual const char * GetClassName() const { return "Geometry"; }
+class Geometry : virtual public Object {
+protected:
+    Geometry* m_Parent = nullptr;
+
+public:
+    uLibTypeMacro(Geometry, Object)
+
+    
+
+    virtual void SetParent(Geometry* p) { m_Parent = p; }
+    virtual Geometry* GetParent() const { return m_Parent; }
+
+    virtual bool IsLinear() const { return false; }
+    virtual bool IsPure() const { return false; }
 
     virtual Vector3f ToLinear(const Vector3f& curved_space) const {
         return curved_space;
@@ -48,37 +59,120 @@ public:
         return cartesian_space;
     }
 
-    inline Vector4f GetWorldPoint(const Vector4f v) const {
+    virtual Vector4f GetWorldPoint(const Vector4f v) const = 0;
-        Vector3f lin = ToLinear(Vector3f(v.x(), v.y(), v.z()));
+    virtual Vector4f GetLocalPoint(const Vector4f v) const = 0;
-        return this->GetWorldMatrix() * Vector4f(lin.x(), lin.y(), lin.z(), v.w());
+
+    virtual Vector4f GetWorldPoint(const float x, const float y, const float z) const {
+        return GetWorldPoint(Vector4f(x,y,z,1));
     }
 
-    inline Vector4f GetWorldPoint(const float x, const float y, const float z) {
+    virtual Vector4f GetLocalPoint(const float x, const float y, const float z) const {
-        return this->GetWorldPoint(Vector4f(x,y,z,1));
+        return GetLocalPoint(Vector4f(x,y,z,1));
     }
 
-    inline Vector4f GetLocalPoint(const Vector4f v) const {
+    virtual Vector4f GetWorldPoint(const Vector3f v) const {
-        Vector4f loc_lin = this->GetWorldMatrix().inverse() * v;
+        return GetWorldPoint(Vector4f(v.x(), v.y(), v.z(), 1.0f));
-        Vector3f curv = FromLinear(Vector3f(loc_lin.x(), loc_lin.y(), loc_lin.z()));
-        return Vector4f(curv.x(), curv.y(), curv.z(), loc_lin.w());
     }
 
-    inline Vector4f GetLocalPoint(const float x, const float y, const float z) {
+    virtual Vector4f GetLocalPoint(const Vector3f v) const {
-         return this->GetLocalPoint(Vector4f(x,y,z,1));
+        return GetLocalPoint(Vector4f(v.x(), v.y(), v.z(), 1.0f));
     }
+
+    virtual void Translate(Vector3f t) = 0;
+    virtual void Rotate(Vector3f r) = 0;
+    virtual void Scale(Vector3f s) = 0;
+
 };
 
-class CylindricalGeometry : public Geometry {
+
+
+class LinearGeometry : public Geometry {
+protected:
+    Affine3f m_T = Affine3f::Identity();
+
 public:
+    uLibTypeMacro(LinearGeometry, Geometry)
+
+    
+
+    virtual bool IsLinear() const override { return true; }
+    virtual bool IsPure() const override { return true; }
+
+    virtual Vector4f GetWorldPoint(const Vector4f v) const override {
+        Vector3f lin_v = ToLinear(v.head<3>());
+        Vector4f v_lin(lin_v.x(), lin_v.y(), lin_v.z(), v.w());
+
+        Affine3f combined = m_T;
+        const Geometry* curr = m_Parent;
+        while (curr && curr->IsLinear() && curr->IsPure()) {
+            combined = static_cast<const LinearGeometry*>(curr)->m_T * combined;
+            curr = curr->GetParent();
+        }
+
+        Vector4f v_res = combined.matrix() * v_lin;
+        if (curr) return curr->GetWorldPoint(v_res);
+        return v_res;
+    }
+
+    virtual Vector4f GetLocalPoint(const Vector4f v) const override {
+        Vector4f v_parent = m_Parent ? m_Parent->GetLocalPoint(v) : v;
+        Vector4f v_loc_lin = m_T.inverse().matrix() * v_parent;
+        Vector3f v_curv = FromLinear(v_loc_lin.head<3>());
+        return Vector4f(v_curv.x(), v_curv.y(), v_curv.z(), v_loc_lin.w());
+    }
+
+    virtual void Translate(Vector3f t) override {
+        m_T.translate(t);
+    }
+
+    virtual void Rotate(Vector3f r) override {
+        this->EulerYZYRotate(r);
+    }
+
+    virtual void Scale(Vector3f s) override {
+        m_T.scale(s);
+    }
+
+    void SetPosition(const Vector3f& v) { m_T.translation() = v; }
+    Vector3f GetPosition() const { return m_T.translation(); }
+
+    void EulerYZYRotate(const Vector3f& e) {
+        Matrix3f mat;
+        mat =     Eigen::AngleAxisf(e.x(), Vector3f::UnitY())
+                * Eigen::AngleAxisf(e.y(), Vector3f::UnitZ())
+                * Eigen::AngleAxisf(e.z(), Vector3f::UnitY());
+        m_T.rotate(mat);
+    }
+
+    void FlipAxes(int first, int second) {
+        Matrix3f mat = Matrix3f::Identity();
+        mat.col(first).swap(mat.col(second));
+        m_T.rotate(mat);
+    }
+
+    const Affine3f& GetTransform() const { return m_T; }
+    void SetTransform(const Affine3f& t) { m_T = t; }
+};
+
+
+
+
+class CylindricalGeometry : public LinearGeometry {
+public:
+    uLibTypeMacro(CylindricalGeometry, LinearGeometry)
     CylindricalGeometry() {}
 
-    Vector3f ToLinear(const Vector3f& cylindrical) const {
+    
+
+    virtual bool IsPure() const override { return false; }
+
+    Vector3f ToLinear(const Vector3f& cylindrical) const override {
         return Vector3f(cylindrical.x() * std::cos(cylindrical.y()), 
                         cylindrical.x() * std::sin(cylindrical.y()), 
                         cylindrical.z());
     }
 
-    Vector3f FromLinear(const Vector3f& linear) const {
+    Vector3f FromLinear(const Vector3f& linear) const override {
         float r = std::sqrt(linear.x() * linear.x() + linear.y() * linear.y());
         float phi = std::atan2(linear.y(), linear.x());
         return Vector3f(r, phi, linear.z());
@@ -86,13 +180,16 @@ public:
 
 };
 
-class SphericalGeometry : public Geometry {
+class SphericalGeometry : public LinearGeometry {
 public:
+    uLibTypeMacro(SphericalGeometry, LinearGeometry)
     SphericalGeometry() {}
 
-    virtual const char * GetClassName() const { return "SphericalGeometry"; }
+    
 
-    Vector3f ToLinear(const Vector3f& spherical) const {
+    virtual bool IsPure() const override { return false; }
+
+    Vector3f ToLinear(const Vector3f& spherical) const override {
         float r = spherical.x();
         float theta = spherical.y();
         float phi = spherical.z();
@@ -101,7 +198,7 @@ public:
                         r * std::cos(theta));
     }
 
-    Vector3f FromLinear(const Vector3f& linear) const {
+    Vector3f FromLinear(const Vector3f& linear) const override {
         float r = linear.norm();
         float theta = (r == 0.0f) ? 0.0f : std::acos(linear.z() / r);
         float phi = std::atan2(linear.y(), linear.x());
@@ -110,13 +207,16 @@ public:
 
 };
 
-class ToroidalGeometry : public Geometry {
+class ToroidalGeometry : public LinearGeometry {
 public:
+    uLibTypeMacro(ToroidalGeometry, LinearGeometry)
     ToroidalGeometry(float Rtor) : m_Rtor(Rtor) {}
 
-    virtual const char * GetClassName() const { return "ToroidalGeometry"; }
+    
 
-    Vector3f ToLinear(const Vector3f& toroidal) const {
+    virtual bool IsPure() const override { return false; }
+
+    Vector3f ToLinear(const Vector3f& toroidal) const override {
         float r = toroidal.x();
         float theta = toroidal.y();
         float phi = toroidal.z();
@@ -125,7 +225,7 @@ public:
                         r * std::sin(theta));
     }
 
-    Vector3f FromLinear(const Vector3f& linear) const {
+    Vector3f FromLinear(const Vector3f& linear) const override {
         float phi = std::atan2(linear.y(), linear.x());
         float r_xy = std::sqrt(linear.x() * linear.x() + linear.y() * linear.y());
         float delta_r = r_xy - m_Rtor;

src/Math/Makefile.am

@@ -1,42 +0,0 @@
-SUBDIRS = .
-
-include $(top_srcdir)/Common.am
-
-library_includedir = $(includedir)/libmutom-${PACKAGE_VERSION}/Math
-library_include_HEADERS = 	ContainerBox.h	\
-				Dense.h 	\
-				Geometry.h	\
-				Transform.h     \
-				StructuredData.h\
-				StructuredGrid.h\
-				VoxImage.h	\
-				VoxRaytracer.h  \
-				Utils.h		\
-				VoxImageFilter.h\
-				VoxImageFilter.hpp \
-				VoxImageFilterLinear.hpp \
-				VoxImageFilterMedian.hpp \
-				VoxImageFilterABTrim.hpp \
-				VoxImageFilterBilateral.hpp \
-				VoxImageFilterThreshold.hpp \
-				VoxImageFilter2ndStat.hpp \
-				VoxImageFilterCustom.hpp \
-                                Accumulator.h \
-				TriangleMesh.h
-
-
-_MATH_SOURCES = \
-                VoxRaytracer.cpp   \
-                StructuredData.cpp \
-                StructuredGrid.cpp \
-                VoxImage.cpp       \
-                TriangleMesh.cpp   \
-		Dense.cpp
-
-
-
-
-noinst_LTLIBRARIES = libmutommath.la
-libmutommath_la_SOURCES = ${_MATH_SOURCES}
-
-

src/Math/MathRegistrations.cpp

@@ -5,12 +5,15 @@
 #include "Math/TriangleMesh.h"
 #include "Math/QuadMesh.h"
 #include "Math/VoxImage.h"
+#include "Math/Assembly.h"
 #include "Math/StructuredData.h"
 
 namespace uLib {
 
+ULIB_REGISTER_OBJECT(TRS)
 ULIB_REGISTER_OBJECT(ContainerBox)
 ULIB_REGISTER_OBJECT(Cylinder)
+ULIB_REGISTER_OBJECT(Assembly)
 ULIB_REGISTER_OBJECT(CylindricalGeometry)
 ULIB_REGISTER_OBJECT(SphericalGeometry)
 ULIB_REGISTER_OBJECT(TriangleMesh)

src/Math/Polydata.h

@@ -36,7 +36,7 @@ class Polydata : public Object {
 
 public:
 
-    virtual const char * GetClassName() const { return "Polydata"; }
+    
 
 
 

src/Math/QuadMesh.h

@@ -34,11 +34,12 @@
 
 namespace uLib {
 
-class QuadMesh : public AffineTransform, public Object
+class QuadMesh : public TRS
 {
 public:
+    uLibTypeMacro(QuadMesh, TRS)
 
-    virtual const char * GetClassName() const { return "QuadMesh"; }
+    
 
     void PrintSelf(std::ostream &o);
 
@@ -52,7 +53,9 @@ public:
     Vector3f GetPoint(const Id_t id) const;
 
     inline std::vector<Vector3f> & Points() { return this->m_Points; }
+    inline const std::vector<Vector3f> & Points() const { return this->m_Points; }
     inline std::vector<Vector4i> & Quads() { return this->m_Quads; }
+    inline const std::vector<Vector4i> & Quads() const { return this->m_Quads; }
 
     const Vector4i & GetQuad(const Id_t id) const { return m_Quads.at(id); }
     Vector3f GetNormal(const Id_t id) const;

src/Math/Transform.h

@@ -50,19 +50,43 @@
 #define U_TRANSFORM_H
 
 #include <Eigen/Geometry>
+#include "Math/Units.h"
 #include "Math/Dense.h"
 
 
 namespace uLib {
 
+
+
+using Eigen::Isometry3f;
+using Eigen::Isometry3d;
+
+using Eigen::Affine3f;
+using Eigen::Affine3d;
+
+using Eigen::Projective3f;
+using Eigen::Projective3d;
+
+
+
+
+
+
+
 ////////////////////////////////////////////////////////////////////////////////
 /////////  AFFINE TRANSFORM  WRAPPER  //////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////
 
-class AffineTransform {
+
+
+class AffineTransform : virtual public Object {
+public:
+    uLibTypeMacro(AffineTransform, Object)
 protected:
-    Eigen::Affine3f  m_T;
+
+    Affine3f  m_T;
     AffineTransform *m_Parent;
+
 public:
     AffineTransform() :
         m_T(Matrix4f::Identity()),
@@ -79,14 +103,15 @@ public:
         m_Parent(copy.m_Parent)
     {}
 
-    Eigen::Affine3f& GetTransform() { return m_T; }
+    Affine3f& GetTransform() { return m_T; }
 
     AffineTransform *GetParent() const { return this->m_Parent; }
 
     void SetParent(AffineTransform *name) { this->m_Parent = name; }
 
-    void SetMatrix (Matrix4f mat) { m_T.matrix() = mat; }
+    void SetMatrix (const Matrix4f &mat) { m_T.matrix() = mat; }
-    Matrix4f GetMatrix() const { return m_T.matrix(); }
+    Matrix4f& GetMatrix () { return m_T.matrix(); }
+    const Matrix4f& GetMatrix () const { return m_T.matrix(); }
 
     Matrix4f GetWorldMatrix() const
     {
@@ -94,26 +119,32 @@ public:
         else return  m_Parent->GetWorldMatrix() * m_T.matrix(); // T = B * A //
     }
 
-    void SetPosition(const Vector3f v) { this->m_T.translation() = v; }
+    void SetWorldMatrix(const Matrix4f &mat)
+    {
+        if(!m_Parent) m_T.matrix() = mat;
+        else m_T.matrix() = m_Parent->GetWorldMatrix().inverse() * mat;
+    }
+
+    void SetPosition(const Vector3f &v) { this->m_T.translation() = v; }
 
     Vector3f GetPosition() const { return this->m_T.translation(); }
 
-    void SetRotation(const Matrix3f m) { this->m_T.linear() = m; }
+    void SetRotation(const Matrix3f &m) { this->m_T.linear() = m; }
 
     Matrix3f GetRotation() const { return this->m_T.rotation(); }
 
-    void Translate(const Vector3f v) { this->m_T.translate(v); }
+    void Translate(const Vector3f &v) { this->m_T.translate(v); }
 
-    void Scale(const Vector3f v) { this->m_T.scale(v); }
+    void Scale(const Vector3f &v) { this->m_T.scale(v); }
 
     Vector3f GetScale() const { 
-        return Vector3f(m_T.linear().col(0).norm(), 
+        return Vector3f(this->m_T.linear().col(0).norm(),
-                        m_T.linear().col(1).norm(), 
+                        this->m_T.linear().col(1).norm(),
-                        m_T.linear().col(2).norm()); 
+                        this->m_T.linear().col(2).norm());
     }
 
 
-    void Rotate(const Matrix3f m) { this->m_T.rotate(m); }
+    void Rotate(const Matrix3f &m) { this->m_T.rotate(m); }
 
     void Rotate(const float angle, Vector3f axis)
     {
@@ -127,12 +158,12 @@ public:
         Rotate(angle,euler_axis);
     }
 
-    void PreRotate(const Matrix3f m) { this->m_T.prerotate(m); }
+    void PreRotate(const Matrix3f &m) { this->m_T.prerotate(m); }
 
-    void QuaternionRotate(const Vector4f q)
+    void QuaternionRotate(const Vector4f &q)
     { this->m_T.rotate(Eigen::Quaternion<float>(q)); }
 
-    void EulerYZYRotate(const Vector3f e) {
+    void EulerYZYRotate(const Vector3f &e) {
         Matrix3f mat;
         mat =     Eigen::AngleAxisf(e.x(), Vector3f::UnitY())
                 * Eigen::AngleAxisf(e.y(), Vector3f::UnitZ())
@@ -150,8 +181,124 @@ public:
 
 
 
+////////////////////////////////////////////////////////////////////////////////
+/////////  TRS PARAMETERS  /////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////////
+
+typedef Eigen::Affine3f AffineMatrix;
+
+class TRS : public AffineTransform {
+
+    uLibTypeMacro(TRS, AffineTransform)
+    ULIB_SERIALIZE_ACCESS
+    // ULIB_DECLARE_PROPERTIES(TRS)
+
+public:
+
+    Vector3f position = Vector3f::Zero();
+    Vector3f rotation = Vector3f::Zero();
+    Vector3f scaling  = Vector3f::Ones();
+
+    TRS() = default;
+
+    TRS(const class AffineTransform& at) {
+        this->FromMatrix(at.GetMatrix());
+    }
+
+    TRS(const Matrix4f& mat) {
+        this->FromMatrix(mat);
+    }
+
+    void FromMatrix(const Matrix4f& mat) {
+        this->position = mat.block<3,1>(0,3);
+        
+        Matrix3f linear = mat.block<3,3>(0,0);
+        this->scaling(0) = linear.col(0).norm();
+        this->scaling(1) = linear.col(1).norm();
+        this->scaling(2) = linear.col(2).norm();
+        
+        Matrix3f rot = linear;
+        if (this->scaling(0) > 1e-6) rot.col(0) /= this->scaling(0);
+        if (this->scaling(1) > 1e-6) rot.col(1) /= this->scaling(1);
+        if (this->scaling(2) > 1e-6) rot.col(2) /= this->scaling(2);
+        
+        Vector3f euler = rot.eulerAngles(2, 1, 0); 
+        this->rotation = Vector3f(euler(2), euler(1), euler(0));
+        
+        this->SetMatrix(mat);
+        this->NotifyPropertiesUpdated();
+    }
+
+    void SetPosition(const Vector3f &v) { 
+        position = v; 
+        this->AffineTransform::SetPosition(v); 
+    }
+    
+    void SetRotation(const Vector3f &v) { 
+        rotation = v; 
+        this->SyncMatrix(); 
+    }
+    
+    void SetOrientation(const Vector3f &v) { SetRotation(v); }
+    
+    void SetScale(const Vector3f &v) { 
+        scaling = v; 
+        this->SyncMatrix(); 
+    }
+
+    void SyncMatrix() {
+        this->GetTransform() = GetAffineMatrix();
+    }
+
+    void Updated() override {
+        this->SyncMatrix();
+        this->NotifyPropertiesUpdated();
+        this->AffineTransform::Updated();
+    }
+
+    template <class ArchiveT>
+    void serialize(ArchiveT & ar, const unsigned int version) {
+        ar & HRPU(position, "mm");
+        ar & HRPU(rotation, "rad"); 
+        ar & HRP(scaling);
+    }
+    
+
+    AffineMatrix GetAffineMatrix() const {
+        AffineMatrix m = AffineMatrix::Identity();
+        m.translate(position);
+        m.rotate(Eigen::AngleAxisf(rotation.z(), Vector3f::UnitZ()));
+        m.rotate(Eigen::AngleAxisf(rotation.y(), Vector3f::UnitY()));
+        m.rotate(Eigen::AngleAxisf(rotation.x(), Vector3f::UnitX()));
+        m.scale(scaling);
+        return m;
+    }
+
+    Matrix4f GetMatrix() const {
+        return this->GetAffineMatrix().matrix();
+    }
+
+
+    
+    
+};
+
+
+
+
+
+inline std::ostream& operator<<(std::ostream& os, const TRS& trs) {
+    os << trs.position << " " << trs.rotation << " " << trs.scaling;
+    return os;
 }
 
+inline std::istream& operator>>(std::istream& is, TRS& trs) {
+    is >> trs.position >> trs.rotation >> trs.scaling;
+    return is;
+}
+
+} // uLib
+
 
 
 #endif//U_TRANSFORM_H

src/Math/TriangleMesh.h

@@ -37,11 +37,12 @@
 
 namespace uLib {
 
-class TriangleMesh : public AffineTransform, public Object
+class TriangleMesh : public TRS
 {
 public:
+    uLibTypeMacro(TriangleMesh, TRS)
 
-    virtual const char * GetClassName() const { return "TriangleMesh"; }
+    
 
     void PrintSelf(std::ostream &o);
 
@@ -55,7 +56,9 @@ public:
     Vector3f GetPoint(const Id_t id) const;
 
     inline std::vector<Vector3f> & Points() { return this->m_Points; }
+    inline const std::vector<Vector3f> & Points() const { return this->m_Points; }
     inline std::vector<Vector3i> & Triangles() { return this->m_Triangles; }
+    inline const std::vector<Vector3i> & Triangles() const { return this->m_Triangles; }
 
     const Vector3i & GetTriangle(const Id_t id) const { return m_Triangles.at(id); }
     Vector3f GetNormal(const Id_t id) const;

src/Math/VoxImage.h

@@ -47,7 +47,7 @@ namespace Abstract {
 class VoxImage : public uLib::StructuredGrid {
 public:
 
-  virtual const char * GetClassName() const { return "VoxImage"; }
+  
 
   typedef uLib::StructuredGrid BaseClass;
 
@@ -109,8 +109,20 @@ public:
 
   VoxImage(const Vector3i &size);
 
-  VoxImage(const VoxImage<T> &copy) : BaseClass(copy) {
+  // Use compiler-generated copy constructor and assignment operator
-    this->m_Data = copy.m_Data;
+
+  VoxImage<T>& operator=(const VoxImage<T>& other) {
+    if (this != &other) {
+      // Copy the base class non-virtual parts (dims, spacing, position, etc.)
+      // WITHOUT going through the virtual SetDims chain (which would call
+      // m_Data.resize() THEN DataAllocator::operator= will resize again → double-free).
+      // Instead, directly copy DataAllocator and update the StructuredGrid state.
+      this->m_Data = other.m_Data;
+      StructuredGrid::SetDims(other.GetDims());
+      this->SetSpacing(other.GetSpacing());
+      this->SetPosition(other.GetPosition());
+    }
+    return *this;
   }
 
   inline DataAllocator<T> &Data() { return this->m_Data; }

src/Math/VoxImageFilter.h

@@ -61,7 +61,7 @@ class VoxImageFilter : public Abstract::VoxImageFilter, public Object {
 
 public:
 
-  virtual const char * GetClassName() const { return "VoxImageFilter"; }
+  
 
   VoxImageFilter(const Vector3i &size);
 

src/Math/VoxImageFilter.hpp

@@ -98,15 +98,14 @@ template <typename T> void Kernel<T>::PrintSelf(std::ostream &o) const {
 
 ////////////////////////////////////////////////////////////////////////////////
 
-#define _TPL_ template <typename VoxelT, typename AlgorithmT>
-#define _TPLT_ VoxelT, AlgorithmT
 
-_TPL_
+
-VoxImageFilter<_TPLT_>::VoxImageFilter(const Vector3i &size)
+template <typename VoxelT, typename AlgorithmT>
+VoxImageFilter<VoxelT, AlgorithmT>::VoxImageFilter(const Vector3i &size)
     : m_KernelData(size), t_Algoritm(static_cast<AlgorithmT *>(this)) {}
 
-_TPL_
+template <typename VoxelT, typename AlgorithmT>
-void VoxImageFilter<_TPLT_>::Run() {
+void VoxImageFilter<VoxelT, AlgorithmT>::Run() {
   VoxImage<VoxelT> buffer = *m_Image;
 #pragma omp parallel for
   for (int i = 0; i < m_Image->Data().size(); ++i)
@@ -114,8 +113,8 @@ void VoxImageFilter<_TPLT_>::Run() {
 #pragma omp barrier
 }
 
-_TPL_
+template <typename VoxelT, typename AlgorithmT>
-void VoxImageFilter<_TPLT_>::SetKernelOffset() {
+void VoxImageFilter<VoxelT, AlgorithmT>::SetKernelOffset() {
   Vector3i id(0, 0, 0);
   for (int z = 0; z < m_KernelData.GetDims()(2); ++z) {
     for (int x = 0; x < m_KernelData.GetDims()(0); ++x) {
@@ -127,8 +126,8 @@ void VoxImageFilter<_TPLT_>::SetKernelOffset() {
   }
 }
 
-_TPL_
+template <typename VoxelT, typename AlgorithmT>
-float VoxImageFilter<_TPLT_>::Distance2(const Vector3i &v) {
+float VoxImageFilter<VoxelT, AlgorithmT>::Distance2(const Vector3i &v) {
   Vector3i tmp = v;
   const Vector3i &dim = this->m_KernelData.GetDims();
   Vector3i center = dim / 2;
@@ -140,8 +139,8 @@ float VoxImageFilter<_TPLT_>::Distance2(const Vector3i &v) {
                  0.25 * (3 - (dim(0) % 2) - (dim(1) % 2) - (dim(2) % 2)));
 }
 
-_TPL_
+template <typename VoxelT, typename AlgorithmT>
-void VoxImageFilter<_TPLT_>::SetKernelNumericXZY(
+void VoxImageFilter<VoxelT, AlgorithmT>::SetKernelNumericXZY(
     const std::vector<float> &numeric) {
   // set data order //
   StructuredData::Order order = m_KernelData.GetDataOrder();
@@ -159,8 +158,8 @@ void VoxImageFilter<_TPLT_>::SetKernelNumericXZY(
   // m_KernelData.SetDataOrder(order);
 }
 
-_TPL_
+template <typename VoxelT, typename AlgorithmT>
-void VoxImageFilter<_TPLT_>::SetKernelSpherical(float (*shape)(float)) {
+void VoxImageFilter<VoxelT, AlgorithmT>::SetKernelSpherical(float (*shape)(float)) {
   Vector3i id;
   for (int y = 0; y < m_KernelData.GetDims()(1); ++y) {
     for (int z = 0; z < m_KernelData.GetDims()(2); ++z) {
@@ -172,8 +171,8 @@ void VoxImageFilter<_TPLT_>::SetKernelSpherical(float (*shape)(float)) {
   }
 }
 
-_TPL_ template <class ShapeT>
+template <typename VoxelT, typename AlgorithmT> template <class ShapeT>
-void VoxImageFilter<_TPLT_>::SetKernelSpherical(ShapeT shape) {
+void VoxImageFilter<VoxelT, AlgorithmT>::SetKernelSpherical(ShapeT shape) {
   Interface::IsA<ShapeT, Interface::VoxImageFilterShape>();
   Vector3i id;
   for (int y = 0; y < m_KernelData.GetDims()(1); ++y) {
@@ -186,8 +185,8 @@ void VoxImageFilter<_TPLT_>::SetKernelSpherical(ShapeT shape) {
   }
 }
 
-_TPL_
+template <typename VoxelT, typename AlgorithmT>
-void VoxImageFilter<_TPLT_>::SetKernelWeightFunction(
+void VoxImageFilter<VoxelT, AlgorithmT>::SetKernelWeightFunction(
     float (*shape)(const Vector3f &)) {
   const Vector3i &dim = m_KernelData.GetDims();
   Vector3i id;
@@ -207,8 +206,8 @@ void VoxImageFilter<_TPLT_>::SetKernelWeightFunction(
   }
 }
 
-_TPL_ template <class ShapeT>
+template <typename VoxelT, typename AlgorithmT> template <class ShapeT>
-void VoxImageFilter<_TPLT_>::SetKernelWeightFunction(ShapeT shape) {
+void VoxImageFilter<VoxelT, AlgorithmT>::SetKernelWeightFunction(ShapeT shape) {
   Interface::IsA<ShapeT, Interface::VoxImageFilterShape>();
   const Vector3i &dim = m_KernelData.GetDims();
   Vector3i id;
@@ -228,14 +227,14 @@ void VoxImageFilter<_TPLT_>::SetKernelWeightFunction(ShapeT shape) {
   }
 }
 
-_TPL_
+template <typename VoxelT, typename AlgorithmT>
-void VoxImageFilter<_TPLT_>::SetImage(Abstract::VoxImage *image) {
+void VoxImageFilter<VoxelT, AlgorithmT>::SetImage(Abstract::VoxImage *image) {
   this->m_Image = reinterpret_cast<VoxImage<VoxelT> *>(image);
   this->SetKernelOffset();
 }
 
-_TPL_
+template <typename VoxelT, typename AlgorithmT>
-float VoxImageFilter<_TPLT_>::Convolve(const VoxImage<VoxelT> &buffer,
+float VoxImageFilter<VoxelT, AlgorithmT>::Convolve(const VoxImage<VoxelT> &buffer,
                                        int index) {
   const DataAllocator<VoxelT> &vbuf = buffer.ConstData();
   const DataAllocator<VoxelT> &vker = m_KernelData.ConstData();
@@ -252,8 +251,8 @@ float VoxImageFilter<_TPLT_>::Convolve(const VoxImage<VoxelT> &buffer,
   return conv / ksum;
 }
 
-#undef _TPLT_
+
-#undef _TPL_
+
 
 } // namespace uLib
 

src/Math/testing/CylinderTest.cpp

@@ -52,7 +52,7 @@ int main()
 
   // Test 1: Basic identity transformation and cylinder parameters
   {
-    Cylinder cyl(2.0, 10.0);
+    Cylinder cyl(2.0, 10.0, 2);
     std::cout << "Cyl R=" << cyl.GetRadius() << " H=" << cyl.GetHeight() << std::endl;
     std::cout << "Cyl World Matrix:\n" << cyl.GetWorldMatrix() << std::endl;
 
@@ -82,7 +82,7 @@ int main()
 
   // Test 2: Translation
   {
-    Cylinder cyl(1.0, 2.0);
+    Cylinder cyl(1.0, 2.0, 2);
     cyl.SetPosition(Vector3f(10, 20, 30));
     
     // Local base origin (0, 0, 0) -> World (10, 20, 30)
@@ -96,7 +96,7 @@ int main()
 
   // Test 3: Rotation and complex mapping
   {
-    Cylinder cyl(5.0, 20.0);
+    Cylinder cyl(5.0, 20.0, 2);
     cyl.SetPosition(Vector3f(1.0, 2.0, 3.0));
     // Rotate 90 degrees around X: Local Y becomes World Z, Local Z becomes World -Y
     cyl.Rotate(M_PI/2.0, Vector3f(1, 0, 0));

src/Math/testing/GeometryTest.cpp

@@ -53,7 +53,7 @@ int main()
   ///////////////// GEOMETRY TESTING ///////////////////////////////////////////
   //////////////////////////////////////////////////////////////////////////////
 
-  Geometry Geo;
+  LinearGeometry Geo;
 
   Geo.SetPosition(Vector3f(1,1,1));
   Geo.EulerYZYRotate(Vector3f(0,0,0));
@@ -77,7 +77,7 @@ int main()
 
   Geo.EulerYZYRotate(Vector3f(0,0,M_PI_2));
   wp = Geo.GetWorldPoint(HPoint3f(1,1,1));
-  //  std::cout << "Geometry matrix\n" << Geo.GetTransform() << "\n";
+  //  std::cout << "Geometry matrix\n" << Geo.GetTransform().matrix() << "\n";
   //  std::cout << "World 1,1,1 coords\n" << wp << "\n";
   TEST0( Vector4f0(wp - HPoint3f(0,2,2)) );
 
@@ -122,6 +122,27 @@ int main()
     TEST0( Vector4f0(recovered.homogeneous() - tor_pt.homogeneous()) );
   }
 
+  // PARENT GEOMETRY TESTING
+  {
+    LinearGeometry parent;
+    parent.Translate(Vector3f(10, 0, 0));
+
+    LinearGeometry child;
+    child.SetParent(&parent);
+    child.Translate(Vector3f(0, 5, 0));
+
+    HPoint3f wp = child.GetWorldPoint(HPoint3f(1, 1, 1));
+    TEST0( Vector4f0(wp - HPoint3f(11, 6, 1)) );
+
+    CylindricalGeometry cparent;
+    LinearGeometry grandchild;
+    grandchild.SetParent(&cparent);
+    grandchild.Translate(Vector3f(1, 0, 0)); 
+
+    HPoint3f gp = grandchild.GetWorldPoint(HPoint3f(1, M_PI_2, 0));
+    TEST0( Vector4f0(gp - HPoint3f(0, 2, 0)) );
+  }
+
   END_TESTING;
 }
 

src/Math/testing/testing-prototype.h

@@ -31,8 +31,10 @@
 static int _fail = 0;                      \
 printf("..:: Testing " #name " ::..\n");
 
-#define TEST1(val) if ((val)==0) { printf("Assertion failed: %s != 0\n", #val); _fail++; }
+#define TEST1(val) _fail += (val)==0
-#define TEST0(val) if ((val)!=0) { printf("Assertion failed: %s != 0\n", #val); _fail++; }
+#define TEST0(val) _fail += (val)!=0
+#define ASSERT_EQUAL(a,b) if((a)!=(b)) { printf("Assertion failed: " #a " != " #b " at line %d\n", __LINE__); _fail++; }
+#define ASSERT_NOT_NULL(ptr) if((ptr)==NULL) { printf("Assertion failed: " #ptr " is NULL at line %d\n", __LINE__); _fail++; }
 #define END_TESTING return _fail;
 
 #define ASSERT_EQ(a, b) if ((a) != (b)) { printf("Assertion failed: %s != %s\n", #a, #b); _fail++; }

src/Python/math_bindings.cpp

@@ -162,6 +162,12 @@ void init_math(py::module_ &m) {
       .def_readwrite("direction_error", &HError3f::direction_error);
 
   // 3. Dynamic Vectors (uLib::Vector)
+  py::class_<TRS, AffineTransform, std::shared_ptr<TRS>>(m, "TRS")
+      .def(py::init<>())
+      .def_readwrite("position", &TRS::position)
+      .def_readwrite("rotation", &TRS::rotation)
+      .def_readwrite("scaling", &TRS::scaling);
+
   py::bind_vector<uLib::Vector<Scalari>>(m, "Vector_i")
       .def("MoveToVRAM", &uLib::Vector<Scalari>::MoveToVRAM)
       .def("MoveToRAM", &uLib::Vector<Scalari>::MoveToRAM);
@@ -268,7 +274,7 @@ void init_math(py::module_ &m) {
 
   // 5. Core Math Structures
   py::class_<AffineTransform, std::shared_ptr<AffineTransform>>(m,
-                                                              "AffineTransform")
+                                                               "AffineTransform")
       .def(py::init<>())
       .def("GetWorldMatrix", &AffineTransform::GetWorldMatrix)
       .def("SetPosition", &AffineTransform::SetPosition)
@@ -278,23 +284,46 @@ void init_math(py::module_ &m) {
       .def("SetRotation", &AffineTransform::SetRotation)
       .def("GetRotation", &AffineTransform::GetRotation)
       .def("Rotate",
-           py::overload_cast<const Matrix3f>(&AffineTransform::Rotate))
+           py::overload_cast<const Matrix3f&>(&AffineTransform::Rotate))
       .def("Rotate",
            py::overload_cast<float, Vector3f>(&AffineTransform::Rotate))
       .def("Rotate", py::overload_cast<Vector3f>(&AffineTransform::Rotate))
       .def("EulerYZYRotate", &AffineTransform::EulerYZYRotate)
-      .def("FlipAxes", &AffineTransform::FlipAxes);
+      .def("FlipAxes", &AffineTransform::FlipAxes)
+      .def("SetWorldMatrix", &AffineTransform::SetWorldMatrix);
 
-  py::class_<Geometry, AffineTransform, std::shared_ptr<Geometry>>(m, "Geometry")
+  py::class_<TRS, AffineTransform, std::shared_ptr<TRS>>(m, "TRS")
       .def(py::init<>())
-      .def("GetWorldPoint", py::overload_cast<const Vector4f>(
+      .def(py::init<const Matrix4f &>())
-                                &Geometry::GetWorldPoint, py::const_))
+      .def_readwrite("position", &TRS::position)
-      .def("GetWorldPoint",
+      .def_readwrite("rotation", &TRS::rotation)
-           py::overload_cast<float, float, float>(&Geometry::GetWorldPoint))
+      .def_readwrite("scaling", &TRS::scaling)
-      .def("GetLocalPoint", py::overload_cast<const Vector4f>(
+      .def("SetPosition", &TRS::SetPosition)
-                                &Geometry::GetLocalPoint, py::const_))
+      .def("SetRotation", &TRS::SetRotation)
-      .def("GetLocalPoint",
+      .def("SetOrientation", &TRS::SetOrientation)
-           py::overload_cast<float, float, float>(&Geometry::GetLocalPoint));
+      .def("SetScale", &TRS::SetScale)
+      .def("FromMatrix", &TRS::FromMatrix)
+      .def("GetMatrix", &TRS::GetMatrix);
+
+  py::class_<Geometry, Object, std::shared_ptr<Geometry>>(m, "Geometry")
+      .def("GetParent", &Geometry::GetParent)
+      .def("SetParent", &Geometry::SetParent)
+      .def("GetWorldPoint", py::overload_cast<const Vector4f>(&Geometry::GetWorldPoint, py::const_))
+      .def("GetWorldPoint", py::overload_cast<float, float, float>(&Geometry::GetWorldPoint, py::const_))
+      .def("GetLocalPoint", py::overload_cast<const Vector4f>(&Geometry::GetLocalPoint, py::const_))
+      .def("GetLocalPoint", py::overload_cast<float, float, float>(&Geometry::GetLocalPoint, py::const_));
+
+  py::class_<LinearGeometry, Geometry, std::shared_ptr<LinearGeometry>>(m, "LinearGeometry")
+      .def(py::init<>())
+      .def("Translate", &LinearGeometry::Translate)
+      .def("Rotate", &LinearGeometry::Rotate)
+      .def("Scale", &LinearGeometry::Scale)
+      .def("SetPosition", &LinearGeometry::SetPosition)
+      .def("GetPosition", &LinearGeometry::GetPosition)
+      .def("EulerYZYRotate", &LinearGeometry::EulerYZYRotate)
+      .def("FlipAxes", &LinearGeometry::FlipAxes)
+      .def("GetTransform", &LinearGeometry::GetTransform)
+      .def("SetTransform", &LinearGeometry::SetTransform);
 
   py::class_<ContainerBox, AffineTransform, Object, std::shared_ptr<ContainerBox>>(
       m, "ContainerBox")
@@ -427,26 +456,26 @@ void init_math(py::module_ &m) {
       .def("__getitem__",
            py::overload_cast<const Vector3i &>(&VoxImage<Voxel>::operator[]));
 
-  py::class_<TriangleMesh>(m, "TriangleMesh")
+  py::class_<TriangleMesh, TRS, std::shared_ptr<TriangleMesh>>(m, "TriangleMesh")
       .def(py::init<>())
       .def("AddPoint", &TriangleMesh::AddPoint)
       .def("AddTriangle",
            py::overload_cast<const Vector3i &>(&TriangleMesh::AddTriangle))
-      .def("Points", &TriangleMesh::Points,
+      .def("Points", py::overload_cast<>(&TriangleMesh::Points),
            py::return_value_policy::reference_internal)
-      .def("Triangles", &TriangleMesh::Triangles,
+      .def("Triangles", py::overload_cast<>(&TriangleMesh::Triangles),
            py::return_value_policy::reference_internal)
       .def("GetTriangle", &TriangleMesh::GetTriangle)
       .def("GetNormal", &TriangleMesh::GetNormal);
 
-  py::class_<QuadMesh>(m, "QuadMesh")
+  py::class_<QuadMesh, TRS, std::shared_ptr<QuadMesh>>(m, "QuadMesh")
       .def(py::init<>())
       .def("AddPoint", &QuadMesh::AddPoint)
       .def("AddQuad",
            py::overload_cast<const Vector4i &>(&QuadMesh::AddQuad))
-      .def("Points", &QuadMesh::Points,
+      .def("Points", py::overload_cast<>(&QuadMesh::Points),
            py::return_value_policy::reference_internal)
-      .def("Quads", &QuadMesh::Quads,
+      .def("Quads", py::overload_cast<>(&QuadMesh::Quads),
            py::return_value_policy::reference_internal)
       .def("GetQuad", &QuadMesh::GetQuad)
       .def("GetNormal", &QuadMesh::GetNormal);

src/Root/QCanvas.cpp

@@ -1,6 +1,7 @@
 #include "QCanvas.h"
 #include <iostream>
 #include <cstdio>
+#include <cstdlib>
 
 
 
@@ -40,7 +41,13 @@ QCanvas::QCanvas(QWidget *parent) : QWidget(parent), m_canvas(nullptr) {
     if (!gApplication) {
         static int argc = 1;
         static char* argv[] = {(char*)"App", nullptr};
-        new TApplication("App", &argc, argv);
+        if (std::getenv("CTEST_PROJECT_NAME")) {
+            static int bargc = 2;
+            static char* bargv[] = {(char*)"App", (char*)"-b", nullptr};
+            new TApplication("App", &bargc, bargv);
+        } else {
+            new TApplication("App", &argc, argv);
+        }
     }
     
     // Create the TCanvas associated with this QWidget

src/Root/testing/QCanvasTest.cpp

@@ -6,6 +6,7 @@
 #include <TCanvas.h>
 #include <TRandom.h>
 #include <TEnv.h>
+#include <cstdlib>
 #include "Root/QCanvas.h"
 
 int main(int argc, char **argv) {
@@ -37,10 +38,11 @@ int main(int argc, char **argv) {
     } else {
         std::cerr << "FAIL: Canvas is still NULL after show() and processEvents()" << std::endl;
     }
-
+    if (std::getenv("CTEST_PROJECT_NAME")) {
+        return 0;
+    }
     return app.exec();
 }
 #else
 int main() { return 0; }
 #endif
-

src/Vtk/CMakeLists.txt

@@ -3,7 +3,6 @@ set(HEADERS uLibVtkInterface.h
             vtkHandlerWidget.h
             vtkQViewport.h
             vtkViewport.h
-            vtkPolydata.h
             vtkObjectsContext.h
             )
 
@@ -12,7 +11,6 @@ set(SOURCES uLibVtkInterface.cxx
             vtkHandlerWidget.cpp
             vtkQViewport.cpp
             vtkViewport.cpp
-            vtkPolydata.cpp
             vtkObjectsContext.cpp
             )
 

src/Vtk/HEP/Detectors/vtkDetectorChamber.cxx

@@ -64,7 +64,7 @@ vtkDetectorChamber::vtkDetectorChamber(DetectorChamber *content)
   
   this->SetProp(m_PlaneActor);
   
-  this->contentUpdate();
+  this->Update();
 }
 
 vtkDetectorChamber::~vtkDetectorChamber() {
@@ -76,8 +76,8 @@ DetectorChamber *vtkDetectorChamber::GetContent() {
   return static_cast<DetectorChamber *>(m_Content);
 }
 
-void vtkDetectorChamber::contentUpdate() {
+void vtkDetectorChamber::Update() {
-  this->BaseClass::contentUpdate();
+  this->BaseClass::Update();
 
   if (!m_Content) return;
   DetectorChamber *c = this->GetContent();

src/Vtk/HEP/Detectors/vtkDetectorChamber.h

@@ -56,7 +56,7 @@ public:
 
   Content *GetContent();
 
-  virtual void contentUpdate() override;
+  virtual void Update() override;
 
 protected:
   vtkActor *m_PlaneActor;

src/Vtk/HEP/Detectors/vtkMuonEvent.h

@@ -45,7 +45,7 @@
 
 #include "HEP/Detectors/MuonEvent.h"
 #include "Vtk/uLibVtkInterface.h"
-#include "Vtk/vtkPolydata.h"
+#include "Vtk/Math/vtkPolydata.h"
 
 namespace uLib {
 namespace Vtk {

src/Vtk/HEP/Detectors/vtkMuonScatter.cxx

@@ -40,20 +40,21 @@ namespace Vtk {
 vtkMuonScatter::vtkMuonScatter(MuonScatter &content)
     : m_Content(&content), m_LineIn(vtkLineSource::New()),
       m_LineOut(vtkLineSource::New()), m_PolyData(vtkPolyData::New()),
-      m_SpherePoca(NULL) {
+      m_SpherePoca(NULL), m_Asm(vtkAssembly::New()) {
   InstallPipe();
 }
 
 vtkMuonScatter::vtkMuonScatter(const MuonScatter &content)
     : m_Content(const_cast<MuonScatter *>(&content)),
       m_LineIn(vtkLineSource::New()), m_LineOut(vtkLineSource::New()),
-      m_PolyData(vtkPolyData::New()), m_SpherePoca(NULL) {
+      m_PolyData(vtkPolyData::New()), m_SpherePoca(NULL), m_Asm(vtkAssembly::New()) {
   InstallPipe();
 }
 
 vtkMuonScatter::~vtkMuonScatter() {
   m_LineIn->Delete();
   m_LineOut->Delete();
+  m_Asm->Delete();
   if (m_SpherePoca)
     m_SpherePoca->Delete();
 }
@@ -87,13 +88,15 @@ void vtkMuonScatter::InstallPipe() {
   mapper->SetInputConnection(m_LineIn->GetOutputPort());
   vtkSmartPointer<vtkActor> actor = vtkSmartPointer<vtkActor>::New();
   actor->SetMapper(mapper);
-  this->SetProp(actor);
+  m_Asm->AddPart(actor);
 
   mapper = vtkSmartPointer<vtkPolyDataMapper>::New();
   mapper->SetInputConnection(m_LineOut->GetOutputPort());
   actor = vtkSmartPointer<vtkActor>::New();
   actor->SetMapper(mapper);
-  this->SetProp(actor);
+  m_Asm->AddPart(actor);
+
+  this->SetProp(m_Asm);
 }
 
 vtkPolyData *vtkMuonScatter::GetPolyData() const {
@@ -123,7 +126,7 @@ void vtkMuonScatter::AddPocaPoint(HPoint3f poca) {
   mapper->SetInputConnection(m_SpherePoca->GetOutputPort());
   vtkSmartPointer<vtkActor> actor = vtkSmartPointer<vtkActor>::New();
   actor->SetMapper(mapper);
-  this->SetProp(actor);
+  m_Asm->AddPart(actor);
 }
 
 HPoint3f vtkMuonScatter::GetPocaPoint() {

src/Vtk/HEP/Detectors/vtkMuonScatter.h

@@ -27,6 +27,7 @@
 #define VTKMUONSCATTER_H
 
 #include <vtkActor.h>
+#include <vtkAssembly.h>
 #include <vtkAppendPolyData.h>
 #include <vtkLineSource.h>
 #include <vtkPolyDataMapper.h>
@@ -46,7 +47,7 @@
 
 #include "HEP/Detectors/MuonScatter.h"
 #include "Vtk/uLibVtkInterface.h"
-#include "Vtk/vtkPolydata.h"
+#include "Vtk/Math/vtkPolydata.h"
 
 class vtkRenderWindowInteractor;
 
@@ -85,6 +86,7 @@ private:
   vtkLineSource *m_LineOut;
   vtkSphereSource *m_SpherePoca;
   vtkPolyData *m_PolyData;
+  vtkAssembly *m_Asm;
 };
 
 } // namespace Vtk

src/Vtk/HEP/Geant/CMakeLists.txt

@@ -5,11 +5,19 @@
 
 set(HEP_GEANT_SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/vtkGeantEvent.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/vtkGeantSolid.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/vtkBoxSolid.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/vtkTessellatedSolid.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/vtkGeantScene.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/vtkEmitterPrimary.cpp
     PARENT_SCOPE)
 
 set(HEP_GEANT_HEADERS
     ${CMAKE_CURRENT_SOURCE_DIR}/vtkGeantEvent.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/vtkGeantSolid.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/vtkBoxSolid.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/vtkTessellatedSolid.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/vtkGeantScene.h
     ${CMAKE_CURRENT_SOURCE_DIR}/vtkEmitterPrimary.h
     PARENT_SCOPE)
 

src/Vtk/HEP/Geant/testing/CMakeLists.txt

@@ -1,6 +1,8 @@
 # TESTS
 set(TESTS
        vtkGeantEventTest
+       vtkGeantSceneTest
+       vtkSolidsTest
        vtkEmitterPrimaryTest
        vtkSkyPlaneEmitterPrimaryTest
        vtkCylinderEmitterPrimaryTest

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

@@ -0,0 +1,65 @@
+/*//////////////////////////////////////////////////////////////////////////////
+// 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 >
+
+//////////////////////////////////////////////////////////////////////////////*/
+
+#include "Geant/Solid.h"
+#include "HEP/Geant/Scene.h"
+#include "Math/ContainerBox.h"
+#include "Math/Dense.h"
+#include "Math/Units.h"
+#include "Vtk/uLibVtkViewer.h"
+#include "Vtk/HEP/Geant/vtkGeantScene.h"
+
+#include <vtkSmartPointer.h>
+#include <vtkRenderer.h>
+#include <vtkRenderWindow.h>
+
+#include <iostream>
+
+using namespace uLib;
+
+int main(int argc, char** argv) {
+    bool interactive = (argc > 1 && std::string(argv[1]) == "-i");
+
+    // 1. Setup Geant4 Scene
+    Geant::Scene scene;
+    scene.ConstructWorldBox(Vector3f(30_m, 30_m, 30_m), "G4_AIR");
+
+    // Add an iron cube inside the world
+    ContainerBox iron_box;
+    iron_box.Scale(Vector3f(10_m, 10_m, 10_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");
+    iron_cube->Update();
+    scene.AddSolid(iron_cube);
+    scene.Initialize();
+
+    // 2. Build VTK scene representation
+    Vtk::Viewer viewer;
+    viewer.GetRenderer()->SetBackground(0.05, 0.05, 0.1);
+
+    Vtk::vtkGeantScene vtkScene(&scene);
+    vtkScene.AddToViewer(viewer);
+
+    std::cout << "==================================================" << std::endl;
+    std::cout << " vtkGeantScene Test" << std::endl;
+    std::cout << " World box + 1 iron cube displayed" << std::endl;
+    std::cout << "==================================================" << std::endl;
+
+    if (interactive) {
+        viewer.ZoomAuto();
+        viewer.Start();
+    } else {
+        std::cout << "Non-interactive test: scene initialized successfully" << std::endl;
+    }
+
+    return 0;
+}

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

@@ -0,0 +1,84 @@
+/*//////////////////////////////////////////////////////////////////////////////
+// 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 >
+
+//////////////////////////////////////////////////////////////////////////////*/
+
+#include "Vtk/HEP/Geant/vtkBoxSolid.h"
+#include "Vtk/HEP/Geant/vtkTessellatedSolid.h"
+#include "Vtk/uLibVtkViewer.h"
+#include "HEP/Geant/Solid.h"
+#include "Math/ContainerBox.h"
+#include "Math/TriangleMesh.h"
+#include "Math/Units.h"
+
+#include <vtkProperty.h>
+#include <vtkActor.h>
+
+using namespace uLib;
+
+int main(int argc, char** argv) {
+    bool interactive = (argc > 1 && std::string(argv[1]) == "-i");
+
+    // 1. Create a BoxSolid
+    ContainerBox box;
+    box.Scale(Vector3f(1_m, 2_m, 3_m));
+    Geant::BoxSolid gBox("MyBox", &box);
+    gBox.Update();
+
+    Vtk::vtkBoxSolid vtkBox(&gBox);
+
+    // 2. Create a TessellatedSolid
+    Geant::TessellatedSolid gTess("MyTess");
+    TriangleMesh mesh;
+    // Create a simple pyramid
+    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.Triangles().push_back(Vector3i(1, 2, 0));
+    mesh.Triangles().push_back(Vector3i(2, 3, 0));
+    mesh.Triangles().push_back(Vector3i(3, 4, 0));
+    mesh.Triangles().push_back(Vector3i(4, 1, 0));
+    mesh.Triangles().push_back(Vector3i(1, 3, 2)); // base
+    mesh.Triangles().push_back(Vector3i(1, 4, 3)); // base
+    
+    gTess.SetMesh(mesh);
+    gTess.Update();
+
+    Vtk::vtkTessellatedSolid vtkTess(&gTess);
+
+    // 3. Visualization setup
+    Vtk::Viewer viewer;
+    vtkBox.AddToViewer(viewer);
+    vtkTess.AddToViewer(viewer);
+
+    // Color them differently
+    vtkActor::SafeDownCast(vtkBox.GetProp())->GetProperty()->SetColor(0.8, 0.2, 0.2); // Redish box
+    vtkActor::SafeDownCast(vtkTess.GetProp())->GetProperty()->SetColor(0.2, 0.8, 0.2); // Greenish tess
+    
+    // Position tessellated solid away from box
+    Matrix4f trans = Matrix4f::Identity();
+    trans.block<3,1>(0,3) = Vector3f(5_m, 0, 0);
+    gTess.SetTransform(trans);
+    vtkTess.Update();
+
+    std::cout << "..:: Testing vtkSolidsTest ::.." << std::endl;
+    std::cout << "Box and Tessellated solids initialized." << std::endl;
+
+    if (interactive) {
+        viewer.ZoomAuto();
+        viewer.Start();
+    } else {
+        std::cout << "Non-interactive test passed." << std::endl;
+    }
+
+    return 0;
+}

src/Vtk/HEP/Geant/vtkBoxSolid.cpp

@@ -0,0 +1,57 @@
+/*//////////////////////////////////////////////////////////////////////////////
+// CMT Cosmic Muon Tomography project //////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////////
+
+  Copyright (c) 2014, Universita' degli Studi Padova, INFN sez. di Padova
+  All rights reserved
+
+  Authors: Andrea Rigoni Garola < andrea.rigoni@pd.infn.it >
+
+//////////////////////////////////////////////////////////////////////////////*/
+
+#include "vtkBoxSolid.h"
+#include <vtkCubeSource.h>
+#include <vtkPolyDataMapper.h>
+#include <vtkActor.h>
+
+namespace uLib {
+namespace Vtk {
+
+vtkBoxSolid::vtkBoxSolid(Geant::BoxSolid *content)
+    : vtkGeantSolid(content), m_BoxContent(content) {
+  // Re-run Update for box-specific pipe
+  this->Update();
+}
+
+vtkBoxSolid::~vtkBoxSolid() {}
+
+void vtkBoxSolid::Update() {
+  this->UpdateGeometry();
+  this->UpdateTransform();
+}
+
+void vtkBoxSolid::UpdateGeometry() {
+  if (!m_BoxContent || !m_BoxContent->GetObject()) {
+    // Fallback to base tessellation if no model object
+    vtkGeantSolid::UpdateGeometry();
+    return;
+  }
+
+  // Use the underlying ContainerBox for precise geometry
+  Vector3f size = m_BoxContent->GetObject()->GetSize();
+  
+  vtkNew<vtkCubeSource> cube;
+  cube->SetXLength(size(0));
+  cube->SetYLength(size(1));
+  cube->SetZLength(size(2));
+  cube->Update();
+
+  vtkPolyData *poly = GetPolyData();
+  if (poly) {
+      poly->ShallowCopy(cube->GetOutput());
+      poly->Modified();
+  }
+}
+
+} // namespace Vtk
+} // namespace uLib

src/Vtk/HEP/Geant/vtkBoxSolid.h

@@ -0,0 +1,52 @@
+/*//////////////////////////////////////////////////////////////////////////////
+// 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.
+
+//////////////////////////////////////////////////////////////////////////////*/
+
+#ifndef U_VTKBOXSOLID_H
+#define U_VTKBOXSOLID_H
+
+#include "vtkGeantSolid.h"
+
+namespace uLib {
+namespace Vtk {
+
+/**
+ * @brief VTK Puppet for visualizing a Geant::BoxSolid.
+ */
+class vtkBoxSolid : public vtkGeantSolid {
+public:
+  vtkBoxSolid(Geant::BoxSolid *content);
+  virtual ~vtkBoxSolid();
+
+  virtual void Update() override;
+  virtual void UpdateGeometry() override;
+
+protected:
+  Geant::BoxSolid *m_BoxContent;
+};
+
+} // namespace Vtk
+} // namespace uLib
+
+#endif // U_VTKBOXSOLID_H

src/Vtk/HEP/Geant/vtkGeantEvent.h

@@ -28,7 +28,7 @@
 
 #include "HEP/Geant/GeantEvent.h"
 #include "uLibVtkInterface.h"
-#include "vtkPolydata.h"
+#include "Vtk/Math/vtkPolydata.h"
 #include <vtkActor.h>
 
 namespace uLib {

src/Vtk/HEP/Geant/vtkGeantScene.cpp

@@ -0,0 +1,102 @@
+/*//////////////////////////////////////////////////////////////////////////////
+// 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 "vtkGeantScene.h"
+#include "vtkGeantSolid.h"
+#include "vtkBoxSolid.h"
+#include "vtkTessellatedSolid.h"
+#include "Vtk/vtkViewport.h"
+
+namespace uLib {
+namespace Vtk {
+
+vtkGeantScene::vtkGeantScene(Geant::Scene *scene)
+    : m_Scene(scene), m_WorldPuppet(nullptr) {
+  if (!m_Scene)
+    return;
+
+  // 1. Create the world box wireframe puppet
+  ContainerBox *worldBox = m_Scene->GetWorldBox();
+  if (worldBox) {
+    m_WorldPuppet = new vtkContainerBox(worldBox);
+    m_WorldPuppet->SetRepresentation(Puppet::Wireframe);
+    m_WorldPuppet->ShowScaleMeasures(true);
+  }
+
+  // 2. Create puppets for each non-world solid
+  const Geant::Solid *world = m_Scene->GetWorld();
+  const Vector<Geant::Solid *> &solids = m_Scene->GetSolids();
+
+  for (Geant::Solid *solid : solids) {
+    // Skip the world volume itself — it's already shown as the wireframe box
+    if (solid == world)
+      continue;
+
+    // Only create a puppet if the solid has a valid G4VSolid
+    if (solid->GetG4Solid()) {
+      vtkGeantSolid *vtkSolid = nullptr;
+      if (auto *box = dynamic_cast<Geant::BoxSolid *>(solid)) {
+        vtkSolid = new vtkBoxSolid(box);
+      } else if (auto *tess = dynamic_cast<Geant::TessellatedSolid *>(solid)) {
+        vtkSolid = new vtkTessellatedSolid(tess);
+      } else {
+        vtkSolid = new vtkGeantSolid(solid);
+        vtkSolid->Update();
+      }
+      
+      if (vtkSolid) {
+        m_SolidPuppets.push_back(vtkSolid);
+      }
+    }
+  }
+}
+
+vtkGeantScene::~vtkGeantScene() {
+  delete m_WorldPuppet;
+  for (auto *p : m_SolidPuppets) {
+    delete p;
+  }
+}
+
+void vtkGeantScene::AddToViewer(Viewport &viewer) {
+  if (m_WorldPuppet) {
+    viewer.AddPuppet(*m_WorldPuppet);
+  }
+  for (auto *p : m_SolidPuppets) {
+    viewer.AddPuppet(*p);
+  }
+}
+
+void vtkGeantScene::RemoveFromViewer(Viewport &viewer) {
+  if (m_WorldPuppet) {
+    viewer.RemovePuppet(*m_WorldPuppet);
+  }
+  for (auto *p : m_SolidPuppets) {
+    viewer.RemovePuppet(*p);
+  }
+}
+
+} // namespace Vtk
+} // namespace uLib

src/Vtk/HEP/Geant/vtkGeantScene.h

@@ -0,0 +1,87 @@
+/*//////////////////////////////////////////////////////////////////////////////
+// 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.
+
+//////////////////////////////////////////////////////////////////////////////*/
+
+#ifndef U_VTKGEANTSCENE_H
+#define U_VTKGEANTSCENE_H
+
+#include "HEP/Geant/Scene.h"
+#include "uLibVtkInterface.h"
+#include "Vtk/Math/vtkContainerBox.h"
+
+#include <vector>
+#include <memory>
+
+namespace uLib {
+namespace Vtk {
+
+class vtkGeantSolid;
+
+/**
+ * @brief VTK Puppet representing the entire Geant::Scene.
+ *
+ * When constructed, it creates child puppets for the world box (as a
+ * vtkContainerBox wireframe) and for each non-world Solid in the scene
+ * (as vtkGeantSolid surfaces).
+ *
+ * Usage:
+ * @code
+ *   Geant::Scene scene;
+ *   scene.ConstructWorldBox(Vector3f(30_m, 30_m, 30_m), "G4_AIR");
+ *   // ... add solids ...
+ *   scene.Initialize();
+ *
+ *   Vtk::Viewer viewer;
+ *   Vtk::vtkGeantScene vtkScene(&scene);
+ *   vtkScene.AddToViewer(viewer);
+ *   viewer.Start();
+ * @endcode
+ */
+class vtkGeantScene : public Object {
+public:
+  vtkGeantScene(Geant::Scene *scene);
+  ~vtkGeantScene();
+
+  /// Add all puppets (world box + solids) to a viewer.
+  void AddToViewer(class Viewport &viewer);
+
+  /// Remove all puppets from viewport.
+  void RemoveFromViewer(class Viewport &viewer);
+
+  /// Get the world box puppet 
+  vtkContainerBox* GetWorldPuppet() const { return m_WorldPuppet; }
+
+  /// Get the solid puppets
+  const std::vector<vtkGeantSolid*>& GetSolidPuppets() const { return m_SolidPuppets; }
+
+private:
+  Geant::Scene             *m_Scene;
+  vtkContainerBox          *m_WorldPuppet;
+  std::vector<vtkGeantSolid*> m_SolidPuppets;
+};
+
+} // namespace Vtk
+} // namespace uLib
+
+#endif // U_VTKGEANTSCENE_H

src/Vtk/HEP/Geant/vtkGeantSolid.cpp

@@ -0,0 +1,165 @@
+/*//////////////////////////////////////////////////////////////////////////////
+// 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 "vtkGeantSolid.h"
+
+#include <vtkActor.h>
+#include <vtkPolyData.h>
+#include <vtkPoints.h>
+#include <vtkCellArray.h>
+#include <vtkPolyDataMapper.h>
+#include <vtkProperty.h>
+#include <vtkSmartPointer.h>
+#include <vtkTransform.h>
+#include <vtkMatrix4x4.h>
+
+#include <Geant4/G4VSolid.hh>
+#include <Geant4/G4Polyhedron.hh>
+#include <Geant4/G4VPhysicalVolume.hh>
+
+namespace uLib {
+namespace Vtk {
+
+vtkGeantSolid::vtkGeantSolid(Content *content)
+    : m_SolidActor(vtkActor::New()), m_Content(content) {
+  this->InstallPipe();
+}
+
+vtkGeantSolid::~vtkGeantSolid() {
+  m_SolidActor->Delete();
+}
+
+vtkPolyData *vtkGeantSolid::GetPolyData() const {
+  if (!m_SolidActor || !m_SolidActor->GetMapper())
+    return NULL;
+  return vtkPolyData::SafeDownCast(m_SolidActor->GetMapper()->GetInput());
+}
+
+void vtkGeantSolid::Update() {
+  this->UpdateGeometry();
+  this->UpdateTransform();
+}
+
+void vtkGeantSolid::UpdateGeometry() {
+  if (!m_Content)
+    return;
+
+  G4VSolid *g4solid = m_Content->GetG4Solid();
+  if (!g4solid)
+    return;
+
+  // Get the polyhedron tessellation from Geant4
+  G4Polyhedron *polyhedron = g4solid->GetPolyhedron();
+  if (!polyhedron)
+    return;
+
+  vtkSmartPointer<vtkPoints> points = vtkSmartPointer<vtkPoints>::New();
+  vtkSmartPointer<vtkCellArray> polys = vtkSmartPointer<vtkCellArray>::New();
+
+  // Extract vertices
+  int nVertices = polyhedron->GetNoVertices();
+  for (int i = 1; i <= nVertices; ++i) {
+    G4Point3D vtx = polyhedron->GetVertex(i);
+    points->InsertNextPoint(vtx.x(), vtx.y(), vtx.z());
+  }
+
+  // Extract facets (polygons)
+  int nFacets = polyhedron->GetNoFacets();
+  for (int f = 1; f <= nFacets; ++f) {
+    G4int nEdges;
+    G4int iVertex[4]; // G4Polyhedron facets have at most 4 vertices
+    // GetNextFacet returns edges; for quads nEdges=4, for triangles nEdges=3
+    polyhedron->GetFacet(f, nEdges, iVertex);
+
+    vtkIdType ids[4];
+    for (int e = 0; e < nEdges; ++e) {
+      // G4Polyhedron vertices are 1-indexed; VTK expects 0-indexed
+      ids[e] = static_cast<vtkIdType>(std::abs(iVertex[e]) - 1);
+    }
+    polys->InsertNextCell(nEdges, ids);
+  }
+
+  vtkPolyData *polyData = GetPolyData();
+  if (polyData) {
+    polyData->SetPoints(points);
+    polyData->SetPolys(polys);
+    polyData->Modified();
+  }
+}
+
+void vtkGeantSolid::UpdateTransform() {
+  if (!m_Content || !m_SolidActor)
+    return;
+
+  // Apply the Geant4 transform (position/rotation) if placed
+  if (m_Content->GetPhysical()) {
+    auto *phys = m_Content->GetPhysical();
+    G4ThreeVector pos = phys->GetTranslation();
+    const G4RotationMatrix *rot = phys->GetRotation();
+
+    vtkSmartPointer<vtkTransform> transform = vtkSmartPointer<vtkTransform>::New();
+    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);
+  }
+}
+
+void vtkGeantSolid::InstallPipe() {
+  vtkSmartPointer<vtkPolyData> polyData = vtkSmartPointer<vtkPolyData>::New();
+  vtkSmartPointer<vtkPolyDataMapper> mapper =
+      vtkSmartPointer<vtkPolyDataMapper>::New();
+  mapper->SetInputData(polyData);
+
+  m_SolidActor->SetMapper(mapper);
+
+  // Default look: semi-transparent blue surface
+  m_SolidActor->GetProperty()->SetColor(0.4, 0.6, 0.9);
+  m_SolidActor->GetProperty()->SetOpacity(0.3);
+  m_SolidActor->GetProperty()->SetAmbient(0.5);
+  m_SolidActor->GetProperty()->SetDiffuse(0.6);
+  m_SolidActor->GetProperty()->SetSpecular(0.2);
+  m_SolidActor->GetProperty()->SetEdgeVisibility(1);
+  m_SolidActor->GetProperty()->SetEdgeColor(0.2, 0.3, 0.5);
+
+  this->SetProp(m_SolidActor);
+}
+
+} // namespace Vtk
+} // namespace uLib

src/Vtk/HEP/Geant/vtkGeantSolid.h

@@ -0,0 +1,69 @@
+/*//////////////////////////////////////////////////////////////////////////////
+// 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.
+
+//////////////////////////////////////////////////////////////////////////////*/
+
+#ifndef U_VTKGEANTSOLID_H
+#define U_VTKGEANTSOLID_H
+
+#include "HEP/Geant/Solid.h"
+#include "uLibVtkInterface.h"
+#include "Vtk/Math/vtkPolydata.h"
+
+class vtkActor;
+
+namespace uLib {
+namespace Vtk {
+
+/**
+ * @brief VTK Puppet for visualizing a Geant::Solid.
+ *
+ * Renders the G4VSolid geometry as a tessellated polydata surface.
+ * Works with BoxSolid, TessellatedSolid, or any Solid that provides
+ * a valid G4VSolid via GetG4Solid().
+ */
+class vtkGeantSolid : public Puppet, public Polydata {
+  typedef Geant::Solid Content;
+
+public:
+  vtkGeantSolid(Content *content);
+  ~vtkGeantSolid();
+
+  virtual class vtkPolyData *GetPolyData() const override;
+
+  virtual void Update() override;
+
+  virtual void UpdateGeometry();
+  virtual void UpdateTransform();
+
+protected:
+  virtual void InstallPipe();
+
+  vtkActor *m_SolidActor;
+  Content  *m_Content;
+};
+
+} // namespace Vtk
+} // namespace uLib
+
+#endif // U_VTKGEANTSOLID_H

src/Vtk/HEP/Geant/vtkTessellatedSolid.cpp

@@ -0,0 +1,62 @@
+/*//////////////////////////////////////////////////////////////////////////////
+// CMT Cosmic Muon Tomography project //////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////////
+
+  Copyright (c) 2014, Universita' degli Studi Padova, INFN sez. di Padova
+  All rights reserved
+
+  Authors: Andrea Rigoni Garola < andrea.rigoni@pd.infn.it >
+
+//////////////////////////////////////////////////////////////////////////////*/
+
+#include "vtkTessellatedSolid.h"
+
+#include <vtkPoints.h>
+#include <vtkCellArray.h>
+#include <vtkPolyData.h>
+
+namespace uLib {
+namespace Vtk {
+
+vtkTessellatedSolid::vtkTessellatedSolid(Geant::TessellatedSolid *content)
+    : vtkGeantSolid(content), m_TessContent(content) {
+  this->Update();
+}
+
+vtkTessellatedSolid::~vtkTessellatedSolid() {}
+
+void vtkTessellatedSolid::Update() {
+  this->UpdateGeometry();
+  this->UpdateTransform();
+}
+
+void vtkTessellatedSolid::UpdateGeometry() {
+  if (!m_TessContent || m_TessContent->GetMesh().Points().empty()) {
+    // Fallback to base tessellation if no model mesh
+    vtkGeantSolid::UpdateGeometry();
+    return;
+  }
+
+  const TriangleMesh &mesh = m_TessContent->GetMesh();
+  
+  vtkNew<vtkPoints> points;
+  for (const auto& pt : mesh.Points()) {
+    points->InsertNextPoint(pt(0), pt(1), pt(2));
+  }
+
+  vtkNew<vtkCellArray> polys;
+  for (const auto& trg : mesh.Triangles()) {
+    vtkIdType ids[3] = { (vtkIdType)trg(0), (vtkIdType)trg(1), (vtkIdType)trg(2) };
+    polys->InsertNextCell(3, ids);
+  }
+
+  vtkPolyData *poly = GetPolyData();
+  if (poly) {
+      poly->SetPoints(points);
+      poly->SetPolys(polys);
+      poly->Modified();
+  }
+}
+
+} // namespace Vtk
+} // namespace uLib