mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX:fixed send button refresh too many times 

Change-Id: Ifb0b9e4d2e6ed7997ba7f033d555ea3aeec9fa9c
This commit is contained in:
tao wang 2023-08-21 17:33:18 +08:00 committed by Lane.Wei
parent ae7a9303b8
commit 297e4d1373
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/slic3r/GUI/SelectMachine.cpp
View File

@ -1681,7 +1681,7 @@ void SelectMachineDialog::update_select_layout(MachineObject *obj)
Fit(); Fit();
} }
void SelectMachineDialog::prepare_mode() void SelectMachineDialog::prepare_mode(bool refresh_button)
{ {
// disable combobox // disable combobox
m_comboBox_printer->Enable(); m_comboBox_printer->Enable();
@ -1696,7 +1696,9 @@ void SelectMachineDialog::prepare_mode()
if (wxIsBusy()) if (wxIsBusy())
wxEndBusyCursor(); wxEndBusyCursor();
Enable_Send_Button(true); if (refresh_button) {
Enable_Send_Button(true);
}
m_status_bar->reset(); m_status_bar->reset();
if (m_simplebook->GetSelection() != 0) { if (m_simplebook->GetSelection() != 0) {
@ -2014,13 +2016,6 @@ void SelectMachineDialog::show_status(PrintDialogStatus status, std::vector<wxSt
else else
m_comboBox_printer->Enable(); m_comboBox_printer->Enable();
// m_panel_warn m_simplebook
if (status == PrintDialogStatus::PrintStatusSending) {
sending_mode();
} else {
prepare_mode();
}
// other // other
if (status == PrintDialogStatus::PrintStatusInit) { if (status == PrintDialogStatus::PrintStatusInit) {
update_print_status_msg(wxEmptyString, false, false); update_print_status_msg(wxEmptyString, false, false);
@ -2162,6 +2157,14 @@ void SelectMachineDialog::show_status(PrintDialogStatus status, std::vector<wxSt
Enable_Send_Button(false); Enable_Send_Button(false);
Enable_Refresh_Button(true); Enable_Refresh_Button(true);
} }
// m_panel_warn m_simplebook
if (status == PrintDialogStatus::PrintStatusSending) {
sending_mode();
}
else {
prepare_mode(false);
}
} }
void SelectMachineDialog::init_timer() void SelectMachineDialog::init_timer()

2
src/slic3r/GUI/SelectMachine.hpp
View File

@ -400,7 +400,7 @@ public:
void check_fcous_state(wxWindow* window); void check_fcous_state(wxWindow* window);
void popup_filament_backup(); void popup_filament_backup();
void update_select_layout(MachineObject *obj); void update_select_layout(MachineObject *obj);
void prepare_mode(); void prepare_mode(bool refresh_button = true);
void sending_mode(); void sending_mode();
void finish_mode(); void finish_mode();
void sync_ams_mapping_result(std::vector<FilamentInfo>& result); void sync_ams_mapping_result(std::vector<FilamentInfo>& result);