Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[All] Changed message for scene check #4324

Closed
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
a50701b
Added projective and lagrangian suffix
bakpaul Nov 17, 2023
6502243
Reported changes to Cuda plugin
bakpaul Nov 21, 2023
5252432
Modify rest of the code to avoid warning from compatibility layer
bakpaul Nov 21, 2023
c315181
Add compatibility layer for deprecated header in CUDA
bakpaul Nov 21, 2023
39b00dd
add alias for compatibility layer in scene construction
bakpaul Nov 21, 2023
42fe9f6
Report name modification to all scenes
bakpaul Nov 21, 2023
b9d94ea
Revert Compat modification...
bakpaul Nov 21, 2023
d689871
[LinearAlgera, Core] Fix linking with LTO on MacOS/Clang (#4293)
fredroy Nov 22, 2023
32d6b98
[LinearSolver] Remove CSparse-based linear solvers (#4258)
alxbilger Nov 23, 2023
af57258
[GUI.Qt] Minor single-line cleaning (#4308)
alxbilger Nov 24, 2023
0e7ccbe
[Sofa.GUI.Qt] Add cmake module for QGLViewer (#4290)
olivier-roussel Nov 29, 2023
620bc51
[MultiThreading] Avoid Static Initialization Order Fiasco (#4307)
alxbilger Nov 29, 2023
7f4fdef
[Core] Minor clean of DefaultAnimationLoop (#4314)
bakpaul Nov 29, 2023
c2af338
[LinearSystem] Speedup computation of Jacobian matrices (#4317)
alxbilger Nov 29, 2023
7811db5
[SofaCUDA] FIX compilation SofaCUDA along with SparseGrid with Cuda12…
bakpaul Nov 29, 2023
13e9031
[Common] Add message to make the fetch mechanism less hidden (#4310)
bakpaul Nov 29, 2023
d696114
[Collections] Remove reference to non-existing SofaSimulation (#4320)
fredroy Nov 29, 2023
109e4ee
Remove repeating preffix from projective constraints
bakpaul Nov 29, 2023
e43420d
Moved alias to original header
bakpaul Nov 29, 2023
9a2a1d0
Changed deprecation date
bakpaul Nov 29, 2023
e9dc62a
add component change entry
bakpaul Nov 29, 2023
7bf84de
Changed the message display of sceneCheckUsingAlias when aliased comp…
bakpaul Nov 29, 2023
1384deb
Fix factory
bakpaul Nov 29, 2023
c6628b2
Merge branch 'master' into change_name_changed_message_for_scene_check
bakpaul Nov 30, 2023
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
Prev Previous commit
Next Next commit
Changed the message display of sceneCheckUsingAlias when aliased comp…
…onent is in component change
bakpaul committed Nov 29, 2023
commit 7bf84dee24d6a66224b94390d7db22c4394a33db
211 changes: 108 additions & 103 deletions Sofa/framework/Helper/src/sofa/helper/ComponentChange.cpp
Original file line number Diff line number Diff line change
@@ -32,7 +32,7 @@ const std::map<std::string, Deprecated, std::less<> > deprecatedComponents = {
{"RigidRigidMapping", Deprecated("v23.06", "v23.12", "You can use the component RigidMapping with template='Rigid3,Rigid3' instead.")},
};

const std::map<std::string, ComponentChange, std::less<> > uncreatableComponents = {
const std::map<std::string, ComponentChange, std::less<> > movedComponents = {
// SofaValidation was pluginized in #1302
{"CompareState", Pluginized("v20.06", "SofaValidation")},
{"CompareTopology", Pluginized("v20.06", "SofaValidation")},
@@ -66,107 +66,6 @@ const std::map<std::string, ComponentChange, std::less<> > uncreatableComponents
{ "LMConstraintSolver", Pluginized("v20.12", "LMConstraint") },
{ "LMConstraintDirectSolver", Pluginized("v20.12", "LMConstraint") },

/***********************/
// REMOVED SINCE v23.06

{ "OglGrid", Removed("v22.12", "v23.06")},
{ "OglLineAxis", Removed("v22.12", "v23.06")},

/***********************/
// REMOVED SINCE v22.06

{"PointConstraint", Removed("v21.12", "v22.06")},

/***********************/
// REMOVED SINCE v21.12

{ "LMDNewProximityIntersection", Removed("v21.12", "v21.12") },
{ "LocalMinDistanceFilter", Removed("v21.12", "v21.12") },
{ "LineLocalMinDistanceFilter", Removed("v21.12", "v21.12") },
{ "PointLocalMinDistanceFilter", Removed("v21.12", "v21.12") },
{ "TriangleLocalMinDistanceFilter", Removed("v21.12", "v21.12") },

/***********************/
// REMOVED SINCE v21.06

{"LengthContainer", Removed("v21.06", "v21.06")},
{"PoissonContainer", Removed("v21.06", "v21.06")},
{"RadiusContainer", Removed("v21.06", "v21.06")},
{"StiffnessContainer", Removed("v21.06", "v21.06")},

/***********************/
// REMOVED SINCE v20.12

{ "DynamicSparseGridTopologyAlgorithms", Removed("v20.12", "v20.12") },
{ "HexahedronSetTopologyAlgorithms", Removed("v20.12", "v20.12") },
{ "TetrahedronSetTopologyAlgorithms", Removed("v20.12", "v20.12") },
{ "QuadSetTopologyAlgorithms", Removed("v20.12", "v20.12") },
{ "TriangleSetTopologyAlgorithms", Removed("v20.12", "v20.12") },
{ "EdgeSetTopologyAlgorithms", Removed("v20.12", "v20.12") },
{ "PointSetTopologyAlgorithms", Removed("v20.12", "v20.12") },

/***********************/
// REMOVED SINCE v20.06

{"Euler", Removed("v19.12", "v20.06")},
{"EulerExplicit", Removed("v19.12", "v20.06")},
{"ExplicitEuler", Removed("v19.12", "v20.06")},
{"EulerSolver", Removed("v19.12", "v20.06")},
{"ExplicitEulerSolver", Removed("v19.12", "v20.06")},

{"Capsule", Removed("v19.12", "v20.06")},
{"CapsuleModel", Removed("v19.12", "v20.06")},
{"TCapsuleModel", Removed("v19.12", "v20.06")},

{"Cube", Removed("v19.12", "v20.06")},
{"CubeModel", Removed("v19.12", "v20.06")},

{"CudaPoint", Removed("v19.12", "v20.06")},
{"CudaPointModel", Removed("v19.12", "v20.06")},

{"Cylinder", Removed("v19.12", "v20.06")},
{"CylinderModel", Removed("v19.12", "v20.06")},

{"Line", Removed("v19.12", "v20.06")},
{"TLineModel", Removed("v19.12", "v20.06")},
{"LineMeshModel", Removed("v19.12", "v20.06")},
{"LineSetModel", Removed("v19.12", "v20.06")},
{"LineMesh", Removed("v19.12", "v20.06")},
{"LineSet", Removed("v19.12", "v20.06")},
{"LineModel", Removed("v19.12", "v20.06")},

{"OBB", Removed("v19.12", "v20.06")},
{"OBBModel", Removed("v19.12", "v20.06")},
{"TOBBModel", Removed("v19.12", "v20.06")},

{"Point", Removed("v19.12", "v20.06")},
{"TPointModel", Removed("v19.12", "v20.06")},
{"PointModel", Removed("v19.12", "v20.06")},
{"PointMesh", Removed("v19.12", "v20.06")},
{"PointSet", Removed("v19.12", "v20.06")},

{"Ray", Removed("v19.12", "v20.06")},
{"RayModel", Removed("v19.12", "v20.06")},

{"RigidCapsule", Removed("v19.12", "v20.06")},
{"RigidCapsuleModel", Removed("v19.12", "v20.06")},
{"RigidCapsuleCollisionModel", Removed("v19.12", "v20.06")},

{"Sphere", Removed("v19.12", "v20.06")},
{"SphereModel", Removed("v19.12", "v20.06")},
{"TSphereModel", Removed("v19.12", "v20.06")},

{"Tetrahedron", Removed("v19.12", "v20.06")},
{"TetrahedronModel", Removed("v19.12", "v20.06")},

{"Triangle", Removed("v19.12", "v20.06")},
{"TriangleSet", Removed("v19.12", "v20.06")},
{"TriangleMesh", Removed("v19.12", "v20.06")},
{"TriangleSetModel", Removed("v19.12", "v20.06")},
{"TriangleMeshModel", Removed("v19.12", "v20.06")},
{"TriangleModel", Removed("v19.12", "v20.06")},
{"TTriangleModel", Removed("v19.12", "v20.06")},

/***********************/
// MOVED SINCE v21.06
{ "SpatialGridPointModel", Moved("v21.06", "SofaMiscCollision", "SofaSphFluid") },
@@ -721,7 +620,113 @@ const std::map<std::string, ComponentChange, std::less<> > uncreatableComponents

// Moved to CSparseSolvers
{ "SparseCholeskySolver", Moved("v23.12", "Sofa.Component.LinearSolver.Direct", "CSparseSolvers") },
{ "SparseLUSolver", Moved("v23.12", "Sofa.Component.LinearSolver.Direct", "CSparseSolvers") },
{ "SparseLUSolver", Moved("v23.12", "Sofa.Component.LinearSolver.Direct", "CSparseSolvers") }

};

const std::map<std::string, ComponentChange, std::less<> > uncreatableComponents = {

/***********************/
// REMOVED SINCE v23.06

{ "OglGrid", Removed("v22.12", "v23.06")},
{ "OglLineAxis", Removed("v22.12", "v23.06")},

/***********************/
// REMOVED SINCE v22.06

{"PointConstraint", Removed("v21.12", "v22.06")},

/***********************/
// REMOVED SINCE v21.12

{ "LMDNewProximityIntersection", Removed("v21.12", "v21.12") },
{ "LocalMinDistanceFilter", Removed("v21.12", "v21.12") },
{ "LineLocalMinDistanceFilter", Removed("v21.12", "v21.12") },
{ "PointLocalMinDistanceFilter", Removed("v21.12", "v21.12") },
{ "TriangleLocalMinDistanceFilter", Removed("v21.12", "v21.12") },

/***********************/
// REMOVED SINCE v21.06

{"LengthContainer", Removed("v21.06", "v21.06")},
{"PoissonContainer", Removed("v21.06", "v21.06")},
{"RadiusContainer", Removed("v21.06", "v21.06")},
{"StiffnessContainer", Removed("v21.06", "v21.06")},

/***********************/
// REMOVED SINCE v20.12

{ "DynamicSparseGridTopologyAlgorithms", Removed("v20.12", "v20.12") },
{ "HexahedronSetTopologyAlgorithms", Removed("v20.12", "v20.12") },
{ "TetrahedronSetTopologyAlgorithms", Removed("v20.12", "v20.12") },
{ "QuadSetTopologyAlgorithms", Removed("v20.12", "v20.12") },
{ "TriangleSetTopologyAlgorithms", Removed("v20.12", "v20.12") },
{ "EdgeSetTopologyAlgorithms", Removed("v20.12", "v20.12") },
{ "PointSetTopologyAlgorithms", Removed("v20.12", "v20.12") },

/***********************/
// REMOVED SINCE v20.06

{"Euler", Removed("v19.12", "v20.06")},
{"EulerExplicit", Removed("v19.12", "v20.06")},
{"ExplicitEuler", Removed("v19.12", "v20.06")},
{"EulerSolver", Removed("v19.12", "v20.06")},
{"ExplicitEulerSolver", Removed("v19.12", "v20.06")},

{"Capsule", Removed("v19.12", "v20.06")},
{"CapsuleModel", Removed("v19.12", "v20.06")},
{"TCapsuleModel", Removed("v19.12", "v20.06")},

{"Cube", Removed("v19.12", "v20.06")},
{"CubeModel", Removed("v19.12", "v20.06")},

{"CudaPoint", Removed("v19.12", "v20.06")},
{"CudaPointModel", Removed("v19.12", "v20.06")},

{"Cylinder", Removed("v19.12", "v20.06")},
{"CylinderModel", Removed("v19.12", "v20.06")},

{"Line", Removed("v19.12", "v20.06")},
{"TLineModel", Removed("v19.12", "v20.06")},
{"LineMeshModel", Removed("v19.12", "v20.06")},
{"LineSetModel", Removed("v19.12", "v20.06")},
{"LineMesh", Removed("v19.12", "v20.06")},
{"LineSet", Removed("v19.12", "v20.06")},
{"LineModel", Removed("v19.12", "v20.06")},

{"OBB", Removed("v19.12", "v20.06")},
{"OBBModel", Removed("v19.12", "v20.06")},
{"TOBBModel", Removed("v19.12", "v20.06")},

{"Point", Removed("v19.12", "v20.06")},
{"TPointModel", Removed("v19.12", "v20.06")},
{"PointModel", Removed("v19.12", "v20.06")},
{"PointMesh", Removed("v19.12", "v20.06")},
{"PointSet", Removed("v19.12", "v20.06")},

{"Ray", Removed("v19.12", "v20.06")},
{"RayModel", Removed("v19.12", "v20.06")},

{"RigidCapsule", Removed("v19.12", "v20.06")},
{"RigidCapsuleModel", Removed("v19.12", "v20.06")},
{"RigidCapsuleCollisionModel", Removed("v19.12", "v20.06")},

{"Sphere", Removed("v19.12", "v20.06")},
{"SphereModel", Removed("v19.12", "v20.06")},
{"TSphereModel", Removed("v19.12", "v20.06")},

{"Tetrahedron", Removed("v19.12", "v20.06")},
{"TetrahedronModel", Removed("v19.12", "v20.06")},

{"Triangle", Removed("v19.12", "v20.06")},
{"TriangleSet", Removed("v19.12", "v20.06")},
{"TriangleMesh", Removed("v19.12", "v20.06")},
{"TriangleSetModel", Removed("v19.12", "v20.06")},
{"TriangleMeshModel", Removed("v19.12", "v20.06")},
{"TriangleModel", Removed("v19.12", "v20.06")},
{"TTriangleModel", Removed("v19.12", "v20.06")},


// Change Constraint naming #4302
{"AffineMovementConstraint", Renamed("v24.06","v25.06","AffineMovementProjectiveConstraint")},
1 change: 1 addition & 0 deletions Sofa/framework/Helper/src/sofa/helper/ComponentChange.h
Original file line number Diff line number Diff line change
@@ -126,6 +126,7 @@ class SOFA_HELPER_API Renamed : public ComponentChange
};

extern SOFA_HELPER_API const std::map< std::string, Deprecated, std::less<> > deprecatedComponents;
extern SOFA_HELPER_API const std::map< std::string, ComponentChange, std::less<> > movedComponents;
extern SOFA_HELPER_API const std::map< std::string, ComponentChange, std::less<> > uncreatableComponents;

} // namespace sofa::helper::lifecycle
Original file line number Diff line number Diff line change
@@ -91,7 +91,7 @@ void SceneCheckUsingAlias::doPrintSummary()
auto searchAlias = uncreatableComponents.find(unique_alias);
if( searchAlias != uncreatableComponents.end() )
{
usingAliasesWarning << " This alias will be REMOVED at the SOFA release " << searchAlias->second.getVersion() << ", please update your scenes.";
usingAliasesWarning << " " << searchAlias->second.getMessage();
}

if(unique_alias != unique_aliases.back()) usingAliasesWarning << msgendl;