From 1d621ce9b061f571128200540ef5343a1902011c Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Tue, 18 Nov 2014 23:15:30 +0000
Subject: [PATCH] patch for OCC 6.8 from Thierry Thomas
---
CMakeLists.txt | 3 ++-
Geo/OCCFace.cpp | 8 ++++++--
doc/texinfo/opt_general.texi | 5 +++++
doc/texinfo/opt_mesh.texi | 5 +++++
4 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f3e2720950..9852f32744 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1077,7 +1077,8 @@ if(ENABLE_OCC)
# ModelingData
TKBRep TKGeomBase TKG3d TKG2d
# FoundationClasses
- TKAdvTools TKMath TKernel)
+ # TKAdvTools -- not necessary? (and removed from OCC 6.8)
+ TKMath TKernel)
if(ENABLE_SGEOM)
set(OCC_LIBS_REQUIRED ${OCC_LIBS_REQUIRED}
# For SGEOM
diff --git a/Geo/OCCFace.cpp b/Geo/OCCFace.cpp
index 125774adb2..3495091cbd 100644
--- a/Geo/OCCFace.cpp
+++ b/Geo/OCCFace.cpp
@@ -28,7 +28,11 @@
#include <BRepMesh_FastDiscret.hxx>
#if (OCC_VERSION_MAJOR == 6) && (OCC_VERSION_MINOR >= 6)
-#include <BOPInt_Context.hxx>
+# if (OCC_VERSION_MINOR < 8)
+# include <BOPInt_Context.hxx>
+# else
+# include <IntTools_Context.hxx>
+# endif
#include <BOPTools_AlgoTools2D.hxx>
#include <BOPTools_AlgoTools.hxx>
#else
@@ -455,7 +459,7 @@ bool OCCFace::buildSTLTriangulation(bool force)
void OCCFace::replaceEdgesInternal(std::list<GEdge*> &new_edges)
{
-#if (OCC_VERSION_MAJOR == 6) && (OCC_VERSION_MINOR >= 6)
+#if (OCC_VERSION_MAJOR == 6) && (OCC_VERSION_MINOR >= 6) && (OCC_VERSION_MINOR < 8)
Handle(BOPInt_Context) myContext = new BOPInt_Context;
#elif defined(OCC_VERSION_HEX) && OCC_VERSION_HEX >= 0x060503
Handle(IntTools_Context) myContext = new IntTools_Context;
diff --git a/doc/texinfo/opt_general.texi b/doc/texinfo/opt_general.texi
index 54f2d57e73..8d5c618b14 100644
--- a/doc/texinfo/opt_general.texi
+++ b/doc/texinfo/opt_general.texi
@@ -809,6 +809,11 @@ Vertical position (in pixels) of the (detached) menu tree@*
Default value: @code{400}@*
Saved in: @code{General.SessionFileName}
+@item General.MessageFontSize
+Size of the font in the message window (-1=automatic)@*
+Default value: @code{-1}@*
+Saved in: @code{General.OptionsFileName}
+
@item General.MessageHeight
Height (in pixels) of the message console when it is visible (should be > 0)@*
Default value: @code{300}@*
diff --git a/doc/texinfo/opt_mesh.texi b/doc/texinfo/opt_mesh.texi
index 8ff1a0509d..fca061be34 100644
--- a/doc/texinfo/opt_mesh.texi
+++ b/doc/texinfo/opt_mesh.texi
@@ -659,6 +659,11 @@ Skip a model edge in mesh generation if its length is less than user's defined t
Default value: @code{0}@*
Saved in: @code{General.OptionsFileName}
+@item Mesh.ToleranceInitialDelaunay
+Tolerance for initial 3D Delaunay mesher@*
+Default value: @code{1e-08}@*
+Saved in: @code{General.OptionsFileName}
+
@item Mesh.Triangles
Display mesh triangles?@*
Default value: @code{1}@*
--
GitLab