Salome HOME
Fix Makefile.am
[modules/geom.git] / src / GEOMAlgo / BlockFix_UnionFaces.cxx
index a97fab21c414b088b569377c881bfb0a70ae358b..e2f9f32fd8a2dfa7434aadb4c33163dd1e6e22e8 100644 (file)
@@ -1,31 +1,32 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2011  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
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-//  This library is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU Lesser General Public
-//  License as published by the Free Software Foundation; either
-//  version 2.1 of the License.
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
 //
-//  This library is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-//  Lesser General Public License for more details.
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
 //
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  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_UnionFaces.cxx
-// Created:    Tue Dec  7 17:15:42 2004
-// Author:     Pavel DURANDIN
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// 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_UnionFaces.cxx
+//  Created: Tue Dec  7 17:15:42 2004
+//  Author:  Pavel DURANDIN
 
 #include <BlockFix_UnionFaces.ixx>
 
+#include <Basics_OCCTVersion.hxx>
+
 #include <ShapeAnalysis_WireOrder.hxx>
 #include <ShapeAnalysis_Edge.hxx>
 
 #include <ShapeFix_Wire.hxx>
 #include <ShapeFix_Edge.hxx>
 
+#if OCC_VERSION_LARGE > 0x06040000 // Porting to OCCT6.5.1
+#include <IntPatch_ImpImpIntersection.hxx>
+#else
+#include <IntPatch_TheIIIntOfIntersection.hxx>
+#endif
+
 #include <BRep_Tool.hxx>
 #include <BRep_Builder.hxx>
 #include <BRepTools.hxx>
+#include <BRepTopAdaptor_TopolTool.hxx>
 
 #include <TopExp.hxx>
 #include <TopExp_Explorer.hxx>
@@ -59,7 +67,7 @@
 #include <TopoDS.hxx>
 #include <TopoDS_Edge.hxx>
 #include <TopoDS_Wire.hxx>
-#include <TopoDS_Face.hxx>  
+#include <TopoDS_Face.hxx>
 #include <TopoDS_Solid.hxx>
 #include <TopoDS_Vertex.hxx>
 #include <TopoDS_Shell.hxx>
 
 #include <TColGeom_HArray2OfSurface.hxx>
 
+#include <GeomAdaptor_HSurface.hxx>
+#include <GeomLib_IsPlanarSurface.hxx>
+
+#include <Geom_Surface.hxx>
 #include <Geom_Plane.hxx>
 #include <Geom_OffsetSurface.hxx>
-#include <Geom_CylindricalSurface.hxx>
 #include <Geom_SphericalSurface.hxx>
-#include <Geom_Surface.hxx>
-#include <Geom_Curve.hxx>
+#include <Geom_CylindricalSurface.hxx>
+#include <Geom_SurfaceOfRevolution.hxx>
+#include <Geom_SurfaceOfLinearExtrusion.hxx>
 #include <Geom_RectangularTrimmedSurface.hxx>
 
+#include <Geom_Curve.hxx>
+#include <Geom_Line.hxx>
+#include <Geom_Circle.hxx>
+
 #include <Geom2d_Line.hxx>
 
 #include <gp_XY.hxx>
 #include <gp_Pnt2d.hxx>
-  
+
+#include <Standard_Failure.hxx>
+#include <Standard_ErrorHandler.hxx> // CAREFUL ! position of this file is critic : see Lucien PIGNOLONI / OCC
+
 //=======================================================================
 //function : BlockFix_UnionFaces
-//purpose  : 
+//purpose  :
 //=======================================================================
 
 BlockFix_UnionFaces::BlockFix_UnionFaces()
-     : myTolerance(Precision::Confusion())
+  : myTolerance(Precision::Confusion()),
+    myOptimumNbFaces(6)
 {
 }
 
 
 //=======================================================================
-//function : GetTolearnce
-//purpose  : 
+//function : GetTolerance
+//purpose  :
 //=======================================================================
 
 Standard_Real& BlockFix_UnionFaces::GetTolerance()
