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

kicad2step: fix compatibility with wxWidgets 3.0 

(commit 4670309 uses 2 functions existing only in 3.1.x)
This commit is contained in:
jean-pierre charras 2021-08-27 19:02:55 +02:00
parent 4670309ec1
commit 47d5682b14
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
utils/kicad2step/pcb/oce_utils.cpp
View File

@ -83,6 +83,8 @@
#include <gp_Pnt.hxx> #include <gp_Pnt.hxx>
#include <Geom_BezierCurve.hxx> #include <Geom_BezierCurve.hxx>
#include <macros.h>
static constexpr double USER_PREC = 1e-4; static constexpr double USER_PREC = 1e-4;
static constexpr double USER_ANGLE_PREC = 1e-6; static constexpr double USER_ANGLE_PREC = 1e-6;
@ -611,7 +613,7 @@ bool PCBMODEL::AddComponent( const std::string& aFileNameUTF8, const std::string
return false; return false;
} }
wxString fileName( wxString::FromUTF8( aFileNameUTF8 ) ); wxString fileName( wxString::FromUTF8( aFileNameUTF8.c_str() ) );
ReportMessage( wxString::Format( "Add component %s.\n", aRefDes ) ); ReportMessage( wxString::Format( "Add component %s.\n", aRefDes ) );
// first retrieve a label // first retrieve a label
@ -998,7 +1000,7 @@ bool PCBMODEL::getModelLabel( const std::string& aFileNameUTF8, TRIPLET aScale,
Handle( TDocStd_Document ) doc; Handle( TDocStd_Document ) doc;
m_app->NewDocument( "MDTV-XCAF", doc ); m_app->NewDocument( "MDTV-XCAF", doc );
wxString fileName( wxString::FromUTF8( aFileNameUTF8 ) ); wxString fileName( wxString::FromUTF8( aFileNameUTF8.c_str() ) );
FormatType modelFmt = fileType( aFileNameUTF8.c_str() ); FormatType modelFmt = fileType( aFileNameUTF8.c_str() );
switch( modelFmt ) switch( modelFmt )
@ -1082,7 +1084,7 @@ bool PCBMODEL::getModelLabel( const std::string& aFileNameUTF8, TRIPLET aScale,
if( success ) if( success )
{ {
std::string altFileNameUTF8 = outFile.GetFullPath().utf8_string(); std::string altFileNameUTF8 = TO_UTF8( outFile.GetFullPath() );
success = getModelLabel( altFileNameUTF8, TRIPLET( 1.0, 1.0, 1.0 ), aLabel, false ); success = getModelLabel( altFileNameUTF8, TRIPLET( 1.0, 1.0, 1.0 ), aLabel, false );
} }
@ -1141,7 +1143,7 @@ bool PCBMODEL::getModelLabel( const std::string& aFileNameUTF8, TRIPLET aScale,
if( altFile.IsOk() && altFile.FileExists() ) if( altFile.IsOk() && altFile.FileExists() )
{ {
std::string altFileNameUTF8 = altFile.GetFullPath().utf8_string(); std::string altFileNameUTF8 = TO_UTF8( altFile.GetFullPath() );
// When substituting a STEP/IGS file for VRML, do not apply the VRML scaling // When substituting a STEP/IGS file for VRML, do not apply the VRML scaling
// to the new STEP model. This process of auto-substitution is janky as all // to the new STEP model. This process of auto-substitution is janky as all