From 4f2fef2779e4cac3d31eb2ba4181416efb6a6bab Mon Sep 17 00:00:00 2001 From: FormerLurker Date: Fri, 20 Nov 2020 14:40:10 -0600 Subject: Add -z parameter to console app to support arcs, take z into account when calculating spiral length. --- ArcWelderTest/ArcWelderTest.cpp | 9 +++++++-- ArcWelderTest/ArcWelderTest.h | 2 ++ 2 files changed, 9 insertions(+), 2 deletions(-) (limited to 'ArcWelderTest') diff --git a/ArcWelderTest/ArcWelderTest.cpp b/ArcWelderTest/ArcWelderTest.cpp index abd51c7..226e4b6 100644 --- a/ArcWelderTest/ArcWelderTest.cpp +++ b/ArcWelderTest/ArcWelderTest.cpp @@ -241,14 +241,19 @@ static void TestAntiStutter(std::string filePath) std::vector logger_names; logger_names.push_back("arc_welder.gcode_conversion"); std::vector logger_levels; - //logger_levels.push_back(log_levels::DEBUG); + logger_levels.push_back(log_levels::NOSET); + logger_levels.push_back(log_levels::VERBOSE); + logger_levels.push_back(log_levels::DEBUG); logger_levels.push_back(log_levels::INFO); + logger_levels.push_back(log_levels::WARNING); + logger_levels.push_back(log_levels::ERROR); + logger_levels.push_back(log_levels::CRITICAL); logger* p_logger = new logger(logger_names, logger_levels); p_logger->set_log_level(INFO); //arc_welder arc_welder_obj(BENCHY_0_5_MM_NO_WIPE, "C:\\Users\\Brad\\Documents\\3DPrinter\\AntiStutter\\test_output.gcode", p_logger, max_resolution, false, 50, static_cast(on_progress)); //arc_welder arc_welder_obj(SIX_SPEED_TEST, "C:\\Users\\Brad\\Documents\\3DPrinter\\AntiStutter\\test_output.gcode", p_logger, max_resolution, false, 50, on_progress); arc_welder arc_welder_obj( - SPIRAL_VASE_TEST_CYLINDER, + SPIRAL_VASE_TEST_DOUBLE_SPIRAL, "C:\\Users\\Brad\\Documents\\3DPrinter\\AntiStutter\\test_output.gcode", p_logger, max_resolution, diff --git a/ArcWelderTest/ArcWelderTest.h b/ArcWelderTest/ArcWelderTest.h index 6345761..90ed99a 100644 --- a/ArcWelderTest/ArcWelderTest.h +++ b/ArcWelderTest/ArcWelderTest.h @@ -83,6 +83,8 @@ static std::string SPIRAL_TEST = "C:\\Users\\Brad\\Documents\\3DPrinter\\AntiStu static std::string SPIRAL_TEST_PRECISION = "C:\\Users\\Brad\\Documents\\3DPrinter\\AntiStutter\\smoothietest\\SPIRAL_TEST_precision.gcode"; static std::string SPIRAL_VASE_TEST_DOUBLE_SPIRAL = "C:\\Users\\Brad\\Documents\\3DPrinter\\AntiStutter\\SpiralVaseTest\\SpiralVaseTest_DOUBLE_SPIRAL.gcode"; static std::string SPIRAL_VASE_TEST_CYLINDER = "C:\\Users\\Brad\\Documents\\3DPrinter\\AntiStutter\\SpiralVaseTest\\SpiralVaseTest_Cylinder.gcode"; +static std::string SPIRAL_VASE_TEST_SINGLE_LAYER_CYLINDER = "C:\\Users\\Brad\\Documents\\3DPrinter\\AntiStutter\\SpiralVaseTest\\SpiralVaseSingleLayer_Cylinder.gcode"; +static std::string SPIRAL_VASE_TEST_PI_BOWL = "C:\\Users\\Brad\\Documents\\3DPrinter\\AntiStutter\\SpiralVaseTest\\SpiralVaseTest_PiBowl.gcode"; -- cgit v1.2.3