From 3a6f58ebf0e720caf05a8482e3a1d69ca277e5b6 Mon Sep 17 00:00:00 2001 From: "xin.zhang" Date: Fri, 9 May 2025 18:35:31 +0800 Subject: [PATCH] FIX: update extruder control check dialog jira: [STUDIO-12092] Change-Id: I8a12c92e39c8fd7fb4bde1feb8d70b309ecff060 --- src/slic3r/GUI/StatusPanel.cpp | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/src/slic3r/GUI/StatusPanel.cpp b/src/slic3r/GUI/StatusPanel.cpp index 108a9469c..cd2f92df2 100644 --- a/src/slic3r/GUI/StatusPanel.cpp +++ b/src/slic3r/GUI/StatusPanel.cpp @@ -3976,22 +3976,12 @@ void StatusPanel::on_axis_ctrl_z_down_10(wxCommandEvent &event) void StatusPanel::axis_ctrl_e_hint(bool up_down) { if (ctrl_e_hint_dlg == nullptr) { - ctrl_e_hint_dlg = new SecondaryCheckDialog(this->GetParent(), wxID_ANY, _L("Warning"), SecondaryCheckDialog::ButtonStyle::CONFIRM_AND_CANCEL, wxDefaultPosition, wxDefaultSize, wxCLOSE_BOX | wxCAPTION, true); + ctrl_e_hint_dlg = new SecondaryCheckDialog(this->GetParent(), wxID_ANY, _L("Warning"), SecondaryCheckDialog::ButtonStyle::CONFIRM_AND_CANCEL, wxDefaultPosition, wxDefaultSize, wxCLOSE_BOX, true); ctrl_e_hint_dlg->update_text(_L("Please heat the nozzle to above 170 degree before loading or unloading filament.")); - ctrl_e_hint_dlg->show_again_config_text = std::string("not_show_ectrl_hint"); - } - if (up_down) { - ctrl_e_hint_dlg->update_btn_label(_L("Confirm"), _L("Still unload")); - ctrl_e_hint_dlg->Bind(EVT_SECONDARY_CHECK_CANCEL, [this](wxCommandEvent& e) { - obj->command_axis_control("E", 1.0, -10.0f, 900); - }); - } - else { - ctrl_e_hint_dlg->update_btn_label(_L("Confirm"), _L("Still load")); - ctrl_e_hint_dlg->Bind(EVT_SECONDARY_CHECK_CANCEL, [this](wxCommandEvent& e) { - obj->command_axis_control("E", 1.0, 10.0f, 900); - }); + ctrl_e_hint_dlg->m_show_again_checkbox->Hide(); + ctrl_e_hint_dlg->m_button_cancel->Hide(); } + ctrl_e_hint_dlg->on_show(); } @@ -3999,7 +3989,7 @@ void StatusPanel::on_axis_ctrl_e_up_10(wxCommandEvent &event) { if (obj) { auto current_nozzle_id = obj->m_extder_data.current_extder_id; - if (obj->m_extder_data.extders[current_nozzle_id].temp >= TEMP_THRESHOLD_ALLOW_E_CTRL || (wxGetApp().app_config->get("not_show_ectrl_hint") == "1")) + if (obj->m_extder_data.extders[current_nozzle_id].temp >= TEMP_THRESHOLD_ALLOW_E_CTRL) if (obj->is_enable_np) { obj->command_extruder_control(current_nozzle_id, -10.0f); } else { @@ -4015,7 +4005,7 @@ void StatusPanel::on_axis_ctrl_e_down_10(wxCommandEvent &event) { if (obj) { auto current_nozzle_id = obj->m_extder_data.current_extder_id; - if (obj->m_extder_data.extders[current_nozzle_id].temp >= TEMP_THRESHOLD_ALLOW_E_CTRL || (wxGetApp().app_config->get("not_show_ectrl_hint") == "1")) + if (obj->m_extder_data.extders[current_nozzle_id].temp >= TEMP_THRESHOLD_ALLOW_E_CTRL) if (obj->is_enable_np) { obj->command_extruder_control(current_nozzle_id, 10.0f); } else {