juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-17 02:22:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX:add idel heating protection

Browse Source 
jira:[STUDIO-14359][STUDIO-14431]

Change-Id: I2ecb6c78c4b28d6f14c45dbb1f905b95a9d8c4ab
(cherry picked from commit f6eee61915b47321c1cb44e3ff2306875c32466b)
This commit is contained in:
milk
2025-09-15 21:41:05 +08:00
committed by Noisyfox
parent 434d2142e4
commit 7608195e17
7 changed files with 197 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

151
src/slic3r/GUI/SafetyOptionsDialog.cpp
View File

@@ -8,6 +8,7 @@
#include "DeviceCore/DevConfig.h"
#include "DeviceCore/DevExtruderSystem.h"
#include "DeviceCore/DevNozzleSystem.h"
#include "DeviceCore/DevPrintOptions.h"
static const wxColour STATIC_BOX_LINE_COL = wxColour(238, 238, 238);
static const wxColour STATIC_TEXT_CAPTION_COL = wxColour(100, 100, 100);
@@ -58,7 +59,7 @@ SafetyOptionsDialog::SafetyOptionsDialog(wxWindow* parent)
evt.Skip();
});
open_door_switch_board->Bind(wxCUSTOMEVT_SWITCH_POS, [this](wxCommandEvent &evt)
m_open_door_switch_board->Bind(wxCUSTOMEVT_SWITCH_POS, [this](wxCommandEvent &evt)
{
if (evt.GetInt() == 0)
{
@@ -71,6 +72,35 @@ SafetyOptionsDialog::SafetyOptionsDialog(wxWindow* parent)
evt.Skip();
});
m_cb_idel_heating_protection->Bind(wxEVT_TOGGLEBUTTON, [this](wxCommandEvent &evt) {
if (obj)
{
obj->GetPrintOptions()->command_xcam_control_idelheatingprotect_detector(m_cb_idel_heating_protection->GetValue());
}
else
{
BOOST_LOG_TRIVIAL(warning) << __FUNCTION__ << "obj is empty";
}
evt.Skip();
});
auto toast_click = [this](wxMouseEvent &e) {
if (m_idel_protect_unavailable) {
show_idel_heating_toast(_L("Unavailable while heating maintenance function is on."));
}
e.Skip();
};
m_text_idel_heating_protection->Bind(wxEVT_LEFT_DOWN, toast_click);
m_text_idel_heating_protection_caption->Bind(wxEVT_LEFT_DOWN, toast_click);
m_idel_heating_container->Bind(wxEVT_LEFT_DOWN, toast_click);
m_idel_heating_toast_timer.SetOwner(this);
Bind( wxEVT_TIMER, [this](wxTimerEvent &e) {
if (m_idel_heating_toast) {
m_idel_heating_toast->Destroy();
m_idel_heating_toast = nullptr;
}}, m_idel_heating_toast_timer.GetId());
wxGetApp().UpdateDlgDarkUI(this);
}
@@ -87,41 +117,70 @@ void SafetyOptionsDialog::update_options(MachineObject* obj_)
{
if (!obj_) return;
UpdateOptionOpenDoorCheck(obj_);
updateOpenDoorCheck(obj_);
updateIdelHeatingProtect(obj_);
this->Freeze();
this->Thaw();
Layout();
}
void SafetyOptionsDialog::UpdateOptionOpenDoorCheck(MachineObject *obj) {
void SafetyOptionsDialog::updateOpenDoorCheck(MachineObject *obj) {
if (!obj || !obj->support_door_open_check()) {
m_cb_open_door->Hide();
text_open_door->Hide();
open_door_switch_board->Hide();
m_text_open_door->Hide();
m_open_door_switch_board->Hide();
return;
}
if (obj->get_door_open_check_state() != MachineObject::DOOR_OPEN_CHECK_DISABLE) {
m_cb_open_door->SetValue(true);
open_door_switch_board->Enable();
m_open_door_switch_board->Enable();
if (obj->get_door_open_check_state() == MachineObject::DOOR_OPEN_CHECK_ENABLE_WARNING) {
open_door_switch_board->updateState("left");
open_door_switch_board->Refresh();
m_open_door_switch_board->updateState("left");
m_open_door_switch_board->Refresh();
} else if (obj->get_door_open_check_state() == MachineObject::DOOR_OPEN_CHECK_ENABLE_PAUSE_PRINT) {
open_door_switch_board->updateState("right");
open_door_switch_board->Refresh();
m_open_door_switch_board->updateState("right");
m_open_door_switch_board->Refresh();
}
} else {
m_cb_open_door->SetValue(false);
open_door_switch_board->Disable();
m_open_door_switch_board->Disable();
}
m_cb_open_door->Show();
text_open_door->Show();
open_door_switch_board->Show();
m_text_open_door->Show();
m_open_door_switch_board->Show();
}
void SafetyOptionsDialog::updateIdelHeatingProtect(MachineObject *obj)
{
if (obj->is_support_idelheadingprotect_detection) {
m_idel_heating_container->Show();
} else {
m_idel_heating_container->Hide();
m_idel_protect_unavailable = false;
return;
}
if (obj->GetPrintOptions()->GetIdelHeatingProtectEenabled() == 2)
{
m_cb_idel_heating_protection->SetValue(false);
m_cb_idel_heating_protection->Enable(false);
m_text_idel_heating_protection->SetForegroundColour(wxColour(170, 170, 170));
m_text_idel_heating_protection_caption->SetForegroundColour(wxColour(170, 170, 170));
m_cb_idel_heating_protection->SetBackgroundColour(wxColour(255, 255, 255));
m_idel_protect_unavailable = true;
} else {
m_cb_idel_heating_protection->Enable(true);
m_cb_idel_heating_protection->SetValue(obj->GetPrintOptions()->GetIdelHeatingProtectEenabled());
m_text_idel_heating_protection->SetForegroundColour(*wxBLACK);
m_text_idel_heating_protection_caption->SetForegroundColour(STATIC_TEXT_CAPTION_COL);
m_cb_idel_heating_protection->SetForegroundColour(*wxBLACK);
m_idel_protect_unavailable = false;
}
}
wxBoxSizer* SafetyOptionsDialog::create_settings_group(wxWindow* parent)
@@ -131,19 +190,44 @@ wxBoxSizer* SafetyOptionsDialog::create_settings_group(wxWindow* parent)
//Open Door Detection
wxBoxSizer* line_sizer = new wxBoxSizer(wxHORIZONTAL);
m_cb_open_door = new CheckBox(parent);
text_open_door = new Label(parent, _L("Open Door Detection"));
text_open_door->SetFont(Label::Body_14);
open_door_switch_board = new SwitchBoard(parent, _L("Notification"), _L("Pause printing"), wxSize(FromDIP(200), FromDIP(26)));
open_door_switch_board->Disable();
line_sizer->Add(FromDIP(5), 0, 0, 0);
m_text_open_door = new Label(parent, _L("Open Door Detection"));
m_text_open_door->SetFont(Label::Body_14);
m_open_door_switch_board = new SwitchBoard(parent, _L("Notification"), _L("Pause printing"), wxSize(FromDIP(200), FromDIP(26)));
m_open_door_switch_board->Disable();
line_sizer->AddSpacer(FromDIP(5));
line_sizer->Add(m_cb_open_door, 0, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(5));
line_sizer->Add(text_open_door, 1, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(5));
line_sizer->Add(m_text_open_door, 1, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(5));
sizer->Add(line_sizer, 0, wxEXPAND | wxLEFT | wxRIGHT, FromDIP(18));
sizer->Add(open_door_switch_board, 0, wxLEFT, FromDIP(58));
sizer->Add(m_open_door_switch_board, 0, wxLEFT, FromDIP(65));
line_sizer->Add(FromDIP(10), 0, 0, 0);
sizer->Add(0, 0, 0, wxTOP, FromDIP(15));
//Idel Heating Protect
m_idel_heating_container = new wxPanel(parent, wxID_ANY);
m_idel_heating_container->SetBackgroundColour(*wxWHITE);
wxBoxSizer* idel_container_sizer = new wxBoxSizer(wxVERTICAL);
line_sizer = new wxBoxSizer(wxHORIZONTAL);
m_cb_idel_heating_protection = new CheckBox(m_idel_heating_container);
m_text_idel_heating_protection = new Label(m_idel_heating_container, _L("Idel Heating Protection"));
m_text_idel_heating_protection->SetFont(Label::Body_14);
line_sizer->AddSpacer(FromDIP(5));
line_sizer->Add(m_cb_idel_heating_protection, 0, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(5));
line_sizer->Add(m_text_idel_heating_protection, 1, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(5));
idel_container_sizer->Add(line_sizer, 0, wxEXPAND | wxLEFT | wxRIGHT, FromDIP(18));
line_sizer = new wxBoxSizer(wxHORIZONTAL);
m_text_idel_heating_protection_caption = new Label(m_idel_heating_container, _L("Stops heating automatically after 5 mins of idle to ensure safety."));
m_text_idel_heating_protection_caption->SetFont(Label::Body_12);
m_text_idel_heating_protection_caption->SetForegroundColour(STATIC_TEXT_CAPTION_COL);
line_sizer->AddSpacer(FromDIP(20));
line_sizer->Add(m_text_idel_heating_protection_caption, 1, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(5));
idel_container_sizer->Add(line_sizer, 0, wxEXPAND | wxLEFT | wxRIGHT, FromDIP(30));
m_idel_heating_container->SetSizer(idel_container_sizer);
sizer->Add(m_idel_heating_container, 0, wxEXPAND);
return sizer;
}
@@ -161,4 +245,31 @@ bool SafetyOptionsDialog::Show(bool show)
return DPIDialog::Show(show);
}
void SafetyOptionsDialog::show_idel_heating_toast(const wxString &text)
{
if (m_idel_heating_toast)
{
m_idel_heating_toast->Destroy();
m_idel_heating_toast = nullptr;
}
m_idel_heating_toast = new wxPopupWindow(this);
m_idel_heating_toast->SetBackgroundColour(wxColour(0, 0, 0));
wxStaticText *textCtrl = new wxStaticText(m_idel_heating_toast, wxID_ANY, text, wxPoint(10, 10));
textCtrl->SetForegroundColour(*wxWHITE);
// Start a one-shot timer for 3 seconds to dismiss
wxSize textSize = textCtrl->GetBestSize();
m_idel_heating_toast->SetSize(textSize + wxSize(20, 20));
wxRect anchor = m_text_idel_heating_protection->GetScreenRect();
wxPoint pos = anchor.GetBottomLeft();
pos.y += FromDIP(40);
m_idel_heating_toast->Move(pos);
m_idel_heating_toast->Show(true);
m_idel_heating_toast_timer.Stop();
m_idel_heating_toast_timer.StartOnce(3000);
}
}} // namespace Slic3r::GUI