Don't generate a format specifier length of ":"
It's ambiguous, are we talking the length of a human colon or a pigs? Fix #7556
This commit is contained in:
parent
dbd04b3fe1
commit
b80fdad511
|
@ -37,8 +37,7 @@ static wxString formatFloat( double x, int nDigits )
|
||||||
|
|
||||||
if( nDigits )
|
if( nDigits )
|
||||||
{
|
{
|
||||||
fmt = wxT( "%.0Nf" );
|
fmt.Printf( "%%.0%df", nDigits );
|
||||||
fmt[3] = '0' + nDigits;
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -102,6 +101,12 @@ static void getSISuffix( double x, const wxString& unit, int& power, wxString& s
|
||||||
|
|
||||||
static int countDecimalDigits( double x, int maxDigits )
|
static int countDecimalDigits( double x, int maxDigits )
|
||||||
{
|
{
|
||||||
|
if( std::isnan( x ) )
|
||||||
|
{
|
||||||
|
// avoid trying to count the decimals of NaN
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
int64_t k = (int)( ( x - floor( x ) ) * pow( 10.0, (double) maxDigits ) );
|
int64_t k = (int)( ( x - floor( x ) ) * pow( 10.0, (double) maxDigits ) );
|
||||||
int n = 0;
|
int n = 0;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue