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

ENH: update prompt for filament mix printing

Browse Source 
jira: NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I92c86edadd6720b0e566057bd2593605ee4a3f77
(cherry picked from commit a93f6a54a2be94807702e3c75bdb4c79d508f260)
This commit is contained in:
xun.zhang
2025-07-15 15:19:09 +08:00
committed by Noisyfox
parent a543a55e01
commit f7643eb3be
4 changed files with 58 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/slic3r/GUI/GLCanvas3D.cpp
View File

@@ -142,6 +142,12 @@ std::string& get_nozzle_filament_incompatible_text() {
return nozzle_filament_incompatible_text;
}
std::string& get_filament_mixture_warning_text(){
static std::string filament_mixture_warning_text;
return filament_mixture_warning_text;
}
static std::string format_number(float value)
{
std::ostringstream oss;
@@ -3052,6 +3058,9 @@ void GLCanvas3D::reload_scene(bool refresh_immediately, bool force_full_scene_re
bool filament_nozzle_compatible = cur_plate->check_compatible_of_nozzle_and_filament(full_config_temp, wxGetApp().preset_bundle->filament_presets, get_nozzle_filament_incompatible_text());
_set_warning_notification(EWarning::NozzleFilamentIncompatible, !filament_nozzle_compatible);
bool filament_mixture_compatible = cur_plate->check_mixture_filament_compatible(full_config_temp, get_filament_mixture_warning_text());
_set_warning_notification(EWarning::MixtureFilamentIncompatible, !filament_mixture_compatible);
bool model_fits = contained_min_one && !m_model->objects.empty() && !partlyOut && object_results.filaments.empty() && tpu_valid && filament_printable;
post_event(Event<bool>(EVT_GLCANVAS_ENABLE_ACTION_BUTTONS, model_fits));
ppl.get_curr_plate()->update_slice_ready_status(model_fits);
@@ -3070,6 +3079,7 @@ void GLCanvas3D::reload_scene(bool refresh_immediately, bool force_full_scene_re
_set_warning_notification(EWarning::MultiExtruderPrintableError,false);
_set_warning_notification(EWarning::MultiExtruderHeightOutside,false);
_set_warning_notification(EWarning::NozzleFilamentIncompatible,false);
_set_warning_notification(EWarning::MixtureFilamentIncompatible,false);
post_event(Event<bool>(EVT_GLCANVAS_ENABLE_ACTION_BUTTONS, false));
}
@@ -10124,6 +10134,10 @@ void GLCanvas3D::_set_warning_notification(EWarning warning, bool state)
text = _u8L(get_nozzle_filament_incompatible_text());
break;
}
case EWarning::MixtureFilamentIncompatible: {
text = _u8L(get_filament_mixture_warning_text());
break;
}
}
//BBS: this may happened when exit the app, plater is null
if (!wxGetApp().plater())