Update ACT to include latest Python, Golang bindings patches and changes required for Volumetric extension

AutomaticComponentToolkit/_githash_act.txt

@@ -1 +1 @@
-4237585f405bbebfbaf143ade7033777d1491bda
+06f9086d0c9ec906570076b4b6ed6ed05e2fa976

AutomaticComponentToolkit/go_version.txt

@@ -0,0 +1 @@
+1.23.4

Include/API/lib3mf_absnode.hpp

@@ -1,6 +1,6 @@
 /*++
 
-Copyright (C) 2023 3MF Consortium (Original Author)
+Copyright (C) 2024 3MF Consortium (Original Author)
 
 All rights reserved.
 
@@ -66,7 +66,7 @@ class CAbsNode : public virtual IAbsNode, public virtual COneInputNode {
 	*/
 
 public:
-	CAbsNode(NMR::PModelImplicitNode pImplicitNode);
+
 	/**
 	* Put additional public members here. They will not be visible in the external API.
 	*/

Include/API/lib3mf_accessright.hpp

@@ -1,6 +1,6 @@
 /*++
 
-Copyright (C) 2019 3MF Consortium (Original Author)
+Copyright (C) 2024 3MF Consortium (Original Author)
 
 All rights reserved.
 
@@ -29,46 +29,67 @@ Abstract: This is the class declaration of CAccessRight
 */
 
 
-#ifndef __LIB3MF_DECRYPTRIGHT
-#define __LIB3MF_DECRYPTRIGHT
+#ifndef __LIB3MF_ACCESSRIGHT
+#define __LIB3MF_ACCESSRIGHT
 
 #include "lib3mf_interfaces.hpp"
+
+// Parent classes
 #include "lib3mf_base.hpp"
 #ifdef _MSC_VER
 #pragma warning(push)
 #pragma warning(disable : 4250)
 #endif
 
 // Include custom headers here.
-#include "Model/Classes/NMR_KeyStoreAccessRight.h"
+
+
 namespace Lib3MF {
-	namespace Impl {
+namespace Impl {
+
+
+/*************************************************************************************************************************
+ Class declaration of CAccessRight 
+**************************************************************************************************************************/
+
+class CAccessRight : public virtual IAccessRight, public virtual CBase {
+private:
 
+	/**
+	* Put private members here.
+	*/
 
-		/*************************************************************************************************************************
-		Class declaration of CAccessRight
-		**************************************************************************************************************************/
+protected:
 
-		class CAccessRight : public virtual IAccessRight, public virtual CBase {
-		private:
-			NMR::PKeyStoreAccessRight m_pAccessRight;
-		public:
-			CAccessRight(NMR::PKeyStoreAccessRight ar);
+	/**
+	* Put protected members here.
+	*/
 
-			// Inherited via IAccessRight
-			IConsumer * GetConsumer() override;
+public:
 
-			Lib3MF::eWrappingAlgorithm GetWrappingAlgorithm() override;
+	/**
+	* Put additional public members here. They will not be visible in the external API.
+	*/
 
-			Lib3MF::eMgfAlgorithm GetMgfAlgorithm() override;
 
-			Lib3MF::eDigestMethod GetDigestMethod() override;
+	/**
+	* Public member functions to implement.
+	*/
 
-			// Other access methods
-			NMR::PKeyStoreAccessRight accessRight() const;
+	IConsumer * GetConsumer() override;
 
+	Lib3MF::eWrappingAlgorithm GetWrappingAlgorithm() override;
 
-		};
-	}
-}
+	Lib3MF::eMgfAlgorithm GetMgfAlgorithm() override;
+
+	Lib3MF::eDigestMethod GetDigestMethod() override;
+
+};
+
+} // namespace Impl
+} // namespace Lib3MF
+
+#ifdef _MSC_VER
+#pragma warning(pop)
 #endif
+#endif // __LIB3MF_ACCESSRIGHT

