diff options
| -rw-r--r-- | ArcWelderConsole/ArcWelderConsole.cpp | 1 | ||||
| -rw-r--r-- | ArcWelderTest/ArcWelderTest.cpp | 4 | ||||
| -rw-r--r-- | GcodeProcessorLib/utilities.h | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/ArcWelderConsole/ArcWelderConsole.cpp b/ArcWelderConsole/ArcWelderConsole.cpp index dbc6085..50e2b93 100644 --- a/ArcWelderConsole/ArcWelderConsole.cpp +++ b/ArcWelderConsole/ArcWelderConsole.cpp @@ -40,7 +40,6 @@ #define PROGRESS_TYPE_FULL "FULL" int main(int argc, char* argv[]) { - arc_welder_args args; std::string log_level_string; std::string log_level_string_default = "INFO"; diff --git a/ArcWelderTest/ArcWelderTest.cpp b/ArcWelderTest/ArcWelderTest.cpp index 538bb2a..4a6940b 100644 --- a/ArcWelderTest/ArcWelderTest.cpp +++ b/ArcWelderTest/ArcWelderTest.cpp @@ -305,10 +305,10 @@ static void TestAntiStutter(std::string filePath) // BENCHY_L1_DIFFICULT // SPIRAL_TEST // SPIRAL_VASE_TEST_FUNNEL - std::string source_path = SPIRAL_VASE_TEST_SINGLE_LAYER_CYLINDER; + std::string source_path = SUPER_HUGE_TEST; std::string target_path = "C:\\Users\\Brad\\Documents\\3DPrinter\\AntiStutter\\test_output.gcode"; arc_welder_args args(source_path, target_path, p_logger); - args.box_encoding = args.box_encoding = utilities::box_drawing::HTML; + args.box_encoding = args.box_encoding = utilities::box_drawing::ASCII; args.callback = on_progress; // override any arguments here; args.allow_travel_arcs = true; diff --git a/GcodeProcessorLib/utilities.h b/GcodeProcessorLib/utilities.h index a71a36e..f1f4ede 100644 --- a/GcodeProcessorLib/utilities.h +++ b/GcodeProcessorLib/utilities.h @@ -44,7 +44,6 @@ namespace utilities{ extern const std::string WHITESPACE_; extern const char GUID_RANGE[]; extern const bool GUID_DASHES[]; - extern const char PATH_SEPARATOR_; bool is_zero(double x, double tolerance); bool is_zero(double x); @@ -86,6 +85,7 @@ namespace utilities{ std::string join(const std::string* strings, size_t length, std::string sep); std::string join(const std::vector<std::string> strings, std::string sep); + // bool contains(const std::string source, const std::string substring); // Might need this later std::istream& safe_get_line(std::istream& is, std::string& t); |