anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-10 20:04:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix formatFPnumber with negative doubles.

Browse Source
This commit is contained in:
Juergen Spitzmueller 2015-06-26 15:49:44 +02:00
parent 2a8db0a64b
commit c9d9309c1e
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/support/lstrings.cpp
View File

@ -1407,6 +1407,10 @@ std::string formatFPNumber(double x)
os << std::fixed; os << std::fixed;
// Prevent outputs of 23.4200000000000017 but output small numbers // Prevent outputs of 23.4200000000000017 but output small numbers
// with at least 6 significant digits. // with at least 6 significant digits.
bool const neg = x < 0;
// Treat all doubles as positive for the formatting
if (neg)
x = -x;
double const logarithm = log10(x); double const logarithm = log10(x);
os << std::setprecision(max(6 - static_cast<int>(round(logarithm)), 0)) << x; os << std::setprecision(max(6 - static_cast<int>(round(logarithm)), 0)) << x;
string result = os.str(); string result = os.str();
@ -1415,6 +1419,9 @@ std::string formatFPNumber(double x)
if (result[result.length()-1] == '.') if (result[result.length()-1] == '.')
result = rtrim(result, "."); result = rtrim(result, ".");
} }
// Re-add negativity
if (neg)
result = "-" + result;
return result; return result;
} }