0028995: UnifySameDomain produces invalid shape

Synchronization of the ShapeAnalysis_Edge behavior with the BRepCheck_Edge by adding check for 2d curves on planes.

Implementation of the BRep_Tool::CurveOnPlane method to avoid code duplication for making PCurve of the edge on planar face.

src/BRep/BRep_Tool.cxx

@@ -321,8 +321,23 @@ Handle(Geom2d_Curve) BRep_Tool::CurveOnSurface(const TopoDS_Edge& E,
     itcr.Next();
   }
 
-  // for planar surface and 3d curve try a projection
+  // Curve is not found. Try projection on plane
-  // modif 21-05-97 : for RectangularTrimmedSurface, try a projection
+  return CurveOnPlane(E, S, L, First, Last);
+}
+
+//=======================================================================
+//function : CurveOnPlane
+//purpose  : For planar surface returns projection of the edge on the plane
+//=======================================================================
+Handle(Geom2d_Curve) BRep_Tool::CurveOnPlane(const TopoDS_Edge& E,
+                                             const Handle(Geom_Surface)& S,
+                                             const TopLoc_Location& L,
+                                             Standard_Real& First,
+                                             Standard_Real& Last)
+{
+  First = Last = 0.;
+
+  // Check if the surface is planar
   Handle(Geom_Plane) GP;
   Handle(Geom_RectangularTrimmedSurface) GRTS;
   GRTS = Handle(Geom_RectangularTrimmedSurface)::DownCast(S);
@@ -330,64 +345,51 @@ Handle(Geom2d_Curve) BRep_Tool::CurveOnSurface(const TopoDS_Edge& E,
     GP = Handle(Geom_Plane)::DownCast(GRTS->BasisSurface());
   else
     GP = Handle(Geom_Plane)::DownCast(S);
-  //fin modif du 21-05-97
 
-  if (!GP.IsNull())
+  if (GP.IsNull())
+    // not a plane
+    return nullPCurve;
+
+  // Check existence of 3d curve in edge
+  Standard_Real f, l;
+  TopLoc_Location aCurveLocation;
+  Handle(Geom_Curve) C3D = BRep_Tool::Curve(E, aCurveLocation, f, l);
+
+  if (C3D.IsNull())
+    // no 3d curve
+    return nullPCurve;
+
+  aCurveLocation = aCurveLocation.Predivided(L);
+  First = f; Last = l;
+
+  // Transform curve and update parameters in account of scale factor
+  if (!aCurveLocation.IsIdentity())
   {
-    Handle(GeomAdaptor_HCurve) HC;
+    const gp_Trsf& aTrsf = aCurveLocation.Transformation();
-    Handle(GeomAdaptor_HSurface) HS;
+    C3D = Handle(Geom_Curve)::DownCast(C3D->Transformed(aTrsf));
-
+    f = C3D->TransformedParameter(f, aTrsf);
-    HC = new GeomAdaptor_HCurve();
+    l = C3D->TransformedParameter(l, aTrsf);
-    HS = new GeomAdaptor_HSurface();
-
-    TopLoc_Location aCurveLocation;
-
-    Standard_Real f, l;// for those who call with (u,u).
-    Handle(Geom_Curve) C3d = BRep_Tool::Curve(E, aCurveLocation, f, l);
-
-    if (C3d.IsNull())
-    {
-      First = Last = 0.;
-      return nullPCurve;
-    }
-
-    aCurveLocation = aCurveLocation.Predivided(L);
-    First = f; Last = l; //Range of edge must not be modified
-
-    if (!aCurveLocation.IsIdentity())
-    {
-      const gp_Trsf& T = aCurveLocation.Transformation();
-      Handle(Geom_Geometry) GC3d = C3d->Transformed(T);
-      C3d = Handle(Geom_Curve)::DownCast (GC3d);
-      f = C3d->TransformedParameter(f, T);
-      l = C3d->TransformedParameter(l, T);
-    }
-    GeomAdaptor_Surface& GAS = HS->ChangeSurface();
-    GAS.Load(GP);
-
-    Handle(Geom_Curve) ProjOnPlane = 
-      GeomProjLib::ProjectOnPlane(new Geom_TrimmedCurve(C3d,f,l,Standard_True,Standard_False),
-                                  GP,
-                                  GP->Position().Direction(),
-                                  Standard_True);
-
-    GeomAdaptor_Curve& GAC = HC->ChangeCurve();
-    GAC.Load(ProjOnPlane);
-
-    ProjLib_ProjectedCurve Proj(HS,HC);
-    Handle(Geom2d_Curve) pc = Geom2dAdaptor::MakeCurve(Proj);
-
-    if (pc->DynamicType() == STANDARD_TYPE(Geom2d_TrimmedCurve)) {
-      Handle(Geom2d_TrimmedCurve) TC = 
-        Handle(Geom2d_TrimmedCurve)::DownCast (pc);
-      pc = TC->BasisCurve();
-    }
-
-    return pc;
   }
-  
+
-  First = Last = 0.;
+  // Perform projection
-  return nullPCurve;
+  Handle(Geom_Curve) ProjOnPlane =
+    GeomProjLib::ProjectOnPlane(new Geom_TrimmedCurve(C3D, f, l, Standard_True, Standard_False),
+                                GP,
+                                GP->Position().Direction(),
+                                Standard_True);
+
+  Handle(GeomAdaptor_HSurface) HS = new GeomAdaptor_HSurface(GP);
+  Handle(GeomAdaptor_HCurve)   HC = new GeomAdaptor_HCurve(ProjOnPlane);
+
+  ProjLib_ProjectedCurve Proj(HS, HC);
+  Handle(Geom2d_Curve) pc = Geom2dAdaptor::MakeCurve(Proj);
+
+  if (pc->DynamicType() == STANDARD_TYPE(Geom2d_TrimmedCurve)) {
+    Handle(Geom2d_TrimmedCurve) TC = Handle(Geom2d_TrimmedCurve)::DownCast(pc);
+    pc = TC->BasisCurve();
+  }
+
+  return pc;
 }
 
 //=======================================================================
@@ -438,35 +440,34 @@ void  BRep_Tool::CurveOnSurface(const TopoDS_Edge& E,
                                 Standard_Real& Last,
                                 const Standard_Integer Index)
 {
-  Standard_Integer i = 0;
+  if (Index < 1)
-  Standard_Boolean Eisreversed = (E.Orientation() == TopAbs_REVERSED);
+    return;
 
+  Standard_Integer i = 0;
   // find the representation
   const BRep_TEdge* TE = static_cast<const BRep_TEdge*>(E.TShape().get());
   BRep_ListIteratorOfListOfCurveRepresentation itcr(TE->Curves());
-
+  for (; itcr.More(); itcr.Next())
-  while (itcr.More()) {
+  {
     const Handle(BRep_CurveRepresentation)& cr = itcr.Value();
-    if (cr->IsCurveOnSurface()) {
+    if (cr->IsCurveOnSurface())
+    {
       const BRep_GCurve* GC = static_cast<const BRep_GCurve*>(cr.get());
-      i++;
+      ++i;
-      if (i > Index) break;
+      // Compare index taking into account the fact that for the curves on
-      if (i == Index) {
+      // closed surfaces there are two PCurves
-        // JMB le 21 Mai 1999
+      if (i == Index)
-        // it is done as in the other CurveOnSurface methods, ie. take into account
+        C = GC->PCurve();
-        // the orientation in case of cut edges (return PCurve2)
+      else if (GC->IsCurveOnClosedSurface() && (++i == Index))
-        // otherwise there is a risk to loop curves or to not get the prover one.
+        C = GC->PCurve2();
-        if (GC->IsCurveOnClosedSurface() && Eisreversed)
+      else
-          C = GC->PCurve2();
+        continue;
-        else
+
-          C = GC->PCurve();
+      S = GC->Surface();
-        S = GC->Surface();
+      L = E.Location() * GC->Location();
-        L = E.Location() * GC->Location();
+      GC->Range(First, Last);
-        GC->Range(First,Last);
+      return;
-        return;
-      }
     }
-    itcr.Next();
   }
   
   C.Nullify();

src/BRep/BRep_Tool.hxx

@@ -103,6 +103,16 @@ public:
   //! handle  if this curve does  not exist.  Returns in
   //! <First> and <Last> the parameter range.
   Standard_EXPORT static Handle(Geom2d_Curve) CurveOnSurface (const TopoDS_Edge& E, const Handle(Geom_Surface)& S, const TopLoc_Location& L, Standard_Real& First, Standard_Real& Last);
+
+  //! For the planar surface builds the 2d curve for the edge
+  //! by projection of the edge on plane.
+  //! Returns a NULL handle if the surface is not planar or
+  //! the projection failed.
+  Standard_EXPORT static Handle(Geom2d_Curve) CurveOnPlane (const TopoDS_Edge& E,
+                                                            const Handle(Geom_Surface)& S,
+                                                            const TopLoc_Location& L,
+                                                            Standard_Real& First,
+                                                            Standard_Real& Last);
   
   //! Returns in <C>, <S>, <L> a 2d curve, a surface and
   //! a location for the edge <E>. <C> and <S>  are null

src/ShapeAnalysis/ShapeAnalysis_Edge.cxx

@@ -800,93 +800,112 @@ Standard_Boolean ShapeAnalysis_Edge::CheckSameParameter (const TopoDS_Edge& edge
   if (BRep_Tool::Degenerated (edge)) return Standard_False;
 
   maxdev = 0;
-  
+
+  // Get same parameter flag
   Handle(BRep_TEdge)& TE = *((Handle(BRep_TEdge)*)&edge.TShape());
   Standard_Boolean SameParameter = TE->SameParameter();
 
-  GeomAdaptor_Curve AC3d;
+  // Get 3D curve of the edge
-
+  Standard_Real aFirst, aLast;
-  // find 3d curve
+  TopLoc_Location aCurveLoc;
-  BRep_ListIteratorOfListOfCurveRepresentation itcr(TE->Curves());
+  Handle(Geom_Curve) aC3D = BRep_Tool::Curve(edge, aCurveLoc, aFirst, aLast);
-  for ( ; itcr.More(); itcr.Next() ) {
+  if (aC3D.IsNull()) {
-    Handle(BRep_GCurve) GC = Handle(BRep_GCurve)::DownCast(itcr.Value());
+    myStatus |= ShapeExtend::EncodeStatus(ShapeExtend_FAIL1);
-    if ( GC.IsNull() || ! GC->IsCurve3D() ) continue;
-    Handle(Geom_Curve) C3d = GC->Curve3D();
-    if ( C3d.IsNull() ) continue; //:s1 abv 22 Apr 99: PRO7226 #489490
-    TopLoc_Location loc = GC->Location();
-    if ( ! loc.IsIdentity() )
-      C3d = Handle(Geom_Curve)::DownCast ( C3d->Transformed ( loc ) );
-    else C3d = Handle(Geom_Curve)::DownCast ( C3d->Copy() ); //:s4 abv 26 Apr 99: sim6049.igs 21677: necessary to get True SP (!!?)
-    Standard_Real First, Last;
-    GC->Range ( First, Last );
-    AC3d.Load ( C3d, First, Last );
-    break;
-  }
-
-  if ( ! itcr.More() ) {
-    myStatus |= ShapeExtend::EncodeStatus ( ShapeExtend_FAIL1 );
     return Standard_False;
   }
 
-  Handle(Geom_Surface) aFaceSurf;
+  if (!aCurveLoc.IsIdentity())
-  TopLoc_Location L;
-  if ( !face.IsNull() )
   {
-    aFaceSurf = BRep_Tool::Surface(face, L);
+    const gp_Trsf& aTrsf = aCurveLoc.Transformation();
+    aC3D = Handle(Geom_Curve)::DownCast(aC3D->Transformed(aTrsf));
+    aFirst = aC3D->TransformedParameter(aFirst, aTrsf);
+    aLast = aC3D->TransformedParameter(aLast, aTrsf);
   }
 
-  // iterate on pcurves
+  // Create adaptor for the curve
-  itcr.Initialize ( TE->Curves() );
+  GeomAdaptor_Curve aGAC(aC3D, aFirst, aLast);
-  for ( ; itcr.More(); itcr.Next() )
-  {
-    Handle(BRep_GCurve) GC = Handle(BRep_GCurve)::DownCast(itcr.Value());
-    if ( GC.IsNull() || ! GC->IsCurveOnSurface() ) continue;
 
-    if ( !(face.IsNull()) ) // Face is not null.
+  Handle(Geom_Surface) aFaceSurf;
+  TopLoc_Location aFaceLoc;
+  if (!face.IsNull())
+    aFaceSurf = BRep_Tool::Surface(face, aFaceLoc);
+
+  Standard_Boolean IsPCurveFound = Standard_False;
+  Standard_Integer i = 1;
+
+  // Iterate on all curve representations
+  for (;;)
+  {
+    Handle(Geom2d_Curve) aPC;
+    Handle(Geom_Surface) aS;
+    TopLoc_Location aLoc;
+    Standard_Real f, l;
+
+    BRep_Tool::CurveOnSurface(edge, aPC, aS, aLoc, f, l, i);
+
+    if (aPC.IsNull())
+      // No more curves
+      break;
+
+    ++i;
+
+    // If the input face is not null, check that the curve is on its surface
+    if (!aFaceSurf.IsNull())
     {
-      // Check for different surface.
+      if (aFaceSurf != aS || aFaceLoc != aLoc)
-      if (!GC->IsCurveOnSurface(aFaceSurf, GC->Location()))
+      {
         continue;
+      }
     }
 
-    Standard_Real f, l;
+    IsPCurveFound = Standard_True;
-    GC->Range ( f, l );
+
-    Handle(Geom_Surface) Su = GC->Surface();
+    // Apply transformations for the surface
-    TopLoc_Location loc = GC->Location();
+    Handle(Geom_Surface) aST = Handle(Geom_Surface)::
-    if (!loc.IsIdentity())
+      DownCast(aS->Transformed(aLoc.Transformation()));
-      Su = Handle(Geom_Surface)::DownCast ( Su->Transformed ( loc ) );
+
-    Handle(GeomAdaptor_HSurface) GAHS = new GeomAdaptor_HSurface(Su);
+    // Compute deviation between curves
-    
+    Handle(Geom2dAdaptor_HCurve) GHPC = new Geom2dAdaptor_HCurve(aPC, f, l);
-    Handle(Geom2d_Curve) PC = GC->PCurve();
+    Handle(GeomAdaptor_HSurface) GAHS = new GeomAdaptor_HSurface(aST);
-    Handle(Geom2dAdaptor_HCurve) GHPC = new Geom2dAdaptor_HCurve(PC,f,l);
+
-    //Adaptor3d_CurveOnSurface ACS(GHPC,GAHS);
+    Adaptor3d_CurveOnSurface ACS(GHPC, GAHS);
-    Adaptor3d_CurveOnSurface ACS;
+    if (!ComputeDeviation(aGAC, ACS, SameParameter, maxdev, NbControl - 1))
-    ACS.Load(GHPC, GAHS);
-    if ( ! ComputeDeviation ( AC3d, ACS, SameParameter, maxdev, NbControl-1 ) )
     {
       myStatus |= ShapeExtend::EncodeStatus ( ShapeExtend_FAIL2 );
     }
+  }
 
-    if ( GC->IsCurveOnClosedSurface() )
+  // For the planar face and non-existing  2d curve
+  // check the deviation for the projection of the 3d curve on plane
+  if (!IsPCurveFound && !aFaceSurf.IsNull())
+  {
+    Standard_Real f, l;
+    Handle(Geom2d_Curve) aPC = BRep_Tool::CurveOnPlane(edge, aFaceSurf, aFaceLoc, f, l);
+    if (!aPC.IsNull())
     {
-      GHPC->ChangeCurve2d().Load ( GC->PCurve2(), f, l ); // same bounds
+      Handle(Geom2dAdaptor_HCurve) GHPC = new Geom2dAdaptor_HCurve(aPC, aFirst, aLast);
-      ACS.Load(GHPC, GAHS); // sans doute inutile
+
-      if ( ! ComputeDeviation ( AC3d, ACS, SameParameter, maxdev, NbControl-1 ) )
+      Handle(Geom_Surface) aST =
+        Handle(Geom_Surface)::DownCast(aFaceSurf->Transformed(aFaceLoc.Transformation()));
+      Handle(GeomAdaptor_HSurface) GAHS = new GeomAdaptor_HSurface(aST);
+
+      Adaptor3d_CurveOnSurface ACS(GHPC, GAHS);
+
+      if (!ComputeDeviation(aGAC, ACS, SameParameter, maxdev, NbControl - 1))
       {
-        myStatus |= ShapeExtend::EncodeStatus ( ShapeExtend_FAIL2 );
+        myStatus |= ShapeExtend::EncodeStatus(ShapeExtend_FAIL2);
       }
     }
   }
-  
+
-  if ( maxdev > TE->Tolerance() ) 
+  if (maxdev > TE->Tolerance())
-    myStatus |= ShapeExtend::EncodeStatus ( ShapeExtend_DONE1 );
+    myStatus |= ShapeExtend::EncodeStatus(ShapeExtend_DONE1);
-  if ( ! SameParameter ) 
+  if (!SameParameter)
-    myStatus |= ShapeExtend::EncodeStatus ( ShapeExtend_DONE2 );
+    myStatus |= ShapeExtend::EncodeStatus(ShapeExtend_DONE2);
 
   return Status ( ShapeExtend_DONE );
 }
 
-
 //=======================================================================
 //function : IsOverlapPartEdges
 //purpose  : 

tests/bugs/modalg_7/bug27004

@@ -1,5 +1,3 @@
-puts "TODO OCC27004 ALL: Faulty shapes in variables faulty_1 to"
-
 puts "========"
 puts "OCC27004"
 puts "========"
@@ -26,4 +24,7 @@ unifysamedom result r
 
 checkshape result
 
+checknbshapes result -vertex 12 -edge 18 -wire 8 -face 8 -solid 1
+checkprops result -s 223704 -v 3.27888e+006
+
 checkview -display result -2d -path ${imagedir}/${test_image}.png

tests/bugs/modalg_7/bug28995

@@ -0,0 +1,35 @@
+puts "======="
+puts "0028995"
+puts "======="
+puts ""
+##################################################
+# UnifySameDomain produces invalid shape
+##################################################
+
+brestore [locate_data_file bug28995_s1.brep] s1
+brestore [locate_data_file bug28995_s2.brep] s2
+
+# perform fuse operation
+bfuse rfuse s1 s2
+
+# check the result of fuse
+checkshape rfuse 
+
+if {![regexp "This shape seems to be OK" [bopcheck rfuse]]} {
+  puts "Error: The result of FUSE operation is a self-intersecting shape."
+}
+
+# unify faces and edges in the fused shape
+unifysamedom result rfuse
+
+# check unified result
+checkshape result
+
+if {![regexp "This shape seems to be OK" [bopcheck result]]} {
+  puts "Error: The result of UnifySameDomain algorithm is a self-intersecting shape."
+}
+
+checknbshapes result -vertex 200 -edge 300 -wire 104 -face 103 -solid 1
+checkprops result -s 1.59154e+006 -v 1.1497e+007
+
+checkview -display result -2d -path ${imagedir}/${test_image}.png

tests/de/step_3/C5

@@ -1,5 +1,3 @@
-# !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: CHECKSHAPE : Faulty" 
 puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
 
 

tests/heal/unify_same_domain/B4

@@ -1,5 +1,3 @@
-puts "TODO OCC28995 ALL: Faulty shapes"
-
 puts "======="
 puts "0028913"
 puts "======="

tests/heal/unify_same_domain/B5

@@ -1,5 +1,3 @@
-puts "TODO OCC28995 ALL: Faulty shapes"
-
 puts "======="
 puts "0028913"
 puts "======="