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())