Include/API/lib3mf_additionnode.hpp

@@ -1,6 +1,6 @@
 /*++
 
-Copyright (C) 2023 3MF Consortium (Original Author)
+Copyright (C) 2024 3MF Consortium (Original Author)
 
 All rights reserved.
 
@@ -66,7 +66,7 @@ class CAdditionNode : public virtual IAdditionNode, public virtual CTwoInputNode
 	*/
 
 public:
-	CAdditionNode(NMR::PModelImplicitNode pImplicitNode);
+
 	/**
 	* Put additional public members here. They will not be visible in the external API.
 	*/

Include/API/lib3mf_arccosnode.hpp

@@ -1,6 +1,6 @@
 /*++
 
-Copyright (C) 2023 3MF Consortium (Original Author)
+Copyright (C) 2024 3MF Consortium (Original Author)
 
 All rights reserved.
 
@@ -60,12 +60,12 @@ class CArcCosNode : public virtual IArcCosNode, public virtual COneInputNode {
 	*/
 
 protected:
+
 	/**
 	* Put protected members here.
 	*/
 
 public:
-	CArcCosNode(NMR::PModelImplicitNode pImplicitNode);
 
 	/**
 	* Put additional public members here. They will not be visible in the external API.

Include/API/lib3mf_arcsinnode.hpp

@@ -1,6 +1,6 @@
 /*++
 
-Copyright (C) 2023 3MF Consortium (Original Author)
+Copyright (C) 2024 3MF Consortium (Original Author)
 
 All rights reserved.
 
@@ -60,12 +60,12 @@ class CArcSinNode : public virtual IArcSinNode, public virtual COneInputNode {
 	*/
 
 protected:
+
 	/**
 	* Put protected members here.
 	*/
 
 public:
-	CArcSinNode(NMR::PModelImplicitNode pImplicitNode);
 
 	/**
 	* Put additional public members here. They will not be visible in the external API.

Include/API/lib3mf_arctan2node.hpp

@@ -1,6 +1,6 @@
 /*++
 
-Copyright (C) 2023 3MF Consortium (Original Author)
+Copyright (C) 2024 3MF Consortium (Original Author)
 
 All rights reserved.
 
@@ -66,7 +66,7 @@ class CArcTan2Node : public virtual IArcTan2Node, public virtual CTwoInputNode {
 	*/
 
 public:
-	CArcTan2Node(NMR::PModelImplicitNode pImplicitNode);
+
 	/**
 	* Put additional public members here. They will not be visible in the external API.
 	*/

Include/API/lib3mf_arctannode.hpp

@@ -1,6 +1,6 @@
 /*++
 
-Copyright (C) 2023 3MF Consortium (Original Author)
+Copyright (C) 2024 3MF Consortium (Original Author)
 
 All rights reserved.
 
@@ -66,7 +66,7 @@ class CArcTanNode : public virtual IArcTanNode, public virtual COneInputNode {
 	*/
 
 public:
-	CArcTanNode(NMR::PModelImplicitNode pImplicitNode);
+
 	/**
 	* Put additional public members here. They will not be visible in the external API.
 	*/

Include/API/lib3mf_attachment.hpp

@@ -1,6 +1,6 @@
 /*++
 
-Copyright (C) 2019 3MF Consortium (Original Author)
+Copyright (C) 2024 3MF Consortium (Original Author)
 
 All rights reserved.
 
@@ -33,14 +33,16 @@ Abstract: This is the class declaration of CAttachment
 #define __LIB3MF_ATTACHMENT
 
 #include "lib3mf_interfaces.hpp"
+
+// Parent classes
 #include "lib3mf_base.hpp"
 #ifdef _MSC_VER
 #pragma warning(push)
 #pragma warning(disable : 4250)
 #endif
 
 // Include custom headers here.
-#include "Model/Classes/NMR_ModelAttachment.h"
+
 
 namespace Lib3MF {
 namespace Impl {
@@ -56,7 +58,6 @@ class CAttachment : public virtual IAttachment, public virtual CBase {
 	/**
 	* Put private members here.
 	*/
