From 15560894e7d3cb5b9f1229610ac2362ffb5bc965 Mon Sep 17 00:00:00 2001 From: "zhou.xu" Date: Wed, 26 Feb 2025 12:26:10 +0800 Subject: [PATCH] ENH:Optimize SVG import failure pop-up window jira: STUDIO-10585 Change-Id: I5b41d9aea1a8900e48b0a2a2a3785cd73b5b1856 --- src/slic3r/GUI/Gizmos/GLGizmoSVG.cpp | 2 +- src/slic3r/GUI/Plater.cpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/slic3r/GUI/Gizmos/GLGizmoSVG.cpp b/src/slic3r/GUI/Gizmos/GLGizmoSVG.cpp index ca885b986..9391c1f68 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoSVG.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoSVG.cpp @@ -165,7 +165,7 @@ EmbossShape select_shape(std::string_view filepath, double tesselation_tolerance // Must contain some shapes !!! if (shape.shapes_with_ids.empty()) { - show_error(nullptr, GUI::format(_u8L("SVG file does NOT contain a single path to be embossed (%1%)."), svg.path)); + show_error(nullptr, GUI::format(_u8L("%1% contains some unsupported data. Please use third-party software to convert the SVG to path data before reimporting."), svg.path)); return {}; } shape.svg_file = std::move(svg); diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index d667f9fce..515ad6880 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -12470,7 +12470,8 @@ bool Plater::load_svg(const wxArrayString &filenames, bool from_toolbar_or_file_ const wxString &filename = filenames[0]; if (boost::iends_with(filenames[0].ToStdString(), ".svg")) { BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << "," << __FILE__ << filename; - return emboss_svg(filename, from_toolbar_or_file_menu); + emboss_svg(filename, from_toolbar_or_file_menu); + return true; } else { BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << "," << __FILE__ << ",fail:" << filename; }