Resolving merge conflicts

3MFConsortium · Oct 21, 2024 · e9881fc · e9881fc
1 parent 1f46378
commit e9881fc
Show file tree

Hide file tree

Showing 18 changed files with 19 additions and 110 deletions.
diff --git a/Autogenerated/Bindings/C/lib3mf_types.h b/Autogenerated/Bindings/C/lib3mf_types.h
@@ -86,7 +86,7 @@ typedef void * Lib3MF_pvoid;
 #define LIB3MF_VERSION_MAJOR 2
 #define LIB3MF_VERSION_MINOR 4
 #define LIB3MF_VERSION_MICRO 0
-#define LIB3MF_VERSION_PRERELEASEINFO "implicit"
+#define LIB3MF_VERSION_PRERELEASEINFO ""
 #define LIB3MF_VERSION_BUILDINFO ""
 
 /*************************************************************************************************************************

diff --git a/Autogenerated/Bindings/CDynamic/lib3mf_types.h b/Autogenerated/Bindings/CDynamic/lib3mf_types.h
@@ -86,7 +86,7 @@ typedef void * Lib3MF_pvoid;
 #define LIB3MF_VERSION_MAJOR 2
 #define LIB3MF_VERSION_MINOR 4
 #define LIB3MF_VERSION_MICRO 0
-#define LIB3MF_VERSION_PRERELEASEINFO "implicit"
+#define LIB3MF_VERSION_PRERELEASEINFO ""
 #define LIB3MF_VERSION_BUILDINFO ""
 
 /*************************************************************************************************************************

diff --git a/Autogenerated/Bindings/Cpp/lib3mf_types.hpp b/Autogenerated/Bindings/Cpp/lib3mf_types.hpp
@@ -85,7 +85,7 @@ typedef void * Lib3MF_pvoid;
 #define LIB3MF_VERSION_MAJOR 2
 #define LIB3MF_VERSION_MINOR 4
 #define LIB3MF_VERSION_MICRO 0
-#define LIB3MF_VERSION_PRERELEASEINFO "implicit"
+#define LIB3MF_VERSION_PRERELEASEINFO ""
 #define LIB3MF_VERSION_BUILDINFO ""
 
 /*************************************************************************************************************************

diff --git a/Autogenerated/Bindings/CppDynamic/lib3mf_types.hpp b/Autogenerated/Bindings/CppDynamic/lib3mf_types.hpp
@@ -85,7 +85,7 @@ typedef void * Lib3MF_pvoid;
 #define LIB3MF_VERSION_MAJOR 2
 #define LIB3MF_VERSION_MINOR 4
 #define LIB3MF_VERSION_MICRO 0
-#define LIB3MF_VERSION_PRERELEASEINFO "implicit"
+#define LIB3MF_VERSION_PRERELEASEINFO ""
 #define LIB3MF_VERSION_BUILDINFO ""
 
 /*************************************************************************************************************************

diff --git a/Autogenerated/Bindings/Go/lib3mf_types.h b/Autogenerated/Bindings/Go/lib3mf_types.h
@@ -86,7 +86,7 @@ typedef void * Lib3MF_pvoid;
 #define LIB3MF_VERSION_MAJOR 2
 #define LIB3MF_VERSION_MINOR 4
 #define LIB3MF_VERSION_MICRO 0
-#define LIB3MF_VERSION_PRERELEASEINFO "implicit"
+#define LIB3MF_VERSION_PRERELEASEINFO ""
 #define LIB3MF_VERSION_BUILDINFO ""
 
 /*************************************************************************************************************************

diff --git a/Autogenerated/Bindings/NodeJS/lib3mf_types.h b/Autogenerated/Bindings/NodeJS/lib3mf_types.h
@@ -86,7 +86,7 @@ typedef void * Lib3MF_pvoid;
 #define LIB3MF_VERSION_MAJOR 2
 #define LIB3MF_VERSION_MINOR 4
 #define LIB3MF_VERSION_MICRO 0
-#define LIB3MF_VERSION_PRERELEASEINFO "implicit"
+#define LIB3MF_VERSION_PRERELEASEINFO ""
 #define LIB3MF_VERSION_BUILDINFO ""
 
 /*************************************************************************************************************************

diff --git a/Autogenerated/Bindings/Pascal/Unit_Lib3MF.pas b/Autogenerated/Bindings/Pascal/Unit_Lib3MF.pas
@@ -56,7 +56,7 @@ interface
 	LIB3MF_VERSION_MAJOR = 2;
 	LIB3MF_VERSION_MINOR = 4;
 	LIB3MF_VERSION_MICRO = 0;
-	LIB3MF_VERSION_PRERELEASEINFO = 'implicit';
+	LIB3MF_VERSION_PRERELEASEINFO = '';
 	LIB3MF_VERSION_BUILDINFO = '';
 
 

diff --git a/Autogenerated/Source/lib3mf_abi.hpp b/Autogenerated/Source/lib3mf_abi.hpp
@@ -6226,16 +6226,6 @@ LIB3MF_DECLSPEC Lib3MFResult lib3mf_model_addfunctionfromimage3d(Lib3MF_Model pM
 */
 LIB3MF_DECLSPEC Lib3MFResult lib3mf_model_addvolumedata(Lib3MF_Model pModel, Lib3MF_VolumeData * pVolumeDataInstance);
 
