NC-2499: Allow slicestacks on components-objects

Which is correct according to the slices-extension

Author: Martin Weismann

CMakeLists.txt

@@ -8,7 +8,7 @@ project (lib3MF)
 
 # Define Version
 set(LIB3MF_VERSION_MAJOR 1)				# increase on every backward-compatibility breaking change of the API
-set(LIB3MF_VERSION_MINOR 2)				# increase on every backward compatible change of the API
+set(LIB3MF_VERSION_MINOR 3)				# increase on every backward compatible change of the API
 set(LIB3MF_VERSION_MICRO 0)				# increase on on every change that does not alter the API
 
 set(CMAKE_INSTALL_BINDIR bin CACHE PATH "directory for installing binary files")

Include/Model/COM/NMR_COMInterface_ModelComponentsObject.h

@@ -84,10 +84,15 @@ namespace NMR {
 		LIB3MFMETHOD(IsComponentsObject) (_Out_ BOOL * pbIsComponentsObject);
 		LIB3MFMETHOD(IsValidObject) (_Out_ BOOL * pbIsValid);
 
+		LIB3MFMETHOD(SetSliceStackId)(_In_ DWORD nSliceStackId);
+		LIB3MFMETHOD(GetSliceStackId)(_Out_ DWORD *pnSliceStackId);
+		LIB3MFMETHOD(SetSlicesMeshResolution)(_In_ eModelSlicesMeshResolution eSlicesMeshResolution);
+		LIB3MFMETHOD(GetSlicesMeshResolution)(_Out_ eModelSlicesMeshResolution *peSlicesMeshResolution);
+
 		LIB3MFMETHOD(CreateDefaultPropertyHandler) (_Outptr_ ILib3MFDefaultPropertyHandler ** ppPropertyHandler);
 		LIB3MFMETHOD(CreateDefaultMultiPropertyHandler) (_In_ DWORD nChannel, _Outptr_ ILib3MFDefaultPropertyHandler ** ppPropertyHandler);
 
-			CCOMModelComponentsObject();
+		CCOMModelComponentsObject();
 
 		void setResource(_In_ PModelResource pModelResource);
 	};

Include/Model/COM/NMR_COMInterface_ModelMeshObject.h

