Implemented Profile Modifier

3MFConsortium · Oct 26, 2024 · 051c8b7 · 051c8b7
1 parent c74debb
commit 051c8b7
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 2 deletions.
diff --git a/Include/Common/NMR_ErrorConst.h b/Include/Common/NMR_ErrorConst.h
@@ -1696,4 +1696,7 @@ Toolpath errors (0xBXXX)
 // Invalid profile modifier namespace
 #define NMR_ERROR_INVALIDPROFILEMODIFIERNAMESPACE 0xB02A
 
+// Toolpath profile not created
+#define NMR_ERROR_TOOLPATHPROFILENOTCREATED 0xB02B
+
 #endif // __NMR_ERRORCONST
diff --git a/Include/Model/Reader/Toolpath1905/NMR_ModelReader_Toolpath1905_ToolpathProfile.h b/Include/Model/Reader/Toolpath1905/NMR_ModelReader_Toolpath1905_ToolpathProfile.h
@@ -45,6 +45,7 @@ namespace NMR {
 	private:
 		CModel * m_pModel;
 		CModelToolpath* m_pToolpath;
+		PModelToolpathProfile m_pProfile;
 		PModelWarnings m_pWarnings;
 
 		nfBool m_bHasUUID;

diff --git a/Source/Common/NMR_Exception.cpp b/Source/Common/NMR_Exception.cpp
@@ -592,6 +592,7 @@ namespace NMR {
 		case NMR_ERROR_MISSINGMODIFIERPROFILEDELTA: return "Missing modifier profile delta";
 		case NMR_ERROR_EMPTYMODIFIERPROFILEATTRIBUTE: return "Empty modifier profile attribute";
 		case NMR_ERROR_INVALIDPROFILEMODIFIERNAMESPACE: return "Invalid profile modifier namespace";
+		case NMR_ERROR_TOOLPATHPROFILENOTCREATED: return "Toolpath profile not created";
 
 		default:
 			return "unknown error";

diff --git a/Source/Model/Reader/Toolpath1905/NMR_ModelReader_Toolpath1905_ToolpathProfile.cpp b/Source/Model/Reader/Toolpath1905/NMR_ModelReader_Toolpath1905_ToolpathProfile.cpp
@@ -119,6 +119,11 @@ namespace NMR {
 					m_pModel, m_pWarnings);
 				pXMLNode->parseXML(pXMLReader);
 
+				if (m_pProfile.get() == nullptr)
+					throw CNMRException(NMR_ERROR_TOOLPATHPROFILENOTCREATED);
+
+				pXMLNode->addToProfile(m_pProfile.get(), pXMLReader);
+
 			}
 			else
 				m_pWarnings->addException(CNMRException(NMR_ERROR_NAMESPACE_INVALID_ELEMENT), mrwInvalidOptionalValue);
@@ -134,10 +139,10 @@ namespace NMR {
 		if (!m_bHasName)
 			throw CNMRException(NMR_ERROR_MISSINGNAME);
 
-		auto pProfile = pToolpath->addExistingProfile(m_sUUID, m_sName);
+		m_pProfile = pToolpath->addExistingProfile(m_sUUID, m_sName);
 
 		for (auto iter : m_Parameters) {
-			pProfile->addValue(iter.first.first, iter.first.second, iter.second, true);
+			m_pProfile->addValue(iter.first.first, iter.first.second, iter.second, true);
 		}
 
 	}