0021672: [CEA 565] Dump Study from script

[modules/geom.git] / src / GEOMAlgo / BlockFix_BlockFixAPI.cxx

diff --git a/src/GEOMAlgo/BlockFix_BlockFixAPI.cxx b/src/GEOMAlgo/BlockFix_BlockFixAPI.cxx
index 21281eefdc18255d4d1f92df795068014fc92909..3c82e4a84c4ba653c5609304548216de1dd6e678 100644 (file)
--- a/src/GEOMAlgo/BlockFix_BlockFixAPI.cxx
+++ b/src/GEOMAlgo/BlockFix_BlockFixAPI.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,16 +18,21 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
 
 //  File:    BlockFix_BlockFixAPI.cxx
 //  Created: Tue Dec  7 11:59:05 2004
 //  Author:  Pavel DURANDIN
-//
+
 #include <BlockFix_BlockFixAPI.ixx>
+
 #include <BlockFix.hxx>
 #include <BlockFix_UnionFaces.hxx>
 #include <BlockFix_UnionEdges.hxx>
+
+#include <Basics_OCCTVersion.hxx>
+
+#include <ShapeUpgrade_RemoveLocations.hxx>
+
 #include <Precision.hxx>
 
 //=======================================================================
@@ -52,12 +57,23 @@ void BlockFix_BlockFixAPI::Perform()
   TopoDS_Shape aShape = Shape();
   myShape = BlockFix::RotateSphereSpace(aShape,myTolerance);
 
+  // try to approximate non-canonic surfaces
+  // with singularities on boundaries by filling
+  myShape = BlockFix::RefillProblemFaces(myShape);
+
   // faces unification
   BlockFix_UnionFaces aFaceUnifier;
   aFaceUnifier.GetTolerance() = myTolerance;
   aFaceUnifier.GetOptimumNbFaces() = myOptimumNbFaces;
   TopoDS_Shape aResult = aFaceUnifier.Perform(myShape);
 
+  // avoid problem with degenerated edges appearance
+  // due to shape quality regress
+  ShapeUpgrade_RemoveLocations RemLoc;
+  RemLoc.Remove(aResult);
+  aResult = RemLoc.GetResult();
+
+  // edges unification
   BlockFix_UnionEdges anEdgeUnifier;
   myShape = anEdgeUnifier.Perform(aResult,myTolerance);