From e8351220545b97bc9ddb738d3cb854023460e8f4 Mon Sep 17 00:00:00 2001 From: "xun.zhang" Date: Mon, 14 Oct 2024 11:23:28 +0800 Subject: [PATCH] FIX: Support ABS recognized as ABS jira: 7685,8151,8323 Signed-off-by: xun.zhang Change-Id: I0a4cce12663ee8f62309f0828521364874a7638d --- src/libslic3r/PrintConfig.cpp | 7 ++++++- src/slic3r/GUI/DeviceManager.cpp | 4 ++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp index f90f29c6a..d03a4898b 100644 --- a/src/libslic3r/PrintConfig.cpp +++ b/src/libslic3r/PrintConfig.cpp @@ -5190,7 +5190,12 @@ std::string DynamicPrintConfig::get_filament_type(std::string &displayed_filamen } else if (filament_type->get_at(id) == "PA") { displayed_filament_type = "Sup.PA"; return "PA-S"; - } else { + } + else if (filament_type->get_at(id) == "ABS") { + displayed_filament_type = "Sup.ABS"; + return "ABS-S"; + } + else { displayed_filament_type = filament_type->get_at(id); return filament_type->get_at(id); } diff --git a/src/slic3r/GUI/DeviceManager.cpp b/src/slic3r/GUI/DeviceManager.cpp index c4c5a1fa0..36778cfb6 100644 --- a/src/slic3r/GUI/DeviceManager.cpp +++ b/src/slic3r/GUI/DeviceManager.cpp @@ -274,6 +274,8 @@ std::string AmsTray::get_display_filament_type() return "Sup.PLA"; else if (type == "PA-S") return "Sup.PA"; + else if (type == "ABS-S") + return "Sup.ABS"; else return type; return type; @@ -285,6 +287,8 @@ std::string AmsTray::get_filament_type() return "PLA-S"; } else if (type == "Sup.PA") { return "PA-S"; + } else if (type == "Sup.ABS") { + return "ABS-S"; } else if (type == "Support W") { return "PLA-S"; } else if (type == "Support G") {