-/**
-* finds a volume data object by its UniqueResourceID
-*
-* @param[in] pModel - Model instance.
-* @param[in] nUniqueResourceID - UniqueResourceID
-* @param[out] pVolumeDataInstance - returns the volume data instance
-* @return error code or 0 (success)
-*/
-LIB3MF_DECLSPEC Lib3MFResult lib3mf_model_getvolumedatabyid(Lib3MF_Model pModel, Lib3MF_uint32 nUniqueResourceID, Lib3MF_VolumeData * pVolumeDataInstance);
-
 /**
 * adds an empty boundary shape object to the model.
 *

diff --git a/Autogenerated/Source/lib3mf_interfaces.hpp b/Autogenerated/Source/lib3mf_interfaces.hpp
@@ -6534,13 +6534,6 @@ class IModel : public virtual IBase {
 	*/
 	virtual IVolumeData * AddVolumeData() = 0;
 
-	/**
-	* IModel::GetVolumeDataByID - finds a volume data object by its UniqueResourceID
-	* @param[in] nUniqueResourceID - UniqueResourceID
-	* @return returns the volume data instance
-	*/
-	virtual IVolumeData * GetVolumeDataByID(const Lib3MF_uint32 nUniqueResourceID) = 0;
-
 	/**
 	* IModel::AddLevelSet - adds an empty boundary shape object to the model.
 	* @return  returns the mesh object instance

diff --git a/Autogenerated/Source/lib3mf_interfacewrapper.cpp b/Autogenerated/Source/lib3mf_interfacewrapper.cpp
@@ -22535,43 +22535,6 @@ Lib3MFResult lib3mf_model_addvolumedata(Lib3MF_Model pModel, Lib3MF_VolumeData *
 	}
 }
 
-Lib3MFResult lib3mf_model_getvolumedatabyid(Lib3MF_Model pModel, Lib3MF_uint32 nUniqueResourceID, Lib3MF_VolumeData * pVolumeDataInstance)
-{
-	IBase* pIBaseClass = (IBase *)pModel;
-
-	PLib3MFInterfaceJournalEntry pJournalEntry;
-	try {
-		if (m_GlobalJournal.get() != nullptr)  {
-			pJournalEntry = m_GlobalJournal->beginClassMethod(pModel, "Model", "GetVolumeDataByID");
-			pJournalEntry->addUInt32Parameter("UniqueResourceID", nUniqueResourceID);
-		}
-		if (pVolumeDataInstance == nullptr)
-			throw ELib3MFInterfaceException (LIB3MF_ERROR_INVALIDPARAM);
-		IBase* pBaseVolumeDataInstance(nullptr);
-		IModel* pIModel = dynamic_cast<IModel*>(pIBaseClass);
-		if (!pIModel)
-			throw ELib3MFInterfaceException(LIB3MF_ERROR_INVALIDCAST);
-
-		pBaseVolumeDataInstance = pIModel->GetVolumeDataByID(nUniqueResourceID);
-
-		*pVolumeDataInstance = (IBase*)(pBaseVolumeDataInstance);
-		if (pJournalEntry.get() != nullptr) {
-			pJournalEntry->addHandleResult("VolumeDataInstance", *pVolumeDataInstance);
-			pJournalEntry->writeSuccess();
-		}
-		return LIB3MF_SUCCESS;
-	}
-	catch (ELib3MFInterfaceException & Exception) {
-		return handleLib3MFException(pIBaseClass, Exception, pJournalEntry.get());
-	}
-	catch (std::exception & StdException) {
-		return handleStdException(pIBaseClass, StdException, pJournalEntry.get());
-	}
-	catch (...) {
-		return handleUnhandledException(pIBaseClass, pJournalEntry.get());
-	}
-}
-
 Lib3MFResult lib3mf_model_addlevelset(Lib3MF_Model pModel, Lib3MF_LevelSet * pLevelSetInstance)
 {
 	IBase* pIBaseClass = (IBase *)pModel;
@@ -23856,8 +23819,6 @@ Lib3MFResult Lib3MF::Impl::Lib3MF_GetProcAddress (const char * pProcName, void *
 		*ppProcAddress = (void*) &lib3mf_model_addfunctionfromimage3d;
 	if (sProcName == "lib3mf_model_addvolumedata") 
 		*ppProcAddress = (void*) &lib3mf_model_addvolumedata;
-	if (sProcName == "lib3mf_model_getvolumedatabyid") 
-		*ppProcAddress = (void*) &lib3mf_model_getvolumedatabyid;
 	if (sProcName == "lib3mf_model_addlevelset") 
 		*ppProcAddress = (void*) &lib3mf_model_addlevelset;
 	if (sProcName == "lib3mf_model_getlevelsets") 

diff --git a/AutomaticComponentToolkit/lib3mf.xml b/AutomaticComponentToolkit/lib3mf.xml
@@ -4121,14 +4121,7 @@
 			<param name="VolumeDataInstance" type="handle" class="VolumeData" pass="return"
 				description="returns the new volume data instance." />
 		</method>
-
-		<method name="GetVolumeDataByID"
-			description="finds a volume data object by its UniqueResourceID">
-			<param name="UniqueResourceID" type="uint32" pass="in" description="UniqueResourceID" />
-			<param name="VolumeDataInstance" type="handle" class="VolumeData" pass="return"
-				description="returns the volume data instance" />
-		</method>
-
+
 		<method name="AddLevelSet" description="adds an empty boundary shape object to the model.">
 			<param name="LevelSetInstance" type="handle" class="LevelSet" pass="return"
 				description=" returns the mesh object instance" />

diff --git a/Source/Common/NMR_StringUtils.cpp b/Source/Common/NMR_StringUtils.cpp
@@ -151,7 +151,7 @@ namespace NMR {
 
 	nfDouble fnStringToDouble(_In_z_ const nfChar * pszValue)
 	{
-		__NMRASSERT(pszValue);
+		__NMRASSERT(pwszValue);
 		nfDouble dResult = 0.0;
 
 		//skip leading whitespaces
@@ -174,18 +174,7 @@ namespace NMR {
 		}
 		if ((dResult == HUGE_VAL) || (dResult == -HUGE_VAL))
 			throw CNMRException(NMR_ERROR_STRINGTODOUBLECONVERSIONOUTOFRANGE);
-#else
-		// Convert to double and make a input and range check!
-		std::from_chars_result result = std::from_chars(pszValue, pszValue + strlen(pszValue), dResult, std::chars_format::general);
 
-		// Check if any conversion happened
-		if (result.ec == std::errc::invalid_argument || result.ec == std::errc::result_out_of_range)
-			throw CNMRException(NMR_ERROR_EMPTYSTRINGTODOUBLECONVERSION);
-
-		if ((*result.ptr != '\0') && (*result.ptr != ' '))
-			throw CNMRException(NMR_ERROR_INVALIDSTRINGTODOUBLECONVERSION);
-
-#endif
 		return dResult;
 	}
 

diff --git a/Source/Model/Classes/NMR_Model.cpp b/Source/Model/Classes/NMR_Model.cpp
@@ -429,7 +429,6 @@ namespace NMR {
 		return newResourceID;
 	}
 
-    void CModel::updateUniqueResourceID(UniqueResourceID nOldID, UniqueResourceID nNewID)
     void CModel::updateUniqueResourceID(UniqueResourceID nOldID, UniqueResourceID nNewID)
 	{
 		if (m_ResourceMap.find(nNewID) != m_ResourceMap.end()) {

diff --git a/Tests/CPP_Bindings/Source/Reader.cpp b/Tests/CPP_Bindings/Source/Reader.cpp
@@ -33,6 +33,8 @@ UnitTest_Reader.cpp: Defines Unittests for the Reader classes
 #include "UnitTest_Utilities.h"
 #include "lib3mf_implicit.hpp"
 
+#include <algorithm>
+
 namespace Lib3MF
 {
 	class Reader : public Lib3MFTest {
@@ -66,18 +68,9 @@ namespace Lib3MF
         ASSERT_NO_THROW(model->AddMeshObject());
         ASSERT_NO_THROW(model->AddMeshObject());
         ASSERT_NO_THROW(model->AddMeshObject());
-        std::vector<Lib3MF_uint32> resourceIDs;
-        std::vector<Lib3MF_uint32> modelResourceIDs;
-        std::vector<Lib3MF_uint32> expectedModelResourceIDs({2,3,5,6,7});
-        std::vector<Lib3MF_uint32> expectedResourceIDs({2,3,4,5,6});
+
         auto objectIterator = model->GetObjects();
-        while (objectIterator->MoveNext()) {
-            auto object = objectIterator->GetCurrentObject();
-            modelResourceIDs.push_back(object->GetModelResourceID());
-            resourceIDs.push_back(object->GetResourceID());
-        }
-        ASSERT_EQ(modelResourceIDs, expectedModelResourceIDs);
-        ASSERT_EQ(resourceIDs, expectedResourceIDs);
+		EXPECT_EQ(objectIterator->Count(), 5);
     }
 
     TEST_F(Reader, 3MFReadFromFileAndAddComponents)
@@ -87,18 +80,9 @@ namespace Lib3MF
         ASSERT_NO_THROW(model->AddComponentsObject());
         ASSERT_NO_THROW(model->AddComponentsObject());
         ASSERT_NO_THROW(model->AddComponentsObject());
-        std::vector<Lib3MF_uint32> resourceIDs;
-        std::vector<Lib3MF_uint32> modelResourceIDs;
-        std::vector<Lib3MF_uint32> expectedModelResourceIDs({2,3,4,5,6,7,8,9});
-        std::vector<Lib3MF_uint32> expectedResourceIDs({1,2,3,4,5,6,7,8});
+
         auto objectIterator = model->GetObjects();
-        while (objectIterator->MoveNext()) {
-            auto object = objectIterator->GetCurrentObject();
-            modelResourceIDs.push_back(object->GetModelResourceID());
-            resourceIDs.push_back(object->GetResourceID());
-        }
-        ASSERT_EQ(modelResourceIDs, expectedModelResourceIDs);
-        ASSERT_EQ(resourceIDs, expectedResourceIDs);
+		EXPECT_EQ(objectIterator->Count(), 8);
     }
 
 	TEST_F(Reader, STLReadFromFile)

diff --git a/submodules/AutomaticComponentToolkit b/submodules/AutomaticComponentToolkit
diff --git a/submodules/cpp-base64 b/submodules/cpp-base64
diff --git a/submodules/googletest b/submodules/googletest
diff --git a/submodules/libzip b/submodules/libzip
+0 −48		.github/workflows/build.yml
+0 −3		.gitignore
+22 −0		.travis.yml
+7 −36		Build/build.bat
+8 −19		Build/build.sh
+84 −84		Examples/Injection/Numbers_component/Implementations/Cpp/Interfaces/numbers_abi.hpp
+1 −2		Examples/Injection/Numbers_component/Implementations/Cpp/Interfaces/numbers_interfaceexception.hpp
+2 −2		Examples/Injection/Numbers_component/Implementations/Cpp/Interfaces/numbers_interfaces.hpp
+1 −1		Examples/Injection/Numbers_component/Implementations/Cpp/Interfaces/numbers_types.hpp
+2 −3		Examples/Injection/Numbers_component/Implementations/Cpp/Stub/numbers_base.hpp
+2 −3		Examples/Injection/Numbers_component/Implementations/Cpp/Stub/numbers_variable.hpp
+0 −10		Examples/Primes/LibPrimes_component/Bindings/Java9/build_jar.sh
+0 −69		Examples/Primes/LibPrimes_component/Bindings/Java9/libprimes/Base.java
+0 −78		Examples/Primes/LibPrimes_component/Bindings/Java9/libprimes/Calculator.java
+0 −57		Examples/Primes/LibPrimes_component/Bindings/Java9/libprimes/FactorizationCalculator.java
+0 −80		Examples/Primes/LibPrimes_component/Bindings/Java9/libprimes/LibPrimesException.java
+0 −263		Examples/Primes/LibPrimes_component/Bindings/Java9/libprimes/LibPrimesWrapper.java
+0 −43		Examples/Primes/LibPrimes_component/Bindings/Java9/libprimes/PrimeFactor.java
+0 −52		Examples/Primes/LibPrimes_component/Bindings/Java9/libprimes/SieveCalculator.java
+0 −45		Examples/Primes/LibPrimes_component/Examples/Java9/LibPrimes_Example.java
+0 −29		Examples/Primes/LibPrimes_component/Examples/Java9/build.sh
+1 −46		Examples/Primes/Tutorial.md
+0 −1		Examples/Primes/libPrimes.xml
+3 −4		README.md
+4 −4		Source/actutils.go
+280 −455		Source/automaticcomponenttoolkit.go
+84 −172		Source/buildbindingccpp.go
+11 −17		Source/buildbindingcsharp.go
+862 −704		Source/buildbindinggo.go
+0 −1,510		Source/buildbindingjava.go
+550 −554		Source/buildbindingnode.go
+4 −4		Source/buildbindingpascal.go
+443 −437		Source/buildbindingpython.go
+1,117 −1,331		Source/buildimplementationcpp.go
+92 −102		Source/buildimplementationpascal.go
+370 −510		Source/componentdefinition.go
+131 −137		Source/componentdiff.go
+484 −537		Source/languagec.go
+0 −5		Source/languagewriter.go
+ −		act.arm.linux32
+ −		act.arm.linux64
+ −		act.linux32
+ −		act.linux64
+3 −0		go.mod
+6 −2		Makefile
+11 −11		base64.cpp
+1 −1		base64.h
+23 −1		test.cpp
+0 −43		.github/workflows/gtest-ci.yml
+1 −0		.gitignore
+30 −13		BUILD.bazel
+11 −2		CMakeLists.txt
+4 −4		CONTRIBUTING.md
+1 −0		CONTRIBUTORS
+67 −0		MODULE.bazel
+9 −13		README.md
+48 −13		WORKSPACE
+35 −0		WORKSPACE.bzlmod
+6 −4		ci/linux-presubmit.sh
+2 −1		ci/macos-presubmit.sh
+8 −3		ci/windows-presubmit.bat
+23 −13		docs/advanced.md
+18 −39		docs/faq.md
+38 −3		docs/gmock_cook_book.md
+4 −2		docs/gmock_for_dummies.md
+19 −20		docs/primer.md
+23 −30		docs/quickstart-bazel.md
+10 −3		docs/reference/assertions.md
+1 −2		docs/reference/mocking.md
+25 −4		docs/reference/testing.md
+33 −0		fake_fuchsia_sdk.bzl
+14 −13		googlemock/CMakeLists.txt
+3 −3		googlemock/README.md
+87 −24		googlemock/include/gmock/gmock-actions.h
+5 −4		googlemock/include/gmock/gmock-function-mocker.h
+184 −130		googlemock/include/gmock/gmock-matchers.h
+8 −6		googlemock/include/gmock/gmock-more-actions.h
+4 −6		googlemock/include/gmock/gmock-spec-builders.h
+8 −7		googlemock/include/gmock/gmock.h
+8 −6		googlemock/include/gmock/internal/gmock-internal-utils.h
+5 −4		googlemock/include/gmock/internal/gmock-port.h
+4 −4		googlemock/src/gmock-cardinalities.cc
+3 −2		googlemock/src/gmock-internal-utils.cc
+14 −15		googlemock/src/gmock-matchers.cc
+2 −1		googlemock/src/gmock-spec-builders.cc
+52 −4		googlemock/test/gmock-actions_test.cc
+2 −2		googlemock/test/gmock-function-mocker_test.cc
+27 −27		googlemock/test/gmock-matchers-arithmetic_test.cc
+14 −2		googlemock/test/gmock-matchers-comparisons_test.cc
+29 −11		googlemock/test/gmock-matchers-containers_test.cc
+63 −23		googlemock/test/gmock-matchers-misc_test.cc
+39 −1		googlemock/test/gmock-more-actions_test.cc
+1 −1		googlemock/test/gmock-pp_test.cc
+1 −1		googlemock/test/gmock-spec-builders_test.cc
+9 −0		googlemock/test/gmock_link_test.h
+14 −14		googletest/CMakeLists.txt
+2 −2		googletest/README.md
+4 −0		googletest/cmake/Config.cmake.in
+22 −20		googletest/cmake/internal_utils.cmake
+1 −1		googletest/include/gtest/gtest-assertion-result.h
+4 −4		googletest/include/gtest/gtest-death-test.h
+9 −10		googletest/include/gtest/gtest-message.h
+4 −4		googletest/include/gtest/gtest-param-test.h
+63 −27		googletest/include/gtest/gtest-printers.h
+65 −61		googletest/include/gtest/gtest-typed-test.h
+36 −19		googletest/include/gtest/gtest.h
+25 −26		googletest/include/gtest/internal/gtest-death-test-internal.h
+7 −1		googletest/include/gtest/internal/gtest-filepath.h
+30 −69		googletest/include/gtest/internal/gtest-internal.h
+79 −75		googletest/include/gtest/internal/gtest-param-util.h
+2 −0		googletest/include/gtest/internal/gtest-port-arch.h
+98 −43		googletest/include/gtest/internal/gtest-port.h
+3 −3		googletest/include/gtest/internal/gtest-type-util.h
+19 −17		googletest/src/gtest-death-test.cc
+1 −1		googletest/src/gtest-filepath.cc
+29 −17		googletest/src/gtest-internal-inl.h
+70 −28		googletest/src/gtest-port.cc
+190 −121		googletest/src/gtest.cc
+1 −0		googletest/test/googletest-color-test.py
+41 −37		googletest/test/googletest-death-test-test.cc
+15 −0		googletest/test/googletest-json-output-unittest.py
+4 −1		googletest/test/googletest-options-test.cc
+0 −5		googletest/test/googletest-output-test-golden-lin.txt
+3 −3		googletest/test/googletest-port-test.cc
+16 −0		googletest/test/googletest-printers-test.cc
+52 −44		googletest/test/gtest_environment_test.cc
+23 −41		googletest/test/gtest_help_test.py
+3 −0		googletest/test/gtest_json_test_utils.py
+1 −3		googletest/test/gtest_repeat_test.cc
+68 −27		googletest/test/gtest_unittest.cc
+9 −6		googletest/test/gtest_xml_output_unittest.py
+16 −10		googletest_deps.bzl