juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-16 10:02:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

ENH: save multi extruder state in gcode processor

Browse Source 
1.Save multi extruder state in gcode processor
2.Add machine exturder change time
3.Fix some naming issues

jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I9785331290515eeb908ff0ff01aad5aac44212d9
(cherry picked from commit b49d4ca1539cd9f473e0ee0c79a4287c0d5fe03b)
This commit is contained in:
xun.zhang
2024-07-26 16:46:24 +08:00
committed by Noisyfox
parent e7308673ec
commit 6598b626e7
3 changed files with 317 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/slic3r/GUI/GCodeViewer.cpp
View File

@@ -1134,7 +1134,7 @@ void GCodeViewer::refresh(const GCodeProcessorResult& gcode_result, const std::v
ColorRGBA default_color;
decode_color("#FF8000", default_color);
// ensure there are enough colors defined
while (m_tools.m_tool_colors.size() < std::max(size_t(1), gcode_result.extruders_count)) {
while (m_tools.m_tool_colors.size() < std::max(size_t(1), gcode_result.filaments_count)) {
m_tools.m_tool_colors.push_back(default_color);
m_tools.m_tool_visibles.push_back(true);
}
@@ -2351,7 +2351,7 @@ void GCodeViewer::load_toolpaths(const GCodeProcessorResult& gcode_result, const
if (m_moves_count == 0)
return;
m_extruders_count = gcode_result.extruders_count;
m_extruders_count = gcode_result.filaments_count;
unsigned int progress_count = 0;
static const unsigned int progress_threshold = 1000;
@@ -5301,7 +5301,7 @@ void GCodeViewer::render_legend(float &legend_height, int canvas_width, int canv
ImGui::SameLine();
imgui.text(_u8L("Filament change times") + ":");
ImGui::SameLine();
::sprintf(buf, "%d", m_print_statistics.total_filamentchanges);
::sprintf(buf, "%d", m_print_statistics.total_filament_changes);
imgui.text(buf);
//BBS display cost