Fix bytes string when logging from python. Reduce notification period from 1 sec to 0.5 sec and add an argument to control this (not added to console app yet).

2 files changed, 6 insertions, 2 deletions

diff --git a/PyArcWelder/py_arc_welder_extension.cpp b/PyArcWelder/py_arc_welder_extension.cpp
index b386d9f..1e440f9 100644
--- a/PyArcWelder/py_arc_welder_extension.cpp
+++ b/PyArcWelder/py_arc_welder_extension.cpp
@@ -198,7 +198,9 @@ extern "C"
 		args.py_progress_callback = py_progress_callback;
 		args.log = p_py_logger;
 		py_arc_welder arc_welder_obj(args);
-		arc_welder_results results = arc_welder_obj.process();
+		arc_welder_results results;
+		results = arc_welder_obj.process();
+		
 		message = "py_gcode_arc_converter.ConvertFile - Arc Conversion Complete.";
 		p_py_logger->log(GCODE_CONVERSION, INFO, message);
 		Py_XDECREF(py_progress_callback);
diff --git a/PyArcWelder/py_logger.cpp b/PyArcWelder/py_logger.cpp
index 0418ef5..0ae6548 100644
--- a/PyArcWelder/py_logger.cpp
+++ b/PyArcWelder/py_logger.cpp
@@ -203,7 +203,9 @@ void py_logger::log(const int logger_type, const int log_level, const std::strin
 			return;
 		}
 	}
-	PyObject* pyMessage = gcode_arc_converter::PyBytesOrString_FromString(message);
+	//PyObject* pyMessage = gcode_arc_converter::PyBytesOrString_FromString(message);
+	PyObject* pyMessage = gcode_arc_converter::PyUnicode_SafeFromString(message);
+	
 	if (pyMessage == NULL)
 	{
 		std::cout << "Unable to convert the log message '" << message.c_str() << "' to a PyString/Unicode message.\r\n";