From cb89a9eb12cef2e13f788c45313c06189d8c19f5 Mon Sep 17 00:00:00 2001 From: "xin.zhang" Date: Tue, 21 Jan 2025 16:20:40 +0800 Subject: [PATCH] FIX: dynamic flow cali is default to auto jira: [STUDIO-10085] Change-Id: I8cac8ea2fddf1fafacf69680a983315c71e751a0 --- src/slic3r/GUI/SelectMachine.cpp | 36 -------------------------------- 1 file changed, 36 deletions(-) diff --git a/src/slic3r/GUI/SelectMachine.cpp b/src/slic3r/GUI/SelectMachine.cpp index 5176b9604..ef3fe9c8d 100644 --- a/src/slic3r/GUI/SelectMachine.cpp +++ b/src/slic3r/GUI/SelectMachine.cpp @@ -986,7 +986,6 @@ void SelectMachineDialog::update_select_layout(MachineObject *obj) } update_timelapse_enable_status(); - update_flow_cali_check(obj); if (config && config->get("print", "timelapse") == "0") { m_checkbox_list["timelapse"]->setValue("off"); @@ -3005,23 +3004,11 @@ void SelectMachineDialog::on_selection_changed(wxCommandEvent &event) //reset print status - update_flow_cali_check(obj); - show_status(PrintDialogStatus::PrintStatusInit); update_show_status(); } -void SelectMachineDialog::update_flow_cali_check(MachineObject* obj) -{ - auto bed_type = m_plater->get_partplate_list().get_curr_plate()->get_bed_type(true); - auto show_cali_tips = true; - - if (obj && obj->get_printer_arch() == PrinterArch::ARCH_I3) { show_cali_tips = false; } - - set_flow_calibration_state(true, show_cali_tips); -} - void SelectMachineDialog::update_ams_check(MachineObject *obj) { if (!obj) {return;} @@ -3541,26 +3528,6 @@ void SelectMachineDialog::on_dpi_changed(const wxRect &suggested_rect) Refresh(); } -void SelectMachineDialog::set_flow_calibration_state(bool state, bool show_tips) -{ - if (!state) { - m_checkbox_list["flow_cali"]->setValue(state ? "on" : "off"); - m_checkbox_list["flow_cali"]->Enable(); - } - else { - - AppConfig* config = wxGetApp().app_config; - if (config && config->get("print", "flow_cali") == "0") { - m_checkbox_list["flow_cali"]->setValue("off"); - } - else { - m_checkbox_list["flow_cali"]->setValue("on"); - } - - m_checkbox_list["flow_cali"]->Enable(); - } -} - void SelectMachineDialog::set_default() { if (m_print_type == PrintFromType::FROM_NORMAL) { @@ -4321,9 +4288,6 @@ void SelectMachineDialog::set_default_from_sdcard() m_basic_panel->Layout(); m_basic_panel->Fit(); - - set_flow_calibration_state(true); - wxSize screenSize = wxGetDisplaySize(); auto dialogSize = this->GetSize();