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

Add parsing for centimeters into the numeric evaluator 

ADDED: Allow cm as a unit in text field expressions

Fixes https://gitlab.com/kicad/code/kicad/issues/4797
This commit is contained in:
Ian McInerney 2020-07-07 19:59:26 +01:00
parent 4cd0ec8808
commit 0f0e845d74
2 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
common/libeval/numeric_evaluator.cpp
View File

@ -62,9 +62,9 @@ NUMERIC_EVALUATOR::NUMERIC_EVALUATOR( EDA_UNITS aUnits, bool aUseMils )
m_defaultUnits = Unit::Inch; m_defaultUnits = Unit::Inch;
break; break;
case EDA_UNITS::MILLIMETRES: case EDA_UNITS::MILLIMETRES:
m_defaultUnits = Unit::Metric; m_defaultUnits = Unit::MM;
break; break;
default:m_defaultUnits = Unit::Metric; default:m_defaultUnits = Unit::MM;
break; break;
} }
} }
@ -239,7 +239,13 @@ NUMERIC_EVALUATOR::Token NUMERIC_EVALUATOR::getToken()
if( sizeLeft >= 2 && ch == 'm' && cptr[ 1 ] == 'm' && !isalnum( cptr[ 2 ] )) if( sizeLeft >= 2 && ch == 'm' && cptr[ 1 ] == 'm' && !isalnum( cptr[ 2 ] ))
{ {
m_token.pos += 2; m_token.pos += 2;
return Unit::Metric; return Unit::MM;
}
if( sizeLeft >= 2 && ch == 'c' && cptr[ 1 ] == 'm' && !isalnum( cptr[ 2 ] ))
{
m_token.pos += 2;
return Unit::CM;
} }
if( sizeLeft >= 2 && ch == 'i' && cptr[ 1 ] == 'n' && !isalnum( cptr[ 2 ] )) if( sizeLeft >= 2 && ch == 'i' && cptr[ 1 ] == 'n' && !isalnum( cptr[ 2 ] ))
@ -298,13 +304,14 @@ NUMERIC_EVALUATOR::Token NUMERIC_EVALUATOR::getToken()
// The factor is assigned to the terminal UNIT. The actual // The factor is assigned to the terminal UNIT. The actual
// conversion is done within a parser action. // conversion is done within a parser action.
retval.token = UNIT; retval.token = UNIT;
if( m_defaultUnits == Unit::Metric ) if( m_defaultUnits == Unit::MM )
{ {
switch( convertFrom ) switch( convertFrom )
{ {
case Unit::Inch :retval.value.dValue = 25.4; break; case Unit::Inch :retval.value.dValue = 25.4; break;
case Unit::Mil :retval.value.dValue = 25.4 / 1000.0; break; case Unit::Mil :retval.value.dValue = 25.4 / 1000.0; break;
case Unit::Metric :retval.value.dValue = 1.0; break; case Unit::MM :retval.value.dValue = 1.0; break;
case Unit::CM :retval.value.dValue = 10.0; break;
case Unit::Invalid :break; case Unit::Invalid :break;
} }
} }
@ -314,7 +321,8 @@ NUMERIC_EVALUATOR::Token NUMERIC_EVALUATOR::getToken()
{ {
case Unit::Inch :retval.value.dValue = 1.0; break; case Unit::Inch :retval.value.dValue = 1.0; break;
case Unit::Mil :retval.value.dValue = 1.0 / 1000.0; break; case Unit::Mil :retval.value.dValue = 1.0 / 1000.0; break;
case Unit::Metric :retval.value.dValue = 1.0 / 25.4; break; case Unit::MM :retval.value.dValue = 1.0 / 25.4; break;
case Unit::CM :retval.value.dValue = 1.0 / 2.54; break;
case Unit::Invalid :break; case Unit::Invalid :break;
} }
} }
@ -324,7 +332,8 @@ NUMERIC_EVALUATOR::Token NUMERIC_EVALUATOR::getToken()
{ {
case Unit::Inch :retval.value.dValue = 1.0 * 1000.0; break; case Unit::Inch :retval.value.dValue = 1.0 * 1000.0; break;
case Unit::Mil :retval.value.dValue = 1.0; break; case Unit::Mil :retval.value.dValue = 1.0; break;
case Unit::Metric :retval.value.dValue = 1000.0 / 25.4; break; case Unit::MM :retval.value.dValue = 1000.0 / 25.4; break;
case Unit::CM :retval.value.dValue = 1000.0 / 2.54; break;
case Unit::Invalid :break; case Unit::Invalid :break;
} }
} }

2
include/libeval/numeric_evaluator.h
View File

@ -93,7 +93,7 @@ namespace numEval
class NUMERIC_EVALUATOR class NUMERIC_EVALUATOR
{ {
enum class Unit { Invalid, Metric, Inch, Mil }; enum class Unit { Invalid, MM, CM, Inch, Mil };
public: public:
NUMERIC_EVALUATOR( EDA_UNITS aUnits, bool aUseMils = false ); NUMERIC_EVALUATOR( EDA_UNITS aUnits, bool aUseMils = false );