X-Git-Url: http://git.dev.opencascade.org/gitweb/?p=occt.git;a=blobdiff_plain;f=src%2FBRepFill%2FBRepFill_TrimSurfaceTool.cxx;h=583e6c7d76c2424067481c751faf38761ff2d756;hp=dd62446d6b807d983524d177aaf076bdf74daac0;hb=42cf5bc1cacbc83b1bf8639227311ad726522ace;hpb=7a06c690fbf05b0def03a8c3632e9bb39e657a11

diff --git a/src/BRepFill/BRepFill_TrimSurfaceTool.cxx b/src/BRepFill/BRepFill_TrimSurfaceTool.cxx
old mode 100755
new mode 100644
index dd62446..583e6c7
--- a/src/BRepFill/BRepFill_TrimSurfaceTool.cxx
+++ b/src/BRepFill/BRepFill_TrimSurfaceTool.cxx
@@ -1,76 +1,74 @@
 // Created on: 1994-10-21
 // Created by: Bruno DUMORTIER
 // Copyright (c) 1994-1999 Matra Datavision
-// Copyright (c) 1999-2012 OPEN CASCADE SAS
+// Copyright (c) 1999-2014 OPEN CASCADE SAS
 //
-// The content of this file is subject to the Open CASCADE Technology Public
-// License Version 6.5 (the "License"). You may not use the content of this file
-// except in compliance with the License. Please obtain a copy of the License
-// at http://www.opencascade.org and read it completely before using this file.
+// This file is part of Open CASCADE Technology software library.
 //
-// The Initial Developer of the Original Code is Open CASCADE S.A.S., having its
-// main offices at: 1, place des Freres Montgolfier, 78280 Guyancourt, France.
+// This library is free software; you can redistribute it and/or modify it under
+// the terms of the GNU Lesser General Public License version 2.1 as published
+// by the Free Software Foundation, with special exception defined in the file
+// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
+// distribution for complete text of the license and disclaimer of any warranty.
 //
-// The Original Code and all software distributed under the License is
-// distributed on an "AS IS" basis, without warranty of any kind, and the
-// Initial Developer hereby disclaims all such warranties, including without
-// limitation, any warranties of merchantability, fitness for a particular
-// purpose or non-infringement. Please see the License for the specific terms
-// and conditions governing the rights and limitations under the License.
+// Alternatively, this file may be used under the terms of Open CASCADE
+// commercial license or contractual agreement.
 
 
-
-#include <stdio.h>
-
-#include <BRepFill_TrimSurfaceTool.ixx>
-
-#include <Precision.hxx>
-
 #include <Adaptor3d_SurfaceOfRevolution.hxx>
 #include <AppParCurves_MultiCurve.hxx>
+#include <BRep_Tool.hxx>
+#include <BRepFill_ApproxSeewing.hxx>
 #include <BRepFill_ComputeCLine.hxx>
 #include <BRepFill_MultiLine.hxx>
+#include <BRepFill_TrimSurfaceTool.hxx>
 #include <BRepIntCurveSurface_Inter.hxx>
-#include <BRepFill_ApproxSeewing.hxx>
-#include <BRep_Tool.hxx>
-#include <ElCLib.hxx>
 #include <BSplCLib.hxx>
-#include <PLib.hxx>
-#include <gp.hxx>
-#include <gp_Sphere.hxx>
-#include <gp_Cone.hxx>
-#include <gp_Torus.hxx>
-#include <gp_Cylinder.hxx>
-#include <Geom2dInt_GInter.hxx>
-#include <Geom2dAPI_ProjectPointOnCurve.hxx>
-#include <Geom2dAdaptor_Curve.hxx>
+#include <ElCLib.hxx>
 #include <Geom2d_BSplineCurve.hxx>
+#include <Geom2d_Curve.hxx>
 #include <Geom2d_TrimmedCurve.hxx>
-#include <GeomAdaptor_Surface.hxx>
-#include <GeomAdaptor_HCurve.hxx>
+#include <Geom2dAdaptor_Curve.hxx>
+#include <Geom2dAPI_ProjectPointOnCurve.hxx>
+#include <Geom2dInt_GInter.hxx>
+#include <Geom_BSplineCurve.hxx>
+#include <Geom_Curve.hxx>
 #include <Geom_Plane.hxx>
 #include <Geom_SurfaceOfRevolution.hxx>
-#include <Geom_BSplineCurve.hxx>
 #include <Geom_TrimmedCurve.hxx>
+#include <GeomAdaptor_HCurve.hxx>
+#include <GeomAdaptor_Surface.hxx>
 #include <GeomProjLib.hxx>
+#include <gp.hxx>
+#include <gp_Cone.hxx>
+#include <gp_Cylinder.hxx>
+#include <gp_Pnt2d.hxx>
+#include <gp_Sphere.hxx>
+#include <gp_Torus.hxx>
 #include <IntRes2d_IntersectionPoint.hxx>
 #include <IntRes2d_IntersectionSegment.hxx>
+#include <PLib.hxx>
 #include <Precision.hxx>
-#include <StdFail_NotDone.hxx>
+#include <Standard_NoSuchObject.hxx>
 #include <Standard_NotImplemented.hxx>
+#include <StdFail_NotDone.hxx>
 #include <TColgp_Array1OfPnt.hxx>
-#include <TColStd_Array1OfReal.hxx>
 #include <TColStd_Array1OfInteger.hxx>
+#include <TColStd_Array1OfReal.hxx>
 #include <TopAbs_State.hxx>
 #include <TopExp.hxx>
+#include <TopExp_Explorer.hxx>
 #include <TopoDS.hxx>
+#include <TopoDS_Edge.hxx>
+#include <TopoDS_Face.hxx>
 #include <TopoDS_Vertex.hxx>
 
+#include <stdio.h>
 #ifdef DRAW
 #include <DrawTrSurf.hxx>
 #include <DBRep.hxx>
 #endif
-#ifdef DEB
+#ifdef OCCT_DEBUG
 static Standard_Boolean Affich       = Standard_False;
 static Standard_Integer NBCALL  = 1;
 #endif
@@ -101,7 +99,7 @@ myInv1(Inv1),
 myInv2(Inv2),
 myBis  (Bis)
 {
-#ifdef DEB
+#ifdef OCCT_DEBUG
   if ( Affich) {
     cout << " ---------->TrimSurfaceTool : NBCALL = " << NBCALL << endl;
     
@@ -278,7 +276,7 @@ static void EvalParameters(const TopoDS_Edge&          Edge,
     NbSegments = Intersector.NbSegments();
     
     if (NbSegments > 0) {
-#ifdef DEB
+#ifdef OCCT_DEBUG
       cout << " IntersectWith : " << NbSegments  
 	   << " Segments of intersection" << endl;
 #endif
@@ -440,7 +438,7 @@ Standard_Boolean BRepFill_TrimSurfaceTool::IsOnFace
 
   // eval if is on face 1
 //  modified by NIZHNY-EAP Fri Jan 21 09:49:09 2000 ___BEGIN___
-  Inter.Init(myFace1, Line, 1e-6);//Precision::PConfusion());
+  Inter.Init(myFace1, Line,1e-6);//Precision::PConfusion());
   if (Inter.More()) return Standard_True;
   
   // eval if is on face 2
@@ -473,11 +471,8 @@ Standard_Real BRepFill_TrimSurfaceTool::ProjOn(const gp_Pnt2d& Point,
 
   // evaluate the projection of the point on the curve.
   Geom2dAPI_ProjectPointOnCurve Projector(Point, C2d);
-#ifdef DEB  
-  Standard_Real Dist = 
-#endif
-    Projector.LowerDistance();
-#ifdef DEB
+#ifdef OCCT_DEBUG
+  Standard_Real Dist = Projector.LowerDistance();
   if ( Dist > Precision::Confusion() ) {
     cout << " *** WARNING  TrimSurfaceTool:  *** " << endl;
     cout << "      --> the point is not on the edge" <<endl;
@@ -503,9 +498,6 @@ void BRepFill_TrimSurfaceTool::Project
        Handle(Geom2d_Curve)& PCurve2,
        GeomAbs_Shape&        Cont) const 
 {
-  Standard_Integer Deg1, Deg2;
-  Deg1 = Deg2 = 8;
-
   Handle(Geom2d_TrimmedCurve) CT = 
     new Geom2d_TrimmedCurve(myBis,U1,U2);
   BRepFill_MultiLine ML(myFace1,myFace2,