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

NEW:Support setting filaments in printing

Browse Source 
jira:[set filament]

Change-Id: Ib37896f9101d93ca63c7edb0b1e6328045a5ddb3
(cherry picked from commit fa2dbd7ada18bc806be845673cce9eb4559cda80)
This commit is contained in:
tao wang
2024-08-13 11:41:45 +08:00
committed by Noisyfox
parent e9f9cf5c0a
commit 8eece6a66f
3 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -413,7 +413,13 @@ void AMSMaterialsSetting::update()
void AMSMaterialsSetting::enable_confirm_button(bool en)
{
m_button_confirm->Show(en);
if (!en) {
m_button_confirm->Show(obj->is_support_filament_setting_inprinting);
}
else {
m_button_confirm->Show(en);
}
if (!m_is_third) {
m_tip_readonly->Hide();
}
@@ -705,7 +711,7 @@ void AMSMaterialsSetting::on_picker_color(wxCommandEvent& event)
void AMSMaterialsSetting::on_clr_picker(wxMouseEvent &event)
{
if(!m_is_third || obj->is_in_printing() || obj->can_resume())
if(!m_is_third || !obj->is_support_filament_setting_inprinting)
return;
@@ -922,8 +928,8 @@ void AMSMaterialsSetting::Popup(wxString filament, wxString sn, wxString temp_mi
}
m_button_reset->Show();
m_button_confirm->Show();
}
//m_button_confirm->Show();
}
m_comboBox_filament->Set(filament_items);
m_comboBox_filament->SetSelection(selection_idx);