diff options
| author | FormerLurker <hochgebe@gmail.com> | 2020-05-02 18:06:40 +0300 |
|---|---|---|
| committer | FormerLurker <hochgebe@gmail.com> | 2020-05-02 18:06:40 +0300 |
| commit | 8d7b572cc7fa7faf795db88a29340b6380090f8f (patch) | |
| tree | 5c5b2fb251af89e0c9038be84236c6df85d098fb /ArcWelderConsole | |
| parent | 4fcf89d4995921b89b579d06052df11b66e4879f (diff) | |
Add enhanced progress and complete statistics for arc welder. Add ARC_SEGMENTS_PER_SEC to inverse processor.
Diffstat (limited to 'ArcWelderConsole')
| -rw-r--r-- | ArcWelderConsole/ArcWelderConsole.cpp | 10 | ||||
| -rw-r--r-- | ArcWelderConsole/ArcWelderConsole.h | 3 |
2 files changed, 4 insertions, 9 deletions
diff --git a/ArcWelderConsole/ArcWelderConsole.cpp b/ArcWelderConsole/ArcWelderConsole.cpp index ebc39b5..c96d4e7 100644 --- a/ArcWelderConsole/ArcWelderConsole.cpp +++ b/ArcWelderConsole/ArcWelderConsole.cpp @@ -26,7 +26,6 @@ #include <iostream> #include <sstream> #include <iomanip> -#include "arc_welder.h" #include "gcode_position.h" int main(int argc, char* argv[]) { @@ -224,13 +223,8 @@ int main(int argc, char* argv[]) return 0; } -static bool on_progress(double percent_complete, double seconds_elapsed, double seconds_remaining, int gcodes_processed, int current_line, int points_compressed, int arcs_created) +static bool on_progress(arc_welder_progress progress) { - std::cout << std::fixed << std::setprecision(1); - if (percent_complete < 100) - std::cout << percent_complete << "% complete in " << seconds_elapsed << " seconds with " << seconds_remaining << " seconds remaining. Current Line: " << current_line << ", Points Compressed:" << points_compressed << ", ArcsCreated:" << arcs_created << "\r\n"; - else if (percent_complete >= 100) - std::cout << "Processing Completed in " << seconds_elapsed << " seconds.\n\tPoints Compressed:" << points_compressed << "\n\tArcsCreated:" << arcs_created << "\n"; - std::cout.unsetf(std::ios::floatfield); + std::cout << progress.str(); return true; }
\ No newline at end of file diff --git a/ArcWelderConsole/ArcWelderConsole.h b/ArcWelderConsole/ArcWelderConsole.h index 35ad744..d7ac5b9 100644 --- a/ArcWelderConsole/ArcWelderConsole.h +++ b/ArcWelderConsole/ArcWelderConsole.h @@ -23,4 +23,5 @@ // FormerLurker@pm.me //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once -static bool on_progress(double percent_complete, double seconds_elapsed, double seconds_remaining, int gcodes_processed, int current_line, int points_compressed, int arcs_created);
\ No newline at end of file +#include "arc_welder.h" +static bool on_progress(arc_welder_progress progress);
\ No newline at end of file |