Fixed merge issues

Author: alexanderoster

AutomaticComponentToolkit/lib3mf.xml

@@ -5130,13 +5130,12 @@
 			description="creates a resource iterator instance with all slice stack resources.">
 			<param name="ResourceIterator" type="handle" class="SliceStackIterator" pass="return"
 				description="returns the iterator instance." />
+		</method>		
+		
 		<method name="GetToolpaths" description="creates a Toolpath instance with all toolpath resources.">
 			<param name="ResourceIterator" type="handle" class="ToolpathIterator" pass="return" description="returns the iterator instance." />
 		</method>		
-		
-		<method name="GetSliceStacks" description="creates a resource iterator instance with all slice stack resources.">
-			<param name="ResourceIterator" type="handle" class="SliceStackIterator" pass="return" description="returns the iterator instance."/>
-		</method>
+
 		<method name="GetImage3Ds"
 			description="creates a resource iterator instance with all image3d resources.">
 			<param name="ResourceIterator" type="handle" class="Image3DIterator" pass="return"
@@ -5233,11 +5232,7 @@
 			<param name="BuildItemInstance" type="handle" class="BuildItem" pass="in"
 				description="Build item to remove." />
 		</method>
-		<method name="GetMetaDataGroup"
-			description="Returns the metadata of the model as MetaDataGroup">
-			<param name="TheMetaDataGroup" type="handle" class="MetaDataGroup" pass="return"
-				description="returns an Instance of the metadatagroup of the model" />
-		</method>
+
 		<method name="AddToolpath" description = "adds an empty Toolpath resource to the model. Bottom Z will be 0 in this case.">
 			<param name="UnitFactor" type="double" pass="in" description="A factor that transforms document units into toolpath units." />
 			<param name="ToolpathInstance" type="handle" class="Toolpath" pass="return" description="The toolpath instance of the created Toolpath." />

Include/Model/Writer/v100/NMR_ModelWriterNode100_Mesh.h

@@ -132,7 +132,7 @@ namespace NMR {
 	public:
 		CModelWriterNode100_Mesh() = delete;
 		CModelWriterNode100_Mesh(_In_ CModelMeshObject * pModelMeshObject, _In_ CXmlWriter * pXMLWriter, _In_ PProgressMonitor pProgressMonitor,
-			_In_ PMeshInformation_PropertyIndexMapping pPropertyIndexMapping, _In_ int nPosAfterDecPoint, _In_ nfBool bWriteMaterialExtension, _In_ nfBool m_bWriteBeamLatticeExtension,
+			_In_ PMeshInformation_PropertyIndexMapping pPropertyIndexMapping, _In_ int nPosAfterDecPoint, _In_ nfBool bWriteMaterialExtension, _In_ nfBool bWriteBeamLatticeExtension,
 			_In_ nfBool bWriteVolumetricExtension, _In_ nfBool bWriteTriangleSetExtension, CChunkedBinaryStreamWriter* pBinaryStreamWriter);
 		virtual void writeToXML();
 	};

Source/Common/NMR_Exception.cpp

