From 9598a52aee3559612d01a8337ab8e7b631a21497 Mon Sep 17 00:00:00 2001 From: tamasmeszaros Date: Thu, 5 Oct 2023 16:00:16 +0200 Subject: [PATCH] Try to fix build on Mac --- src/libslic3r/Arrange/ArrangeSettingsView.hpp | 34 +++++++++++-------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/src/libslic3r/Arrange/ArrangeSettingsView.hpp b/src/libslic3r/Arrange/ArrangeSettingsView.hpp index b3d81e06c1..59d171c110 100644 --- a/src/libslic3r/Arrange/ArrangeSettingsView.hpp +++ b/src/libslic3r/Arrange/ArrangeSettingsView.hpp @@ -77,21 +77,6 @@ public: return STR[v]; } - static constexpr std::optional to_geometry_handling(std::string_view str) - { - return get_enumval(str, GeometryHandlingLabels); - } - - static constexpr std::optional to_arrange_strategy(std::string_view str) - { - return get_enumval(str, ArrangeStrategyLabels); - } - - static constexpr std::optional to_xl_pivots(std::string_view str) - { - return get_enumval(str, XLPivotsLabels); - } - private: template @@ -110,6 +95,25 @@ private: return ret; } +public: + + static constexpr std::optional to_geometry_handling(std::string_view str) + { + return get_enumval(str, GeometryHandlingLabels); + } + + static constexpr std::optional to_arrange_strategy(std::string_view str) + { + return get_enumval(str, ArrangeStrategyLabels); + } + + static constexpr std::optional to_xl_pivots(std::string_view str) + { + return get_enumval(str, XLPivotsLabels); + } + +private: + static constexpr const auto GeometryHandlingLabels = make_staticmap({ {"convex"sv, ghConvex}, {"balanced"sv, ghBalanced},