mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-05-14 09:02:06 +00:00
Fix erroneous interpolation on speed, flow rate in speed and flow views (#11848)
# Description Reverts to default orca behaviour of showing the gcode speeds and flow values instead of an interpolation to the next segment. The existing behaviour incorrectly shows the next G1 XY command following a bridge or overhang as interpolated when using the speed and flow views. This is inconsistent with both actual speed (as its limited to a single segment) and gcode view (as it shows a speed gradient where there is none in the gcode). Before / after    Actual speed and flow views are unaffected  
This commit is contained in:
committed by
GitHub
parent
6d3e0de4d9
commit
4af168bac7
@@ -451,7 +451,9 @@ void GCodeProcessor::TimeMachine::calculate_time(GCodeProcessorResult& result, P
|
||||
if ((position - prev_move.position).norm() > EPSILON &&
|
||||
(position - curr_move.position).norm() > EPSILON) {
|
||||
const float delta_extruder = interpolate ? lerp(prev_move.delta_extruder, curr_move.delta_extruder, t) : curr_move.delta_extruder;
|
||||
const float feedrate = interpolate ? lerp(prev_move.feedrate, curr_move.feedrate, t) : curr_move.feedrate;
|
||||
const float feedrate = curr_move.feedrate; // ORCA: set feedrate to the gcode feed rate to prevent visualiser from
|
||||
// displaying erroneous speed transition when actual speed/actual flow views are NOT selected.
|
||||
// interpolate ? lerp(prev_move.feedrate, curr_move.feedrate, t) : curr_move.feedrate;
|
||||
const float width = interpolate ? lerp(prev_move.width, curr_move.width, t) : curr_move.width;
|
||||
const float height = interpolate ? lerp(prev_move.height, curr_move.height, t) : curr_move.height;
|
||||
// ORCA: Fix issue with flow rate changes being visualized incorrectly
|
||||
@@ -480,7 +482,9 @@ void GCodeProcessor::TimeMachine::calculate_time(GCodeProcessorResult& result, P
|
||||
if ((position - prev_move.position).norm() > EPSILON &&
|
||||
(position - curr_move.position).norm() > EPSILON) {
|
||||
const float delta_extruder = interpolate ? lerp(prev_move.delta_extruder, curr_move.delta_extruder, t) : curr_move.delta_extruder;
|
||||
const float feedrate = interpolate ? lerp(prev_move.feedrate, curr_move.feedrate, t) : curr_move.feedrate;
|
||||
const float feedrate = curr_move.feedrate; // ORCA: set feedrate to the gcode feed rate to prevent visualiser from
|
||||
// displaying erroneous speed transition when actual speed/actual flow views are NOT selected.
|
||||
// interpolate ? lerp(prev_move.feedrate, curr_move.feedrate, t) : curr_move.feedrate;
|
||||
const float width = interpolate ? lerp(prev_move.width, curr_move.width, t) : curr_move.width;
|
||||
const float height = interpolate ? lerp(prev_move.height, curr_move.height, t) : curr_move.height;
|
||||
// ORCA: Fix issue with flow rate changes being visualized incorrectly
|
||||
|
||||
Reference in New Issue
Block a user