juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-09-13 20:17:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX: impl sync extruder information & fix something

Browse Source 
Change-Id: I5f7224f646729cba94505487d00015a8e48443c5
(cherry picked from commit 26bf483bfe089cc6730e1c1da452497feb320520)
This commit is contained in:
chunmao.guo
2024-07-08 16:32:21 +08:00
committed by Noisyfox
parent 76a8cc6ba4
commit 9433db8d54
2 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/slic3r/GUI/Plater.cpp
View File

@@ -739,8 +739,20 @@ void Sidebar::priv::sync_extruder_list()
auto printer_tab = dynamic_cast<TabPrinter *>(wxGetApp().get_tab(Preset::TYPE_PRINTER)); auto printer_tab = dynamic_cast<TabPrinter *>(wxGetApp().get_tab(Preset::TYPE_PRINTER));
printer_tab->set_extruder_volume_type(0, NozzleVolumeType::nvtBigTraffic); printer_tab->set_extruder_volume_type(0, NozzleVolumeType::nvtBigTraffic);
printer_tab->set_extruder_volume_type(1, NozzleVolumeType::nvtNormal); printer_tab->set_extruder_volume_type(1, NozzleVolumeType::nvtNormal);
AMSCountPopupWindow::SetAMSCount(0, 0, 0); MachineObject *obj = wxGetApp().getDeviceManager()->get_selected_machine();
AMSCountPopupWindow::SetAMSCount(1, 1, 1); if (obj == nullptr) {
MessageDialog dlg(this->plater, _L("Please select a printer in 'Device' page first."), _L("Sync extruder infomation"), wxOK);
dlg.ShowModal();
return;
}
int left = 0, right = 0;
for (auto ams : obj->amsList) {
// Main (first) extruder at right
if (ams.second->nozzle == 0) ++right;
else ++left;
}
AMSCountPopupWindow::SetAMSCount(0, left, obj->vt_slot.size() > 1);
AMSCountPopupWindow::SetAMSCount(1, right, 1);
AMSCountPopupWindow::UpdateAMSCount(0, m_left_ams_count); AMSCountPopupWindow::UpdateAMSCount(0, m_left_ams_count);
AMSCountPopupWindow::UpdateAMSCount(1, m_right_ams_count); AMSCountPopupWindow::UpdateAMSCount(1, m_right_ams_count);
} }

3
src/slic3r/GUI/Tab.cpp
View File

@@ -4468,6 +4468,7 @@ if (is_marlin_flavor)
} }
update_dirty(); update_dirty();
on_value_change(opt_key, value);
update(); update();
}; };
@@ -5571,6 +5572,8 @@ bool Tab::tree_sel_change_delayed(wxCommandEvent& event)
// update_undo_buttons(); // update_undo_buttons();
this->OnActivate(); this->OnActivate();
m_parent->set_active_tab(this); m_parent->set_active_tab(this);
m_main_sizer->Show(m_extruder_switch, !m_active_page->m_opt_id_map.empty());
GetParent()->Layout();
m_page_view->Thaw(); m_page_view->Thaw();
return false; return false;