chronology broken

supermerill · Jul 23, 2024 · e04da33 · e04da33
1 parent 2ef8ecc
commit e04da33
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/libslic3r/GCode/GCodeProcessor.cpp b/src/libslic3r/GCode/GCodeProcessor.cpp
@@ -3636,7 +3636,7 @@ void GCodeProcessor::store_move_vertex(EMoveType type)
         m_line_id + 1 :
         ((type == EMoveType::Seam) ? m_last_line_id : m_line_id);
     assert(type != EMoveType::Noop);
-
+    std::cout<<"store_move_vertex @"<<m_time_processor.machines[0].time<<"\n";
     m_result.moves.emplace_back(
         m_last_line_id,
         type,

diff --git a/src/libslic3r/GCode/GCodeProcessor.hpp b/src/libslic3r/GCode/GCodeProcessor.hpp
@@ -101,7 +101,7 @@ namespace Slic3r {
                 gcode_id(gcode_id), type(type), extrusion_role(extrusion_role), extruder_id(extruder_id), 
                 cp_color_id(cp_color_id), position(position), delta_extruder(delta_extruder), feedrate(feedrate), 
                 width(width), height(height), mm3_per_mm(mm3_per_mm), fan_speed(fan_speed), 
-                temperature(temperature), time(time), layer_duration(layer_duration), layer_id(layer_id) {
+                temperature(temperature), move_time(time), layer_duration(layer_duration), layer_id(layer_id) {
             }
 
             uint32_t gcode_id{ 0 };
@@ -117,7 +117,7 @@ namespace Slic3r {
             float mm3_per_mm{ 0.0f };
             float fan_speed{ 0.0f }; // percentage
             float temperature{ 0.0f }; // Celsius degrees
-            float time{ 0.0f }; // s
+            float move_time{ 0.0f }; // s
             float layer_duration{ 0.0f }; // s (layer id before finalize)
             uint16_t layer_id{ 0 };
 

diff --git a/src/slic3r/GUI/GCodeViewer.cpp b/src/slic3r/GUI/GCodeViewer.cpp
@@ -156,7 +156,7 @@ bool GCodeViewer::Path::matches(const GCodeProcessorResult::MoveVertex& move, co
             compare.feedrate.is_same_value(feedrate, move.feedrate) &&
             fan_speed == move.fan_speed &&
             layer_time == move.layer_duration &&
-            elapsed_time == move.time &&
+            elapsed_time == move.move_time &&
             temperature == move.temperature &&
             compare.height.is_same_value(height, move.height) &&
             compare.width.is_same_value(width, move.width) &&
@@ -195,7 +195,7 @@ void GCodeViewer::TBuffer::add_path(const GCodeProcessorResult::MoveVertex& move
     paths.push_back({ move.type, move.extrusion_role, move.delta_extruder,
         move.height, move.width,
         move.feedrate, move.fan_speed, move.temperature,
-        move.volumetric_rate(), move.mm3_per_mm, move.extruder_id, move.cp_color_id, { { endpoint, endpoint } }, move.layer_duration, move.time });
+        move.volumetric_rate(), move.mm3_per_mm, move.extruder_id, move.cp_color_id, { { endpoint, endpoint } }, move.layer_duration, move.move_time });
 }
 
 namespace quick_pow10
@@ -1300,7 +1300,7 @@ void GCodeViewer::refresh(const GCodeProcessorResult& gcode_result, const std::v
             m_extrusions.ranges.volumetric_flow.update_from(curr.mm3_per_mm);
             if (curr.layer_duration > 0.f)
                 m_extrusions.ranges.layer_duration.update_from(curr.layer_duration);
-            m_extrusions.ranges.elapsed_time.update_from(curr.time);
+            m_extrusions.ranges.elapsed_time.update_from(curr.move_time);
             [[fallthrough]];
         }
         case EMoveType::Travel: