3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Purging volume parameters normalization - minor changes

Browse Source
This commit is contained in:
Lukas Matena 2018-03-21 10:20:36 +01:00
parent ac9db81820
commit 1a1be94c99
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
xs/src/slic3r/GUI/PresetBundle.cpp
View File

@ -721,22 +721,21 @@ void PresetBundle::update_multi_material_filament_presets()
this->filament_presets.resize(num_extruders, this->filament_presets.empty() ? this->filaments.first_visible().name : this->filament_presets.back()); this->filament_presets.resize(num_extruders, this->filament_presets.empty() ? this->filaments.first_visible().name : this->filament_presets.back());
// Now verify if wiping_volumes_matrix has proper size (it is used to deduce number of extruders in wipe tower generator): // Now verify if wiping_volumes_matrix has proper size (it is used to deduce number of extruders in wipe tower generator):
std::vector<double> old_matrix = (prints.get_edited_preset().config.option<ConfigOptionFloats>("wiping_volumes_matrix"))->values; std::vector<double> old_matrix = (prints.get_edited_preset().config.option<ConfigOptionFloats>("wiping_volumes_matrix"))->values;
size_t old_number_of_extruders = int(sqrt(old_matrix.size())+EPSILON); size_t old_number_of_extruders = int(sqrt(old_matrix.size())+EPSILON);
// First do it for the extruders presets (in-place): if (num_extruders != old_number_of_extruders) {
// First verify if purging volumes presets for each extruder matches number of extruders
std::vector<double>& extruders = (prints.get_edited_preset().config.option<ConfigOptionFloats>("wiping_volumes_extruders"))->values; std::vector<double>& extruders = (prints.get_edited_preset().config.option<ConfigOptionFloats>("wiping_volumes_extruders"))->values;
while (extruders.size() < 2*num_extruders) { while (extruders.size() < 2*num_extruders) {
extruders.push_back(extruders[0]); // copy the values from the first extruder extruders.push_back(extruders.size()>1 ? extruders[0] : 50.); // copy the values from the first extruder
extruders.push_back(extruders[1]); extruders.push_back(extruders.size()>1 ? extruders[1] : 50.);
} }
while (extruders.size() > 2*num_extruders) { while (extruders.size() > 2*num_extruders) {
extruders.pop_back(); extruders.pop_back();
extruders.pop_back(); extruders.pop_back();
} }
// Now update the purging volume matrix:
if (num_extruders != old_number_of_extruders) {
std::vector<double> new_matrix; std::vector<double> new_matrix;
for (unsigned int i=0;i<num_extruders;++i) for (unsigned int i=0;i<num_extruders;++i)
for (unsigned int j=0;j<num_extruders;++j) { for (unsigned int j=0;j<num_extruders;++j) {