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

FIX:add mode for syscAMsInfoDialog

Browse Source 
jira: none
Change-Id: Iabfc9953f86cd08a2357a9197d6e1afe8d781d9f
(cherry picked from commit eaeac42b19b322f56b501c0d2ce99c4a6b2fd050)
This commit is contained in:
zhou.xu
2025-01-06 16:38:30 +08:00
committed by Noisyfox
parent ed3175f7a0
commit e2d86888b5
10 changed files with 376 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2627,7 +2627,18 @@ void Sidebar::sync_ams_list()
temp_info.connected_printer = true;
temp_info.first_sync = ams_filament_ids.empty();
SyncAmsInfoDialog sync_dlg(this, temp_info);
auto dlg_res = sync_dlg.ShowModal();
int dlg_res{(int) wxID_CANCEL};
if (sync_dlg.is_need_show()) {
if (sync_dlg.is_dirty_filament()){
wxGetApp().get_tab(Preset::TYPE_FILAMENT)->select_preset(wxGetApp().preset_bundle->filament_presets[0], false, "", false, true);
wxGetApp().preset_bundle->export_selections(*wxGetApp().app_config);
dynamic_filament_list.update();
}
sync_dlg.set_check_dirty_fialment(false);
dlg_res = sync_dlg.ShowModal();
} else {
dlg_res =(int) wxID_YES;
}
if (dlg_res == wxID_CANCEL)
return;
auto sync_result = sync_dlg.get_result();
@@ -2672,9 +2683,9 @@ void Sidebar::sync_ams_list()
wxGetApp().plater()->on_filaments_change(n);
for (auto& c : p->combos_filament)
c->update();
wxGetApp().get_tab(Preset::TYPE_FILAMENT)->select_preset(wxGetApp().preset_bundle->filament_presets[0]);
/*wxGetApp().get_tab(Preset::TYPE_FILAMENT)->select_preset(wxGetApp().preset_bundle->filament_presets[0]);
wxGetApp().preset_bundle->export_selections(*wxGetApp().app_config);
update_dynamic_filament_list();
update_dynamic_filament_list();*/
// Expand filament list
p->m_panel_filament_content->SetMaxSize({-1, -1});
// BBS:Synchronized consumables information