3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2026-02-22 12:32:17 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

FIX: wrong check while send print

Browse source 
jira: [STUDIO-9489]
Change-Id: I7ad5cc2a55cd9b55de3d98ad7bd30150b1f448af
(cherry picked from commit 1e712f19c97837ccda9d5b381f0668488036131e)
This commit is contained in:
xin.zhang 2025-01-01 16:03:06 +08:00 • committed by Noisyfox
parent 8c2f658c93
commit 33440082e6
4 changed files with 30 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/slic3r/GUI/SelectMachine.cpp
View file

@ -1504,7 +1504,7 @@ bool SelectMachineDialog::is_nozzle_type_match(ExtderData data) {
const auto& project_config = wxGetApp().preset_bundle->project_config;
//check nozzle used
auto used_filaments = wxGetApp().plater()->get_partplate_list().get_curr_plate()->get_used_extruders(); // 1 based
auto used_filaments = wxGetApp().plater()->get_partplate_list().get_curr_plate()->get_used_filaments(); // 1 based
auto filament_maps = wxGetApp().plater()->get_partplate_list().get_curr_plate()->get_real_filament_maps(project_config); // 1 based
std::map<int, std::string> used_extruders_flow;
std::vector<int> used_extruders; // 0 based
@ -1980,21 +1980,19 @@ bool SelectMachineDialog::is_same_nozzle_diameters(float& tag_nozzle_diameter) c
try
{
auto used_extruder_idxs = wxGetApp().plater()->get_partplate_list().get_curr_plate()->get_used_extruders();/*the index is started from 1*/
for (int extruder_idx : used_extruder_idxs)
PartPlate* cur_plate = wxGetApp().plater()->get_partplate_list().get_curr_plate();
auto used_filament_idxs = cur_plate->get_used_filaments();/*the index is started from 1*/
for (int used_filament_idx : used_filament_idxs)
{
if (opt_nozzle_diameters->size() < extruder_idx)
int used_nozzle_idx = cur_plate->get_used_nozzle_by_filament_id(used_filament_idx);
if (used_nozzle_idx == -1)
{
assert(0);
return false;
}
tag_nozzle_diameter = float(opt_nozzle_diameters->get_at(extruder_idx));
if (obj_->m_extder_data.extders.size() < extruder_idx)
{
return false;
}
if (tag_nozzle_diameter != obj_->m_extder_data.extders[extruder_idx - 1].current_nozzle_diameter)
tag_nozzle_diameter = float(opt_nozzle_diameters->get_at(used_nozzle_idx));
if (tag_nozzle_diameter != obj_->m_extder_data.extders[used_nozzle_idx].current_nozzle_diameter)
{
return false;
}
@ -3696,7 +3694,7 @@ void SelectMachineDialog::reset_and_sync_ams_list()
}
}
auto extruders = wxGetApp().plater()->get_partplate_list().get_curr_plate()->get_used_extruders();
auto extruders = wxGetApp().plater()->get_partplate_list().get_curr_plate()->get_used_filaments();
BitmapCache bmcache;
MaterialHash::iterator iter = m_materialList.begin();
while (iter != m_materialList.end()) {