Rename allow_z_axis_changes to allow_3d_arcs.

3 files changed, 12 insertions, 12 deletions

diff --git a/PyArcWelder/py_arc_welder.h b/PyArcWelder/py_arc_welder.h
index 979c3d0..14d5760 100644
--- a/PyArcWelder/py_arc_welder.h
+++ b/PyArcWelder/py_arc_welder.h
@@ -45,7 +45,7 @@ public:
 		int min_arc_segments,
 		double mm_per_arc_segment,
 		bool g90_g91_influences_extruder,
-		bool allow_z_axis_changes,
+		bool allow_3d_arcs,
 		int buffer_size, 
 		PyObject* py_progress_callback
 		): arc_welder(
@@ -58,7 +58,7 @@ public:
 			min_arc_segments,
 			mm_per_arc_segment,
 			g90_g91_influences_extruder,
-			allow_z_axis_changes,
+			allow_3d_arcs,
 			buffer_size
   ){
 		guid_ = guid;
diff --git a/PyArcWelder/py_arc_welder_extension.cpp b/PyArcWelder/py_arc_welder_extension.cpp
index 4796230..5f7553c 100644
--- a/PyArcWelder/py_arc_welder_extension.cpp
+++ b/PyArcWelder/py_arc_welder_extension.cpp
@@ -196,7 +196,7 @@ extern "C"
 		std::string message = "py_gcode_arc_converter.ConvertFile - Beginning Arc Conversion.";
 		p_py_logger->log(GCODE_CONVERSION, INFO, message);
 
-		py_arc_welder arc_welder_obj(args.guid, args.source_path, args.target_path, p_py_logger, args.resolution_mm, args.path_tolerance_percent, args.max_radius_mm, args.min_arc_segments, args.mm_per_arc_segment, args.g90_g91_influences_extruder, args.allow_z_axis_changes, DEFAULT_GCODE_BUFFER_SIZE, py_progress_callback);
+		py_arc_welder arc_welder_obj(args.guid, args.source_path, args.target_path, p_py_logger, args.resolution_mm, args.path_tolerance_percent, args.max_radius_mm, args.min_arc_segments, args.mm_per_arc_segment, args.g90_g91_influences_extruder, args.allow_3d_arcs, DEFAULT_GCODE_BUFFER_SIZE, py_progress_callback);
 		arc_welder_results results = arc_welder_obj.process();
 		message = "py_gcode_arc_converter.ConvertFile - Arc Conversion Complete.";
 		p_py_logger->log(GCODE_CONVERSION, INFO, message);
@@ -329,15 +329,15 @@ static bool ParseArgs(PyObject* py_args, py_gcode_arc_args& args, PyObject** py_
 	}
 
 	// Extract Allow Z Axis Changes
-	// allow_z_axis_changes
-	PyObject* py_allow_z_axis_changes = PyDict_GetItemString(py_args, "allow_z_axis_changes");
-	if (py_allow_z_axis_changes == NULL)
+	// allow_3d_arcs
+	PyObject* py_allow_3d_arcs = PyDict_GetItemString(py_args, "allow_3d_arcs");
+	if (py_allow_3d_arcs == NULL)
 	{
-		std::string message = "ParseArgs - Unable to retrieve allow_z_axis_changes from the args.";
+		std::string message = "ParseArgs - Unable to retrieve allow_3d_arcs from the args.";
 		p_py_logger->log_exception(GCODE_CONVERSION, message);
 		return false;
 	}
-	args.allow_z_axis_changes = PyLong_AsLong(py_allow_z_axis_changes) > 0;
+	args.allow_3d_arcs = PyLong_AsLong(py_allow_3d_arcs) > 0;
 
 	// Extract G90/G91 influences extruder
 	// g90_influences_extruder
diff --git a/PyArcWelder/py_arc_welder_extension.h b/PyArcWelder/py_arc_welder_extension.h
index bcd368b..46944a1 100644
--- a/PyArcWelder/py_arc_welder_extension.h
+++ b/PyArcWelder/py_arc_welder_extension.h
@@ -52,7 +52,7 @@ struct py_gcode_arc_args {
 		min_arc_segments = DEFAULT_MIN_ARC_SEGMENTS;
 		mm_per_arc_segment = DEFAULT_MM_PER_ARC_SEGMENT;
 		g90_g91_influences_extruder = DEFAULT_G90_G91_INFLUENCES_EXTREUDER;
-		allow_z_axis_changes = DEFAULT_ALLOW_Z_AXIS_CHANGES;
+		allow_3d_arcs = DEFAULT_allow_3d_arcs;
 		log_level = 0;
 	}
 	py_gcode_arc_args(
@@ -65,7 +65,7 @@ struct py_gcode_arc_args {
 		int min_arc_segments_,
 		double mm_per_arc_segment_,
 		bool g90_g91_influences_extruder_, 
-		bool allow_z_axis_changes_,
+		bool allow_3d_arcs_,
 		int log_level_
 	) {
 		guid = guid_;
@@ -76,7 +76,7 @@ struct py_gcode_arc_args {
 		max_radius_mm = max_radius_mm_;
 		min_arc_segments = min_arc_segments_;
 		mm_per_arc_segment = mm_per_arc_segment_;
-		allow_z_axis_changes = allow_z_axis_changes_;
+		allow_3d_arcs = allow_3d_arcs_;
 		g90_g91_influences_extruder = g90_g91_influences_extruder_;
 		log_level = log_level_;
 	}
@@ -85,7 +85,7 @@ struct py_gcode_arc_args {
 	std::string target_path;
 	double resolution_mm;
 	double path_tolerance_percent;
-	bool allow_z_axis_changes;
+	bool allow_3d_arcs;
 	bool g90_g91_influences_extruder;
 	double max_radius_mm;
 	int min_arc_segments;