From 649c738bdedb5668ca5fb2006d37a0e02e1476f1 Mon Sep 17 00:00:00 2001 From: "Orend, Dr Jan (ORJ)" <56254096+3dJan@users.noreply.github.com> Date: Thu, 19 Oct 2023 16:36:35 +0200 Subject: [PATCH] [Implicit] Initializing port types based on the set node configuration --- Autogenerated/Bindings/C/lib3mf_types.h | 7 +- .../Bindings/CDynamic/lib3mf_types.h | 7 +- Autogenerated/Bindings/CSharp/Lib3MF.cs | 7 +- Autogenerated/Bindings/Cpp/lib3mf_types.hpp | 7 +- .../Bindings/CppDynamic/lib3mf_types.hpp | 7 +- Autogenerated/Bindings/Go/lib3mf.go | 5 - Autogenerated/Bindings/Go/lib3mf_types.h | 7 +- .../Bindings/NodeJS/lib3mf_nodewrapper.cc | 5 - Autogenerated/Bindings/NodeJS/lib3mf_types.h | 7 +- Autogenerated/Bindings/Pascal/Unit_Lib3MF.pas | 17 +- Autogenerated/Bindings/Python/Lib3MF.py | 5 - Autogenerated/Source/lib3mf_types.hpp | 7 +- AutomaticComponentToolkit/lib3mf.xml | 5 - Include/Model/Classes/NMR_ImplicitNodeTypes.h | 2 + .../Model/Classes/NMR_ImplicitNodeTypes.cpp | 250 +++++++++--------- .../Classes/NMR_ModelImplicitFunction.cpp | 2 +- Tests/CPP_Bindings/Source/Volumetric.cpp | 24 +- 17 files changed, 152 insertions(+), 219 deletions(-) diff --git a/Autogenerated/Bindings/C/lib3mf_types.h b/Autogenerated/Bindings/C/lib3mf_types.h index 7e1738f85..b19cbc2cb 100644 --- a/Autogenerated/Bindings/C/lib3mf_types.h +++ b/Autogenerated/Bindings/C/lib3mf_types.h @@ -453,12 +453,7 @@ typedef enum eLib3MFImplicitNodeConfiguration { eImplicitNodeConfigurationDefault = 1, /** Default */ eImplicitNodeConfigurationScalarToScalar = 2, /** Scalar -> Scalar */ eImplicitNodeConfigurationVectorToVector = 3, /** Vector -> Vector */ - eImplicitNodeConfigurationMatrixToMatrix = 4, /** Matrix -> Matrix */ - eImplicitNodeConfigurationScalarScalarToScalar = 5, /** Scalar, Scalar -> Scalar */ - eImplicitNodeConfigurationVectorVectorToVector = 6, /** Vector, Vector -> Vector */ - eImplicitNodeConfigurationScalarToVector = 8, /** Scalar -> Vector */ - eImplicitNodeConfigurationVectorToScalar = 9, /** Vector -> Scalar */ - eImplicitNodeConfigurationVectorVectorToScalar = 10 /** Vector, Vector -> Scalar */ + eImplicitNodeConfigurationMatrixToMatrix = 4 /** Matrix -> Matrix */ } eLib3MFImplicitNodeConfiguration; typedef enum eLib3MFEncryptionAlgorithm { diff --git a/Autogenerated/Bindings/CDynamic/lib3mf_types.h b/Autogenerated/Bindings/CDynamic/lib3mf_types.h index 7e1738f85..b19cbc2cb 100644 --- a/Autogenerated/Bindings/CDynamic/lib3mf_types.h +++ b/Autogenerated/Bindings/CDynamic/lib3mf_types.h @@ -453,12 +453,7 @@ typedef enum eLib3MFImplicitNodeConfiguration { eImplicitNodeConfigurationDefault = 1, /** Default */ eImplicitNodeConfigurationScalarToScalar = 2, /** Scalar -> Scalar */ eImplicitNodeConfigurationVectorToVector = 3, /** Vector -> Vector */ - eImplicitNodeConfigurationMatrixToMatrix = 4, /** Matrix -> Matrix */ - eImplicitNodeConfigurationScalarScalarToScalar = 5, /** Scalar, Scalar -> Scalar */ - eImplicitNodeConfigurationVectorVectorToVector = 6, /** Vector, Vector -> Vector */ - eImplicitNodeConfigurationScalarToVector = 8, /** Scalar -> Vector */ - eImplicitNodeConfigurationVectorToScalar = 9, /** Vector -> Scalar */ - eImplicitNodeConfigurationVectorVectorToScalar = 10 /** Vector, Vector -> Scalar */ + eImplicitNodeConfigurationMatrixToMatrix = 4 /** Matrix -> Matrix */ } eLib3MFImplicitNodeConfiguration; typedef enum eLib3MFEncryptionAlgorithm { diff --git a/Autogenerated/Bindings/CSharp/Lib3MF.cs b/Autogenerated/Bindings/CSharp/Lib3MF.cs index de717f481..a2abaf37a 100644 --- a/Autogenerated/Bindings/CSharp/Lib3MF.cs +++ b/Autogenerated/Bindings/CSharp/Lib3MF.cs @@ -221,12 +221,7 @@ public enum eImplicitNodeConfiguration { Default = 1, ScalarToScalar = 2, VectorToVector = 3, - MatrixToMatrix = 4, - ScalarScalarToScalar = 5, - VectorVectorToVector = 6, - ScalarToVector = 8, - VectorToScalar = 9, - VectorVectorToScalar = 10 + MatrixToMatrix = 4 }; public enum eEncryptionAlgorithm { diff --git a/Autogenerated/Bindings/Cpp/lib3mf_types.hpp b/Autogenerated/Bindings/Cpp/lib3mf_types.hpp index d34084760..d0085adc6 100644 --- a/Autogenerated/Bindings/Cpp/lib3mf_types.hpp +++ b/Autogenerated/Bindings/Cpp/lib3mf_types.hpp @@ -454,12 +454,7 @@ namespace Lib3MF { Default = 1, /** Default */ ScalarToScalar = 2, /** Scalar -> Scalar */ VectorToVector = 3, /** Vector -> Vector */ - MatrixToMatrix = 4, /** Matrix -> Matrix */ - ScalarScalarToScalar = 5, /** Scalar, Scalar -> Scalar */ - VectorVectorToVector = 6, /** Vector, Vector -> Vector */ - ScalarToVector = 8, /** Scalar -> Vector */ - VectorToScalar = 9, /** Vector -> Scalar */ - VectorVectorToScalar = 10 /** Vector, Vector -> Scalar */ + MatrixToMatrix = 4 /** Matrix -> Matrix */ }; enum class eEncryptionAlgorithm : Lib3MF_int32 { diff --git a/Autogenerated/Bindings/CppDynamic/lib3mf_types.hpp b/Autogenerated/Bindings/CppDynamic/lib3mf_types.hpp index d34084760..d0085adc6 100644 --- a/Autogenerated/Bindings/CppDynamic/lib3mf_types.hpp +++ b/Autogenerated/Bindings/CppDynamic/lib3mf_types.hpp @@ -454,12 +454,7 @@ namespace Lib3MF { Default = 1, /** Default */ ScalarToScalar = 2, /** Scalar -> Scalar */ VectorToVector = 3, /** Vector -> Vector */ - MatrixToMatrix = 4, /** Matrix -> Matrix */ - ScalarScalarToScalar = 5, /** Scalar, Scalar -> Scalar */ - VectorVectorToVector = 6, /** Vector, Vector -> Vector */ - ScalarToVector = 8, /** Scalar -> Vector */ - VectorToScalar = 9, /** Vector -> Scalar */ - VectorVectorToScalar = 10 /** Vector, Vector -> Scalar */ + MatrixToMatrix = 4 /** Matrix -> Matrix */ }; enum class eEncryptionAlgorithm : Lib3MF_int32 { diff --git a/Autogenerated/Bindings/Go/lib3mf.go b/Autogenerated/Bindings/Go/lib3mf.go index bf4a818ce..bb13d1124 100644 --- a/Autogenerated/Bindings/Go/lib3mf.go +++ b/Autogenerated/Bindings/Go/lib3mf.go @@ -4622,11 +4622,6 @@ const ( ImplicitNodeConfiguration_ScalarToScalar = 2 ImplicitNodeConfiguration_VectorToVector = 3 ImplicitNodeConfiguration_MatrixToMatrix = 4 - ImplicitNodeConfiguration_ScalarScalarToScalar = 5 - ImplicitNodeConfiguration_VectorVectorToVector = 6 - ImplicitNodeConfiguration_ScalarToVector = 8 - ImplicitNodeConfiguration_VectorToScalar = 9 - ImplicitNodeConfiguration_VectorVectorToScalar = 10 ) // EncryptionAlgorithm represents a Lib3MF enum. diff --git a/Autogenerated/Bindings/Go/lib3mf_types.h b/Autogenerated/Bindings/Go/lib3mf_types.h index 7e1738f85..b19cbc2cb 100644 --- a/Autogenerated/Bindings/Go/lib3mf_types.h +++ b/Autogenerated/Bindings/Go/lib3mf_types.h @@ -453,12 +453,7 @@ typedef enum eLib3MFImplicitNodeConfiguration { eImplicitNodeConfigurationDefault = 1, /** Default */ eImplicitNodeConfigurationScalarToScalar = 2, /** Scalar -> Scalar */ eImplicitNodeConfigurationVectorToVector = 3, /** Vector -> Vector */ - eImplicitNodeConfigurationMatrixToMatrix = 4, /** Matrix -> Matrix */ - eImplicitNodeConfigurationScalarScalarToScalar = 5, /** Scalar, Scalar -> Scalar */ - eImplicitNodeConfigurationVectorVectorToVector = 6, /** Vector, Vector -> Vector */ - eImplicitNodeConfigurationScalarToVector = 8, /** Scalar -> Vector */ - eImplicitNodeConfigurationVectorToScalar = 9, /** Vector -> Scalar */ - eImplicitNodeConfigurationVectorVectorToScalar = 10 /** Vector, Vector -> Scalar */ + eImplicitNodeConfigurationMatrixToMatrix = 4 /** Matrix -> Matrix */ } eLib3MFImplicitNodeConfiguration; typedef enum eLib3MFEncryptionAlgorithm { diff --git a/Autogenerated/Bindings/NodeJS/lib3mf_nodewrapper.cc b/Autogenerated/Bindings/NodeJS/lib3mf_nodewrapper.cc index 4cb9527f7..5c0fc62ec 100644 --- a/Autogenerated/Bindings/NodeJS/lib3mf_nodewrapper.cc +++ b/Autogenerated/Bindings/NodeJS/lib3mf_nodewrapper.cc @@ -16826,11 +16826,6 @@ void CLib3MFWrapper::New(const FunctionCallbackInfo& args) newObject->Set(isolate->GetCurrentContext(), String::NewFromUtf8(isolate, "eImplicitNodeConfiguration_ScalarToScalar"), Integer::New(isolate, 2)); newObject->Set(isolate->GetCurrentContext(), String::NewFromUtf8(isolate, "eImplicitNodeConfiguration_VectorToVector"), Integer::New(isolate, 3)); newObject->Set(isolate->GetCurrentContext(), String::NewFromUtf8(isolate, "eImplicitNodeConfiguration_MatrixToMatrix"), Integer::New(isolate, 4)); - newObject->Set(isolate->GetCurrentContext(), String::NewFromUtf8(isolate, "eImplicitNodeConfiguration_ScalarScalarToScalar"), Integer::New(isolate, 5)); - newObject->Set(isolate->GetCurrentContext(), String::NewFromUtf8(isolate, "eImplicitNodeConfiguration_VectorVectorToVector"), Integer::New(isolate, 6)); - newObject->Set(isolate->GetCurrentContext(), String::NewFromUtf8(isolate, "eImplicitNodeConfiguration_ScalarToVector"), Integer::New(isolate, 8)); - newObject->Set(isolate->GetCurrentContext(), String::NewFromUtf8(isolate, "eImplicitNodeConfiguration_VectorToScalar"), Integer::New(isolate, 9)); - newObject->Set(isolate->GetCurrentContext(), String::NewFromUtf8(isolate, "eImplicitNodeConfiguration_VectorVectorToScalar"), Integer::New(isolate, 10)); newObject->Set(isolate->GetCurrentContext(), String::NewFromUtf8(isolate, "eEncryptionAlgorithm_AES256_GCM"), Integer::New(isolate, 1)); newObject->Set(isolate->GetCurrentContext(), String::NewFromUtf8(isolate, "eWrappingAlgorithm_RSA_OAEP"), Integer::New(isolate, 0)); newObject->Set(isolate->GetCurrentContext(), String::NewFromUtf8(isolate, "eMgfAlgorithm_MGF1_SHA1"), Integer::New(isolate, 160)); diff --git a/Autogenerated/Bindings/NodeJS/lib3mf_types.h b/Autogenerated/Bindings/NodeJS/lib3mf_types.h index 7e1738f85..b19cbc2cb 100644 --- a/Autogenerated/Bindings/NodeJS/lib3mf_types.h +++ b/Autogenerated/Bindings/NodeJS/lib3mf_types.h @@ -453,12 +453,7 @@ typedef enum eLib3MFImplicitNodeConfiguration { eImplicitNodeConfigurationDefault = 1, /** Default */ eImplicitNodeConfigurationScalarToScalar = 2, /** Scalar -> Scalar */ eImplicitNodeConfigurationVectorToVector = 3, /** Vector -> Vector */ - eImplicitNodeConfigurationMatrixToMatrix = 4, /** Matrix -> Matrix */ - eImplicitNodeConfigurationScalarScalarToScalar = 5, /** Scalar, Scalar -> Scalar */ - eImplicitNodeConfigurationVectorVectorToVector = 6, /** Vector, Vector -> Vector */ - eImplicitNodeConfigurationScalarToVector = 8, /** Scalar -> Vector */ - eImplicitNodeConfigurationVectorToScalar = 9, /** Vector -> Scalar */ - eImplicitNodeConfigurationVectorVectorToScalar = 10 /** Vector, Vector -> Scalar */ + eImplicitNodeConfigurationMatrixToMatrix = 4 /** Matrix -> Matrix */ } eLib3MFImplicitNodeConfiguration; typedef enum eLib3MFEncryptionAlgorithm { diff --git a/Autogenerated/Bindings/Pascal/Unit_Lib3MF.pas b/Autogenerated/Bindings/Pascal/Unit_Lib3MF.pas index 8e03c26f3..7a3c3f6e1 100644 --- a/Autogenerated/Bindings/Pascal/Unit_Lib3MF.pas +++ b/Autogenerated/Bindings/Pascal/Unit_Lib3MF.pas @@ -309,12 +309,7 @@ interface eImplicitNodeConfigurationDefault, eImplicitNodeConfigurationScalarToScalar, eImplicitNodeConfigurationVectorToVector, - eImplicitNodeConfigurationMatrixToMatrix, - eImplicitNodeConfigurationScalarScalarToScalar, - eImplicitNodeConfigurationVectorVectorToVector, - eImplicitNodeConfigurationScalarToVector, - eImplicitNodeConfigurationVectorToScalar, - eImplicitNodeConfigurationVectorVectorToScalar + eImplicitNodeConfigurationMatrixToMatrix ); TLib3MFEncryptionAlgorithm = ( @@ -8304,11 +8299,6 @@ implementation eImplicitNodeConfigurationScalarToScalar: Result := 2; eImplicitNodeConfigurationVectorToVector: Result := 3; eImplicitNodeConfigurationMatrixToMatrix: Result := 4; - eImplicitNodeConfigurationScalarScalarToScalar: Result := 5; - eImplicitNodeConfigurationVectorVectorToVector: Result := 6; - eImplicitNodeConfigurationScalarToVector: Result := 8; - eImplicitNodeConfigurationVectorToScalar: Result := 9; - eImplicitNodeConfigurationVectorVectorToScalar: Result := 10; else raise ELib3MFException.CreateCustomMessage(LIB3MF_ERROR_INVALIDPARAM, 'invalid enum value'); end; @@ -8321,11 +8311,6 @@ implementation 2: Result := eImplicitNodeConfigurationScalarToScalar; 3: Result := eImplicitNodeConfigurationVectorToVector; 4: Result := eImplicitNodeConfigurationMatrixToMatrix; - 5: Result := eImplicitNodeConfigurationScalarScalarToScalar; - 6: Result := eImplicitNodeConfigurationVectorVectorToVector; - 8: Result := eImplicitNodeConfigurationScalarToVector; - 9: Result := eImplicitNodeConfigurationVectorToScalar; - 10: Result := eImplicitNodeConfigurationVectorVectorToScalar; else raise ELib3MFException.CreateCustomMessage(LIB3MF_ERROR_INVALIDPARAM, 'invalid enum constant'); end; diff --git a/Autogenerated/Bindings/Python/Lib3MF.py b/Autogenerated/Bindings/Python/Lib3MF.py index 694269257..a74da4859 100644 --- a/Autogenerated/Bindings/Python/Lib3MF.py +++ b/Autogenerated/Bindings/Python/Lib3MF.py @@ -784,11 +784,6 @@ class ImplicitNodeConfiguration(CTypesEnum): ScalarToScalar = 2 VectorToVector = 3 MatrixToMatrix = 4 - ScalarScalarToScalar = 5 - VectorVectorToVector = 6 - ScalarToVector = 8 - VectorToScalar = 9 - VectorVectorToScalar = 10 '''Definition of EncryptionAlgorithm ''' class EncryptionAlgorithm(CTypesEnum): diff --git a/Autogenerated/Source/lib3mf_types.hpp b/Autogenerated/Source/lib3mf_types.hpp index d34084760..d0085adc6 100644 --- a/Autogenerated/Source/lib3mf_types.hpp +++ b/Autogenerated/Source/lib3mf_types.hpp @@ -454,12 +454,7 @@ namespace Lib3MF { Default = 1, /** Default */ ScalarToScalar = 2, /** Scalar -> Scalar */ VectorToVector = 3, /** Vector -> Vector */ - MatrixToMatrix = 4, /** Matrix -> Matrix */ - ScalarScalarToScalar = 5, /** Scalar, Scalar -> Scalar */ - VectorVectorToVector = 6, /** Vector, Vector -> Vector */ - ScalarToVector = 8, /** Scalar -> Vector */ - VectorToScalar = 9, /** Vector -> Scalar */ - VectorVectorToScalar = 10 /** Vector, Vector -> Scalar */ + MatrixToMatrix = 4 /** Matrix -> Matrix */ }; enum class eEncryptionAlgorithm : Lib3MF_int32 { diff --git a/AutomaticComponentToolkit/lib3mf.xml b/AutomaticComponentToolkit/lib3mf.xml index cb6b8735f..e4bfc2a34 100644 --- a/AutomaticComponentToolkit/lib3mf.xml +++ b/AutomaticComponentToolkit/lib3mf.xml @@ -1831,11 +1831,6 @@