@@ -102,6 +122,17 @@ Standard_Real& BlockFix_UnionFaces::GetTolerance()
 }
 
 
+//=======================================================================
+//function : GetOptimumNbFaces
+//purpose  :
+//=======================================================================
+
+Standard_Integer& BlockFix_UnionFaces::GetOptimumNbFaces()
+{
+  return myOptimumNbFaces;
+}
+
+
 //=======================================================================
 //function : AddOrdinaryEdges
 //purpose  : auxilary
@@ -129,22 +160,22 @@ static Standard_Boolean AddOrdinaryEdges(TopTools_SequenceOfShape& edges,
   for(Standard_Integer i = 1; i <= edges.Length(); i++) {
     TopoDS_Shape current = edges(i);
     if(aNewEdges.Contains(current)) {
-               
+
       aNewEdges.Remove(current);
       edges.Remove(i);
       i--;
-      
+
       if(!isDropped) {
         isDropped = Standard_True;
         anIndex = i;
       }
     }
   }
-          
+
   //add edges to the sequemce
   for(TopTools_MapIteratorOfMapOfShape anIter(aNewEdges); anIter.More(); anIter.Next())
     edges.Append(anIter.Key());
-  
+
   return isDropped;
 }
 
@@ -156,7 +187,7 @@ static Standard_Boolean AddOrdinaryEdges(TopTools_SequenceOfShape& edges,
 static Handle(Geom_Surface) ClearRts(const Handle(Geom_Surface)& aSurface)
 {
   if(aSurface->IsKind(STANDARD_TYPE(Geom_RectangularTrimmedSurface))) {
-    Handle(Geom_RectangularTrimmedSurface) rts = 
+    Handle(Geom_RectangularTrimmedSurface) rts =
       Handle(Geom_RectangularTrimmedSurface)::DownCast(aSurface);
     return rts->BasisSurface();
   }
@@ -166,7 +197,7 @@ static Handle(Geom_Surface) ClearRts(const Handle(Geom_Surface)& aSurface)
 
 //=======================================================================
 //function : Perform
-//purpose  : 
+//purpose  :
 //=======================================================================
 
 TopoDS_Shape BlockFix_UnionFaces::Perform(const TopoDS_Shape& Shape)
@@ -201,9 +232,12 @@ TopoDS_Shape BlockFix_UnionFaces::Perform(const TopoDS_Shape& Shape)
         nbf++;
     }
 
+    bool doUnion = ((myOptimumNbFaces == 0) ||
+                    ((myOptimumNbFaces > 0) && (nbf > myOptimumNbFaces)));
+
     // processing each face
     mapF.Clear();
-    for (exp.Init(aSolid, TopAbs_FACE); exp.More() && nbf > 6; exp.Next()) {
+    for (exp.Init(aSolid, TopAbs_FACE); exp.More() && doUnion; exp.Next()) {
       TopoDS_Face aFace = TopoDS::Face(exp.Current().Oriented(TopAbs_FORWARD));
 
       if (aProcessed.Contains(aFace))
@@ -227,42 +261,42 @@ TopoDS_Shape BlockFix_UnionFaces::Perform(const TopoDS_Shape& Shape)
         TopoDS_Edge edge = TopoDS::Edge(edges(i));
         if (BRep_Tool::Degenerated(edge))
           continue;
-      
+
         const TopTools_ListOfShape& aList = aMapEdgeFaces.FindFromKey(edge);
         TopTools_ListIteratorOfListOfShape anIter(aList);
         for (; anIter.More(); anIter.Next()) {
           TopoDS_Face anCheckedFace = TopoDS::Face(anIter.Value().Oriented(TopAbs_FORWARD));
           if (anCheckedFace.IsSame(aFace))
             continue;
-        
+
           if (aProcessed.Contains(anCheckedFace))
             continue;
-        
+
           if (IsSameDomain(aFace,anCheckedFace)) {
-          
+
             if (aList.Extent() != 2) {
               // non mainfold case is not processed
               continue;
             }
-          
+
             // replacing pcurves
             TopoDS_Face aMockUpFace;
             BRep_Builder B;
             B.MakeFace(aMockUpFace,aBaseSurface,aBaseLocation,0.);
             MovePCurves(aMockUpFace,anCheckedFace);
-            
+
             if (AddOrdinaryEdges(edges,aMockUpFace,dummy)) {
               // sequence edges is modified
               i = dummy;
             }
-            
+
             faces.Append(anCheckedFace);
             aProcessed.Add(anCheckedFace);
             break;
           }
         }
       }
-    
+
       // all faces collected in the sequence. Perform union of faces
       if (faces.Length() > 1) {
         NbModif++;
@@ -270,26 +304,26 @@ TopoDS_Shape BlockFix_UnionFaces::Perform(const TopoDS_Shape& Shape)
         BRep_Builder B;
         B.MakeFace(aResult,aBaseSurface,aBaseLocation,0);
         Standard_Integer nbWires = 0;
-      
+
         // connecting wires
         while (edges.Length()>0) {
-        
+
           Standard_Boolean isEdge3d = Standard_False;
           nbWires++;
           TopTools_MapOfShape aVertices;
           TopoDS_Wire aWire;
           B.MakeWire(aWire);
-        
+
           TopoDS_Edge anEdge = TopoDS::Edge(edges(1));
           edges.Remove(1);
-        
+
           isEdge3d |= !BRep_Tool::Degenerated(anEdge);
           B.Add(aWire,anEdge);
           TopoDS_Vertex V1,V2;
           TopExp::Vertices(anEdge,V1,V2);
           aVertices.Add(V1);
           aVertices.Add(V2);
-        
+
           Standard_Boolean isNewFound = Standard_False;
           do {
             isNewFound = Standard_False;
@@ -307,10 +341,10 @@ TopoDS_Shape BlockFix_UnionFaces::Perform(const TopoDS_Shape& Shape)
               }
             }
           } while (isNewFound);
-        
+
           // sorting any type of edges
           aWire = TopoDS::Wire(aContext->Apply(aWire));
-                
+
           TopoDS_Face tmpF = TopoDS::Face(aContext->Apply(faces(1).Oriented(TopAbs_FORWARD)));
           Handle(ShapeFix_Wire) sfw = new ShapeFix_Wire(aWire,tmpF,Precision::Confusion());
           sfw->FixReorder();
@@ -357,7 +391,7 @@ TopoDS_Shape BlockFix_UnionFaces::Perform(const TopoDS_Shape& Shape)
               sawo.Add(c2d->Value(f).XY(),c2d->Value(l).XY());
             }
             sawo.Perform();
-            
+
             // constructind one degenerative edge
             gp_XY aStart, anEnd, tmp;
             Standard_Integer nbFirst = sawo.Ordered(1);
@@ -367,7 +401,7 @@ TopoDS_Shape BlockFix_UnionFaces::Perform(const TopoDS_Shape& Shape)
             TopoDS_Edge E = sbe.CopyReplaceVertices(anOrigE,aDummyV,aDummyV);
             sawo.XY(nbFirst,aStart,tmp);
             sawo.XY(sawo.Ordered(aLastEdge),tmp,anEnd);
-          
+
             gp_XY aVec = anEnd-aStart;
             Handle(Geom2d_Line) aLine = new Geom2d_Line(aStart,gp_Dir2d(anEnd-aStart));
 
@@ -397,9 +431,9 @@ TopoDS_Shape BlockFix_UnionFaces::Perform(const TopoDS_Shape& Shape)
         sff.SetContext(aContext);
         // Applying the fixes
         sff.Perform();
-        if(sff.Status(ShapeExtend_FAIL)) 
+        if(sff.Status(ShapeExtend_FAIL))
         hasFailed = Standard_True;
-      
+
         // breaking down to several faces
         TopoDS_Shape theResult = aContext->Apply(aResult);
         for (TopExp_Explorer aFaceExp (theResult,TopAbs_FACE); aFaceExp.More(); aFaceExp.Next()) {
@@ -408,38 +442,38 @@ TopoDS_Shape BlockFix_UnionFaces::Perform(const TopoDS_Shape& Shape)
           grid->SetValue ( 1, 1, aBaseSurface );
           Handle(ShapeExtend_CompositeSurface) G = new ShapeExtend_CompositeSurface ( grid );
           ShapeFix_ComposeShell CompShell;
-          CompShell.Init ( G, aBaseLocation, aCurrent, ::Precision::Confusion() );//myPrecision 
+          CompShell.Init ( G, aBaseLocation, aCurrent, ::Precision::Confusion() );//myPrecision
           CompShell.SetContext( aContext );
-          
+
           TopTools_SequenceOfShape parts;
           ShapeFix_SequenceOfWireSegment wires;
           for(TopExp_Explorer W_Exp(aCurrent,TopAbs_WIRE);W_Exp.More();W_Exp.Next()) {
-            Handle(ShapeExtend_WireData) sbwd = 
+            Handle(ShapeExtend_WireData) sbwd =
               new ShapeExtend_WireData ( TopoDS::Wire(W_Exp.Current() ));
             ShapeFix_WireSegment seg ( sbwd, TopAbs_REVERSED );
             wires.Append(seg);
           }
-                
+
           CompShell.DispatchWires ( parts,wires );
           for (Standard_Integer j=1; j <= parts.Length(); j++ ) {
             ShapeFix_Face aFixOrient(TopoDS::Face(parts(j)));
             aFixOrient.SetContext(aContext);
             aFixOrient.FixOrientation();
           }
-        
+
           TopoDS_Shape CompRes;
           if ( faces.Length() !=1 ) {
             TopoDS_Shell S;
             B.MakeShell ( S );
-            for ( i=1; i <= parts.Length(); i++ ) 
+            for ( i=1; i <= parts.Length(); i++ )
               B.Add ( S, parts(i) );
             CompRes = S;
           }
           else CompRes = parts(1);
-          
+
           aContext->Replace(aCurrent,CompRes);
         }
-      
+
         // remove the remaining faces
         for(i = 2; i <= faces.Length(); i++)
           aContext->Remove(faces(i));
@@ -470,7 +504,7 @@ TopoDS_Shape BlockFix_UnionFaces::Perform(const TopoDS_Shape& Shape)
         sfw->SetMinTolerance(myTolerance);
         sfw->SetMaxTolerance(Max(1.,myTolerance*1000.));
         sfw->SetFace(aFace);
-        for (TopoDS_Iterator iter (aFace,Standard_False); iter.More(); iter.Next()) { 
+        for (TopoDS_Iterator iter (aFace,Standard_False); iter.More(); iter.Next()) {
           TopoDS_Wire wire = TopoDS::Wire(iter.Value());
           sfw->Load(wire);
           sfw->FixReorder();
@@ -487,102 +521,163 @@ TopoDS_Shape BlockFix_UnionFaces::Perform(const TopoDS_Shape& Shape)
 
 //=======================================================================
 //function : IsSameDomain
-//purpose  : 
+//purpose  :
 //=======================================================================
 
+bool getCylinder (Handle(Geom_Surface)& theInSurface, gp_Cylinder& theOutCylinder)
+{
+  bool isCylinder = false;
+
+  if (theInSurface->IsKind(STANDARD_TYPE(Geom_CylindricalSurface))) {
+    Handle(Geom_CylindricalSurface) aGC = Handle(Geom_CylindricalSurface)::DownCast(theInSurface);
+
+    theOutCylinder = aGC->Cylinder();
+    isCylinder = true;
+  }
+  else if (theInSurface->IsKind(STANDARD_TYPE(Geom_SurfaceOfRevolution))) {
+    Handle(Geom_SurfaceOfRevolution) aRS =
+      Handle(Geom_SurfaceOfRevolution)::DownCast(theInSurface);
+    Handle(Geom_Curve) aBasis = aRS->BasisCurve();
+    if (aBasis->IsKind(STANDARD_TYPE(Geom_Line))) {
+      Handle(Geom_Line) aBasisLine = Handle(Geom_Line)::DownCast(aBasis);
+      gp_Dir aDir = aRS->Direction();
+      gp_Dir aBasisDir = aBasisLine->Position().Direction();
+      if (aBasisDir.IsParallel(aDir, Precision::Confusion())) {
+        // basis line is parallel to the revolution axis: it is a cylinder
+        gp_Pnt aLoc = aRS->Location();
+        Standard_Real aR = aBasisLine->Lin().Distance(aLoc);
+        gp_Ax3 aCylAx (aLoc, aDir);
+
+        theOutCylinder = gp_Cylinder(aCylAx, aR);
+        isCylinder = true;
+      }
+    }
+  }
+  else if (theInSurface->IsKind(STANDARD_TYPE(Geom_SurfaceOfLinearExtrusion))) {
+    Handle(Geom_SurfaceOfLinearExtrusion) aLES =
+      Handle(Geom_SurfaceOfLinearExtrusion)::DownCast(theInSurface);
+    Handle(Geom_Curve) aBasis = aLES->BasisCurve();
+    if (aBasis->IsKind(STANDARD_TYPE(Geom_Circle))) {
+      Handle(Geom_Circle) aBasisCircle = Handle(Geom_Circle)::DownCast(aBasis);
+      gp_Dir aDir = aLES->Direction();
+      gp_Dir aBasisDir = aBasisCircle->Position().Direction();
+      if (aBasisDir.IsParallel(aDir, Precision::Confusion())) {
+        // basis circle is normal to the extrusion axis: it is a cylinder
+        gp_Pnt aLoc = aBasisCircle->Location();
+        Standard_Real aR = aBasisCircle->Radius();
+        gp_Ax3 aCylAx (aLoc, aDir);
+
+        theOutCylinder = gp_Cylinder(aCylAx, aR);
+        isCylinder = true;
+      }
+    }
+  }
+  else {
+  }
+
+  return isCylinder;
+}
+
 Standard_Boolean BlockFix_UnionFaces::IsSameDomain(const TopoDS_Face& aFace,
                                                    const TopoDS_Face& aCheckedFace) const
 {
-  //checking the same handless
+  //checking the same handles
   TopLoc_Location L1, L2;
   Handle(Geom_Surface) S1, S2;
-  
+
   S1 = BRep_Tool::Surface(aFace,L1);
   S2 = BRep_Tool::Surface(aCheckedFace,L2);
-  
+
   if (S1 == S2 && L1 == L2)
     return true;
 
-  // begin: planar case (improvement 20052)
+  // planar and cylindrical cases (IMP 20052)
+  Standard_Real aPrec = Precision::Confusion();
+
   S1 = BRep_Tool::Surface(aFace);
   S2 = BRep_Tool::Surface(aCheckedFace);
 
-  Handle(Geom_Plane) aGP1, aGP2;
-  Handle(Geom_RectangularTrimmedSurface) aGRTS1, aGRTS2;
-  Handle(Geom_OffsetSurface) aGOFS1, aGOFS2;
-
-  aGRTS1 = Handle(Geom_RectangularTrimmedSurface)::DownCast(S1);
-  aGRTS2 = Handle(Geom_RectangularTrimmedSurface)::DownCast(S2);
-
-  aGOFS1 = Handle(Geom_OffsetSurface)::DownCast(S1);
-  aGOFS2 = Handle(Geom_OffsetSurface)::DownCast(S2);
-
-  if (!aGOFS1.IsNull()) {
-    aGP1 = Handle(Geom_Plane)::DownCast(aGOFS1->BasisSurface());
-  }
-  else if (!aGRTS1.IsNull()) {
-    aGP1 = Handle(Geom_Plane)::DownCast(aGRTS1->BasisSurface());
-  }
-  else {
-    aGP1 = Handle(Geom_Plane)::DownCast(S1);
-  }
-
-  if (!aGOFS2.IsNull()) {
-    aGP2 = Handle(Geom_Plane)::DownCast(aGOFS2->BasisSurface());
-  }
-  else if (!aGRTS2.IsNull()) {
-    aGP2 = Handle(Geom_Plane)::DownCast(aGRTS2->BasisSurface());
-  }
-  else {
-    aGP2 = Handle(Geom_Plane)::DownCast(S2);
-  }
-
-  if (!aGP1.IsNull() && !aGP2.IsNull()) {
-    // both surfaces are planar, check equality
-    Standard_Real A1, B1, C1, D1;
-    Standard_Real A2, B2, C2, D2;
-    aGP1->Coefficients(A1, B1, C1, D1);
-    aGP2->Coefficients(A2, B2, C2, D2);
-
-    if (fabs(A1) > Precision::Confusion()) {
-      A1 = 1.0;
-      B1 /= A1;
-      C1 /= A1;
-      D1 /= A1;
-    }
-    else if (fabs(B1) > Precision::Confusion()) {
-      B1 = 1.0;
-      C1 /= B1;
-      D1 /= B1;
+  S1 = ClearRts(S1);
+  S2 = ClearRts(S2);
+
+  //Handle(Geom_OffsetSurface) aGOFS1, aGOFS2;
+  //aGOFS1 = Handle(Geom_OffsetSurface)::DownCast(S1);
+  //aGOFS2 = Handle(Geom_OffsetSurface)::DownCast(S2);
+  //if (!aGOFS1.IsNull()) S1 = aGOFS1->BasisSurface();
+  //if (!aGOFS2.IsNull()) S2 = aGOFS2->BasisSurface();
+
+  // case of two elementary surfaces: use OCCT tool
+  // elementary surfaces: ConicalSurface, CylindricalSurface,
+  //                      Plane, SphericalSurface and ToroidalSurface
+  if (S1->IsKind(STANDARD_TYPE(Geom_ElementarySurface)) &&
+      S2->IsKind(STANDARD_TYPE(Geom_ElementarySurface)))
+  {
+    Handle(GeomAdaptor_HSurface) aGA1 = new GeomAdaptor_HSurface(S1);
+    Handle(GeomAdaptor_HSurface) aGA2 = new GeomAdaptor_HSurface(S2);
+
+    Handle(BRepTopAdaptor_TopolTool) aTT1 = new BRepTopAdaptor_TopolTool();
+    Handle(BRepTopAdaptor_TopolTool) aTT2 = new BRepTopAdaptor_TopolTool();
+
+    try {
+#if OCC_VERSION_LARGE > 0x06010000
+      OCC_CATCH_SIGNALS;
+#endif
+
+#if OCC_VERSION_LARGE > 0x06040000 // Porting to OCCT6.5.1
+      IntPatch_ImpImpIntersection anIIInt (aGA1, aTT1, aGA2, aTT2, aPrec, aPrec);
+#else
+      IntPatch_TheIIIntOfIntersection anIIInt (aGA1, aTT1, aGA2, aTT2, aPrec, aPrec);
+#endif
+      if (!anIIInt.IsDone() || anIIInt.IsEmpty())
+        return false;
+
+      return anIIInt.TangentFaces();
     }
-    else {
-      C1 = 1.0;
-      D1 /= C1;
+    catch (Standard_Failure) {
+      return false;
     }
+  }
 
-    if (fabs(A2) > Precision::Confusion()) {
-      A2 = 1.0;
-      B2 /= A2;
-      C2 /= A2;
-      D2 /= A2;
-    }
-    else if (fabs(B2) > Precision::Confusion()) {
-      B2 = 1.0;
-      C2 /= B2;
-      D2 /= B2;
-    }
-    else {
-      C2 = 1.0;
-      D2 /= C2;
+  // case of two planar surfaces:
+  // all kinds of surfaces checked, including b-spline and bezier
+  GeomLib_IsPlanarSurface aPlanarityChecker1 (S1, aPrec);
+  if (aPlanarityChecker1.IsPlanar()) {
+    GeomLib_IsPlanarSurface aPlanarityChecker2 (S2, aPrec);
+    if (aPlanarityChecker2.IsPlanar()) {
+      gp_Pln aPln1 = aPlanarityChecker1.Plan();
+      gp_Pln aPln2 = aPlanarityChecker2.Plan();
+
+      if (aPln1.Position().Direction().IsParallel(aPln2.Position().Direction(), aPrec) &&
+          aPln1.Distance(aPln2) < aPrec) {
+        return true;
+      }
     }
+  }
 
-    if (fabs(A1 - A2) < Precision::Confusion() &&
-        fabs(B1 - B2) < Precision::Confusion() &&
-        fabs(C1 - C2) < Precision::Confusion() &&
-        fabs(D1 - D2) < Precision::Confusion())
-      return true;
+  // case of two cylindrical surfaces, at least one of which is a swept surface
+  // swept surfaces: SurfaceOfLinearExtrusion, SurfaceOfRevolution
+  if ((S1->IsKind(STANDARD_TYPE(Geom_CylindricalSurface)) ||
+       S1->IsKind(STANDARD_TYPE(Geom_SweptSurface))) &&
+      (S2->IsKind(STANDARD_TYPE(Geom_CylindricalSurface)) ||
+       S2->IsKind(STANDARD_TYPE(Geom_SweptSurface))))
+  {
+    gp_Cylinder aCyl1, aCyl2;
+    if (getCylinder(S1, aCyl1) && getCylinder(S2, aCyl2)) {
+      if (fabs(aCyl1.Radius() - aCyl2.Radius()) < aPrec) {
+        gp_Dir aDir1 = aCyl1.Position().Direction();
+        gp_Dir aDir2 = aCyl2.Position().Direction();
+        if (aDir1.IsParallel(aDir2, aPrec)) {
+          gp_Pnt aLoc1 = aCyl1.Location();
+          gp_Pnt aLoc2 = aCyl2.Location();
+          gp_Vec aVec12 (aLoc1, aLoc2);
+          if (aVec12.SquareMagnitude() < aPrec*aPrec ||
+              aVec12.IsParallel(aDir1, aPrec)) {
+            return true;
+          }
+        }
+      }
+    }
   }
-  // end: planar case (improvement 20052)
 
   return false;
 }
@@ -590,7 +685,7 @@ Standard_Boolean BlockFix_UnionFaces::IsSameDomain(const TopoDS_Face& aFace,
 
 //=======================================================================
 //function : MovePCurves
-//purpose  : 
+//purpose  :
 //=======================================================================
 
 void BlockFix_UnionFaces::MovePCurves(TopoDS_Face& aTarget,
@@ -598,17 +693,17 @@ void BlockFix_UnionFaces::MovePCurves(TopoDS_Face& aTarget,
 {
   BRep_Builder B;
   for(TopExp_Explorer wexp(aSource,TopAbs_WIRE);wexp.More();wexp.Next()) {
-    Handle(ShapeFix_Wire) sfw = new ShapeFix_Wire(TopoDS::Wire(wexp.Current()), 
+    Handle(ShapeFix_Wire) sfw = new ShapeFix_Wire(TopoDS::Wire(wexp.Current()),
                                                   aTarget, Precision::Confusion());
     sfw->FixReorder();
     Standard_Boolean isReoredFailed = sfw->StatusReorder ( ShapeExtend_FAIL );
     sfw->FixEdgeCurves();
     if(isReoredFailed)
       continue;
-    
+
     sfw->FixShifted();
     sfw->FixDegenerated();
-    
+
     // remove degenerated edges from not degenerated points
     ShapeAnalysis_Edge sae;
     Handle(ShapeExtend_WireData) sewd = sfw->WireData();
@@ -619,7 +714,7 @@ void BlockFix_UnionFaces::MovePCurves(TopoDS_Face& aTarget,
         i--;
       }
     }
-    
+
     TopoDS_Wire ResWire = sfw->Wire();
     B.Add(aTarget,ResWire);
   }