realAscot/kicad-source
1
0
Fork 0
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-09-14 10:13:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix a minor error in commit b154acc: the commit was using a too old file.

Browse Source
This commit is contained in:
jean-pierre charras 2022-04-14 15:35:49 +02:00
parent b154acccdc
commit d2c5eb1f23
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -62,7 +62,7 @@ bool KICADCURVE::Read( SEXPR::SEXPR* aEntry, CURVE_TYPE aCurveType )
&& CURVE_CIRCLE != aCurveType && CURVE_BEZIER != aCurveType && CURVE_CIRCLE != aCurveType && CURVE_BEZIER != aCurveType
&& CURVE_POLYGON != aCurveType ) && CURVE_POLYGON != aCurveType )
{ {
wxLogMessage( "* Unsupported curve type: %d\n", aCurveType ); wxLogMessage( wxT( "* Unsupported curve type: %d\n" ), aCurveType );
return false; return false;
} }
@ -76,7 +76,7 @@ bool KICADCURVE::Read( SEXPR::SEXPR* aEntry, CURVE_TYPE aCurveType )
|| ( CURVE_BEZIER == aCurveType && nchild < 5 ) || ( CURVE_BEZIER == aCurveType && nchild < 5 )
|| ( CURVE_POLYGON == aCurveType && nchild < 5 ) ) || ( CURVE_POLYGON == aCurveType && nchild < 5 ) )
{ {
wxLogMessage( "* bad curve data; not enough parameters\n" ); wxLogMessage( wxT( "* bad curve data; not enough parameters\n" ) );
return false; return false;
} }
@ -201,10 +201,9 @@ bool KICADCURVE::Read( SEXPR::SEXPR* aEntry, CURVE_TYPE aCurveType )
else if( text == "angle" ) else if( text == "angle" )
{ {
if( child->GetNumberOfChildren() < 2 if( child->GetNumberOfChildren() < 2
|| ( !child->GetChild( 1 )->IsDouble() || ( !child->GetChild( 1 )->IsDouble() && !child->GetChild( 1 )->IsInteger() ) )
&& !child->GetChild( 1 )->IsInteger() ) )
{ {
wxLogMessage( "* bad angle data\n" ); wxLogMessage( wxT( "* bad angle data\n" ) );
return false; return false;
} }
@ -223,7 +222,7 @@ bool KICADCURVE::Read( SEXPR::SEXPR* aEntry, CURVE_TYPE aCurveType )
{ {
std::ostringstream ostr; std::ostringstream ostr;
ostr << "* bad layer data: " << child->AsString(); ostr << "* bad layer data: " << child->AsString();
wxLogMessage( "%s\n", ostr.str().c_str() ); wxLogMessage( wxT( "%s\n" ), ostr.str().c_str() );
return false; return false;
} }
@ -253,7 +252,7 @@ bool KICADCURVE::Read( SEXPR::SEXPR* aEntry, CURVE_TYPE aCurveType )
m_end.y = new_arc.GetP0().y/scale; m_end.y = new_arc.GetP0().y/scale;
m_ep.x = new_arc.GetP1().x/scale; m_ep.x = new_arc.GetP1().x/scale;
m_ep.y = new_arc.GetP1().y/scale; m_ep.y = new_arc.GetP1().y/scale;
m_angle = new_arc.GetCentralAngle() / 180.0 * M_PI; m_angle = new_arc.GetCentralAngle().AsRadians();
} }
return true; return true;