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

Kicad2Step: handle quoted layers 

More recent Kicad_pcb files have quoted layer names (i.e.
strings, not symbols). The importer in K2S doesn't handle that,
so it chokes on elements like (layer "Edge.Cuts").

Fixes: lp:1824750
* https://bugs.launchpad.net/kicad/+bug/1824750
This commit is contained in:
John Beard 2019-04-15 09:56:01 +01:00
parent 6cdde97e6f
commit c135158364
1 changed files with 39 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
utils/kicad2step/pcb/kicadcurve.cpp
View File

@ -28,6 +28,40 @@
#include "sexpr/sexpr.h" #include "sexpr/sexpr.h"
#include "kicadcurve.h" #include "kicadcurve.h"
#include <core/optional.h>
/**
* Get the layer name from a layer element, if the layer is syntactically
* valid
*
* E.g. (layer "Edge.Cuts") -> "Edge.Cuts"
*
* @param aLayerElem the s-expr element to get the name from
* @return the layer name if valid, else empty
*/
static OPT<std::string> getLayerName( const SEXPR::SEXPR& aLayerElem )
{
OPT<std::string> layer;
if( aLayerElem.GetNumberOfChildren() == 2 )
{
const auto& layerChild = *aLayerElem.GetChild( 1 );
// The layer child can be quoted (string) or unquoted (symbol)
// depending on PCB version.
if( layerChild.IsString() )
{
layer = layerChild.GetString();
}
else if( layerChild.IsSymbol() )
{
layer = layerChild.GetSymbol();
}
}
return layer;
}
KICADCURVE::KICADCURVE() KICADCURVE::KICADCURVE()
{ {
@ -115,19 +149,18 @@ bool KICADCURVE::Read( SEXPR::SEXPR* aEntry, CURVE_TYPE aCurveType )
} }
else if( text == "layer" ) else if( text == "layer" )
{ {
if( child->GetNumberOfChildren() < 2 const OPT<std::string> layer = getLayerName( *child );
|| !child->GetChild( 1 )->IsSymbol() )
if( !layer )
{ {
std::ostringstream ostr; std::ostringstream ostr;
ostr << "* bad layer data"; ostr << "* bad layer data: " << child->AsString();
wxLogMessage( "%s\n", ostr.str().c_str() ); wxLogMessage( "%s\n", ostr.str().c_str() );
return false; return false;
} }
text = child->GetChild( 1 )->GetSymbol();
// NOTE: for the moment we only process Edge.Cuts // NOTE: for the moment we only process Edge.Cuts
if( text == "Edge.Cuts" ) if( *layer == "Edge.Cuts" )
m_layer = LAYER_EDGE; m_layer = LAYER_EDGE;
} }
} }