From: jfa <jfa@opencascade.com>
Date: Tue, 19 Dec 2017 12:44:49 +0000 (+0300)
Subject: Working version
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=4ad9a0dd6a7920d02a2affdee7df2bc41990a44a;p=modules%2Fgeom.git

Working version
---

diff --git a/src/BlockFix/BlockFix_BlockFixAPI.cxx b/src/BlockFix/BlockFix_BlockFixAPI.cxx
index 7dcb72080..c6d6d3221 100644
--- a/src/BlockFix/BlockFix_BlockFixAPI.cxx
+++ b/src/BlockFix/BlockFix_BlockFixAPI.cxx
@@ -29,9 +29,6 @@
 #include <BlockFix.hxx>
 #include <BlockFix_UnionFaces.hxx>
 #include <BlockFix_UnionEdges.hxx>
-#include <ShapeUpgrade_UnifySameDomain.hxx>
-
-#include <Basics_OCCTVersion.hxx>
 
 #include <ShapeUpgrade_RemoveLocations.hxx>
 
@@ -69,30 +66,6 @@ void BlockFix_BlockFixAPI::Perform()
   // with singularities on boundaries by filling
   myShape = BlockFix::RefillProblemFaces(myShape);
 
-  //Unification
-  // default values
-  Standard_Boolean anUFaces = Standard_True;
-  if (myOptimumNbFaces == -1)
-    anUFaces = Standard_False;
-  Standard_Boolean anUEdges = Standard_True;
-  Standard_Boolean anConBS = Standard_False;
-  Standard_Boolean isAllowInternal = Standard_False;
-  Standard_Boolean isSafeInputMode = Standard_True;
-  Standard_Real aLinTol = Precision::Confusion();
-  Standard_Real aAngTol = Precision::Angular();
-  TopTools_MapOfShape aMapOfShapes;
-
-  ShapeUpgrade_UnifySameDomain Unifier;
-  Unifier.Initialize(myShape, anUEdges, anUFaces, anConBS);
-  Unifier.KeepShapes(aMapOfShapes);
-  Unifier.SetSafeInputMode(isSafeInputMode);
-  Unifier.AllowInternalEdges(isAllowInternal);
-  Unifier.SetLinearTolerance(aLinTol);
-  Unifier.SetAngularTolerance(aAngTol);
-  Unifier.Build();
-  TopoDS_Shape aRes = Unifier.Shape();
-
-  /*
   // faces unification
   BlockFix_UnionFaces aFaceUnifier;
   aFaceUnifier.GetTolerance() = myTolerance;
@@ -110,7 +83,5 @@ void BlockFix_BlockFixAPI::Perform()
   myShape = anEdgeUnifier.Perform(aResult,myTolerance);
 
   TopoDS_Shape aRes = BlockFix::FixRanges(myShape,myTolerance);
-  */
-  
   myShape = aRes;
 }
diff --git a/src/BlockFix/BlockFix_UnionFaces.cxx b/src/BlockFix/BlockFix_UnionFaces.cxx
index 612272223..0f5d378c6 100644
--- a/src/BlockFix/BlockFix_UnionFaces.cxx
+++ b/src/BlockFix/BlockFix_UnionFaces.cxx
@@ -642,9 +642,9 @@ TopoDS_Shape BlockFix_UnionFaces::Perform(const TopoDS_Shape& Shape)
         sff.SetMaxTolerance(Max(1.,myTolerance*1000.));
         //Setting modes
         sff.FixOrientationMode() = 0;
-#if OCC_VERSION_LARGE > 0x07020001
+        //#if OCC_VERSION_LARGE > 0x07020001
         sff.FixWireTool()->CheckMissingEdgesMode() = Standard_False;
-#endif
+        //#endif
         //sff.FixWireMode() = 0;
         sff.SetContext(aContext);
         // Applying the fixes