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

Fix wrong slot id

Browse Source
This commit is contained in:
Noisyfox
2025-05-07 16:05:49 +08:00
parent b0872aaba9
commit f6bfad9de1
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -523,7 +523,7 @@ void AMSMaterialsSetting::on_select_reset(wxCommandEvent& event) {
// set k / n value // set k / n value
if (obj->cali_version <= -1 && obj->get_printer_series() == PrinterSeries::SERIES_P1P) { if (obj->cali_version <= -1 && obj->get_printer_series() == PrinterSeries::SERIES_P1P) {
// set extrusion cali ratio // set extrusion cali ratio
int cali_tray_id = ams_id * 4 + tray_id; int cali_tray_id = ams_id * 4 + slot_id;
double k = 0.0; double k = 0.0;
try { try {
@@ -544,7 +544,7 @@ void AMSMaterialsSetting::on_select_reset(wxCommandEvent& event) {
} }
else { else {
PACalibIndexInfo select_index_info; PACalibIndexInfo select_index_info;
select_index_info.tray_id = tray_id; select_index_info.tray_id = slot_id;
select_index_info.nozzle_diameter = obj->m_nozzle_data.nozzles[0].diameter; select_index_info.nozzle_diameter = obj->m_nozzle_data.nozzles[0].diameter;
select_index_info.cali_idx = -1; select_index_info.cali_idx = -1;
select_index_info.filament_id = selected_ams_id; select_index_info.filament_id = selected_ams_id;
@@ -695,7 +695,7 @@ void AMSMaterialsSetting::on_select_ok(wxCommandEvent &event)
} }
} }
else { else {
int cali_tray_id = ams_id * 4 + tray_id; int cali_tray_id = ams_id * 4 + slot_id;
double k = 0.0; double k = 0.0;
try { try {
k_text.ToDouble(&k); k_text.ToDouble(&k);
@@ -802,7 +802,7 @@ void AMSMaterialsSetting::on_clr_picker(wxMouseEvent &event)
bool AMSMaterialsSetting::is_virtual_tray() bool AMSMaterialsSetting::is_virtual_tray()
{ {
if (tray_id == VIRTUAL_TRAY_ID) if (ams_id == VIRTUAL_TRAY_ID)
return true; return true;
return false; return false;
} }
@@ -1167,9 +1167,7 @@ void AMSMaterialsSetting::on_select_filament(wxCommandEvent &evt)
if (obj->cali_version >= 0) { if (obj->cali_version >= 0) {
// add default item // add default item
PACalibResult default_item; PACalibResult default_item;
default_item.filament_id = ams_filament_id;
default_item.cali_idx = -1; default_item.cali_idx = -1;
default_item.filament_id = ams_filament_id;
get_default_k_n_value(ams_filament_id, default_item.k_value, default_item.n_coef); get_default_k_n_value(ams_filament_id, default_item.k_value, default_item.n_coef);
m_pa_profile_items.emplace_back(default_item); m_pa_profile_items.emplace_back(default_item);
items.push_back(_L("Default")); items.push_back(_L("Default"));

1
src/slic3r/GUI/AMSMaterialsSetting.hpp
View File

@@ -119,7 +119,6 @@ public:
MachineObject* obj{ nullptr }; MachineObject* obj{ nullptr };
int ams_id { 0 }; /* 0 ~ 3 */ int ams_id { 0 }; /* 0 ~ 3 */
int slot_id { 0 }; /* 0 ~ 3 */ int slot_id { 0 }; /* 0 ~ 3 */
int tray_id { 0 }; /* 0 ~ 3 */
std::string ams_filament_id; std::string ams_filament_id;
std::string ams_setting_id; std::string ams_setting_id;