GitHub-Proxy/BambuStudio
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/bambulab/BambuStudio.git synced 2025-09-29 06:33:13 +08:00
Code Issues Actions Packages Projects Releases 1 Wiki Activity

ENH:support set ams filament

Browse Source 
jira:[for 2nozzle setting]

Change-Id: Ib9e20bcdf6d8ea1bf5dd5e8624a68730e05e69ad
This commit is contained in:
tao.wang 2024-07-23 20:46:19 +08:00 committed by lane.wei
parent 62624e2a13
commit 78c5928194
3 changed files with 49 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/slic3r/GUI/AMSMaterialsSetting.cpp
View File

@ -590,7 +590,11 @@ void AMSMaterialsSetting::on_select_ok(wxCommandEvent &event)
obj->command_ams_filament_settings(ams_id, tar_tray, ams_filament_id, ams_setting_id, std::string(col_buf), m_filament_type, nozzle_temp_min_int, nozzle_temp_max_int); obj->command_ams_filament_settings(ams_id, tar_tray, ams_filament_id, ams_setting_id, std::string(col_buf), m_filament_type, nozzle_temp_min_int, nozzle_temp_max_int);
} }
else { else {
obj->command_ams_filament_settings(ams_id, tray_id, ams_filament_id, ams_setting_id, std::string(col_buf), m_filament_type, nozzle_temp_min_int, nozzle_temp_max_int); if (obj->is_enable_np) {
obj->command_ams_filament_settings(ams_id, slot_id, ams_filament_id, ams_setting_id, std::string(col_buf), m_filament_type, nozzle_temp_min_int, nozzle_temp_max_int);
} else {
obj->command_ams_filament_settings(ams_id, ams_id * 4 + slot_id, ams_filament_id, ams_setting_id, std::string(col_buf), m_filament_type, nozzle_temp_min_int, nozzle_temp_max_int);
}
} }
} }

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

