Fixed toolpath reader issues

3MFConsortium · Oct 28, 2024 · 2d3ae66 · 2d3ae66
1 parent 83ba867
commit 2d3ae66
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/Source/Model/Classes/NMR_ModelToolpathLayerReadData.cpp b/Source/Model/Classes/NMR_ModelToolpathLayerReadData.cpp
@@ -392,7 +392,7 @@ namespace NMR {
 							return true;
 					}
 					return false;
-
+	
 				case NMR::eModelToolpathProfileOverrideFactor::pfFactorG:
 					for (uint32_t nPointIndex = 0; nPointIndex < pSegment->m_nPointCount; nPointIndex++) {
 						auto& point = m_Points.getDataRef(pSegment->m_nStartPoint + nPointIndex);

diff --git a/Source/Model/ToolpathReader/NMR_ToolpathReaderNode_Point.cpp b/Source/Model/ToolpathReader/NMR_ToolpathReaderNode_Point.cpp
@@ -92,6 +92,15 @@ namespace NMR {
 			m_nY = fnStringToInt32(pAttributeValue);
 			m_bHasY = true;
 		}
+		else if (strcmp(pAttributeName, XML_3MF_TOOLPATHATTRIBUTE_SCALEFACTORF) == 0) {
+			m_nFactorF = fnStringToInt32(pAttributeValue);
+		}
+		else if (strcmp(pAttributeName, XML_3MF_TOOLPATHATTRIBUTE_SCALEFACTORG) == 0) {
+			m_nFactorG = fnStringToInt32(pAttributeValue);
+		}
+		else if (strcmp(pAttributeName, XML_3MF_TOOLPATHATTRIBUTE_SCALEFACTORH) == 0) {
+			m_nFactorH = fnStringToInt32(pAttributeValue);
+		}
 		else
 			m_pWarnings->addException(CNMRException(NMR_ERROR_NAMESPACE_INVALID_ATTRIBUTE), mrwInvalidOptionalValue);
 

diff --git a/Source/Model/ToolpathReader/NMR_ToolpathReaderNode_Segment.cpp b/Source/Model/ToolpathReader/NMR_ToolpathReaderNode_Segment.cpp
@@ -112,7 +112,7 @@ namespace NMR {
 				m_nPartID = nValue;
 		}
 
-		if (strcmp(pAttributeName, XML_3MF_TOOLPATHATTRIBUTE_PARTID) == 0) {
+		if (strcmp(pAttributeName, XML_3MF_TOOLPATHATTRIBUTE_OVERRIDEFRACTION) == 0) {
 			if (m_bHasOverrideFraction)
 				throw CNMRException(NMR_ERROR_DUPLICATEOVERRIDEFRACTION);