Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
1faedb7
Merge DAGNode in Node
damienmarchal Jun 27, 2025
8f897b8
Use Node in place of DAGNode in sofa's code.
damienmarchal Jun 27, 2025
4d0de25
Copy past content of DAGNode in Node
damienmarchal Jun 27, 2025
a3a1734
FIXUP forward declaration of BaseMechanicalstate
damienmarchal Jun 27, 2025
2eebd94
Merge branch 'master' into xp-merge-dagnode-node
damienmarchal Jun 30, 2025
272830c
Merge branch 'master' into xp-merge-dagnode-node
damienmarchal Jul 11, 2025
f2fb253
Merge branch 'master' into xp-merge-dagnode-node
damienmarchal Jul 14, 2025
d3f502b
FIX Node refactoring invalid merge.
damienmarchal Jul 14, 2025
2a3482f
Remove DAGNode and DAGSimulation
damienmarchal Jul 14, 2025
9ba0c0b
Move Simulation's singleton initialization from graph/init.cpp to Sim…
damienmarchal Jul 14, 2025
d6d5603
[Sofa.Simulation.Core] Clean of Simulation
damienmarchal Jul 14, 2025
db0bcb6
Bye bye DAGNode
damienmarchal Jul 14, 2025
d63e359
Merge branch 'master' into xp-merge-dagnode-node
damienmarchal Jul 16, 2025
00acc17
Clean of the integration of DAGNode into Node
damienmarchal Jul 16, 2025
0742e65
Add deprecation macro in DAGNode.h forwarding to Node
damienmarchal Jul 16, 2025
fc2ede0
Merge branch 'master' into xp-merge-dagnode-node
damienmarchal Jul 17, 2025
4fe2197
Merge branch 'master' into xp-merge-dagnode-node
damienmarchal Jul 17, 2025
35d6b2b
Merge branch 'master' into xp-merge-dagnode-node
damienmarchal Jul 20, 2025
14be651
Merge branch 'master' into xp-merge-dagnode-node
damienmarchal Jul 24, 2025
ebd355b
Remove DAGNode and DAGSimulation
damienmarchal Jul 14, 2025
f7755e7
Move Simulation's singleton initialization from graph/init.cpp to Sim…
damienmarchal Jul 14, 2025
54e9625
[Sofa.Simulation.Core] Clean of Simulation
damienmarchal Jul 14, 2025
3e758a6
Bye bye DAGNode
damienmarchal Jul 14, 2025
27f6353
Merge remote-tracking branch 'cristal/xp-remove-dagsimulation' into x…
damienmarchal Jul 24, 2025
0cc6ecf
Merge remote-tracking branch 'upstream/master' into xp-remove-dagsimu…
damienmarchal Sep 6, 2025
9f6bfb1
Merge branch 'master' into xp-remove-dagsimulation
damienmarchal Sep 8, 2025
e985ea3
Merge branch 'master' into xp-remove-dagsimulation
damienmarchal Sep 11, 2025
1e09f4e
Merge branch 'master' into xp-remove-dagsimulation
damienmarchal Oct 4, 2025
3f5313f
Merge remote-tracking branch 'upstream/master' into xp-remove-dagsimu…
damienmarchal Oct 4, 2025
a2b20bc
Merge remote-tracking branch 'cristal/xp-remove-dagsimulation' into x…
damienmarchal Oct 4, 2025
cbf1167
Add missing #include<string>
damienmarchal Oct 4, 2025
649796e
Merge branch 'master' into xp-remove-dagsimulation
damienmarchal Oct 9, 2025
3d7e337
Merge branch 'master' into xp-remove-dagsimulation
damienmarchal Oct 13, 2025
3294f2b
Merge branch 'master' into xp-remove-dagsimulation
damienmarchal Oct 14, 2025
2830747
Merge remote-tracking branch 'upstream/master' into xp-remove-dagsimu…
damienmarchal Oct 17, 2025
9e1e43e
Fix link problem with createNewNode (missing SOFA_SIMULATION_CORE_API)
damienmarchal Oct 17, 2025
03451dc
Merge branch 'master' into xp-remove-dagsimulation
damienmarchal Oct 17, 2025
66ca683
Merge branch 'master' into xp-remove-dagsimulation
damienmarchal Oct 23, 2025
ef83543
Merge branch 'master' into xp-remove-dagsimulation
damienmarchal Oct 30, 2025
960fa8a
Merge branch 'master' into xp-remove-dagsimulation
hugtalbot Nov 6, 2025
eca4767
[Sofa.Core] Add a castTo in fwd.h to support "const" conversion
damienmarchal Oct 30, 2025
6782a19
[Sofa.Core] Add a getPathName() method in BaseData
damienmarchal Oct 30, 2025
3bc1c5d
Merge remote-tracking branch 'upstream/master' into xp-remove-dagsimu…
damienmarchal Nov 27, 2025
3381c71
Merge branch 'master' into xp-remove-dagsimulation
damienmarchal Jun 26, 2026
c78fd77
Rename BaseObjectDescription into BaseComponentDescription
AnnaMarchalBoneva Jun 30, 2026
03ba1b9
Propagate change
AnnaMarchalBoneva Jun 30, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class SOFA_COMPONENT_COLLISION_DETECTION_ALGORITHM_API BruteForceDetection final

