Skip to content

Commit 5b06333

Browse files
authored
[Core] Improve TopologicalMapping error messages (#5730)
[Core] Improve TopologicalMapping error messages and add validation asserts
1 parent bfa4704 commit 5b06333

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

Sofa/framework/Core/src/sofa/core/topology/TopologicalMapping.cpp

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,16 +94,20 @@ bool TopologicalMapping::checkTopologyInputTypes()
9494
return false;
9595
}
9696

97+
assert(fromModel.get());
98+
assert(toModel.get());
9799

98-
if (fromModel.get()->getTopologyType() != m_inputType)
100+
const ElementType inputTopologyType = fromModel->getTopologyType();
101+
if (inputTopologyType != m_inputType)
99102
{
100-
msg_error() << "The type of the input topology '" << fromModel.getPath() << "' does not correspond to a valid '" << elementTypeToString(m_inputType) << "' topology.";
103+
msg_error() << "The type of the input topology '" << fromModel.getPath() << "' (" << elementTypeToString(inputTopologyType) << ") does not correspond to a valid '" << elementTypeToString(m_inputType) << "' topology.";
101104
return false;
102105
}
103106

104-
if (toModel.get()->getTopologyType() != m_outputType)
107+
const ElementType outputTopologyType = toModel->getTopologyType();
108+
if (outputTopologyType != m_outputType)
105109
{
106-
msg_error() << "The type of the output topology '" << toModel.getPath() << "' does not correspond to a valid '" << elementTypeToString(m_outputType) << "' topology.";
110+
msg_error() << "The type of the output topology '" << toModel.getPath() << "' (" << elementTypeToString(outputTopologyType) << ") does not correspond to a valid '" << elementTypeToString(m_outputType) << "' topology.";
107111
return false;
108112
}
109113

0 commit comments

Comments
 (0)