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

FIX: can not send print since the param fault

Browse Source 
jira: [STUDIO-9724]
Change-Id: I1e8870e6e0b182ed6c026784b169cfcf56c56e4c
(cherry picked from commit 181316374321822da231612cc7e87f77395a20ac)
This commit is contained in:
xin.zhang
2025-01-11 11:32:41 +08:00
committed by Noisyfox
parent eeebaa3f74
commit 25900bb917
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/slic3r/GUI/SelectMachine.cpp
View File

@@ -2108,6 +2108,7 @@ void SelectMachineDialog::on_ok_btn(wxCommandEvent &event)
//check blacklist //check blacklist
for (auto i = 0; i < m_ams_mapping_result.size(); i++) { for (auto i = 0; i < m_ams_mapping_result.size(); i++) {
const auto& ams_id = m_ams_mapping_result[i].ams_id;
auto tid = m_ams_mapping_result[i].tray_id; auto tid = m_ams_mapping_result[i].tray_id;
std::string filament_type = boost::to_upper_copy(m_ams_mapping_result[i].type); std::string filament_type = boost::to_upper_copy(m_ams_mapping_result[i].type);
@@ -2122,7 +2123,8 @@ void SelectMachineDialog::on_ok_btn(wxCommandEvent &event)
bool in_blacklist = false; bool in_blacklist = false;
std::string action; std::string action;
std::string info; std::string info;
DeviceManager::check_filaments_in_blacklist(filament_brand, filament_type, tid, in_blacklist, action, info);
DeviceManager::check_filaments_in_blacklist(filament_brand, filament_type, stoi(ams_id), in_blacklist, action, info);
if (in_blacklist && action == "warning") { if (in_blacklist && action == "warning") {
wxString prohibited_error = wxString::FromUTF8(info); wxString prohibited_error = wxString::FromUTF8(info);
@@ -2173,6 +2175,7 @@ void SelectMachineDialog::on_ok_btn(wxCommandEvent &event)
for (auto i = 0; i < m_ams_mapping_result.size(); i++) { for (auto i = 0; i < m_ams_mapping_result.size(); i++) {
const auto& ams_id = m_ams_mapping_result[i].ams_id;
auto tid = m_ams_mapping_result[i].tray_id; auto tid = m_ams_mapping_result[i].tray_id;
std::string filament_type = boost::to_upper_copy(m_ams_mapping_result[i].type); std::string filament_type = boost::to_upper_copy(m_ams_mapping_result[i].type);
@@ -2187,7 +2190,7 @@ void SelectMachineDialog::on_ok_btn(wxCommandEvent &event)
bool in_blacklist = false; bool in_blacklist = false;
std::string action; std::string action;
std::string info; std::string info;
DeviceManager::check_filaments_in_blacklist(filament_brand, filament_type, tid, in_blacklist, action, info); DeviceManager::check_filaments_in_blacklist(filament_brand, filament_type, stoi(ams_id), in_blacklist, action, info);
if (in_blacklist && action == "prohibition") { if (in_blacklist && action == "prohibition") {
has_prohibited_filament = true; has_prohibited_filament = true;