3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-08 07:27:41 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

FIX: [STUDIO-2205] select sync all AMS filaments or only changes

Browse source 
Change-Id: I027158e2baa355c6147fea4d45b63ba564b18d0c
This commit is contained in:
chunmao.guo 2023-02-09 13:08:21 +08:00 • committed by Lane.Wei
parent 6a33848a6d
commit e9c443fcd7
1 changed files with 25 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

39
src/slic3r/GUI/Plater.cpp
View file

@ -1342,7 +1342,7 @@ void Sidebar::on_filaments_change(size_t num_filaments)
sizer->Hide(p->m_flushing_volume_btn); sizer->Hide(p->m_flushing_volume_btn);
} }
p->m_panel_filament_title->Layout(); Layout();
p->m_panel_filament_title->Refresh(); p->m_panel_filament_title->Refresh();
update_ui_from_settings(); update_ui_from_settings();
dynamic_filament_list.update(); dynamic_filament_list.update();
@ -1389,20 +1389,33 @@ void Sidebar::sync_ams_list()
dlg.ShowModal(); dlg.ShowModal();
return; return;
} }
MessageDialog dlg(this,
_L("Sync filaments with AMS will drop all current selected filament presets and colors. Do you want to continue?"),
_L("Sync filaments with AMS"), wxYES_NO);
if (dlg.ShowModal() != wxID_YES) return;
std::string ams_filament_ids = wxGetApp().app_config->get("ams_filament_ids", p->ams_list_device); std::string ams_filament_ids = wxGetApp().app_config->get("ams_filament_ids", p->ams_list_device);
if (!ams_filament_ids.empty()) { std::vector<std::string> list2;
std::vector<std::string> list2; if (!ams_filament_ids.empty())
boost::algorithm::split(list2, ams_filament_ids, boost::algorithm::is_any_of(",")); boost::algorithm::split(list2, ams_filament_ids, boost::algorithm::is_any_of(","));
if (list2.size() == list.size()) { struct SyncAmsDialog : MessageDialog {
for (int i = 0; i < list.size(); ++i) { SyncAmsDialog(wxWindow * parent, bool first): MessageDialog(parent,
list[i].set_key_value("filament_changed", first
new ConfigOptionBool{!list2[i].empty() && list2[i] != list[i].opt_string("filament_id", 0u)}); ? _L("Sync filaments with AMS will drop all current selected filament presets and colors. Do you want to continue?")
: _L("Already did a synchronization, do you want to update only changes or resync all?"),
_L("Sync filaments with AMS"), 0)
{
if (first) {
add_button(wxID_YES, true, _L("Yes"));
} else {
add_button(wxID_OK, true, _L("Update"));
add_button(wxID_YES, false, _L("Resync"));
} }
add_button(wxID_CANCEL, false, _L("Cancel"));
} }
} dlg(this, ams_filament_ids.empty());
auto res = dlg.ShowModal();
if (res == wxID_CANCEL) return;
list2.resize(list.size());
for (int i = 0; i < list.size(); ++i) {
auto filament_id = list[i].opt_string("filament_id", 0u);
list[i].set_key_value("filament_changed", new ConfigOptionBool{res == wxID_YES || list2[i] != filament_id});
list2[i] = filament_id;
} }
unsigned int unknowns = 0; unsigned int unknowns = 0;
auto n = wxGetApp().preset_bundle->sync_ams_list(unknowns); auto n = wxGetApp().preset_bundle->sync_ams_list(unknowns);
@ -1413,8 +1426,6 @@ void Sidebar::sync_ams_list()
dlg.ShowModal(); dlg.ShowModal();
return; return;
} }
std::vector<std::string> list2;
for (auto &f : list) list2.push_back(f.opt_string("filament_id", 0u));
ams_filament_ids = boost::algorithm::join(list2, ","); ams_filament_ids = boost::algorithm::join(list2, ",");
wxGetApp().app_config ->set("ams_filament_ids", p->ams_list_device, ams_filament_ids); wxGetApp().app_config ->set("ams_filament_ids", p->ams_list_device, ams_filament_ids);
if (unknowns > 0) { if (unknowns > 0) {
@ -1426,7 +1437,7 @@ void Sidebar::sync_ams_list()
wxGetApp().plater()->on_filaments_change(n); wxGetApp().plater()->on_filaments_change(n);
for (auto &c : p->combos_filament) for (auto &c : p->combos_filament)
c->update(); c->update();
wxGetApp().get_tab(Preset::TYPE_PRINT)->update(); wxGetApp().get_tab(Preset::TYPE_FILAMENT)->select_preset(wxGetApp().preset_bundle->filament_presets[0]);
wxGetApp().preset_bundle->export_selections(*wxGetApp().app_config); wxGetApp().preset_bundle->export_selections(*wxGetApp().app_config);
dynamic_filament_list.update(); dynamic_filament_list.update();
} }