From 1461d0c6d3058a6e7ef700e9240d5366d1386dda Mon Sep 17 00:00:00 2001 From: Alex Bilger Date: Wed, 11 Mar 2026 08:00:10 +0100 Subject: [PATCH 1/2] Use `toBaseComponent()` instead of `toBaseObject()` --- Sofa/framework/Core/src/sofa/core/objectmodel/BaseLink.cpp | 4 ++-- applications/projects/Modeler/lib/GraphHistoryManager.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Sofa/framework/Core/src/sofa/core/objectmodel/BaseLink.cpp b/Sofa/framework/Core/src/sofa/core/objectmodel/BaseLink.cpp index bb4c8632e86..7224bdb686b 100644 --- a/Sofa/framework/Core/src/sofa/core/objectmodel/BaseLink.cpp +++ b/Sofa/framework/Core/src/sofa/core/objectmodel/BaseLink.cpp @@ -209,8 +209,8 @@ std::string BaseLink::CreateString(const std::string& path, const std::string& d std::string BaseLink::CreateStringPath(Base* dest, Base* from) { if (!dest || dest == from) return std::string("[]"); - BaseObject* o = dest->toBaseObject(); - BaseObject* f = from->toBaseObject(); + BaseObject* o = dest->toBaseComponent()(); + BaseObject* f = from->toBaseComponent()(); const BaseContext* ctx = from->toBaseContext(); if (!ctx && f) ctx = f->getContext(); if (o) diff --git a/applications/projects/Modeler/lib/GraphHistoryManager.cpp b/applications/projects/Modeler/lib/GraphHistoryManager.cpp index 3530069c1e8..f819901efba 100644 --- a/applications/projects/Modeler/lib/GraphHistoryManager.cpp +++ b/applications/projects/Modeler/lib/GraphHistoryManager.cpp @@ -91,7 +91,7 @@ void GraphHistoryManager::undoOperation(Operation &o) switch(o.ID) { case Operation::DELETE_OBJECT: - o.parent->addObject(o.sofaComponent->toBaseObject()); + o.parent->addObject(o.sofaComponent->toBaseComponent()()); graph->moveItem(graph->graphListener->items[o.sofaComponent.get()],graph->graphListener->items[o.above.get()]); o.ID = Operation::ADD_OBJECT; message=std::string("Undo Delete NODE ") + " (" + o.sofaComponent->getClassName() + ") " + o.sofaComponent->getName(); @@ -109,7 +109,7 @@ void GraphHistoryManager::undoOperation(Operation &o) case Operation::ADD_OBJECT: o.parent=graph->getNode(graph->graphListener->items[o.sofaComponent.get()]); o.above=graph->getComponentAbove(graph->graphListener->items[o.sofaComponent.get()]); - o.parent->removeObject(o.sofaComponent->toBaseObject()); + o.parent->removeObject(o.sofaComponent->toBaseComponent()()); o.ID = Operation::DELETE_OBJECT; message=std::string("Undo Delete OBJECT ") +" (" + o.sofaComponent->getClassName() + ") " + o.sofaComponent->getName(); From d1f7302a836bcd53be3f47643fd8e6c2cad1722d Mon Sep 17 00:00:00 2001 From: Frederick Roy Date: Mon, 16 Mar 2026 10:28:04 +0900 Subject: [PATCH 2/2] fix typo --- Sofa/framework/Core/src/sofa/core/objectmodel/BaseLink.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Sofa/framework/Core/src/sofa/core/objectmodel/BaseLink.cpp b/Sofa/framework/Core/src/sofa/core/objectmodel/BaseLink.cpp index 7224bdb686b..0e9287cd8c5 100644 --- a/Sofa/framework/Core/src/sofa/core/objectmodel/BaseLink.cpp +++ b/Sofa/framework/Core/src/sofa/core/objectmodel/BaseLink.cpp @@ -209,8 +209,8 @@ std::string BaseLink::CreateString(const std::string& path, const std::string& d std::string BaseLink::CreateStringPath(Base* dest, Base* from) { if (!dest || dest == from) return std::string("[]"); - BaseObject* o = dest->toBaseComponent()(); - BaseObject* f = from->toBaseComponent()(); + BaseObject* o = dest->toBaseComponent(); + BaseObject* f = from->toBaseComponent(); const BaseContext* ctx = from->toBaseContext(); if (!ctx && f) ctx = f->getContext(); if (o)