From: SZV <> Date: Wed, 12 Oct 2011 06:22:36 +0000 (+0000) Subject: 0022623: Use of uninitialized variables in HLRBRep_Curve::UpdateMinMax in debug mode X-Git-Tag: V6_5_3_beta1~190 X-Git-Url: http://git.dev.opencascade.org/gitweb/?p=occt.git;a=commitdiff_plain;h=733a0e55f0d77fa76975551c7aa1f6b8fcedd366 0022623: Use of uninitialized variables in HLRBRep_Curve::UpdateMinMax in debug mode --- diff --git a/src/Contap/Contap.cdl b/src/Contap/Contap.cdl index 73d48cf333..8b10f9a652 100755 --- a/src/Contap/Contap.cdl +++ b/src/Contap/Contap.cdl @@ -1,8 +1,7 @@ --- File: Contap.cdl --- Created: Fri Feb 5 11:50:39 1993 --- Author: Jacques GOUSSARD --- ----Copyright: Matra Datavision 1993 +-- File: Contap.cdl +-- Created: Fri Feb 5 11:50:39 1993 +-- Author: Jacques GOUSSARD +---Copyright: Matra Datavision 1993 package Contap @@ -82,4 +81,3 @@ is end Contap; - diff --git a/src/Contap/Contap_ArcFunction.cdl b/src/Contap/Contap_ArcFunction.cdl index 51d56535bf..9b8b7ee17d 100755 --- a/src/Contap/Contap_ArcFunction.cdl +++ b/src/Contap/Contap_ArcFunction.cdl @@ -1,10 +1,7 @@ --- File: Contap_ArcFunction.cdl --- Created: Thu Jun 3 12:32:05 1993 --- Author: Jacques GOUSSARD --- ----Copyright: Matra Datavision 1993 - - +-- File: Contap_ArcFunction.cdl +-- Created: Thu Jun 3 12:32:05 1993 +-- Author: Jacques GOUSSARD +---Copyright: Matra Datavision 1993 generic class ArcFunction from Contap (TheArc as any; diff --git a/src/Contap/Contap_ArcFunction.gxx b/src/Contap/Contap_ArcFunction.gxx index c3e275045a..8fcff849f8 100755 --- a/src/Contap/Contap_ArcFunction.gxx +++ b/src/Contap/Contap_ArcFunction.gxx @@ -1,8 +1,11 @@ +// File: Contap_ArcFunction.gxx +// Created: Thu Jun 3 12:32:05 1993 +// Author: Jacques GOUSSARD +// Copyright: OPEN CASCADE 2000 + #include #include - - Contap_ArcFunction::Contap_ArcFunction (): myMean(1.), myType(Contap_ContourStd), @@ -72,11 +75,7 @@ Standard_Boolean Contap_ArcFunction::Derivative (const Standard_Real U, { gp_Pnt2d pt2d; gp_Vec2d d2d; -#ifndef DEB Standard_Real dfu =0.,dfv =0.; -#else - Standard_Real dfu,dfv; -#endif // gp_Vec d1u,d1v,d2u,d2v,d2uv; TheArcTool::D1(myArc,U,pt2d,d2d); // TheSurfaceTool::D2(mySurf,pt2d.X(),pt2d.Y(),solpt,d1u,d1v,d2u,d2v,d2uv); @@ -130,11 +129,7 @@ Standard_Boolean Contap_ArcFunction::Values (const Standard_Real U, { gp_Pnt2d pt2d; gp_Vec2d d2d; -#ifndef DEB Standard_Real dfu =0.,dfv =0.; -#else - Standard_Real dfu,dfv; -#endif // gp_Vec d1u,d1v,d2u,d2v,d2uv; TheArcTool::D1(myArc,U,pt2d,d2d); // TheSurfaceTool::D2(mySurf,pt2d.X(),pt2d.Y(),solpt,d1u,d1v,d2u,d2v,d2uv); diff --git a/src/Contap/Contap_ArcFunction.lxx b/src/Contap/Contap_ArcFunction.lxx index 6ff876936a..ab3e86ae6b 100755 --- a/src/Contap/Contap_ArcFunction.lxx +++ b/src/Contap/Contap_ArcFunction.lxx @@ -1,3 +1,8 @@ +// File: Contap_ArcFunction.lxx +// Created: Thu Jun 3 12:32:05 1993 +// Author: Jacques GOUSSARD +// Copyright: OPEN CASCADE 2000 + inline void Contap_ArcFunction::Set(const gp_Dir& Direction, const Standard_Real Angle) { @@ -37,4 +42,3 @@ inline const gp_Pnt& Contap_ArcFunction::Valpoint { return seqpt(Index); } - diff --git a/src/Contap/Contap_ArcTool.cdl b/src/Contap/Contap_ArcTool.cdl index c60694e60a..4d7744f39c 100755 --- a/src/Contap/Contap_ArcTool.cdl +++ b/src/Contap/Contap_ArcTool.cdl @@ -1,9 +1,7 @@ --- File: Contap_ArcTool.cdl --- Created: Wed May 12 09:09:34 1993 --- Author: Jacques GOUSSARD --- ----Copyright: Matra Datavision 1993 - +-- File: Contap_ArcTool.cdl +-- Created: Wed May 12 09:09:34 1993 +-- Author: Jacques GOUSSARD +---Copyright: Matra Datavision 1993 deferred generic class ArcTool from Contap @@ -48,5 +46,3 @@ is end ArcTool; - - diff --git a/src/Contap/Contap_ContAna.cdl b/src/Contap/Contap_ContAna.cdl index 957f6d3508..626597e04f 100755 --- a/src/Contap/Contap_ContAna.cdl +++ b/src/Contap/Contap_ContAna.cdl @@ -1,10 +1,7 @@ --- File: Contap_ContAna.cdl --- Created: Thu Mar 4 10:51:23 1993 --- Author: Jacques GOUSSARD --- ----Copyright: Matra Datavision 1993 - - +-- File: Contap_ContAna.cdl +-- Created: Thu Mar 4 10:51:23 1993 +-- Author: Jacques GOUSSARD +---Copyright: Matra Datavision 1993 class ContAna from Contap diff --git a/src/Contap/Contap_ContAna.cxx b/src/Contap/Contap_ContAna.cxx index 115af176bb..2aa7aca327 100755 --- a/src/Contap/Contap_ContAna.cxx +++ b/src/Contap/Contap_ContAna.cxx @@ -1,17 +1,19 @@ +// File: Contap_ContAna.cxx +// Created: Thu Mar 4 10:51:23 1993 +// Author: Jacques GOUSSARD +// Copyright: OPEN CASCADE 2000 + #include #include #include - - #define Tolpetit 1.e-8 - Contap_ContAna::Contap_ContAna (): done(Standard_False) {} void Contap_ContAna::Perform (const gp_Sphere& S, - const gp_Dir& D) + const gp_Dir& D) { done = Standard_False; typL = GeomAbs_Circle; @@ -29,8 +31,8 @@ void Contap_ContAna::Perform (const gp_Sphere& S, } void Contap_ContAna::Perform (const gp_Sphere& S, - const gp_Dir& D, - const Standard_Real Angle) + const gp_Dir& D, + const Standard_Real Angle) { done = Standard_False; typL = GeomAbs_Circle; @@ -50,7 +52,7 @@ void Contap_ContAna::Perform (const gp_Sphere& S, } void Contap_ContAna::Perform (const gp_Sphere& S, - const gp_Pnt& Eye) + const gp_Pnt& Eye) { done = Standard_False; @@ -81,10 +83,8 @@ void Contap_ContAna::Perform (const gp_Sphere& S, done = Standard_True; } - void Contap_ContAna::Perform (const gp_Cylinder& C, - const gp_Dir& D) - + const gp_Dir& D) { done = Standard_False; @@ -107,9 +107,8 @@ void Contap_ContAna::Perform (const gp_Cylinder& C, } void Contap_ContAna::Perform (const gp_Cylinder& C, - const gp_Dir& D, - const Standard_Real Angle) - + const gp_Dir& D, + const Standard_Real Angle) { done = Standard_False; @@ -167,8 +166,7 @@ void Contap_ContAna::Perform (const gp_Cylinder& C, } void Contap_ContAna::Perform (const gp_Cylinder& C, - const gp_Pnt& Eye) - + const gp_Pnt& Eye) { done = Standard_False; @@ -195,10 +193,8 @@ void Contap_ContAna::Perform (const gp_Cylinder& C, done = Standard_True; } - void Contap_ContAna::Perform (const gp_Cone& C, - const gp_Dir& D) - + const gp_Dir& D) { done = Standard_False; @@ -257,11 +253,9 @@ void Contap_ContAna::Perform (const gp_Cone& C, done = Standard_True; } - void Contap_ContAna::Perform (const gp_Cone& C, - const gp_Dir& D, - const Standard_Real Angle) - + const gp_Dir& D, + const Standard_Real Angle) { done = Standard_False; nbSol = 0; @@ -358,13 +352,10 @@ void Contap_ContAna::Perform (const gp_Cone& C, } done = Standard_True; - - } void Contap_ContAna::Perform (const gp_Cone& C, - const gp_Pnt& Eye) - + const gp_Pnt& Eye) { done = Standard_False; @@ -424,10 +415,8 @@ void Contap_ContAna::Perform (const gp_Cone& C, nbSol = 0; } done = Standard_True; - } - gp_Lin Contap_ContAna::Line (const Standard_Integer Index) const { if (!done) {StdFail_NotDone::Raise();} @@ -443,7 +432,6 @@ gp_Lin Contap_ContAna::Line (const Standard_Integer Index) const case 4: return gp_Lin(pt4,dir4); } - Standard_OutOfRange::Raise("Erreur de programmation dans Contap_ContAna"); + Standard_OutOfRange::Raise("Program error in Contap_ContAna"); return gp_Lin(); } - diff --git a/src/Contap/Contap_ContAna.lxx b/src/Contap/Contap_ContAna.lxx index 0c1e8160b7..775ed5f3d9 100755 --- a/src/Contap/Contap_ContAna.lxx +++ b/src/Contap/Contap_ContAna.lxx @@ -1,3 +1,8 @@ +// File: Contap_ContAna.lxx +// Created: Thu Mar 4 10:51:23 1993 +// Author: Jacques GOUSSARD +// Copyright: OPEN CASCADE 2000 + #include #include #include @@ -29,4 +34,3 @@ inline gp_Circ Contap_ContAna::Circle () const if (typL != GeomAbs_Circle || nbSol == 0) {Standard_DomainError::Raise();} return gp_Circ(gp_Ax2(pt1,dir1,dir2),prm); } - diff --git a/src/Contap/Contap_ContourGen.cdl b/src/Contap/Contap_ContourGen.cdl index 3035174667..120566cb3d 100755 --- a/src/Contap/Contap_ContourGen.cdl +++ b/src/Contap/Contap_ContourGen.cdl @@ -1,9 +1,7 @@ --- File: Contap_ContourGen.cdl --- Created: Fri Feb 5 09:39:18 1993 --- Author: Jacques GOUSSARD --- ----Copyright: Matra Datavision 1993 - +-- File: Contap_ContourGen.cdl +-- Created: Fri Feb 5 09:39:18 1993 +-- Author: Jacques GOUSSARD +---Copyright: Matra Datavision 1993 generic class ContourGen from Contap (TheVertex as any; diff --git a/src/Contap/Contap_ContourGen.gxx b/src/Contap/Contap_ContourGen.gxx index 3eca407566..f7e1c93f6e 100755 --- a/src/Contap/Contap_ContourGen.gxx +++ b/src/Contap/Contap_ContourGen.gxx @@ -1,3 +1,8 @@ +// File: Contap_ContourGen.gxx +// Created: Fri Feb 5 09:39:18 1993 +// Author: Jacques GOUSSARD +// Copyright: OPEN CASCADE 2000 + #include #include diff --git a/src/Contap/Contap_ContourGen.lxx b/src/Contap/Contap_ContourGen.lxx index de20378ba5..2ffa0bb91d 100755 --- a/src/Contap/Contap_ContourGen.lxx +++ b/src/Contap/Contap_ContourGen.lxx @@ -1,3 +1,8 @@ +// File: Contap_ContourGen.lxx +// Created: Fri Feb 5 09:39:18 1993 +// Author: Jacques GOUSSARD +// Copyright: OPEN CASCADE 2000 + #include inline Standard_Boolean Contap_ContourGen::IsDone () const diff --git a/src/Contap/Contap_ContourGen_1.gxx b/src/Contap/Contap_ContourGen_1.gxx index 291c8c9064..4515e30d21 100755 --- a/src/Contap/Contap_ContourGen_1.gxx +++ b/src/Contap/Contap_ContourGen_1.gxx @@ -1,3 +1,8 @@ +// File: Contap_ContourGen_1.gxx +// Created: Fri Feb 5 09:39:18 1993 +// Author: Jacques GOUSSARD +// Copyright: OPEN CASCADE 2000 + #include diff --git a/src/Contap/Contap_ContourGen_2.gxx b/src/Contap/Contap_ContourGen_2.gxx index 5493330d56..97330488c7 100755 --- a/src/Contap/Contap_ContourGen_2.gxx +++ b/src/Contap/Contap_ContourGen_2.gxx @@ -1,7 +1,7 @@ -//---------------------------------------------- -//-- C o n t a p _ C o n t o u r _ 2 . g x x -- -//---------------------------------------------- - +// File: Contap_ContourGen_2.gxx +// Created: Fri Feb 5 09:39:18 1993 +// Author: Jacques GOUSSARD +// Copyright: OPEN CASCADE 2000 #include #include @@ -128,13 +128,8 @@ static void LineConstructor(Contap_TheSequenceOfLine& slin, Standard_Integer nbvtx = L.NbVertex(); //-- cout<<" WLine -> "< @@ -151,10 +154,8 @@ IntSurf_TypeTrans ComputeTransitionOngpLine ElSLib::Parameters(TheSurfaceTool::Sphere(Surf),P,u,v); break; } -#ifndef DEB default: break; -#endif } return(ComputeTransitionOnLine(SFunc,u,v,T)); } @@ -183,13 +184,10 @@ IntSurf_TypeTrans ComputeTransitionOngpCircle ElSLib::Parameters(TheSurfaceTool::Sphere(Surf),P,u,v); break; } -#ifndef DEB default: break; -#endif } return(ComputeTransitionOnLine(SFunc,u,v,T)); - } @@ -334,10 +332,8 @@ void Contap_ContourGen::PerformAna(const Handle(TheTopolTool)& Domain) { } } -#ifndef DEB default: break; -#endif } break; } diff --git a/src/Contap/Contap_HContToolGen.gxx b/src/Contap/Contap_HContToolGen.gxx index 2ee967d7f1..fffab5efc4 100755 --- a/src/Contap/Contap_HContToolGen.gxx +++ b/src/Contap/Contap_HContToolGen.gxx @@ -1,10 +1,7 @@ -//-- File: Contap_HContToolGen.cdl -//-- Created: Fri Jul 2 13:19:22 1995 -//-- Author: Laurent BUCHARD -//-- -//---Copyright: Matra Datavision 1995 - - +// File: Contap_HContToolGen.gxx +// Created: Fri Jul 2 13:19:22 1995 +// Author: Laurent BUCHARD +// Copyright: OPEN CASCADE 2000 #include #include @@ -248,11 +245,7 @@ Standard_Integer Contap_HContToolGen::NbSamplesOnArc default: nbsOnC = 10; } -//#ifndef DEB return (Standard_Integer)(nbsOnC); -//#else -// return(nbsOnC); -//#endif } diff --git a/src/Contap/Contap_HCurve2dToolGen.cdl b/src/Contap/Contap_HCurve2dToolGen.cdl index 439d2dbeec..df7721833e 100755 --- a/src/Contap/Contap_HCurve2dToolGen.cdl +++ b/src/Contap/Contap_HCurve2dToolGen.cdl @@ -1,8 +1,7 @@ --- File: Contap_HCurve2dToolGen.cdl --- Created: Mon Jul 17 16:25:23 1995 --- Author: Laurent BUCHARD --- ----Copyright: Matra Datavision 1995 +-- File: Contap_HCurve2dToolGen.cdl +-- Created: Mon Jul 17 16:25:23 1995 +-- Author: Laurent BUCHARD +---Copyright: Matra Datavision 1995 generic class HCurve2dToolGen from Contap ( @@ -223,5 +222,3 @@ is returns Integer from Standard; end HCurve2dToolGen; - - diff --git a/src/Contap/Contap_HCurve2dToolGen.gxx b/src/Contap/Contap_HCurve2dToolGen.gxx index cc490c3c9b..5953a507a3 100755 --- a/src/Contap/Contap_HCurve2dToolGen.gxx +++ b/src/Contap/Contap_HCurve2dToolGen.gxx @@ -1,7 +1,7 @@ -// File: Contap_HCurve2dToolGen.gxx -// Created: Mon Jul 17 17:39:39 1995 -// Author: Modelistation -// +// File: Contap_HCurve2dToolGen.gxx +// Created: Mon Jul 17 17:39:39 1995 +// Author: Modelistation +// Copyright: OPEN CASCADE 2000 #include CurveGen_hxx #include @@ -11,27 +11,29 @@ #include - //============================================================ Standard_Integer Contap_HCurve2dToolGen::NbSamples (const CurveGen& C, - const Standard_Real U0, - const Standard_Real U1) { - GeomAbs_CurveType typC = C->GetType(); - static Standard_Real nbsOther = 10.0; - Standard_Real nbs = nbsOther; - - if(typC == GeomAbs_Line) - nbs = 2; - else if(typC == GeomAbs_BezierCurve) - nbs = 3 + C->NbPoles(); - else if(typC == GeomAbs_BSplineCurve) { - nbs = C->NbKnots(); - nbs*= C->Degree(); - nbs*= C->LastParameter()- C->FirstParameter(); - nbs/= U1-U0; - if(nbs < 2.0) nbs=2; + const Standard_Real U0, + const Standard_Real U1) +{ + Standard_Real nbs = 10.0; + switch (C->GetType()) + { + case GeomAbs_Line: + nbs = 2.; + break; + case GeomAbs_BezierCurve: + nbs = 3. + C->NbPoles(); + break; + case GeomAbs_BSplineCurve: + nbs = C->NbKnots(); + nbs*= C->Degree(); + nbs*= C->LastParameter()- C->FirstParameter(); + nbs/= U1-U0; + if(nbs < 2.0) nbs = 2.; + break; } - if(nbs>50) - nbs = 50; + if (nbs>50.) + nbs = 50.; return((Standard_Integer)nbs); } diff --git a/src/Contap/Contap_HCurve2dToolGen.lxx b/src/Contap/Contap_HCurve2dToolGen.lxx index 547c451fbb..c34d512b6d 100755 --- a/src/Contap/Contap_HCurve2dToolGen.lxx +++ b/src/Contap/Contap_HCurve2dToolGen.lxx @@ -1,8 +1,7 @@ -// File: Contap_HCurve2dToolGen.lxx -// Created: Thu Oct 22 12:14:59 1992 -// Author: Laurent BUCHARD -// - +// File: Contap_HCurve2dToolGen.lxx +// Created: Thu Oct 22 12:14:59 1992 +// Author: Laurent BUCHARD +// Copyright: OPEN CASCADE 2000 #include CurveGen_hxx @@ -138,17 +137,3 @@ inline Handle(Geom2d_BSplineCurve) Contap_HCurve2dToolGen::BSpline (const CurveG return(C->BSpline()); } //============================================================ - - - - - - - - - - - - - - diff --git a/src/Contap/Contap_Line.cdl b/src/Contap/Contap_Line.cdl index f5539e9fa5..3812a7c9fe 100755 --- a/src/Contap/Contap_Line.cdl +++ b/src/Contap/Contap_Line.cdl @@ -1,9 +1,7 @@ --- File: Contap_Line.cdl --- Created: Fri Feb 5 12:13:00 1993 --- Author: Jacques GOUSSARD --- ----Copyright: Matra Datavision 1993 - +-- File: Contap_Line.cdl +-- Created: Fri Feb 5 12:13:00 1993 +-- Author: Jacques GOUSSARD +---Copyright: Matra Datavision 1993 generic class Line from Contap (TheVertex as any; diff --git a/src/Contap/Contap_Line.gxx b/src/Contap/Contap_Line.gxx index bc581723a2..a2657e32cf 100755 --- a/src/Contap/Contap_Line.gxx +++ b/src/Contap/Contap_Line.gxx @@ -1,6 +1,7 @@ -//-------------------------------------------------- -//-- C o n t a p _ L i n e . g x x -- -//-------------------------------------------------- +// File: Contap_Line.gxx +// Created: Fri Feb 5 12:13:00 1993 +// Author: Jacques GOUSSARD +// Copyright: OPEN CASCADE 2000 Contap_Line::Contap_Line () { svtx = new TheHSequenceOfPoint (); @@ -11,8 +12,6 @@ void Contap_Line::ResetSeqOfVertex() { svtx = new TheHSequenceOfPoint (); } - - void Contap_Line::Add(const ThePoint& P) { Standard_Integer n = svtx->Length(); if(n==0) { @@ -35,9 +34,6 @@ void Contap_Line::Add(const ThePoint& P) { } } - - - void Contap_Line::Clear () { if(!curv.IsNull()) curv->Clear(); @@ -80,10 +76,8 @@ IntSurf_TypeTrans Contap_Line::TransitionOnS() const { return(Trans); } - const TheArc& Contap_Line::Arc () const { if (typL != Contap_Restriction) {Standard_DomainError::Raise();} return thearc; } - diff --git a/src/Contap/Contap_Line.lxx b/src/Contap/Contap_Line.lxx index aeed591b01..f812b101e3 100755 --- a/src/Contap/Contap_Line.lxx +++ b/src/Contap/Contap_Line.lxx @@ -1,3 +1,8 @@ +// File: Contap_Line.lxx +// Created: Fri Feb 5 12:13:00 1993 +// Author: Jacques GOUSSARD +// Copyright: OPEN CASCADE 2000 + #include #include #include @@ -5,7 +10,6 @@ #include #include - #include TheHSequenceOfPoint_hxx inline const Handle(IntSurf_LineOn2S)& Contap_Line::LineOn2S () const @@ -54,4 +58,3 @@ inline gp_Circ Contap_Line::Circle () const if (typL != Contap_Circle) {Standard_DomainError::Raise();} return gp_Circ(gp_Ax2(pt,dir1,dir2),rad); } - diff --git a/src/Contap/Contap_Point.cdl b/src/Contap/Contap_Point.cdl index aba2f19c01..728b1db8ab 100755 --- a/src/Contap/Contap_Point.cdl +++ b/src/Contap/Contap_Point.cdl @@ -1,9 +1,7 @@ --- File: Contap_Point.cdl --- Created: Thu Mar 4 17:22:45 1993 --- Author: Jacques GOUSSARD --- ----Copyright: Matra Datavision 1993 - +-- File: Contap_Point.cdl +-- Created: Thu Mar 4 17:22:45 1993 +-- Author: Jacques GOUSSARD +---Copyright: Matra Datavision 1993 generic class Point from Contap (TheVertex as any; diff --git a/src/Contap/Contap_Point.gxx b/src/Contap/Contap_Point.gxx index 03b77f6b91..d125e1a572 100755 --- a/src/Contap/Contap_Point.gxx +++ b/src/Contap/Contap_Point.gxx @@ -1,3 +1,8 @@ +// File: Contap_Point.gxx +// Created: Thu Mar 4 17:22:45 1993 +// Author: Jacques GOUSSARD +// Copyright: OPEN CASCADE 2000 + Contap_Point::Contap_Point (): onarc(Standard_False),isvtx(Standard_False),ismult(Standard_False), myInternal(Standard_False) @@ -9,4 +14,3 @@ Contap_Point::Contap_Point (const gp_Pnt& Pt, pt(Pt),uparam(U),vparam(V),onarc(Standard_False),isvtx(Standard_False), ismult(Standard_False),myInternal(Standard_False) {} - diff --git a/src/Contap/Contap_Point.lxx b/src/Contap/Contap_Point.lxx index a0134d4c59..472d43a0a6 100755 --- a/src/Contap/Contap_Point.lxx +++ b/src/Contap/Contap_Point.lxx @@ -1,5 +1,9 @@ -#include +// File: Contap_Point.lxx +// Created: Thu Mar 4 17:22:45 1993 +// Author: Jacques GOUSSARD +// Copyright: OPEN CASCADE 2000 +#include inline void Contap_Point::SetValue (const gp_Pnt& Pt, const Standard_Real U, @@ -112,4 +116,3 @@ inline const TheVertex& Contap_Point::Vertex () const { if (!isvtx) {Standard_DomainError::Raise();} return vtx; } - diff --git a/src/Contap/Contap_SurfFunction.cdl b/src/Contap/Contap_SurfFunction.cdl index 917902397f..c44c4058c5 100755 --- a/src/Contap/Contap_SurfFunction.cdl +++ b/src/Contap/Contap_SurfFunction.cdl @@ -1,8 +1,7 @@ --- File: Contap_SurfFunction.cdl --- Created: Thu Jun 3 15:23:20 1993 --- Author: Jacques GOUSSARD --- ----Copyright: Matra Datavision 1993 +-- File: Contap_SurfFunction.cdl +-- Created: Thu Jun 3 15:23:20 1993 +-- Author: Jacques GOUSSARD +---Copyright: Matra Datavision 1993 generic class SurfFunction from Contap diff --git a/src/Contap/Contap_SurfFunction.gxx b/src/Contap/Contap_SurfFunction.gxx index 7c94b3a624..9167f15248 100755 --- a/src/Contap/Contap_SurfFunction.gxx +++ b/src/Contap/Contap_SurfFunction.gxx @@ -1,3 +1,8 @@ +// File: Contap_SurfFunction.gxx +// Created: Thu Jun 3 15:23:20 1993 +// Author: Jacques GOUSSARD +// Copyright: OPEN CASCADE 2000 + // jag 940616 #define Tolpetit 1.e-16 diff --git a/src/Contap/Contap_SurfFunction.lxx b/src/Contap/Contap_SurfFunction.lxx index 1846078a90..e8594fe073 100755 --- a/src/Contap/Contap_SurfFunction.lxx +++ b/src/Contap/Contap_SurfFunction.lxx @@ -1,3 +1,8 @@ +// File: Contap_SurfFunction.lxx +// Created: Thu Jun 3 15:23:20 1993 +// Author: Jacques GOUSSARD +// Copyright: OPEN CASCADE 2000 + #include inline void Contap_SurfFunction::Set(const gp_Pnt& Eye) diff --git a/src/Contap/Contap_SurfProps.cdl b/src/Contap/Contap_SurfProps.cdl index 069799d25f..7954ec326e 100755 --- a/src/Contap/Contap_SurfProps.cdl +++ b/src/Contap/Contap_SurfProps.cdl @@ -1,8 +1,7 @@ --- File: Contap_SurfProps.cdl --- Created: Fri Feb 24 15:30:15 1995 --- Author: Jacques GOUSSARD --- ----Copyright: Matra Datavision 1995 +-- File: Contap_SurfProps.cdl +-- Created: Fri Feb 24 15:30:15 1995 +-- Author: Jacques GOUSSARD +---Copyright: Matra Datavision 1995 generic class SurfProps from Contap diff --git a/src/Contap/Contap_SurfProps.gxx b/src/Contap/Contap_SurfProps.gxx index bac6fd5123..8be37a13ad 100755 --- a/src/Contap/Contap_SurfProps.gxx +++ b/src/Contap/Contap_SurfProps.gxx @@ -1,8 +1,7 @@ -// File: Contap_SurfProps.gxx -// Created: Fri Feb 24 15:37:28 1995 -// Author: Jacques GOUSSARD -// - +// File: Contap_SurfProps.gxx +// Created: Fri Feb 24 15:37:28 1995 +// Author: Jacques GOUSSARD +// Copyright: OPEN CASCADE 2000 #include @@ -321,4 +320,3 @@ void Contap_SurfProps::NormAndDn(const TheSurface& S, break; } } - diff --git a/src/Contap/Contap_SurfaceTool.cdl b/src/Contap/Contap_SurfaceTool.cdl index 726941312d..81655df009 100755 --- a/src/Contap/Contap_SurfaceTool.cdl +++ b/src/Contap/Contap_SurfaceTool.cdl @@ -1,9 +1,7 @@ --- File: Contap_SurfaceTool.cdl --- Created: Wed May 12 09:11:00 1993 --- Author: Jacques GOUSSARD --- ----Copyright: Matra Datavision 1993 - +-- File: Contap_SurfaceTool.cdl +-- Created: Wed May 12 09:11:00 1993 +-- Author: Jacques GOUSSARD +---Copyright: Matra Datavision 1993 deferred generic class SurfaceTool from Contap diff --git a/src/Contap/Contap_TopolTool.cdl b/src/Contap/Contap_TopolTool.cdl index d5b34fa5be..4bf8b75c78 100755 --- a/src/Contap/Contap_TopolTool.cdl +++ b/src/Contap/Contap_TopolTool.cdl @@ -1,9 +1,7 @@ --- File: Contap_TopolTool.cdl --- Created: Wed May 12 09:16:05 1993 --- Author: Jacques GOUSSARD --- ----Copyright: Matra Datavision 1993 - +-- File: Contap_TopolTool.cdl +-- Created: Wed May 12 09:16:05 1993 +-- Author: Jacques GOUSSARD +---Copyright: Matra Datavision 1993 deferred generic class TopolTool from Contap diff --git a/src/HLRAlgo/HLRAlgo.cdl b/src/HLRAlgo/HLRAlgo.cdl index 2b6ae42cee..8b2e77e21a 100755 --- a/src/HLRAlgo/HLRAlgo.cdl +++ b/src/HLRAlgo/HLRAlgo.cdl @@ -1,8 +1,7 @@ --- File: HLRAlgo.cdl --- Created: Tue Feb 18 17:18:30 1992 --- Author: Christophe MARION --- ----Copyright: Matra Datavision 1992 +-- File: HLRAlgo.cdl +-- Created: Tue Feb 18 17:18:30 1992 +-- Author: Christophe MARION +---Copyright: Matra Datavision 1992 package HLRAlgo --- Purpose: In order to have the precision required in diff --git a/src/HLRAlgo/HLRAlgo.cxx b/src/HLRAlgo/HLRAlgo.cxx index 45d5c8f168..727edc2bcf 100755 --- a/src/HLRAlgo/HLRAlgo.cxx +++ b/src/HLRAlgo/HLRAlgo.cxx @@ -1,24 +1,24 @@ -// File: HLRAlgo.cxx -// Created: Tue Sep 12 17:05:53 1995 -// Author: Christophe MARION -// +// File: HLRAlgo.cxx +// Created: Tue Sep 12 17:05:53 1995 +// Author: Christophe MARION +// Copyright: OPEN CASCADE 2000 #include -static Standard_Real cosu0 = cos(0*PI/14); -static Standard_Real sinu0 = sin(0*PI/14); -static Standard_Real cosu1 = cos(1*PI/14); -static Standard_Real sinu1 = sin(1*PI/14); -static Standard_Real cosu2 = cos(2*PI/14); -static Standard_Real sinu2 = sin(2*PI/14); -static Standard_Real cosu3 = cos(3*PI/14); -static Standard_Real sinu3 = sin(3*PI/14); -static Standard_Real cosu4 = cos(4*PI/14); -static Standard_Real sinu4 = sin(4*PI/14); -static Standard_Real cosu5 = cos(5*PI/14); -static Standard_Real sinu5 = sin(5*PI/14); -static Standard_Real cosu6 = cos(6*PI/14); -static Standard_Real sinu6 = sin(6*PI/14); +static const Standard_Real cosu0 = cos(0.*PI/14.); +static const Standard_Real sinu0 = sin(0.*PI/14.); +static const Standard_Real cosu1 = cos(1.*PI/14.); +static const Standard_Real sinu1 = sin(1.*PI/14.); +static const Standard_Real cosu2 = cos(2.*PI/14.); +static const Standard_Real sinu2 = sin(2.*PI/14.); +static const Standard_Real cosu3 = cos(3.*PI/14.); +static const Standard_Real sinu3 = sin(3.*PI/14.); +static const Standard_Real cosu4 = cos(4.*PI/14.); +static const Standard_Real sinu4 = sin(4.*PI/14.); +static const Standard_Real cosu5 = cos(5.*PI/14.); +static const Standard_Real sinu5 = sin(5.*PI/14.); +static const Standard_Real cosu6 = cos(6.*PI/14.); +static const Standard_Real sinu6 = sin(6.*PI/14.); //======================================================================= //function : UpdateMinMax @@ -26,62 +26,36 @@ static Standard_Real sinu6 = sin(6*PI/14); //======================================================================= void HLRAlgo::UpdateMinMax (const Standard_Real x, - const Standard_Real y, - const Standard_Real z, - const Standard_Address Min, - const Standard_Address Max) + const Standard_Real y, + const Standard_Real z, + const Standard_Address Min, + const Standard_Address Max) { - Standard_Real d00,d01,d02,d03,d04,d05,d06,d07; - Standard_Real d08,d09,d10,d11,d12,d13,d14,d15; - d00 = cosu0 * x + sinu0 * y; - d01 = sinu0 * x - cosu0 * y; - d02 = cosu1 * x + sinu1 * y; - d03 = sinu1 * x - cosu1 * y; - d04 = cosu2 * x + sinu2 * y; - d05 = sinu2 * x - cosu2 * y; - d06 = cosu3 * x + sinu3 * y; - d07 = sinu3 * x - cosu3 * y; - d08 = cosu4 * x + sinu4 * y; - d09 = sinu4 * x - cosu4 * y; - d10 = cosu5 * x + sinu5 * y; - d11 = sinu5 * x - cosu5 * y; - d12 = cosu6 * x + sinu6 * y; - d13 = sinu6 * x - cosu6 * y; - d14 = z; - d15 = z; - - if (((Standard_Real*)Min)[ 0] > d00) ((Standard_Real*)Min) [ 0] = d00; - if (((Standard_Real*)Max)[ 0] < d00) ((Standard_Real*)Max) [ 0] = d00; - if (((Standard_Real*)Min)[ 1] > d01) ((Standard_Real*)Min) [ 1] = d01; - if (((Standard_Real*)Max)[ 1] < d01) ((Standard_Real*)Max) [ 1] = d01; - if (((Standard_Real*)Min)[ 2] > d02) ((Standard_Real*)Min) [ 2] = d02; - if (((Standard_Real*)Max)[ 2] < d02) ((Standard_Real*)Max) [ 2] = d02; - if (((Standard_Real*)Min)[ 3] > d03) ((Standard_Real*)Min) [ 3] = d03; - if (((Standard_Real*)Max)[ 3] < d03) ((Standard_Real*)Max) [ 3] = d03; - if (((Standard_Real*)Min)[ 4] > d04) ((Standard_Real*)Min) [ 4] = d04; - if (((Standard_Real*)Max)[ 4] < d04) ((Standard_Real*)Max) [ 4] = d04; - if (((Standard_Real*)Min)[ 5] > d05) ((Standard_Real*)Min) [ 5] = d05; - if (((Standard_Real*)Max)[ 5] < d05) ((Standard_Real*)Max) [ 5] = d05; - if (((Standard_Real*)Min)[ 6] > d06) ((Standard_Real*)Min) [ 6] = d06; - if (((Standard_Real*)Max)[ 6] < d06) ((Standard_Real*)Max) [ 6] = d06; - if (((Standard_Real*)Min)[ 7] > d07) ((Standard_Real*)Min) [ 7] = d07; - if (((Standard_Real*)Max)[ 7] < d07) ((Standard_Real*)Max) [ 7] = d07; - if (((Standard_Real*)Min)[ 8] > d08) ((Standard_Real*)Min) [ 8] = d08; - if (((Standard_Real*)Max)[ 8] < d08) ((Standard_Real*)Max) [ 8] = d08; - if (((Standard_Real*)Min)[ 9] > d09) ((Standard_Real*)Min) [ 9] = d09; - if (((Standard_Real*)Max)[ 9] < d09) ((Standard_Real*)Max) [ 9] = d09; - if (((Standard_Real*)Min)[10] > d10) ((Standard_Real*)Min) [10] = d10; - if (((Standard_Real*)Max)[10] < d10) ((Standard_Real*)Max) [10] = d10; - if (((Standard_Real*)Min)[11] > d11) ((Standard_Real*)Min) [11] = d11; - if (((Standard_Real*)Max)[11] < d11) ((Standard_Real*)Max) [11] = d11; - if (((Standard_Real*)Min)[12] > d12) ((Standard_Real*)Min) [12] = d12; - if (((Standard_Real*)Max)[12] < d12) ((Standard_Real*)Max) [12] = d12; - if (((Standard_Real*)Min)[13] > d13) ((Standard_Real*)Min) [13] = d13; - if (((Standard_Real*)Max)[13] < d13) ((Standard_Real*)Max) [13] = d13; - if (((Standard_Real*)Min)[14] > d14) ((Standard_Real*)Min) [14] = d14; - if (((Standard_Real*)Max)[14] < d14) ((Standard_Real*)Max) [14] = d14; - if (((Standard_Real*)Min)[15] > d15) ((Standard_Real*)Min) [15] = d15; - if (((Standard_Real*)Max)[15] < d15) ((Standard_Real*)Max) [15] = d15; + Standard_Real d[16]; + d[ 0] = cosu0 * x + sinu0 * y; + d[ 1] = sinu0 * x - cosu0 * y; + d[ 2] = cosu1 * x + sinu1 * y; + d[ 3] = sinu1 * x - cosu1 * y; + d[ 4] = cosu2 * x + sinu2 * y; + d[ 5] = sinu2 * x - cosu2 * y; + d[ 6] = cosu3 * x + sinu3 * y; + d[ 7] = sinu3 * x - cosu3 * y; + d[ 8] = cosu4 * x + sinu4 * y; + d[ 9] = sinu4 * x - cosu4 * y; + d[10] = cosu5 * x + sinu5 * y; + d[11] = sinu5 * x - cosu5 * y; + d[12] = cosu6 * x + sinu6 * y; + d[13] = sinu6 * x - cosu6 * y; + d[14] = z; + d[15] = z; + + Standard_Integer i = 0; + while (i < 16) + { + if (((Standard_Real*)Min)[i] > d[i]) ((Standard_Real*)Min)[i] = d[i]; + if (((Standard_Real*)Max)[i] < d[i]) ((Standard_Real*)Max)[i] = d[i]; + i++; + } } //======================================================================= @@ -90,41 +64,16 @@ void HLRAlgo::UpdateMinMax (const Standard_Real x, //======================================================================= void HLRAlgo::EnlargeMinMax (const Standard_Real tol, - const Standard_Address Min, - const Standard_Address Max) + const Standard_Address Min, + const Standard_Address Max) { - ((Standard_Real*)Min)[ 0] -= tol; - ((Standard_Real*)Max)[ 0] += tol; - ((Standard_Real*)Min)[ 1] -= tol; - ((Standard_Real*)Max)[ 1] += tol; - ((Standard_Real*)Min)[ 2] -= tol; - ((Standard_Real*)Max)[ 2] += tol; - ((Standard_Real*)Min)[ 3] -= tol; - ((Standard_Real*)Max)[ 3] += tol; - ((Standard_Real*)Min)[ 4] -= tol; - ((Standard_Real*)Max)[ 4] += tol; - ((Standard_Real*)Min)[ 5] -= tol; - ((Standard_Real*)Max)[ 5] += tol; - ((Standard_Real*)Min)[ 6] -= tol; - ((Standard_Real*)Max)[ 6] += tol; - ((Standard_Real*)Min)[ 7] -= tol; - ((Standard_Real*)Max)[ 7] += tol; - ((Standard_Real*)Min)[ 8] -= tol; - ((Standard_Real*)Max)[ 8] += tol; - ((Standard_Real*)Min)[ 9] -= tol; - ((Standard_Real*)Max)[ 9] += tol; - ((Standard_Real*)Min)[10] -= tol; - ((Standard_Real*)Max)[10] += tol; - ((Standard_Real*)Min)[11] -= tol; - ((Standard_Real*)Max)[11] += tol; - ((Standard_Real*)Min)[12] -= tol; - ((Standard_Real*)Max)[12] += tol; - ((Standard_Real*)Min)[13] -= tol; - ((Standard_Real*)Max)[13] += tol; - ((Standard_Real*)Min)[14] -= tol; - ((Standard_Real*)Max)[14] += tol; - ((Standard_Real*)Min)[15] -= tol; - ((Standard_Real*)Max)[15] += tol; + Standard_Integer i = 0; + while (i < 16) + { + ((Standard_Real*)Min)[i] -= tol; + ((Standard_Real*)Max)[i] += tol; + i++; + } } //======================================================================= @@ -133,41 +82,16 @@ void HLRAlgo::EnlargeMinMax (const Standard_Real tol, //======================================================================= void HLRAlgo::InitMinMax (const Standard_Real Big, - const Standard_Address Min, - const Standard_Address Max) + const Standard_Address Min, + const Standard_Address Max) { - ((Standard_Real*)Min)[ 0] = - ((Standard_Real*)Min)[ 1] = - ((Standard_Real*)Min)[ 2] = - ((Standard_Real*)Min)[ 3] = - ((Standard_Real*)Min)[ 4] = - ((Standard_Real*)Min)[ 5] = - ((Standard_Real*)Min)[ 6] = - ((Standard_Real*)Min)[ 7] = - ((Standard_Real*)Min)[ 8] = - ((Standard_Real*)Min)[ 9] = - ((Standard_Real*)Min)[10] = - ((Standard_Real*)Min)[11] = - ((Standard_Real*)Min)[12] = - ((Standard_Real*)Min)[13] = - ((Standard_Real*)Min)[14] = - ((Standard_Real*)Min)[15] = Big; - ((Standard_Real*)Max)[ 0] = - ((Standard_Real*)Max)[ 1] = - ((Standard_Real*)Max)[ 2] = - ((Standard_Real*)Max)[ 3] = - ((Standard_Real*)Max)[ 4] = - ((Standard_Real*)Max)[ 5] = - ((Standard_Real*)Max)[ 6] = - ((Standard_Real*)Max)[ 7] = - ((Standard_Real*)Max)[ 8] = - ((Standard_Real*)Max)[ 9] = - ((Standard_Real*)Max)[10] = - ((Standard_Real*)Max)[11] = - ((Standard_Real*)Max)[12] = - ((Standard_Real*)Max)[13] = - ((Standard_Real*)Max)[14] = - ((Standard_Real*)Max)[15] = -Big; + Standard_Integer i = 0; + while (i < 16) + { + ((Standard_Real*)Min)[i] = Big; + ((Standard_Real*)Max)[i] = -Big; + i++; + } } //======================================================================= @@ -176,8 +100,8 @@ void HLRAlgo::InitMinMax (const Standard_Real Big, //======================================================================= void HLRAlgo::EncodeMinMax (const Standard_Address Min, - const Standard_Address Max, - const Standard_Address MM) + const Standard_Address Max, + const Standard_Address MM) { ((Standard_Integer*)MM)[ 0] = ((Standard_Integer*)Min)[ 1]&0x00007fff; ((Standard_Integer*)MM)[ 8] = ((Standard_Integer*)Max)[ 1]&0x00007fff; @@ -218,24 +142,16 @@ void HLRAlgo::EncodeMinMax (const Standard_Address Min, //purpose : //======================================================================= -Standard_Real HLRAlgo::SizeBox(const Standard_Address Min, - const Standard_Address Max) +Standard_Real HLRAlgo::SizeBox(const Standard_Address Min, + const Standard_Address Max) { - Standard_Real s; - s = ((Standard_Integer *)Max)[ 0] - ((Standard_Integer *)Min)[ 0]; - s *= ((Standard_Integer *)Max)[ 1] - ((Standard_Integer *)Min)[ 1]; - s *= ((Standard_Integer *)Max)[ 2] - ((Standard_Integer *)Min)[ 2]; - s *= ((Standard_Integer *)Max)[ 3] - ((Standard_Integer *)Min)[ 3]; - s *= ((Standard_Integer *)Max)[ 4] - ((Standard_Integer *)Min)[ 4]; - s *= ((Standard_Integer *)Max)[ 5] - ((Standard_Integer *)Min)[ 5]; - s *= ((Standard_Integer *)Max)[ 6] - ((Standard_Integer *)Min)[ 6]; - s *= ((Standard_Integer *)Max)[ 7] - ((Standard_Integer *)Min)[ 7]; - s *= ((Standard_Integer *)Max)[ 8] - ((Standard_Integer *)Min)[ 8]; - s *= ((Standard_Integer *)Max)[ 9] - ((Standard_Integer *)Min)[ 9]; - s *= ((Standard_Integer *)Max)[10] - ((Standard_Integer *)Min)[10]; - s *= ((Standard_Integer *)Max)[11] - ((Standard_Integer *)Min)[11]; - s *= ((Standard_Integer *)Max)[12] - ((Standard_Integer *)Min)[12]; - s *= ((Standard_Integer *)Max)[13] - ((Standard_Integer *)Min)[13]; + Standard_Real s = ((Standard_Integer *)Max)[0] - ((Standard_Integer *)Min)[0]; + Standard_Integer i = 1; + while (i < 14) + { + s *= ((Standard_Integer *)Max)[i] - ((Standard_Integer *)Min)[i]; + i++; + } return s; } @@ -245,8 +161,8 @@ Standard_Real HLRAlgo::SizeBox(const Standard_Address Min, //======================================================================= void HLRAlgo::DecodeMinMax (const Standard_Address MM, - const Standard_Address Min, - const Standard_Address Max) + const Standard_Address Min, + const Standard_Address Max) { ((Standard_Integer*)Min)[ 0]=(((Standard_Integer*)MM)[ 0]&0x7fff0000)>>16; ((Standard_Integer*)Max)[ 0]=(((Standard_Integer*)MM)[ 8]&0x7fff0000)>>16; @@ -288,42 +204,17 @@ void HLRAlgo::DecodeMinMax (const Standard_Address MM, //======================================================================= void HLRAlgo::CopyMinMax (const Standard_Address IMin, - const Standard_Address IMax, - const Standard_Address OMin, - const Standard_Address OMax) + const Standard_Address IMax, + const Standard_Address OMin, + const Standard_Address OMax) { - ((Standard_Integer*)OMin)[ 0]=((Standard_Integer*)IMin)[ 0]; - ((Standard_Integer*)OMax)[ 0]=((Standard_Integer*)IMax)[ 0]; - ((Standard_Integer*)OMin)[ 1]=((Standard_Integer*)IMin)[ 1]; - ((Standard_Integer*)OMax)[ 1]=((Standard_Integer*)IMax)[ 1]; - ((Standard_Integer*)OMin)[ 2]=((Standard_Integer*)IMin)[ 2]; - ((Standard_Integer*)OMax)[ 2]=((Standard_Integer*)IMax)[ 2]; - ((Standard_Integer*)OMin)[ 3]=((Standard_Integer*)IMin)[ 3]; - ((Standard_Integer*)OMax)[ 3]=((Standard_Integer*)IMax)[ 3]; - ((Standard_Integer*)OMin)[ 4]=((Standard_Integer*)IMin)[ 4]; - ((Standard_Integer*)OMax)[ 4]=((Standard_Integer*)IMax)[ 4]; - ((Standard_Integer*)OMin)[ 5]=((Standard_Integer*)IMin)[ 5]; - ((Standard_Integer*)OMax)[ 5]=((Standard_Integer*)IMax)[ 5]; - ((Standard_Integer*)OMin)[ 6]=((Standard_Integer*)IMin)[ 6]; - ((Standard_Integer*)OMax)[ 6]=((Standard_Integer*)IMax)[ 6]; - ((Standard_Integer*)OMin)[ 7]=((Standard_Integer*)IMin)[ 7]; - ((Standard_Integer*)OMax)[ 7]=((Standard_Integer*)IMax)[ 7]; - ((Standard_Integer*)OMin)[ 8]=((Standard_Integer*)IMin)[ 8]; - ((Standard_Integer*)OMax)[ 8]=((Standard_Integer*)IMax)[ 8]; - ((Standard_Integer*)OMin)[ 9]=((Standard_Integer*)IMin)[ 9]; - ((Standard_Integer*)OMax)[ 9]=((Standard_Integer*)IMax)[ 9]; - ((Standard_Integer*)OMin)[10]=((Standard_Integer*)IMin)[10]; - ((Standard_Integer*)OMax)[10]=((Standard_Integer*)IMax)[10]; - ((Standard_Integer*)OMin)[11]=((Standard_Integer*)IMin)[11]; - ((Standard_Integer*)OMax)[11]=((Standard_Integer*)IMax)[11]; - ((Standard_Integer*)OMin)[12]=((Standard_Integer*)IMin)[12]; - ((Standard_Integer*)OMax)[12]=((Standard_Integer*)IMax)[12]; - ((Standard_Integer*)OMin)[13]=((Standard_Integer*)IMin)[13]; - ((Standard_Integer*)OMax)[13]=((Standard_Integer*)IMax)[13]; - ((Standard_Integer*)OMin)[14]=((Standard_Integer*)IMin)[14]; - ((Standard_Integer*)OMax)[14]=((Standard_Integer*)IMax)[14]; - ((Standard_Integer*)OMin)[15]=((Standard_Integer*)IMin)[15]; - ((Standard_Integer*)OMax)[15]=((Standard_Integer*)IMax)[15]; + Standard_Integer i = 0; + while (i < 16) + { + ((Standard_Integer*)OMin)[i]=((Standard_Integer*)IMin)[i]; + ((Standard_Integer*)OMax)[i]=((Standard_Integer*)IMax)[i]; + i++; + } } //======================================================================= @@ -332,73 +223,17 @@ void HLRAlgo::CopyMinMax (const Standard_Address IMin, //======================================================================= void HLRAlgo::AddMinMax (const Standard_Address IMin, - const Standard_Address IMax, - const Standard_Address OMin, - const Standard_Address OMax) + const Standard_Address IMax, + const Standard_Address OMin, + const Standard_Address OMax) { - if (((Standard_Integer*)OMin)[ 0] > ((Standard_Integer*)IMin)[ 0]) - ((Standard_Integer*)OMin)[ 0]=((Standard_Integer*)IMin)[ 0]; - if (((Standard_Integer*)OMax)[ 0] < ((Standard_Integer*)IMax)[ 0]) - ((Standard_Integer*)OMax)[ 0]=((Standard_Integer*)IMax)[ 0]; - if (((Standard_Integer*)OMin)[ 1] > ((Standard_Integer*)IMin)[ 1]) - ((Standard_Integer*)OMin)[ 1]=((Standard_Integer*)IMin)[ 1]; - if (((Standard_Integer*)OMax)[ 1] < ((Standard_Integer*)IMax)[ 1]) - ((Standard_Integer*)OMax)[ 1]=((Standard_Integer*)IMax)[ 1]; - if (((Standard_Integer*)OMin)[ 2] > ((Standard_Integer*)IMin)[ 2]) - ((Standard_Integer*)OMin)[ 2]=((Standard_Integer*)IMin)[ 2]; - if (((Standard_Integer*)OMax)[ 2] < ((Standard_Integer*)IMax)[ 2]) - ((Standard_Integer*)OMax)[ 2]=((Standard_Integer*)IMax)[ 2]; - if (((Standard_Integer*)OMin)[ 3] > ((Standard_Integer*)IMin)[ 3]) - ((Standard_Integer*)OMin)[ 3]=((Standard_Integer*)IMin)[ 3]; - if (((Standard_Integer*)OMax)[ 3] < ((Standard_Integer*)IMax)[ 3]) - ((Standard_Integer*)OMax)[ 3]=((Standard_Integer*)IMax)[ 3]; - if (((Standard_Integer*)OMin)[ 4] > ((Standard_Integer*)IMin)[ 4]) - ((Standard_Integer*)OMin)[ 4]=((Standard_Integer*)IMin)[ 4]; - if (((Standard_Integer*)OMax)[ 4] < ((Standard_Integer*)IMax)[ 4]) - ((Standard_Integer*)OMax)[ 4]=((Standard_Integer*)IMax)[ 4]; - if (((Standard_Integer*)OMin)[ 5] > ((Standard_Integer*)IMin)[ 5]) - ((Standard_Integer*)OMin)[ 5]=((Standard_Integer*)IMin)[ 5]; - if (((Standard_Integer*)OMax)[ 5] < ((Standard_Integer*)IMax)[ 5]) - ((Standard_Integer*)OMax)[ 5]=((Standard_Integer*)IMax)[ 5]; - if (((Standard_Integer*)OMin)[ 6] > ((Standard_Integer*)IMin)[ 6]) - ((Standard_Integer*)OMin)[ 6]=((Standard_Integer*)IMin)[ 6]; - if (((Standard_Integer*)OMax)[ 6] < ((Standard_Integer*)IMax)[ 6]) - ((Standard_Integer*)OMax)[ 6]=((Standard_Integer*)IMax)[ 6]; - if (((Standard_Integer*)OMin)[ 7] > ((Standard_Integer*)IMin)[ 7]) - ((Standard_Integer*)OMin)[ 7]=((Standard_Integer*)IMin)[ 7]; - if (((Standard_Integer*)OMax)[ 7] < ((Standard_Integer*)IMax)[ 7]) - ((Standard_Integer*)OMax)[ 7]=((Standard_Integer*)IMax)[ 7]; - if (((Standard_Integer*)OMin)[ 8] > ((Standard_Integer*)IMin)[ 8]) - ((Standard_Integer*)OMin)[ 8]=((Standard_Integer*)IMin)[ 8]; - if (((Standard_Integer*)OMax)[ 8] < ((Standard_Integer*)IMax)[ 8]) - ((Standard_Integer*)OMax)[ 8]=((Standard_Integer*)IMax)[ 8]; - if (((Standard_Integer*)OMin)[ 9] > ((Standard_Integer*)IMin)[ 9]) - ((Standard_Integer*)OMin)[ 9]=((Standard_Integer*)IMin)[ 9]; - if (((Standard_Integer*)OMax)[ 9] < ((Standard_Integer*)IMax)[ 9]) - ((Standard_Integer*)OMax)[ 9]=((Standard_Integer*)IMax)[ 9]; - if (((Standard_Integer*)OMin)[10] > ((Standard_Integer*)IMin)[10]) - ((Standard_Integer*)OMin)[10]=((Standard_Integer*)IMin)[10]; - if (((Standard_Integer*)OMax)[10] < ((Standard_Integer*)IMax)[10]) - ((Standard_Integer*)OMax)[10]=((Standard_Integer*)IMax)[10]; - if (((Standard_Integer*)OMin)[11] > ((Standard_Integer*)IMin)[11]) - ((Standard_Integer*)OMin)[11]=((Standard_Integer*)IMin)[11]; - if (((Standard_Integer*)OMax)[11] < ((Standard_Integer*)IMax)[11]) - ((Standard_Integer*)OMax)[11]=((Standard_Integer*)IMax)[11]; - if (((Standard_Integer*)OMin)[12] > ((Standard_Integer*)IMin)[12]) - ((Standard_Integer*)OMin)[12]=((Standard_Integer*)IMin)[12]; - if (((Standard_Integer*)OMax)[12] < ((Standard_Integer*)IMax)[12]) - ((Standard_Integer*)OMax)[12]=((Standard_Integer*)IMax)[12]; - if (((Standard_Integer*)OMin)[13] > ((Standard_Integer*)IMin)[13]) - ((Standard_Integer*)OMin)[13]=((Standard_Integer*)IMin)[13]; - if (((Standard_Integer*)OMax)[13] < ((Standard_Integer*)IMax)[13]) - ((Standard_Integer*)OMax)[13]=((Standard_Integer*)IMax)[13]; - if (((Standard_Integer*)OMin)[14] > ((Standard_Integer*)IMin)[14]) - ((Standard_Integer*)OMin)[14]=((Standard_Integer*)IMin)[14]; - if (((Standard_Integer*)OMax)[14] < ((Standard_Integer*)IMax)[14]) - ((Standard_Integer*)OMax)[14]=((Standard_Integer*)IMax)[14]; - if (((Standard_Integer*)OMin)[15] > ((Standard_Integer*)IMin)[15]) - ((Standard_Integer*)OMin)[15]=((Standard_Integer*)IMin)[15]; - if (((Standard_Integer*)OMax)[15] < ((Standard_Integer*)IMax)[15]) - ((Standard_Integer*)OMax)[15]=((Standard_Integer*)IMax)[15]; + Standard_Integer i = 0; + while (i < 16) + { + if (((Standard_Integer*)OMin)[i] > ((Standard_Integer*)IMin)[i]) + ((Standard_Integer*)OMin)[i]=((Standard_Integer*)IMin)[i]; + if (((Standard_Integer*)OMax)[i] < ((Standard_Integer*)IMax)[i]) + ((Standard_Integer*)OMax)[i]=((Standard_Integer*)IMax)[i]; + i++; + } } - diff --git a/src/HLRAlgo/HLRAlgo_BiPoint.cdl b/src/HLRAlgo/HLRAlgo_BiPoint.cdl index e93ca3a3e3..44130cb98a 100755 --- a/src/HLRAlgo/HLRAlgo_BiPoint.cdl +++ b/src/HLRAlgo/HLRAlgo_BiPoint.cdl @@ -1,8 +1,7 @@ --- File: HLRAlgo_BiPoint.cdl --- Created: Thu Jun 22 12:28:58 1995 --- Author: Christophe MARION --- ----Copyright: Matra Datavision 1995 +-- File: HLRAlgo_BiPoint.cdl +-- Created: Thu Jun 22 12:28:58 1995 +-- Author: Christophe MARION +---Copyright: Matra Datavision 1995 class BiPoint from HLRAlgo diff --git a/src/HLRAlgo/HLRAlgo_BiPoint.cxx b/src/HLRAlgo/HLRAlgo_BiPoint.cxx index 9ab2a02e03..a62e232589 100755 --- a/src/HLRAlgo/HLRAlgo_BiPoint.cxx +++ b/src/HLRAlgo/HLRAlgo_BiPoint.cxx @@ -1,7 +1,8 @@ -// File: HLRAlgo_BiPoint.cxx -// Created: Thu Jun 22 12:31:58 1995 -// Author: Christophe MARION -// +// File: HLRAlgo_BiPoint.cxx +// Created: Thu Jun 22 12:31:58 1995 +// Author: Christophe MARION +// Copyright: OPEN CASCADE 2000 + #ifndef No_Exception #define No_Exception #endif @@ -315,4 +316,3 @@ HLRAlgo_BiPoint::HLRAlgo_BiPoint (const Standard_Real X1, SegFlags = flag; Hidden(Standard_False); } - diff --git a/src/HLRAlgo/HLRAlgo_BiPoint.lxx b/src/HLRAlgo/HLRAlgo_BiPoint.lxx index 2a626c9f71..db4d0f5086 100755 --- a/src/HLRAlgo/HLRAlgo_BiPoint.lxx +++ b/src/HLRAlgo/HLRAlgo_BiPoint.lxx @@ -1,7 +1,7 @@ -// File: HLRAlgo_BiPoint.lxx -// Created: Thu Jun 22 12:35:03 1995 -// Author: Christophe MARION -// +// File: HLRAlgo_BiPoint.lxx +// Created: Thu Jun 22 12:35:03 1995 +// Author: Christophe MARION +// Copyright: OPEN CASCADE 2000 #define EMskRg1Line ((Standard_Boolean)1) #define EMskRgNLine ((Standard_Boolean)2) @@ -128,4 +128,3 @@ inline Standard_Address HLRAlgo_BiPoint::Indices () const inline Standard_Address HLRAlgo_BiPoint::Coordinates () const { return (Standard_Address)myCoordinates; } - diff --git a/src/HLRAlgo/HLRAlgo_Coincidence.cdl b/src/HLRAlgo/HLRAlgo_Coincidence.cdl index 33d2c5f84a..6869fa8480 100755 --- a/src/HLRAlgo/HLRAlgo_Coincidence.cdl +++ b/src/HLRAlgo/HLRAlgo_Coincidence.cdl @@ -1,8 +1,7 @@ --- File: Coincidence.cdl --- Created: Thu Aug 20 18:06:13 1992 --- Author: Christophe MARION --- ----Copyright: Matra Datavision 1992 +-- File: HLRAlgo_Coincidence.cdl +-- Created: Thu Aug 20 18:06:13 1992 +-- Author: Christophe MARION +---Copyright: Matra Datavision 1992 class Coincidence from HLRAlgo diff --git a/src/HLRAlgo/HLRAlgo_Coincidence.cxx b/src/HLRAlgo/HLRAlgo_Coincidence.cxx index a955987cc6..ef9cb250f3 100755 --- a/src/HLRAlgo/HLRAlgo_Coincidence.cxx +++ b/src/HLRAlgo/HLRAlgo_Coincidence.cxx @@ -1,7 +1,7 @@ -// File: HLRAlgo_Coincidence.cxx -// Created: Wed Feb 19 14:31:45 1992 -// Author: Christophe MARION -// +// File: HLRAlgo_Coincidence.cxx +// Created: Wed Feb 19 14:31:45 1992 +// Author: Christophe MARION +// Copyright: OPEN CASCADE 2000 #include @@ -11,6 +11,9 @@ //======================================================================= HLRAlgo_Coincidence::HLRAlgo_Coincidence() + : myFE(0), + myParam(0.), + myStBef(TopAbs_IN), + myStAft(TopAbs_IN) { } - diff --git a/src/HLRAlgo/HLRAlgo_Coincidence.lxx b/src/HLRAlgo/HLRAlgo_Coincidence.lxx index e554bc71a1..c32bbc29f1 100755 --- a/src/HLRAlgo/HLRAlgo_Coincidence.lxx +++ b/src/HLRAlgo/HLRAlgo_Coincidence.lxx @@ -1,7 +1,7 @@ -// File: HLRAlgo_Coincidence.lxx -// Created: Wed Feb 19 14:31:45 1992 -// Author: Christophe MARION -// +// File: HLRAlgo_Coincidence.lxx +// Created: Wed Feb 19 14:31:45 1992 +// Author: Christophe MARION +// Copyright: OPEN CASCADE 2000 //======================================================================= //function : Set2D @@ -52,4 +52,3 @@ inline void HLRAlgo_Coincidence::State3D stbef = myStBef; staft = myStAft; } - diff --git a/src/HLRAlgo/HLRAlgo_EdgeIterator.cdl b/src/HLRAlgo/HLRAlgo_EdgeIterator.cdl index bd690b3d8e..f30b0d835a 100755 --- a/src/HLRAlgo/HLRAlgo_EdgeIterator.cdl +++ b/src/HLRAlgo/HLRAlgo_EdgeIterator.cdl @@ -1,8 +1,7 @@ --- File: HLRAlgo_EdgeIterator.cdl --- Created: Mon Jan 11 13:58:26 1993 --- Author: Christophe MARION --- ----Copyright: Matra Datavision 1993 +-- File: HLRAlgo_EdgeIterator.cdl +-- Created: Mon Jan 11 13:58:26 1993 +-- Author: Christophe MARION +---Copyright: Matra Datavision 1993 class EdgeIterator from HLRAlgo diff --git a/src/HLRAlgo/HLRAlgo_EdgeIterator.cxx b/src/HLRAlgo/HLRAlgo_EdgeIterator.cxx index 4030137e33..2922e03ade 100755 --- a/src/HLRAlgo/HLRAlgo_EdgeIterator.cxx +++ b/src/HLRAlgo/HLRAlgo_EdgeIterator.cxx @@ -1,7 +1,8 @@ -// File: HLRAlgo_EdgeIterator.cxx -// Created: Mon Jan 11 13:58:26 1993 -// Author: Christophe MARION -// +// File: HLRAlgo_EdgeIterator.cxx +// Created: Mon Jan 11 13:58:26 1993 +// Author: Christophe MARION +// Copyright: OPEN CASCADE 2000 + #ifndef No_Exception #define No_Exception #endif @@ -66,4 +67,3 @@ void HLRAlgo_EdgeIterator::NextHidden () (iHid,myHidEnd,myHidTolEnd,B1,B2); } } - diff --git a/src/HLRAlgo/HLRAlgo_EdgeIterator.lxx b/src/HLRAlgo/HLRAlgo_EdgeIterator.lxx index d61f2adb71..860e6609a3 100755 --- a/src/HLRAlgo/HLRAlgo_EdgeIterator.lxx +++ b/src/HLRAlgo/HLRAlgo_EdgeIterator.lxx @@ -1,7 +1,7 @@ -// File: HLRAlgo_EdgeIterator.lxx -// Created: Mon Jan 11 13:58:26 1993 -// Author: Christophe MARION -// +// File: HLRAlgo_EdgeIterator.lxx +// Created: Mon Jan 11 13:58:26 1993 +// Author: Christophe MARION +// Copyright: OPEN CASCADE 2000 #include @@ -73,4 +73,3 @@ HLRAlgo_EdgeIterator::Visible (Standard_Real& Start, ((HLRAlgo_EdgeStatus*)EVis)->VisiblePart (iVis,Start,TolStart,End,TolEnd); } - diff --git a/src/HLRAlgo/HLRAlgo_EdgeStatus.cdl b/src/HLRAlgo/HLRAlgo_EdgeStatus.cdl index 50ecfe5e3d..aaf92d796c 100755 --- a/src/HLRAlgo/HLRAlgo_EdgeStatus.cdl +++ b/src/HLRAlgo/HLRAlgo_EdgeStatus.cdl @@ -1,8 +1,7 @@ --- File: EdgeStatus.cdl --- Created: Tue Feb 18 10:36:07 1992 --- Author: Christophe MARION --- ----Copyright: Matra Datavision 1992 +-- File: HLRAlgo_EdgeStatus.cdl +-- Created: Tue Feb 18 10:36:07 1992 +-- Author: Christophe MARION +---Copyright: Matra Datavision 1992 class EdgeStatus from HLRAlgo diff --git a/src/HLRAlgo/HLRAlgo_EdgeStatus.cxx b/src/HLRAlgo/HLRAlgo_EdgeStatus.cxx index d712aa9b20..947aac70ba 100755 --- a/src/HLRAlgo/HLRAlgo_EdgeStatus.cxx +++ b/src/HLRAlgo/HLRAlgo_EdgeStatus.cxx @@ -1,7 +1,8 @@ -// File: HLRAlgo_EdgeStatus.cxx -// Created: Tue Feb 18 11:30:23 1992 -// Author: Christophe MARION -// +// File: HLRAlgo_EdgeStatus.cxx +// Created: Tue Feb 18 11:30:23 1992 +// Author: Christophe MARION +// Copyright: OPEN CASCADE 2000 + #ifndef No_Exception #define No_Exception #endif @@ -100,4 +101,3 @@ void HLRAlgo_EdgeStatus::Hide (const Standard_Real Start , if (!AllHidden()) AllHidden(myVisibles.NbIntervals() == 0); } } - diff --git a/src/HLRAlgo/HLRAlgo_EdgeStatus.lxx b/src/HLRAlgo/HLRAlgo_EdgeStatus.lxx index c0ac65fa9e..15bbe152c2 100755 --- a/src/HLRAlgo/HLRAlgo_EdgeStatus.lxx +++ b/src/HLRAlgo/HLRAlgo_EdgeStatus.lxx @@ -1,7 +1,7 @@ -// File: HLRAlgo_EdgeStatus.lxx -// Created: Tue Feb 18 11:30:12 1992 -// Author: Christophe MARION -// +// File: HLRAlgo_EdgeStatus.lxx +// Created: Tue Feb 18 11:30:12 1992 +// Author: Christophe MARION +// Copyright: OPEN CASCADE 2000 #define EMaskAllHidden ((Standard_Boolean)1) #define EMaskAllVisible ((Standard_Boolean)2) @@ -80,4 +80,3 @@ inline void HLRAlgo_EdgeStatus::AllVisible (const Standard_Boolean B) if (B) myFlags |= EMaskAllVisible; else myFlags &= ~EMaskAllVisible; } - diff --git a/src/HLRAlgo/HLRAlgo_EdgesBlock.cdl b/src/HLRAlgo/HLRAlgo_EdgesBlock.cdl index 4d8b1d45fd..bebf129a3d 100755 --- a/src/HLRAlgo/HLRAlgo_EdgesBlock.cdl +++ b/src/HLRAlgo/HLRAlgo_EdgesBlock.cdl @@ -1,8 +1,7 @@ --- File: HLRAlgo_EdgesBlock.cdl --- Created: Mon Apr 6 17:57:45 1992 --- Author: Christophe MARION --- ----Copyright: Matra Datavision 1992 +-- File: HLRAlgo_EdgesBlock.cdl +-- Created: Mon Apr 6 17:57:45 1992 +-- Author: Christophe MARION +---Copyright: Matra Datavision 1992 class EdgesBlock from HLRAlgo inherits TShared from MMgt diff --git a/src/HLRAlgo/HLRAlgo_EdgesBlock.cxx b/src/HLRAlgo/HLRAlgo_EdgesBlock.cxx index 6e74257847..203b0a37ff 100755 --- a/src/HLRAlgo/HLRAlgo_EdgesBlock.cxx +++ b/src/HLRAlgo/HLRAlgo_EdgesBlock.cxx @@ -1,7 +1,8 @@ -// File: HLRAlgo_EdgesBlock.cxx -// Created: Fri Mar 27 17:08:48 1992 -// Author: Christophe MARION -// +// File: HLRAlgo_EdgesBlock.cxx +// Created: Fri Mar 27 17:08:48 1992 +// Author: Christophe MARION +// Copyright: OPEN CASCADE 2000 + #ifndef No_Exception #define No_Exception #endif @@ -26,4 +27,3 @@ void HLRAlgo_EdgesBlock::UpdateMinMax (const Standard_Address TotMinMax) for (Standard_Integer i = 0; i <= 15; i++) myMinMax[i] = ((Standard_Integer*)TotMinMax)[i]; } - diff --git a/src/HLRAlgo/HLRAlgo_EdgesBlock.lxx b/src/HLRAlgo/HLRAlgo_EdgesBlock.lxx index 9830cba510..4e155f87a8 100755 --- a/src/HLRAlgo/HLRAlgo_EdgesBlock.lxx +++ b/src/HLRAlgo/HLRAlgo_EdgesBlock.lxx @@ -1,7 +1,7 @@ -// File: HLRAlgo_EdgesBlock.lxx -// Created: Thu Apr 20 11:31:26 1995 -// Author: Christophe MARION -// +// File: HLRAlgo_EdgesBlock.lxx +// Created: Thu Apr 20 11:31:26 1995 +// Author: Christophe MARION +// Copyright: OPEN CASCADE 2000 #define EMaskOrient ((Standard_Boolean)15) #define EMaskOutLine ((Standard_Boolean)16) @@ -166,4 +166,3 @@ inline void HLRAlgo_EdgesBlock::IsoLine (const Standard_Integer I, inline Standard_Address HLRAlgo_EdgesBlock::MinMax () const { return (Standard_Address)&myMinMax; } - diff --git a/src/HLRAlgo/HLRAlgo_Intersection.cdl b/src/HLRAlgo/HLRAlgo_Intersection.cdl index d6b17f9380..23907bce19 100755 --- a/src/HLRAlgo/HLRAlgo_Intersection.cdl +++ b/src/HLRAlgo/HLRAlgo_Intersection.cdl @@ -1,8 +1,7 @@ --- File: Intersection.cdl --- Created: Fri Aug 21 10:41:54 1992 --- Author: Christophe MARION --- ----Copyright: Matra Datavision 1992 +-- File: HLRAlgo_Intersection.cdl +-- Created: Fri Aug 21 10:41:54 1992 +-- Author: Christophe MARION +---Copyright: Matra Datavision 1992 class Intersection from HLRAlgo diff --git a/src/HLRAlgo/HLRAlgo_Intersection.cxx b/src/HLRAlgo/HLRAlgo_Intersection.cxx index 53380b7f7c..a1815936c5 100755 --- a/src/HLRAlgo/HLRAlgo_Intersection.cxx +++ b/src/HLRAlgo/HLRAlgo_Intersection.cxx @@ -1,7 +1,7 @@ -// File: HLRAlgo_Intersection.cxx -// Created: Wed Feb 19 14:22:05 1992 -// Author: Christophe MARION -// +// File: HLRAlgo_Intersection.cxx +// Created: Wed Feb 19 14:22:05 1992 +// Author: Christophe MARION +// Copyright: OPEN CASCADE 2000 #include @@ -34,4 +34,3 @@ HLRAlgo_Intersection::HLRAlgo_Intersection myToler(Tol), myState(S) {} - diff --git a/src/HLRAlgo/HLRAlgo_Intersection.lxx b/src/HLRAlgo/HLRAlgo_Intersection.lxx index cb159da1af..a8e19b9e9a 100755 --- a/src/HLRAlgo/HLRAlgo_Intersection.lxx +++ b/src/HLRAlgo/HLRAlgo_Intersection.lxx @@ -1,7 +1,7 @@ -// File: HLRAlgo_Intersection.lxx -// Created: Wed Feb 19 14:21:57 1992 -// Author: Christophe MARION -// +// File: HLRAlgo_Intersection.lxx +// Created: Wed Feb 19 14:21:57 1992 +// Author: Christophe MARION +// Copyright: OPEN CASCADE 2000 //======================================================================= //function : Orientation @@ -114,4 +114,3 @@ inline void HLRAlgo_Intersection::State (const TopAbs_State St) inline TopAbs_State HLRAlgo_Intersection::State() const { return myState; } - diff --git a/src/HLRAlgo/HLRAlgo_PolyAlgo.cdl b/src/HLRAlgo/HLRAlgo_PolyAlgo.cdl index 384e921d26..b6a5cfc5f4 100755 --- a/src/HLRAlgo/HLRAlgo_PolyAlgo.cdl +++ b/src/HLRAlgo/HLRAlgo_PolyAlgo.cdl @@ -1,8 +1,7 @@ --- File: HLRAlgo_PolyAlgo.cdl --- Created: Tue Feb 18 10:36:07 1992 --- Author: Christophe MARION --- ----Copyright: Matra Datavision 1992 +-- File: HLRAlgo_PolyAlgo.cdl +-- Created: Tue Feb 18 10:36:07 1992 +-- Author: Christophe MARION +---Copyright: Matra Datavision 1992 class PolyAlgo from HLRAlgo inherits TShared from MMgt diff --git a/src/HLRAlgo/HLRAlgo_PolyAlgo.cxx b/src/HLRAlgo/HLRAlgo_PolyAlgo.cxx index fbba6ee617..21fa3cb1ad 100755 --- a/src/HLRAlgo/HLRAlgo_PolyAlgo.cxx +++ b/src/HLRAlgo/HLRAlgo_PolyAlgo.cxx @@ -1,7 +1,8 @@ -// File: HLRAlgo_PolyAlgo.cxx -// Created: Fri May 5 15:58:19 1995 -// Author: Christophe MARION -// +// File: HLRAlgo_PolyAlgo.cxx +// Created: Fri May 5 15:58:19 1995 +// Author: Christophe MARION +// Copyright: OPEN CASCADE 2000 + #ifndef No_Exception //#define No_Exception #endif @@ -219,11 +220,7 @@ void HLRAlgo_PolyAlgo::Update () Standard_Real X1,X2,X3,Y1,Y2,Y3,Z1,Z2,Z3; Standard_Real dn,dnx,dny,dnz,dx1,dy1,dz1,dx2,dy2,dz2,dx3,dy3; Standard_Real adx1,ady1,adx2,ady2,adx3,ady3; -#ifndef DEB Standard_Real a =0.,b =0.,c =0.,d =0.; -#else - Standard_Real a,b,c,d; -#endif const Standard_Address PolyTIndices = (*pd)->Indices(); TColgp_Array1OfXYZ & Nodes = (*pd)->Nodes(); HLRAlgo_Array1OfTData& TData = (*pd)->TData(); diff --git a/src/HLRAlgo/HLRAlgo_PolyAlgo.lxx b/src/HLRAlgo/HLRAlgo_PolyAlgo.lxx index f63edc7ad0..92913f45e6 100755 --- a/src/HLRAlgo/HLRAlgo_PolyAlgo.lxx +++ b/src/HLRAlgo/HLRAlgo_PolyAlgo.lxx @@ -1,7 +1,7 @@ -// File: HLRAlgo_PolyAlgo.lxx -// Created: Tue Jun 20 11:50:07 1995 -// Author: Christophe MARION -// +// File: HLRAlgo_PolyAlgo.lxx +// Created: Tue Jun 20 11:50:07 1995 +// Author: Christophe MARION +// Copyright: OPEN CASCADE 2000 #include diff --git a/src/HLRAlgo/HLRAlgo_PolyData.cdl b/src/HLRAlgo/HLRAlgo_PolyData.cdl index 05029dc727..a32477bc0a 100755 --- a/src/HLRAlgo/HLRAlgo_PolyData.cdl +++ b/src/HLRAlgo/HLRAlgo_PolyData.cdl @@ -1,8 +1,7 @@ --- File: HLRAlgo_PolyData.cdl --- Created: Fri Oct 29 15:19:08 1993 --- Author: Christophe MARION --- ----Copyright: Matra Datavision 1993 +-- File: HLRAlgo_PolyData.cdl +-- Created: Fri Oct 29 15:19:08 1993 +-- Author: Christophe MARION +---Copyright: Matra Datavision 1993 class PolyData from HLRAlgo inherits TShared from MMgt diff --git a/src/HLRAlgo/HLRAlgo_PolyData.cxx b/src/HLRAlgo/HLRAlgo_PolyData.cxx index cf355f8c23..0c5101bfec 100755 --- a/src/HLRAlgo/HLRAlgo_PolyData.cxx +++ b/src/HLRAlgo/HLRAlgo_PolyData.cxx @@ -1,7 +1,8 @@ -// File: HLRAlgo_PolyData.cxx -// Created: Mon Jan 11 13:58:26 1993 -// Author: Christophe MARION -// +// File: HLRAlgo_PolyData.cxx +// Created: Mon Jan 11 13:58:26 1993 +// Author: Christophe MARION +// Copyright: OPEN CASCADE 2000 + #ifndef No_Exception //#define No_Exception #endif @@ -807,4 +808,3 @@ HideByOneTriangle (const Standard_Address Coordinates, else status.Hide(psta,(Standard_ShortReal)TolParam,pend,(Standard_ShortReal)TolParam, Standard_False,Standard_False); } - diff --git a/src/HLRAlgo/HLRAlgo_PolyData.lxx b/src/HLRAlgo/HLRAlgo_PolyData.lxx index 011f4a5b83..40c99b690d 100755 --- a/src/HLRAlgo/HLRAlgo_PolyData.lxx +++ b/src/HLRAlgo/HLRAlgo_PolyData.lxx @@ -1,8 +1,7 @@ - -// File: HLRAlgo_PolyData.lxx -// Created: Mon Jan 11 13:58:26 1993 -// Author: Christophe MARION -// +// File: HLRAlgo_PolyData.lxx +// Created: Mon Jan 11 13:58:26 1993 +// Author: Christophe MARION +// Copyright: OPEN CASCADE 2000 #include #include @@ -68,4 +67,3 @@ inline Standard_Boolean HLRAlgo_PolyData::Hiding () const inline Standard_Address HLRAlgo_PolyData::Indices () { return (Standard_Address)myIndices; } - diff --git a/src/HLRAlgo/HLRAlgo_PolyHidingData.cdl b/src/HLRAlgo/HLRAlgo_PolyHidingData.cdl index 6a6ee23964..3a6874afbd 100755 --- a/src/HLRAlgo/HLRAlgo_PolyHidingData.cdl +++ b/src/HLRAlgo/HLRAlgo_PolyHidingData.cdl @@ -1,8 +1,7 @@ --- File: HLRAlgo_PolyHidingData.cdl --- Created: Fri Oct 29 15:19:08 1993 --- Author: Christophe MARION --- ----Copyright: Matra Datavision 1993 +-- File: HLRAlgo_PolyHidingData.cdl +-- Created: Fri Oct 29 15:19:08 1993 +-- Author: Christophe MARION +---Copyright: Matra Datavision 1993 class PolyHidingData from HLRAlgo diff --git a/src/HLRAlgo/HLRAlgo_PolyHidingData.cxx b/src/HLRAlgo/HLRAlgo_PolyHidingData.cxx index 94f4074b7c..3ac87c964d 100755 --- a/src/HLRAlgo/HLRAlgo_PolyHidingData.cxx +++ b/src/HLRAlgo/HLRAlgo_PolyHidingData.cxx @@ -1,7 +1,6 @@ -// File: HLRAlgo_PolyHidingData.cxx -// Created: Wed Jun 21 19:23:39 1995 -// Author: Christophe MARION -// +// File: HLRAlgo_PolyHidingData.cxx +// Created: Wed Jun 21 19:23:39 1995 +// Author: Christophe MARION +// Copyright: OPEN CASCADE 2000 #include - diff --git a/src/HLRAlgo/HLRAlgo_PolyHidingData.lxx b/src/HLRAlgo/HLRAlgo_PolyHidingData.lxx index c1118a0984..831d1f1448 100755 --- a/src/HLRAlgo/HLRAlgo_PolyHidingData.lxx +++ b/src/HLRAlgo/HLRAlgo_PolyHidingData.lxx @@ -1,7 +1,7 @@ -// File: HLRAlgo_PolyHidingData.lxx -// Created: Wed Jun 21 19:29:59 1995 -// Author: Christophe MARION -// +// File: HLRAlgo_PolyHidingData.lxx +// Created: Wed Jun 21 19:29:59 1995 +// Author: Christophe MARION +// Copyright: OPEN CASCADE 2000 //======================================================================= //function : PolyHidingData @@ -51,4 +51,3 @@ HLRAlgo_PolyHidingData::IndexAndMinMax() const inline Standard_Address HLRAlgo_PolyHidingData::Plan() const { return (Standard_Address)myPlan; } - diff --git a/src/HLRAlgo/HLRAlgo_PolyInternalData.cdl b/src/HLRAlgo/HLRAlgo_PolyInternalData.cdl index 008e833dbb..ed85b80549 100755 --- a/src/HLRAlgo/HLRAlgo_PolyInternalData.cdl +++ b/src/HLRAlgo/HLRAlgo_PolyInternalData.cdl @@ -1,8 +1,7 @@ --- File: HLRAlgo_PolyInternalData.cdl --- Created: Fri Oct 29 15:19:08 1993 --- Author: Christophe MARION --- ----Copyright: Matra Datavision 1993 +-- File: HLRAlgo_PolyInternalData.cdl +-- Created: Fri Oct 29 15:19:08 1993 +-- Author: Christophe MARION +---Copyright: Matra Datavision 1993 class PolyInternalData from HLRAlgo inherits TShared from MMgt diff --git a/src/HLRAlgo/HLRAlgo_PolyInternalData.cxx b/src/HLRAlgo/HLRAlgo_PolyInternalData.cxx index e404ba117f..d06566bcbd 100755 --- a/src/HLRAlgo/HLRAlgo_PolyInternalData.cxx +++ b/src/HLRAlgo/HLRAlgo_PolyInternalData.cxx @@ -1,7 +1,7 @@ -// File: HLRAlgo_PolyInternalData.cxx -// Created: Tue Jul 11 16:59:46 1995 -// Author: Christophe MARION -// +// File: HLRAlgo_PolyInternalData.cxx +// Created: Tue Jul 11 16:59:46 1995 +// Author: Christophe MARION +// Copyright: OPEN CASCADE 2000 #include #include @@ -917,4 +917,3 @@ IncPINod (Standard_Address& PINod1, } myNbPINod++; } - diff --git a/src/HLRAlgo/HLRAlgo_PolyInternalData.lxx b/src/HLRAlgo/HLRAlgo_PolyInternalData.lxx index 9a3093217c..1936725dad 100755 --- a/src/HLRAlgo/HLRAlgo_PolyInternalData.lxx +++ b/src/HLRAlgo/HLRAlgo_PolyInternalData.lxx @@ -1,7 +1,7 @@ -// File: HLRAlgo_PolyInternalData.lxx -// Created: Mon Jan 11 13:58:26 1993 -// Author: Christophe MARION -// +// File: HLRAlgo_PolyInternalData.lxx +// Created: Mon Jan 11 13:58:26 1993 +// Author: Christophe MARION +// Copyright: OPEN CASCADE 2000 #include #include @@ -126,4 +126,3 @@ HLRAlgo_PolyInternalData::PINod () const inline HLRAlgo_Array1OfPISeg & HLRAlgo_PolyInternalData::PISeg () const { return myPISeg->ChangeArray1(); } - diff --git a/src/HLRAlgo/HLRAlgo_PolyInternalNode.cdl b/src/HLRAlgo/HLRAlgo_PolyInternalNode.cdl index a54f99e520..46929ef496 100755 --- a/src/HLRAlgo/HLRAlgo_PolyInternalNode.cdl +++ b/src/HLRAlgo/HLRAlgo_PolyInternalNode.cdl @@ -1,8 +1,7 @@ --- File: HLRAlgo_PolyInternalNode.cdl --- Created: Fri Jan 10 22:23:38 1997 --- Author: Christophe MARION --- ----Copyright: Matra Datavision 1997 +-- File: HLRAlgo_PolyInternalNode.cdl +-- Created: Fri Jan 10 22:23:38 1997 +-- Author: Christophe MARION +---Copyright: Matra Datavision 1997 class PolyInternalNode from HLRAlgo inherits TShared from MMgt diff --git a/src/HLRAlgo/HLRAlgo_PolyInternalNode.cxx b/src/HLRAlgo/HLRAlgo_PolyInternalNode.cxx index e41b4b2632..f3392cf604 100755 --- a/src/HLRAlgo/HLRAlgo_PolyInternalNode.cxx +++ b/src/HLRAlgo/HLRAlgo_PolyInternalNode.cxx @@ -1,6 +1,6 @@ -// File: HLRAlgo_PolyInternalNode.cxx -// Created: Fri Jan 10 22:25:33 1997 -// Author: Christophe MARION -// +// File: HLRAlgo_PolyInternalNode.cxx +// Created: Fri Jan 10 22:25:33 1997 +// Author: Christophe MARION +// Copyright: OPEN CASCADE 2000 #include diff --git a/src/HLRAlgo/HLRAlgo_PolyInternalNode.lxx b/src/HLRAlgo/HLRAlgo_PolyInternalNode.lxx index af22263ffa..8938a1d96f 100755 --- a/src/HLRAlgo/HLRAlgo_PolyInternalNode.lxx +++ b/src/HLRAlgo/HLRAlgo_PolyInternalNode.lxx @@ -1,7 +1,7 @@ -// File: HLRAlgo_PolyInternalNode.lxx -// Created: Fri Jan 10 22:25:51 1997 -// Author: Christophe MARION -// +// File: HLRAlgo_PolyInternalNode.lxx +// Created: Fri Jan 10 22:25:51 1997 +// Author: Christophe MARION +// Copyright: OPEN CASCADE 2000 //======================================================================= //function : HLRAlgo_PolyInternalNode @@ -31,4 +31,3 @@ inline Standard_Address HLRAlgo_PolyInternalNode::Indices () const inline Standard_Address HLRAlgo_PolyInternalNode::RValues () const { return (Standard_Address)myRValues; } - diff --git a/src/HLRAlgo/HLRAlgo_PolyInternalSegment.cdl b/src/HLRAlgo/HLRAlgo_PolyInternalSegment.cdl index 37439d260f..bdbb2dd0b4 100755 --- a/src/HLRAlgo/HLRAlgo_PolyInternalSegment.cdl +++ b/src/HLRAlgo/HLRAlgo_PolyInternalSegment.cdl @@ -1,8 +1,7 @@ --- File: HLRAlgo_PolyInternalSegment.cdl --- Created: Tue Dec 3 17:00:57 1996 --- Author: Christophe MARION --- ----Copyright: Matra Datavision 1996 +-- File: HLRAlgo_PolyInternalSegment.cdl +-- Created: Tue Dec 3 17:00:57 1996 +-- Author: Christophe MARION +---Copyright: Matra Datavision 1996 class PolyInternalSegment from HLRAlgo diff --git a/src/HLRAlgo/HLRAlgo_PolyInternalSegment.cxx b/src/HLRAlgo/HLRAlgo_PolyInternalSegment.cxx index f590acd2c4..51a2891113 100755 --- a/src/HLRAlgo/HLRAlgo_PolyInternalSegment.cxx +++ b/src/HLRAlgo/HLRAlgo_PolyInternalSegment.cxx @@ -1,7 +1,6 @@ -// File: HLRAlgo_PolyInternalSegment.cxx -// Created: Tue Dec 3 17:23:48 1996 -// Author: Christophe MARION -// +// File: HLRAlgo_PolyInternalSegment.cxx +// Created: Tue Dec 3 17:23:48 1996 +// Author: Christophe MARION +// Copyright: OPEN CASCADE 2000 #include - diff --git a/src/HLRAlgo/HLRAlgo_PolyInternalSegment.lxx b/src/HLRAlgo/HLRAlgo_PolyInternalSegment.lxx index f884a5f3a0..29ed070668 100755 --- a/src/HLRAlgo/HLRAlgo_PolyInternalSegment.lxx +++ b/src/HLRAlgo/HLRAlgo_PolyInternalSegment.lxx @@ -1,7 +1,7 @@ -// File: HLRAlgo_PolyInternalSegment.lxx -// Created: Tue Dec 3 17:09:42 1996 -// Author: Christophe MARION -// +// File: HLRAlgo_PolyInternalSegment.lxx +// Created: Tue Dec 3 17:09:42 1996 +// Author: Christophe MARION +// Copyright: OPEN CASCADE 2000 //======================================================================= //function : HLRAlgo_PolyInternalSegment @@ -18,4 +18,3 @@ inline HLRAlgo_PolyInternalSegment::HLRAlgo_PolyInternalSegment () inline Standard_Address HLRAlgo_PolyInternalSegment::Indices () const { return (Standard_Address)myIndices; } - diff --git a/src/HLRAlgo/HLRAlgo_PolyShellData.cdl b/src/HLRAlgo/HLRAlgo_PolyShellData.cdl index d0bb21988d..922fe30f2f 100755 --- a/src/HLRAlgo/HLRAlgo_PolyShellData.cdl +++ b/src/HLRAlgo/HLRAlgo_PolyShellData.cdl @@ -1,8 +1,7 @@ --- File: HLRAlgo_PolyShellData.cdl --- Created: Fri Oct 29 15:19:08 1993 --- Author: Christophe MARION --- ----Copyright: Matra Datavision 1993 +-- File: HLRAlgo_PolyShellData.cdl +-- Created: Fri Oct 29 15:19:08 1993 +-- Author: Christophe MARION +---Copyright: Matra Datavision 1993 class PolyShellData from HLRAlgo inherits TShared from MMgt diff --git a/src/HLRAlgo/HLRAlgo_PolyShellData.cxx b/src/HLRAlgo/HLRAlgo_PolyShellData.cxx index d8ab1d48c3..4fe2ccd22c 100755 --- a/src/HLRAlgo/HLRAlgo_PolyShellData.cxx +++ b/src/HLRAlgo/HLRAlgo_PolyShellData.cxx @@ -1,7 +1,8 @@ -// File: HLRAlgo_PolyShellData.cxx -// Created: Fri May 5 15:58:19 1995 -// Author: Christophe MARION -// +// File: HLRAlgo_PolyShellData.cxx +// Created: Fri May 5 15:58:19 1995 +// Author: Christophe MARION +// Copyright: OPEN CASCADE 2000 + #ifndef No_Exception //#define No_Exception #endif @@ -101,4 +102,3 @@ UpdateHiding (const Standard_Integer nbHiding) myHPolHi = new TColStd_HArray1OfTransient(1,nbHiding); else myHPolHi.Nullify(); } - diff --git a/src/HLRAlgo/HLRAlgo_PolyShellData.lxx b/src/HLRAlgo/HLRAlgo_PolyShellData.lxx index 65f054a3bb..30ac1871d0 100755 --- a/src/HLRAlgo/HLRAlgo_PolyShellData.lxx +++ b/src/HLRAlgo/HLRAlgo_PolyShellData.lxx @@ -1,7 +1,7 @@ -// File: HLRAlgo_PolyShellData.lxx -// Created: Fri May 5 15:58:19 1995 -// Author: Christophe MARION -// +// File: HLRAlgo_PolyShellData.lxx +// Created: Fri May 5 15:58:19 1995 +// Author: Christophe MARION +// Copyright: OPEN CASCADE 2000 #include @@ -48,4 +48,3 @@ HLRAlgo_PolyShellData::Edges () inline Standard_Address HLRAlgo_PolyShellData::Indices () { return (Standard_Address)myMinMax; } - diff --git a/src/HLRAlgo/HLRAlgo_Projector.cdl b/src/HLRAlgo/HLRAlgo_Projector.cdl index fa1d95564c..190c3eecff 100755 --- a/src/HLRAlgo/HLRAlgo_Projector.cdl +++ b/src/HLRAlgo/HLRAlgo_Projector.cdl @@ -1,8 +1,7 @@ --- File: HLRAlgo_Projector.cdl --- Created: Thu Mar 12 13:32:28 1992 --- Author: Christophe MARION --- ----Copyright: Matra Datavision 1992 +-- File: HLRAlgo_Projector.cdl +-- Created: Thu Mar 12 13:32:28 1992 +-- Author: Christophe MARION +---Copyright: Matra Datavision 1992 class Projector from HLRAlgo ---Purpose: Implements a projector object. diff --git a/src/HLRAlgo/HLRAlgo_Projector.cxx b/src/HLRAlgo/HLRAlgo_Projector.cxx index c1e0c56512..bbf5521cd2 100755 --- a/src/HLRAlgo/HLRAlgo_Projector.cxx +++ b/src/HLRAlgo/HLRAlgo_Projector.cxx @@ -1,7 +1,8 @@ -// File: HLRAlgo_Projector.cxx -// Created: Fri Mar 13 11:08:32 1992 -// Author: Christophe MARION -// +// File: HLRAlgo_Projector.cxx +// Created: Fri Mar 13 11:08:32 1992 +// Author: Christophe MARION +// Copyright: OPEN CASCADE 2000 + #ifndef No_Exception // #define No_Exception #endif diff --git a/src/HLRAlgo/HLRAlgo_Projector.lxx b/src/HLRAlgo/HLRAlgo_Projector.lxx index ef12545d1d..0e692b0beb 100755 --- a/src/HLRAlgo/HLRAlgo_Projector.lxx +++ b/src/HLRAlgo/HLRAlgo_Projector.lxx @@ -1,7 +1,7 @@ -// File: HLRAlgo_Projector.lxx -// Created: Thu Jul 9 12:50:25 1992 -// Author: Christophe MARION -// +// File: HLRAlgo_Projector.lxx +// Created: Thu Jul 9 12:50:25 1992 +// Author: Christophe MARION +// Copyright: OPEN CASCADE 2000 #include #include @@ -81,4 +81,3 @@ inline void HLRAlgo_Projector::Transform (gp_Vec& D) const inline void HLRAlgo_Projector::Transform (gp_Pnt& Pnt) const { Pnt.Transform(myTrsf); } - diff --git a/src/HLRAlgo/HLRAlgo_TriangleData.cdl b/src/HLRAlgo/HLRAlgo_TriangleData.cdl index a6e5aaeced..72cfd8fe1e 100755 --- a/src/HLRAlgo/HLRAlgo_TriangleData.cdl +++ b/src/HLRAlgo/HLRAlgo_TriangleData.cdl @@ -1,8 +1,7 @@ --- File: HLRAlgo_TriangleData.cdl --- Created: Fri Oct 29 15:19:08 1993 --- Author: Christophe MARION --- ----Copyright: Matra Datavision 1993 +-- File: HLRAlgo_TriangleData.cdl +-- Created: Fri Oct 29 15:19:08 1993 +-- Author: Christophe MARION +---Copyright: Matra Datavision 1993 class TriangleData from HLRAlgo diff --git a/src/HLRAlgo/HLRAlgo_TriangleData.cxx b/src/HLRAlgo/HLRAlgo_TriangleData.cxx index de523efe8f..9fcb151332 100755 --- a/src/HLRAlgo/HLRAlgo_TriangleData.cxx +++ b/src/HLRAlgo/HLRAlgo_TriangleData.cxx @@ -1,7 +1,6 @@ -// File: HLRAlgo_TriangleData.cxx -// Created: Mon Jan 11 13:58:26 1993 -// Author: Christophe MARION -// +// File: HLRAlgo_TriangleData.cxx +// Created: Mon Jan 11 13:58:26 1993 +// Author: Christophe MARION +// Copyright: OPEN CASCADE 2000 #include - diff --git a/src/HLRAlgo/HLRAlgo_TriangleData.lxx b/src/HLRAlgo/HLRAlgo_TriangleData.lxx index c30b17ae2d..abc1d10b2d 100755 --- a/src/HLRAlgo/HLRAlgo_TriangleData.lxx +++ b/src/HLRAlgo/HLRAlgo_TriangleData.lxx @@ -1,7 +1,7 @@ -// File: HLRAlgo_TriangleData.lxx -// Created: Mon Jan 11 13:58:26 1993 -// Author: Christophe MARION -// +// File: HLRAlgo_TriangleData.lxx +// Created: Mon Jan 11 13:58:26 1993 +// Author: Christophe MARION +// Copyright: OPEN CASCADE 2000 //======================================================================= //function : TriangleData @@ -18,4 +18,3 @@ inline HLRAlgo_TriangleData::HLRAlgo_TriangleData () inline Standard_Address HLRAlgo_TriangleData::Indices () const { return (Standard_Address)myIndices; } - diff --git a/src/HLRAlgo/HLRAlgo_WiresBlock.cdl b/src/HLRAlgo/HLRAlgo_WiresBlock.cdl index a32cc45e9d..29a1aab35e 100755 --- a/src/HLRAlgo/HLRAlgo_WiresBlock.cdl +++ b/src/HLRAlgo/HLRAlgo_WiresBlock.cdl @@ -1,8 +1,7 @@ --- File: HLRAlgo_WiresBlock.cdl --- Created: Mon Apr 6 17:56:12 1992 --- Author: Christophe MARION --- ----Copyright: Matra Datavision 1992 +-- File: HLRAlgo_WiresBlock.cdl +-- Created: Mon Apr 6 17:56:12 1992 +-- Author: Christophe MARION +---Copyright: Matra Datavision 1992 class WiresBlock from HLRAlgo inherits TShared from MMgt diff --git a/src/HLRAlgo/HLRAlgo_WiresBlock.cxx b/src/HLRAlgo/HLRAlgo_WiresBlock.cxx index 11d6e3718f..131b3c99db 100755 --- a/src/HLRAlgo/HLRAlgo_WiresBlock.cxx +++ b/src/HLRAlgo/HLRAlgo_WiresBlock.cxx @@ -1,7 +1,8 @@ -// File: HLRAlgo_WiresBlock.cxx -// Created: Fri Mar 27 17:08:48 1992 -// Author: Christophe MARION -// +// File: HLRAlgo_WiresBlock.cxx +// Created: Fri Mar 27 17:08:48 1992 +// Author: Christophe MARION +// Copyright: OPEN CASCADE 2000 + #ifndef No_Exception #define No_Exception #endif @@ -52,4 +53,3 @@ void HLRAlgo_WiresBlock::UpdateMinMax (const Standard_Address TotMinMax) for (Standard_Integer i = 0; i <= 15; i++) myMinMax[i] = ((Standard_Integer*)TotMinMax)[i]; } - diff --git a/src/HLRAlgo/HLRAlgo_WiresBlock.lxx b/src/HLRAlgo/HLRAlgo_WiresBlock.lxx index dc3099420e..f7c335ab27 100755 --- a/src/HLRAlgo/HLRAlgo_WiresBlock.lxx +++ b/src/HLRAlgo/HLRAlgo_WiresBlock.lxx @@ -1,7 +1,7 @@ -// File: HLRAlgo_WiresBlock.lxx -// Created: Tue Sep 5 15:11:36 1995 -// Author: Christophe MARION -// +// File: HLRAlgo_WiresBlock.lxx +// Created: Tue Sep 5 15:11:36 1995 +// Author: Christophe MARION +// Copyright: OPEN CASCADE 2000 //======================================================================= //function : MinMax @@ -10,4 +10,3 @@ inline Standard_Address HLRAlgo_WiresBlock::MinMax () const { return (Standard_Address)&myMinMax; } - diff --git a/src/HLRBRep/HLRBRep.cdl b/src/HLRBRep/HLRBRep.cdl index ec0d57fb4c..45c7e83be0 100755 --- a/src/HLRBRep/HLRBRep.cdl +++ b/src/HLRBRep/HLRBRep.cdl @@ -1,8 +1,7 @@ --- File: HLRBRep.cdl --- Created: Wed Oct 14 11:08:52 1992 --- Author: Christophe MARION --- ----Copyright: Matra Datavision 1992 +-- File: HLRBRep.cdl +-- Created: Wed Oct 14 11:08:52 1992 +-- Author: Christophe MARION +---Copyright: Matra Datavision 1992 package HLRBRep ---Purpose: Hidden Lines Removal diff --git a/src/HLRBRep/HLRBRep.cxx b/src/HLRBRep/HLRBRep.cxx index ce8eaa06d2..cb5f4fddd0 100755 --- a/src/HLRBRep/HLRBRep.cxx +++ b/src/HLRBRep/HLRBRep.cxx @@ -1,7 +1,7 @@ -// File: HLRBRep.cxx -// Created: Thu Aug 27 12:33:14 1992 -// Author: Christophe MARION -// +// File: HLRBRep.cxx +// Created: Thu Aug 27 12:33:14 1992 +// Author: Christophe MARION +// Copyright: OPEN CASCADE 2000 #include #include @@ -116,4 +116,3 @@ HLRBRep::PolyHLRAngleAndDeflection (const Standard_Real InAngl, (HAngMax - HAngLim) / (HAngMax - HAngMin)); OutDefl = OutAngl * OutAngl * 0.5; } - diff --git a/src/HLRBRep/HLRBRep_Algo.cdl b/src/HLRBRep/HLRBRep_Algo.cdl index 236356d2bf..e23c21e338 100755 --- a/src/HLRBRep/HLRBRep_Algo.cdl +++ b/src/HLRBRep/HLRBRep_Algo.cdl @@ -1,8 +1,7 @@ --- File: HLRBRep_Algo.cdl --- Created: Wed Aug 3 16:15:26 1994 --- Author: Christophe MARION --- ----Copyright: Matra Datavision 1994 +-- File: HLRBRep_Algo.cdl +-- Created: Wed Aug 3 16:15:26 1994 +-- Author: Christophe MARION +---Copyright: Matra Datavision 1994 class Algo from HLRBRep inherits InternalAlgo from HLRBRep diff --git a/src/HLRBRep/HLRBRep_Algo.cxx b/src/HLRBRep/HLRBRep_Algo.cxx index 216b91c5e6..2889ab27f0 100755 --- a/src/HLRBRep/HLRBRep_Algo.cxx +++ b/src/HLRBRep/HLRBRep_Algo.cxx @@ -1,7 +1,7 @@ -// File: HLRBRep_Algo.cxx -// Created: Thu Aug 4 10:18:44 1994 -// Author: Christophe MARION -// +// File: HLRBRep_Algo.cxx +// Created: Thu Aug 4 10:18:44 1994 +// Author: Christophe MARION +// Copyright: OPEN CASCADE 2000 #define No_Standard_OutOfRange @@ -80,4 +80,3 @@ void HLRBRep_Algo::OutLinedShapeNullify () ShapeBounds(i).Shape()->DataStructure().Clear(); } } - diff --git a/src/HLRBRep/HLRBRep_AreaLimit.cdl b/src/HLRBRep/HLRBRep_AreaLimit.cdl index d9dc3d8d40..cf398a2453 100755 --- a/src/HLRBRep/HLRBRep_AreaLimit.cdl +++ b/src/HLRBRep/HLRBRep_AreaLimit.cdl @@ -1,8 +1,7 @@ --- File: HLRBRep_AreaLimit.cdl --- Created: Thu Apr 17 20:21:04 1997 --- Author: Christophe MARION --- ----Copyright: Matra Datavision 1997 +-- File: HLRBRep_AreaLimit.cdl +-- Created: Thu Apr 17 20:21:04 1997 +-- Author: Christophe MARION +---Copyright: Matra Datavision 1997 class AreaLimit from HLRBRep inherits TShared from MMgt @@ -88,4 +87,3 @@ fields myNext : AreaLimit from HLRBRep; end AreaLimit; - diff --git a/src/HLRBRep/HLRBRep_AreaLimit.cxx b/src/HLRBRep/HLRBRep_AreaLimit.cxx index 893aa23d69..3211c3a6f7 100755 --- a/src/HLRBRep/HLRBRep_AreaLimit.cxx +++ b/src/HLRBRep/HLRBRep_AreaLimit.cxx @@ -1,8 +1,7 @@ -// File: HLRBRep_AreaLimit.cxx -// Created: Thu Apr 17 21:43:21 1997 -// Author: Christophe MARION -// - +// File: HLRBRep_AreaLimit.cxx +// Created: Thu Apr 17 21:43:21 1997 +// Author: Christophe MARION +// Copyright: OPEN CASCADE 2000 #include @@ -189,4 +188,3 @@ void HLRBRep_AreaLimit::Clear() myPrevious.Nullify(); myNext.Nullify(); } - diff --git a/src/HLRBRep/HLRBRep_BCurveTool.cdl b/src/HLRBRep/HLRBRep_BCurveTool.cdl index 7c68ccac0a..a82e1dd4e3 100755 --- a/src/HLRBRep/HLRBRep_BCurveTool.cdl +++ b/src/HLRBRep/HLRBRep_BCurveTool.cdl @@ -1,8 +1,7 @@ --- File: HLRBRep_BCurveTool.cdl --- Created: Mon Jul 17 16:25:23 1995 --- Author: Modelistation --- ----Copyright: Matra Datavision 1995 +-- File: HLRBRep_BCurveTool.cdl +-- Created: Mon Jul 17 16:25:23 1995 +-- Author: Modelistation +---Copyright: Matra Datavision 1995 class BCurveTool from HLRBRep diff --git a/src/HLRBRep/HLRBRep_BCurveTool.cxx b/src/HLRBRep/HLRBRep_BCurveTool.cxx index d0d0684ac9..4fe702d7f5 100755 --- a/src/HLRBRep/HLRBRep_BCurveTool.cxx +++ b/src/HLRBRep/HLRBRep_BCurveTool.cxx @@ -1,7 +1,7 @@ -// File: HLRBRep_BCurveTool.cxx -// Created: Mon Jul 17 17:39:39 1995 -// Author: Modelistation -// +// File: HLRBRep_BCurveTool.cxx +// Created: Mon Jul 17 17:39:39 1995 +// Author: Modelistation +// Copyright: OPEN CASCADE 2000 #include #include @@ -94,4 +94,3 @@ Handle(Geom_BezierCurve) Handle(Geom_BSplineCurve) HLRBRep_BCurveTool::BSpline (const BRepAdaptor_Curve& C) { return(C.BSpline()); } - diff --git a/src/HLRBRep/HLRBRep_BCurveTool.lxx b/src/HLRBRep/HLRBRep_BCurveTool.lxx index 11fade855a..763544d68b 100755 --- a/src/HLRBRep/HLRBRep_BCurveTool.lxx +++ b/src/HLRBRep/HLRBRep_BCurveTool.lxx @@ -1,7 +1,7 @@ -// File: HLRBRep_BCurveTool.lxx -// Created: Thu Oct 22 12:14:59 1992 -// Author: Laurent BUCHARD -// +// File: HLRBRep_BCurveTool.lxx +// Created: Thu Oct 22 12:14:59 1992 +// Author: Laurent BUCHARD +// Copyright: OPEN CASCADE 2000 #include #include @@ -253,4 +253,3 @@ HLRBRep_BCurveTool::NbPoles (const BRepAdaptor_Curve& C) inline Standard_Integer HLRBRep_BCurveTool::NbKnots(const BRepAdaptor_Curve& C) { return(C.NbKnots()); } - diff --git a/src/HLRBRep/HLRBRep_BSurfaceTool.cdl b/src/HLRBRep/HLRBRep_BSurfaceTool.cdl index 49059c6c6f..fc0181c722 100755 --- a/src/HLRBRep/HLRBRep_BSurfaceTool.cdl +++ b/src/HLRBRep/HLRBRep_BSurfaceTool.cdl @@ -1,8 +1,7 @@ --- File: HLRBRep_BSurfaceTool.cdl --- Created: Fri Jul 2 16:59:47 1993 --- Author: Laurent BUCHARD --- ----Copyright: Matra Datavision 1993 +-- File: HLRBRep_BSurfaceTool.cdl +-- Created: Fri Jul 2 16:59:47 1993 +-- Author: Laurent BUCHARD +---Copyright: Matra Datavision 1993 class BSurfaceTool from HLRBRep diff --git a/src/HLRBRep/HLRBRep_BSurfaceTool.cxx b/src/HLRBRep/HLRBRep_BSurfaceTool.cxx index 26ff291ae6..68927ccb2e 100755 --- a/src/HLRBRep/HLRBRep_BSurfaceTool.cxx +++ b/src/HLRBRep/HLRBRep_BSurfaceTool.cxx @@ -1,8 +1,8 @@ -//-- File : HLRBRep_BSurfaceTool.cxx -//-- Created : Wed Jui 7 18:00:00 1993 -//-- Author : Laurent BUCHARD -//-- -//-- Copyright: Matra Datavision 1993 +// File: HLRBRep_BSurfaceTool.cxx +// Created: Wed Jui 7 18:00:00 1993 +// Author: Laurent BUCHARD +// Copyright: Matra Datavision 1993 +// Copyright: OPEN CASCADE 2000 #include #include @@ -152,4 +152,3 @@ HLRBRep_BSurfaceTool::NbSamplesV(const BRepAdaptor_Surface& S, } return(n); } - diff --git a/src/HLRBRep/HLRBRep_BSurfaceTool.lxx b/src/HLRBRep/HLRBRep_BSurfaceTool.lxx index 04736e7b18..b6a320cf8d 100755 --- a/src/HLRBRep/HLRBRep_BSurfaceTool.lxx +++ b/src/HLRBRep/HLRBRep_BSurfaceTool.lxx @@ -1,8 +1,8 @@ -//-- File : HLRBRep_BSurfaceTool.lxx -//-- Created : Wed Jui 7 18:00:00 1993 -//-- Author : Laurent BUCHARD -//-- -//-- Copyright: Matra Datavision 1993 +// File: HLRBRep_BSurfaceTool.lxx +// Created: Wed Jui 7 18:00:00 1993 +// Author: Laurent BUCHARD +// Copyright: Matra Datavision 1993 +// Copyright: OPEN CASCADE 2000 #include #include @@ -472,4 +472,3 @@ HLRBRep_BSurfaceTool::NbVKnots(const BRepAdaptor_Surface& S) inline Standard_Boolean HLRBRep_BSurfaceTool::IsVRational(const BRepAdaptor_Surface& S) { return(S.IsVRational()); } - diff --git a/src/HLRBRep/HLRBRep_BiPnt2D.cdl b/src/HLRBRep/HLRBRep_BiPnt2D.cdl index d5be00757b..2ec57d68d8 100755 --- a/src/HLRBRep/HLRBRep_BiPnt2D.cdl +++ b/src/HLRBRep/HLRBRep_BiPnt2D.cdl @@ -1,8 +1,7 @@ --- File: HLRBRep_BiPnt2D.cdl --- Created: Fri Aug 21 17:10:30 1992 --- Author: Christophe MARION --- ----Copyright: Matra Datavision 1992 +-- File: HLRBRep_BiPnt2D.cdl +-- Created: Fri Aug 21 17:10:30 1992 +-- Author: Christophe MARION +---Copyright: Matra Datavision 1992 class BiPnt2D from HLRBRep diff --git a/src/HLRBRep/HLRBRep_BiPnt2D.cxx b/src/HLRBRep/HLRBRep_BiPnt2D.cxx index 9a96ee963c..8852b56da4 100755 --- a/src/HLRBRep/HLRBRep_BiPnt2D.cxx +++ b/src/HLRBRep/HLRBRep_BiPnt2D.cxx @@ -1,7 +1,7 @@ -// File: HLRBRep_BiPnt2D.cxx -// Created: Tue Aug 25 10:43:05 1992 -// Author: Christophe MARION -// +// File: HLRBRep_BiPnt2D.cxx +// Created: Tue Aug 25 10:43:05 1992 +// Author: Christophe MARION +// Copyright: OPEN CASCADE 2000 #include @@ -38,4 +38,3 @@ HLRBRep_BiPnt2D::HLRBRep_BiPnt2D (const Standard_Real x1, OutLine(outl); IntLine(intl); } - diff --git a/src/HLRBRep/HLRBRep_BiPnt2D.lxx b/src/HLRBRep/HLRBRep_BiPnt2D.lxx index dfdbde5f9c..86fc63d219 100755 --- a/src/HLRBRep/HLRBRep_BiPnt2D.lxx +++ b/src/HLRBRep/HLRBRep_BiPnt2D.lxx @@ -1,7 +1,7 @@ -// File: HLRBRep_BiPnt2D.lxx -// Created: Tue Aug 25 10:43:05 1992 -// Author: Christophe MARION -// +// File: HLRBRep_BiPnt2D.lxx +// Created: Tue Aug 25 10:43:05 1992 +// Author: Christophe MARION +// Copyright: OPEN CASCADE 2000 #define EMskRg1Line ((Standard_Boolean)1) #define EMskRgNLine ((Standard_Boolean)2) @@ -115,4 +115,3 @@ inline void HLRBRep_BiPnt2D::IntLine (const Standard_Boolean B) if (B) myFlags |= EMskIntLine; else myFlags &= ~EMskIntLine; } - diff --git a/src/HLRBRep/HLRBRep_BiPoint.cdl b/src/HLRBRep/HLRBRep_BiPoint.cdl index 63a0dddd82..4ab70939d9 100755 --- a/src/HLRBRep/HLRBRep_BiPoint.cdl +++ b/src/HLRBRep/HLRBRep_BiPoint.cdl @@ -1,8 +1,7 @@ --- File: HLRBRep_BiPoint.cdl --- Created: Fri Aug 21 17:10:30 1992 --- Author: Christophe MARION --- ----Copyright: Matra Datavision 1992 +-- File: HLRBRep_BiPoint.cdl +-- Created: Fri Aug 21 17:10:30 1992 +-- Author: Christophe MARION +---Copyright: Matra Datavision 1992 class BiPoint from HLRBRep diff --git a/src/HLRBRep/HLRBRep_BiPoint.cxx b/src/HLRBRep/HLRBRep_BiPoint.cxx index ed4ac382e5..86eae38f72 100755 --- a/src/HLRBRep/HLRBRep_BiPoint.cxx +++ b/src/HLRBRep/HLRBRep_BiPoint.cxx @@ -1,7 +1,7 @@ -// File: HLRBRep_BiPoint.cxx -// Created: Tue Aug 25 10:43:05 1992 -// Author: Christophe MARION -// +// File: HLRBRep_BiPoint.cxx +// Created: Tue Aug 25 10:43:05 1992 +// Author: Christophe MARION +// Copyright: OPEN CASCADE 2000 #include @@ -40,4 +40,3 @@ HLRBRep_BiPoint::HLRBRep_BiPoint (const Standard_Real x1, OutLine(outl); IntLine(intl); } - diff --git a/src/HLRBRep/HLRBRep_BiPoint.lxx b/src/HLRBRep/HLRBRep_BiPoint.lxx index 9e74b3b387..7d475ac4d6 100755 --- a/src/HLRBRep/HLRBRep_BiPoint.lxx +++ b/src/HLRBRep/HLRBRep_BiPoint.lxx @@ -1,7 +1,7 @@ -// File: HLRBRep_BiPoint.lxx -// Created: Tue Aug 25 10:43:05 1992 -// Author: Christophe MARION -// +// File: HLRBRep_BiPoint.lxx +// Created: Tue Aug 25 10:43:05 1992 +// Author: Christophe MARION +// Copyright: OPEN CASCADE 2000 #define EMskRg1Line ((Standard_Boolean)1) #define EMskRgNLine ((Standard_Boolean)2) @@ -115,4 +115,3 @@ inline void HLRBRep_BiPoint::IntLine (const Standard_Boolean B) if (B) myFlags |= EMskIntLine; else myFlags &= ~EMskIntLine; } - diff --git a/src/HLRBRep/HLRBRep_CLPropsATool.cdl b/src/HLRBRep/HLRBRep_CLPropsATool.cdl index 3d9a88ebdc..67bf4c024b 100755 --- a/src/HLRBRep/HLRBRep_CLPropsATool.cdl +++ b/src/HLRBRep/HLRBRep_CLPropsATool.cdl @@ -1,8 +1,7 @@ --- File: HLRBRep_CLPropsATool.cdl --- Created: Tue Apr 20 18:34:23 1993 --- Author: Modelistation --- ----Copyright: Matra Datavision 1993 +-- File: HLRBRep_CLPropsATool.cdl +-- Created: Tue Apr 20 18:34:23 1993 +-- Author: Modelistation +---Copyright: Matra Datavision 1993 class CLPropsATool from HLRBRep @@ -73,4 +72,3 @@ is ---C++: inline end CLPropsATool; - diff --git a/src/HLRBRep/HLRBRep_CLPropsATool.cxx b/src/HLRBRep/HLRBRep_CLPropsATool.cxx index 82e87d2cb8..a99bdb94c8 100755 --- a/src/HLRBRep/HLRBRep_CLPropsATool.cxx +++ b/src/HLRBRep/HLRBRep_CLPropsATool.cxx @@ -1,6 +1,6 @@ -// File: HLRBRep_CLPropsTool.cxx -// Created: Tue Aug 18 15:40:26 1992 -// Author: Herve LEGRAND -// +// File: HLRBRep_CLPropsTool.cxx +// Created: Tue Aug 18 15:40:26 1992 +// Author: Herve LEGRAND +// Copyright: OPEN CASCADE 2000 #include diff --git a/src/HLRBRep/HLRBRep_CLPropsATool.lxx b/src/HLRBRep/HLRBRep_CLPropsATool.lxx index 89122d6c73..d61022032b 100755 --- a/src/HLRBRep/HLRBRep_CLPropsATool.lxx +++ b/src/HLRBRep/HLRBRep_CLPropsATool.lxx @@ -1,7 +1,7 @@ -// File: HLRBRep_CLPropsATool.lxx -// Created: Tue Aug 18 15:40:26 1992 -// Author: Herve LEGRAND -// +// File: HLRBRep_CLPropsATool.lxx +// Created: Tue Aug 18 15:40:26 1992 +// Author: Herve LEGRAND +// Copyright: OPEN CASCADE 2000 #include #include @@ -83,4 +83,3 @@ inline Standard_Real HLRBRep_CLPropsATool::FirstParameter inline Standard_Real HLRBRep_CLPropsATool::LastParameter (const Standard_Address A) { return ((HLRBRep_Curve*)A)->LastParameter(); } - diff --git a/src/HLRBRep/HLRBRep_Curve.cdl b/src/HLRBRep/HLRBRep_Curve.cdl index 6912fd73bc..edb78d7e5a 100755 --- a/src/HLRBRep/HLRBRep_Curve.cdl +++ b/src/HLRBRep/HLRBRep_Curve.cdl @@ -1,8 +1,7 @@ --- File: HLRBRep_Curve.cdl --- Created: Thu Apr 1 15:09:20 1993 --- Author: Modelistation --- ----Copyright: Matra Datavision 1993 +-- File: HLRBRep_Curve.cdl +-- Created: Thu Apr 1 15:09:20 1993 +-- Author: Modelistation +---Copyright: Matra Datavision 1993 class Curve from HLRBRep diff --git a/src/HLRBRep/HLRBRep_Curve.cxx b/src/HLRBRep/HLRBRep_Curve.cxx index 2a63da7ab1..169ded6d71 100755 --- a/src/HLRBRep/HLRBRep_Curve.cxx +++ b/src/HLRBRep/HLRBRep_Curve.cxx @@ -1,7 +1,7 @@ -// File: HLRBRep_Curve.gxx -// Created: Fri Mar 13 11:08:32 1992 -// Author: Christophe MARION -// +// File: HLRBRep_Curve.cxx +// Created: Fri Mar 13 11:08:32 1992 +// Author: Christophe MARION +// Copyright: OPEN CASCADE 2000 #include #include @@ -18,7 +18,7 @@ #include #include -#define OCC155 // jfa 05.03.2002 // bad vectors projection +//OCC155 // jfa 05.03.2002 // bad vectors projection //======================================================================= //function : HLRBRep_Curve @@ -44,29 +44,25 @@ void HLRBRep_Curve::Curve (const TopoDS_Edge& E) Standard_Real HLRBRep_Curve::Parameter2d (const Standard_Real P3d) const { - // Mathematical formula for lines // myOF P3d (myOF myVX - myOZ myVX + myOX myVZ) - // P2d -> -------------------------------------------- + // Res -> -------------------------------------------- // (-myOF + myOZ) (-myOF + myOZ + P3d myVZ) - Standard_Real P2d; if (myType == GeomAbs_Line) { if (((HLRAlgo_Projector*) myProj)->Perspective()) { - Standard_Real FmOZ = myOF - myOZ; - P2d = myOF * P3d * (myVX * FmOZ + myOX * myVZ) / - (FmOZ * (FmOZ - P3d * myVZ)); + const Standard_Real FmOZ = myOF - myOZ; + return myOF * P3d * (myVX * FmOZ + myOX * myVZ) / (FmOZ * (FmOZ - P3d * myVZ)); } - else P2d = P3d * myVX; + return P3d * myVX; } else if (myType == GeomAbs_Ellipse) { - P2d = P3d + myOX; + return P3d + myOX; } - else P2d = P3d; - return P2d; + return P3d; } //======================================================================= @@ -77,7 +73,6 @@ HLRBRep_Curve::Parameter2d (const Standard_Real P3d) const Standard_Real HLRBRep_Curve::Parameter3d (const Standard_Real P2d) const { - // Mathematical formula for lines // 2 @@ -85,22 +80,19 @@ HLRBRep_Curve::Parameter3d (const Standard_Real P2d) const // P3d -> ----------------------------------------------------- // (myOF - myOZ) (myOF myVX + P2d myVZ) + myOF myOX myVZ - Standard_Real P3d; if (myType == GeomAbs_Line) { if (((HLRAlgo_Projector*) myProj)->Perspective()) { - Standard_Real FmOZ = myOF - myOZ; - P3d = P2d * FmOZ * FmOZ / - (FmOZ * (myOF * myVX + P2d * myVZ) + myOF * myOX * myVZ); + const Standard_Real FmOZ = myOF - myOZ; + return P2d * FmOZ * FmOZ / (FmOZ * (myOF * myVX + P2d * myVZ) + myOF * myOX * myVZ); } - else P3d = P2d / myVX; + return P2d / myVX; } else if (myType == GeomAbs_Ellipse) { - P3d = P2d - myOX; + return P2d - myOX; } - else P3d = P2d; - return P3d; + return P2d; } //======================================================================= @@ -109,7 +101,7 @@ HLRBRep_Curve::Parameter3d (const Standard_Real P2d) const //======================================================================= Standard_Real HLRBRep_Curve::Update (const Standard_Address TotMin, - const Standard_Address TotMax) + const Standard_Address TotMax) { GeomAbs_CurveType typ = HLRBRep_BCurveTool::GetType(myCurve); myType = GeomAbs_OtherCurve; @@ -125,16 +117,16 @@ Standard_Real HLRBRep_Curve::Update (const Standard_Address TotMin, gp_Dir D1 = HLRBRep_BCurveTool::Circle(myCurve).Axis().Direction(); D1.Transform(((HLRAlgo_Projector*) myProj)->Transformation()); if (D1.IsParallel(gp::DZ(),Precision::Angular())) - myType = GeomAbs_Circle; + myType = GeomAbs_Circle; else if (Abs(D1.Dot(gp::DZ())) < Precision::Angular()*10) //*10: The minor radius of ellipse should not be too small. - myType = GeomAbs_OtherCurve; + myType = GeomAbs_OtherCurve; else { - myType = GeomAbs_Ellipse; - // compute the angle offset - gp_Dir D3 = D1.Crossed(gp::DZ()); - gp_Dir D2 = HLRBRep_BCurveTool::Circle(myCurve).XAxis().Direction(); - D2.Transform(((HLRAlgo_Projector*) myProj)->Transformation()); - myOX = D3.AngleWithRef(D2,D1); + myType = GeomAbs_Ellipse; + // compute the angle offset + gp_Dir D3 = D1.Crossed(gp::DZ()); + gp_Dir D2 = HLRBRep_BCurveTool::Circle(myCurve).XAxis().Direction(); + D2.Transform(((HLRAlgo_Projector*) myProj)->Transformation()); + myOX = D3.AngleWithRef(D2,D1); } } break; @@ -144,8 +136,8 @@ Standard_Real HLRBRep_Curve::Update (const Standard_Address TotMin, gp_Dir D1 = HLRBRep_BCurveTool::Ellipse(myCurve).Axis().Direction(); D1.Transform(((HLRAlgo_Projector*) myProj)->Transformation()); if (D1.IsParallel(gp::DZ(),Precision::Angular())) { - myOX = 0.; // no offset on the angle - myType = GeomAbs_Ellipse; + myOX = 0.; // no offset on the angle + myType = GeomAbs_Ellipse; } } break; @@ -224,11 +216,7 @@ HLRBRep_Curve::UpdateMinMax (const Standard_Address TotMin, Standard_Integer nbPnt = 30; Standard_Integer i; Standard_Real step = (b-a)/(nbPnt+1); -#ifndef DEB Standard_Real xa,ya,za,xb =0.,yb =0.,zb =0.; -#else - Standard_Real xa,ya,za,xb,yb,zb; -#endif Standard_Real dx1,dy1,dz1,dd1; Standard_Real dx2,dy2,dz2,dd2; @@ -238,21 +226,21 @@ HLRBRep_Curve::UpdateMinMax (const Standard_Address TotMin, xb = x ; yb = y ; zb = z ; ((HLRAlgo_Projector*) myProj)->Project(Value3D(a),x,y,z); HLRAlgo::UpdateMinMax(x,y,z,TotMin,TotMax); - if (i >= 2) { - dx1 = x - xa; dy1 = y - ya; dz1 = z - za; - dd1 = sqrt (dx1 * dx1 + dy1 * dy1 + dz1 * dz1); - if (dd1 > 0) { - dx2 = xb - xa; dy2 = yb - ya; dz2 = zb - za; - dd2 = sqrt (dx2 * dx2 + dy2 * dy2 + dz2 * dz2); - if (dd2 > 0) { - Standard_Real p = (dx1 * dx2 + dy1 * dy2 + dz1 * dz2) / (dd1 * dd2); - dx1 = xa + p * dx1 - xb; - dy1 = ya + p * dy1 - yb; - dz1 = za + p * dz1 - zb; - dd1 = sqrt (dx1 * dx1 + dy1 * dy1 + dz1 * dz1); - if (dd1 > tolMinMax) tolMinMax = dd1; - } - } + if (i >= 2) { + dx1 = x - xa; dy1 = y - ya; dz1 = z - za; + dd1 = sqrt (dx1 * dx1 + dy1 * dy1 + dz1 * dz1); + if (dd1 > 0) { + dx2 = xb - xa; dy2 = yb - ya; dz2 = zb - za; + dd2 = sqrt (dx2 * dx2 + dy2 * dy2 + dz2 * dz2); + if (dd2 > 0) { + Standard_Real p = (dx1 * dx2 + dy1 * dy2 + dz1 * dz2) / (dd1 * dd2); + dx1 = xa + p * dx1 - xb; + dy1 = ya + p * dy1 - yb; + dz1 = za + p * dz1 - zb; + dd1 = sqrt (dx1 * dx1 + dy1 * dy1 + dz1 * dz1); + if (dd1 > tolMinMax) tolMinMax = dd1; + } + } } } } @@ -280,12 +268,10 @@ Standard_Real HLRBRep_Curve::Z (const Standard_Real U) const //======================================================================= void HLRBRep_Curve::Tangent (const Standard_Boolean AtStart, - gp_Pnt2d& P, - gp_Dir2d& D) const + gp_Pnt2d& P, gp_Dir2d& D) const { - Standard_Real U; - if (AtStart) U = HLRBRep_BCurveTool::FirstParameter(myCurve); - else U = HLRBRep_BCurveTool::LastParameter (myCurve); + Standard_Real U = AtStart? HLRBRep_BCurveTool::FirstParameter(myCurve) : + HLRBRep_BCurveTool::LastParameter (myCurve); D0(U,P); HLRBRep_CLProps CLP(2,Epsilon(1.)); @@ -304,20 +290,17 @@ void HLRBRep_Curve::Tangent (const Standard_Boolean AtStart, void HLRBRep_Curve::D0 (const Standard_Real U, gp_Pnt2d& P) const { -#if 0 - gp_Pnt P3d; + /* gp_Pnt P3d; HLRBRep_BCurveTool::D0(myCurve,U,P3d); P3d.Transform(((HLRAlgo_Projector*) myProj)->Transformation()); if (((HLRAlgo_Projector*) myProj)->Perspective()) { Standard_Real R = 1.-P3d.Z()/((HLRAlgo_Projector*) myProj)->Focus(); P.SetCoord(P3d.X()/R,P3d.Y()/R); } - else P.SetCoord(P3d.X(),P3d.Y()); -#else + else P.SetCoord(P3d.X(),P3d.Y()); */ gp_Pnt P3d; HLRBRep_BCurveTool::D0(myCurve,U,P3d); ((HLRAlgo_Projector*) myProj)->Project(P3d,P); -#endif } //======================================================================= @@ -326,10 +309,8 @@ void HLRBRep_Curve::D0 (const Standard_Real U, gp_Pnt2d& P) const //======================================================================= void HLRBRep_Curve::D1 (const Standard_Real U, - gp_Pnt2d& P, - gp_Vec2d& V) const + gp_Pnt2d& P, gp_Vec2d& V) const { - // Mathematical formula for lines // X'[t] X[t] Z'[t] @@ -338,8 +319,7 @@ void HLRBRep_Curve::D1 (const Standard_Real U, // 1 - ---- f (1 - ----) // f f -#if 0 - gp_Pnt P3D; + /* gp_Pnt P3D; gp_Vec V13D; HLRBRep_BCurveTool::D1(myCurve,U,P3D,V13D); P3D .Transform(((HLRAlgo_Projector*) myProj)->Transformation()); @@ -354,8 +334,7 @@ void HLRBRep_Curve::D1 (const Standard_Real U, else { P.SetCoord(P3D .X(),P3D .Y()); V.SetCoord(V13D.X(),V13D.Y()); - } -#else + } */ gp_Pnt P3D; gp_Vec V13D; HLRBRep_BCurveTool::D1(myCurve,U,P3D,V13D); @@ -367,17 +346,14 @@ void HLRBRep_Curve::D1 (const Standard_Real U, V.SetCoord(V13D.X()/R + P3D.X()*e, V13D.Y()/R + P3D.Y()*e); } else { -#ifdef OCC155 + //OCC155 ((HLRAlgo_Projector*) myProj)->Project(P3D,V13D,P,V); -#else - ((HLRAlgo_Projector*) myProj)->Project(P3D,P); + /* ((HLRAlgo_Projector*) myProj)->Project(P3D,P); gp_Pnt2d opop; gp_Pnt uiui(V13D.X(),V13D.Y(),V13D.Z()); ((HLRAlgo_Projector*) myProj)->Project(uiui,opop); - V.SetCoord(opop.X(),opop.Y()); -#endif + V.SetCoord(opop.X(),opop.Y()); */ } -#endif } //======================================================================= @@ -386,11 +362,8 @@ void HLRBRep_Curve::D1 (const Standard_Real U, //======================================================================= void HLRBRep_Curve::D2 (const Standard_Real U, - gp_Pnt2d& P, - gp_Vec2d& V1, - gp_Vec2d& V2) const + gp_Pnt2d& P, gp_Vec2d& V1, gp_Vec2d& V2) const { - // Mathematical formula for lines // 2 @@ -430,10 +403,7 @@ void HLRBRep_Curve::D2 (const Standard_Real U, //======================================================================= void HLRBRep_Curve::D3 (const Standard_Real, - gp_Pnt2d&, - gp_Vec2d&, - gp_Vec2d&, - gp_Vec2d&) const + gp_Pnt2d&, gp_Vec2d&, gp_Vec2d&, gp_Vec2d&) const { } @@ -442,8 +412,7 @@ void HLRBRep_Curve::D3 (const Standard_Real, //purpose : //======================================================================= -gp_Vec2d HLRBRep_Curve::DN (const Standard_Real, - const Standard_Integer) const +gp_Vec2d HLRBRep_Curve::DN (const Standard_Real, const Standard_Integer) const { return gp_Vec2d(); } //======================================================================= @@ -478,25 +447,23 @@ gp_Circ2d HLRBRep_Curve::Circle () const gp_Elips2d HLRBRep_Curve::Ellipse () const { - GeomAbs_CurveType typ = HLRBRep_BCurveTool::GetType(myCurve); - if (typ == GeomAbs_Ellipse) { + if (HLRBRep_BCurveTool::GetType(myCurve) == GeomAbs_Ellipse) { gp_Elips E = HLRBRep_BCurveTool::Ellipse(myCurve); E.Transform(((HLRAlgo_Projector*) myProj)->Transformation()); return ProjLib::Project(gp_Pln(gp::XOY()),E); } - else { // this is a circle - gp_Circ C = HLRBRep_BCurveTool::Circle(myCurve); - C.Transform(((HLRAlgo_Projector*) myProj)->Transformation()); - const gp_Dir& D1 = C.Axis().Direction(); - const gp_Dir& D3 = D1.Crossed(gp::DZ()); - const gp_Dir& D2 = D1.Crossed(D3); - Standard_Real rap = sqrt( D2.X()*D2.X() + D2.Y()*D2.Y() ); - gp_Dir2d d(D1.Y(),-D1.X()); - gp_Pnt2d p(C.Location().X(),C.Location().Y()); - gp_Elips2d El(gp_Ax2d(p,d),C.Radius(),C.Radius()*rap); - if ( D1.Z() < 0 ) El.Reverse(); - return El; - } + // this is a circle + gp_Circ C = HLRBRep_BCurveTool::Circle(myCurve); + C.Transform(((HLRAlgo_Projector*) myProj)->Transformation()); + const gp_Dir& D1 = C.Axis().Direction(); + const gp_Dir& D3 = D1.Crossed(gp::DZ()); + const gp_Dir& D2 = D1.Crossed(D3); + Standard_Real rap = sqrt( D2.X()*D2.X() + D2.Y()*D2.Y() ); + gp_Dir2d d(D1.Y(),-D1.X()); + gp_Pnt2d p(C.Location().X(),C.Location().Y()); + gp_Elips2d El(gp_Ax2d(p,d),C.Radius(),C.Radius()*rap); + if ( D1.Z() < 0 ) El.Reverse(); + return El; } //======================================================================= @@ -568,7 +535,6 @@ void HLRBRep_Curve::PolesAndWeights (TColgp_Array1OfPnt2d& TP, } } - //======================================================================= //function : Knots //purpose : @@ -582,7 +548,6 @@ void HLRBRep_Curve::Knots (TColStd_Array1OfReal& kn) const } } - //======================================================================= //function : Multiplicities //purpose : @@ -595,4 +560,3 @@ void HLRBRep_Curve::Multiplicities (TColStd_Array1OfInteger& mu) const HB->Multiplicities(mu); } } - diff --git a/src/HLRBRep/HLRBRep_Curve.lxx b/src/HLRBRep/HLRBRep_Curve.lxx index 9a2bcb40bb..9062f003c7 100755 --- a/src/HLRBRep/HLRBRep_Curve.lxx +++ b/src/HLRBRep/HLRBRep_Curve.lxx @@ -1,7 +1,7 @@ -// File: HLRBRep_Curve.lxx -// Created: Fri Mar 13 11:08:32 1992 -// Author: Christophe MARION -// +// File: HLRBRep_Curve.lxx +// Created: Fri Mar 13 11:08:32 1992 +// Author: Christophe MARION +// Copyright: OPEN CASCADE 2000 #include #include @@ -191,4 +191,3 @@ inline Standard_Boolean HLRBRep_Curve::IsRational() const { return HLRBRep_BCurveTool::IsRational(myCurve); } - diff --git a/src/HLRBRep/HLRBRep_CurveTool.cdl b/src/HLRBRep/HLRBRep_CurveTool.cdl index 76f4f887b1..3b372f3f25 100755 --- a/src/HLRBRep/HLRBRep_CurveTool.cdl +++ b/src/HLRBRep/HLRBRep_CurveTool.cdl @@ -1,8 +1,7 @@ --- File: HLRBRep_CurveTool.cdl --- Created: Mon Jul 17 16:25:23 1995 --- Author: Modelistation --- ----Copyright: Matra Datavision 1995 +-- File: HLRBRep_CurveTool.cdl +-- Created: Mon Jul 17 16:25:23 1995 +-- Author: Modelistation +---Copyright: Matra Datavision 1995 class CurveTool from HLRBRep diff --git a/src/HLRBRep/HLRBRep_CurveTool.cxx b/src/HLRBRep/HLRBRep_CurveTool.cxx index 2917fe75b6..051ee4abe6 100755 --- a/src/HLRBRep/HLRBRep_CurveTool.cxx +++ b/src/HLRBRep/HLRBRep_CurveTool.cxx @@ -1,7 +1,7 @@ -// File: HLRBRep_CurveTool.cxx -// Created: Mon Jul 17 17:39:39 1995 -// Author: Modelistation -// +// File: HLRBRep_CurveTool.cxx +// Created: Mon Jul 17 17:39:39 1995 +// Author: Modelistation +// Copyright: OPEN CASCADE 2000 #include #include @@ -64,4 +64,3 @@ HLRBRep_CurveTool::NbSamples (const Standard_Address C, nbs = 50; return((Standard_Integer)nbs); } - diff --git a/src/HLRBRep/HLRBRep_CurveTool.lxx b/src/HLRBRep/HLRBRep_CurveTool.lxx index 3c6eb59a63..4231d93069 100755 --- a/src/HLRBRep/HLRBRep_CurveTool.lxx +++ b/src/HLRBRep/HLRBRep_CurveTool.lxx @@ -1,7 +1,7 @@ -// File: HLRBRep_CurveTool.lxx -// Created: Thu Oct 22 12:14:59 1992 -// Author: Laurent BUCHARD -// +// File: HLRBRep_CurveTool.lxx +// Created: Thu Oct 22 12:14:59 1992 +// Author: Laurent BUCHARD +// Copyright: OPEN CASCADE 2000 #include #include @@ -297,4 +297,3 @@ inline Handle(Geom2d_BSplineCurve) inline Standard_Real HLRBRep_CurveTool::EpsX(const Standard_Address C) { return(1e-10); } - diff --git a/src/HLRBRep/HLRBRep_Data.cdl b/src/HLRBRep/HLRBRep_Data.cdl index 9c8f151bad..6485be0bee 100755 --- a/src/HLRBRep/HLRBRep_Data.cdl +++ b/src/HLRBRep/HLRBRep_Data.cdl @@ -1,8 +1,7 @@ --- File: HLRBRep_Data.cdl --- Created: Mon Jan 11 13:58:26 1993 --- Author: Christophe MARION --- ----Copyright: Matra Datavision 1993 +-- File: HLRBRep_Data.cdl +-- Created: Mon Jan 11 13:58:26 1993 +-- Author: Christophe MARION +---Copyright: Matra Datavision 1993 class Data from HLRBRep inherits TShared from MMgt diff --git a/src/HLRBRep/HLRBRep_Data.cxx b/src/HLRBRep/HLRBRep_Data.cxx index d59aee3d75..60a617529f 100755 --- a/src/HLRBRep/HLRBRep_Data.cxx +++ b/src/HLRBRep/HLRBRep_Data.cxx @@ -1,7 +1,7 @@ -// File: HLRBRep_Data.cxx -// Created: Thu Apr 17 19:17:52 1997 -// Author: Christophe MARION -// +// File: HLRBRep_Data.cxx +// Created: Thu Apr 17 19:17:52 1997 +// Author: Christophe MARION +// Copyright: OPEN CASCADE 2000 //#define No_Standard_OutOfRange @@ -534,10 +534,6 @@ void HLRBRep_Data::Write (const Handle(HLRBRep_Data)& DS, const Standard_Integer de, const Standard_Integer df) { -#ifdef DEB - Standard_Integer n1vert = -#endif - DS->NbVertices(); Standard_Integer n1edge = DS->NbEdges(); Standard_Integer n1face = DS->NbFaces(); @@ -1490,49 +1486,59 @@ void HLRBRep_Data::LocalFEGeometry2D (const Standard_Integer FE, //======================================================================= void HLRBRep_Data::EdgeState (const Standard_Real p1, - const Standard_Real p2, - TopAbs_State& stbef, - TopAbs_State& staft) + const Standard_Real p2, + TopAbs_State& stbef, + TopAbs_State& staft) { // compute the state of The Edge near the Intersection // this method should give the states before and after // it should get the parameters on the surface - - gp_Pnt Pbid; - gp_Vec TngEdge; - ((HLRBRep_Curve*)myLEGeom)->D1(p1,Pbid,TngEdge); + Standard_Real pu,pv; - if (HLRBRep_EdgeFaceTool::UVPoint(p2,myFEGeom,iFaceGeom,pu,pv)) { + if (HLRBRep_EdgeFaceTool::UVPoint(p2,myFEGeom,iFaceGeom,pu,pv)) + { mySLProps.SetParameters(pu,pv); - gp_Dir NrmFace = mySLProps.Normal(); - const gp_Trsf& TI = myProj.InvertedTransformation(); - gp_Dir V; - if (myProj.Perspective()) { - gp_Pnt2d P2d; - myProj.Project(Pbid,P2d); - V = gp_Dir(P2d.X(),P2d.Y(),-myProj.Focus()); + if (mySLProps.IsNormalDefined()) + { + gp_Dir NrmFace = mySLProps.Normal(); + + gp_Pnt Pbid; + gp_Vec TngEdge; + ((HLRBRep_Curve*)myLEGeom)->D1(p1,Pbid,TngEdge); + + const gp_Trsf& TI = myProj.InvertedTransformation(); + gp_Dir V; + if (myProj.Perspective()) { + gp_Pnt2d P2d; + myProj.Project(Pbid,P2d); + V = gp_Dir(P2d.X(),P2d.Y(),-myProj.Focus()); + } + else { + V = gp_Dir(0,0,-1); + } + V.Transform(TI); + if (NrmFace.Dot(V) > 0.) + NrmFace.Reverse(); + + const Standard_Real scal = (TngEdge.SquareMagnitude()>1.e-10)? NrmFace.Dot(gp_Dir(TngEdge)) : 0.; + + if (scal > myToler*10) {stbef = TopAbs_IN ;staft = TopAbs_OUT;} + else if (scal < -myToler*10) {stbef = TopAbs_OUT;staft = TopAbs_IN ;} + else {stbef = TopAbs_ON ;staft = TopAbs_ON ;} } else { - V = gp_Dir(0,0,-1); + stbef = TopAbs_OUT; + staft = TopAbs_OUT; +#ifdef DEB + cout << "HLRBRep_Data::EdgeState : undefined" << endl; +#endif } - V.Transform(TI); - if (NrmFace.Dot(V) > 0) - NrmFace.Reverse(); - - Standard_Real scal; - if(TngEdge.SquareMagnitude()>1e-10) - scal=NrmFace.Dot(gp_Dir(TngEdge)); - else scal=0.0; - - if (scal > myToler*10) {stbef = TopAbs_IN ;staft = TopAbs_OUT;} - else if (scal < -myToler*10) {stbef = TopAbs_OUT;staft = TopAbs_IN ;} - else {stbef = TopAbs_ON ;staft = TopAbs_ON ;} } else { stbef = TopAbs_OUT; staft = TopAbs_OUT; #ifdef DEB - cout << "HLRBRep_Data::EdgeState : undefined" << endl; + cout << "HLRBRep_Data::EdgeState : undefined" << endl; #endif } } @@ -1563,22 +1569,15 @@ HLRBRep_Data::HidingStartLevel (const Standard_Integer E, Loop = Standard_False; else { if (Abs(param-sta) > Abs(param-end)) - end = param; + end = param; else - sta = param; + sta = param; } It.Next(); } - param = (sta + end) / 2; -#ifndef DEB + param = 0.5 * (sta + end); Standard_Integer level = 0; -#else - Standard_Integer level; -#endif -#ifdef DEB - TopAbs_State st = -#endif - Classify(E,ED,Standard_True,level,param); + /*TopAbs_State st = */Classify(E,ED,Standard_True,level,param); Loop = Standard_True; It.Initialize(IL); @@ -1589,15 +1588,15 @@ HLRBRep_Data::HidingStartLevel (const Standard_Integer E, switch (Int.Transition()) { case TopAbs_FORWARD : - level = level - Int.Intersection().Level(); - break; + level -= Int.Intersection().Level(); + break; case TopAbs_REVERSED : - level = level + Int.Intersection().Level(); - break; + level += Int.Intersection().Level(); + break; case TopAbs_EXTERNAL : case TopAbs_INTERNAL : - default : - break; + default : + break; } } else if (p > param + tolpar) @@ -1619,10 +1618,10 @@ HLRBRep_Data::HidingStartLevel (const Standard_Integer E, //======================================================================= TopAbs_State HLRBRep_Data::Compare (const Standard_Integer E, - const HLRBRep_EdgeData& ED) + const HLRBRep_EdgeData& ED) { - Standard_Integer level; - Standard_Real parbid = 0; + Standard_Integer level = 0; + Standard_Real parbid = 0.; return Classify(E,ED,Standard_False,level,parbid); } @@ -2207,11 +2206,7 @@ HLRBRep_Data::RejectedPoint (const IntRes2d_IntersectionPoint& PInter, Standard_Real p1,p2,dz; Standard_ShortReal t1,t2; TopAbs_State st; -#ifndef DEB TopAbs_Orientation Orie =TopAbs_FORWARD ; -#else - TopAbs_Orientation Orie ; -#endif TopAbs_Orientation Or2 = TopAbs_INTERNAL; Standard_Boolean inverted = Standard_False; const IntRes2d_Transition* Tr1; @@ -2287,11 +2282,7 @@ HLRBRep_Data::RejectedPoint (const IntRes2d_IntersectionPoint& PInter, } if (iFaceBack) Orie = TopAbs::Complement(Orie); // change the transition -#ifndef DEB TopAbs_Orientation Ori = TopAbs_FORWARD; -#else - TopAbs_Orientation Ori; -#endif switch (Tr1->PositionOnCurve()) { case IntRes2d_Head : Ori = TopAbs_FORWARD ; break; case IntRes2d_Middle : Ori = TopAbs_INTERNAL; break; @@ -2446,4 +2437,3 @@ HLRBRep_Data::SameVertex (const Standard_Boolean h1, } return SameV; } - diff --git a/src/HLRBRep/HLRBRep_Data.lxx b/src/HLRBRep/HLRBRep_Data.lxx index efdd20874a..290ecef2d7 100755 --- a/src/HLRBRep/HLRBRep_Data.lxx +++ b/src/HLRBRep/HLRBRep_Data.lxx @@ -1,7 +1,7 @@ -// File: HLRBRep_Data.lxx -// Created: Thu Apr 17 16:56:27 1997 -// Author: Christophe MARION -// +// File: HLRBRep_Data.lxx +// Created: Thu Apr 17 16:56:27 1997 +// Author: Christophe MARION +// Copyright: OPEN CASCADE 2000 //======================================================================= //function : EDataArray @@ -124,4 +124,3 @@ inline Standard_Boolean HLRBRep_Data::EdgeOfTheHidingFace (const Standard_Integer E, const HLRBRep_EdgeData& ED) const { return ED.HideCount() == myHideCount-1; } - diff --git a/src/HLRBRep/HLRBRep_EdgeBuilder.cdl b/src/HLRBRep/HLRBRep_EdgeBuilder.cdl index f06728d12c..db087eea53 100755 --- a/src/HLRBRep/HLRBRep_EdgeBuilder.cdl +++ b/src/HLRBRep/HLRBRep_EdgeBuilder.cdl @@ -1,8 +1,7 @@ --- File: HLRBRep_EdgeBuilder.cdl --- Created: Thu Apr 17 20:11:57 1997 --- Author: Christophe MARION --- ----Copyright: Matra Datavision 1997 +-- File: HLRBRep_EdgeBuilder.cdl +-- Created: Thu Apr 17 20:11:57 1997 +-- Author: Christophe MARION +---Copyright: Matra Datavision 1997 class EdgeBuilder from HLRBRep diff --git a/src/HLRBRep/HLRBRep_EdgeBuilder.cxx b/src/HLRBRep/HLRBRep_EdgeBuilder.cxx index ae2ce20627..91318f5061 100755 --- a/src/HLRBRep/HLRBRep_EdgeBuilder.cxx +++ b/src/HLRBRep/HLRBRep_EdgeBuilder.cxx @@ -1,7 +1,8 @@ -// File: HLRBRep_EdgeBuilder.cxx -// Created: Thu Apr 17 21:45:17 1997 -// Author: Christophe MARION -// +// File: HLRBRep_EdgeBuilder.cxx +// Created: Thu Apr 17 21:45:17 1997 +// Author: Christophe MARION +// Copyright: OPEN CASCADE 2000 + #ifndef No_Exception #define No_Exception #endif @@ -465,4 +466,3 @@ void HLRBRep_EdgeBuilder::Destroy() right.Nullify(); myLimits.Nullify(); } - diff --git a/src/HLRBRep/HLRBRep_EdgeData.cdl b/src/HLRBRep/HLRBRep_EdgeData.cdl index 04b053ddf5..89a85dc4af 100755 --- a/src/HLRBRep/HLRBRep_EdgeData.cdl +++ b/src/HLRBRep/HLRBRep_EdgeData.cdl @@ -1,8 +1,7 @@ --- File: HLRBRep_EdgeData.cdl --- Created: Thu Apr 17 11:34:54 1997 --- Author: Christophe MARION --- ----Copyright: Matra Datavision 1997 +-- File: HLRBRep_EdgeData.cdl +-- Created: Thu Apr 17 11:34:54 1997 +-- Author: Christophe MARION +---Copyright: Matra Datavision 1997 class EdgeData from HLRBRep diff --git a/src/HLRBRep/HLRBRep_EdgeData.cxx b/src/HLRBRep/HLRBRep_EdgeData.cxx index fbc95298ce..d9bfa115dc 100755 --- a/src/HLRBRep/HLRBRep_EdgeData.cxx +++ b/src/HLRBRep/HLRBRep_EdgeData.cxx @@ -1,7 +1,7 @@ -// File: HLRBRep_EdgeData.cxx -// Created: Thu Apr 17 11:44:47 1997 -// Author: Christophe MARION -// +// File: HLRBRep_EdgeData.cxx +// Created: Thu Apr 17 11:44:47 1997 +// Author: Christophe MARION +// Copyright: OPEN CASCADE 2000 #include #include @@ -77,4 +77,3 @@ void HLRBRep_EdgeData::UpdateMinMax (const Standard_Address TotMinMax) myMinMax[14] = ((Standard_Integer*)TotMinMax)[14]; myMinMax[15] = ((Standard_Integer*)TotMinMax)[15]; } - diff --git a/src/HLRBRep/HLRBRep_EdgeData.lxx b/src/HLRBRep/HLRBRep_EdgeData.lxx index bd11e568bc..ed5bb7e1d2 100755 --- a/src/HLRBRep/HLRBRep_EdgeData.lxx +++ b/src/HLRBRep/HLRBRep_EdgeData.lxx @@ -1,7 +1,7 @@ -// File: HLRBRep_EdgeData.lxx -// Created: Thu Apr 17 11:42:44 1997 -// Author: Christophe MARION -// +// File: HLRBRep_EdgeData.lxx +// Created: Thu Apr 17 11:42:44 1997 +// Author: Christophe MARION +// Copyright: OPEN CASCADE 2000 #define EMaskSelected ((Standard_Boolean)1) #define EMaskUsed ((Standard_Boolean)2) @@ -360,4 +360,3 @@ inline Standard_Address HLRBRep_EdgeData::Curve () inline Standard_ShortReal HLRBRep_EdgeData::Tolerance () const { return myTolerance; } - diff --git a/src/HLRBRep/HLRBRep_EdgeFaceTool.cdl b/src/HLRBRep/HLRBRep_EdgeFaceTool.cdl index f996e021b4..d4be6bc659 100755 --- a/src/HLRBRep/HLRBRep_EdgeFaceTool.cdl +++ b/src/HLRBRep/HLRBRep_EdgeFaceTool.cdl @@ -1,8 +1,7 @@ --- File: HLRBRep_EdgeFaceTool.cdl --- Created: Mon Oct 18 19:19:43 1993 --- Author: Christophe MARION --- ----Copyright: Matra Datavision 1993 +-- File: HLRBRep_EdgeFaceTool.cdl +-- Created: Mon Oct 18 19:19:43 1993 +-- Author: Christophe MARION +---Copyright: Matra Datavision 1993 class EdgeFaceTool from HLRBRep diff --git a/src/HLRBRep/HLRBRep_EdgeFaceTool.cxx b/src/HLRBRep/HLRBRep_EdgeFaceTool.cxx index c462526455..0e8bbc830c 100755 --- a/src/HLRBRep/HLRBRep_EdgeFaceTool.cxx +++ b/src/HLRBRep/HLRBRep_EdgeFaceTool.cxx @@ -1,7 +1,7 @@ -// File: HLRBRep_EdgeFaceTool.cxx -// Created: Mon Oct 18 19:31:35 1993 -// Author: Christophe MARION -// +// File: HLRBRep_EdgeFaceTool.cxx +// Created: Mon Oct 18 19:31:35 1993 +// Author: Christophe MARION +// Copyright: OPEN CASCADE 2000 #include #include @@ -18,11 +18,11 @@ //purpose : //======================================================================= -Standard_Real HLRBRep_EdgeFaceTool::CurvatureValue -( const Standard_Address F, - const Standard_Real U, - const Standard_Real V, - const gp_Dir& Tg) +Standard_Real HLRBRep_EdgeFaceTool::CurvatureValue + (const Standard_Address F, + const Standard_Real U, + const Standard_Real V, + const gp_Dir& Tg) { gp_Pnt P; gp_Vec D1U,D1V,D2U,D2V,D2UV; @@ -45,8 +45,7 @@ Standard_Real HLRBRep_EdgeFaceTool::CurvatureValue Standard_Real D = nmu2 *alfa2 + 2*d1ud1v *alfabeta + nmv2 *beta2; return N/D; } - else - return 0; + return 0.; } //======================================================================= @@ -54,36 +53,34 @@ Standard_Real HLRBRep_EdgeFaceTool::CurvatureValue //purpose : //======================================================================= -Standard_Boolean HLRBRep_EdgeFaceTool::UVPoint(const Standard_Real Par, - const Standard_Address E, - const Standard_Address F, - Standard_Real& U, - Standard_Real& V) +Standard_Boolean HLRBRep_EdgeFaceTool::UVPoint(const Standard_Real Par, + const Standard_Address E, + const Standard_Address F, + Standard_Real& U, + Standard_Real& V) { Standard_Real pfbid,plbid; - Standard_Boolean done = Standard_True; if (BRep_Tool::CurveOnSurface (((HLRBRep_Curve *)E)->Curve().Edge(), - ((HLRBRep_Surface*)F)->Surface().Face(),pfbid,plbid).IsNull()) { + ((HLRBRep_Surface*)F)->Surface().Face(),pfbid,plbid).IsNull()) + { BRepExtrema_ExtPF proj (BRepLib_MakeVertex(((HLRBRep_Curve*)E)->Value3D(Par)), ((HLRBRep_Surface*)F)->Surface().Face()); - Standard_Integer index = 0; + Standard_Integer i, index = 0; Standard_Real dist2 = RealLast(); - Standard_Real newdist2; - Standard_Integer n = proj.NbExt(); - - for (Standard_Integer i = 1; i <= n; i++) { - newdist2 = proj.SquareDistance(i); + const Standard_Integer n = proj.NbExt(); + for (i = 1; i <= n; i++) { + const Standard_Real newdist2 = proj.SquareDistance(i); if (newdist2 < dist2) { - dist2 = newdist2; - index = i; + dist2 = newdist2; + index = i; } } - if (index != 0) - proj.Parameter(index,U,V); - else - done = Standard_False; + if (index == 0) + return Standard_False; + + proj.Parameter(index,U,V); } else { BRepAdaptor_Curve2d PC @@ -94,6 +91,5 @@ Standard_Boolean HLRBRep_EdgeFaceTool::UVPoint(const Standard_Real Par, U = P2d.X(); V = P2d.Y(); } - return done; + return Standard_True; } - diff --git a/src/HLRBRep/HLRBRep_EdgeIList.cdl b/src/HLRBRep/HLRBRep_EdgeIList.cdl index 9df6f60774..18d5f2020c 100755 --- a/src/HLRBRep/HLRBRep_EdgeIList.cdl +++ b/src/HLRBRep/HLRBRep_EdgeIList.cdl @@ -1,8 +1,7 @@ --- File: HLRBRep_EdgeIList.cdl --- Created: Thu Apr 17 19:56:30 1997 --- Author: Christophe MARION --- ----Copyright: Matra Datavision 1997 +-- File: HLRBRep_EdgeIList.cdl +-- Created: Thu Apr 17 19:56:30 1997 +-- Author: Christophe MARION +---Copyright: Matra Datavision 1997 class EdgeIList from HLRBRep diff --git a/src/HLRBRep/HLRBRep_EdgeIList.cxx b/src/HLRBRep/HLRBRep_EdgeIList.cxx index c4a394dcfc..40cc904c67 100755 --- a/src/HLRBRep/HLRBRep_EdgeIList.cxx +++ b/src/HLRBRep/HLRBRep_EdgeIList.cxx @@ -1,7 +1,8 @@ -// File: HLRBRep_EdgeIList.cxx -// Created: Thu Apr 17 21:26:59 1997 -// Author: Christophe MARION -// +// File: HLRBRep_EdgeIList.cxx +// Created: Thu Apr 17 21:26:59 1997 +// Author: Christophe MARION +// Copyright: OPEN CASCADE 2000 + #ifndef No_Exception #define No_Exception #endif @@ -157,4 +158,3 @@ ProcessComplex(HLRAlgo_InterferenceList& IL, */ } - diff --git a/src/HLRBRep/HLRBRep_EdgeInterferenceTool.cdl b/src/HLRBRep/HLRBRep_EdgeInterferenceTool.cdl index 93e2b433f6..469dda95ec 100755 --- a/src/HLRBRep/HLRBRep_EdgeInterferenceTool.cdl +++ b/src/HLRBRep/HLRBRep_EdgeInterferenceTool.cdl @@ -1,8 +1,7 @@ --- File: HLRBRep_EdgeInterferenceTool.cdl --- Created: Thu Apr 17 19:45:19 1997 --- Author: Christophe MARION --- ----Copyright: Matra Datavision 1997 +-- File: HLRBRep_EdgeInterferenceTool.cdl +-- Created: Thu Apr 17 19:45:19 1997 +-- Author: Christophe MARION +---Copyright: Matra Datavision 1997 class EdgeInterferenceTool from HLRBRep diff --git a/src/HLRBRep/HLRBRep_EdgeInterferenceTool.cxx b/src/HLRBRep/HLRBRep_EdgeInterferenceTool.cxx index 2d3cd9d43c..9757649710 100755 --- a/src/HLRBRep/HLRBRep_EdgeInterferenceTool.cxx +++ b/src/HLRBRep/HLRBRep_EdgeInterferenceTool.cxx @@ -1,7 +1,8 @@ -// File: HLRBRep_EdgeInterferenceTool.cxx -// Created: Thu Apr 17 21:22:03 1997 -// Author: Christophe MARION -// +// File: HLRBRep_EdgeInterferenceTool.cxx +// Created: Thu Apr 17 21:22:03 1997 +// Author: Christophe MARION +// Copyright: OPEN CASCADE 2000 + #ifndef No_Exception #define No_Exception #endif @@ -102,4 +103,3 @@ void HLRBRep_EdgeInterferenceTool::InterferenceBoundaryGeometry Tang.SetCoord(TgFE.X(),TgFE.Y(),0); Norm.SetCoord(NmFE.X(),NmFE.Y(),0); } - diff --git a/src/HLRBRep/HLRBRep_EdgeInterferenceTool.lxx b/src/HLRBRep/HLRBRep_EdgeInterferenceTool.lxx index 889c75db3d..0cd715794c 100755 --- a/src/HLRBRep/HLRBRep_EdgeInterferenceTool.lxx +++ b/src/HLRBRep/HLRBRep_EdgeInterferenceTool.lxx @@ -1,7 +1,7 @@ -// File: HLRBRep_EdgeInterferenceTool.lxx -// Created: Thu Apr 17 21:17:06 1997 -// Author: Christophe MARION -// +// File: HLRBRep_EdgeInterferenceTool.lxx +// Created: Thu Apr 17 21:17:06 1997 +// Author: Christophe MARION +// Copyright: OPEN CASCADE 2000 #include @@ -80,4 +80,3 @@ inline Standard_Real HLRBRep_EdgeInterferenceTool::ParameterOfInterference (const HLRAlgo_Interference& I) const { return I.Intersection().Parameter(); } - diff --git a/src/HLRBRep/HLRBRep_FaceData.cdl b/src/HLRBRep/HLRBRep_FaceData.cdl index 87951e4582..1d456c49be 100755 --- a/src/HLRBRep/HLRBRep_FaceData.cdl +++ b/src/HLRBRep/HLRBRep_FaceData.cdl @@ -1,8 +1,7 @@ --- File: HLRBRep_FaceData.cdl --- Created: Thu Apr 17 11:55:00 1997 --- Author: Christophe MARION --- ----Copyright: Matra Datavision 1997 +-- File: HLRBRep_FaceData.cdl +-- Created: Thu Apr 17 11:55:00 1997 +-- Author: Christophe MARION +---Copyright: Matra Datavision 1997 class FaceData from HLRBRep diff --git a/src/HLRBRep/HLRBRep_FaceData.cxx b/src/HLRBRep/HLRBRep_FaceData.cxx index be021e8b38..498b304acf 100755 --- a/src/HLRBRep/HLRBRep_FaceData.cxx +++ b/src/HLRBRep/HLRBRep_FaceData.cxx @@ -1,7 +1,7 @@ -// File: HLRBRep_FaceData.cxx -// Created: Thu Apr 17 12:02:21 1997 -// Author: Christophe MARION -// +// File: HLRBRep_FaceData.cxx +// Created: Thu Apr 17 12:02:21 1997 +// Author: Christophe MARION +// Copyright: OPEN CASCADE 2000 #include #include @@ -65,4 +65,3 @@ void HLRBRep_FaceData::SetWEdge (const Standard_Integer WI, Wires()->Wire(WI)->Double (EWI,Dble); Wires()->Wire(WI)->IsoLine (EWI,IsoL); } - diff --git a/src/HLRBRep/HLRBRep_FaceData.lxx b/src/HLRBRep/HLRBRep_FaceData.lxx index 61470666a5..888ca765f4 100755 --- a/src/HLRBRep/HLRBRep_FaceData.lxx +++ b/src/HLRBRep/HLRBRep_FaceData.lxx @@ -1,7 +1,7 @@ -// File: HLRBRep_FaceData.lxx -// Created: Thu Apr 17 12:00:16 1997 -// Author: Christophe MARION -// +// File: HLRBRep_FaceData.lxx +// Created: Thu Apr 17 12:00:16 1997 +// Author: Christophe MARION +// Copyright: OPEN CASCADE 2000 #define EMaskOrient ((Standard_Boolean)15) #define FMaskSelected ((Standard_Boolean)16) @@ -323,4 +323,3 @@ inline HLRBRep_Surface& HLRBRep_FaceData::Geometry() inline Standard_ShortReal HLRBRep_FaceData::Tolerance () const { return myTolerance; } - diff --git a/src/HLRBRep/HLRBRep_FaceIterator.cdl b/src/HLRBRep/HLRBRep_FaceIterator.cdl index 7fa0ccfccc..72513c7e56 100755 --- a/src/HLRBRep/HLRBRep_FaceIterator.cdl +++ b/src/HLRBRep/HLRBRep_FaceIterator.cdl @@ -1,8 +1,7 @@ --- File: HLRBRep_FaceIterator.cdl --- Created: Thu Apr 17 15:55:18 1997 --- Author: Christophe MARION --- ----Copyright: Matra Datavision 1997 +-- File: HLRBRep_FaceIterator.cdl +-- Created: Thu Apr 17 15:55:18 1997 +-- Author: Christophe MARION +---Copyright: Matra Datavision 1997 class FaceIterator from HLRBRep diff --git a/src/HLRBRep/HLRBRep_FaceIterator.cxx b/src/HLRBRep/HLRBRep_FaceIterator.cxx index 55fa121b23..a772a56b09 100755 --- a/src/HLRBRep/HLRBRep_FaceIterator.cxx +++ b/src/HLRBRep/HLRBRep_FaceIterator.cxx @@ -1,7 +1,8 @@ -// File: HLRBRep_FaceIterator.cxx -// Created: Thu Apr 17 16:00:19 1997 -// Author: Christophe MARION -// +// File: HLRBRep_FaceIterator.cxx +// Created: Thu Apr 17 16:00:19 1997 +// Author: Christophe MARION +// Copyright: OPEN CASCADE 2000 + #ifndef No_Exception #define No_Exception #endif @@ -48,4 +49,3 @@ void HLRBRep_FaceIterator::NextEdge() } } } - diff --git a/src/HLRBRep/HLRBRep_FaceIterator.lxx b/src/HLRBRep/HLRBRep_FaceIterator.lxx index 0856a386b5..97e289be09 100755 --- a/src/HLRBRep/HLRBRep_FaceIterator.lxx +++ b/src/HLRBRep/HLRBRep_FaceIterator.lxx @@ -1,7 +1,7 @@ -// File: HLRBRep_FaceIterator.lxx -// Created: Thu Apr 17 16:03:06 1997 -// Author: Christophe MARION -// +// File: HLRBRep_FaceIterator.lxx +// Created: Thu Apr 17 16:03:06 1997 +// Author: Christophe MARION +// Copyright: OPEN CASCADE 2000 #include #include @@ -96,4 +96,3 @@ inline Standard_Boolean HLRBRep_FaceIterator::Double() const inline Standard_Boolean HLRBRep_FaceIterator::IsoLine() const { return myEdges->IsoLine(iEdge); } - diff --git a/src/HLRBRep/HLRBRep_HLRToShape.cdl b/src/HLRBRep/HLRBRep_HLRToShape.cdl index 7cf9a63fa5..c005e940f9 100755 --- a/src/HLRBRep/HLRBRep_HLRToShape.cdl +++ b/src/HLRBRep/HLRBRep_HLRToShape.cdl @@ -1,8 +1,7 @@ --- File: HLRBRep_HLRToShape.cdl --- Created: Mon Oct 11 16:45:31 1993 --- Author: Christophe MARION --- ----Copyright: Matra Datavision 1993 +-- File: HLRBRep_HLRToShape.cdl +-- Created: Mon Oct 11 16:45:31 1993 +-- Author: Christophe MARION +---Copyright: Matra Datavision 1993 class HLRToShape from HLRBRep ---Purpose: A framework for filtering the computation diff --git a/src/HLRBRep/HLRBRep_HLRToShape.cxx b/src/HLRBRep/HLRBRep_HLRToShape.cxx index e642931c51..553f0912af 100755 --- a/src/HLRBRep/HLRBRep_HLRToShape.cxx +++ b/src/HLRBRep/HLRBRep_HLRToShape.cxx @@ -1,7 +1,7 @@ -// File: HLRBRep_HLRToShape.cxx -// Created: Mon Oct 11 16:55:56 1993 -// Author: Christophe MARION -// +// File: HLRBRep_HLRToShape.cxx +// Created: Mon Oct 11 16:55:56 1993 +// Author: Christophe MARION +// Copyright: OPEN CASCADE 2000 #include #include @@ -212,4 +212,3 @@ HLRBRep_HLRToShape::DrawEdge (const Standard_Boolean visible, } } } - diff --git a/src/HLRBRep/HLRBRep_HLRToShape.lxx b/src/HLRBRep/HLRBRep_HLRToShape.lxx index a7b806e0ef..ba8dc4cceb 100755 --- a/src/HLRBRep/HLRBRep_HLRToShape.lxx +++ b/src/HLRBRep/HLRBRep_HLRToShape.lxx @@ -1,7 +1,7 @@ -// File: HLRBRep_HLRToShape.lxx -// Created: Tue Nov 2 15:55:51 1993 -// Author: Christophe MARION -// +// File: HLRBRep_HLRToShape.lxx +// Created: Tue Nov 2 15:55:51 1993 +// Author: Christophe MARION +// Copyright: OPEN CASCADE 2000 #include @@ -174,4 +174,3 @@ inline TopoDS_Shape HLRBRep_HLRToShape::IsoLineHCompound() inline TopoDS_Shape HLRBRep_HLRToShape::IsoLineHCompound(const TopoDS_Shape& S) { return InternalCompound(1,Standard_False,S); } - diff --git a/src/HLRBRep/HLRBRep_Hider.cdl b/src/HLRBRep/HLRBRep_Hider.cdl index 2d603753dc..3ec0a6485a 100755 --- a/src/HLRBRep/HLRBRep_Hider.cdl +++ b/src/HLRBRep/HLRBRep_Hider.cdl @@ -1,8 +1,7 @@ --- File: HLRBRep_Hider.cdl --- Created: Thu Apr 17 19:43:52 1997 --- Author: Christophe MARION --- ----Copyright: Matra Datavision 1997 +-- File: HLRBRep_Hider.cdl +-- Created: Thu Apr 17 19:43:52 1997 +-- Author: Christophe MARION +---Copyright: Matra Datavision 1997 class Hider from HLRBRep diff --git a/src/HLRBRep/HLRBRep_Hider.cxx b/src/HLRBRep/HLRBRep_Hider.cxx index 3ab2e04d0d..d4f496c953 100755 --- a/src/HLRBRep/HLRBRep_Hider.cxx +++ b/src/HLRBRep/HLRBRep_Hider.cxx @@ -1,7 +1,7 @@ -// File: HLRBRep_Hider.cxx -// Created: Thu Apr 17 19:33:55 1997 -// Author: Christophe MARION -// +// File: HLRBRep_Hider.cxx +// Created: Thu Apr 17 19:33:55 1997 +// Author: Christophe MARION +// Copyright: OPEN CASCADE 2000 #define No_Standard_OutOfRange @@ -94,18 +94,9 @@ void HLRBRep_Hider::Hide(const Standard_Integer FI, HLRBRep_EdgeInterferenceTool EIT(myDS); // List of Intersections HLRBRep_Array1OfEData& myEData = myDS->EDataArray(); -#ifdef DEB - Standard_Integer EToBeChecked = -1; -#endif for (; myDS->MoreEdge(); myDS->NextEdge()) { // loop on the Edges Standard_Integer E = myDS->Edge(); // ***************** -#ifdef DEB - if(E == EToBeChecked) { - cout << E << endl; - } -#endif - try { OCC_CATCH_SIGNALS Standard_Boolean hasOut = Standard_False; @@ -589,4 +580,3 @@ void HLRBRep_Hider::Hide(const Standard_Integer FI, } } } - diff --git a/src/HLRBRep/HLRBRep_InternalAlgo.cdl b/src/HLRBRep/HLRBRep_InternalAlgo.cdl index 8be8bc6adf..20d2e315fa 100755 --- a/src/HLRBRep/HLRBRep_InternalAlgo.cdl +++ b/src/HLRBRep/HLRBRep_InternalAlgo.cdl @@ -1,8 +1,7 @@ --- File: HLRBRep_InternalAlgo.cdl --- Created: Thu Apr 17 20:45:25 1997 --- Author: Christophe MARION --- ----Copyright: Matra Datavision 1997 +-- File: HLRBRep_InternalAlgo.cdl +-- Created: Thu Apr 17 20:45:25 1997 +-- Author: Christophe MARION +---Copyright: Matra Datavision 1997 class InternalAlgo from HLRBRep inherits TShared from MMgt diff --git a/src/HLRBRep/HLRBRep_InternalAlgo.cxx b/src/HLRBRep/HLRBRep_InternalAlgo.cxx index 3390cc30f1..8974b872cd 100755 --- a/src/HLRBRep/HLRBRep_InternalAlgo.cxx +++ b/src/HLRBRep/HLRBRep_InternalAlgo.cxx @@ -1,7 +1,7 @@ -// File: HLRBRep_InternalAlgo.cxx -// Created: Thu Apr 17 21:49:17 1997 -// Author: Christophe MARION -// +// File: HLRBRep_InternalAlgo.cxx +// Created: Thu Apr 17 21:49:17 1997 +// Author: Christophe MARION +// Copyright: OPEN CASCADE 2000 #include #include @@ -109,13 +109,8 @@ void HLRBRep_InternalAlgo::Update () if (!myShapes.IsEmpty()) { Standard_Integer n = myShapes.Length(); Handle(HLRBRep_Data) *DS = new Handle(HLRBRep_Data) [n]; -#ifndef DEB - static -#endif - Standard_Integer i,dv,de,df,nv,ne,nf; - nv = 0; - ne = 0; - nf = 0; + + Standard_Integer i,dv,de,df,nv=0,ne=0,nf=0; for (i = 1; i <= n; i++) { HLRBRep_ShapeBounds& SB = myShapes(i); @@ -974,4 +969,3 @@ Standard_Boolean HLRBRep_InternalAlgo::Debug () const Handle(HLRBRep_Data) HLRBRep_InternalAlgo::DataStructure () const { return myDS; } - diff --git a/src/HLRBRep/HLRBRep_Intersector.cdl b/src/HLRBRep/HLRBRep_Intersector.cdl index 7c456d5040..e3d9f5afdc 100755 --- a/src/HLRBRep/HLRBRep_Intersector.cdl +++ b/src/HLRBRep/HLRBRep_Intersector.cdl @@ -1,8 +1,7 @@ --- File: Intersector.cdl --- Created: Wed Aug 26 18:11:37 1992 --- Author: Christophe MARION --- ----Copyright: Matra Datavision 1992 +-- File: HLRBRep_Intersector.cdl +-- Created: Wed Aug 26 18:11:37 1992 +-- Author: Christophe MARION +---Copyright: Matra Datavision 1992 class Intersector from HLRBRep diff --git a/src/HLRBRep/HLRBRep_Intersector.cxx b/src/HLRBRep/HLRBRep_Intersector.cxx index 6760f613a4..0a067faae0 100755 --- a/src/HLRBRep/HLRBRep_Intersector.cxx +++ b/src/HLRBRep/HLRBRep_Intersector.cxx @@ -1,7 +1,8 @@ -// File: HLRBRep_Intersector.gxx -// Created: Thu Oct 22 11:37:24 1992 -// Author: Christophe MARION -// +// File: HLRBRep_Intersector.gxx +// Created: Thu Oct 22 11:37:24 1992 +// Author: Christophe MARION +// Copyright: OPEN CASCADE 2000 + #ifndef No_Exception #define No_Exception #endif diff --git a/src/HLRBRep/HLRBRep_LineTool.cdl b/src/HLRBRep/HLRBRep_LineTool.cdl index 829ba485f1..4896a022c1 100755 --- a/src/HLRBRep/HLRBRep_LineTool.cdl +++ b/src/HLRBRep/HLRBRep_LineTool.cdl @@ -1,8 +1,7 @@ --- File: HLRBRep_LineTool.cdl --- Created: Wed Aug 18 14:58:10 1993 --- Author: Christophe MARION --- ----Copyright: Matra Datavision 1993 +-- File: HLRBRep_LineTool.cdl +-- Created: Wed Aug 18 14:58:10 1993 +-- Author: Christophe MARION +---Copyright: Matra Datavision 1993 class LineTool from HLRBRep diff --git a/src/HLRBRep/HLRBRep_LineTool.cxx b/src/HLRBRep/HLRBRep_LineTool.cxx index 353d2c5f78..b5527614fb 100755 --- a/src/HLRBRep/HLRBRep_LineTool.cxx +++ b/src/HLRBRep/HLRBRep_LineTool.cxx @@ -1,8 +1,6 @@ -// File: HLRBRep_LineTool.cxx -// Created: Mon Dec 20 16:43:17 1993 -// Author: Jean Yves LEBEY -// - +// File: HLRBRep_LineTool.cxx +// Created: Mon Dec 20 16:43:17 1993 +// Author: Jean Yves LEBEY +// Copyright: OPEN CASCADE 2000 #include - diff --git a/src/HLRBRep/HLRBRep_LineTool.lxx b/src/HLRBRep/HLRBRep_LineTool.lxx index 5a6143cef5..f2a4ffb4f9 100755 --- a/src/HLRBRep/HLRBRep_LineTool.lxx +++ b/src/HLRBRep/HLRBRep_LineTool.lxx @@ -1,7 +1,7 @@ -// File: HLRBRep_LineTool.lxx -// Created: Wed Aug 18 15:06:22 1993 -// Author: Christophe MARION -// +// File: HLRBRep_LineTool.lxx +// Created: Wed Aug 18 15:06:22 1993 +// Author: Christophe MARION +// Copyright: OPEN CASCADE 2000 #include #include diff --git a/src/HLRBRep/HLRBRep_PolyAlgo.cdl b/src/HLRBRep/HLRBRep_PolyAlgo.cdl index 7c4bd80b72..0a09700057 100755 --- a/src/HLRBRep/HLRBRep_PolyAlgo.cdl +++ b/src/HLRBRep/HLRBRep_PolyAlgo.cdl @@ -1,8 +1,7 @@ --- File: PolyAlgo.cdl --- Created: Tue Feb 18 10:36:07 1992 --- Author: Christophe MARION --- ----Copyright: Matra Datavision 1992 +-- File: HLRBRep_PolyAlgo.cdl +-- Created: Tue Feb 18 10:36:07 1992 +-- Author: Christophe MARION +---Copyright: Matra Datavision 1992 class PolyAlgo from HLRBRep inherits TShared from MMgt diff --git a/src/HLRBRep/HLRBRep_PolyAlgo.cxx b/src/HLRBRep/HLRBRep_PolyAlgo.cxx index ed716899a6..efaeedb27a 100755 --- a/src/HLRBRep/HLRBRep_PolyAlgo.cxx +++ b/src/HLRBRep/HLRBRep_PolyAlgo.cxx @@ -1,7 +1,8 @@ -// File: HLRBRep_PolyAlgo.cxx -// Created: Fri May 5 15:58:19 1995 -// Author: Christophe MARION -// +// File: HLRBRep_PolyAlgo.cxx +// Created: Fri May 5 15:58:19 1995 +// Author: Christophe MARION +// Copyright: OPEN CASCADE 2000 + // Modified by cma, Tue Apr 1 11:39:48 1997 // Modified by cma, Tue Apr 1 11:40:30 1997 @@ -2629,7 +2630,6 @@ HLRBRep_PolyAlgo::CheckFrBackTriangles (HLRAlgo_ListOfBPoint& List, Standard_Real dd,dX,dY,nX,nY; Standard_Boolean FrBackInList; Standard_Address TData ,PISeg ,PINod ; -#ifndef DEB /* Standard_Address IndexPtr = NULL; const Handle(HLRAlgo_PolyInternalData)& pid1 = *(Handle(HLRAlgo_PolyInternalData)*)&(PID(F1Index)); @@ -2644,10 +2644,6 @@ HLRBRep_PolyAlgo::CheckFrBackTriangles (HLRAlgo_ListOfBPoint& List, PINod2 = &pid2->PISeg();*/ Standard_Address TData1 = NULL,PISeg1 = NULL,PINod1 = NULL; Standard_Address TData2 = NULL,PISeg2 = NULL,PINod2 = NULL; -#else - Standard_Address TData1,PISeg1,PINod1; - Standard_Address TData2,PISeg2,PINod2; -#endif Standard_Address Nod11Indices,Nod12Indices,Nod13Indices; Standard_Address Nod11RValues,Nod12RValues,Nod13RValues; Standard_Address Tri1Indices; diff --git a/src/HLRBRep/HLRBRep_PolyAlgo.lxx b/src/HLRBRep/HLRBRep_PolyAlgo.lxx index f398a70bbe..bd30eefa9b 100755 --- a/src/HLRBRep/HLRBRep_PolyAlgo.lxx +++ b/src/HLRBRep/HLRBRep_PolyAlgo.lxx @@ -1,7 +1,7 @@ -// File: HLRBRep_PolyAlgo.lxx -// Created: Thu Jun 15 16:17:43 1995 -// Author: Christophe MARION -// +// File: HLRBRep_PolyAlgo.lxx +// Created: Thu Jun 15 16:17:43 1995 +// Author: Christophe MARION +// Copyright: OPEN CASCADE 2000 #include @@ -150,4 +150,3 @@ inline Standard_Boolean HLRBRep_PolyAlgo::Debug () const inline void HLRBRep_PolyAlgo::Debug (const Standard_Boolean B) { myDebug = B; } - diff --git a/src/HLRBRep/HLRBRep_PolyHLRToShape.cdl b/src/HLRBRep/HLRBRep_PolyHLRToShape.cdl index 1203df8074..986b6e90f0 100755 --- a/src/HLRBRep/HLRBRep_PolyHLRToShape.cdl +++ b/src/HLRBRep/HLRBRep_PolyHLRToShape.cdl @@ -1,8 +1,7 @@ --- File: HLRBRep_PolyHLRToShape.cdl --- Created: Mon Oct 11 16:45:31 1993 --- Author: Christophe MARION --- ----Copyright: Matra Datavision 1993 +-- File: HLRBRep_PolyHLRToShape.cdl +-- Created: Mon Oct 11 16:45:31 1993 +-- Author: Christophe MARION +---Copyright: Matra Datavision 1993 class PolyHLRToShape from HLRBRep diff --git a/src/HLRBRep/HLRBRep_PolyHLRToShape.cxx b/src/HLRBRep/HLRBRep_PolyHLRToShape.cxx index f831f765a8..e3391017e5 100755 --- a/src/HLRBRep/HLRBRep_PolyHLRToShape.cxx +++ b/src/HLRBRep/HLRBRep_PolyHLRToShape.cxx @@ -1,7 +1,8 @@ -// File: HLRBRep_PolyHLRToShape.cxx -// Created: Mon Oct 11 16:55:56 1993 -// Author: Christophe MARION -// +// File: HLRBRep_PolyHLRToShape.cxx +// Created: Mon Oct 11 16:55:56 1993 +// Author: Christophe MARION +// Copyright: OPEN CASCADE 2000 + // Modified by cma, Fri Nov 10 17:36:13 1995 #include @@ -172,4 +173,3 @@ HLRBRep_PolyHLRToShape::InternalCompound (const Standard_Integer typ, if (!added) Result = TopoDS_Shape(); return Result; } - diff --git a/src/HLRBRep/HLRBRep_PolyHLRToShape.lxx b/src/HLRBRep/HLRBRep_PolyHLRToShape.lxx index 7b82e66461..0faa08492e 100755 --- a/src/HLRBRep/HLRBRep_PolyHLRToShape.lxx +++ b/src/HLRBRep/HLRBRep_PolyHLRToShape.lxx @@ -1,7 +1,7 @@ -// File: HLRBRep_PolyHLRToShape.lxx -// Created: Tue Nov 2 15:55:51 1993 -// Author: Christophe MARION -// +// File: HLRBRep_PolyHLRToShape.lxx +// Created: Tue Nov 2 15:55:51 1993 +// Author: Christophe MARION +// Copyright: OPEN CASCADE 2000 #include @@ -156,4 +156,3 @@ inline TopoDS_Shape HLRBRep_PolyHLRToShape::OutLineHCompound() inline TopoDS_Shape HLRBRep_PolyHLRToShape::OutLineHCompound(const TopoDS_Shape& S) { return InternalCompound(1,Standard_False,S); } - diff --git a/src/HLRBRep/HLRBRep_SLPropsATool.cdl b/src/HLRBRep/HLRBRep_SLPropsATool.cdl index 7a59d4015e..a5c3646786 100755 --- a/src/HLRBRep/HLRBRep_SLPropsATool.cdl +++ b/src/HLRBRep/HLRBRep_SLPropsATool.cdl @@ -1,8 +1,7 @@ --- File: HLRBRep_SLPropsATool.cdl --- Created: Fri Apr 23 13:56:45 1993 --- Author: Modelistation --- ----Copyright: Matra Datavision 1993 +-- File: HLRBRep_SLPropsATool.cdl +-- Created: Fri Apr 23 13:56:45 1993 +-- Author: Modelistation +---Copyright: Matra Datavision 1993 class SLPropsATool from HLRBRep diff --git a/src/HLRBRep/HLRBRep_SLPropsATool.cxx b/src/HLRBRep/HLRBRep_SLPropsATool.cxx index 0333cf7c7e..6f8e347db7 100755 --- a/src/HLRBRep/HLRBRep_SLPropsATool.cxx +++ b/src/HLRBRep/HLRBRep_SLPropsATool.cxx @@ -1,6 +1,6 @@ -// File: HLRBRep_SLPropsATool.cxx -// Created: Tue Aug 18 15:16:03 1992 -// Author: Herve LEGRAND -// +// File: HLRBRep_SLPropsATool.cxx +// Created: Tue Aug 18 15:16:03 1992 +// Author: Herve LEGRAND +// Copyright: OPEN CASCADE 2000 #include diff --git a/src/HLRBRep/HLRBRep_SLPropsATool.lxx b/src/HLRBRep/HLRBRep_SLPropsATool.lxx index 7ffd01b204..a5c54579e4 100755 --- a/src/HLRBRep/HLRBRep_SLPropsATool.lxx +++ b/src/HLRBRep/HLRBRep_SLPropsATool.lxx @@ -1,7 +1,7 @@ -// File: HLRBRep_SLPropsATool.lxx -// Created: Tue Aug 18 15:16:03 1992 -// Author: Herve LEGRAND -// +// File: HLRBRep_SLPropsATool.lxx +// Created: Tue Aug 18 15:16:03 1992 +// Author: Herve LEGRAND +// Copyright: OPEN CASCADE 2000 #include #include @@ -87,4 +87,3 @@ inline void HLRBRep_SLPropsATool::Bounds U1 = V1 = RealFirst(); U2 = V2 = RealLast(); } - diff --git a/src/HLRBRep/HLRBRep_ShapeBounds.cdl b/src/HLRBRep/HLRBRep_ShapeBounds.cdl index e525a46f9e..d56b42e87a 100755 --- a/src/HLRBRep/HLRBRep_ShapeBounds.cdl +++ b/src/HLRBRep/HLRBRep_ShapeBounds.cdl @@ -1,8 +1,7 @@ --- File: HLRBRep_ShapeBounds.cdl --- Created: Thu Apr 17 17:51:44 1997 --- Author: Christophe MARION --- ----Copyright: Matra Datavision 1997 +-- File: HLRBRep_ShapeBounds.cdl +-- Created: Thu Apr 17 17:51:44 1997 +-- Author: Christophe MARION +---Copyright: Matra Datavision 1997 class ShapeBounds from HLRBRep ---Purpose: Contains a Shape and the bounds of its vertices, @@ -83,4 +82,3 @@ fields myMinMax : Integer from Standard[16]; end ShapeBounds from HLRBRep; - diff --git a/src/HLRBRep/HLRBRep_ShapeBounds.cxx b/src/HLRBRep/HLRBRep_ShapeBounds.cxx index 3097292bb7..70a6878c75 100755 --- a/src/HLRBRep/HLRBRep_ShapeBounds.cxx +++ b/src/HLRBRep/HLRBRep_ShapeBounds.cxx @@ -1,8 +1,7 @@ -// File: HLRBRep_ShapeBounds.cxx -// Created: Thu Apr 17 18:35:42 1997 -// Author: Christophe MARION -// - +// File: HLRBRep_ShapeBounds.cxx +// Created: Thu Apr 17 18:35:42 1997 +// Author: Christophe MARION +// Copyright: OPEN CASCADE 2000 #include @@ -111,4 +110,3 @@ void HLRBRep_ShapeBounds::UpdateMinMax (const Standard_Address TotMinMax) for (Standard_Integer i = 0; i <= 15; i++) myMinMax[i] = ((Standard_Integer*)TotMinMax)[i]; } - diff --git a/src/HLRBRep/HLRBRep_ShapeBounds.lxx b/src/HLRBRep/HLRBRep_ShapeBounds.lxx index 55b4b2d85e..eb37de7b95 100755 --- a/src/HLRBRep/HLRBRep_ShapeBounds.lxx +++ b/src/HLRBRep/HLRBRep_ShapeBounds.lxx @@ -1,7 +1,7 @@ -// File: HLRBRep_ShapeBounds.lxx -// Created: Thu Apr 17 18:34:31 1997 -// Author: Christophe MARION -// +// File: HLRBRep_ShapeBounds.lxx +// Created: Thu Apr 17 18:34:31 1997 +// Author: Christophe MARION +// Copyright: OPEN CASCADE 2000 //======================================================================= //function : HLRBRep_ShapeBounds @@ -69,4 +69,3 @@ inline Standard_Integer HLRBRep_ShapeBounds::NbOfIso () const inline Standard_Address HLRBRep_ShapeBounds::MinMax () const { return (Standard_Address)&myMinMax; } - diff --git a/src/HLRBRep/HLRBRep_ShapeToHLR.cdl b/src/HLRBRep/HLRBRep_ShapeToHLR.cdl index c74fe9923e..62ac49c867 100755 --- a/src/HLRBRep/HLRBRep_ShapeToHLR.cdl +++ b/src/HLRBRep/HLRBRep_ShapeToHLR.cdl @@ -1,8 +1,7 @@ --- File: HLRBRep_ShapeToHLR.cdl --- Created: Tue May 4 16:52:14 1993 --- Author: Modelistation --- ----Copyright: Matra Datavision 1993 +-- File: HLRBRep_ShapeToHLR.cdl +-- Created: Tue May 4 16:52:14 1993 +-- Author: Modelistation +---Copyright: Matra Datavision 1993 class ShapeToHLR from HLRBRep diff --git a/src/HLRBRep/HLRBRep_ShapeToHLR.cxx b/src/HLRBRep/HLRBRep_ShapeToHLR.cxx index 3df7e91abe..ef376f8064 100755 --- a/src/HLRBRep/HLRBRep_ShapeToHLR.cxx +++ b/src/HLRBRep/HLRBRep_ShapeToHLR.cxx @@ -1,7 +1,8 @@ -// File: HLRBRep_ShapeToHLR.cxx -// Created: Thu Aug 27 12:33:14 1992 -// Author: Christophe MARION -// +// File: HLRBRep_ShapeToHLR.cxx +// Created: Thu Aug 27 12:33:14 1992 +// Author: Christophe MARION +// Copyright: OPEN CASCADE 2000 + #ifndef No_Exception // #define No_Exception #endif @@ -86,10 +87,6 @@ HLRBRep_ShapeToHLR::Load(const Handle(HLRTopoBRep_OutLiner)& S, // Create the data structure Handle(HLRBRep_Data) DS = new HLRBRep_Data (nbVert, nbEdge, nbFace); -#ifdef DEB - HLRBRep_Array1OfEData& ED = -#endif - DS->EDataArray (); HLRBRep_EdgeData* ed; if(nbEdge != 0) ed = &(DS->EDataArray().ChangeValue(1)); // ed++; @@ -281,4 +278,3 @@ HLRBRep_ShapeToHLR::ExploreShape (const Handle(HLRTopoBRep_OutLiner)& S, } } } - diff --git a/src/HLRBRep/HLRBRep_Surface.cdl b/src/HLRBRep/HLRBRep_Surface.cdl index 9a8a92e3f5..81240bda60 100755 --- a/src/HLRBRep/HLRBRep_Surface.cdl +++ b/src/HLRBRep/HLRBRep_Surface.cdl @@ -1,8 +1,7 @@ --- File: HLRBRep_Surface.cdl --- Created: Wed Apr 14 19:48:14 1993 --- Author: Modelistation --- ----Copyright: Matra Datavision 1993 +-- File: HLRBRep_Surface.cdl +-- Created: Wed Apr 14 19:48:14 1993 +-- Author: Modelistation +---Copyright: Matra Datavision 1993 class Surface from HLRBRep diff --git a/src/HLRBRep/HLRBRep_Surface.cxx b/src/HLRBRep/HLRBRep_Surface.cxx index 706a47a4b7..bc4eb0c62c 100755 --- a/src/HLRBRep/HLRBRep_Surface.cxx +++ b/src/HLRBRep/HLRBRep_Surface.cxx @@ -1,7 +1,7 @@ -// File: HLRBRep_Surface.cxx -// Created: Fri Mar 13 11:08:32 1992 -// Author: Christophe MARION -// +// File: HLRBRep_Surface.cxx +// Created: Fri Mar 13 11:08:32 1992 +// Author: Christophe MARION +// Copyright: OPEN CASCADE 2000 #include #include @@ -273,4 +273,3 @@ gp_Pln HLRBRep_Surface::Plane () const return HLRBRep_BSurfaceTool::Plane(mySurf); } } - diff --git a/src/HLRBRep/HLRBRep_Surface.lxx b/src/HLRBRep/HLRBRep_Surface.lxx index f8af1d6a4d..6e340ab1f9 100755 --- a/src/HLRBRep/HLRBRep_Surface.lxx +++ b/src/HLRBRep/HLRBRep_Surface.lxx @@ -1,7 +1,7 @@ -// File: HLRBRep_Surface.lxx -// Created: Fri Mar 13 11:08:32 1992 -// Author: Christophe MARION -// +// File: HLRBRep_Surface.lxx +// Created: Fri Mar 13 11:08:32 1992 +// Author: Christophe MARION +// Copyright: OPEN CASCADE 2000 #include #include @@ -302,4 +302,3 @@ inline Standard_Integer HLRBRep_Surface::NbVKnots()const inline gp_Ax1 HLRBRep_Surface::Axis()const { return HLRBRep_BSurfaceTool::AxeOfRevolution(mySurf); } - diff --git a/src/HLRBRep/HLRBRep_SurfaceTool.cdl b/src/HLRBRep/HLRBRep_SurfaceTool.cdl index 018ac4ef4f..c825fefd06 100755 --- a/src/HLRBRep/HLRBRep_SurfaceTool.cdl +++ b/src/HLRBRep/HLRBRep_SurfaceTool.cdl @@ -1,8 +1,7 @@ --- File: HLRBRep_SurfaceTool.cdl --- Created: Fri Jul 2 16:59:47 1993 --- Author: Laurent BUCHARD --- ----Copyright: Matra Datavision 1993 +-- File: HLRBRep_SurfaceTool.cdl +-- Created: Fri Jul 2 16:59:47 1993 +-- Author: Laurent BUCHARD +---Copyright: Matra Datavision 1993 class SurfaceTool from HLRBRep diff --git a/src/HLRBRep/HLRBRep_SurfaceTool.cxx b/src/HLRBRep/HLRBRep_SurfaceTool.cxx index 2d0b8c556d..bff172b3f4 100755 --- a/src/HLRBRep/HLRBRep_SurfaceTool.cxx +++ b/src/HLRBRep/HLRBRep_SurfaceTool.cxx @@ -1,8 +1,8 @@ -//-- File : HLRBRep_SurfaceTool.gxx -//-- Created : Wed Jui 7 18:00:00 1c93 -//-- Author : Laurent BUCHARD -//-- -//-- Copyright: Matra Datavision 1993 +// File: HLRBRep_SurfaceTool.cxx +// Created: Wed Jui 7 18:00:00 1c93 +// Author: Laurent BUCHARD +// Copyright: Matra Datavision 1993 +// Copyright: OPEN CASCADE 2000 #include #include @@ -124,4 +124,3 @@ Standard_Integer HLRBRep_SurfaceTool::NbSamplesV(const Standard_Address S, } return(n); } - diff --git a/src/HLRBRep/HLRBRep_SurfaceTool.lxx b/src/HLRBRep/HLRBRep_SurfaceTool.lxx index af86986a24..1a10893ed9 100755 --- a/src/HLRBRep/HLRBRep_SurfaceTool.lxx +++ b/src/HLRBRep/HLRBRep_SurfaceTool.lxx @@ -1,8 +1,8 @@ -//-- File : HLRBRep_SurfaceTool.lxx -//-- Created : Wed Jui 7 18:00:00 1993 -//-- Author : Laurent BUCHARD -//-- -//-- Copyright: Matra Datavision 1993 +// File: HLRBRep_SurfaceTool.lxx +// Created: Wed Jui 7 18:00:00 1993 +// Author: Laurent BUCHARD +// Copyright: Matra Datavision 1993 +// Copyright: OPEN CASCADE 2000 #include #include diff --git a/src/HLRBRep/HLRBRep_VertexList.cdl b/src/HLRBRep/HLRBRep_VertexList.cdl index 70afa0911d..c2ae813efa 100755 --- a/src/HLRBRep/HLRBRep_VertexList.cdl +++ b/src/HLRBRep/HLRBRep_VertexList.cdl @@ -1,8 +1,7 @@ --- File: HLRBRep_VertexList.cdl --- Created: Thu Apr 17 20:04:00 1997 --- Author: Christophe MARION --- ----Copyright: Matra Datavision 1997 +-- File: HLRBRep_VertexList.cdl +-- Created: Thu Apr 17 20:04:00 1997 +-- Author: Christophe MARION +---Copyright: Matra Datavision 1997 class VertexList from HLRBRep @@ -69,4 +68,3 @@ fields fromInterf : Boolean from Standard; end VertexList; - diff --git a/src/HLRBRep/HLRBRep_VertexList.cxx b/src/HLRBRep/HLRBRep_VertexList.cxx index 9205e192f6..430c4ecc46 100755 --- a/src/HLRBRep/HLRBRep_VertexList.cxx +++ b/src/HLRBRep/HLRBRep_VertexList.cxx @@ -1,7 +1,8 @@ -// File: HLRBRep_VertexList.cxx -// Created: Thu Apr 17 21:25:08 1997 -// Author: Christophe MARION -// +// File: HLRBRep_VertexList.cxx +// Created: Thu Apr 17 21:25:08 1997 +// Author: Christophe MARION +// Copyright: OPEN CASCADE 2000 + #ifndef No_Exception #define No_Exception #endif @@ -151,4 +152,3 @@ TopAbs_Orientation HLRBRep_VertexList::BoundaryTransition() const Standard_DomainError::Raise("HLRBRep_VertexList::BoundaryTransition"); return TopAbs_EXTERNAL; // only for WNT. } -