haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NUMERIC_EVALUATOR::parseSetResult(): fix incorrect use of %g to print a double. 

This function is used in UNIT_BINDER, that does not accept floating notation
with exponent, that can be generated by parseSetResult().
As a result: values < 0.0001 cannot be entered in a UNIT_BINDER.
This commit is contained in:
jean-pierre charras 2021-04-14 19:47:03 +02:00
parent fe6cc0c3d8
commit 7c64dba333
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/base_units.cpp
View File

@ -81,7 +81,7 @@ std::string Double2Str( double aValue )
{ {
// For these values, %g works fine, and sometimes %f // For these values, %g works fine, and sometimes %f
// gives a bad value (try aValue = 1.222222222222, with %.16f format!) // gives a bad value (try aValue = 1.222222222222, with %.16f format!)
len = sprintf( buf, "%.16g", aValue ); len = sprintf( buf, "%.10g", aValue );
} }
return std::string( buf, len ); return std::string( buf, len );
@ -437,6 +437,7 @@ void FetchUnitsFromString( const wxString& aTextValue, EDA_UNITS& aUnits )
long long int ValueFromString( EDA_UNITS aUnits, const wxString& aTextValue, EDA_DATA_TYPE aType ) long long int ValueFromString( EDA_UNITS aUnits, const wxString& aTextValue, EDA_DATA_TYPE aType )
{ {
double value = DoubleValueFromString( aUnits, aTextValue, aType ); double value = DoubleValueFromString( aUnits, aTextValue, aType );
return KiROUND<double, long long int>( value ); return KiROUND<double, long long int>( value );
} }

5
common/libeval/numeric_evaluator.cpp
View File

@ -107,7 +107,10 @@ void NUMERIC_EVALUATOR::parseSetResult( double val )
else else
{ {
// Can be printed as a floating point // Can be printed as a floating point
snprintf( m_token.token, m_token.OutLen, "%.10g", val ); // Warning: DO NOT use a format like %f or %g, because they can create issues.
// especially %g can generate an exponent, incompatible with UNIT_BINDER
// Use the optimized Double2Str
snprintf( m_token.token, m_token.OutLen, "%s", Double2Str( val ).c_str() );
} }
} }