diff --git a/Autogenerated/Bindings/C/lib3mf_types.h b/Autogenerated/Bindings/C/lib3mf_types.h index 95ecb060f..696aec4eb 100644 --- a/Autogenerated/Bindings/C/lib3mf_types.h +++ b/Autogenerated/Bindings/C/lib3mf_types.h @@ -388,7 +388,7 @@ typedef enum eLib3MFBeamLatticeClipMode { } eLib3MFBeamLatticeClipMode; typedef enum eLib3MFBeamLatticeBallMode { - eBeamLatticeBallModeNone = 0, + eBeamLatticeBallModeBeamLatticeBallModeNone = 0, eBeamLatticeBallModeMixed = 1, eBeamLatticeBallModeAll = 2 } eLib3MFBeamLatticeBallMode; diff --git a/Autogenerated/Bindings/CDynamic/lib3mf_types.h b/Autogenerated/Bindings/CDynamic/lib3mf_types.h index 95ecb060f..696aec4eb 100644 --- a/Autogenerated/Bindings/CDynamic/lib3mf_types.h +++ b/Autogenerated/Bindings/CDynamic/lib3mf_types.h @@ -388,7 +388,7 @@ typedef enum eLib3MFBeamLatticeClipMode { } eLib3MFBeamLatticeClipMode; typedef enum eLib3MFBeamLatticeBallMode { - eBeamLatticeBallModeNone = 0, + eBeamLatticeBallModeBeamLatticeBallModeNone = 0, eBeamLatticeBallModeMixed = 1, eBeamLatticeBallModeAll = 2 } eLib3MFBeamLatticeBallMode; diff --git a/Autogenerated/Bindings/CSharp/Lib3MF.cs b/Autogenerated/Bindings/CSharp/Lib3MF.cs index b860630f8..7292de8bf 100644 --- a/Autogenerated/Bindings/CSharp/Lib3MF.cs +++ b/Autogenerated/Bindings/CSharp/Lib3MF.cs @@ -101,7 +101,7 @@ public enum eBeamLatticeClipMode { }; public enum eBeamLatticeBallMode { - None = 0, + BeamLatticeBallModeNone = 0, Mixed = 1, All = 2 }; diff --git a/Autogenerated/Bindings/Cpp/lib3mf_types.hpp b/Autogenerated/Bindings/Cpp/lib3mf_types.hpp index 4310047ac..61ecedc56 100644 --- a/Autogenerated/Bindings/Cpp/lib3mf_types.hpp +++ b/Autogenerated/Bindings/Cpp/lib3mf_types.hpp @@ -389,7 +389,7 @@ namespace Lib3MF { }; enum class eBeamLatticeBallMode : Lib3MF_int32 { - None = 0, + BeamLatticeBallModeNone = 0, Mixed = 1, All = 2 }; diff --git a/Autogenerated/Bindings/CppDynamic/lib3mf_types.hpp b/Autogenerated/Bindings/CppDynamic/lib3mf_types.hpp index 4310047ac..61ecedc56 100644 --- a/Autogenerated/Bindings/CppDynamic/lib3mf_types.hpp +++ b/Autogenerated/Bindings/CppDynamic/lib3mf_types.hpp @@ -389,7 +389,7 @@ namespace Lib3MF { }; enum class eBeamLatticeBallMode : Lib3MF_int32 { - None = 0, + BeamLatticeBallModeNone = 0, Mixed = 1, All = 2 }; diff --git a/Autogenerated/Bindings/Go/lib3mf.go b/Autogenerated/Bindings/Go/lib3mf.go index 65f688240..7a8592b92 100644 --- a/Autogenerated/Bindings/Go/lib3mf.go +++ b/Autogenerated/Bindings/Go/lib3mf.go @@ -5593,7 +5593,7 @@ const ( type BeamLatticeBallMode int const ( - BeamLatticeBallMode_None = 0 + BeamLatticeBallMode_BeamLatticeBallModeNone = 0 BeamLatticeBallMode_Mixed = 1 BeamLatticeBallMode_All = 2 ) diff --git a/Autogenerated/Bindings/Go/lib3mf_types.h b/Autogenerated/Bindings/Go/lib3mf_types.h index 95ecb060f..696aec4eb 100644 --- a/Autogenerated/Bindings/Go/lib3mf_types.h +++ b/Autogenerated/Bindings/Go/lib3mf_types.h @@ -388,7 +388,7 @@ typedef enum eLib3MFBeamLatticeClipMode { } eLib3MFBeamLatticeClipMode; typedef enum eLib3MFBeamLatticeBallMode { - eBeamLatticeBallModeNone = 0, + eBeamLatticeBallModeBeamLatticeBallModeNone = 0, eBeamLatticeBallModeMixed = 1, eBeamLatticeBallModeAll = 2 } eLib3MFBeamLatticeBallMode; diff --git a/Autogenerated/Bindings/NodeJS/lib3mf_nodewrapper.cc b/Autogenerated/Bindings/NodeJS/lib3mf_nodewrapper.cc index 8e5051385..2ed51aabd 100644 --- a/Autogenerated/Bindings/NodeJS/lib3mf_nodewrapper.cc +++ b/Autogenerated/Bindings/NodeJS/lib3mf_nodewrapper.cc @@ -23617,7 +23617,7 @@ void CLib3MFWrapper::New(const FunctionCallbackInfo& args) newObject->Set(isolate->GetCurrentContext(), String::NewFromUtf8(isolate, "eBeamLatticeClipMode_NoClipMode"), Integer::New(isolate, 0)); newObject->Set(isolate->GetCurrentContext(), String::NewFromUtf8(isolate, "eBeamLatticeClipMode_Inside"), Integer::New(isolate, 1)); newObject->Set(isolate->GetCurrentContext(), String::NewFromUtf8(isolate, "eBeamLatticeClipMode_Outside"), Integer::New(isolate, 2)); - newObject->Set(isolate->GetCurrentContext(), String::NewFromUtf8(isolate, "eBeamLatticeBallMode_None"), Integer::New(isolate, 0)); + newObject->Set(isolate->GetCurrentContext(), String::NewFromUtf8(isolate, "eBeamLatticeBallMode_BeamLatticeBallModeNone"), Integer::New(isolate, 0)); newObject->Set(isolate->GetCurrentContext(), String::NewFromUtf8(isolate, "eBeamLatticeBallMode_Mixed"), Integer::New(isolate, 1)); newObject->Set(isolate->GetCurrentContext(), String::NewFromUtf8(isolate, "eBeamLatticeBallMode_All"), Integer::New(isolate, 2)); newObject->Set(isolate->GetCurrentContext(), String::NewFromUtf8(isolate, "eProgressIdentifier_QUERYCANCELED"), Integer::New(isolate, 0)); diff --git a/Autogenerated/Bindings/NodeJS/lib3mf_types.h b/Autogenerated/Bindings/NodeJS/lib3mf_types.h index 95ecb060f..696aec4eb 100644 --- a/Autogenerated/Bindings/NodeJS/lib3mf_types.h +++ b/Autogenerated/Bindings/NodeJS/lib3mf_types.h @@ -388,7 +388,7 @@ typedef enum eLib3MFBeamLatticeClipMode { } eLib3MFBeamLatticeClipMode; typedef enum eLib3MFBeamLatticeBallMode { - eBeamLatticeBallModeNone = 0, + eBeamLatticeBallModeBeamLatticeBallModeNone = 0, eBeamLatticeBallModeMixed = 1, eBeamLatticeBallModeAll = 2 } eLib3MFBeamLatticeBallMode; diff --git a/Autogenerated/Bindings/Pascal/Unit_Lib3MF.pas b/Autogenerated/Bindings/Pascal/Unit_Lib3MF.pas index d6d74ee5c..fdb5e2256 100644 --- a/Autogenerated/Bindings/Pascal/Unit_Lib3MF.pas +++ b/Autogenerated/Bindings/Pascal/Unit_Lib3MF.pas @@ -194,7 +194,7 @@ interface ); TLib3MFBeamLatticeBallMode = ( - eBeamLatticeBallModeNone, + eBeamLatticeBallModeBeamLatticeBallModeNone, eBeamLatticeBallModeMixed, eBeamLatticeBallModeAll ); @@ -10622,7 +10622,7 @@ implementation function convertBeamLatticeBallModeToConst(const AValue: TLib3MFBeamLatticeBallMode): Integer; begin case AValue of - eBeamLatticeBallModeNone: Result := 0; + eBeamLatticeBallModeBeamLatticeBallModeNone: Result := 0; eBeamLatticeBallModeMixed: Result := 1; eBeamLatticeBallModeAll: Result := 2; else @@ -10633,7 +10633,7 @@ implementation function convertConstToBeamLatticeBallMode(const AValue: Integer): TLib3MFBeamLatticeBallMode; begin case AValue of - 0: Result := eBeamLatticeBallModeNone; + 0: Result := eBeamLatticeBallModeBeamLatticeBallModeNone; 1: Result := eBeamLatticeBallModeMixed; 2: Result := eBeamLatticeBallModeAll; else diff --git a/Autogenerated/Bindings/Python/Lib3MF.py b/Autogenerated/Bindings/Python/Lib3MF.py index 82862c49f..e3d29b734 100644 --- a/Autogenerated/Bindings/Python/Lib3MF.py +++ b/Autogenerated/Bindings/Python/Lib3MF.py @@ -792,7 +792,7 @@ class BeamLatticeClipMode(CTypesEnum): '''Definition of BeamLatticeBallMode ''' class BeamLatticeBallMode(CTypesEnum): - None = 0 + BeamLatticeBallModeNone = 0 Mixed = 1 All = 2 '''Definition of ProgressIdentifier diff --git a/Autogenerated/Source/lib3mf_types.hpp b/Autogenerated/Source/lib3mf_types.hpp index 4310047ac..61ecedc56 100644 --- a/Autogenerated/Source/lib3mf_types.hpp +++ b/Autogenerated/Source/lib3mf_types.hpp @@ -389,7 +389,7 @@ namespace Lib3MF { }; enum class eBeamLatticeBallMode : Lib3MF_int32 { - None = 0, + BeamLatticeBallModeNone = 0, Mixed = 1, All = 2 }; diff --git a/AutomaticComponentToolkit/lib3mf.xml b/AutomaticComponentToolkit/lib3mf.xml index 3a3f5a15c..d08606821 100644 --- a/AutomaticComponentToolkit/lib3mf.xml +++ b/AutomaticComponentToolkit/lib3mf.xml @@ -181,7 +181,7 @@ - diff --git a/AutomaticComponentToolkit/patch_python.bat b/AutomaticComponentToolkit/patch_python.bat deleted file mode 100644 index a19c08d1f..000000000 --- a/AutomaticComponentToolkit/patch_python.bat +++ /dev/null @@ -1,17 +0,0 @@ -@echo off - -REM This script is to patch python binding which is using None keyword for enum. Apply this patch until ACT is fixed - -set "current_dir=%~dp0" - -REM Specify the python binding file path -set "file_path=%current_dir%\..\Autogenerated\Bindings\Python\Lib3MF.py" - -REM None is a python keyword which has to be replaced -set "search_line= None = 0" - -REM Replace None with BeamLatticeBallModeNone -set "new_line= BeamLatticeBallModeNone = 0" - -REM Use PowerShell to find and replace the line -powershell -Command "(Get-Content '%file_path%') -replace '%search_line%', '%new_line%' | Set-Content '%file_path%'" \ No newline at end of file diff --git a/AutomaticComponentToolkit/patch_python.sh b/AutomaticComponentToolkit/patch_python.sh deleted file mode 100644 index ebf8b909b..000000000 --- a/AutomaticComponentToolkit/patch_python.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash - -# This script is to patch python binding which is using None keyword for enum. Apply this patch until ACT is fixed - -current_dir=`dirname "$0"` - -# Specify the python binding file path -file_path="$current_dir/../Autogenerated/Bindings/Python/Lib3MF.py" - -# None is python keyword which has to be replaced -search_line="\tNone = 0" - -# Replace None with BeamLatticeBallModeNone -new_line="\tBeamLatticeBallModeNone = 0" - -# Use sed to find and replace the line -sed -i "s|$search_line|$new_line|" "$file_path" \ No newline at end of file diff --git a/Source/API/lib3mf_beamlattice.cpp b/Source/API/lib3mf_beamlattice.cpp index 04c88b25a..e2c9a8ecf 100644 --- a/Source/API/lib3mf_beamlattice.cpp +++ b/Source/API/lib3mf_beamlattice.cpp @@ -139,7 +139,7 @@ void CBeamLattice::GetBallOptions (eLib3MFBeamLatticeBallMode & eBallMode, Lib3M void CBeamLattice::SetBallOptions (const eLib3MFBeamLatticeBallMode eBallMode, const Lib3MF_double dBallRadius) { - if (eBallMode == eLib3MFBeamLatticeBallMode::None || dBallRadius > 0.0) { + if (eBallMode == eLib3MFBeamLatticeBallMode::BeamLatticeBallModeNone || dBallRadius > 0.0) { m_mesh.setBeamLatticeBallMode((NMR::eModelBeamLatticeBallMode)eBallMode); m_mesh.setDefaultBallRadius(dBallRadius); } diff --git a/Tests/CPP_Bindings/Source/BeamLattice.cpp b/Tests/CPP_Bindings/Source/BeamLattice.cpp index 97294e454..7ca63dabd 100644 --- a/Tests/CPP_Bindings/Source/BeamLattice.cpp +++ b/Tests/CPP_Bindings/Source/BeamLattice.cpp @@ -152,7 +152,7 @@ namespace Lib3MF TEST_F(BeamLattice, BallMode) { - beamLattice->SetBallOptions(eBeamLatticeBallMode::None, 1.2); + beamLattice->SetBallOptions(eBeamLatticeBallMode::BeamLatticeBallModeNone, 1.2); sBeam beam; beam.m_Radii[0] = 1.0;