@@ -129,7 +129,6 @@ namespace NMR {
 
 		LIB3MFMETHOD(SetSliceStackId)(_In_ DWORD nSliceStackId);
 		LIB3MFMETHOD(GetSliceStackId)(_Out_ DWORD *pnSliceStackId);
-
 		LIB3MFMETHOD(SetSlicesMeshResolution)(_In_ eModelSlicesMeshResolution eSlicesMeshResolution);
 		LIB3MFMETHOD(GetSlicesMeshResolution)(_Out_ eModelSlicesMeshResolution *peSlicesMeshResolution);
 

Include/Model/COM/NMR_COMInterfaces.h

@@ -816,6 +816,35 @@ namespace NMR {
 		*/
 		LIB3MFMETHOD(IsValidObject) (_Out_ BOOL * pbIsValid) LIB3MFABSTRACT;
 
+		/**
+		* Link the object to a slice stack
+		*
+		* @param[in] nSliceStackId id of the slice stack to link
+		* @return error code or 0 (success)
+		*/
+		LIB3MFMETHOD(SetSliceStackId)(_In_ DWORD nSliceStackId) LIB3MFABSTRACT;
+
+		/**
+		* get the id of the slice stack linked to the object
+		* @param[out] pnSliceStackId id of the slice stack linked to the object
+		* @return error code or 0 (success)
+		*/
+		LIB3MFMETHOD(GetSliceStackId)(_Out_ DWORD *pnSliceStackId) LIB3MFABSTRACT;
+
+		/**
+		* set the meshresolution of the object
+		* @param[in] eSlicesMeshResolution meshresolution of this object
+		* @return error code or 0 (success)
+		*/
+		LIB3MFMETHOD(SetSlicesMeshResolution)(_In_ eModelSlicesMeshResolution eSlicesMeshResolution) LIB3MFABSTRACT;
+
+		/**
+		* get the meshresolution of the object
+		* @param[out] peSlicesMeshResolution meshresolution of this object
+		* @return error code or 0 (success)
+		*/
+		LIB3MFMETHOD(GetSlicesMeshResolution)(_Out_ eModelSlicesMeshResolution *peSlicesMeshResolution) LIB3MFABSTRACT;
+
 		/* Property handling */
 
 		/**
@@ -1953,35 +1982,6 @@ namespace NMR {
 		* @return error code or 0 (success)
 		*/
 		LIB3MFMETHOD(IsManifoldAndOriented) (_Out_ BOOL * pbIsOrientedAndManifold) LIB3MFABSTRACT;
-
-		/**
-		* Link the mesh object to a slice stack
-		*
-		* @param[in] nSliceStackId id of the slice stack to link
-		* @return error code or 0 (success)
-		*/
-		LIB3MFMETHOD(SetSliceStackId)(_In_ DWORD nSliceStackId) LIB3MFABSTRACT;
-
-		/**
-		* get the id of the slice stack linked to the mesh object
-		* @param[out] pnSliceStackId id of the slice stack linked to the mesh object
-		* @return error code or 0 (success)
-		*/
-		LIB3MFMETHOD(GetSliceStackId)(_Out_ DWORD *pnSliceStackId) LIB3MFABSTRACT;
-
-		/**
-		* set the meshresolution of the mesh object
-		* @param[in] eSlicesMeshResolution meshresolution of this mesh object
-		* @return error code or 0 (success)
-		*/
-		LIB3MFMETHOD(SetSlicesMeshResolution)(_In_ eModelSlicesMeshResolution eSlicesMeshResolution) LIB3MFABSTRACT;
-
-		/**
-		* get the meshresolution of the mesh object
-		* @param[out] peSlicesMeshResolution meshresolution of this mesh object
-		* @return error code or 0 (success)
-		*/
-		LIB3MFMETHOD(GetSlicesMeshResolution)(_Out_ eModelSlicesMeshResolution *peSlicesMeshResolution) LIB3MFABSTRACT;
 	};
 
 	/**********************************************************************************************************

Include/Model/COM/NMR_DLLInterfaces.h

@@ -2018,6 +2018,38 @@ namespace NMR {
 		*/
 		LIB3MF_DECLSPEC LIB3MFRESULT lib3mf_componentsobject_getcomponentcount(_In_ PLib3MFModelComponentsObject * pComponentsObject, _Out_ DWORD * pComponentCount);
 
+		/**
+		* Link a slicestack to the components object
+		*
+		* @param[in] pComponentsObject components object to link with the slicestack
+		* @param[in] pSliceStack slice stack to link the meshobject to
+		*/
+		LIB3MF_DECLSPEC LIB3MFRESULT lib3mf_componentsobject_setslicestack(_In_ PLib3MFModelComponentsObject *pComponentsObject, _In_ PLib3MFSliceStack *pSliceStack);
+
+		/**
+		* Get the linked slicestack tof a the components object
+		*
+		* @param[in] pComponentsObject components object to link with the slicestack
+		* @param[out] pSliceStack slice stack to link the meshobject to
+		*/
+		LIB3MF_DECLSPEC LIB3MFRESULT lib3mf_componentsobject_getslicestackid(_In_ PLib3MFModelComponentsObject *pComponentsObject, _Out_ DWORD *pSliceStackId);
+
+		/**
+		* Set the mesh resolution of a components object that has sliceinformation
+		*
+		* @param[in] pComponentsObject components object for which the meshresolution is set
+		* @param[in] eSlicesMeshResolution mesh resolution of the components object
+		*/
+		LIB3MF_DECLSPEC LIB3MFRESULT lib3mf_componentsobject_setslicesmeshresolution(_In_ PLib3MFModelComponentsObject *pComponentsObject, _In_ eModelSlicesMeshResolution eSlicesMeshResolution);
+
+		/**
+		* Get the mesh resolution of a components object that has sliceinformation
+		*
+		* @param[in] pComponentsObject components object for which the meshresolution is queried
+		* @param[out] peSlicesMeshResolution mesh resolution of the components object
+		*/
+		LIB3MF_DECLSPEC LIB3MFRESULT lib3mf_componentsobject_getslicesmeshresolution(_In_ PLib3MFModelComponentsObject *pComponentsObject, _Out_ eModelSlicesMeshResolution *eSlicesMeshResolution);
+
 		// Build Item
 		/**
 		* Retrieves the object resource associated to a build item

Include/Model/Classes/NMR_ModelComponentsObject.h

@@ -48,7 +48,7 @@ namespace NMR {
 	typedef std::shared_ptr <CModel> PModel;
 
 	class CModelComponentsObject : public CModelObject {
-	private:		
+	private:
 		std::vector<PModelComponent> m_Components;
 	public:
 		CModelComponentsObject() = delete;

Include/Model/Classes/NMR_ModelMeshObject.h

@@ -51,10 +51,6 @@ namespace NMR {
 	private:
 		PMesh m_pMesh; 
 		PModelMeshBeamLatticeAttributes m_pBeamLatticeAttributes;
-
-		PPackageResourceID m_pSliceStackId;
-		eModelSlicesMeshResolution m_eSlicesMeshResolution;
-
 	public:
 		CModelMeshObject() = delete;
 		CModelMeshObject(_In_ const ModelResourceID sID, _In_ CModel * pModel);
@@ -79,12 +75,6 @@ namespace NMR {
 		_Ret_notnull_ CModelMeshBeamLatticeAttributes * getBeamLatticeAttributes();
 		void setBeamLatticeAttributes(_In_ PModelMeshBeamLatticeAttributes pBeamLatticeAttributes);
 
-		void setSliceStackId(PPackageResourceID nSliceStackId);
-		PPackageResourceID getSliceStackId();
-
-		void setSlicesMeshResolution(eModelSlicesMeshResolution eMeshResolution);
-		eModelSlicesMeshResolution slicesMeshResolution() const;
-
 		ModelResourceID calculateDefaultPropertyID() const;
 	};
 

Include/Model/Classes/NMR_ModelObject.h

@@ -54,7 +54,8 @@ namespace NMR {
 	private:
 		std::wstring m_sName;
 		std::wstring m_sPartNumber;
-
+		PPackageResourceID m_pSliceStackId;
+		eModelSlicesMeshResolution m_eSlicesMeshResolution;
 	private:
 		PUUID m_UUID;
 		std::wstring m_sThumbnail;
@@ -93,6 +94,12 @@ namespace NMR {
 
 		virtual nfBool isValidForSlices(const NMATRIX3& totalParentMatrix) = 0;
 
+		void setSliceStackId(PPackageResourceID nSliceStackId);
+		PPackageResourceID getSliceStackId();
+
+		void setSlicesMeshResolution(eModelSlicesMeshResolution eMeshResolution);
+		eModelSlicesMeshResolution slicesMeshResolution() const;
+
 		// Set/Get Default Property
 		void setDefaultProperty (_In_ PModelDefaultProperty pModelDefaultProperty);
 		PModelDefaultProperty getDefaultProperty();