X-Git-Url: http://git.dev.opencascade.org/gitweb/?p=occt.git;a=blobdiff_plain;f=src%2FBRepOffset%2FBRepOffset_Offset.cxx;h=17e07088d792b4a387e69909cfa7625c538012a0;hp=cbfce6be6c28747d911763540f2dfc0d1e269986;hb=d804b26d7746d1dbdc6ea57981db8162c0a5347f;hpb=ba4181452c1b6bb57b7491a65a49acc3b063fc92

diff --git a/src/BRepOffset/BRepOffset_Offset.cxx b/src/BRepOffset/BRepOffset_Offset.cxx
index cbfce6b..17e0708 100644
--- a/src/BRepOffset/BRepOffset_Offset.cxx
+++ b/src/BRepOffset/BRepOffset_Offset.cxx
@@ -73,6 +73,13 @@
 #include <GeomAPI_ProjectPointOnCurve.hxx>
 #include <GeomLib.hxx>
 
+#include <TopTools_IndexedMapOfShape.hxx>
+#include <BRepLib_MakeWire.hxx>
+#include <gce_MakePln.hxx>
+#include <ShapeFix_Shape.hxx>
+#include <GProp_GProps.hxx>
+#include <BRepGProp.hxx>
+
 #ifdef DEB
 static Standard_Boolean Affich = Standard_False;
 static Standard_Integer NbOFFSET = 0;
@@ -83,6 +90,32 @@ static Standard_Integer NbOFFSET = 0;
 #endif
 #include <stdio.h>
 
+
+static gp_Pnt GetFarestCorner(const TopoDS_Wire& aWire)
+{
+  TopTools_IndexedMapOfShape Vertices;
+  TopExp::MapShapes(aWire, TopAbs_VERTEX, Vertices);
+
+  Standard_Real MaxDist = 0.;
+  gp_Pnt thePoint;
+  for (Standard_Integer i = 1; i <= Vertices.Extent(); i++)
+    for (Standard_Integer j = 1; j <= Vertices.Extent(); j++)
+    {
+      const TopoDS_Vertex& V1 = TopoDS::Vertex(Vertices(i));
+      const TopoDS_Vertex& V2 = TopoDS::Vertex(Vertices(j));
+      gp_Pnt P1 = BRep_Tool::Pnt(V1);
+      gp_Pnt P2 = BRep_Tool::Pnt(V2);
+      Standard_Real aDist = P1.SquareDistance(P2);
+      if (aDist > MaxDist)
+      {
+        MaxDist = aDist;
+        thePoint = P1;
+      }
+    }
+
+  return thePoint;
+}
+
 //=======================================================================
 //function : UpdateEdge
 //purpose  : 
@@ -1316,29 +1349,29 @@ void BRepOffset_Offset::Init(const TopoDS_Vertex&        Vertex,
   }
 #endif
 
+  gp_Pnt Origin = BRep_Tool::Pnt(Vertex);
 
-  it.Initialize(LEdge);
-  TopExp::Vertices(TopoDS::Edge(it.Value()), V1, V2);
-  P1 = BRep_Tool::Pnt(V1);
-  P2 = BRep_Tool::Pnt(V2);
+  //// Find the axis of the sphere to exclude
+  //// degenerated and seam edges from the face under construction
+  BRepLib_MakeWire MW;
+  MW.Add(LEdge);
+  TopoDS_Wire theWire = MW.Wire();
 
-  if ( !it.More()) {
-    Standard_ConstructionError::Raise("BRepOffset_Sphere");
-  }
-  it.Next();
-  TopExp::Vertices(TopoDS::Edge(it.Value()), V3, V4);
+  ShapeFix_Shape Fixer(theWire);
+  Fixer.Perform();
+  theWire = TopoDS::Wire(Fixer.Shape());
 
-  P3 = BRep_Tool::Pnt(V3);
-  Standard_Real eps = 1.e-8;
-  if ( P1.Distance(P3) < eps || P2.Distance(P3) < eps)
-    P3 = BRep_Tool::Pnt(V4);
-  
-  P = BRep_Tool::Pnt(Vertex);
-  
-  gp_Vec X = gp_Vec(P1,P2) ^ gp_Vec(P1,P3);
-  if ( X * gp_Vec(P1,P) < 0.) X.Reverse();
+  GProp_GProps GlobalProps;
+  BRepGProp::LinearProperties(theWire, GlobalProps);
+  gp_Pnt BaryCenter = GlobalProps.CentreOfMass();
+  gp_Vec Xdir(BaryCenter, Origin);
+
+  gp_Pnt FarestCorner = GetFarestCorner(theWire);
+  gp_Pln thePlane = gce_MakePln(Origin, BaryCenter, FarestCorner);
+  gp_Dir Vdir = thePlane.Axis().Direction();
 
-  gp_Ax3 Axis( P, gp_Dir(gp_Vec(P1,P2)), gp_Dir(X));
+  gp_Ax3 Axis(Origin, Vdir, Xdir);
+  
   Handle(Geom_Surface) S 
     = new Geom_SphericalSurface( Axis, Abs(Offset));