From bba4b993f555bf401df3981702ae129fdb259255 Mon Sep 17 00:00:00 2001 From: tao wang Date: Tue, 30 May 2023 20:25:07 +0800 Subject: [PATCH] ENH:enable flow calibration when using Textured PEI Plate Change-Id: I34d5ae8a04f97eb4559b27a87f87a894650f6e39 --- src/slic3r/GUI/SelectMachine.cpp | 58 ++++++++++++++++---------------- src/slic3r/GUI/SelectMachine.hpp | 4 +-- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/src/slic3r/GUI/SelectMachine.cpp b/src/slic3r/GUI/SelectMachine.cpp index a401f2e633..e8f445fb0c 100644 --- a/src/slic3r/GUI/SelectMachine.cpp +++ b/src/slic3r/GUI/SelectMachine.cpp @@ -1646,7 +1646,7 @@ wxWindow *SelectMachineDialog::create_item_checkbox(wxString title, wxWindow *pa check->Bind(wxEVT_LEFT_DOWN, [this, check, param](wxMouseEvent &e) { - if (!m_checkbox_state_list[param]) {return;} + //if (!m_checkbox_state_list[param]) {return;} AppConfig* config = wxGetApp().app_config; if (config) { if (check->GetValue()) @@ -1658,7 +1658,7 @@ wxWindow *SelectMachineDialog::create_item_checkbox(wxString title, wxWindow *pa }); checkbox->Bind(wxEVT_LEFT_DOWN, [this, check, param](wxMouseEvent&) { - if (!m_checkbox_state_list[param]) {return;} + //if (!m_checkbox_state_list[param]) {return;} check->SetValue(check->GetValue() ? false : true); AppConfig* config = wxGetApp().app_config; if (config) { @@ -1670,7 +1670,7 @@ wxWindow *SelectMachineDialog::create_item_checkbox(wxString title, wxWindow *pa }); text->Bind(wxEVT_LEFT_DOWN, [this, check, param](wxMouseEvent &) { - if (!m_checkbox_state_list[param]) {return;} + //if (!m_checkbox_state_list[param]) {return;} check->SetValue(check->GetValue() ? false : true); AppConfig* config = wxGetApp().app_config; if (config) { @@ -1681,7 +1681,7 @@ wxWindow *SelectMachineDialog::create_item_checkbox(wxString title, wxWindow *pa } }); - m_checkbox_state_list[param] = true; + //m_checkbox_state_list[param] = true; m_checkbox_list[param] = check; return checkbox; } @@ -3302,27 +3302,27 @@ wxImage *SelectMachineDialog::LoadImageFromBlob(const unsigned char *data, int s return NULL; } -void SelectMachineDialog::set_flow_calibration_state(bool state) -{ - if (!state) { - m_checkbox_list["flow_cali"]->SetValue(state); - m_checkbox_list["flow_cali"]->SetToolTip(_L("Extrusion compensation calibration is not supported when using Textured PEI Plate")); - m_checkbox_list["flow_cali"]->Disable(); - m_checkbox_state_list["flow_cali"] = state; - for (auto win : select_flow->GetWindowChildren()) { - win->SetToolTip(_L("Extrusion compensation calibration is not supported when using Textured PEI Plate")); - } - select_flow->SetToolTip(_L("Extrusion compensation calibration is not supported when using Textured PEI Plate")); - } - else { - m_checkbox_list["flow_cali"]->SetValue(state); - m_checkbox_list["flow_cali"]->Enable(); - m_checkbox_state_list["flow_cali"] = state; - for (auto win : select_flow->GetWindowChildren()) { - win->SetToolTip( _L("Flow Calibration")); - } - } -} +//void SelectMachineDialog::set_flow_calibration_state(bool state) +//{ +// if (!state) { +// m_checkbox_list["flow_cali"]->SetValue(state); +// m_checkbox_list["flow_cali"]->SetToolTip(_L("Extrusion compensation calibration is not supported when using Textured PEI Plate")); +// m_checkbox_list["flow_cali"]->Disable(); +// m_checkbox_state_list["flow_cali"] = state; +// for (auto win : select_flow->GetWindowChildren()) { +// win->SetToolTip(_L("Extrusion compensation calibration is not supported when using Textured PEI Plate")); +// } +// select_flow->SetToolTip(_L("Extrusion compensation calibration is not supported when using Textured PEI Plate")); +// } +// else { +// m_checkbox_list["flow_cali"]->SetValue(state); +// m_checkbox_list["flow_cali"]->Enable(); +// m_checkbox_state_list["flow_cali"] = state; +// for (auto win : select_flow->GetWindowChildren()) { +// win->SetToolTip( _L("Flow Calibration")); +// } +// } +//} void SelectMachineDialog::set_default() { @@ -3564,13 +3564,13 @@ void SelectMachineDialog::set_default_normal() m_scrollable_view->SetMaxSize(m_scrollable_region->GetSize()); //disable pei bed - auto bed_type = m_plater->get_partplate_list().get_curr_plate()->get_bed_type(true); + /*auto bed_type = m_plater->get_partplate_list().get_curr_plate()->get_bed_type(true); if (bed_type == BedType::btPTE) { set_flow_calibration_state(false); } else { set_flow_calibration_state(true); - } + }*/ wxSize screenSize = wxGetDisplaySize(); auto dialogSize = this->GetSize(); @@ -3720,13 +3720,13 @@ void SelectMachineDialog::set_default_from_sdcard() m_scrollable_view->SetMaxSize(m_scrollable_region->GetSize()); //disable pei bed - auto bed_type = m_plater->get_partplate_list().get_curr_plate()->get_bed_type(true); + /*auto bed_type = m_plater->get_partplate_list().get_curr_plate()->get_bed_type(true); if (bed_type == BedType::btPTE) { set_flow_calibration_state(false); } else { set_flow_calibration_state(true); - } + }*/ wxSize screenSize = wxGetDisplaySize(); auto dialogSize = this->GetSize(); diff --git a/src/slic3r/GUI/SelectMachine.hpp b/src/slic3r/GUI/SelectMachine.hpp index 0d57a74935..5cbda9c7e0 100644 --- a/src/slic3r/GUI/SelectMachine.hpp +++ b/src/slic3r/GUI/SelectMachine.hpp @@ -305,7 +305,7 @@ private: StateColor m_btn_bg_enable; std::map m_checkbox_list; - std::map m_checkbox_state_list; + //std::map m_checkbox_state_list; std::vector m_bedtype_list; std::vector m_list; std::vector m_filaments; @@ -440,7 +440,7 @@ public: void update_priner_status_msg(wxString msg, bool is_warning = false); void update_print_status_msg(wxString msg, bool is_warning = false, bool is_printer = true); void update_print_error_info(int code, std::string msg, std::string extra); - void set_flow_calibration_state(bool state); + //void set_flow_calibration_state(bool state); bool is_show_timelapse(); bool is_same_printer_model(); bool has_tips(MachineObject* obj);