mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX: exception when comparing profiles 

jira:[NEW]

Signed-off-by: XunZhangBambu <xun.zhang@bambulab.com>
Change-Id: I946b5fcd35f779d271df2b3de731fdcada5aab29
This commit is contained in:
XunZhangBambu 2024-01-11 19:36:47 +08:00 committed by Lane.Wei
parent 499106aafa
commit 1fa6a08cc7
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/libslic3r/Preset.cpp
View File

@ -2599,6 +2599,12 @@ void add_correct_opts_to_diff(const std::string &opt_key, t_config_option_keys&
const T* opt_init = static_cast<const T*>(other.option(opt_key)); const T* opt_init = static_cast<const T*>(other.option(opt_key));
const T* opt_cur = static_cast<const T*>(this_c.option(opt_key)); const T* opt_cur = static_cast<const T*>(this_c.option(opt_key));
int opt_init_max_id = opt_init->values.size() - 1; int opt_init_max_id = opt_init->values.size() - 1;
if (opt_init_max_id < 0) {
for (int i = 0; i < int(opt_cur->values.size()); i++)
vec.emplace_back(opt_key + "#" + std::to_string(i));
return;
}
for (int i = 0; i < int(opt_cur->values.size()); i++) for (int i = 0; i < int(opt_cur->values.size()); i++)
{ {
int init_id = i <= opt_init_max_id ? i : 0; int init_id = i <= opt_init_max_id ? i : 0;

3
src/slic3r/GUI/UnsavedChangesDialog.cpp
View File

@ -1366,6 +1366,9 @@ static wxString get_string_value(std::string opt_key, const DynamicPrintConfig&
else if (opt_key == "thumbnail_size") { else if (opt_key == "thumbnail_size") {
return get_thumbnails_string(config.option<ConfigOptionPoints>(opt_key)->values); return get_thumbnails_string(config.option<ConfigOptionPoints>(opt_key)->values);
} }
else if (opt_key == "head_wrap_detect_zone") {
return get_thumbnails_string(config.option<ConfigOptionPoints>(opt_key)->values);
}
Vec2d val = config.opt<ConfigOptionPoints>(opt_key)->get_at(opt_idx); Vec2d val = config.opt<ConfigOptionPoints>(opt_key)->get_at(opt_idx);
return from_u8((boost::format("[%1%]") % ConfigOptionPoint(val).serialize()).str()); return from_u8((boost::format("[%1%]") % ConfigOptionPoint(val).serialize()).str());
} }