From 6e7b2e9614f063129ac09d3011ae693c7c1291e2 Mon Sep 17 00:00:00 2001 From: "zhimin.zeng" Date: Wed, 11 Dec 2024 20:41:55 +0800 Subject: [PATCH] FIX: fix build error (cherry picked from commit 885e96d8db30a688c3fc65f828c2c4b78499b4c3) --- src/slic3r/GUI/DeviceManager.hpp | 1 - src/slic3r/GUI/GLCanvas3D.cpp | 11 +++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/slic3r/GUI/DeviceManager.hpp b/src/slic3r/GUI/DeviceManager.hpp index d2ef312a9b..f424050349 100644 --- a/src/slic3r/GUI/DeviceManager.hpp +++ b/src/slic3r/GUI/DeviceManager.hpp @@ -872,7 +872,6 @@ public: //bool is_support_p1s_plus{false}; bool is_support_nozzle_blob_detection{false}; bool is_support_air_print_detection{false}; - bool is_support_filament_setting_inprinting{false}; bool is_support_agora{false}; bool is_support_upgrade_kit{false}; bool is_support_command_homing { false };// fun[32] diff --git a/src/slic3r/GUI/GLCanvas3D.cpp b/src/slic3r/GUI/GLCanvas3D.cpp index fdcfcce437..37760a9b29 100644 --- a/src/slic3r/GUI/GLCanvas3D.cpp +++ b/src/slic3r/GUI/GLCanvas3D.cpp @@ -9722,6 +9722,17 @@ void GLCanvas3D::_set_warning_notification(EWarning warning, bool state) case EWarning::ObjectLimited: text = object_limited_text; break; + case EWarning::FilamentUnPrintableOnFirstLayer: { + std::string warning; + const std::vector &conflict_filament = m_gcode_viewer.filament_printable_reuslt.conflict_filament; + auto iter = conflict_filament.begin(); + for (int filament : conflict_filament) { + warning += std::to_string(filament + 1); + warning += " "; + } + text = (boost::format(_u8L("filaments %s cannot be printed directly on the surface of this plate.")) % warning).str(); + error = ErrorType::SLICING_ERROR; + break; } //BBS: this may happened when exit the app, plater is null if (!wxGetApp().plater())