mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-05-21 04:13:50 +00:00
SPE-2397: Fixed order of traversing time blocks in GCodeProcessor::TimeMachine::calculate_time() to match what is done in firmware
(cherry picked from commit 9b7961ddcb824c5b18cb414ed5b975d999a24641)
This commit is contained in:
committed by
Andrew Sun
parent
7814605906
commit
acd3c94955
@@ -398,16 +398,16 @@ void GCodeProcessor::TimeMachine::calculate_time(GCodeProcessorResult& result, P
|
|||||||
|
|
||||||
assert(keep_last_n_blocks <= blocks.size());
|
assert(keep_last_n_blocks <= blocks.size());
|
||||||
|
|
||||||
// forward_pass
|
|
||||||
for (size_t i = 0; i + 1 < blocks.size(); ++i) {
|
|
||||||
planner_forward_pass_kernel(blocks[i], blocks[i + 1]);
|
|
||||||
}
|
|
||||||
|
|
||||||
// reverse_pass
|
// reverse_pass
|
||||||
for (int i = static_cast<int>(blocks.size()) - 1; i > 0; --i) {
|
for (int i = static_cast<int>(blocks.size()) - 1; i > 0; --i) {
|
||||||
planner_reverse_pass_kernel(blocks[i - 1], blocks[i]);
|
planner_reverse_pass_kernel(blocks[i - 1], blocks[i]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// forward_pass
|
||||||
|
for (size_t i = 0; i + 1 < blocks.size(); ++i) {
|
||||||
|
planner_forward_pass_kernel(blocks[i], blocks[i + 1]);
|
||||||
|
}
|
||||||
|
|
||||||
recalculate_trapezoids(blocks);
|
recalculate_trapezoids(blocks);
|
||||||
|
|
||||||
const size_t n_blocks_process = blocks.size() - keep_last_n_blocks;
|
const size_t n_blocks_process = blocks.size() - keep_last_n_blocks;
|
||||||
|
|||||||
Reference in New Issue
Block a user