Time estimate shown in GUI as formatted string / Write to file made by class GCode's private methods

This commit is contained in:
Enrico Turri 2017-12-14 09:18:28 +01:00
parent 20234c94ee
commit 0fe855cd6d
7 changed files with 146 additions and 141 deletions

View file

@ -233,14 +233,15 @@ public:
PrintRegionPtrs regions;
PlaceholderParser placeholder_parser;
// TODO: status_cb
double total_used_filament, total_extruded_volume, total_cost, total_weight, estimated_print_time;
std::string estimated_print_time;
double total_used_filament, total_extruded_volume, total_cost, total_weight;
std::map<size_t, float> filament_stats;
PrintState<PrintStep, psCount> state;
// ordered collections of extrusion paths to build skirt loops and brim
ExtrusionEntityCollection skirt, brim;
Print() : total_used_filament(0), total_extruded_volume(0), estimated_print_time(0) { restart(); }
Print() : total_used_filament(0), total_extruded_volume(0) { restart(); }
~Print() { clear_objects(); }
// methods for handling objects