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

Avoid unnecessary zeros when writing double values to XML or JSON

Browse source
This commit is contained in:
ed 2018-12-17 16:17:53 +00:00
parent 27258ed6dd
commit 3ba771507d
3 changed files with 38 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -351,9 +351,14 @@ struct JSONFormatter
auto d = static_cast<double> (v);
if (juce_isfinite (d))
out << String (d, maximumDecimalPlaces);
{
String doubleString (d, maximumDecimalPlaces);
out << doubleString.substring (0, (int) CharacterFunctions::findLengthWithoutTrailingZeros (doubleString.getCharPointer()));
}
else
{
out << "null";
}
}
else if (v.isArray())
{

29
modules/juce_core/text/juce_CharacterFunctions.h
View file

@ -378,6 +378,35 @@ public:
return readDoubleValue (text);
}
/** If the input is a string representation of a floating-point number, this will
find the length of the string without any trailing zeros.
*/
template <typename CharPointerType>
static size_t findLengthWithoutTrailingZeros (CharPointerType text)
{
auto start = text;
auto end = text + ((int) text.length());
for (auto e = end; e > start + 1; --e)
{
auto lastChar = *(e - 1);
if (lastChar != '0')
{
if (lastChar == '.')
return (size_t) (e + 1 - start);
for (auto s = start; s < e; ++s)
if (*s == '.')
return (size_t) (e - start);
break;
}
}
return (size_t) (end - start);
}
//==============================================================================
/** Parses a character string, to read an integer value. */
template <typename IntType, typename CharPointerType>

21
modules/juce_core/xml/juce_XmlElement.cpp
View file

@ -578,26 +578,11 @@ void XmlElement::setAttribute (const Identifier& attributeName, const int number
setAttribute (attributeName, String (number));
}
static String trimTrailingZeros (const String& input)
{
auto pointPos = input.indexOfChar ('.');
if (pointPos == -1)
return input;
auto start = input.getCharPointer();
auto minPos = start + pointPos + 1;
auto ptr = start + input.length() - 1;
while (ptr != minPos && *ptr == '0')
--ptr;
return input.substring (0, (int) (ptr - start) + 1);
}
void XmlElement::setAttribute (const Identifier& attributeName, const double number)
{
setAttribute (attributeName, trimTrailingZeros ({ number, 20 }));
String doubleString (number, 20);
setAttribute (attributeName,
doubleString.substring (0, (int) CharacterFunctions::findLengthWithoutTrailingZeros (doubleString.getCharPointer())));
}
void XmlElement::removeAttribute (const Identifier& attributeName) noexcept