3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed tests and windows build

Browse Source
This commit is contained in:
Lukas Matena 2021-05-10 12:18:30 +02:00
parent c5c6f51ae0
commit 6b6b086948
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libslic3r/LocalesUtils.cpp
View File

@ -24,7 +24,7 @@ CNumericLocalesSetter::CNumericLocalesSetter()
CNumericLocalesSetter::~CNumericLocalesSetter() CNumericLocalesSetter::~CNumericLocalesSetter()
{ {
#ifdef _WIN32 #ifdef _WIN32
std::setlocale(LC_NUMERIC, m_orig_numeric_locale) std::setlocale(LC_NUMERIC, m_orig_numeric_locale.data());
#else #else
uselocale(m_original_locale); uselocale(m_original_locale);
freelocale(m_new_locale); freelocale(m_new_locale);

3
tests/libslic3r/test_config.cpp
View File

@ -1,6 +1,7 @@
#include <catch2/catch.hpp> #include <catch2/catch.hpp>
#include "libslic3r/PrintConfig.hpp" #include "libslic3r/PrintConfig.hpp"
#include "libslic3r/LocalesUtils.hpp"
using namespace Slic3r; using namespace Slic3r;
@ -112,7 +113,7 @@ SCENARIO("Config accessor functions perform as expected.", "[Config]") {
WHEN("A string option is set through the double interface") { WHEN("A string option is set through the double interface") {
config.set("end_gcode", 100.5); config.set("end_gcode", 100.5);
THEN("The underlying value is set correctly.") { THEN("The underlying value is set correctly.") {
REQUIRE(config.opt<ConfigOptionString>("end_gcode")->value == std::to_string(100.5)); REQUIRE(config.opt<ConfigOptionString>("end_gcode")->value == float_to_string_decimal_point(100.5));
} }
} }
WHEN("A float or percent is set as a percent through the string interface.") { WHEN("A float or percent is set as a percent through the string interface.") {