3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-12-25 09:08:38 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

FIX: fix incorrect flush_volume_matrix size when switch printer

Browse source 
jira: none
Change-Id: Idaaaaa65b2ea7fdefd41d1c589e5404f8296ae4a
(cherry picked from commit 927170c6304795b0ad75560688348b4febb96a42)
This commit is contained in:
zhimin.zeng 2024-10-15 15:43:34 +08:00 • committed by Noisyfox
parent c362a99a11
commit 4ac3edf780
1 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/slic3r/GUI/Plater.cpp
View file

@ -13661,34 +13661,36 @@ void Plater::update_flush_volume_matrix(size_t old_nozzle_size, size_t new_nozzl
// Verify whether it is the first time start Studio
size_t filament_nums = project_config->option<ConfigOptionStrings>("filament_colour")->values.size();
size_t flush_volume_size = project_config->option<ConfigOptionFloats>("flush_volumes_matrix")->values.size();
if (filament_nums * filament_nums * new_nozzle_size == flush_volume_size)
return;
assert(nozzle_nums == new_nozzle_size);
if (old_nozzle_size < new_nozzle_size) {
std::vector<double> flush_volume_mtx = get_flush_volumes_matrix(project_config->option<ConfigOptionFloats>("flush_volumes_matrix")->values, -1, old_nozzle_size);
std::vector<double> first_flush_volume_mtx = get_flush_volumes_matrix(project_config->option<ConfigOptionFloats>("flush_volumes_matrix")->values, 0, old_nozzle_size);
first_flush_volume_mtx.resize(filament_nums * filament_nums);
std::vector<double> flush_multipliers = project_config->option<ConfigOptionFloats>("flush_multiplier")->values;
double first_flush_multiplier = project_config->option<ConfigOptionFloats>("flush_multiplier")->values.at(0);
for (size_t i = old_nozzle_size; i < new_nozzle_size; ++i) {
flush_volume_mtx.clear();
for (size_t i = 0; i < new_nozzle_size; ++i) {
flush_volume_mtx.insert(flush_volume_mtx.end(), first_flush_volume_mtx.begin(), first_flush_volume_mtx.end());
flush_multipliers.push_back(first_flush_multiplier);
}
flush_multipliers.resize(nozzle_nums, 1.f);
set_flush_volumes_matrix(project_config->option<ConfigOptionFloats>("flush_volumes_matrix")->values, flush_volume_mtx, -1, new_nozzle_size);
project_config->option<ConfigOptionFloats>("flush_multiplier")->values = flush_multipliers;
}
else if (old_nozzle_size > new_nozzle_size) {
std::vector<double> new_flush_volume_mtx;
std::vector<double> flush_multipliers;
for (size_t i = 0; i < new_nozzle_size; ++i) {
std::vector<double> flush_volume_mtx = get_flush_volumes_matrix(project_config->option<ConfigOptionFloats>("flush_volumes_matrix")->values, i, old_nozzle_size);
flush_volume_mtx.resize(filament_nums * filament_nums);
new_flush_volume_mtx.insert(new_flush_volume_mtx.end(), flush_volume_mtx.begin(), flush_volume_mtx.end());
double multiplier_val = project_config->option<ConfigOptionFloats>("flush_multiplier")->values.at(i);
flush_multipliers.push_back(multiplier_val);
}
std::vector<double> flush_multipliers = project_config->option<ConfigOptionFloats>("flush_multiplier")->values;
flush_multipliers.resize(nozzle_nums);
set_flush_volumes_matrix(project_config->option<ConfigOptionFloats>("flush_volumes_matrix")->values, new_flush_volume_mtx, -1, new_nozzle_size);
project_config->option<ConfigOptionFloats>("flush_multiplier")->values = flush_multipliers;
}