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

ENH:refine printer function option

Browse Source 
jira:[STUDIO-12357]

Change-Id: Ie48fb2302279795f41f8b65856bd64b64d2b14f3
(cherry picked from commit 1af87a5309a311e1c2d2c96d757ed7723bd373fb)
This commit is contained in:
milk
2025-06-27 10:14:11 +08:00
committed by Noisyfox
parent 3a3f6d3a43
commit 7a59122f7a
4 changed files with 676 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

99
src/slic3r/GUI/DeviceManager.cpp
View File

@@ -2852,6 +2852,10 @@ int MachineObject::command_xcam_control(std::string module_name, bool on_off, st
if (!lvl.empty()) { if (!lvl.empty()) {
j["xcam"]["halt_print_sensitivity"] = lvl; j["xcam"]["halt_print_sensitivity"] = lvl;
} }
// int cfg = 123;
// get_flag_bits(cfg, 11, 2);
BOOST_LOG_TRIVIAL(info) << "command:xcam_control_set" << ", module_name:" << module_name << ", control:" << on_off << ", halt_print_sensitivity:" << lvl; BOOST_LOG_TRIVIAL(info) << "command:xcam_control_set" << ", module_name:" << module_name << ", control:" << on_off << ", halt_print_sensitivity:" << lvl;
return this->publish_json(j.dump()); return this->publish_json(j.dump());
} }
@@ -2866,6 +2870,49 @@ int MachineObject::command_xcam_control_ai_monitoring(bool on_off, std::string l
return command_xcam_control("printing_monitor", on_off, lvl); return command_xcam_control("printing_monitor", on_off, lvl);
} }
// refine printer function options
int MachineObject::command_xcam_control_spaghetti_detection(bool on_off, std::string lvl)
{
bool print_halt = (lvl == "never_halt") ? false : true;
xcam_spaghetti_detection = on_off;
xcam_ai_monitoring_hold_start = time(nullptr);
xcam_spaghetti_detection_sensitivity = lvl;
return command_xcam_control("spaghetti_detector", on_off, lvl);
}
int MachineObject::command_xcam_control_purgechutepileup_detection(bool on_off, std::string lvl)
{
bool print_halt = (lvl == "never_halt") ? false : true;
xcam_purgechutepileup_detection = on_off;
xcam_ai_monitoring_hold_start = time(nullptr);
xcam_purgechutepileup_detection_sensitivity = lvl;
return command_xcam_control("pileup_detector", on_off, lvl);
}
int MachineObject::command_xcam_control_nozzleclumping_detection(bool on_off, std::string lvl)
{
bool print_halt = (lvl == "never_halt") ? false : true;
xcam_nozzleclumping_detection = on_off;
xcam_ai_monitoring_hold_start = time(nullptr);
xcam_nozzleclumping_detection_sensitivity = lvl;
return command_xcam_control("clump_detector", on_off, lvl);
}
int MachineObject::command_xcam_control_airprinting_detection(bool on_off, std::string lvl)
{
bool print_halt = (lvl == "never_halt") ? false : true;
xcam_airprinting_detection = on_off;
xcam_ai_monitoring_hold_start = time(nullptr);
xcam_airprinting_detection_sensitivity = lvl;
return command_xcam_control("airprint_detector", on_off, lvl);
}
int MachineObject::command_xcam_control_buildplate_marker_detector(bool on_off) int MachineObject::command_xcam_control_buildplate_marker_detector(bool on_off)
{ {
xcam_buildplate_marker_detector = on_off; xcam_buildplate_marker_detector = on_off;
@@ -4405,7 +4452,49 @@ int MachineObject::parse_json(std::string tunnel, std::string payload, bool key_
try { try {
if (jj.contains("xcam")) { if (jj.contains("xcam")) {
if (time(nullptr) - xcam_ai_monitoring_hold_start > HOLD_TIME_3SEC) { if (time(nullptr) - xcam_ai_monitoring_hold_start > HOLD_TIME_3SEC) {
if (jj["xcam"].contains("printing_monitor")) {
if (jj["xcam"].contains("cfg")) {
xcam_disable_ai_detection_display = true;
// std::string cfg = jj["xcam"]["cfg"].get<std::string>();
int cfg = jj["xcam"]["cfg"].get<int>();
xcam_spaghetti_detection = get_flag_bits(cfg,7);
switch (get_flag_bits(cfg, 8, 2)) {
case 0: xcam_spaghetti_detection_sensitivity = "low"; break;
case 1: xcam_spaghetti_detection_sensitivity = "medium"; break;
case 2: xcam_spaghetti_detection_sensitivity = "high"; break;
default: break;
}
xcam_purgechutepileup_detection = get_flag_bits(cfg, 10);
switch (get_flag_bits(cfg, 11, 2)) {
case 0: xcam_purgechutepileup_detection_sensitivity = "low"; break;
case 1: xcam_purgechutepileup_detection_sensitivity = "medium"; break;
case 2: xcam_purgechutepileup_detection_sensitivity = "high"; break;
default: break;
}
xcam_nozzleclumping_detection = get_flag_bits(cfg, 13);
switch (get_flag_bits(cfg, 14, 2)) {
case 0: xcam_nozzleclumping_detection_sensitivity = "low"; break;
case 1: xcam_nozzleclumping_detection_sensitivity = "medium"; break;
case 2: xcam_nozzleclumping_detection_sensitivity = "high"; break;
default: break;
}
xcam_airprinting_detection = get_flag_bits(cfg, 16);
switch (get_flag_bits(cfg, 17, 2)) {
case 0: xcam_airprinting_detection_sensitivity = "low"; break;
case 1: xcam_airprinting_detection_sensitivity = "medium"; break;
case 2: xcam_airprinting_detection_sensitivity = "high"; break;
default: break;
}
}
else if (jj["xcam"].contains("printing_monitor")) {
// new protocol // new protocol
xcam_ai_monitoring = jj["xcam"]["printing_monitor"].get<bool>(); xcam_ai_monitoring = jj["xcam"]["printing_monitor"].get<bool>();
} else { } else {
@@ -4418,9 +4507,11 @@ int MachineObject::parse_json(std::string tunnel, std::string payload, bool key_
} }
} }
} }
if (jj["xcam"].contains("halt_print_sensitivity")) { if (jj["xcam"].contains("halt_print_sensitivity")) {
xcam_ai_monitoring_sensitivity = jj["xcam"]["halt_print_sensitivity"].get<std::string>(); xcam_ai_monitoring_sensitivity = jj["xcam"]["halt_print_sensitivity"].get<std::string>();
} }
} }
if (time(nullptr) - xcam_first_layer_hold_start > HOLD_TIME_3SEC) { if (time(nullptr) - xcam_first_layer_hold_start > HOLD_TIME_3SEC) {
@@ -6295,6 +6386,12 @@ void MachineObject::parse_new_info(json print)
is_support_brtc = get_flag_bits(fun, 31); is_support_brtc = get_flag_bits(fun, 31);
m_support_mqtt_axis_control = get_flag_bits(fun, 38); m_support_mqtt_axis_control = get_flag_bits(fun, 38);
m_support_mqtt_bet_ctrl = get_flag_bits(fun, 39); m_support_mqtt_bet_ctrl = get_flag_bits(fun, 39);
is_support_spaghetti_detection = get_flag_bits(fun, 42);
is_support_purgechutepileup_detection = get_flag_bits(fun, 43);
is_support_nozzleclumping_detection = get_flag_bits(fun, 44);
is_support_airprinting_detection = get_flag_bits(fun, 45);
m_air_duct_data.m_support_cooling_filter = get_flag_bits(fun, 46); m_air_duct_data.m_support_cooling_filter = get_flag_bits(fun, 46);
} }

25
src/slic3r/GUI/DeviceManager.hpp
View File

@@ -1056,9 +1056,21 @@ public:
int nozzle_setting_hold_count = 0; int nozzle_setting_hold_count = 0;
//refine printer
bool xcam_ai_monitoring{ false }; bool xcam_ai_monitoring{ false };
bool xcam_disable_ai_detection_display{false};
bool xcam_spaghetti_detection{false};
bool xcam_purgechutepileup_detection{false};
bool xcam_nozzleclumping_detection{false};
bool xcam_airprinting_detection{false};
time_t xcam_ai_monitoring_hold_start = 0; time_t xcam_ai_monitoring_hold_start = 0;
std::string xcam_ai_monitoring_sensitivity; std::string xcam_ai_monitoring_sensitivity;
std::string xcam_spaghetti_detection_sensitivity;
std::string xcam_purgechutepileup_detection_sensitivity;
std::string xcam_nozzleclumping_detection_sensitivity;
std::string xcam_airprinting_detection_sensitivity;
bool xcam_buildplate_marker_detector{ false }; bool xcam_buildplate_marker_detector{ false };
time_t xcam_buildplate_marker_hold_start = 0; time_t xcam_buildplate_marker_hold_start = 0;
bool xcam_auto_recovery_step_loss{ false }; bool xcam_auto_recovery_step_loss{ false };
@@ -1120,6 +1132,12 @@ public:
bool is_support_command_homing { false };// fun[32] bool is_support_command_homing { false };// fun[32]
bool is_support_brtc{false}; // fun[31], support tcp and upload protocol bool is_support_brtc{false}; // fun[31], support tcp and upload protocol
// refine printer function options
bool is_support_spaghetti_detection{false};
bool is_support_purgechutepileup_detection{false};
bool is_support_nozzleclumping_detection{false};
bool is_support_airprinting_detection{false};
bool installed_upgrade_kit{false}; bool installed_upgrade_kit{false};
int bed_temperature_limit = -1; int bed_temperature_limit = -1;
@@ -1299,7 +1317,14 @@ public:
int command_ipcam_timelapse(bool on_off); int command_ipcam_timelapse(bool on_off);
int command_ipcam_resolution_set(std::string resolution); int command_ipcam_resolution_set(std::string resolution);
int command_xcam_control(std::string module_name, bool on_off, std::string lvl = ""); int command_xcam_control(std::string module_name, bool on_off, std::string lvl = "");
//refine printer
int command_xcam_control_ai_monitoring(bool on_off, std::string lvl); int command_xcam_control_ai_monitoring(bool on_off, std::string lvl);
int command_xcam_control_spaghetti_detection(bool on_off, std::string lvl);
int command_xcam_control_purgechutepileup_detection(bool on_off, std::string lvl);
int command_xcam_control_nozzleclumping_detection(bool on_off, std::string lvl);
int command_xcam_control_airprinting_detection(bool on_off, std::string lvl);
int command_xcam_control_first_layer_inspector(bool on_off, bool print_halt); int command_xcam_control_first_layer_inspector(bool on_off, bool print_halt);
int command_xcam_control_buildplate_marker_detector(bool on_off); int command_xcam_control_buildplate_marker_detector(bool on_off);
int command_xcam_control_auto_recovery_step_loss(bool on_off); int command_xcam_control_auto_recovery_step_loss(bool on_off);

556
src/slic3r/GUI/PrintOptionsDialog.cpp
View File

@@ -15,16 +15,33 @@ PrintOptionsDialog::PrintOptionsDialog(wxWindow* parent)
: DPIDialog(parent, wxID_ANY, _L("Print Options"), wxDefaultPosition, wxDefaultSize, wxCAPTION | wxCLOSE_BOX) : DPIDialog(parent, wxID_ANY, _L("Print Options"), wxDefaultPosition, wxDefaultSize, wxCAPTION | wxCLOSE_BOX)
{ {
this->SetDoubleBuffered(true); this->SetDoubleBuffered(true);
SetBackgroundColour(*wxWHITE); SetBackgroundColour(*wxWHITE);
SetSize(FromDIP(480),FromDIP(520));
m_scrollwindow = new wxScrolledWindow(this, wxID_ANY);
m_scrollwindow->SetScrollRate(0, FromDIP(10));
m_scrollwindow->SetBackgroundColour(*wxWHITE);
m_scrollwindow->SetMinSize(wxSize(FromDIP(480), wxDefaultCoord));
m_scrollwindow->SetMaxSize(wxSize(FromDIP(480), wxDefaultCoord));
auto m_options_sizer = create_settings_group(m_scrollwindow);
m_options_sizer->SetMinSize(wxSize(FromDIP(460), wxDefaultCoord));
m_scrollwindow->SetSizer(m_options_sizer);
wxBoxSizer *mainSizer = new wxBoxSizer(wxVERTICAL);
mainSizer->Add(m_scrollwindow, 1, wxEXPAND);
this->SetSizer(mainSizer);
m_options_sizer->Fit(m_scrollwindow);
m_scrollwindow->FitInside();
auto m_options_sizer = create_settings_group(this);
this->SetSizer(m_options_sizer);
this->Layout(); this->Layout();
m_options_sizer->Fit(this); // mainSizer->Fit(this);
this->Fit(); //this->Fit();
m_cb_ai_monitoring->Bind(wxEVT_TOGGLEBUTTON, [this](wxCommandEvent& evt) { m_cb_ai_monitoring->Bind(wxEVT_TOGGLEBUTTON, [this](wxCommandEvent &evt) {
if (obj) { if (obj) {
int level = ai_monitoring_level_list->GetSelection(); int level = ai_monitoring_level_list->GetSelection();
std::string lvl = sensitivity_level_to_msg_string((AiMonitorSensitivityLevel) level); std::string lvl = sensitivity_level_to_msg_string((AiMonitorSensitivityLevel) level);
@@ -36,6 +53,60 @@ PrintOptionsDialog::PrintOptionsDialog(wxWindow* parent)
evt.Skip(); evt.Skip();
}); });
// refine printer function options
m_cb_spaghetti_detection->Bind(wxEVT_TOGGLEBUTTON, [this](wxCommandEvent& evt) {
if (obj) {
int level = spaghetti_detection_level_list->GetSelection();
std::string lvl = sensitivity_level_to_msg_string((AiMonitorSensitivityLevel) level);
if (!lvl.empty())
obj->command_xcam_control_spaghetti_detection(m_cb_spaghetti_detection->GetValue(), lvl);
else
BOOST_LOG_TRIVIAL(warning) << "print_option: lvl = " << lvl;
}
evt.Skip();
});
m_cb_purgechutepileup_detection->Bind(wxEVT_TOGGLEBUTTON, [this](wxCommandEvent &evt) {
if (obj) {
int level = purgechutepileup_detection_level_list->GetSelection();
std::string lvl = sensitivity_level_to_msg_string((AiMonitorSensitivityLevel) level);
if (!lvl.empty())
obj->command_xcam_control_purgechutepileup_detection(m_cb_purgechutepileup_detection->GetValue(), lvl);
else
BOOST_LOG_TRIVIAL(warning) << "print_option: lvl = " << lvl;
}
evt.Skip();
});
m_cb_nozzleclumping_detection->Bind(wxEVT_TOGGLEBUTTON, [this](wxCommandEvent &evt) {
if (obj) {
int level = nozzleclumping_detection_level_list->GetSelection();
std::string lvl = sensitivity_level_to_msg_string((AiMonitorSensitivityLevel) level);
if (!lvl.empty())
obj->command_xcam_control_nozzleclumping_detection(m_cb_nozzleclumping_detection->GetValue(), lvl);
else
BOOST_LOG_TRIVIAL(warning) << "print_option: lvl = " << lvl;
}
evt.Skip();
});
m_cb_airprinting_detection->Bind(wxEVT_TOGGLEBUTTON, [this](wxCommandEvent &evt) {
if (obj) {
int level = airprinting_detection_level_list->GetSelection();
std::string lvl = sensitivity_level_to_msg_string((AiMonitorSensitivityLevel) level);
if (!lvl.empty())
obj->command_xcam_control_airprinting_detection(m_cb_airprinting_detection->GetValue(), lvl);
else
BOOST_LOG_TRIVIAL(warning) << "print_option: lvl = " << lvl;
}
evt.Skip();
});
m_cb_first_layer->Bind(wxEVT_TOGGLEBUTTON, [this](wxCommandEvent& evt) { m_cb_first_layer->Bind(wxEVT_TOGGLEBUTTON, [this](wxCommandEvent& evt) {
if (obj) { if (obj) {
obj->command_xcam_control_first_layer_inspector(m_cb_first_layer->GetValue(), false); obj->command_xcam_control_first_layer_inspector(m_cb_first_layer->GetValue(), false);
@@ -110,7 +181,12 @@ PrintOptionsDialog::PrintOptionsDialog(wxWindow* parent)
PrintOptionsDialog::~PrintOptionsDialog() PrintOptionsDialog::~PrintOptionsDialog()
{ {
ai_monitoring_level_list->Disconnect( wxEVT_COMBOBOX, wxCommandEventHandler(PrintOptionsDialog::set_ai_monitor_sensitivity), NULL, this ); ai_monitoring_level_list->Disconnect(wxEVT_COMBOBOX, wxCommandEventHandler(PrintOptionsDialog::set_ai_monitor_sensitivity), NULL, this);
// refine printer function options
spaghetti_detection_level_list->Disconnect(wxEVT_COMBOBOX, wxCommandEventHandler(PrintOptionsDialog::set_spaghetti_detection_sensitivity), NULL, this);
purgechutepileup_detection_level_list->Disconnect(wxEVT_COMBOBOX, wxCommandEventHandler(PrintOptionsDialog::set_purgechutepileup_detection_sensitivity), NULL, this);
nozzleclumping_detection_level_list->Disconnect(wxEVT_COMBOBOX, wxCommandEventHandler(PrintOptionsDialog::set_nozzleclumping_detection_sensitivity), NULL, this);
airprinting_detection_level_list->Disconnect(wxEVT_COMBOBOX, wxCommandEventHandler(PrintOptionsDialog::set_airprinting_detection_sensitivity), NULL, this);
} }
void PrintOptionsDialog::on_dpi_changed(const wxRect& suggested_rect) void PrintOptionsDialog::on_dpi_changed(const wxRect& suggested_rect)
@@ -122,24 +198,61 @@ void PrintOptionsDialog::update_ai_monitor_status()
{ {
if (m_cb_ai_monitoring->GetValue()) { if (m_cb_ai_monitoring->GetValue()) {
ai_monitoring_level_list->Enable(); ai_monitoring_level_list->Enable();
} } else {
else {
ai_monitoring_level_list->Disable(); ai_monitoring_level_list->Disable();
} }
} }
// refine printer function options
void PrintOptionsDialog::update_spaghetti_detection_status()
{
if (m_cb_spaghetti_detection->GetValue()) {
spaghetti_detection_level_list->Enable();
} else {
spaghetti_detection_level_list->Disable();
}
}
void PrintOptionsDialog::update_purgechutepileup_detection_status()
{
if (m_cb_purgechutepileup_detection->GetValue()) {
purgechutepileup_detection_level_list->Enable();
} else {
purgechutepileup_detection_level_list->Disable();
}
}
void PrintOptionsDialog::update_nozzleclumping_detection_status()
{
if (m_cb_nozzleclumping_detection->GetValue()) {
nozzleclumping_detection_level_list->Enable();
} else {
nozzleclumping_detection_level_list->Disable();
}
}
void PrintOptionsDialog::update_airprinting_detection_status()
{
if (m_cb_airprinting_detection->GetValue()) {
airprinting_detection_level_list->Enable();
} else {
airprinting_detection_level_list->Disable();
}
}
void PrintOptionsDialog::update_options(MachineObject* obj_) void PrintOptionsDialog::update_options(MachineObject* obj_)
{ {
if (!obj_) return; if (!obj_) return;
if (obj_->is_support_ai_monitoring) { if (obj_->is_support_ai_monitoring && !obj_->xcam_disable_ai_detection_display) {
text_ai_monitoring->Show(); text_ai_monitoring->Show();
m_cb_ai_monitoring->Show(); m_cb_ai_monitoring->Show();
text_ai_monitoring_caption->Show(); text_ai_monitoring_caption->Show();
ai_monitoring_level_list->Show(); ai_monitoring_level_list->Show();
line1->Show(); // line1->Show();
} } else {
else {
text_ai_monitoring->Hide(); text_ai_monitoring->Hide();
m_cb_ai_monitoring->Hide(); m_cb_ai_monitoring->Hide();
text_ai_monitoring_caption->Hide(); text_ai_monitoring_caption->Hide();
@@ -147,21 +260,90 @@ void PrintOptionsDialog::update_options(MachineObject* obj_)
line1->Hide(); line1->Hide();
} }
//refine printer function options
if (obj_->is_support_spaghetti_detection) {
text_spaghetti_detection->Show();
m_cb_spaghetti_detection->Show();
text_spaghetti_detection_caption0->Show();
text_spaghetti_detection_caption1->Show();
spaghetti_detection_level_list->Show();
//line1->Show();
} else {
text_spaghetti_detection->Hide();
m_cb_spaghetti_detection->Hide();
text_spaghetti_detection_caption0->Show();
text_spaghetti_detection_caption1->Hide();
spaghetti_detection_level_list->Hide();
line1->Hide();
}
if (obj_->is_support_purgechutepileup_detection) {
text_purgechutepileup_detection->Show();
m_cb_purgechutepileup_detection->Show();
text_purgechutepileup_detection_caption0->Show();
text_purgechutepileup_detection_caption1->Show();
purgechutepileup_detection_level_list->Show();
// line1->Show();
} else {
text_purgechutepileup_detection->Hide();
m_cb_purgechutepileup_detection->Hide();
text_purgechutepileup_detection_caption0->Hide();
text_purgechutepileup_detection_caption1->Hide();
purgechutepileup_detection_level_list->Hide();
line1->Hide();
}
if (obj_->is_support_nozzleclumping_detection) {
text_nozzleclumping_detection->Show();
m_cb_nozzleclumping_detection->Show();
text_nozzleclumping_detection_caption0->Show();
text_nozzleclumping_detection_caption1->Show();
nozzleclumping_detection_level_list->Show();
// line1->Show();
} else {
text_nozzleclumping_detection->Hide();
m_cb_nozzleclumping_detection->Hide();
text_nozzleclumping_detection_caption0->Hide();
text_nozzleclumping_detection_caption1->Hide();
nozzleclumping_detection_level_list->Hide();
line1->Hide();
}
if (obj_->is_support_airprinting_detection) {
text_airprinting_detection->Show();
m_cb_airprinting_detection->Show();
text_airprinting_detection_caption0->Show();
text_airprinting_detection_caption1->Show();
airprinting_detection_level_list->Show();
// line1->Show();
} else {
text_airprinting_detection->Hide();
m_cb_airprinting_detection->Hide();
text_airprinting_detection_caption0->Hide();
text_airprinting_detection_caption1->Hide();
airprinting_detection_level_list->Hide();
line1->Hide();
}
if (obj_->is_support_build_plate_marker_detect) { if (obj_->is_support_build_plate_marker_detect) {
if (obj_->m_plate_maker_detect_type == MachineObject::POS_CHECK && (text_plate_mark->GetLabel() != _L("Enable detection of build plate position"))) { if (obj_->m_plate_maker_detect_type == MachineObject::POS_CHECK && (text_plate_mark->GetLabel() != _L("Enable detection of build plate position"))) {
text_plate_mark->SetLabel(_L("Enable detection of build plate position")); text_plate_mark->SetLabel(_L("Enable detection of build plate position"));
text_plate_mark_caption->SetLabel(_L("The localization tag of build plate is detected, and printing is paused if the tag is not in predefined range.")); text_plate_mark_caption->SetLabel(_L("The localization tag of build plate is detected, and printing is paused if the tag is not in predefined range."));
text_plate_mark_caption->Wrap(FromDIP(260)); text_plate_mark_caption->Wrap(FromDIP(400));
} else if (obj_->m_plate_maker_detect_type == MachineObject::TYPE_POS_CHECK && (text_plate_mark->GetLabel() != _L("Build Plate Detection"))) { } else if (obj_->m_plate_maker_detect_type == MachineObject::TYPE_POS_CHECK && (text_plate_mark->GetLabel() != _L("Build Plate Detection"))) {
text_plate_mark->SetLabel(_L("Build Plate Detection")); text_plate_mark->SetLabel(_L("Build Plate Detection"));
text_plate_mark_caption->SetLabel(_L("Identifies the type and position of the build plate on the heatbed. Pausing printing if a mismatch is detected.")); text_plate_mark_caption->SetLabel(_L("Identifies the type and position of the build plate on the heatbed. Pausing printing if a mismatch is detected."));
text_plate_mark_caption->Wrap(FromDIP(260)); text_plate_mark_caption->Wrap(FromDIP(400));
} }
text_plate_mark->Show(); text_plate_mark->Show();
m_cb_plate_mark->Show(); m_cb_plate_mark->Show();
text_plate_mark_caption->Show(); text_plate_mark_caption->Show();
line2->Show(); // line2->Show();
} }
else { else {
text_plate_mark->Hide(); text_plate_mark->Hide();
@@ -173,7 +355,7 @@ void PrintOptionsDialog::update_options(MachineObject* obj_)
if (obj_->is_support_first_layer_inspect) { if (obj_->is_support_first_layer_inspect) {
text_first_layer->Show(); text_first_layer->Show();
m_cb_first_layer->Show(); m_cb_first_layer->Show();
line3->Show(); // line3->Show();
} }
else { else {
text_first_layer->Hide(); text_first_layer->Hide();
@@ -184,7 +366,7 @@ void PrintOptionsDialog::update_options(MachineObject* obj_)
if (obj_->is_support_auto_recovery_step_loss) { if (obj_->is_support_auto_recovery_step_loss) {
text_auto_recovery->Show(); text_auto_recovery->Show();
m_cb_auto_recovery->Show(); m_cb_auto_recovery->Show();
line4->Show(); //line4->Show();
} }
else { else {
text_auto_recovery->Hide(); text_auto_recovery->Hide();
@@ -194,7 +376,7 @@ void PrintOptionsDialog::update_options(MachineObject* obj_)
if (obj_->is_support_prompt_sound) { if (obj_->is_support_prompt_sound) {
text_sup_sound->Show(); text_sup_sound->Show();
m_cb_sup_sound->Show(); m_cb_sup_sound->Show();
line5->Show(); // line5->Show();
} }
else { else {
text_sup_sound->Hide(); text_sup_sound->Hide();
@@ -204,7 +386,7 @@ void PrintOptionsDialog::update_options(MachineObject* obj_)
if (obj_->is_support_filament_tangle_detect) { if (obj_->is_support_filament_tangle_detect) {
text_filament_tangle->Show(); text_filament_tangle->Show();
m_cb_filament_tangle->Show(); m_cb_filament_tangle->Show();
line6->Show(); // line6->Show();
} }
else { else {
text_filament_tangle->Hide(); text_filament_tangle->Hide();
@@ -215,7 +397,7 @@ void PrintOptionsDialog::update_options(MachineObject* obj_)
text_nozzle_blob->Show(); text_nozzle_blob->Show();
m_cb_nozzle_blob->Show(); m_cb_nozzle_blob->Show();
text_nozzle_blob_caption->Show(); text_nozzle_blob_caption->Show();
line7->Show(); // line7->Show();
} }
else { else {
text_nozzle_blob->Hide(); text_nozzle_blob->Hide();
@@ -236,15 +418,56 @@ void PrintOptionsDialog::update_options(MachineObject* obj_)
m_cb_filament_tangle->SetValue(obj_->xcam_filament_tangle_detect); m_cb_filament_tangle->SetValue(obj_->xcam_filament_tangle_detect);
m_cb_nozzle_blob->SetValue(obj_->nozzle_blob_detection_enabled); m_cb_nozzle_blob->SetValue(obj_->nozzle_blob_detection_enabled);
m_cb_ai_monitoring->SetValue(obj_->xcam_ai_monitoring); m_cb_ai_monitoring->SetValue(obj_->xcam_ai_monitoring);
for (auto i = AiMonitorSensitivityLevel::LOW; i < LEVELS_NUM; i = (AiMonitorSensitivityLevel) (i + 1)) { for (auto i = AiMonitorSensitivityLevel::LOW; i < LEVELS_NUM; i = (AiMonitorSensitivityLevel) (i + 1)) {
if (sensitivity_level_to_msg_string(i) == obj_->xcam_ai_monitoring_sensitivity) { if (sensitivity_level_to_msg_string(i) == obj_->xcam_ai_monitoring_sensitivity) {
ai_monitoring_level_list->SetSelection((int)i); ai_monitoring_level_list->SetSelection((int) i);
break;
}
}
//refine printer function options
m_cb_spaghetti_detection->SetValue(obj_->xcam_spaghetti_detection);
for (auto i = AiMonitorSensitivityLevel::LOW; i < LEVELS_NUM; i = (AiMonitorSensitivityLevel) (i + 1)) {
if (sensitivity_level_to_msg_string(i) == obj_->xcam_spaghetti_detection_sensitivity) {
spaghetti_detection_level_list->SetSelection((int) i);
break;
}
}
m_cb_purgechutepileup_detection->SetValue(obj_->xcam_purgechutepileup_detection);
for (auto i = AiMonitorSensitivityLevel::LOW; i < LEVELS_NUM; i = (AiMonitorSensitivityLevel) (i + 1)) {
if (sensitivity_level_to_msg_string(i) == obj_->xcam_purgechutepileup_detection_sensitivity) {
purgechutepileup_detection_level_list->SetSelection((int) i);
break;
}
}
m_cb_nozzleclumping_detection->SetValue(obj_->xcam_nozzleclumping_detection);
for (auto i = AiMonitorSensitivityLevel::LOW; i < LEVELS_NUM; i = (AiMonitorSensitivityLevel) (i + 1)) {
if (sensitivity_level_to_msg_string(i) == obj_->xcam_nozzleclumping_detection_sensitivity) {
nozzleclumping_detection_level_list->SetSelection((int) i);
break;
}
}
m_cb_airprinting_detection->SetValue(obj_->xcam_airprinting_detection);
for (auto i = AiMonitorSensitivityLevel::LOW; i < LEVELS_NUM; i = (AiMonitorSensitivityLevel) (i + 1)) {
if (sensitivity_level_to_msg_string(i) == obj_->xcam_airprinting_detection_sensitivity) {
airprinting_detection_level_list->SetSelection((int) i);
break; break;
} }
} }
update_ai_monitor_status(); update_ai_monitor_status();
// refine printer function options
update_spaghetti_detection_status();
update_purgechutepileup_detection_status();
update_nozzleclumping_detection_status();
update_airprinting_detection_status();
this->Thaw(); this->Thaw();
Layout(); Layout();
} }
@@ -298,49 +521,228 @@ wxBoxSizer* PrintOptionsDialog::create_settings_group(wxWindow* parent)
wxBoxSizer* sizer = new wxBoxSizer(wxVERTICAL); wxBoxSizer* sizer = new wxBoxSizer(wxVERTICAL);
wxBoxSizer* line_sizer = new wxBoxSizer(wxHORIZONTAL); wxBoxSizer* line_sizer = new wxBoxSizer(wxHORIZONTAL);
auto m_line = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxSize(-1, 1), wxTAB_TRAVERSAL); /* auto m_line = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxSize(-1, 1), wxTAB_TRAVERSAL);
m_line->SetBackgroundColour(wxColour(166, 169, 170)); m_line->SetBackgroundColour(wxColour(166, 169, 170));
sizer->Add(m_line, 0, wxEXPAND, 0);*/
sizer->Add(m_line, 0, wxEXPAND, 0); //wxPanel *m_line = new wxPanel(parent, wxID_ANY, wxDefaultPosition, wxSize(-1, FromDIP(1)), wxTAB_TRAVERSAL);
//m_line->SetBackgroundColour(wxColour(166, 169, 170));
//sizer->Add(m_line, 0, wxEXPAND | wxLEFT | wxRIGHT, FromDIP(0));
// ai monitoring with levels // ai detections
line_sizer = new wxBoxSizer(wxHORIZONTAL); line_sizer = new wxBoxSizer(wxHORIZONTAL);
text_ai_detections = new Label(parent, _L("AI Detections"));
text_ai_detections->SetFont(Label::Body_14);
line_sizer->Add(FromDIP(5), 0, 0, 0);
line_sizer->Add(text_ai_detections, 0, wxLEFT | wxRIGHT | wxDOWN | wxALIGN_CENTER_VERTICAL, FromDIP(2));
sizer->Add(0, 0, 0, wxTOP, FromDIP(20));
sizer->Add(line_sizer, 0, wxEXPAND | wxLEFT | wxRIGHT, FromDIP(18));
line_sizer = new wxBoxSizer(wxHORIZONTAL);
text_ai_detections_caption = new Label(parent, _L("Printer will send assistant message or pause printing if any of the following problem is detected."));
text_ai_detections_caption->SetFont(Label::Body_12);
text_ai_detections_caption->SetForegroundColour(STATIC_TEXT_CAPTION_COL);
text_ai_detections_caption->Wrap(FromDIP(400));
line_sizer->Add(FromDIP(5), 0, 0, 0);
line_sizer->Add(text_ai_detections_caption, 0,wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(2));
sizer->Add(line_sizer,0,wxEXPAND | wxLEFT | wxRIGHT,FromDIP(18));
// ai monitoring with levels
line_sizer = new wxBoxSizer(wxHORIZONTAL);
m_cb_ai_monitoring = new CheckBox(parent); m_cb_ai_monitoring = new CheckBox(parent);
text_ai_monitoring = new Label(parent, _L("Enable AI monitoring of printing")); text_ai_monitoring = new Label(parent, _L("Enable AI monitoring of printing"));
text_ai_monitoring->SetFont(Label::Body_14); text_ai_monitoring->SetFont(Label::Body_14);
line_sizer->Add(FromDIP(5), 0, 0, 0); line_sizer->Add(FromDIP(5), 0, 0, 0);
line_sizer->Add(m_cb_ai_monitoring, 0, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(5)); line_sizer->Add(m_cb_ai_monitoring, 0, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(5));
line_sizer->Add(text_ai_monitoring, 1, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(5)); line_sizer->Add(text_ai_monitoring, 1, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(5));
sizer->Add(0,0,0,wxTOP, FromDIP(18)); sizer->Add(0, 0, 0, wxTOP, FromDIP(18));
sizer->Add(line_sizer, 0, wxEXPAND | wxLEFT | wxRIGHT, FromDIP(18)); sizer->Add(line_sizer, 0, wxEXPAND | wxLEFT | wxRIGHT, FromDIP(18));
line_sizer->Add(FromDIP(5), 0, 0, 0); line_sizer->Add(FromDIP(5), 0, 0, 0);
line_sizer = new wxBoxSizer(wxHORIZONTAL); line_sizer = new wxBoxSizer(wxHORIZONTAL);
text_ai_monitoring_caption = new Label(parent, _L("Sensitivity of pausing is")); text_ai_monitoring_caption = new Label(parent, _L("Pausing Sensitivity:"));
text_ai_monitoring_caption->SetFont(Label::Body_14); text_ai_monitoring_caption->SetFont(Label::Body_12);
text_ai_monitoring_caption->SetForegroundColour(STATIC_TEXT_CAPTION_COL); text_ai_monitoring_caption->SetForegroundColour(STATIC_TEXT_CAPTION_COL);
text_ai_monitoring_caption->Wrap(-1); text_ai_monitoring_caption->Wrap(-1);
ai_monitoring_level_list = new ComboBox( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(FromDIP(100),-1), 0, NULL, wxCB_READONLY ); ai_monitoring_level_list = new ComboBox(parent, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(FromDIP(100), -1), 0, NULL, wxCB_READONLY);
for (auto i = AiMonitorSensitivityLevel::LOW; i < LEVELS_NUM; i = (AiMonitorSensitivityLevel) (i + 1)) { for (auto i = AiMonitorSensitivityLevel::LOW; i < LEVELS_NUM; i = (AiMonitorSensitivityLevel) (i + 1)) {
wxString level_option = sensitivity_level_to_label_string(i); wxString level_option = sensitivity_level_to_label_string(i);
ai_monitoring_level_list->Append(level_option); ai_monitoring_level_list->Append(level_option);
} }
if (ai_monitoring_level_list->GetCount() > 0) { if (ai_monitoring_level_list->GetCount() > 0) { ai_monitoring_level_list->SetSelection(0); }
ai_monitoring_level_list->SetSelection(0);
}
line_sizer->Add(FromDIP(30), 0, 0, 0); line_sizer->Add(FromDIP(30), 0, 0, 0);
line_sizer->Add(text_ai_monitoring_caption, 0, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(5)); line_sizer->Add(text_ai_monitoring_caption, 0, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(5));
line_sizer->Add( ai_monitoring_level_list, 0, wxEXPAND|wxALL, FromDIP(5) ); line_sizer->Add(ai_monitoring_level_list, 0, wxEXPAND | wxALL, FromDIP(5));
sizer->Add(line_sizer, 0, wxEXPAND | wxLEFT | wxRIGHT, FromDIP(18));
//spaghetti detection with levels
line_sizer = new wxBoxSizer(wxHORIZONTAL);
m_cb_spaghetti_detection = new CheckBox(parent);
text_spaghetti_detection = new Label(parent, _L("Spaghetti Detection"));
text_spaghetti_detection->SetFont(Label::Body_14);
line_sizer->Add(FromDIP(5), 0, 0, 0);
line_sizer->Add(m_cb_spaghetti_detection, 0, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(2));
line_sizer->Add(text_spaghetti_detection, 1, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(2));
sizer->Add(0,0,0,wxTOP, FromDIP(10));
sizer->Add(line_sizer, 0, wxEXPAND | wxLEFT | wxRIGHT, FromDIP(18));
line_sizer = new wxBoxSizer(wxHORIZONTAL);
text_spaghetti_detection_caption0 = new Label(parent, _L("Detect spaghetti failure(scattered lose filament)."));
text_spaghetti_detection_caption0->SetFont(Label::Body_12);
text_spaghetti_detection_caption0->SetForegroundColour(STATIC_TEXT_CAPTION_COL);
text_spaghetti_detection_caption0->Wrap(-1);
line_sizer->Add(FromDIP(30), 0, 0, 0);
line_sizer->Add(text_spaghetti_detection_caption0, 0, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(2));
sizer->Add(line_sizer, 0, wxEXPAND | wxLEFT | wxRIGHT, FromDIP(18));
line_sizer = new wxBoxSizer(wxHORIZONTAL);
text_spaghetti_detection_caption1 = new Label(parent, _L("Pausing Sensitivity:"));
text_spaghetti_detection_caption1->SetFont(Label::Body_12);
text_spaghetti_detection_caption1->SetForegroundColour(STATIC_TEXT_CAPTION_COL);
text_spaghetti_detection_caption1->Wrap(-1);
spaghetti_detection_level_list = new ComboBox(parent, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(FromDIP(100), -1), 0, NULL, wxCB_READONLY);
for (auto i = AiMonitorSensitivityLevel::LOW; i < LEVELS_NUM; i = (AiMonitorSensitivityLevel) (i + 1)) {
wxString level_option = sensitivity_level_to_label_string(i);
spaghetti_detection_level_list->Append(level_option);
}
if (spaghetti_detection_level_list->GetCount() > 0) {
spaghetti_detection_level_list->SetSelection(0);
}
line_sizer->Add(FromDIP(30), 0, 0, 0);
line_sizer->Add(text_spaghetti_detection_caption1, 0, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(5));
line_sizer->Add( spaghetti_detection_level_list, 0, wxEXPAND|wxALL, FromDIP(5) );
sizer->Add(line_sizer, 0, wxEXPAND | wxLEFT | wxRIGHT, FromDIP(18)); sizer->Add(line_sizer, 0, wxEXPAND | wxLEFT | wxRIGHT, FromDIP(18));
line1 = new StaticLine(parent, false); line1 = new StaticLine(parent, false);
line1->SetLineColour(STATIC_BOX_LINE_COL); line1->SetLineColour(STATIC_BOX_LINE_COL);
sizer->Add(line1, 0, wxEXPAND | wxLEFT | wxRIGHT, FromDIP(18)); sizer->Add(line1, 0, wxEXPAND | wxLEFT | wxRIGHT, FromDIP(18));
//purge chute pile-up detection
line_sizer = new wxBoxSizer(wxHORIZONTAL);
m_cb_purgechutepileup_detection = new CheckBox(parent);
text_purgechutepileup_detection = new Label(parent, _L("Purge Chute Pile-Up Detection"));
text_purgechutepileup_detection->SetFont(Label::Body_14);
line_sizer->Add(FromDIP(5), 0, 0, 0);
line_sizer->Add(m_cb_purgechutepileup_detection, 0, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(2));
line_sizer->Add(text_purgechutepileup_detection, 1, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(2));
sizer->Add(0, 0, 0, wxTOP, FromDIP(12));
sizer->Add(line_sizer, 0, wxEXPAND | wxLEFT | wxRIGHT, FromDIP(18));
line_sizer = new wxBoxSizer(wxHORIZONTAL);
text_purgechutepileup_detection_caption0 = new Label(parent, _L("Monitor if the waste is piled up in the purge chute."));
text_purgechutepileup_detection_caption0->SetFont(Label::Body_12);
text_purgechutepileup_detection_caption0->SetForegroundColour(STATIC_TEXT_CAPTION_COL);
text_purgechutepileup_detection_caption0->Wrap(-1);
line_sizer->Add(FromDIP(30), 0, 0, 0);
line_sizer->Add(text_purgechutepileup_detection_caption0, 0, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(5));
sizer->Add(line_sizer, 0, wxEXPAND | wxLEFT | wxRIGHT, FromDIP(18));
line_sizer = new wxBoxSizer(wxHORIZONTAL);
text_purgechutepileup_detection_caption1 = new Label(parent, _L("Pausing Sensitivity:"));
text_purgechutepileup_detection_caption1->SetFont(Label::Body_12);
text_purgechutepileup_detection_caption1->SetForegroundColour(STATIC_TEXT_CAPTION_COL);
text_purgechutepileup_detection_caption1->Wrap(-1);
purgechutepileup_detection_level_list = new ComboBox(parent, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(FromDIP(100), -1), 0, NULL, wxCB_READONLY);
for (auto i = AiMonitorSensitivityLevel::LOW; i < LEVELS_NUM; i = (AiMonitorSensitivityLevel) (i + 1)) {
wxString level_option = sensitivity_level_to_label_string(i);
purgechutepileup_detection_level_list->Append(level_option);
}
if (purgechutepileup_detection_level_list->GetCount() > 0) { purgechutepileup_detection_level_list->SetSelection(0); }
line_sizer->Add(FromDIP(30), 0, 0, 0);
line_sizer->Add(text_purgechutepileup_detection_caption1, 0, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(5));
line_sizer->Add(purgechutepileup_detection_level_list, 0, wxEXPAND | wxALL, FromDIP(5));
sizer->Add(line_sizer, 0, wxEXPAND | wxLEFT | wxRIGHT, FromDIP(18));
//nozzle clumping detection
line_sizer = new wxBoxSizer(wxHORIZONTAL);
m_cb_nozzleclumping_detection = new CheckBox(parent);
text_nozzleclumping_detection = new Label(parent, _L("Nozzle Clumping Detection"));
text_nozzleclumping_detection->SetFont(Label::Body_14);
line_sizer->Add(FromDIP(5), 0, 0, 0);
line_sizer->Add(m_cb_nozzleclumping_detection, 0, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(5));
line_sizer->Add(text_nozzleclumping_detection, 1, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(5));
sizer->Add(0, 0, 0, wxTOP, FromDIP(10));
sizer->Add(line_sizer, 0, wxEXPAND | wxLEFT | wxRIGHT, FromDIP(18));
line_sizer = new wxBoxSizer(wxHORIZONTAL);
text_nozzleclumping_detection_caption0 = new Label(parent, _L("Check if the nozzle is clumping by filaments or other foreign objects."));
text_nozzleclumping_detection_caption0->SetFont(Label::Body_12);
text_nozzleclumping_detection_caption0->SetForegroundColour(STATIC_TEXT_CAPTION_COL);
text_nozzleclumping_detection_caption0->Wrap(-1);
line_sizer->Add(FromDIP(30), 0, 0, 0);
line_sizer->Add(text_nozzleclumping_detection_caption0, 0, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(5));
sizer->Add(line_sizer, 0, wxEXPAND | wxLEFT | wxRIGHT, FromDIP(18));
line_sizer = new wxBoxSizer(wxHORIZONTAL);
text_nozzleclumping_detection_caption1 = new Label(parent, _L("Pausing Sensitivity:"));
text_nozzleclumping_detection_caption1->SetFont(Label::Body_12);
text_nozzleclumping_detection_caption1->SetForegroundColour(STATIC_TEXT_CAPTION_COL);
text_nozzleclumping_detection_caption1->Wrap(-1);
nozzleclumping_detection_level_list = new ComboBox(parent, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(FromDIP(100), -1), 0, NULL, wxCB_READONLY);
for (auto i = AiMonitorSensitivityLevel::LOW; i < LEVELS_NUM; i = (AiMonitorSensitivityLevel) (i + 1)) {
wxString level_option = sensitivity_level_to_label_string(i);
nozzleclumping_detection_level_list->Append(level_option);
}
if (nozzleclumping_detection_level_list->GetCount() > 0) { nozzleclumping_detection_level_list->SetSelection(0); }
line_sizer->Add(FromDIP(30), 0, 0, 0);
line_sizer->Add(text_nozzleclumping_detection_caption1, 0, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(5));
line_sizer->Add(nozzleclumping_detection_level_list, 0, wxEXPAND | wxALL, FromDIP(5));
sizer->Add(line_sizer, 0, wxEXPAND | wxLEFT | wxRIGHT, FromDIP(18));
//air printing detection
line_sizer = new wxBoxSizer(wxHORIZONTAL);
m_cb_airprinting_detection = new CheckBox(parent);
text_airprinting_detection = new Label(parent, _L("Air Printing Detection"));
text_airprinting_detection->SetFont(Label::Body_14);
line_sizer->Add(FromDIP(5), 0, 0, 0);
line_sizer->Add(m_cb_airprinting_detection, 0, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(5));
line_sizer->Add(text_airprinting_detection, 1, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(5));
sizer->Add(0, 0, 0, wxTOP, FromDIP(12));
sizer->Add(line_sizer, 0, wxEXPAND | wxLEFT | wxRIGHT, FromDIP(18));
line_sizer = new wxBoxSizer(wxHORIZONTAL);
text_airprinting_detection_caption0 = new Label(parent, _L("Monitor if the waste is piled up in the purge chute."));
text_airprinting_detection_caption0->SetFont(Label::Body_12);
text_airprinting_detection_caption0->SetForegroundColour(STATIC_TEXT_CAPTION_COL);
text_airprinting_detection_caption0->Wrap(-1);
line_sizer->Add(FromDIP(30), 0, 0, 0);
line_sizer->Add(text_airprinting_detection_caption0, 0, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(5));
sizer->Add(line_sizer, 0, wxEXPAND | wxLEFT | wxRIGHT, FromDIP(18));
line_sizer = new wxBoxSizer(wxHORIZONTAL);
text_airprinting_detection_caption1 = new Label(parent, _L("Pausing Sensitivity:"));
text_airprinting_detection_caption1->SetFont(Label::Body_12);
text_airprinting_detection_caption1->SetForegroundColour(STATIC_TEXT_CAPTION_COL);
text_airprinting_detection_caption1->Wrap(-1);
airprinting_detection_level_list = new ComboBox(parent, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(FromDIP(100), -1), 0, NULL, wxCB_READONLY);
for (auto i = AiMonitorSensitivityLevel::LOW; i < LEVELS_NUM; i = (AiMonitorSensitivityLevel) (i + 1)) {
wxString level_option = sensitivity_level_to_label_string(i);
airprinting_detection_level_list->Append(level_option);
}
if (airprinting_detection_level_list->GetCount() > 0) { airprinting_detection_level_list->SetSelection(0); }
line_sizer->Add(FromDIP(30), 0, 0, 0);
line_sizer->Add(text_airprinting_detection_caption1, 0, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(5));
line_sizer->Add(airprinting_detection_level_list, 0, wxEXPAND | wxALL, FromDIP(5));
sizer->Add(line_sizer, 0, wxEXPAND | wxLEFT | wxRIGHT, FromDIP(18));
//m_line = new wxPanel(parent, wxID_ANY, wxDefaultPosition, wxSize(-1, FromDIP(1)), wxTAB_TRAVERSAL);
//m_line->SetBackgroundColour(wxColour(166, 169, 170));
//sizer->Add(m_line, 0, wxEXPAND | wxALL, FromDIP(20));
// detection of build plate position // detection of build plate position
line_sizer = new wxBoxSizer(wxHORIZONTAL); line_sizer = new wxBoxSizer(wxHORIZONTAL);
m_cb_plate_mark = new CheckBox(parent); m_cb_plate_mark = new CheckBox(parent);
@@ -349,6 +751,8 @@ wxBoxSizer* PrintOptionsDialog::create_settings_group(wxWindow* parent)
line_sizer->Add(FromDIP(5), 0, 0, 0); line_sizer->Add(FromDIP(5), 0, 0, 0);
line_sizer->Add(m_cb_plate_mark, 0, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(5)); line_sizer->Add(m_cb_plate_mark, 0, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(5));
line_sizer->Add(text_plate_mark, 1, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(5)); line_sizer->Add(text_plate_mark, 1, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(5));
sizer->Add(line_sizer, 0, wxEXPAND | wxLEFT | wxRIGHT, FromDIP(18)); sizer->Add(line_sizer, 0, wxEXPAND | wxLEFT | wxRIGHT, FromDIP(18));
line_sizer->Add(FromDIP(5), 0, 0, 0); line_sizer->Add(FromDIP(5), 0, 0, 0);
@@ -357,17 +761,22 @@ wxBoxSizer* PrintOptionsDialog::create_settings_group(wxWindow* parent)
"The localization tag of build plate is detected, and printing is paused if the tag is not in predefined range." "The localization tag of build plate is detected, and printing is paused if the tag is not in predefined range."
); );
text_plate_mark_caption = new Label(parent, caption_text); text_plate_mark_caption = new Label(parent, caption_text);
text_plate_mark_caption->Wrap(FromDIP(260)); text_plate_mark_caption->Wrap(FromDIP(400));
text_plate_mark_caption->SetFont(Label::Body_14); text_plate_mark_caption->SetFont(Label::Body_12);
text_plate_mark_caption->SetForegroundColour(STATIC_TEXT_CAPTION_COL); text_plate_mark_caption->SetForegroundColour(STATIC_TEXT_CAPTION_COL);
line_sizer->Add(FromDIP(30), 0, 0, 0); line_sizer->Add(FromDIP(38), 0, 0, 0);
line_sizer->Add(text_plate_mark_caption, 1, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(0)); line_sizer->Add(text_plate_mark_caption, 1, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(0));
//m_line = new wxPanel(parent, wxID_ANY, wxDefaultPosition, wxSize(-1, FromDIP(1)), wxTAB_TRAVERSAL);
//m_line->SetBackgroundColour(wxColour(166, 169, 170));
//sizer->Add(m_line, 0, wxEXPAND | wxLEFT | wxRIGHT, FromDIP(20));
sizer->Add(line_sizer, 0, wxEXPAND | wxLEFT | wxRIGHT, FromDIP(18)); sizer->Add(line_sizer, 0, wxEXPAND | wxLEFT | wxRIGHT, FromDIP(18));
line2 = new StaticLine(parent, false); line2 = new StaticLine(parent, false);
line2->SetLineColour(STATIC_BOX_LINE_COL); line2->SetLineColour(STATIC_BOX_LINE_COL);
sizer->Add(line2, 0, wxEXPAND | wxLEFT | wxRIGHT, FromDIP(20)); sizer->Add(line2, 0, wxEXPAND | wxLEFT | wxRIGHT, FromDIP(20));
line2->Hide();
// detection of first layer // detection of first layer
line_sizer = new wxBoxSizer(wxHORIZONTAL); line_sizer = new wxBoxSizer(wxHORIZONTAL);
m_cb_first_layer = new CheckBox(parent); m_cb_first_layer = new CheckBox(parent);
@@ -424,8 +833,8 @@ wxBoxSizer* PrintOptionsDialog::create_settings_group(wxWindow* parent)
line_sizer->Add(text_save_remote_print_file_to_storage, 1, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(5)); line_sizer->Add(text_save_remote_print_file_to_storage, 1, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(5));
text_save_remote_print_file_to_storage_explain = new Label(parent, _L("Save the printing files initiated from Bambu Studio, Bambu Handy and MakerWorld on External Storage")); text_save_remote_print_file_to_storage_explain = new Label(parent, _L("Save the printing files initiated from Bambu Studio, Bambu Handy and MakerWorld on External Storage"));
text_save_remote_print_file_to_storage_explain->SetForegroundColour(STATIC_TEXT_EXPLAIN_COL); text_save_remote_print_file_to_storage_explain->SetForegroundColour(STATIC_TEXT_EXPLAIN_COL);
text_save_remote_print_file_to_storage_explain->SetFont(Label::Body_14); text_save_remote_print_file_to_storage_explain->SetFont(Label::Body_12);
text_save_remote_print_file_to_storage_explain->Wrap(FromDIP(260)); text_save_remote_print_file_to_storage_explain->Wrap(FromDIP(400));
sizer->Add(0, 0, 0, wxTOP, FromDIP(15)); sizer->Add(0, 0, 0, wxTOP, FromDIP(15));
sizer->Add(line_sizer, 0, wxEXPAND | wxLEFT | wxRIGHT, FromDIP(18)); sizer->Add(line_sizer, 0, wxEXPAND | wxLEFT | wxRIGHT, FromDIP(18));
sizer->Add(text_save_remote_print_file_to_storage_explain, 0, wxLEFT, FromDIP(58)); sizer->Add(text_save_remote_print_file_to_storage_explain, 0, wxLEFT, FromDIP(58));
@@ -480,7 +889,7 @@ wxBoxSizer* PrintOptionsDialog::create_settings_group(wxWindow* parent)
line_sizer = new wxBoxSizer(wxHORIZONTAL); line_sizer = new wxBoxSizer(wxHORIZONTAL);
wxString nozzle_blob_caption_text = _L("Check if the nozzle is clumping by filament or other foreign objects."); wxString nozzle_blob_caption_text = _L("Check if the nozzle is clumping by filament or other foreign objects.");
text_nozzle_blob_caption = new Label(parent, nozzle_blob_caption_text); text_nozzle_blob_caption = new Label(parent, nozzle_blob_caption_text);
text_nozzle_blob_caption->SetFont(Label::Body_14); text_nozzle_blob_caption->SetFont(Label::Body_12);
text_nozzle_blob_caption->Wrap(-1); text_nozzle_blob_caption->Wrap(-1);
text_nozzle_blob_caption->SetForegroundColour(STATIC_TEXT_CAPTION_COL); text_nozzle_blob_caption->SetForegroundColour(STATIC_TEXT_CAPTION_COL);
line_sizer->Add(FromDIP(30), 0, 0, 0); line_sizer->Add(FromDIP(30), 0, 0, 0);
@@ -496,7 +905,13 @@ wxBoxSizer* PrintOptionsDialog::create_settings_group(wxWindow* parent)
text_nozzle_blob_caption->Hide(); text_nozzle_blob_caption->Hide();
line7->Hide(); line7->Hide();
ai_monitoring_level_list->Connect( wxEVT_COMBOBOX, wxCommandEventHandler(PrintOptionsDialog::set_ai_monitor_sensitivity), NULL, this ); ai_monitoring_level_list->Connect(wxEVT_COMBOBOX, wxCommandEventHandler(PrintOptionsDialog::set_ai_monitor_sensitivity), NULL, this);
// refine printer function options
spaghetti_detection_level_list->Connect(wxEVT_COMBOBOX, wxCommandEventHandler(PrintOptionsDialog::set_spaghetti_detection_sensitivity), NULL, this);
purgechutepileup_detection_level_list->Connect(wxEVT_COMBOBOX, wxCommandEventHandler(PrintOptionsDialog::set_purgechutepileup_detection_sensitivity), NULL, this);
nozzleclumping_detection_level_list->Connect(wxEVT_COMBOBOX, wxCommandEventHandler(PrintOptionsDialog::set_nozzleclumping_detection_sensitivity), NULL, this);
airprinting_detection_level_list->Connect(wxEVT_COMBOBOX, wxCommandEventHandler(PrintOptionsDialog::set_airprinting_detection_sensitivity), NULL, this);
return sizer; return sizer;
} }
@@ -529,10 +944,10 @@ std::string PrintOptionsDialog::sensitivity_level_to_msg_string(enum AiMonitorSe
return ""; return "";
} }
void PrintOptionsDialog::set_ai_monitor_sensitivity(wxCommandEvent& evt) void PrintOptionsDialog::set_ai_monitor_sensitivity(wxCommandEvent &evt)
{ {
int level = ai_monitoring_level_list->GetSelection(); int level = ai_monitoring_level_list->GetSelection();
std::string lvl = sensitivity_level_to_msg_string((AiMonitorSensitivityLevel)level); std::string lvl = sensitivity_level_to_msg_string((AiMonitorSensitivityLevel) level);
if (obj && !lvl.empty()) { if (obj && !lvl.empty()) {
obj->command_xcam_control_ai_monitoring(m_cb_ai_monitoring->GetValue(), lvl); obj->command_xcam_control_ai_monitoring(m_cb_ai_monitoring->GetValue(), lvl);
@@ -541,6 +956,55 @@ void PrintOptionsDialog::set_ai_monitor_sensitivity(wxCommandEvent& evt)
} }
} }
// refine printer function options
void PrintOptionsDialog::set_spaghetti_detection_sensitivity(wxCommandEvent &evt)
{
int level = spaghetti_detection_level_list->GetSelection();
std::string lvl = sensitivity_level_to_msg_string((AiMonitorSensitivityLevel) level);
if (obj && !lvl.empty()) {
obj->command_xcam_control_spaghetti_detection(m_cb_spaghetti_detection->GetValue(), lvl);
} else {
BOOST_LOG_TRIVIAL(warning) << "print_option: obj is null or lvl = " << lvl;
}
}
void PrintOptionsDialog::set_purgechutepileup_detection_sensitivity(wxCommandEvent &evt)
{
int level = purgechutepileup_detection_level_list->GetSelection();
std::string lvl = sensitivity_level_to_msg_string((AiMonitorSensitivityLevel) level);
if (obj && !lvl.empty()) {
obj->command_xcam_control_purgechutepileup_detection(m_cb_purgechutepileup_detection->GetValue(), lvl);
} else {
BOOST_LOG_TRIVIAL(warning) << "print_option: obj is null or lvl = " << lvl;
}
}
void PrintOptionsDialog::set_nozzleclumping_detection_sensitivity(wxCommandEvent &evt)
{
int level = nozzleclumping_detection_level_list->GetSelection();
std::string lvl = sensitivity_level_to_msg_string((AiMonitorSensitivityLevel) level);
if (obj && !lvl.empty()) {
obj->command_xcam_control_nozzleclumping_detection(m_cb_nozzleclumping_detection->GetValue(), lvl);
} else {
BOOST_LOG_TRIVIAL(warning) << "print_option: obj is null or lvl = " << lvl;
}
}
void PrintOptionsDialog::set_airprinting_detection_sensitivity(wxCommandEvent &evt)
{
int level = airprinting_detection_level_list->GetSelection();
std::string lvl = sensitivity_level_to_msg_string((AiMonitorSensitivityLevel) level);
if (obj && !lvl.empty()) {
obj->command_xcam_control_airprinting_detection(m_cb_airprinting_detection->GetValue(), lvl);
} else {
BOOST_LOG_TRIVIAL(warning) << "print_option: obj is null or lvl = " << lvl;
}
}
void PrintOptionsDialog::update_machine_obj(MachineObject *obj_) void PrintOptionsDialog::update_machine_obj(MachineObject *obj_)
{ {
obj = obj_; obj = obj_;

48
src/slic3r/GUI/PrintOptionsDialog.hpp
View File

@@ -70,8 +70,13 @@ class PrintOptionsDialog : public DPIDialog
{ {
protected: protected:
// settings // settings
wxScrolledWindow* m_scrollwindow;
CheckBox* m_cb_first_layer; CheckBox* m_cb_first_layer;
CheckBox* m_cb_ai_monitoring; CheckBox * m_cb_ai_monitoring;
CheckBox* m_cb_spaghetti_detection;
CheckBox* m_cb_purgechutepileup_detection;
CheckBox* m_cb_nozzleclumping_detection;
CheckBox* m_cb_airprinting_detection;
CheckBox* m_cb_plate_mark; CheckBox* m_cb_plate_mark;
CheckBox* m_cb_auto_recovery; CheckBox* m_cb_auto_recovery;
CheckBox* m_cb_open_door; CheckBox* m_cb_open_door;
@@ -80,9 +85,31 @@ protected:
CheckBox* m_cb_filament_tangle; CheckBox* m_cb_filament_tangle;
CheckBox* m_cb_nozzle_blob; CheckBox* m_cb_nozzle_blob;
Label* text_first_layer; Label* text_first_layer;
Label* text_ai_monitoring; Label* text_ai_detections;
Label* text_ai_monitoring_caption; Label* text_ai_detections_caption;
ComboBox* ai_monitoring_level_list;
Label * text_ai_monitoring;
Label * text_ai_monitoring_caption;
Label* text_spaghetti_detection;
Label* text_spaghetti_detection_caption0;
Label* text_spaghetti_detection_caption1;
Label* text_purgechutepileup_detection;
Label* text_purgechutepileup_detection_caption0;
Label* text_purgechutepileup_detection_caption1;
Label* text_nozzleclumping_detection;
Label* text_nozzleclumping_detection_caption0;
Label* text_nozzleclumping_detection_caption1;
Label *text_airprinting_detection;
Label *text_airprinting_detection_caption0;
Label *text_airprinting_detection_caption1;
ComboBox * ai_monitoring_level_list;
ComboBox *spaghetti_detection_level_list;
ComboBox* purgechutepileup_detection_level_list;
ComboBox* nozzleclumping_detection_level_list;
ComboBox* airprinting_detection_level_list;
Label* text_plate_mark; Label* text_plate_mark;
Label* text_plate_mark_caption; Label* text_plate_mark_caption;
Label* text_auto_recovery; Label* text_auto_recovery;
@@ -109,7 +136,13 @@ public:
PrintOptionsDialog(wxWindow* parent); PrintOptionsDialog(wxWindow* parent);
~PrintOptionsDialog(); ~PrintOptionsDialog();
void on_dpi_changed(const wxRect &suggested_rect) override; void on_dpi_changed(const wxRect &suggested_rect) override;
void update_ai_monitor_status(); void update_ai_monitor_status();
//refine printer function options
void update_spaghetti_detection_status();
void update_purgechutepileup_detection_status();
void update_nozzleclumping_detection_status();
void update_airprinting_detection_status();
MachineObject *obj { nullptr }; MachineObject *obj { nullptr };
@@ -127,7 +160,12 @@ public:
}; };
wxString sensitivity_level_to_label_string(enum AiMonitorSensitivityLevel level); wxString sensitivity_level_to_label_string(enum AiMonitorSensitivityLevel level);
std::string sensitivity_level_to_msg_string(enum AiMonitorSensitivityLevel level); std::string sensitivity_level_to_msg_string(enum AiMonitorSensitivityLevel level);
void set_ai_monitor_sensitivity(wxCommandEvent& evt);
void set_ai_monitor_sensitivity(wxCommandEvent &evt);
void set_spaghetti_detection_sensitivity(wxCommandEvent& evt);
void set_purgechutepileup_detection_sensitivity(wxCommandEvent &evt);
void set_nozzleclumping_detection_sensitivity(wxCommandEvent &evt);
void set_airprinting_detection_sensitivity(wxCommandEvent &evt);
private: private:
void UpdateOptionOpenDoorCheck(MachineObject *obj); void UpdateOptionOpenDoorCheck(MachineObject *obj);