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

kicad2step: fix compatibility with OCC versions < 7.5

This commit is contained in:
jean-pierre charras 2021-11-21 17:26:51 +01:00
parent e79fd19326
commit a93c2c24fa
1 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
utils/kicad2step/kicad2step.cpp
View File

@ -41,6 +41,14 @@
#include <Message_PrinterOStream.hxx> // OpenCascade output messenger #include <Message_PrinterOStream.hxx> // OpenCascade output messenger
#include <Standard_Failure.hxx> // In open cascade #include <Standard_Failure.hxx> // In open cascade
#include <Standard_Version.hxx>
#define OCC_VERSION_MIN 0x070500
#if OCC_VERSION_HEX < OCC_VERSION_MIN
#include <Message_Messenger.hxx>
#endif
class KICAD2STEP_FRAME : public KICAD2STEP_FRAME_BASE class KICAD2STEP_FRAME : public KICAD2STEP_FRAME_BASE
{ {
public: public:
@ -62,12 +70,31 @@ void ReportMessage( const wxString& aMessage )
class KiCadPrinter : public Message_Printer class KiCadPrinter : public Message_Printer
{ {
protected: protected:
virtual void send (const TCollection_AsciiString& theString, const Message_Gravity theGravity) const override #if OCC_VERSION_HEX < OCC_VERSION_MIN
virtual void Send( const TCollection_ExtendedString& theString,
const Message_Gravity theGravity,
const Standard_Boolean theToPutEol ) const override
{
Send (TCollection_AsciiString (theString), theGravity, theToPutEol);
}
virtual void Send( const TCollection_AsciiString& theString,
const Message_Gravity theGravity,
const Standard_Boolean theToPutEol) const override
#else
virtual void send( const TCollection_AsciiString& theString,
const Message_Gravity theGravity ) const override
#endif
{ {
if( theGravity >= Message_Info ) if( theGravity >= Message_Info )
{ {
ReportMessage( theString.ToCString() ); ReportMessage( theString.ToCString() );
#if OCC_VERSION_HEX < OCC_VERSION_MIN
if( theToPutEol )
ReportMessage( "\n" );
#else
ReportMessage( "\n" ); ReportMessage( "\n" );
#endif
} }
if( theGravity >= Message_Alarm ) if( theGravity >= Message_Alarm )
openPanel->m_error = true; openPanel->m_error = true;