Rename enum value 'None' to 'BeamLatticeBallModeNone' to not use a py…

…thon keyword
3MFConsortium · Oct 22, 2024 · 3073bf1 · 3073bf1
1 parent 84a318a
commit 3073bf1
Show file tree

Hide file tree

Showing 17 changed files with 17 additions and 51 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git 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
@@ -23617,7 +23617,7 @@ void CLib3MFWrapper::New(const FunctionCallbackInfo<Value>& 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -181,7 +181,7 @@
 	</enum>
 
 	<enum name="BeamLatticeBallMode">
-		<option name="None" value="0" />
+		<option name="BeamLatticeBallModeNone" value="0" />
 		<option name="Mixed" value="1" />
 		<option name="All" value="2" />
 	</enum>

diff --git a/AutomaticComponentToolkit/patch_python.bat b/AutomaticComponentToolkit/patch_python.bat
diff --git a/AutomaticComponentToolkit/patch_python.sh b/AutomaticComponentToolkit/patch_python.sh
diff --git 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
@@ -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;