From af6afb5ef8b6888171b8734761f5727ec59d5ae8 Mon Sep 17 00:00:00 2001 From: mpa Date: Wed, 24 Feb 2016 16:52:30 +0300 Subject: [PATCH] OCCT 7.0.0 porting --- src/DXFPlugin_ExportDriver.cxx | 14 ++------------ src/DXFPlugin_ExportDriver.hxx | 13 ++++--------- src/DXFPlugin_IOperations_i.cc | 4 ++-- src/DXFPlugin_ImportDriver.cxx | 20 +++++++------------- src/DXFPlugin_ImportDriver.hxx | 13 ++++--------- 5 files changed, 19 insertions(+), 45 deletions(-) diff --git a/src/DXFPlugin_ExportDriver.cxx b/src/DXFPlugin_ExportDriver.cxx index 5aea0ab..6b696f4 100644 --- a/src/DXFPlugin_ExportDriver.cxx +++ b/src/DXFPlugin_ExportDriver.cxx @@ -64,7 +64,7 @@ DXFPlugin_ExportDriver::DXFPlugin_ExportDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer DXFPlugin_ExportDriver::Execute( TFunction_Logbook& log ) const +Standard_Integer DXFPlugin_ExportDriver::Execute( LOGBOOK& log ) const { #ifdef DXF_HASLICENSE try { @@ -108,15 +108,6 @@ Standard_Integer DXFPlugin_ExportDriver::Execute( TFunction_Logbook& log ) const return 0; } -//======================================================================= -//function : MustExecute -//purpose : -//======================================================================= -Standard_Boolean DXFPlugin_ExportDriver::MustExecute( const TFunction_Logbook& ) const -{ - return Standard_True; -} - //================================================================================ /*! * \brief Returns a name of creation operation and names and values of creation parameters @@ -129,5 +120,4 @@ GetCreationInformation( std::string& theOperationName, return false; } -IMPLEMENT_STANDARD_HANDLE( DXFPlugin_ExportDriver,GEOM_BaseDriver ); -IMPLEMENT_STANDARD_RTTIEXT( DXFPlugin_ExportDriver,GEOM_BaseDriver ); +OCCT_IMPLEMENT_STANDARD_RTTIEXT( DXFPlugin_ExportDriver,GEOM_BaseDriver ) diff --git a/src/DXFPlugin_ExportDriver.hxx b/src/DXFPlugin_ExportDriver.hxx index 6f95e3c..2d23945 100644 --- a/src/DXFPlugin_ExportDriver.hxx +++ b/src/DXFPlugin_ExportDriver.hxx @@ -23,11 +23,6 @@ // GEOM includes #include -// OCCT includes -#ifndef _TFunction_Logbook_HeaderFile -#include -#endif - DEFINE_STANDARD_HANDLE( DXFPlugin_ExportDriver, GEOM_BaseDriver ); class DXFPlugin_ExportDriver : public GEOM_BaseDriver @@ -37,14 +32,14 @@ public: ~DXFPlugin_ExportDriver() {}; static const Standard_GUID& GetID(); - virtual Standard_Integer Execute( TFunction_Logbook& log ) const; - Standard_Boolean MustExecute( const TFunction_Logbook& ) const; - virtual void Validate( TFunction_Logbook& ) const {} + virtual Standard_Integer Execute( LOGBOOK& log ) const; + Standard_Boolean MustExecute( const LOGBOOK& ) const { return Standard_True; } + virtual void Validate( LOGBOOK& ) const {} virtual bool GetCreationInformation( std::string& theOperationName, std::vector& params ); -DEFINE_STANDARD_RTTI( DXFPlugin_ExportDriver ) +OCCT_DEFINE_STANDARD_RTTIEXT( DXFPlugin_ExportDriver, GEOM_BaseDriver ) }; #endif // _DXFPlugin_ExportDriver_HXX diff --git a/src/DXFPlugin_IOperations_i.cc b/src/DXFPlugin_IOperations_i.cc index c04fb8c..400254c 100644 --- a/src/DXFPlugin_IOperations_i.cc +++ b/src/DXFPlugin_IOperations_i.cc @@ -66,7 +66,7 @@ void DXFPlugin_IOperations_i::ExportDXF( GEOM::GEOM_Object_ptr theOriginal, GetOperations()->SetNotDone(); //Get the reference shape - Handle(GEOM_Object) anOriginal = GetObjectImpl( theOriginal ); + HANDLE_NAMESPACE(GEOM_Object) anOriginal = GetObjectImpl( theOriginal ); if (anOriginal.IsNull()) return; //Export the shape to the file @@ -98,7 +98,7 @@ GEOM::ListOfGO* DXFPlugin_IOperations_i::ImportDXF( const char* theFileName ) Standard_Integer aLength = aHSeq->Length(); aSeq->length( aLength ); for( Standard_Integer i = 1; i <= aLength; i++ ) - aSeq[i-1] = GetObject( Handle(GEOM_Object)::DownCast( aHSeq->Value(i) ) ); + aSeq[i-1] = GetObject( HANDLE_NAMESPACE(GEOM_Object)::DownCast( aHSeq->Value(i) ) ); return aSeq._retn(); } diff --git a/src/DXFPlugin_ImportDriver.cxx b/src/DXFPlugin_ImportDriver.cxx index 0c2ee73..89d31ab 100644 --- a/src/DXFPlugin_ImportDriver.cxx +++ b/src/DXFPlugin_ImportDriver.cxx @@ -81,7 +81,7 @@ DXFPlugin_ImportDriver::DXFPlugin_ImportDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer DXFPlugin_ImportDriver::Execute( TFunction_Logbook& log ) const +Standard_Integer DXFPlugin_ImportDriver::Execute( LOGBOOK& log ) const { if( Label().IsNull() ) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction( Label() ); @@ -170,20 +170,15 @@ Standard_Integer DXFPlugin_ImportDriver::Execute( TFunction_Logbook& log ) const aFunction->SetValue( aResShape ); - log.SetTouched( Label() ); +#if OCC_VERSION_MAJOR < 7 + log.SetTouched(Label()); +#else + log->SetTouched(Label()); +#endif return 1; } -//======================================================================= -//function : MustExecute -//purpose : -//======================================================================= -Standard_Boolean DXFPlugin_ImportDriver::MustExecute( const TFunction_Logbook& ) const -{ - return Standard_True; -} - //================================================================================ /*! * \brief Returns a name of creation operation and names and values of creation parameters @@ -212,5 +207,4 @@ GetCreationInformation( std::string& theOperationName, return true; } -IMPLEMENT_STANDARD_HANDLE( DXFPlugin_ImportDriver, GEOM_BaseDriver ); -IMPLEMENT_STANDARD_RTTIEXT( DXFPlugin_ImportDriver, GEOM_BaseDriver ); +OCCT_IMPLEMENT_STANDARD_RTTIEXT( DXFPlugin_ImportDriver, GEOM_BaseDriver ); diff --git a/src/DXFPlugin_ImportDriver.hxx b/src/DXFPlugin_ImportDriver.hxx index 8d03716..9eb8c9b 100644 --- a/src/DXFPlugin_ImportDriver.hxx +++ b/src/DXFPlugin_ImportDriver.hxx @@ -23,11 +23,6 @@ // GEOM includes #include -// OCCT includes -#ifndef _TFunction_Logbook_HeaderFile -#include -#endif - DEFINE_STANDARD_HANDLE( DXFPlugin_ImportDriver, GEOM_BaseDriver ); class DXFPlugin_ImportDriver : public GEOM_BaseDriver @@ -37,14 +32,14 @@ public: ~DXFPlugin_ImportDriver() {}; static const Standard_GUID& GetID(); - virtual Standard_Integer Execute( TFunction_Logbook& log ) const; - Standard_Boolean MustExecute( const TFunction_Logbook& ) const; - virtual void Validate( TFunction_Logbook& ) const {} + virtual Standard_Integer Execute( LOGBOOK& log ) const; + Standard_Boolean MustExecute( const LOGBOOK& ) const { return Standard_True; } + virtual void Validate( LOGBOOK& ) const {} virtual bool GetCreationInformation( std::string& theOperationName, std::vector& params ); -DEFINE_STANDARD_RTTI( DXFPlugin_ImportDriver ) +OCCT_DEFINE_STANDARD_RTTIEXT( DXFPlugin_ImportDriver, GEOM_BaseDriver ) }; #endif // _DXFPlugin_ImportDriver_HXX -- 2.30.2