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

Properties: update evaluator locale when creating editors

This commit is contained in:
Jon Evans 2022-12-06 17:56:25 -05:00
parent 593dc9e8b6
commit ad8e5891d2
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common/libeval/numeric_evaluator.cpp
View File

@ -46,8 +46,7 @@ namespace numEval
NUMERIC_EVALUATOR::NUMERIC_EVALUATOR( EDA_UNITS aUnits ) NUMERIC_EVALUATOR::NUMERIC_EVALUATOR( EDA_UNITS aUnits )
{ {
struct lconv* lc = localeconv(); LocaleChanged();
m_localeDecimalSeparator = *lc->decimal_point;
m_parseError = false; m_parseError = false;
m_parseFinished = false; m_parseFinished = false;
@ -93,6 +92,13 @@ void NUMERIC_EVALUATOR::SetDefaultUnits( EDA_UNITS aUnits )
} }
void NUMERIC_EVALUATOR::LocaleChanged()
{
struct lconv* lc = localeconv();
m_localeDecimalSeparator = *lc->decimal_point;
}
void NUMERIC_EVALUATOR::parseError( const char* s ) void NUMERIC_EVALUATOR::parseError( const char* s )
{ {
m_parseError = true; m_parseError = true;

1
common/widgets/unit_binder.cpp
View File

@ -139,6 +139,7 @@ void UNIT_BINDER::SetUnits( EDA_UNITS aUnits )
m_units = aUnits; m_units = aUnits;
m_eval.SetDefaultUnits( m_units ); m_eval.SetDefaultUnits( m_units );
m_eval.LocaleChanged(); // In case locale changed since last run
if( m_unitLabel ) if( m_unitLabel )
m_unitLabel->SetLabel( EDA_UNIT_UTILS::GetLabel( m_units, m_dataType ) ); m_unitLabel->SetLabel( EDA_UNIT_UTILS::GetLabel( m_units, m_dataType ) );

2
include/libeval/numeric_evaluator.h
View File

@ -105,6 +105,8 @@ public:
void SetDefaultUnits( EDA_UNITS aUnits ); void SetDefaultUnits( EDA_UNITS aUnits );
void LocaleChanged();
/* Used by the lemon parser */ /* Used by the lemon parser */
void parseError(const char* s); void parseError(const char* s);
void parseOk(); void parseOk();