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

Make sure selectors match against user layer names. 

Also allows for user specification of units in rule constraints.
This commit is contained in:
Jeff Young 2020-06-18 15:36:50 +01:00
parent cae493fe65
commit 76d1b8bfa1
1 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pcbnew/drc/drc_rule_parser.cpp
View File

@ -58,6 +58,9 @@ void DRC_RULES_PARSER::initLayerMap()
{ {
std::string untranslated = TO_UTF8( wxString( LSET::Name( PCB_LAYER_ID( layer ) ) ) ); std::string untranslated = TO_UTF8( wxString( LSET::Name( PCB_LAYER_ID( layer ) ) ) );
m_layerMap[ untranslated ] = PCB_LAYER_ID( layer ); m_layerMap[ untranslated ] = PCB_LAYER_ID( layer );
std::string userName = m_board->GetLayerName( PCB_LAYER_ID( layer ) );
m_layerMap[ userName ] = PCB_LAYER_ID( layer );
} }
} }
@ -346,23 +349,5 @@ void DRC_RULES_PARSER::parseConstraint( DRC_RULE* aRule )
int DRC_RULES_PARSER::parseValue( DRCRULE_T::T aToken ) int DRC_RULES_PARSER::parseValue( DRCRULE_T::T aToken )
{ {
char* tmp; return (int) ValueFromString( EDA_UNITS::MILLIMETRES, CurText(), true );
errno = 0;
double fval = strtod( CurText(), &tmp );
if( errno )
{
THROW_PARSE_ERROR( _( "Invalid floating point number" ), CurSource(), CurLine(),
CurLineNumber(), CurOffset() );
}
if( CurText() == tmp )
{
THROW_PARSE_ERROR( _( "Missing floating point number" ), CurSource(), CurLine(),
CurLineNumber(), CurOffset() );
}
return KiROUND( fval * IU_PER_MM );
} }