removed old OCC <7 references

removed OCC <7 references
This commit is contained in:
andrea
2023-07-24 19:27:46 +02:00
committed by Chris Hennes
parent 6c2a5c1539
commit 170c2b9957
5 changed files with 3 additions and 32 deletions

View File

@@ -160,11 +160,10 @@ if(OCC_FOUND)
TKService
TKV3d
)
if(OCC_VERSION_STRING VERSION_LESS 6.7.3)
list(APPEND OCC_OCAF_LIBRARIES TKAdvTools)
elseif(NOT OCC_VERSION_STRING VERSION_LESS 7.5.0)
if(NOT OCC_VERSION_STRING VERSION_LESS 7.5.0)
list(APPEND OCC_OCAF_LIBRARIES TKRWMesh)
endif(OCC_VERSION_STRING VERSION_LESS 6.7.3)
endif(NOT OCC_VERSION_STRING VERSION_LESS 7.5.0)
message(STATUS "-- Found OCE/OpenCASCADE version: ${OCC_VERSION_STRING}")
message(STATUS "-- OCE/OpenCASCADE include directory: ${OCC_INCLUDE_DIR}")
message(STATUS "-- OCE/OpenCASCADE shared libraries directory: ${OCC_LIBRARY_DIR}")

View File

@@ -21,10 +21,6 @@
#include <Mod/Import/ImportGlobal.h>
//Following is required to be defined on Ubuntu with OCC 6.3.1
#ifndef HAVE_IOSTREAM
#define HAVE_IOSTREAM
#endif
typedef int ColorIndex_t; // DXF color index

View File

@@ -63,10 +63,6 @@
For each Point of the Spine P, an Point Q is evalued on AuxiliarySpine.
If CurvilinearEquivalence=True Q split AuxiliarySpine with the same length ratio than P split Spine.
* OCC before 6.7
TypeOfContact = bool
True = keep Contact
* OCC >= 6.7
TypeOfContact = long
0: No contact

View File

@@ -27,7 +27,6 @@ __doc__ = "JoinFeatures functions that operate on shapes."
import Part
from . import ShapeMerge
from . import generalFuseIsAvailable
from .GeneralFuseResult import GeneralFuseResult
from .Utils import compoundLeaves
@@ -76,12 +75,6 @@ def connect(list_of_shapes, tolerance = 0.0):
if len(list_of_shapes) < 2:
return Part.makeCompound(list_of_shapes)
if not generalFuseIsAvailable(): #fallback to legacy
result = list_of_shapes[0]
for i in range(1, len(list_of_shapes)):
result = connect_legacy(result, list_of_shapes[i], tolerance)
return result
pieces, map = list_of_shapes[0].generalFuse(list_of_shapes[1:], tolerance)
ao = GeneralFuseResult(list_of_shapes, (pieces, map))
ao.splitAggregates()

View File

@@ -62,16 +62,3 @@ def addCommands():
JoinFeatures.addCommands()
SplitFeatures.addCommands()
def generalFuseIsAvailable():
"""generalFuseIsAvailable(): returns True if FreeCAD's Part.Shape.generalFuse is functional.
True if Part.OCC_VERSION >= 7.0.0."""
import Part
if not hasattr(Part, "OCC_VERSION"):
return False
else:
ver_string = Part.OCC_VERSION
import re
match = re.match(r"([0-9]+)\.([0-9]+)\.([0-9]+)",ver_string)
major,minor,rev = match.groups()
major = int(major); minor = int(minor); rev = int(rev)
return (major,minor,rev)>=(7,0,0)