juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-19 19:33:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX: the filament load step is different

Browse Source 
jira: [STUDIO-9684]
Change-Id: I3145d86ad5f6fccd54ab3116e14bcbcbbe1134cf
(cherry picked from commit 37c0e0e1c5bce00250ffaf7c27e8f42f5108e361)
This commit is contained in:
xin.zhang
2025-01-12 21:06:25 +08:00
committed by Noisyfox
parent b7a8c28b1c
commit 3fd3253e5a
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/slic3r/GUI/Widgets/FilamentLoad.cpp
View File

@@ -124,15 +124,13 @@ void FilamentLoad::SetFilamentStep(FilamentStep item_idx, FilamentStepType f_typ
step_control->SetSlotInformation(slot_info); 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_load_steps->DeleteAllItems();
m_filament_unload_steps->DeleteAllItems(); m_filament_unload_steps->DeleteAllItems();
m_filament_vt_load_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 (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_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_CUT_FILAMENT]);
m_filament_load_steps->AppendItem(FILAMENT_CHANGE_STEP_STRING[FilamentStep::STEP_PULL_CURR_FILAMENT]); m_filament_load_steps->AppendItem(FILAMENT_CHANGE_STEP_STRING[FilamentStep::STEP_PULL_CURR_FILAMENT]);

4
src/slic3r/GUI/Widgets/FilamentLoad.hpp
View File

@@ -16,7 +16,9 @@
namespace Slic3r { namespace GUI { 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 class FilamentLoad : public wxSimplebook
{ {
public: public: