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

ENH:support setting nozzle data

Browse Source 
jira:[none]

Change-Id: I75044d9b5529286e5c32a436a38d2e3c8fcf4d55
(cherry picked from commit 68b314eebd58c486cda79931c52a9bdcb72556a3)
This commit is contained in:
tao wang
2024-12-09 20:12:24 +08:00
committed by Noisyfox
parent 1f9d27d880
commit 0e5d3fd7b8
4 changed files with 40 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2106,7 +2106,7 @@ int MachineObject::command_set_printer_nozzle(std::string nozzle_type, float dia
return this->publish_json(j.dump()); return this->publish_json(j.dump());
} }
int MachineObject::command_set_printer_nozzle2(int id, std::string nozzle_type, float diameter, int flow) int MachineObject::command_set_printer_nozzle2(int id, std::string nozzle_type, float diameter)
{ {
nozzle_setting_hold_count = HOLD_COUNT_MAX * 2; nozzle_setting_hold_count = HOLD_COUNT_MAX * 2;
BOOST_LOG_TRIVIAL(info) << "command_set_printer_nozzle2, nozzle_type = " << nozzle_type << " diameter = " << diameter; BOOST_LOG_TRIVIAL(info) << "command_set_printer_nozzle2, nozzle_type = " << nozzle_type << " diameter = " << diameter;
@@ -2114,8 +2114,9 @@ int MachineObject::command_set_printer_nozzle2(int id, std::string nozzle_type,
j["print"]["command"] = "set_nozzle"; j["print"]["command"] = "set_nozzle";
j["print"]["sequence_id"] = std::to_string(MachineObject::m_sequence_id++); j["print"]["sequence_id"] = std::to_string(MachineObject::m_sequence_id++);
j["print"]["id"] = id; j["print"]["id"] = id;
j["print"]["type"] = "type"; j["print"]["type"] = nozzle_type;
j["print"]["diameter"] = diameter; j["print"]["diameter"] = diameter;
j["print"]["wear"] = 0;
return this->publish_json(j.dump()); return this->publish_json(j.dump());
} }

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

@@ -1045,7 +1045,7 @@ public:
int command_pushing(std::string cmd); int command_pushing(std::string cmd);
int command_clean_print_error(std::string task_id, int print_error); int command_clean_print_error(std::string task_id, int print_error);
int command_set_printer_nozzle(std::string nozzle_type, float diameter); int command_set_printer_nozzle(std::string nozzle_type, float diameter);
int command_set_printer_nozzle2(int id, std::string nozzle_type, float diameter, int flow); int command_set_printer_nozzle2(int id, std::string nozzle_type, float diameter);
int command_get_access_code(); int command_get_access_code();
int command_select_extruder(int id); int command_select_extruder(int id);

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

@@ -440,14 +440,14 @@ PrinterPartsDialog::PrinterPartsDialog(wxWindow* parent)
nozzle_type_map[NozzleType::ntHardenedSteel] = _L("Hardened Steel"); nozzle_type_map[NozzleType::ntHardenedSteel] = _L("Hardened Steel");
nozzle_type_map[NozzleType::ntStainlessSteel] = _L("Stainless Steel"); nozzle_type_map[NozzleType::ntStainlessSteel] = _L("Stainless Steel");
//nozzle_flow_map[NozzleFlowType::S_FLOW] = _L("Standard"); nozzle_flow_map[NozzleFlowType::S_FLOW] = _L("Normal flow");
//nozzle_flow_map[NozzleFlowType::H_FLOW] = _L("High flow"); nozzle_flow_map[NozzleFlowType::H_FLOW] = _L("High flow");
nozzle_type_selection_map[NozzleType::ntHardenedSteel] = 0; nozzle_type_selection_map[NozzleType::ntHardenedSteel] = 0;
nozzle_type_selection_map[NozzleType::ntStainlessSteel] = 1; nozzle_type_selection_map[NozzleType::ntStainlessSteel] = 1;
//nozzle_flow_selection_map[NozzleFlowType::S_FLOW] = 0; nozzle_flow_selection_map[NozzleFlowType::S_FLOW] = 0;
//nozzle_flow_selection_map[NozzleFlowType::H_FLOW] = 1; nozzle_flow_selection_map[NozzleFlowType::H_FLOW] = 1;
nozzle_stainless_diameter_map[0] = 0.2; nozzle_stainless_diameter_map[0] = 0.2;
nozzle_stainless_diameter_map[1] = 0.4; nozzle_stainless_diameter_map[1] = 0.4;
@@ -542,8 +542,8 @@ PrinterPartsDialog::PrinterPartsDialog(wxWindow* parent)
multiple_left_nozzle_type->SetForegroundColour(STATIC_TEXT_CAPTION_COL); multiple_left_nozzle_type->SetForegroundColour(STATIC_TEXT_CAPTION_COL);
multiple_left_nozzle_type_checkbox = new ComboBox(multiple_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(FromDIP(140), -1), 0, NULL, wxCB_READONLY); multiple_left_nozzle_type_checkbox = new ComboBox(multiple_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(FromDIP(140), -1), 0, NULL, wxCB_READONLY);
multiple_left_nozzle_type_checkbox->Append(_L("Stainless Steel")); multiple_left_nozzle_type_checkbox->Append(nozzle_type_map[NozzleType::ntHardenedSteel]);
multiple_left_nozzle_type_checkbox->Append(_L("Hardened Steel")); multiple_left_nozzle_type_checkbox->Append(nozzle_type_map[NozzleType::ntStainlessSteel]);
multiple_left_nozzle_type_checkbox->SetSelection(0); multiple_left_nozzle_type_checkbox->SetSelection(0);
auto multiple_left_nozzle_diameter = new Label(multiple_panel, _L("Nozzle Diameter")); auto multiple_left_nozzle_diameter = new Label(multiple_panel, _L("Nozzle Diameter"));
@@ -559,6 +559,8 @@ PrinterPartsDialog::PrinterPartsDialog(wxWindow* parent)
multiple_left_nozzle_flow->SetMaxSize(wxSize(FromDIP(80), -1)); multiple_left_nozzle_flow->SetMaxSize(wxSize(FromDIP(80), -1));
multiple_left_nozzle_flow->SetForegroundColour(STATIC_TEXT_CAPTION_COL); multiple_left_nozzle_flow->SetForegroundColour(STATIC_TEXT_CAPTION_COL);
multiple_left_nozzle_flow_checkbox = new ComboBox(multiple_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(FromDIP(140), -1), 0, NULL, wxCB_READONLY); multiple_left_nozzle_flow_checkbox = new ComboBox(multiple_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(FromDIP(140), -1), 0, NULL, wxCB_READONLY);
multiple_left_nozzle_flow_checkbox->Append(nozzle_flow_map[NozzleFlowType::S_FLOW]);
multiple_left_nozzle_flow_checkbox->Append(nozzle_flow_map[NozzleFlowType::H_FLOW]);
multiple_left_line_sizer->Add(multiple_left_nozzle_type, 0, wxALIGN_CENTER, 0); multiple_left_line_sizer->Add(multiple_left_nozzle_type, 0, wxALIGN_CENTER, 0);
multiple_left_line_sizer->Add(0, 0, 0, wxLEFT, FromDIP(8)); multiple_left_line_sizer->Add(0, 0, 0, wxLEFT, FromDIP(8));
@@ -585,8 +587,8 @@ PrinterPartsDialog::PrinterPartsDialog(wxWindow* parent)
multiple_right_nozzle_type->SetForegroundColour(STATIC_TEXT_CAPTION_COL); multiple_right_nozzle_type->SetForegroundColour(STATIC_TEXT_CAPTION_COL);
multiple_right_nozzle_type_checkbox = new ComboBox(multiple_panel, ID_NOZZLE_TYPE_CHECKBOX_RIGHT, wxEmptyString, wxDefaultPosition, wxSize(FromDIP(140), -1), 0, NULL, wxCB_READONLY); multiple_right_nozzle_type_checkbox = new ComboBox(multiple_panel, ID_NOZZLE_TYPE_CHECKBOX_RIGHT, wxEmptyString, wxDefaultPosition, wxSize(FromDIP(140), -1), 0, NULL, wxCB_READONLY);
multiple_right_nozzle_type_checkbox->Append(_L("Stainless Steel")); multiple_right_nozzle_type_checkbox->Append(nozzle_type_map[NozzleType::ntHardenedSteel]);
multiple_right_nozzle_type_checkbox->Append(_L("Hardened Steel")); multiple_right_nozzle_type_checkbox->Append(nozzle_type_map[NozzleType::ntStainlessSteel]);
multiple_right_nozzle_type_checkbox->SetSelection(0); multiple_right_nozzle_type_checkbox->SetSelection(0);
auto multiple_right_nozzle_diameter = new Label(multiple_panel, _L("Nozzle Diameter")); auto multiple_right_nozzle_diameter = new Label(multiple_panel, _L("Nozzle Diameter"));
@@ -602,6 +604,8 @@ PrinterPartsDialog::PrinterPartsDialog(wxWindow* parent)
multiple_right_nozzle_flow->SetMaxSize(wxSize(FromDIP(80), -1)); multiple_right_nozzle_flow->SetMaxSize(wxSize(FromDIP(80), -1));
multiple_right_nozzle_flow->SetForegroundColour(STATIC_TEXT_CAPTION_COL); multiple_right_nozzle_flow->SetForegroundColour(STATIC_TEXT_CAPTION_COL);
multiple_right_nozzle_flow_checkbox = new ComboBox(multiple_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(FromDIP(140), -1), 0, NULL, wxCB_READONLY); multiple_right_nozzle_flow_checkbox = new ComboBox(multiple_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(FromDIP(140), -1), 0, NULL, wxCB_READONLY);
multiple_right_nozzle_flow_checkbox->Append(nozzle_flow_map[NozzleFlowType::S_FLOW]);
multiple_right_nozzle_flow_checkbox->Append(nozzle_flow_map[NozzleFlowType::H_FLOW]);
multiple_right_line_sizer->Add(multiple_right_nozzle_type, 0, wxALIGN_CENTER, 0); multiple_right_line_sizer->Add(multiple_right_nozzle_type, 0, wxALIGN_CENTER, 0);
multiple_right_line_sizer->Add(0, 0, 0, wxLEFT, FromDIP(8)); multiple_right_line_sizer->Add(0, 0, 0, wxLEFT, FromDIP(8));
@@ -618,7 +622,7 @@ PrinterPartsDialog::PrinterPartsDialog(wxWindow* parent)
multiple_sizer->Add(0, 0, 0, wxTOP, FromDIP(40)); multiple_sizer->Add(0, 0, 0, wxTOP, FromDIP(40));
multiple_sizer->Add(leftTitle, 0, wxLEFT, FromDIP(18)); multiple_sizer->Add(leftTitle, 0, wxLEFT, FromDIP(18));
multiple_sizer->Add(multiple_left_line_sizer, 0, wxALIGN_CENTER|wxLEFT|wxRIGHT, FromDIP(18)); multiple_sizer->Add(multiple_left_line_sizer, 0, wxALIGN_CENTER|wxLEFT|wxRIGHT, FromDIP(18));
multiple_sizer->Add(0, 0, 0, wxTOP, FromDIP(40)); multiple_sizer->Add(0, 0, 0, wxTOP, FromDIP(24));
multiple_sizer->Add(rightTitle, 0, wxLEFT, FromDIP(18)); multiple_sizer->Add(rightTitle, 0, wxLEFT, FromDIP(18));
multiple_sizer->Add(multiple_right_line_sizer, 0, wxALIGN_CENTER | wxLEFT | wxRIGHT, FromDIP(18)); multiple_sizer->Add(multiple_right_line_sizer, 0, wxALIGN_CENTER | wxLEFT | wxRIGHT, FromDIP(18));
multiple_sizer->Add(0, 0, 0, wxTOP, FromDIP(40)); multiple_sizer->Add(0, 0, 0, wxTOP, FromDIP(40));
@@ -627,6 +631,9 @@ PrinterPartsDialog::PrinterPartsDialog(wxWindow* parent)
multiple_panel->Layout(); multiple_panel->Layout();
multiple_panel->Fit(); multiple_panel->Fit();
/*inset data*/
sizer->Add(single_panel, 0, wxEXPAND, 0); sizer->Add(single_panel, 0, wxEXPAND, 0);
sizer->Add(multiple_panel, 0, wxEXPAND, 0); sizer->Add(multiple_panel, 0, wxEXPAND, 0);
SetSizer(sizer); SetSizer(sizer);
@@ -664,6 +671,13 @@ PrinterPartsDialog::~PrinterPartsDialog()
{ {
nozzle_type_checkbox->Disconnect(wxEVT_COMBOBOX, wxCommandEventHandler(PrinterPartsDialog::set_nozzle_data), NULL, this); nozzle_type_checkbox->Disconnect(wxEVT_COMBOBOX, wxCommandEventHandler(PrinterPartsDialog::set_nozzle_data), NULL, this);
nozzle_diameter_checkbox->Disconnect(wxEVT_COMBOBOX, wxCommandEventHandler(PrinterPartsDialog::set_nozzle_data), NULL, this); nozzle_diameter_checkbox->Disconnect(wxEVT_COMBOBOX, wxCommandEventHandler(PrinterPartsDialog::set_nozzle_data), NULL, this);
multiple_left_nozzle_type_checkbox->Disconnect(wxEVT_COMBOBOX, wxCommandEventHandler(PrinterPartsDialog::set_nozzle_data), NULL, this);
multiple_left_nozzle_diameter_checkbox->Disconnect(wxEVT_COMBOBOX, wxCommandEventHandler(PrinterPartsDialog::set_nozzle_data), NULL, this);
multiple_left_nozzle_flow_checkbox->Disconnect(wxEVT_COMBOBOX, wxCommandEventHandler(PrinterPartsDialog::set_nozzle_data), NULL, this);
multiple_right_nozzle_type_checkbox->Disconnect(wxEVT_COMBOBOX, wxCommandEventHandler(PrinterPartsDialog::set_nozzle_data), NULL, this);
multiple_right_nozzle_diameter_checkbox->Disconnect(wxEVT_COMBOBOX, wxCommandEventHandler(PrinterPartsDialog::set_nozzle_data), NULL, this);
multiple_right_nozzle_flow_checkbox->Disconnect(wxEVT_COMBOBOX, wxCommandEventHandler(PrinterPartsDialog::set_nozzle_data), NULL, this);
} }
void PrinterPartsDialog::set_nozzle_data(wxCommandEvent& evt) void PrinterPartsDialog::set_nozzle_data(wxCommandEvent& evt)
@@ -680,10 +694,12 @@ void PrinterPartsDialog::set_nozzle_data(wxCommandEvent& evt)
nozzle_id = MAIN_NOZZLE_ID; nozzle_id = MAIN_NOZZLE_ID;
} }
if (obj) { if (obj) {
try { try {
auto nozzle_type = NozzleType::ntHardenedSteel; auto nozzle_type = NozzleType::ntHardenedSteel;
auto nozzle_diameter = 0.4f; auto nozzle_diameter = 0.4f;
auto nozzle_flow = NozzleFlowType::NONE_FLOWTYPE;
for (auto sm : nozzle_type_selection_map) { for (auto sm : nozzle_type_selection_map) {
if (sm.second == current_nozzle_type_combox->GetSelection()) { if (sm.second == current_nozzle_type_combox->GetSelection()) {
@@ -709,9 +725,7 @@ void PrinterPartsDialog::set_nozzle_data(wxCommandEvent& evt)
nozzle_diameter = std::stof(current_nozzle_diameter_combox->GetStringSelection().ToStdString()); nozzle_diameter = std::stof(current_nozzle_diameter_combox->GetStringSelection().ToStdString());
nozzle_diameter = round(nozzle_diameter * 10) / 10; nozzle_diameter = round(nozzle_diameter * 10) / 10;
/*if (!obj->is_enable_np)*/ { if (!obj->is_enable_np) {
if (current_nozzle_type_combox && current_nozzle_type_combox->IsShown() && current_nozzle_type_combox->GetValue().IsEmpty()) { return; }
if (current_nozzle_diameter_combox && current_nozzle_diameter_combox->IsShown() && current_nozzle_diameter_combox->GetValue().IsEmpty()) { return; }
obj->m_extder_data.extders[MAIN_NOZZLE_ID].current_nozzle_diameter = nozzle_diameter; obj->m_extder_data.extders[MAIN_NOZZLE_ID].current_nozzle_diameter = nozzle_diameter;
obj->m_extder_data.extders[MAIN_NOZZLE_ID].current_nozzle_type = nozzle_type; obj->m_extder_data.extders[MAIN_NOZZLE_ID].current_nozzle_type = nozzle_type;
obj->command_set_printer_nozzle(NozzleTypeEumnToStr[nozzle_type], nozzle_diameter); obj->command_set_printer_nozzle(NozzleTypeEumnToStr[nozzle_type], nozzle_diameter);
@@ -780,7 +794,7 @@ bool PrinterPartsDialog::Show(bool show)
//left //left
auto type = obj->m_extder_data.extders[DEPUTY_NOZZLE_ID].current_nozzle_type; auto type = obj->m_extder_data.extders[DEPUTY_NOZZLE_ID].current_nozzle_type;
auto diameter = obj->m_extder_data.extders[DEPUTY_NOZZLE_ID].current_nozzle_diameter; auto diameter = obj->m_extder_data.extders[DEPUTY_NOZZLE_ID].current_nozzle_diameter;
//auto flow_type = obj->m_extder_data.extders[DEPUTY_NOZZLE_ID].current_nozzle_flow_type; auto flow_type = obj->m_extder_data.extders[DEPUTY_NOZZLE_ID].current_nozzle_flow_type;
multiple_left_nozzle_type_checkbox->Enable(); multiple_left_nozzle_type_checkbox->Enable();
multiple_left_nozzle_diameter_checkbox->Enable(); multiple_left_nozzle_diameter_checkbox->Enable();
@@ -816,13 +830,13 @@ bool PrinterPartsDialog::Show(bool show)
} }
multiple_left_nozzle_type_checkbox->SetSelection(nozzle_type_selection_map[type]); multiple_left_nozzle_type_checkbox->SetSelection(nozzle_type_selection_map[type]);
//if (flow_type != NozzleFlowType::NONE_FLOWTYPE) {multiple_left_nozzle_flow_checkbox->SetSelection(nozzle_flow_selection_map[flow_type]);} if (flow_type != NozzleFlowType::NONE_FLOWTYPE) {multiple_left_nozzle_flow_checkbox->SetSelection(nozzle_flow_selection_map[flow_type]);}
} }
//right //right
type = obj->m_extder_data.extders[MAIN_NOZZLE_ID].current_nozzle_type; type = obj->m_extder_data.extders[MAIN_NOZZLE_ID].current_nozzle_type;
diameter = obj->m_extder_data.extders[MAIN_NOZZLE_ID].current_nozzle_diameter; diameter = obj->m_extder_data.extders[MAIN_NOZZLE_ID].current_nozzle_diameter;
//flow_type = obj->m_extder_data.extders[MAIN_NOZZLE_ID].current_nozzle_flow_type; flow_type = obj->m_extder_data.extders[MAIN_NOZZLE_ID].current_nozzle_flow_type;
multiple_right_nozzle_diameter_checkbox->Clear(); multiple_right_nozzle_diameter_checkbox->Clear();
@@ -858,7 +872,7 @@ bool PrinterPartsDialog::Show(bool show)
} }
multiple_right_nozzle_type_checkbox->SetSelection(nozzle_type_selection_map[type]); multiple_right_nozzle_type_checkbox->SetSelection(nozzle_type_selection_map[type]);
//if (flow_type != NozzleFlowType::NONE_FLOWTYPE) { multiple_right_nozzle_flow_checkbox->SetSelection(nozzle_flow_selection_map[flow_type]); }; if (flow_type != NozzleFlowType::NONE_FLOWTYPE) { multiple_right_nozzle_flow_checkbox->SetSelection(nozzle_flow_selection_map[flow_type]); };
} }
} }

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

@@ -52,8 +52,8 @@ protected:
std::map<NozzleType, wxString> nozzle_type_map; std::map<NozzleType, wxString> nozzle_type_map;
std::map<NozzleType, int> nozzle_type_selection_map; std::map<NozzleType, int> nozzle_type_selection_map;
//std::map<NozzleFlowType, wxString> nozzle_flow_map; std::map<NozzleFlowType, wxString> nozzle_flow_map;
//std::map<NozzleFlowType, int> nozzle_flow_selection_map; std::map<NozzleFlowType, int> nozzle_flow_selection_map;
std::map<int, float> nozzle_stainless_diameter_map; std::map<int, float> nozzle_stainless_diameter_map;
std::map<int, float> nozzle_hard_diameter_map; std::map<int, float> nozzle_hard_diameter_map;