From d6471e7b071129a49f936a85697d5e8c3759730f Mon Sep 17 00:00:00 2001 From: bubnikv Date: Fri, 14 Dec 2018 17:19:17 +0100 Subject: [PATCH] Fix of SLADisplayOrientation updates --- src/libslic3r/PrintConfig.cpp | 6 ++++-- src/libslic3r/PrintConfig.hpp | 4 ++-- src/slic3r/GUI/Field.cpp | 2 ++ src/slic3r/GUI/GUI.cpp | 2 ++ 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp index ab26f5d54..8a564b6b5 100644 --- a/src/libslic3r/PrintConfig.cpp +++ b/src/libslic3r/PrintConfig.cpp @@ -2394,8 +2394,10 @@ void PrintConfigDef::init_sla_params() def->tooltip = L("Display orientation"); def->cli = "display-orientation=s"; def->enum_keys_map = &ConfigOptionEnum::get_enum_values(); - def->enum_values.push_back("Landscape"); - def->enum_values.push_back("Portrait"); + def->enum_values.push_back("landscape"); + def->enum_values.push_back("portrait"); + def->enum_labels.push_back(L("Landscape")); + def->enum_labels.push_back(L("Portrait")); def->default_value = new ConfigOptionEnum(sladoPortrait); def = this->add("printer_correction", coFloats); diff --git a/src/libslic3r/PrintConfig.hpp b/src/libslic3r/PrintConfig.hpp index f639cad76..1949a8ac8 100644 --- a/src/libslic3r/PrintConfig.hpp +++ b/src/libslic3r/PrintConfig.hpp @@ -155,8 +155,8 @@ template<> inline const t_config_enum_values& ConfigOptionEnum::ge template<> inline const t_config_enum_values& ConfigOptionEnum::get_enum_values() { static const t_config_enum_values keys_map = { - { "Landscape", sladoLandscape}, - { "Portrait", sladoPortrait} + { "landscape", sladoLandscape}, + { "portrait", sladoPortrait} }; return keys_map; diff --git a/src/slic3r/GUI/Field.cpp b/src/slic3r/GUI/Field.cpp index ebc7f3665..d4126d933 100644 --- a/src/slic3r/GUI/Field.cpp +++ b/src/slic3r/GUI/Field.cpp @@ -638,6 +638,8 @@ boost::any& Choice::get_value() m_value = static_cast(ret_enum); else if (m_opt_id.compare("host_type") == 0) m_value = static_cast(ret_enum); + else if (m_opt_id.compare("display_orientation") == 0) + m_value = static_cast(ret_enum); } return m_value; diff --git a/src/slic3r/GUI/GUI.cpp b/src/slic3r/GUI/GUI.cpp index bc7ea9899..fb6676aed 100644 --- a/src/slic3r/GUI/GUI.cpp +++ b/src/slic3r/GUI/GUI.cpp @@ -195,6 +195,8 @@ void change_opt_value(DynamicPrintConfig& config, const t_config_option_key& opt config.set_key_value(opt_key, new ConfigOptionEnum(boost::any_cast(value))); else if (opt_key.compare("host_type") == 0) config.set_key_value(opt_key, new ConfigOptionEnum(boost::any_cast(value))); + else if (opt_key.compare("display_orientation") == 0) + config.set_key_value(opt_key, new ConfigOptionEnum(boost::any_cast(value))); } break; case coPoints:{