juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-06-10 05:52:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

ENH:add "update_sync_ams_btn_enable" api

Browse Source 
jira: none
Change-Id: I6380a4380bf402e3f0867faddf188f93658c2d68
(cherry picked from commit ac7d7726d66e77eeb1ac1755ff71652d12e1e2a2)
This commit is contained in:
zhou.xu
2025-02-15 11:27:16 +08:00
committed by Noisyfox
parent af44f4736d
commit 42ed41a4e6
2 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1131,6 +1131,7 @@ bool Sidebar::priv::sync_extruder_list(bool &only_external_material)
printer_tab->set_extruder_volume_type(1, NozzleVolumeType::nvtStandard); printer_tab->set_extruder_volume_type(1, NozzleVolumeType::nvtStandard);
MachineObject *obj = wxGetApp().getDeviceManager()->get_selected_machine(); MachineObject *obj = wxGetApp().getDeviceManager()->get_selected_machine();
auto printer_name = plater->get_selected_printer_name_in_combox(); auto printer_name = plater->get_selected_printer_name_in_combox();
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << __LINE__ << " begin sync_extruder_list";
if (obj == nullptr) { if (obj == nullptr) {
plater->pop_warning_and_go_to_device_page(printer_name, Plater::PrinterWarningType::NOT_CONNECTED, _L("Sync printer information")); plater->pop_warning_and_go_to_device_page(printer_name, Plater::PrinterWarningType::NOT_CONNECTED, _L("Sync printer information"));
return false; return false;
@@ -1168,6 +1169,7 @@ bool Sidebar::priv::sync_extruder_list(bool &only_external_material)
printer_tab->select_preset(machine_preset->name); printer_tab->select_preset(machine_preset->name);
}); });
} }
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << __LINE__ << " go on sync_extruder_list";
int deputy_4 = 0, main_4 = 0, deputy_1 = 0, main_1 = 0; int deputy_4 = 0, main_4 = 0, deputy_1 = 0, main_1 = 0;
for (auto ams : obj->amsList) { for (auto ams : obj->amsList) {
@@ -1194,6 +1196,7 @@ bool Sidebar::priv::sync_extruder_list(bool &only_external_material)
AMSCountPopupWindow::SetAMSCount(main_index, main_4, main_1); AMSCountPopupWindow::SetAMSCount(main_index, main_4, main_1);
AMSCountPopupWindow::UpdateAMSCount(0, left_extruder); AMSCountPopupWindow::UpdateAMSCount(0, left_extruder);
AMSCountPopupWindow::UpdateAMSCount(1, right_extruder); AMSCountPopupWindow::UpdateAMSCount(1, right_extruder);
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << __LINE__ << " finish sync_extruder_list";
return true; return true;
} }
@@ -1364,6 +1367,16 @@ void Sidebar::priv::update_sync_status(const MachineObject *obj)
#define PRINTER_PANEL_SIZE_SMALL (wxSize(FromDIP(98), FromDIP(68))) #define PRINTER_PANEL_SIZE_SMALL (wxSize(FromDIP(98), FromDIP(68)))
#define PRINTER_PANEL_SIZE (wxSize(FromDIP(98), FromDIP(98))) #define PRINTER_PANEL_SIZE (wxSize(FromDIP(98), FromDIP(98)))
void Sidebar::update_sync_ams_btn_enable(wxUpdateUIEvent &e)
{
if (m_last_slice_state != p->plater->is_background_process_slicing()) {
m_last_slice_state = p->plater->is_background_process_slicing();
btn_sync->Enable(!m_last_slice_state);
ams_btn->Enable(!m_last_slice_state);
Refresh();
}
}
Sidebar::Sidebar(Plater *parent) Sidebar::Sidebar(Plater *parent)
: wxPanel(parent, wxID_ANY, wxDefaultPosition, wxSize(42 * wxGetApp().em_unit(), -1)), p(new priv(parent)) : wxPanel(parent, wxID_ANY, wxDefaultPosition, wxSize(42 * wxGetApp().em_unit(), -1)), p(new priv(parent))
{ {
@@ -1625,6 +1638,7 @@ Sidebar::Sidebar(Plater *parent)
btn_sync->SetMinSize(PRINTER_PANEL_SIZE); btn_sync->SetMinSize(PRINTER_PANEL_SIZE);
btn_sync->SetMaxSize(PRINTER_PANEL_SIZE); btn_sync->SetMaxSize(PRINTER_PANEL_SIZE);
btn_sync->SetVertical(); btn_sync->SetVertical();
btn_sync->Bind(wxEVT_UPDATE_UI, &Sidebar::update_sync_ams_btn_enable, this);
btn_sync->Bind(wxEVT_BUTTON, [this](wxCommandEvent &e) { btn_sync->Bind(wxEVT_BUTTON, [this](wxCommandEvent &e) {
deal_btn_sync(); deal_btn_sync();
}); });
@@ -1762,6 +1776,8 @@ Sidebar::Sidebar(Plater *parent)
ams_btn->Bind(wxEVT_BUTTON, [this, scrolled_sizer](wxCommandEvent &e) { ams_btn->Bind(wxEVT_BUTTON, [this, scrolled_sizer](wxCommandEvent &e) {
sync_ams_list(); sync_ams_list();
}); });
ams_btn->Bind(wxEVT_UPDATE_UI, &Sidebar::update_sync_ams_btn_enable, this);
p->m_bpButton_ams_filament = ams_btn; p->m_bpButton_ams_filament = ams_btn;
bSizer39->Add(ams_btn, 0, wxALIGN_CENTER | wxLEFT, FromDIP(SidebarProps::IconSpacing())); bSizer39->Add(ams_btn, 0, wxALIGN_CENTER | wxLEFT, FromDIP(SidebarProps::IconSpacing()));

3
src/slic3r/GUI/Plater.hpp
View File

@@ -128,6 +128,7 @@ class Sidebar : public wxPanel
ConfigOptionMode m_mode; ConfigOptionMode m_mode;
Button * btn_sync{nullptr}; Button * btn_sync{nullptr};
ScalableButton * ams_btn{nullptr}; ScalableButton * ams_btn{nullptr};
bool m_last_slice_state = false;
std::shared_ptr<SyncNozzleAndAmsDialog> m_sna_dialog{nullptr}; std::shared_ptr<SyncNozzleAndAmsDialog> m_sna_dialog{nullptr};
std::shared_ptr<FinishSyncAmsDialog> m_fna_dialog{nullptr}; std::shared_ptr<FinishSyncAmsDialog> m_fna_dialog{nullptr};
std::vector<BedType> m_cur_combox_bed_types; std::vector<BedType> m_cur_combox_bed_types;
@@ -135,6 +136,8 @@ class Sidebar : public wxPanel
bool m_begin_sync_printer_status{false}; bool m_begin_sync_printer_status{false};
std::shared_ptr<SyncAmsInfoDialog> m_sync_dlg{nullptr}; std::shared_ptr<SyncAmsInfoDialog> m_sync_dlg{nullptr};
void update_sync_ams_btn_enable(wxUpdateUIEvent &e);
public: public:
enum DockingState enum DockingState
{ {