From 37c0e0e1c5bce00250ffaf7c27e8f42f5108e361 Mon Sep 17 00:00:00 2001 From: "xin.zhang" Date: Sun, 12 Jan 2025 21:06:25 +0800 Subject: [PATCH] FIX: the filament load step is different jira: [STUDIO-9684] Change-Id: I3145d86ad5f6fccd54ab3116e14bcbcbbe1134cf --- src/slic3r/GUI/Widgets/FilamentLoad.cpp | 6 ++---- src/slic3r/GUI/Widgets/FilamentLoad.hpp | 4 +++- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/slic3r/GUI/Widgets/FilamentLoad.cpp b/src/slic3r/GUI/Widgets/FilamentLoad.cpp index 26f9c0522..a5847a9e7 100644 --- a/src/slic3r/GUI/Widgets/FilamentLoad.cpp +++ b/src/slic3r/GUI/Widgets/FilamentLoad.cpp @@ -124,15 +124,13 @@ void FilamentLoad::SetFilamentStep(FilamentStep item_idx, FilamentStepType f_typ step_control->SetSlotInformation(slot_info); } -void FilamentLoad::UpdateStepCtrl(bool is_extrusion_exist) { +void FilamentLoad::UpdateStepCtrl(bool has_fila_to_switch) { m_filament_load_steps->DeleteAllItems(); m_filament_unload_steps->DeleteAllItems(); m_filament_vt_load_steps->DeleteAllItems(); - is_extrusion = true; //Forgot what it means, need to update dynamically - if (m_ams_model == AMSModel::GENERIC_AMS || m_ext_model == AMSModel::N3F_AMS) { - if (is_extrusion) { + if (has_fila_to_switch) { m_filament_load_steps->AppendItem(FILAMENT_CHANGE_STEP_STRING[FilamentStep::STEP_HEAT_NOZZLE]); m_filament_load_steps->AppendItem(FILAMENT_CHANGE_STEP_STRING[FilamentStep::STEP_CUT_FILAMENT]); m_filament_load_steps->AppendItem(FILAMENT_CHANGE_STEP_STRING[FilamentStep::STEP_PULL_CURR_FILAMENT]); diff --git a/src/slic3r/GUI/Widgets/FilamentLoad.hpp b/src/slic3r/GUI/Widgets/FilamentLoad.hpp index 93f578b7f..37db5dba9 100644 --- a/src/slic3r/GUI/Widgets/FilamentLoad.hpp +++ b/src/slic3r/GUI/Widgets/FilamentLoad.hpp @@ -16,7 +16,9 @@ namespace Slic3r { namespace GUI { - + // The filament load panel + // (1) Load from empty, empty -> filled + // (2) Switch filament, fila_A -> fila_B*/ class FilamentLoad : public wxSimplebook { public: