Migration to OCCT 7.0

diff --git a/adm_local/cmake_files/FindACIS.cmake b/adm_local/cmake_files/FindACIS.cmake
index 9556ab86dd53b05b266c7ae8bb3207eca42ab4ac..f93f8e03d15170cdacc7abfc10febef7e8df9ece 100644 (file)
--- a/adm_local/cmake_files/FindACIS.cmake
+++ b/adm_local/cmake_files/FindACIS.cmake
@@ -36,20 +36,36 @@ SET(OCCLICENSE_ROOT_DIR $ENV{OCCLICENSE_ROOT_DIR})
 IF(ACIS_ROOT_DIR)
   LIST(APPEND CMAKE_PREFIX_PATH "${ACIS_ROOT_DIR}")
 ENDIF(ACIS_ROOT_DIR)
+
 IF(OCCLICENSE_ROOT_DIR)
   LIST(APPEND CMAKE_PREFIX_PATH "${OCCLICENSE_ROOT_DIR}")
 ENDIF(OCCLICENSE_ROOT_DIR)
 
-FIND_PATH(ACIS_INCLUDE_DIRS AcisGeom.hxx PATH_SUFFIXES inc)
-FIND_PATH(OCCTLICENSE_INCLUDE_DIRS OCCLicense_Activate.hxx PATH_SUFFIXES inc)
-IF(OCCTLICENSE_INCLUDE_DIRS)
-  LIST(APPEND ACIS_INCLUDE_DIRS ${OCCTLICENSE_INCLUDE_DIRS})
-ENDIF(OCCTLICENSE_INCLUDE_DIRS)
+FIND_PATH(ACIS_INCLUDE_DIRS AcisGeom.hxx PATH_SUFFIXES include/opencascade)
+IF(ACIS_INCLUDE_DIRS)
+  SET(ACIS_UPCOUNT 2)
+ELSE(ACIS_INCLUDE_DIRS)
+  FIND_PATH(ACIS_INCLUDE_DIRS AcisGeom.hxx PATH_SUFFIXES include inc)
+ENDIF(ACIS_INCLUDE_DIRS)
+
+FIND_PATH(OCCTLICENSE_INCLUDE_DIRS OCCLicense_Activate.hxx PATH_SUFFIXES include/opencascade)
+IF(NOT OCCTLICENSE_INCLUDE_DIRS)
+  FIND_PATH(OCCTLICENSE_INCLUDE_DIRS OCCLicense_Activate.hxx PATH_SUFFIXES include inc)
+ENDIF(NOT OCCTLICENSE_INCLUDE_DIRS)
+
+IF(ACIS_INCLUDE_DIRS AND OCCTLICENSE_INCLUDE_DIRS)
+  FILE(TO_NATIVE_PATH ${ACIS_INCLUDE_DIRS} _acis_dir)
+  FILE(TO_NATIVE_PATH ${OCCTLICENSE_INCLUDE_DIRS} _lic_dir)
+  STRING(COMPARE NOTEQUAL ${_acis_dir} ${_lic_dir} _diff_dir)
+  IF(_diff_dir)
+    LIST(APPEND ACIS_INCLUDE_DIRS ${OCCTLICENSE_INCLUDE_DIRS})
+  ENDIF()
+ENDIF(ACIS_INCLUDE_DIRS AND OCCTLICENSE_INCLUDE_DIRS)
 
