3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-24 15:13:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

FIX: [STUDIO 4483 4489 4493 4494] create filament issue

Browse source 
Jira: 4483 4489 4494

fix: 4483 Window flashing
fix: 4489 dark ui combobox is blur
fix: 4493 add scrolled window
fix: 4494 encoding issue
fix: sync user preset remove the base id

Change-Id: Ida509e7e73d12613611933b1855feee9c1886478
This commit is contained in:
maosheng.wei 2023-09-20 19:36:48 +08:00 • committed by Lane.Wei
parent 19c40bb278
commit 20f2210e36
3 changed files with 76 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/libslic3r/Preset.cpp
View file

@ -1287,7 +1287,14 @@ int PresetCollection::get_differed_values_to_update(Preset& preset, std::map<std
//add other values
key_values[BBL_JSON_KEY_VERSION] = preset.version.to_string();
key_values[BBL_JSON_KEY_BASE_ID] = preset.base_id;
if (!preset.base_id.empty()) {
key_values[BBL_JSON_KEY_BASE_ID] = preset.base_id;
} else {
key_values.erase(BBL_JSON_KEY_BASE_ID);
if (get_preset_base(preset) == &preset && !preset.filament_id.empty()) {
key_values[BBL_JSON_KEY_FILAMENT_ID] = preset.filament_id;
}
}
key_values[BBL_JSON_KEY_UPDATE_TIME] = std::to_string(preset.updated_time);
key_values[BBL_JSON_KEY_TYPE] = Preset::get_iot_type_string(preset.type);
return 0;
@ -2222,10 +2229,10 @@ void PresetCollection::save_current_preset(const std::string &new_name, bool det
auto base = get_preset_base(curr_preset);
inherits = base ? base->name : "";
}
preset.file = this->path_for_preset(preset);
preset.is_default = false;
preset.is_system = false;
preset.is_external = false;
preset.file = this->path_for_preset(preset);
// The newly saved preset will be activated -> make it visible.
preset.is_visible = true;
// Just system presets have aliases