@ -4324,8 +4324,11 @@ int MachineObject::parse_json(std::string payload, bool key_field_only)
; ;
} }
} }
for (auto &filament_id : need_checked_filament_id)
m_checked_filament.insert(filament_id); /*parse new print data*/
try {
parse_new_info(jj);
} catch (...) {}
#pragma endregion #pragma endregion
} else if (jj["command"].get<std::string>() == "gcode_line") { } else if (jj["command"].get<std::string>() == "gcode_line") {
//ack of gcode_line //ack of gcode_line
@ -4799,13 +4802,6 @@ int MachineObject::parse_json(std::string payload, bool key_field_only)
} }
} }
} }
/*parse new print data*/
try
{
parse_new_info(jj);
}
catch (...){}
} }
if (!key_field_only) { if (!key_field_only) {

96
src/slic3r/GUI/StatusPanel.cpp
View File

@ -3708,70 +3708,52 @@ void StatusPanel::on_filament_edit(wxCommandEvent &event)
int ams_id = event.GetInt(); int ams_id = event.GetInt();
int slot_id = event.GetString().IsEmpty() ? 0 : std::stoi(event.GetString().ToStdString()); int slot_id = event.GetString().IsEmpty() ? 0 : std::stoi(event.GetString().ToStdString());
/* if (ams_id.compare(std::to_string(VIRTUAL_TRAY_MAIN_ID)) == 0) { try {
tray_id_int = VIRTUAL_TRAY_MAIN_ID; m_filament_setting_dlg->ams_id = ams_id;
m_filament_setting_dlg->ams_id = ams_id_int; m_filament_setting_dlg->slot_id = slot_id;
m_filament_setting_dlg->tray_id = tray_id_int;
wxString k_val;
wxString n_val;
k_val = wxString::Format("%.3f", obj->vt_slot[0].k);
n_val = wxString::Format("%.3f", obj->vt_slot[0].n);
m_filament_setting_dlg->Move(wxPoint(current_position_x, current_position_y));
m_filament_setting_dlg->Popup(wxEmptyString, wxEmptyString, wxEmptyString, wxEmptyString, k_val, n_val);
} else {*/
//std::string tray_id = event.GetString().ToStdString(); // m_ams_control->GetCurrentCan(ams_id);
try {
m_filament_setting_dlg->ams_id = ams_id;
m_filament_setting_dlg->slot_id = slot_id;
//m_filament_setting_dlg->tray_id = 254;
std::string sn_number; std::string sn_number;
std::string filament; std::string filament;
std::string temp_max; std::string temp_max;
std::string temp_min; std::string temp_min;
wxString k_val; wxString k_val;
wxString n_val; wxString n_val;
auto it = obj->amsList.find(std::to_string(ams_id)); auto it = obj->amsList.find(std::to_string(ams_id));
if (it != obj->amsList.end()) { if (it != obj->amsList.end()) {
auto tray_it = it->second->trayList.find(std::to_string(slot_id)); auto tray_it = it->second->trayList.find(std::to_string(slot_id));
if (tray_it != it->second->trayList.end()) { if (tray_it != it->second->trayList.end()) {
k_val = wxString::Format("%.3f", tray_it->second->k); k_val = wxString::Format("%.3f", tray_it->second->k);
n_val = wxString::Format("%.3f", tray_it->second->n); n_val = wxString::Format("%.3f", tray_it->second->n);
wxColor color = AmsTray::decode_color(tray_it->second->color); wxColor color = AmsTray::decode_color(tray_it->second->color);
//m_filament_setting_dlg->set_color(color); // m_filament_setting_dlg->set_color(color);
std::vector<wxColour> cols; std::vector<wxColour> cols;
for (auto col : tray_it->second->cols) { for (auto col : tray_it->second->cols) { cols.push_back(AmsTray::decode_color(col)); }
cols.push_back( AmsTray::decode_color(col)); m_filament_setting_dlg->set_ctype(tray_it->second->ctype);
} m_filament_setting_dlg->ams_filament_id = tray_it->second->setting_id;
m_filament_setting_dlg->set_ctype(tray_it->second->ctype);
m_filament_setting_dlg->ams_filament_id = tray_it->second->setting_id;
if (m_filament_setting_dlg->ams_filament_id.empty()) { if (m_filament_setting_dlg->ams_filament_id.empty()) {
m_filament_setting_dlg->set_empty_color(color); m_filament_setting_dlg->set_empty_color(color);
} } else {
else { m_filament_setting_dlg->set_color(color);
m_filament_setting_dlg->set_color(color); m_filament_setting_dlg->set_colors(cols);
m_filament_setting_dlg->set_colors(cols); }
}
m_filament_setting_dlg->m_is_third = !MachineObject::is_bbl_filament(tray_it->second->tag_uid); m_filament_setting_dlg->m_is_third = !MachineObject::is_bbl_filament(tray_it->second->tag_uid);
if (!m_filament_setting_dlg->m_is_third) { if (!m_filament_setting_dlg->m_is_third) {
sn_number = tray_it->second->uuid; sn_number = tray_it->second->uuid;
filament = tray_it->second->sub_brands; filament = tray_it->second->sub_brands;
temp_max = tray_it->second->nozzle_temp_max; temp_max = tray_it->second->nozzle_temp_max;
temp_min = tray_it->second->nozzle_temp_min; temp_min = tray_it->second->nozzle_temp_min;
}
} }
} }
}
m_filament_setting_dlg->Move(wxPoint(current_position_x, current_position_y)); m_filament_setting_dlg->Move(wxPoint(current_position_x, current_position_y));
m_filament_setting_dlg->Popup(filament, sn_number, temp_min, temp_max, k_val, n_val); m_filament_setting_dlg->Popup(filament, sn_number, temp_min, temp_max, k_val, n_val);
} } catch (...) {
catch (...) { ;
; }
}
//}
} }
} }