ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2024-11-11 16:19:17 +05:00
Code Issues Packages Projects Releases Wiki Activity

Provide compatibility with older OCCT versions

Browse Source
This commit is contained in:
jfa 2022-09-08 17:29:22 +03:00
parent 27adaead14
commit 0610528e3f
5 changed files with 67 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -204,7 +204,8 @@ SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH NOCHECK ${CMAKE_INSTALL_PREFIX}/${
# =============== # ===============
SET(GEOM_TEST_DIR ${SALOME_INSTALL_SCRIPT_SCRIPTS}/test) SET(GEOM_TEST_DIR ${SALOME_INSTALL_SCRIPT_SCRIPTS}/test)
IF(SALOME_BUILD_TESTS) IF(SALOME_BUILD_TESTS)
INSTALL(FILES CTestTestfileInstall.cmake CONFIGURE_FILE(CTestTestfileInstall.cmake.in CTestTestfileInstall.cmake @ONLY)
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/CTestTestfileInstall.cmake
DESTINATION ${GEOM_TEST_DIR} DESTINATION ${GEOM_TEST_DIR}
RENAME CTestTestfile.cmake) RENAME CTestTestfile.cmake)
ENDIF() ENDIF()

3
CTestTestfileInstall.cmake → CTestTestfileInstall.cmake.in
View File

@ -17,6 +17,9 @@
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
# #
SET(OpenCASCADE_VERSION @OpenCASCADE_VERSION@)
SET(OpenCASCADE_SP_VERSION @OpenCASCADE_SP_VERSION@)
SET(PYTHON_TEST_DRIVER "$ENV{KERNEL_ROOT_DIR}/bin/salome/appliskel/python_test_driver.py") SET(PYTHON_TEST_DRIVER "$ENV{KERNEL_ROOT_DIR}/bin/salome/appliskel/python_test_driver.py")
SET(COMPONENT_NAME GEOM) SET(COMPONENT_NAME GEOM)
SET(TIMEOUT 300) SET(TIMEOUT 300)

70
src/GEOMImpl/GEOMImpl_ICanonicalRecognition.cxx
View File

@ -22,12 +22,17 @@
#include "GEOMImpl_ICanonicalRecognition.hxx" #include "GEOMImpl_ICanonicalRecognition.hxx"
#include <Basics_OCCTVersion.hxx>
#include "GEOM_Function.hxx" #include "GEOM_Function.hxx"
#include "GEOM_Object.hxx" #include "GEOM_Object.hxx"
#include "GEOM_PythonDump.hxx" #include "GEOM_PythonDump.hxx"
#include <TDataStd_ListIteratorOfListOfExtendedString.hxx> #if OCC_VERSION_LARGE > 0x07050303
#include <ShapeAnalysis_CanonicalRecognition.hxx> #include <ShapeAnalysis_CanonicalRecognition.hxx>
#endif
#include <TDataStd_ListIteratorOfListOfExtendedString.hxx>
#include <gp_Pln.hxx> #include <gp_Pln.hxx>
#include <utilities.h> #include <utilities.h>
@ -67,14 +72,19 @@ bool GEOMImpl_ICanonicalRecognition::isPlane(const Handle(GEOM_Object)& theShape
return false; return false;
} }
TopoDS_Shape aShape = theShape->GetValue(); TopoDS_Shape aShape = theShape->GetValue();
if (aShape.IsNull()) if (aShape.IsNull()) {
{ SetErrorCode("Error: NULL shape");
return false; return false;
} }
#if OCC_VERSION_LARGE < 0x07050304
SetErrorCode("Shape type detection aborted. Improper OCCT version: please, use OCCT 7.5.3p5 or newer.");
return false;
#else
ShapeAnalysis_CanonicalRecognition aRecognition(aShape); ShapeAnalysis_CanonicalRecognition aRecognition(aShape);
SetErrorCode(OK); SetErrorCode(OK);
return aRecognition.GetStatus() == 0 && aRecognition.IsPlane(theTolerance, thePln); return aRecognition.GetStatus() == 0 && aRecognition.IsPlane(theTolerance, thePln);
#endif
} }
//============================================================================= //=============================================================================
@ -91,14 +101,19 @@ bool GEOMImpl_ICanonicalRecognition::isSphere(const Handle(GEOM_Object)& theShap
return false; return false;
} }
TopoDS_Shape aShape = theShape->GetValue(); TopoDS_Shape aShape = theShape->GetValue();
if (aShape.IsNull()) if (aShape.IsNull()) {
{ SetErrorCode("Error: NULL shape");
return false; return false;
} }
#if OCC_VERSION_LARGE < 0x07050304
SetErrorCode("Shape type detection aborted. Improper OCCT version: please, use OCCT 7.5.3p5 or newer.");
return false;
#else
ShapeAnalysis_CanonicalRecognition aRecognition(aShape); ShapeAnalysis_CanonicalRecognition aRecognition(aShape);
SetErrorCode(OK); SetErrorCode(OK);
return aRecognition.GetStatus() == 0 && aRecognition.IsSphere(theTolerance, theSphere); return aRecognition.GetStatus() == 0 && aRecognition.IsSphere(theTolerance, theSphere);
#endif
} }
//============================================================================= //=============================================================================
@ -115,14 +130,19 @@ bool GEOMImpl_ICanonicalRecognition::isCone(const Handle(GEOM_Object)& theShape,
return false; return false;
} }
TopoDS_Shape aShape = theShape->GetValue(); TopoDS_Shape aShape = theShape->GetValue();
if (aShape.IsNull()) if (aShape.IsNull()) {
{ SetErrorCode("Error: NULL shape");
return false; return false;
} }
#if OCC_VERSION_LARGE < 0x07050304
SetErrorCode("Shape type detection aborted. Improper OCCT version: please, use OCCT 7.5.3p5 or newer.");
return false;
#else
ShapeAnalysis_CanonicalRecognition aRecognition(aShape); ShapeAnalysis_CanonicalRecognition aRecognition(aShape);
SetErrorCode(OK); SetErrorCode(OK);
return aRecognition.GetStatus() == 0 && aRecognition.IsCone(theTolerance, theCone); return aRecognition.GetStatus() == 0 && aRecognition.IsCone(theTolerance, theCone);
#endif
} }
//============================================================================= //=============================================================================
@ -139,14 +159,19 @@ bool GEOMImpl_ICanonicalRecognition::isCylinder(const Handle(GEOM_Object)& theSh
return false; return false;
} }
TopoDS_Shape aShape = theShape->GetValue(); TopoDS_Shape aShape = theShape->GetValue();
if (aShape.IsNull()) if (aShape.IsNull()) {
{ SetErrorCode("Error: NULL shape");
return false; return false;
} }
#if OCC_VERSION_LARGE < 0x07050304
SetErrorCode("Shape type detection aborted. Improper OCCT version: please, use OCCT 7.5.3p5 or newer.");
return false;
#else
ShapeAnalysis_CanonicalRecognition aRecognition(aShape); ShapeAnalysis_CanonicalRecognition aRecognition(aShape);
SetErrorCode(OK); SetErrorCode(OK);
return aRecognition.GetStatus() == 0 && aRecognition.IsCylinder(theTolerance, theCylinder); return aRecognition.GetStatus() == 0 && aRecognition.IsCylinder(theTolerance, theCylinder);
#endif
} }
//============================================================================= //=============================================================================
@ -163,14 +188,19 @@ bool GEOMImpl_ICanonicalRecognition::isLine(const Handle(GEOM_Object)& theEdge,
return false; return false;
} }
TopoDS_Shape aShape = theEdge->GetValue(); TopoDS_Shape aShape = theEdge->GetValue();
if (aShape.IsNull()) if (aShape.IsNull()) {
{ SetErrorCode("Error: NULL shape");
return false; return false;
} }
#if OCC_VERSION_LARGE < 0x07050304
SetErrorCode("Shape type detection aborted. Improper OCCT version: please, use OCCT 7.5.3p5 or newer.");
return false;
#else
ShapeAnalysis_CanonicalRecognition aRecognition(aShape); ShapeAnalysis_CanonicalRecognition aRecognition(aShape);
SetErrorCode(OK); SetErrorCode(OK);
return aRecognition.GetStatus() == 0 && aRecognition.IsLine(theTolerance, theLine); return aRecognition.GetStatus() == 0 && aRecognition.IsLine(theTolerance, theLine);
#endif
} }
//============================================================================= //=============================================================================
@ -187,14 +217,19 @@ bool GEOMImpl_ICanonicalRecognition::isCircle(const Handle(GEOM_Object)& theEdge
return false; return false;
} }
TopoDS_Shape aShape = theEdge->GetValue(); TopoDS_Shape aShape = theEdge->GetValue();
if (aShape.IsNull()) if (aShape.IsNull()) {
{ SetErrorCode("Error: NULL shape");
return false; return false;
} }
#if OCC_VERSION_LARGE < 0x07050304
SetErrorCode("Shape type detection aborted. Improper OCCT version: please, use OCCT 7.5.3p5 or newer.");
return false;
#else
ShapeAnalysis_CanonicalRecognition aRecognition(aShape); ShapeAnalysis_CanonicalRecognition aRecognition(aShape);
SetErrorCode(OK); SetErrorCode(OK);
return aRecognition.GetStatus() == 0 && aRecognition.IsCircle(theTolerance, theCircle); return aRecognition.GetStatus() == 0 && aRecognition.IsCircle(theTolerance, theCircle);
#endif
} }
//============================================================================= //=============================================================================
@ -211,12 +246,17 @@ bool GEOMImpl_ICanonicalRecognition::isEllipse(const Handle(GEOM_Object)& theEdg
return false; return false;
} }
TopoDS_Shape aShape = theEdge->GetValue(); TopoDS_Shape aShape = theEdge->GetValue();
if (aShape.IsNull()) if (aShape.IsNull()) {
{ SetErrorCode("Error: NULL shape");
return false; return false;
} }
#if OCC_VERSION_LARGE < 0x07050304
SetErrorCode("Shape type detection aborted. Improper OCCT version: please, use OCCT 7.5.3p5 or newer.");
return false;
#else
ShapeAnalysis_CanonicalRecognition aRecognition(aShape); ShapeAnalysis_CanonicalRecognition aRecognition(aShape);
SetErrorCode(OK); SetErrorCode(OK);
return aRecognition.GetStatus() == 0 && aRecognition.IsEllipse(theTolerance, theElips); return aRecognition.GetStatus() == 0 && aRecognition.IsEllipse(theTolerance, theElips);
#endif
} }

2
test/test_CR.py
View File

@ -19,7 +19,7 @@
# #
import salome import salome
###
salome.salome_init() salome.salome_init()
import GEOM import GEOM

5
test/tests.set
View File

@ -19,5 +19,10 @@
SET(ALL_TESTS SET(ALL_TESTS
test_perf_01.py test_perf_01.py
)
IF(${OpenCASCADE_VERSION}.${OpenCASCADE_SP_VERSION} VERSION_GREATER "7.5.3.3")
LIST(APPEND ALL_TESTS
test_CR.py test_CR.py
) )
ENDIF()