mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

JSON: Fix issue where max decimal places option was ignored during serialisation

Browse source
This commit is contained in:
reuk 2024-04-29 20:16:39 +01:00
parent 34adc50472
commit 7c2a5fc758
No known key found for this signature in database
GPG key ID: FCB43929F012EE5C
2 changed files with 22 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/juce_core/javascript/juce_JSON.cpp
View file

@ -442,7 +442,7 @@ void JSON::writeToStream (OutputStream& out, const var& v, const FormatOptions&
if (juce_isfinite (d))
{
out << serialiseDouble (d);
out << serialiseDouble (d, opt.getMaxDecimalPlaces());
}
else
{

25
modules/juce_core/text/juce_String.cpp
View file

@ -2292,20 +2292,25 @@ static String reduceLengthOfFloatString (const String& input)
return input;
}
static String serialiseDouble (double input)
/* maxDecimalPlaces <= 0 means "use as many decimal places as necessary"
*/
static String serialiseDouble (double input, int maxDecimalPlaces = 0)
{
auto absInput = std::abs (input);
if (absInput >= 1.0e6 || absInput <= 1.0e-5)
return reduceLengthOfFloatString ({ input, 15, true });
return reduceLengthOfFloatString ({ input, maxDecimalPlaces > 0 ? maxDecimalPlaces : 15, true });
int intInput = (int) input;
if (exactlyEqual ((double) intInput, input))
return { input, 1 };
auto numberOfDecimalPlaces = [absInput]
auto numberOfDecimalPlaces = [absInput, maxDecimalPlaces]
{
if (maxDecimalPlaces > 0)
return maxDecimalPlaces;
if (absInput < 1.0)
{
if (absInput >= 1.0e-3)
@ -2944,7 +2949,7 @@ public:
beginTest ("Serialisation");
{
std::map <double, String> tests;
std::map<double, String> tests;
tests[364] = "364.0";
tests[1e7] = "1.0e7";
@ -2972,6 +2977,18 @@ public:
expectEquals (serialiseDouble (test.first), test.second);
expectEquals (serialiseDouble (-test.first), "-" + test.second);
}
expectEquals (serialiseDouble (1.0, 0), String ("1.0"));
expectEquals (serialiseDouble (1.0, 1), String ("1.0"));
expectEquals (serialiseDouble (1.0, 2), String ("1.0"));
expectEquals (serialiseDouble (1.0, 3), String ("1.0"));
expectEquals (serialiseDouble (1.0, 10), String ("1.0"));
expectEquals (serialiseDouble (4.567, 0), String ("4.567"));
expectEquals (serialiseDouble (4.567, 1), String ("4.6"));
expectEquals (serialiseDouble (4.567, 2), String ("4.57"));
expectEquals (serialiseDouble (4.567, 3), String ("4.567"));
expectEquals (serialiseDouble (4.567, 10), String ("4.567"));
}
beginTest ("Loops");