From 8a92c26aad11aa089d9a93beed813667013ec617 Mon Sep 17 00:00:00 2001 From: "zhou.xu" Date: Fri, 17 Jan 2025 13:27:41 +0800 Subject: [PATCH] FIX:add deal_btn_sync api jira: none Change-Id: Ib0d2cd95a927622f746767c606cfb1feb56240a6 --- src/slic3r/GUI/Plater.cpp | 22 +++++++++++++--------- src/slic3r/GUI/Plater.hpp | 1 + 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index 06f8a3a66..31a8fd5dd 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -1218,14 +1218,6 @@ bool Sidebar::priv::sync_extruder_list() AMSCountPopupWindow::SetAMSCount(main_index, main_4, main_1); AMSCountPopupWindow::UpdateAMSCount(0, left_extruder); AMSCountPopupWindow::UpdateAMSCount(1, right_extruder); - - SyncNozzleAndAmsDialog::InputInfo temp_na_info; - wxPoint big_btn_pt; - wxSize big_btn_size; - wxGetApp().plater()->sidebar().get_big_btn_sync_pos_size(big_btn_pt, big_btn_size); - temp_na_info.dialog_pos = big_btn_pt + wxPoint(big_btn_size.x, big_btn_size.y) + wxPoint(FromDIP(big_btn_size.x / 10.f - 2), FromDIP(big_btn_size.y / 10.f)); - SyncNozzleAndAmsDialog na_dialog(nullptr, temp_na_info); - na_dialog.ShowModal(); return true; } @@ -1644,7 +1636,7 @@ Sidebar::Sidebar(Plater *parent) btn_sync->SetMaxSize(PRINTER_PANEL_SIZE); btn_sync->SetVertical(); btn_sync->Bind(wxEVT_BUTTON, [this](wxCommandEvent &e) { - p->sync_extruder_list(); + deal_btn_sync(); }); p->timer_sync_printer->Bind(wxEVT_TIMER, [this] (wxTimerEvent & e) { p->flush_printer_sync(); @@ -3091,6 +3083,18 @@ bool Sidebar::is_multifilament() return p->combos_filament.size() > 1; } +void Sidebar::deal_btn_sync() { + p->sync_extruder_list(); + + SyncNozzleAndAmsDialog::InputInfo temp_na_info; + wxPoint big_btn_pt; + wxSize big_btn_size; + wxGetApp().plater()->sidebar().get_big_btn_sync_pos_size(big_btn_pt, big_btn_size); + temp_na_info.dialog_pos = big_btn_pt + wxPoint(big_btn_size.x, big_btn_size.y) + wxPoint(FromDIP(big_btn_size.x / 10.f - 2), FromDIP(big_btn_size.y / 10.f)); + SyncNozzleAndAmsDialog na_dialog(nullptr, temp_na_info); + na_dialog.ShowModal(); +} + static std::vector get_search_inputs(ConfigOptionMode mode) { std::vector ret {}; diff --git a/src/slic3r/GUI/Plater.hpp b/src/slic3r/GUI/Plater.hpp index 867c72142..35b4103b6 100644 --- a/src/slic3r/GUI/Plater.hpp +++ b/src/slic3r/GUI/Plater.hpp @@ -187,6 +187,7 @@ public: bool show_export_removable(bool show) const; bool get_eject_shown() const; bool is_multifilament(); + void deal_btn_sync(); void update_mode(); bool is_collapsed(); void collapse(bool collapse);