Implicit: function -> implicitfunction, for now both element names ar…

…e accepted for reading to migrate existing files
3MFConsortium · Aug 21, 2024 · 92b4cc2 · 92b4cc2
1 parent 6020218
commit 92b4cc2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/Include/Model/Classes/NMR_ModelConstants.h b/Include/Model/Classes/NMR_ModelConstants.h
@@ -258,7 +258,8 @@ These are given by the 3MF Standard
 
 
 // Voumeteric/Implicit
-#define XML_3MF_ELEMENT_IMPLICIT_FUNCTION "function"
+#define XML_3MF_ELEMENT_IMPLICIT_FUNCTION_DEPRECATED "function"
+#define XML_3MF_ELEMENT_IMPLICIT_FUNCTION "implicitfunction"
 
 #define XML_3MF_ATTRIBUTE_IMPLICIT_FUNCTION_ID "id"
 #define XML_3MF_ATTRIBUTE_IMPLICIT_FUNCTION_DISPLAY_NAME "displayname"

diff --git a/Source/Model/Reader/v100/NMR_ModelReaderNode100_Resources.cpp b/Source/Model/Reader/v100/NMR_ModelReaderNode100_Resources.cpp
@@ -152,11 +152,6 @@ namespace NMR {
 					m_pModel, m_pWarnings);
 				pXMLNode->parseXML(pXMLReader);
 			}
-			else if (strcmp(pChildName, XML_3MF_ELEMENT_IMPLICIT_FUNCTION) == 0)
-			{
-				PModelReaderNode_ImplicitFunction pXMLNode = std::make_shared<CModelReaderNode_ImplicitFunction>(m_pModel, m_pWarnings);
-				pXMLNode->parseXML(pXMLReader);
-			}
 			else if (strcmp(pChildName, XML_3MF_ELEMENT_FUNCTION_FROM_IMAGE3D) == 0)
 			{
 				PModelReaderNode pXMLNode = std::make_shared<CModelReaderNode_FunctionFromImage3D>(
@@ -173,7 +168,7 @@ namespace NMR {
 		}
 
 		if (strcmp(pNameSpace, XML_3MF_NAMESPACE_IMPLICITSPEC) == 0) {
-			if (strcmp(pChildName, XML_3MF_ELEMENT_IMPLICIT_FUNCTION) == 0)
+			if ((strcmp(pChildName, XML_3MF_ELEMENT_IMPLICIT_FUNCTION_DEPRECATED) == 0) || (strcmp(pChildName, XML_3MF_ELEMENT_IMPLICIT_FUNCTION) == 0))
 			{
 				PModelReaderNode_ImplicitFunction pXMLNode = std::make_shared<CModelReaderNode_ImplicitFunction>(m_pModel, m_pWarnings);
 				pXMLNode->parseXML(pXMLReader);