-	NMR::PModelAttachment m_pModelAttachment;
 
 protected:
 
@@ -69,43 +70,40 @@ class CAttachment : public virtual IAttachment, public virtual CBase {
 	/**
 	* Put additional public members here. They will not be visible in the external API.
 	*/
-	CAttachment(NMR::PModelAttachment pModelAttachment);
+
 
 	/**
 	* Public member functions to implement.
 	*/
 
-	std::string GetPath ();
+	std::string GetPath() override;
 
-	void SetPath (const std::string & sPath);
+	void SetPath(const std::string & sPath) override;
 
-	IPackagePart * PackagePart();
+	IPackagePart * PackagePart() override;
 
-	std::string GetRelationShipType ();
+	std::string GetRelationShipType() override;
 
-	void SetRelationShipType (const std::string & sPath);
+	void SetRelationShipType(const std::string & sPath) override;
 
-	void WriteToFile (const std::string & sFileName);
+	void WriteToFile(const std::string & sFileName) override;
 
-	void ReadFromFile (const std::string & sFileName);
-
-	void ReadFromCallback(const Lib3MF::ReadCallback pTheReadCallback, const Lib3MF_uint64 nStreamSize, const Lib3MF::SeekCallback pTheSeekCallback, const Lib3MF_pvoid pUserData);
+	void ReadFromFile(const std::string & sFileName) override;
 
-	Lib3MF_uint64 GetStreamSize ();
+	void ReadFromCallback(const Lib3MF::ReadCallback pTheReadCallback, const Lib3MF_uint64 nStreamSize, const Lib3MF::SeekCallback pTheSeekCallback, const Lib3MF_pvoid pUserData) override;
 
-	void WriteToBuffer (Lib3MF_uint64 nBufferBufferSize, Lib3MF_uint64* pBufferNeededCount, Lib3MF_uint8 * pBufferBuffer);
+	Lib3MF_uint64 GetStreamSize() override;
 
-	void ReadFromBuffer(const Lib3MF_uint64 nBufferBufferSize, const Lib3MF_uint8 * pBufferBuffer);
+	void WriteToBuffer(Lib3MF_uint64 nBufferBufferSize, Lib3MF_uint64* pBufferNeededCount, Lib3MF_uint8 * pBufferBuffer) override;
 
-	NMR::PModelAttachment getModelAttachment ();
+	void ReadFromBuffer(const Lib3MF_uint64 nBufferBufferSize, const Lib3MF_uint8 * pBufferBuffer) override;
 
 };
 
-}
-}
+} // namespace Impl
+} // namespace Lib3MF
 
 #ifdef _MSC_VER
 #pragma warning(pop)
 #endif
-
 #endif // __LIB3MF_ATTACHMENT

Include/API/lib3mf_base.hpp

@@ -1,6 +1,6 @@
 /*++
 
-Copyright (C) 2019 3MF Consortium (Original Author)
+Copyright (C) 2024 3MF Consortium (Original Author)
 
 All rights reserved.
 
@@ -52,8 +52,8 @@ namespace Impl {
 class CBase : public virtual IBase {
 private:
 
-	std::unique_ptr<std::list<std::string>> m_pErrors;
-	Lib3MF_uint32 m_nReferenceCount = 1;
+	std::unique_ptr<std::string> m_pLastError;
+	uint32_t m_nReferenceCount = 1;
 
 	/**
 	* Put private members here.
@@ -81,9 +81,13 @@ class CBase : public virtual IBase {
 
 	bool DecRefCount() override;
 
+
 	/**
 	* Public member functions to implement.
 	*/
+
+	Lib3MF_uint64 ClassTypeId() override;
+
 };
 
 } // namespace Impl