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

NEW:update the style when the virtual tray is empty

Browse Source 
Change-Id: I40fc05ce31ed9225e5dea6d080fdbff138b2f9d8
This commit is contained in:
tao wang
2023-05-25 14:28:53 +08:00
committed by Lane.Wei
parent c1010e5d0e
commit 73d3b37979
4 changed files with 35 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/slic3r/GUI/StatusPanel.cpp
View File

@@ -2975,7 +2975,12 @@ void StatusPanel::on_filament_edit(wxCommandEvent &event)
cols.push_back( AmsTray::decode_color(col));
}
m_filament_setting_dlg->set_colors(cols);
if (m_filament_setting_dlg->ams_filament_id.empty()) {
m_filament_setting_dlg->set_empty_color(color);
}
else {
m_filament_setting_dlg->set_color(color);
}
m_filament_setting_dlg->ams_filament_id = tray_it->second->setting_id;
m_filament_setting_dlg->m_is_third = !MachineObject::is_bbl_filament(tray_it->second->tag_uid);
@@ -3014,8 +3019,16 @@ void StatusPanel::on_ext_spool_edit(wxCommandEvent &event)
k_val = wxString::Format("%.3f", obj->vt_tray.k);
n_val = wxString::Format("%.3f", obj->vt_tray.n);
wxColor color = AmsTray::decode_color(obj->vt_tray.color);
m_filament_setting_dlg->set_color(color);
m_filament_setting_dlg->ams_filament_id = obj->vt_tray.setting_id;
if (m_filament_setting_dlg->ams_filament_id.empty()) {
m_filament_setting_dlg->set_empty_color(color);
}
else {
m_filament_setting_dlg->set_color(color);
}
m_filament_setting_dlg->m_is_third = !MachineObject::is_bbl_filament(obj->vt_tray.tag_uid);
if (!m_filament_setting_dlg->m_is_third) {
sn_number = obj->vt_tray.uuid;