3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2026-01-01 20:40:41 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

FIX:add deal_btn_sync api

Browse source 
jira: none
Change-Id: Ib0d2cd95a927622f746767c606cfb1feb56240a6
(cherry picked from commit 8a92c26aad11aa089d9a93beed813667013ec617)
This commit is contained in:
zhou.xu 2025-01-17 13:27:41 +08:00 • committed by Noisyfox
parent 0ad660b1d3
commit dfa9e8d3bd
2 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1174,14 +1174,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;
}
@ -1603,7 +1595,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();
@ -2981,6 +2973,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<Search::InputInfo> get_search_inputs(ConfigOptionMode mode)
{
std::vector<Search::InputInfo> ret {};

1
src/slic3r/GUI/Plater.hpp
View file

@ -200,6 +200,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);