diff options
author | FormerLurker <hochgebe@gmail.com> | 2020-05-17 02:17:15 +0300 |
---|---|---|
committer | FormerLurker <hochgebe@gmail.com> | 2020-05-17 02:17:15 +0300 |
commit | f962acda6cfd7d12dd917803a2e92568dd0d00e2 (patch) | |
tree | 2622bf52b6e510e9f0413f4b5b55b18552cdb724 | |
parent | d89b70ae4a0377818bc7a3cc0f35167c2cf787ab (diff) |
Add back in arc check. Figure out why it is necessary later.
-rw-r--r-- | ArcWelder/segmented_arc.cpp | 9 | ||||
-rw-r--r-- | ArcWelderTest/ArcWelderTest.cpp | 2 |
2 files changed, 9 insertions, 2 deletions
diff --git a/ArcWelder/segmented_arc.cpp b/ArcWelder/segmented_arc.cpp index 79d12c7..28145fd 100644 --- a/ArcWelder/segmented_arc.cpp +++ b/ArcWelder/segmented_arc.cpp @@ -69,6 +69,12 @@ point segmented_arc::pop_back(double e_relative) bool segmented_arc::is_shape() { + if (is_shape_) + { + arc a; + bool is_arc = try_get_arc(a); + return is_arc; + } return is_shape_; } @@ -235,7 +241,8 @@ bool segmented_arc::does_circle_fit_points_(const circle& c) } // get the current arc and compare the total length to the original length - return true; + arc a; + return try_get_arc_(c, a); } diff --git a/ArcWelderTest/ArcWelderTest.cpp b/ArcWelderTest/ArcWelderTest.cpp index 7a4c73e..ef0e006 100644 --- a/ArcWelderTest/ArcWelderTest.cpp +++ b/ArcWelderTest/ArcWelderTest.cpp @@ -241,7 +241,7 @@ static void TestAntiStutter(std::string filePath) 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<progress_callback>(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(SUPER_HUGE_TEST, "C:\\Users\\Brad\\Documents\\3DPrinter\\AntiStutter\\test_output.gcode", p_logger, max_resolution, max_radius_mm, false, 50, on_progress); + arc_welder arc_welder_obj(BARBARIAN, "C:\\Users\\Brad\\Documents\\3DPrinter\\AntiStutter\\test_output.gcode", p_logger, max_resolution, max_radius_mm, false, 50, on_progress); //BENCHY_LAYER_1GCODE //SMALL_TEST //FACE_SHIELD |