@@ -492,7 +492,6 @@ namespace NMR {
 		case NMR_ERROR_KEYSTOREOPCCOULDNOTGETSTREAM: return "Could not get KeyStore stream";
 		case NMR_ERROR_KEYSTOREUNSUPPORTEDALGORITHM: return "The algorithm attribute is unsupported";
 		case NMR_ERROR_KEYSTORETOOMANYELEMENTS: return "Too many elements added to a keystore tree";
-<<<<<<< HEAD
 		case NMR_ERROR_INVALIDMESHBINARYPATH: return "Invalid Mesh Binary Path";
 		case NMR_ERROR_DUPLICATEMESHBINARYPATH: return "Duplicate Mesh Binary Path";
 		case NMR_ERROR_INVALIDBINARYELEMENTID: return "Invalid XML attribute in namespace";
@@ -511,10 +510,7 @@ namespace NMR {
 		case NMR_ERROR_INVALIDTYPEATTRIBUTE: return "Invalid Type Attribute";
 		case NMR_ERROR_MISSINGTYPEATTRIBUTE: return "Missing Type Attribute";
 		case NMR_ERROR_MISSINGCOORDINATE: return "Missing Coordinate";
-		case NMR_ERROR_DATASOURCEISINVALIDATED: return "Data source is invalidated";
-			
-=======
-
+		case NMR_ERROR_DATASOURCEISINVALIDATED: return "Data source is invalidated";			
 		case NMR_ERROR_INVALIDIMAGE3DSIZE: return "Invalid Image3D Size";
 		case NMR_ERROR_TOOMANYCHANNELSELECTORS: return "Too many channel selectors";
 		case NMR_ERROR_TOOMANYVOLUMETRICCHANNELS: return "Too many volumetric channels";
@@ -591,7 +587,6 @@ namespace NMR {
 		case NMR_ERROR_DUPLICATE_BOUNDARY_SHAPE_FALLBACK_VALUE: return "Duplicate attribute fallbackvalue in levelset element";
 		case NMR_ERROR_DUPLICATE_BOUNDARY_SHAPE_VOLUME_ID: return "Duplicate attribute volumeid in levelset element";
 
->>>>>>> develop
 		// XML Parser Error Constants(0x9XXX)
 		case NMR_ERROR_XMLPARSER_INVALIDATTRIBVALUE: return "Invalid XML attribute value";
 		case NMR_ERROR_XMLPARSER_INVALIDPARSERESULT: return "Invalid XML parse result";

Source/Model/Classes/NMR_Model.cpp

@@ -1834,7 +1834,7 @@ namespace NMR {
 
 		throw CNMRException(NMR_ERROR_RESOURCENOTFOUND);
 	}
-}  // namespace NMR
+
 
 	PImportStream CModel::readPathFromPersistentDataSource(_In_ std::string sPath)
 	{
@@ -1863,6 +1863,6 @@ namespace NMR {
 
 	}
 
-}
+}  // namespace NMR
 
 

Source/Model/Writer/v100/NMR_ModelWriterNode100_Mesh.cpp

@@ -50,9 +50,9 @@ This is the class for exporting the 3mf mesh node.
 
 namespace NMR {
 
-	CModelWriterNode100_Mesh::CModelWriterNode100_Mesh(_In_ CModelMeshObject * pModelMeshObject, _In_ CXmlWriter * pXMLWriter, _In_ PProgressMonitor pProgressMonitor,
+	CModelWriterNode100_Mesh::CModelWriterNode100_Mesh(_In_ CModelMeshObject* pModelMeshObject, _In_ CXmlWriter* pXMLWriter, _In_ PProgressMonitor pProgressMonitor,
 		_In_ PMeshInformation_PropertyIndexMapping pPropertyIndexMapping, _In_ int nPosAfterDecPoint, _In_ nfBool bWriteMaterialExtension, _In_ nfBool bWriteBeamLatticeExtension,
-		CChunkedBinaryStreamWriter* pBinaryStreamWriter)
+		_In_ nfBool bWriteVolumetricExtension, _In_ nfBool bWriteTriangleSetExtension, CChunkedBinaryStreamWriter* pBinaryStreamWriter)
 		:CModelWriterNode_ModelBase(pModelMeshObject->getModel(), pXMLWriter, pProgressMonitor), m_nPosAfterDecPoint(nPosAfterDecPoint), m_nPutDoubleFactor((nfInt64)(pow(10, CModelWriterNode100_Mesh::m_nPosAfterDecPoint))),
 		m_pBinaryStreamWriter (pBinaryStreamWriter)
 	{

Source/Model/Writer/v100/NMR_ModelWriterNode100_Model.cpp

@@ -635,7 +635,7 @@ namespace NMR {
 				}
 
 				CModelWriterNode100_Mesh ModelWriter_Mesh(pMeshObject, m_pXMLWriter, m_pProgressMonitor,
-					m_pPropertyIndexMapping, m_nDecimalPrecision, m_bWriteMaterialExtension, m_bWriteBeamLatticeExtension, pMeshBinaryWriter);
+					m_pPropertyIndexMapping, m_nDecimalPrecision, m_bWriteMaterialExtension, m_bWriteBeamLatticeExtension, m_bWriteVolumetricExtension, m_bWriteTriangleSetExtension, pMeshBinaryWriter);
 
 			ModelWriter_Mesh.writeToXML();
 		}
@@ -1077,6 +1077,8 @@ namespace NMR {
 			if (m_bWriteSliceExtension) {
 				writeSliceStacks();
 			}
+			if (m_bWriteToolpaths)
+				writeToolpaths();
 
 			// Create topological order of resources
 			CResourceDependencySorter sorter(m_pModel);
@@ -1099,11 +1101,7 @@ namespace NMR {
 				}
 				writeResource(pResource.get());
 			}
-        }
-			if (m_bWriteToolpaths)
-				writeToolpaths();
-			if (m_bWriteObjects)
-				writeObjects();
+
 		}
 		else {
 			if (m_bWriteSliceExtension) {
@@ -1112,6 +1110,8 @@ namespace NMR {
 			if (m_bWriteObjects) {
 				writeObjects();
 			}
+			if (m_bWriteToolpaths)
+				writeToolpaths();
 		}
 
 		writeFullEndElement();