-FIND_LIBRARY(ACIS_TKACIS NAMES TKACIS)
-FIND_LIBRARY(ACIS_TKSAT NAMES TKSAT)
-FIND_LIBRARY(ACIS_TKXDESAT NAMES TKXDESAT)
-FIND_LIBRARY(ACIS_TKOCCLicense NAMES TKOCCLicense)
+FIND_LIBRARY(ACIS_TKACIS NAMES TKACIS PATH_SUFFIXES lib lin64/gcc/lib bin)
+FIND_LIBRARY(ACIS_TKSAT NAMES TKSAT PATH_SUFFIXES lib lin64/gcc/lib bin)
+FIND_LIBRARY(ACIS_TKXDESAT NAMES TKXDESAT PATH_SUFFIXES lib lin64/gcc/lib bin)
+FIND_LIBRARY(ACIS_TKOCCLicense NAMES TKOCCLicense PATH_SUFFIXES lib lin64/gcc/lib bin)
 
 SET(ACIS_LIBRARIES
   ${ACIS_TKACIS}

diff --git a/src/ACISPlugin_ExportDriver.cxx b/src/ACISPlugin_ExportDriver.cxx
index 6c9b38289f03b47e3c0a46c37a083430e6874536..7259200711a59096e62713a7417b5974caac610a 100644 (file)
--- a/src/ACISPlugin_ExportDriver.cxx
+++ b/src/ACISPlugin_ExportDriver.cxx
@@ -64,7 +64,7 @@ ACISPlugin_ExportDriver::ACISPlugin_ExportDriver()
 //function : Execute
 //purpose  :
 //=======================================================================
-Standard_Integer ACISPlugin_ExportDriver::Execute( TFunction_Logbook& log ) const
+Standard_Integer ACISPlugin_ExportDriver::Execute( LOGBOOK& log ) const
 {
 #ifdef ACIS_HASLICENSE
     try {
@@ -108,15 +108,6 @@ Standard_Integer ACISPlugin_ExportDriver::Execute( TFunction_Logbook& log ) cons
     return 0;
 }
 
-//=======================================================================
-//function : MustExecute
-//purpose  :
-//=======================================================================
-Standard_Boolean ACISPlugin_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( ACISPlugin_ExportDriver,GEOM_BaseDriver );
-IMPLEMENT_STANDARD_RTTIEXT( ACISPlugin_ExportDriver,GEOM_BaseDriver );
+OCCT_IMPLEMENT_STANDARD_RTTIEXT( ACISPlugin_ExportDriver,GEOM_BaseDriver );

diff --git a/src/ACISPlugin_ExportDriver.hxx b/src/ACISPlugin_ExportDriver.hxx
index 5bfb3d6c2f5f44a94d43df9304a4676942f20906..b26445a41157debf6b7d916ec9878605c8deb0f0 100644 (file)
--- a/src/ACISPlugin_ExportDriver.hxx
+++ b/src/ACISPlugin_ExportDriver.hxx
@@ -23,9 +23,6 @@
 // GEOM includes
 #include <GEOM_BaseDriver.hxx>
 
-// OCCT includes
-#include <TFunction_Logbook.hxx>
-
 DEFINE_STANDARD_HANDLE( ACISPlugin_ExportDriver, GEOM_BaseDriver );
 
 class ACISPlugin_ExportDriver : public GEOM_BaseDriver
@@ -35,14 +32,14 @@ public:
   ~ACISPlugin_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& heOperationName,
+  virtual bool                GetCreationInformation( std::string& theOperationName,
                                                       std::vector<GEOM_Param>& params );
 
-DEFINE_STANDARD_RTTI( ACISPlugin_ExportDriver )
+OCCT_DEFINE_STANDARD_RTTIEXT( ACISPlugin_ExportDriver, GEOM_BaseDriver )
 };
 
 #endif // _ACISPlugin_ExportDriver_HXX

diff --git a/src/ACISPlugin_IOperations_i.cc b/src/ACISPlugin_IOperations_i.cc
index 70c797e34a529b1c9b8cf67b8d8a388c9a7bc71a..f2b1606111107e80e844cbf90c96d4a87742c8c3 100644 (file)
--- a/src/ACISPlugin_IOperations_i.cc
+++ b/src/ACISPlugin_IOperations_i.cc
@@ -97,7 +97,7 @@ GEOM::ListOfGO* ACISPlugin_IOperations_i::ImportACIS( 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/ACISPlugin_ImportDriver.cxx b/src/ACISPlugin_ImportDriver.cxx
index 8279129919de91cb5cc4b05c08ecb195f0e7b83a..21262fca08fadd856b5f3c0b43cedb6d2a19cc24 100644 (file)
--- a/src/ACISPlugin_ImportDriver.cxx
+++ b/src/ACISPlugin_ImportDriver.cxx
@@ -78,7 +78,7 @@ ACISPlugin_ImportDriver::ACISPlugin_ImportDriver()
 //function : Execute
 //purpose  :
 //=======================================================================
-Standard_Integer ACISPlugin_ImportDriver::Execute( TFunction_Logbook& log ) const
+Standard_Integer ACISPlugin_ImportDriver::Execute( LOGBOOK& log ) const
 {
   if( Label().IsNull() ) return 0;
   Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction( Label() );
@@ -161,20 +161,15 @@ Standard_Integer ACISPlugin_ImportDriver::Execute( TFunction_Logbook& log ) cons
 
   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 ACISPlugin_ImportDriver::MustExecute( const TFunction_Logbook& ) const
-{
-  return Standard_True;
-}
-
 //================================================================================
 /*!
  * \brief Returns a name of creation operation and names and values of creation parameters
@@ -203,5 +198,4 @@ GetCreationInformation( std::string&             theOperationName,
   return true;
 }
 
-IMPLEMENT_STANDARD_HANDLE( ACISPlugin_ImportDriver, GEOM_BaseDriver );
-IMPLEMENT_STANDARD_RTTIEXT( ACISPlugin_ImportDriver, GEOM_BaseDriver );
+OCCT_IMPLEMENT_STANDARD_RTTIEXT( ACISPlugin_ImportDriver, GEOM_BaseDriver );

diff --git a/src/ACISPlugin_ImportDriver.hxx b/src/ACISPlugin_ImportDriver.hxx
index da09aaa8d4072de43432af2c9fa68be75478f2dc..e5d5f7f854fc1f9012735cf82aada296dbec5613 100644 (file)
--- a/src/ACISPlugin_ImportDriver.hxx
+++ b/src/ACISPlugin_ImportDriver.hxx
@@ -23,11 +23,6 @@
 // GEOM includes
 #include <GEOM_BaseDriver.hxx>
 
-// OCCT includes
-#ifndef _TFunction_Logbook_HeaderFile
-#include <TFunction_Logbook.hxx>
-#endif
-
 DEFINE_STANDARD_HANDLE( ACISPlugin_ImportDriver, GEOM_BaseDriver );
 
 class ACISPlugin_ImportDriver : public GEOM_BaseDriver
@@ -37,14 +32,14 @@ public:
   ~ACISPlugin_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<GEOM_Param>& params );
 
-DEFINE_STANDARD_RTTI( ACISPlugin_ImportDriver )
+OCCT_DEFINE_STANDARD_RTTIEXT( ACISPlugin_ImportDriver, GEOM_BaseDriver )
 };
 
 #endif // _ACISPlugin_ImportDriver_HXX