Skip to content

fix: use raw filament_type in sw_GetFileFilamentMapping to prevent PLA-S remapping #420

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kbaker827 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: use raw filament_type in sw_GetFileFilamentMapping to prevent PLA-S remapping #420

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions src/slic3r/GUI/SSWCP.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3205,15 +3205,17 @@ void SSWCP_MachineOption_Instance::sw_GetFileFilamentMapping()
// filament type
if (full_config.has("filament_type")) {
std::vector<std::string> filament_types;
size_t filament_count = full_config.option<ConfigOptionStrings>("filament_type")->values.size();
const auto* filament_type_opt = full_config.option<ConfigOptionStrings>("filament_type");
size_t filament_count = filament_type_opt->values.size();
if (full_config.has("filament_colour")) {
filament_count = std::max(filament_count, full_config.option<ConfigOptionStrings>("filament_colour")->values.size());
}

filament_types.reserve(filament_count);
for (size_t i = 0; i < filament_count; ++i) {
std::string displayed_filament_type;
std::string filament_type = full_config.get_filament_type(displayed_filament_type, int(i));
// Use raw filament_type value to avoid get_filament_type() remapping
// "Generic Support For PLA" -> "PLA-S", which breaks filament matching in the web UI.
std::string filament_type = filament_type_opt->get_at(int(i));
boost::trim(filament_type);
filament_types.emplace_back(std::move(filament_type));
}
Expand Down