/// Construction method called by ObjectFactory.
template<class T>
static typename T::SPtr create(T*, sofa::core::objectmodel::BaseContext* context, sofa::core::objectmodel::BaseObjectDescription* arg)
static typename T::SPtr create(T*, sofa::core::objectmodel::BaseContext* context, sofa::core::objectmodel::BaseComponentDescription* arg)
{
if (context)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class SOFA_COMPONENT_COLLISION_DETECTION_ALGORITHM_API DirectSAP final : public

/// Construction method called by ObjectFactory.
template<class T>
static typename T::SPtr create(T*, sofa::core::objectmodel::BaseContext* context, sofa::core::objectmodel::BaseObjectDescription* arg)
static typename T::SPtr create(T*, sofa::core::objectmodel::BaseContext* context, sofa::core::objectmodel::BaseComponentDescription* arg)
{
if (context)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,6 @@ using sofa::core::objectmodel::BaseComponent ;
#include <sofa/component/collision/detection/algorithm/CollisionPipeline.h>
using sofa::component::collision::detection::algorithm::CollisionPipeline ;

#include <sofa/simulation/graph/DAGSimulation.h>
using sofa::simulation::graph::DAGSimulation ;

#include <sofa/simulation/Node.h>
using sofa::simulation::Node ;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,7 @@ using std::string;
#include <sofa/testing/BaseSimulationTest.h>
using sofa::testing::BaseSimulationTest;

#include <sofa/simulation/graph/DAGSimulation.h>
using sofa::simulation::graph::DAGSimulation ;
#include <sofa/simulation/Simulation.h>
using sofa::simulation::Node ;

#include <sofa/simulation/common/SceneLoaderXML.h>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ public :
/// Pre-construction check method called by ObjectFactory.
/// Check that DataTypes matches the MechanicalState.
template<class T>
static bool canCreate(T*& obj, core::objectmodel::BaseContext* context, core::objectmodel::BaseObjectDescription* arg)
static bool canCreate(T*& obj, core::objectmodel::BaseContext* context, core::objectmodel::BaseComponentDescription* arg)
{
if (dynamic_cast<core::behavior::MechanicalState<DataTypes>*>(context->getMechanicalState()) == nullptr)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ class PointCollisionModel : public core::CollisionModel
/// Pre-construction check method called by ObjectFactory.
/// Check that DataTypes matches the MechanicalState.
template<class T>
static bool canCreate(T*& obj, core::objectmodel::BaseContext* context, core::objectmodel::BaseObjectDescription* arg)
static bool canCreate(T*& obj, core::objectmodel::BaseContext* context, core::objectmodel::BaseComponentDescription* arg)
{
if (dynamic_cast<core::behavior::MechanicalState<DataTypes>*>(context->getMechanicalState()) == nullptr)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ class SphereCollisionModel : public core::CollisionModel
/// Pre-construction check method called by ObjectFactory.
/// Check that DataTypes matches the MechanicalState.
template<class T>
static bool canCreate(T*& obj, core::objectmodel::BaseContext* context, core::objectmodel::BaseObjectDescription* arg)
static bool canCreate(T*& obj, core::objectmodel::BaseContext* context, core::objectmodel::BaseComponentDescription* arg)
{
if (dynamic_cast<core::behavior::MechanicalState<TDataTypes>*>(context->getMechanicalState()) == nullptr && context->getMechanicalState() != nullptr)
{
Expand All @@ -138,7 +138,7 @@ class SphereCollisionModel : public core::CollisionModel
}

template<class T>
static typename T::SPtr create(T*, core::objectmodel::BaseContext* context, core::objectmodel::BaseObjectDescription* arg)
static typename T::SPtr create(T*, core::objectmodel::BaseContext* context, core::objectmodel::BaseComponentDescription* arg)
{
typename T::SPtr obj;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ class TriangleCollisionModel : public core::CollisionModel
/// Pre-construction check method called by ObjectFactory.
/// Check that DataTypes matches the MechanicalState.
template<class T>
static bool canCreate(T*& obj, core::objectmodel::BaseContext* context, core::objectmodel::BaseObjectDescription* arg)
static bool canCreate(T*& obj, core::objectmodel::BaseContext* context, core::objectmodel::BaseComponentDescription* arg)
{
if (dynamic_cast<core::behavior::MechanicalState<DataTypes>*>(context->getMechanicalState()) == nullptr)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public :
void draw(const core::visual::VisualParams* vparams) override;

template<class T>
static typename T::SPtr create(T*, core::objectmodel::BaseContext* context, core::objectmodel::BaseObjectDescription* arg)
static typename T::SPtr create(T*, core::objectmodel::BaseContext* context, core::objectmodel::BaseComponentDescription* arg)
{
typename T::SPtr obj = sofa::core::objectmodel::New<T>();
if (context)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ class SOFA_COMPONENT_COLLISION_RESPONSE_CONTACT_API ContactListener : public vir
std::vector<std::tuple<unsigned int, unsigned int, unsigned int, unsigned int>> getContactElements() const; // model, id, model, id

template<class T>
static bool canCreate(T*& obj, core::objectmodel::BaseContext* context, core::objectmodel::BaseObjectDescription* arg)
static bool canCreate(T*& obj, core::objectmodel::BaseContext* context, core::objectmodel::BaseComponentDescription* arg)
{
core::CollisionModel* collModel1 = nullptr;
core::CollisionModel* collModel2 = nullptr;
Expand Down Expand Up @@ -108,7 +108,7 @@ class SOFA_COMPONENT_COLLISION_RESPONSE_CONTACT_API ContactListener : public vir
}

template<class T>
static typename T::SPtr create(T* , core::objectmodel::BaseContext* context, core::objectmodel::BaseObjectDescription* arg)
static typename T::SPtr create(T* , core::objectmodel::BaseContext* context, core::objectmodel::BaseComponentDescription* arg)
{
core::CollisionModel* collModel1 = nullptr;
core::CollisionModel* collModel2 = nullptr;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ std::string RuleBasedContactManager::getContactResponse(core::CollisionModel* mo
return replaceVariables(CollisionResponse::getContactResponse(model1, model2));
}

void RuleBasedContactManager::parse ( sofa::core::objectmodel::BaseObjectDescription* arg )
void RuleBasedContactManager::parse ( sofa::core::objectmodel::BaseComponentDescription* arg )
{
const char* v = arg->getAttribute(d_variables.getName().c_str());
if (v)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ class SOFA_COMPONENT_COLLISION_RESPONSE_CONTACT_API RuleBasedContactManager : pu

void createVariableData ( std::string variable );

void parse ( sofa::core::objectmodel::BaseObjectDescription* arg ) override;
void parse ( sofa::core::objectmodel::BaseComponentDescription* arg ) override;

protected:
RuleBasedContactManager();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ class Distances : public core::DataEngine
/// if they are compatible with the input and output model types of this
/// mapping.
template<class T>
static bool canCreate ( T*& obj, core::objectmodel::BaseContext* context, core::objectmodel::BaseObjectDescription* arg )
static bool canCreate ( T*& obj, core::objectmodel::BaseContext* context, core::objectmodel::BaseComponentDescription* arg )
{
bool error = false;
if (arg->findObject(arg->getAttribute("hexaContainerPath", "../..")) == nullptr)
Expand Down Expand Up @@ -158,7 +158,7 @@ class Distances : public core::DataEngine
/// This implementation read the object1 and object2 attributes to
/// find the input and output models of this mapping.
template<class T>
static typename T::SPtr create(T*, core::objectmodel::BaseContext* context, core::objectmodel::BaseObjectDescription* arg )
static typename T::SPtr create(T*, core::objectmodel::BaseContext* context, core::objectmodel::BaseComponentDescription* arg )
{
typename T::SPtr obj = sofa::core::objectmodel::New<T>(
( arg?dynamic_cast<sofa::component::topology::container::dynamic::DynamicSparseGridTopologyContainer*> ( arg->findObject ( arg->getAttribute ( "hexaContainerPath","../.." ) ) ) :nullptr ),
Expand Down
3 changes: 1 addition & 2 deletions Sofa/Component/Engine/Analyze/tests/AverageCoord_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,11 @@ using sofa::testing::BaseSimulationTest;
#include <sofa/component/statecontainer/MechanicalObject.h>
using sofa::component::statecontainer::MechanicalObject ;

#include <sofa/simulation/graph/DAGSimulation.h>
#include <sofa/simulation/Simulation.h>
using sofa::simulation::Simulation ;
using sofa::simulation::Node ;
using sofa::core::objectmodel::New ;
using sofa::core::objectmodel::BaseData ;
using sofa::simulation::graph::DAGSimulation;

#include <sofa/component/engine/analyze/AverageCoord.h>
using sofa::component::engine::analyze::AverageCoord ;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,11 @@ using sofa::testing::BaseSimulationTest;
#include <sofa/component/statecontainer/MechanicalObject.h>
using sofa::component::statecontainer::MechanicalObject ;

#include <sofa/simulation/graph/DAGSimulation.h>
#include <sofa/simulation/Simulation.h>
using sofa::simulation::Simulation ;
using sofa::simulation::Node ;
using sofa::core::objectmodel::New ;
using sofa::core::objectmodel::BaseData ;
using sofa::simulation::graph::DAGSimulation;

#include <sofa/core/visual/VisualParams.h>
using sofa::core::visual::VisualParams;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ class MergeMeshes : public core::DataEngine
~MergeMeshes() override;
public:
/// Parse the given description to assign values to this object's fields and potentially other parameters
void parse ( sofa::core::objectmodel::BaseObjectDescription* arg ) override;
void parse ( sofa::core::objectmodel::BaseComponentDescription* arg ) override;

/// Assign the field values stored in the given map of name -> value pairs
void parseFields ( const std::map<std::string,std::string*>& str ) override;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ void MergeMeshes<DataTypes>::createInputMeshesData(int nb)

/// Parse the given description to assign values to this object's fields and potentially other parameters
template <class DataTypes>
void MergeMeshes<DataTypes>::parse ( sofa::core::objectmodel::BaseObjectDescription* arg )
void MergeMeshes<DataTypes>::parse ( sofa::core::objectmodel::BaseComponentDescription* arg )
{
const char* p = arg->getAttribute(f_nbMeshes.getName().c_str());
if (p)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ class MergeVectors : public core::DataEngine

public:
/// Parse the given description to assign values to this object's fields and potentially other parameters
void parse( sofa::core::objectmodel::BaseObjectDescription* arg ) override;
void parse( sofa::core::objectmodel::BaseComponentDescription* arg ) override;

/// Assign the field values stored in the given map of name -> value pairs
void parseFields( const std::map<std::string,std::string*>& str ) override;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ MergeVectors<VecT>::~MergeVectors()
}

template <class VecT>
void MergeVectors<VecT>::parse( sofa::core::objectmodel::BaseObjectDescription* arg )
void MergeVectors<VecT>::parse( sofa::core::objectmodel::BaseComponentDescription* arg )
{
vf_inputs.parseSizeData(arg, f_nbInputs);
Inherit1::parse(arg);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ class VolumeFromTetrahedrons : public sofa::core::DataEngine
////////////////////////// Inherited from BaseObject ///////////////////
void init() override;
void reinit() override;
void parse(core::objectmodel::BaseObjectDescription* arg) override;
void parse(core::objectmodel::BaseComponentDescription* arg) override;
////////////////////////////////////////////////////////////////////////

////////////////////////// Inherited from DataEngine////////////////////
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ VolumeFromTetrahedrons<DataTypes>::VolumeFromTetrahedrons()
}

template <class DataTypes>
void VolumeFromTetrahedrons<DataTypes>::parse(core::objectmodel::BaseObjectDescription* arg)
void VolumeFromTetrahedrons<DataTypes>::parse(core::objectmodel::BaseComponentDescription* arg)
{
Inherit1::parse(arg);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ class VolumeFromTriangles : public sofa::core::DataEngine
////////////////////////// Inherited from BaseObject ///////////////////
void init() override;
void reinit() override;
void parse(core::objectmodel::BaseObjectDescription* arg) override;
void parse(core::objectmodel::BaseComponentDescription* arg) override;

////////////////////////////////////////////////////////////////////////

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ VolumeFromTriangles<DataTypes>::~VolumeFromTriangles()
}

template <class DataTypes>
void VolumeFromTriangles<DataTypes>::parse(core::objectmodel::BaseObjectDescription* arg)
void VolumeFromTriangles<DataTypes>::parse(core::objectmodel::BaseComponentDescription* arg)
{
Inherit1::parse(arg);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,11 @@ using sofa::testing::BaseSimulationTest;

#include <sofa/helper/BackTrace.h>

#include <sofa/simulation/graph/DAGSimulation.h>
#include <sofa/simulation/Simulation.h>
using sofa::simulation::Simulation ;
using sofa::simulation::Node ;
using sofa::core::objectmodel::New ;
using sofa::core::objectmodel::BaseData ;
using sofa::simulation::graph::DAGSimulation;

#include <sofa/component/engine/generate/ExtrudeEdgesAndGenerateQuads.h>
using sofa::component::engine::generate::ExtrudeEdgesAndGenerateQuads ;
Expand Down
3 changes: 1 addition & 2 deletions Sofa/Component/Engine/Generate/tests/MergePoints_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@
#include <sofa/testing/BaseSimulationTest.h>
using sofa::testing::BaseSimulationTest;

#include <sofa/simulation/graph/DAGSimulation.h>
using sofa::simulation::graph::DAGSimulation;
#include <sofa/simulation/Simulation.h>
using sofa::simulation::Simulation ;
using sofa::core::objectmodel::New ;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ namespace sofa::component::engine::select::boxroi
/// It is then import into sofa::component::engine::BoxROI to not break the
/// API.

using core::objectmodel::BaseObjectDescription ;
using core::objectmodel::BaseComponentDescription ;
using sofa::core::behavior::MechanicalState ;
using core::topology::BaseMeshTopology ;
using core::behavior::MechanicalState ;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ class ComplementaryROI : public core::DataEngine
void doUpdate() override;

/// Parse the given description to assign values to this object's fields and potentially other parameters
void parse ( sofa::core::objectmodel::BaseObjectDescription* arg ) override;
void parse ( sofa::core::objectmodel::BaseComponentDescription* arg ) override;

/// Assign the field values stored in the given map of name -> value pairs
void parseFields ( const std::map<std::string,std::string*>& str ) override;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ namespace sofa::component::engine::select
using std::string;
using std::set;
using std::map;
using sofa::core::objectmodel::BaseObjectDescription;
using sofa::core::objectmodel::BaseComponentDescription;

using helper::ReadAccessor;
using helper::WriteAccessor;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ void MergeROIs::reinit()
update();
}

void MergeROIs::parse ( core::objectmodel::BaseObjectDescription* arg )
void MergeROIs::parse ( core::objectmodel::BaseComponentDescription* arg )
{
f_indices.parseSizeData(arg, d_nbROIs);
Inherit1::parse(arg);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ class SOFA_COMPONENT_ENGINE_SELECT_API MergeROIs : public sofa::core::DataEngine
void reinit() override;

/// Parse the given description to assign values to this object's fields and potentially other parameters
void parse ( core::objectmodel::BaseObjectDescription* arg ) override;
void parse ( core::objectmodel::BaseComponentDescription* arg ) override;

/// Assign the field values stored in the given map of name -> value pairs
void parseFields ( const std::map<std::string,std::string*>& str ) override;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ class MeshSplittingEngine : public core::DataEngine
void reinit() override { resizeData(); update(); }

/// Parse the given description to assign values to this object's fields and potentially other parameters
void parse ( sofa::core::objectmodel::BaseObjectDescription* arg ) override
void parse ( sofa::core::objectmodel::BaseComponentDescription* arg ) override
{
const char* p = arg->getAttribute(nbInputs.getName().c_str());
if (p) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ class PairBoxROI : public core::DataEngine
/// Pre-construction check method called by ObjectFactory.
/// Check that DataTypes matches the MechanicalState.
template<class T>
static bool canCreate(T*& obj, core::objectmodel::BaseContext* context, core::objectmodel::BaseObjectDescription* arg)
static bool canCreate(T*& obj, core::objectmodel::BaseContext* context, core::objectmodel::BaseComponentDescription* arg)
{
if (!arg->getAttribute("template"))
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ class PlaneROI : public core::DataEngine
/// Pre-construction check method called by ObjectFactory.
/// Check that DataTypes matches the MechanicalState.
template<class T>
static bool canCreate(T*& obj, core::objectmodel::BaseContext* context, core::objectmodel::BaseObjectDescription* arg)
static bool canCreate(T*& obj, core::objectmodel::BaseContext* context, core::objectmodel::BaseComponentDescription* arg)
{
if (!arg->getAttribute("template"))
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ class ProximityROI : public core::DataEngine
/// Pre-construction check method called by ObjectFactory.
/// Check that DataTypes matches the MechanicalState.
template<class T>
static bool canCreate(T*& obj, core::objectmodel::BaseContext* context, core::objectmodel::BaseObjectDescription* arg)
static bool canCreate(T*& obj, core::objectmodel::BaseContext* context, core::objectmodel::BaseComponentDescription* arg)
{
if (!arg->getAttribute("template"))
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ class SelectConnectedLabelsROI : public sofa::core::DataEngine


/// Parse the given description to assign values to this object's fields and potentially other parameters
void parse ( sofa::core::objectmodel::BaseObjectDescription* arg ) override
void parse ( sofa::core::objectmodel::BaseComponentDescription* arg ) override
{
d_labels.parseSizeData(arg, d_nbLabels);
Inherit1::parse(arg);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ class SubsetTopology : public core::DataEngine
/// Pre-construction check method called by ObjectFactory.
/// Check that DataTypes matches the MechanicalState.
template<class T>
static bool canCreate(T*& obj, core::objectmodel::BaseContext* context, core::objectmodel::BaseObjectDescription* arg)
static bool canCreate(T*& obj, core::objectmodel::BaseContext* context, core::objectmodel::BaseComponentDescription* arg)
{
if (!arg->getAttribute("template"))
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ class ValuesFromPositions : public core::DataEngine
/// Pre-construction check method called by ObjectFactory.
/// Check that DataTypes matches the MechanicalState.
template<class T>
static bool canCreate(T*& obj, core::objectmodel::BaseContext* context, core::objectmodel::BaseObjectDescription* arg)
static bool canCreate(T*& obj, core::objectmodel::BaseContext* context, core::objectmodel::BaseComponentDescription* arg)
{
if (!arg->getAttribute("template"))
{
Expand Down
3 changes: 1 addition & 2 deletions Sofa/Component/Engine/Select/tests/BoxROI_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,8 @@ using sofa::core::objectmodel::ComponentState;
#include <sofa/component/engine/select/BoxROI.inl>
using sofa::component::engine::select::BoxROI;

#include <sofa/simulation/graph/DAGSimulation.h>
#include <sofa/simulation/Simulation.h>
using sofa::simulation::Simulation;
using sofa::simulation::graph::DAGSimulation;
#include <sofa/simulation/Node.h>
using sofa::simulation::Node;
using sofa::core::objectmodel::BaseComponent;
Expand Down
Loading
Loading