OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-03 17:56:21 +03:00
Code Packages Releases Activity

Replacing french comments by english one

Browse Source
This commit is contained in:
bugmaster 2011-04-28 16:28:27 +00:00 committed by bugmaster
parent 94354caf54
commit 81bba7173e
140 changed files with 4625 additions and 4701 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
src/AIS/AIS_AngleDimension.cxx
View File

@ -805,7 +805,7 @@ void AIS_AngleDimension::ComputeTwoEdgesAngle(const Handle(Prs3d_Presentation)&
return; return;
} }
// Temporary: computation of myVal // Temporary: computation of myVal
// myVal = Abs(geom_lin1->Lin().Angle( geom_lin2->Lin())); // Pb avec les angles JPR // myVal = Abs(geom_lin1->Lin().Angle( geom_lin2->Lin())); // Pb with angles JPR
if (copyOfMyExtShape != 0) myExtShape = copyOfMyExtShape; if (copyOfMyExtShape != 0) myExtShape = copyOfMyExtShape;
@ -833,7 +833,7 @@ void AIS_AngleDimension::ComputeTwoEdgesAngle(const Handle(Prs3d_Presentation)&
#endif #endif
// Traitement du cas ou les 2 droites sont paralleles // Processing in case of 2 parallel straight lines
if (lin1_2d->Lin2d().Direction() if (lin1_2d->Lin2d().Direction()
.IsParallel(lin2_2d->Lin2d().Direction(),Precision::Angular())) { .IsParallel(lin2_2d->Lin2d().Direction(),Precision::Angular())) {
ComputeTwoEdgesNullAngle(aPresentation, ComputeTwoEdgesNullAngle(aPresentation,
@ -844,7 +844,7 @@ void AIS_AngleDimension::ComputeTwoEdgesAngle(const Handle(Prs3d_Presentation)&
isInfinite1,isInfinite2); isInfinite1,isInfinite2);
} }
// Traitement du cas ou les 2 droites ne sont pas paralleles // Processing in case of 2 non-parallel straight lines
else { else {
ComputeTwoEdgesNotNullAngle(aPresentation, ComputeTwoEdgesNotNullAngle(aPresentation,
geom_lin1, geom_lin1,
@ -1035,7 +1035,7 @@ void AIS_AngleDimension::ComputeTwoEdgesNotNullAngle(const Handle(Prs3d_Presenta
Standard_Real par = ElCLib::Parameter(circle,curpos); Standard_Real par = ElCLib::Parameter(circle,curpos);
curpos = ElCLib::Value(par,circle); curpos = ElCLib::Value(par,circle);
// un petit offset comme LengthDimension // small offset like in LengthDimension
gp_Vec transl(myCenter, curpos); gp_Vec transl(myCenter, curpos);
transl*= 0.3; transl*= 0.3;
curpos.Translate(transl); curpos.Translate(transl);
@ -1048,7 +1048,7 @@ void AIS_AngleDimension::ComputeTwoEdgesNotNullAngle(const Handle(Prs3d_Presenta
} }
else { else {
// on projette le point dans le plan // point is projected on the plane
gp_Pnt2d pointOnPln(ProjLib::Project(myPlane->Pln(),myPosition)); gp_Pnt2d pointOnPln(ProjLib::Project(myPlane->Pln(),myPosition));
myPosition = BRepAdaptor_Surface(BRepBuilderAPI_MakeFace(myPlane->Pln()).Face()).Value(pointOnPln.X(),pointOnPln.Y()); myPosition = BRepAdaptor_Surface(BRepBuilderAPI_MakeFace(myPlane->Pln()).Face()).Value(pointOnPln.X(),pointOnPln.Y());
curpos = myPosition; curpos = myPosition;
@ -1058,10 +1058,10 @@ void AIS_AngleDimension::ComputeTwoEdgesNotNullAngle(const Handle(Prs3d_Presenta
curpos.SetXYZ(curpos.XYZ()+delta); curpos.SetXYZ(curpos.XYZ()+delta);
dist = curpos.Distance(myCenter); dist = curpos.Distance(myCenter);
} }
// Pour savoir si on doit prendre la distance -dist ou non // To learn if it is necessary to take distance -dist or not
// il faut savoir si on est dans le secteur oppose a l'angle // it is necessary to know if we are in the sector opposite to the angle
// ou non : on est dans le secteur oppose si les coordonnees // if not : we are in the opposite sector if the coordinates
// de curpos dans le repere (d1,d2) sont negatives // of curpos in point (d1,d2) are negative
gp_Ax2 ax(myCenter,myFDir.Crossed(mySDir),myFDir); gp_Ax2 ax(myCenter,myFDir.Crossed(mySDir),myFDir);
gp_Circ circle(ax,dist); gp_Circ circle(ax,dist);
#ifdef DEB #ifdef DEB
@ -1075,7 +1075,7 @@ void AIS_AngleDimension::ComputeTwoEdgesNotNullAngle(const Handle(Prs3d_Presenta
Standard_Real ufin = uc2; Standard_Real ufin = uc2;
if (uco > ufin) { if (uco > ufin) {
if (Abs(myVal)<PI) { if (Abs(myVal)<PI) {
// test si uco est dans le secteur oppose // test if uco is in the opposite sector
if (uco > udeb+PI && uco < ufin+PI){ if (uco > udeb+PI && uco < ufin+PI){
dist = -dist; dist = -dist;
} }
@ -1172,14 +1172,14 @@ void AIS_AngleDimension::ComputeTwoEdgesNullAngle(const Handle(Prs3d_Presentatio
gp_Lin gpl2 = l2->Lin(); gp_Lin gpl2 = l2->Lin();
//------------------------------------------------------------ //------------------------------------------------------------
// Calcul de myCenter // Computation of myCenter
// -> Point situe sur la ligne mediane des 2 droites, // -> Point located on the median of 2 straight lines,
// calcule comme etant le milieu des 2 points les plus // is calculated as located between 2 closest points
// proches de chaque droite. // of each straight line.
//----------------------------------------------------------- //-----------------------------------------------------------
// theLength : rayon du futur cercle // theLength : radius of the future circle
Standard_Real theLength = gpl1.Distance(gpl2.Location()); Standard_Real theLength = gpl1.Distance(gpl2.Location());
// traitement du cas particulier ou les 2 droites sont confondues // processing of the particular case when 2 straight lines are coincident
Standard_Boolean SameLines(Standard_False); Standard_Boolean SameLines(Standard_False);
if ( theLength <= Precision::Confusion()) { if ( theLength <= Precision::Confusion()) {
SameLines = Standard_True; SameLines = Standard_True;
@ -1247,9 +1247,9 @@ void AIS_AngleDimension::ComputeTwoEdgesNullAngle(const Handle(Prs3d_Presentatio
if ( V1.CrossMagnitude(V2) < 0 ) theaxis.Reverse(); if ( V1.CrossMagnitude(V2) < 0 ) theaxis.Reverse();
} }
gp_Pnt curpos; // position du curseur gp_Pnt curpos; // cursor position
TColStd_Array1OfReal tabdist(1,4); TColStd_Array1OfReal tabdist(1,4);
gp_Pnt P1, P2; // points d'intersection du cercle avec les 2 droites gp_Pnt P1, P2; // points at intersection of the circle with 2 straight lines
if (myAutomaticPosition) { if (myAutomaticPosition) {
if (!isInfinite1) { if (!isInfinite1) {
@ -1279,9 +1279,9 @@ void AIS_AngleDimension::ComputeTwoEdgesNullAngle(const Handle(Prs3d_Presentatio
myCenter.Translate(gp_Vec(d1)*theLength); myCenter.Translate(gp_Vec(d1)*theLength);
// calcul des points d'attache de la cote // calculate attachments of the face
// -> ils sont != des points d'intersection si les // -> they are points of intersection if
// intersection sont en dehors des limites des edges // intersection is outside of the edges
Standard_Real pparam = ElCLib::Parameter(gpl1,myFAttach); Standard_Real pparam = ElCLib::Parameter(gpl1,myFAttach);
Standard_Real pparam1 = ElCLib::Parameter(gpl1,ptat11); Standard_Real pparam1 = ElCLib::Parameter(gpl1,ptat11);
Standard_Real pparam2 = ElCLib::Parameter(gpl1,ptat12); Standard_Real pparam2 = ElCLib::Parameter(gpl1,ptat12);
@ -1315,8 +1315,8 @@ void AIS_AngleDimension::ComputeTwoEdgesNullAngle(const Handle(Prs3d_Presentatio
Handle(Geom_Circle) circle = new Geom_Circle(AX,theLength); Handle(Geom_Circle) circle = new Geom_Circle(AX,theLength);
Handle(Geom2d_Curve) geoCurve = GeomAPI::To2d(circle,myPlane->Pln()); Handle(Geom2d_Curve) geoCurve = GeomAPI::To2d(circle,myPlane->Pln());
Handle(Geom2d_Circle) c2d = *((Handle(Geom2d_Circle)*)& geoCurve); Handle(Geom2d_Circle) c2d = *((Handle(Geom2d_Circle)*)& geoCurve);
// calcul du point d'intersection du cercle avec l1 // calculate the intersection of circle with l1
Standard_Real pparam; // parametre du point d'intersection sur l1 Standard_Real pparam; // parameter of the point of intersection on l1
IntAna2d_AnaIntersection inter(l1_2d->Lin2d(),c2d->Circ2d()); IntAna2d_AnaIntersection inter(l1_2d->Lin2d(),c2d->Circ2d());
gp_Pnt2d pint1(inter.Point(1).Value()); gp_Pnt2d pint1(inter.Point(1).Value());
gp_Pnt2d pint2(inter.Point(2).Value()); gp_Pnt2d pint2(inter.Point(2).Value());
@ -1382,18 +1382,18 @@ void AIS_AngleDimension::ComputeTwoEdgesNullAngle(const Handle(Prs3d_Presentatio
gp_Lin Media(myCenter, gpl1.Direction()); gp_Lin Media(myCenter, gpl1.Direction());
Standard_Real pcurpos = ElCLib::Parameter(Media, curpos); Standard_Real pcurpos = ElCLib::Parameter(Media, curpos);
myCenter = ElCLib::Value(pcurpos, Media); myCenter = ElCLib::Value(pcurpos, Media);
// on translate le centre de facon a avoir un rayon constant! // the centre is translated to avoid a constant radius!
myCenter.Translate(-theLength*gp_Vec(gpl1.Direction())); myCenter.Translate(-theLength*gp_Vec(gpl1.Direction()));
gp_Ax2 AX(myCenter,theaxis,gpl1.Direction()); gp_Ax2 AX(myCenter,theaxis,gpl1.Direction());
Handle(Geom_Circle) circle = new Geom_Circle(AX,theLength); Handle(Geom_Circle) circle = new Geom_Circle(AX,theLength);
// remise a jour de curpos // re-update curpos
pcurpos = ElCLib::Parameter(circle->Circ(), curpos); pcurpos = ElCLib::Parameter(circle->Circ(), curpos);
curpos = ElCLib::Value(pcurpos, circle->Circ()); curpos = ElCLib::Value(pcurpos, circle->Circ());
Handle(Geom2d_Curve) geoCurve = GeomAPI::To2d(circle,myPlane->Pln()); Handle(Geom2d_Curve) geoCurve = GeomAPI::To2d(circle,myPlane->Pln());
Handle(Geom2d_Circle) c2d = *((Handle(Geom2d_Circle)*)& geoCurve); Handle(Geom2d_Circle) c2d = *((Handle(Geom2d_Circle)*)& geoCurve);
// calcul du point d'intersection du cercle avec l1 // calculate the point of intersection of circle with l1
IntAna2d_AnaIntersection inter(l1_2d->Lin2d(),c2d->Circ2d()); IntAna2d_AnaIntersection inter(l1_2d->Lin2d(),c2d->Circ2d());
gp_Pnt2d pint1(inter.Point(1).Value()); gp_Pnt2d pint1(inter.Point(1).Value());
gp_Pnt2d pint2(inter.Point(2).Value()); gp_Pnt2d pint2(inter.Point(2).Value());
@ -1403,9 +1403,9 @@ void AIS_AngleDimension::ComputeTwoEdgesNullAngle(const Handle(Prs3d_Presentatio
else myFAttach = Int2; else myFAttach = Int2;
P1 = myFAttach; P1 = myFAttach;
// calcul du point d'intersection du cercle avec l2 // calculate the point of intersection of circle with l2
// -> c'est la projection car le cercle a son centre // -> this is the projection because the centre of circle
// au milieu de l1 et l2 // is in the middle of l1 and l2
Standard_Real pparam = ElCLib::Parameter(gpl2,myFAttach); Standard_Real pparam = ElCLib::Parameter(gpl2,myFAttach);
mySAttach = ElCLib::Value(pparam, gpl2); mySAttach = ElCLib::Value(pparam, gpl2);
@ -1598,9 +1598,8 @@ void AIS_AngleDimension::Compute3DSelection( const Handle( SelectMgr_Selection )
//======================================================================= //=======================================================================
//function : Compute2DSelection //function : Compute2DSelection
//purpose : calcule les zones de selection sur une cote d'angle entre 2 //purpose : compute zones of selection on a side of angle between 2 edges
// edges // Special processing of zero angles!
// Traitement particulier pour les angles nuls!
//======================================================================= //=======================================================================
void AIS_AngleDimension::Compute2DSelection(const Handle(SelectMgr_Selection)& aSelection) void AIS_AngleDimension::Compute2DSelection(const Handle(SelectMgr_Selection)& aSelection)
@ -1636,7 +1635,7 @@ void AIS_AngleDimension::Compute2DSelection(const Handle(SelectMgr_Selection)& a
} }
//---------------------------------------------------------- //----------------------------------------------------------
// Cas classique ( angle != 0 ) // Classic case ( angle != 0 )
else { else {
if (myFDir.IsParallel(mySDir,Precision::Angular())) { if (myFDir.IsParallel(mySDir,Precision::Angular())) {
@ -1679,7 +1678,7 @@ void AIS_AngleDimension::Compute2DSelection(const Handle(SelectMgr_Selection)& a
if (uco > ufin) { if (uco > ufin) {
if (Abs(myVal)<PI) { if (Abs(myVal)<PI) {
// test si uco est dans le secteur oppose // test if uco is in the opposing sector
if (uco > udeb+PI && uco < ufin+PI){ if (uco > udeb+PI && uco < ufin+PI){
udeb = udeb + PI; udeb = udeb + PI;
ufin = ufin + PI; ufin = ufin + PI;
@ -1695,7 +1694,7 @@ void AIS_AngleDimension::Compute2DSelection(const Handle(SelectMgr_Selection)& a
p1 = ElCLib::Value(udeb,cer); p1 = ElCLib::Value(udeb,cer);
p2 = ElCLib::Value(ufin,cer); p2 = ElCLib::Value(ufin,cer);
//Creation des 2 owners pour chaque partie de la fleche //Create 2 owners for each part of the arrow
Handle(AIS_DimensionOwner) own1 = new AIS_DimensionOwner(this,7); Handle(AIS_DimensionOwner) own1 = new AIS_DimensionOwner(this,7);
Handle(AIS_DimensionOwner) own2 = new AIS_DimensionOwner(this,7); Handle(AIS_DimensionOwner) own2 = new AIS_DimensionOwner(this,7);
if (myExtShape != 0) { if (myExtShape != 0) {
@ -1772,7 +1771,7 @@ void AIS_AngleDimension::ComputeNull2DSelection(
if (uco > ufin) { if (uco > ufin) {
if (Abs(myVal)<PI) { if (Abs(myVal)<PI) {
// test si uco est dans le secteur oppose // test if uco is in the opposing sector
if (uco > udeb+PI && uco < ufin+PI){ if (uco > udeb+PI && uco < ufin+PI){
udeb = udeb + PI; udeb = udeb + PI;
ufin = ufin + PI; ufin = ufin + PI;
@ -1791,7 +1790,7 @@ void AIS_AngleDimension::ComputeNull2DSelection(
} }
} }
//Creation des 2 owners pour chaque partie de la fleche //Create 2 owners for each part of the arrow
Handle(AIS_DimensionOwner) own1 = new AIS_DimensionOwner(this,7); Handle(AIS_DimensionOwner) own1 = new AIS_DimensionOwner(this,7);
Handle(AIS_DimensionOwner) own2 = new AIS_DimensionOwner(this,7); Handle(AIS_DimensionOwner) own2 = new AIS_DimensionOwner(this,7);
if (myExtShape != 0) { if (myExtShape != 0) {
@ -1821,7 +1820,7 @@ void AIS_AngleDimension::ComputeNull2DSelection(
aSelection->Add(scurv); aSelection->Add(scurv);
} }
else { else {
// on trace un bout de segment pour permettre la selection // find end of segment to allow selection
gp_Vec VTrans(myFDir.Crossed(Norm)); gp_Vec VTrans(myFDir.Crossed(Norm));
Handle(Select3D_SensitiveSegment) seg1; Handle(Select3D_SensitiveSegment) seg1;
seg1 = new Select3D_SensitiveSegment(own1, seg1 = new Select3D_SensitiveSegment(own1,

14
src/AIS/AIS_ConcentricRelation.cxx
View File

@ -173,8 +173,8 @@ void AIS_ConcentricRelation::ComputeTwoEdgesConcentric(const Handle(Prs3d_Presen
myCenter = gcirc1->Location(); myCenter = gcirc1->Location();
// on choisit le rayon egal a 1/5 ieme du rayon du plus petit des // choose the radius equal to 1/5 of the smallest radius of
// 2 cercles. On impose une borne sup au rayon( 0.02 au hasard) // 2 circles. Limit is imposed ( 0.02 by chance)
Standard_Real rad1 = gcirc1->Radius(); Standard_Real rad1 = gcirc1->Radius();
Standard_Real rad2 = gcirc2->Radius(); Standard_Real rad2 = gcirc2->Radius();
myRad = (rad1 > rad2 ) ? rad2 : rad1; myRad = (rad1 > rad2 ) ? rad2 : rad1;
@ -182,7 +182,7 @@ void AIS_ConcentricRelation::ComputeTwoEdgesConcentric(const Handle(Prs3d_Presen
if (myRad > 15.) myRad =15.; if (myRad > 15.) myRad =15.;
//Calcul d'un point du cercle de rayon myRad //Calculate a point of circle of radius myRad
gp_Dir vec(ptat11.XYZ() - myCenter.XYZ() ); gp_Dir vec(ptat11.XYZ() - myCenter.XYZ() );
gp_Vec vectrans(vec); gp_Vec vectrans(vec);
myPnt = myCenter.Translated(vectrans.Multiplied(myRad)); myPnt = myCenter.Translated(vectrans.Multiplied(myRad));
@ -243,21 +243,21 @@ void AIS_ConcentricRelation::ComputeSelection(const Handle(SelectMgr_Selection)&
{ {
Handle(SelectMgr_EntityOwner) own = new SelectMgr_EntityOwner(this,7); Handle(SelectMgr_EntityOwner) own = new SelectMgr_EntityOwner(this,7);
//Creation de 2 sensitives cercles //Creation of 2 sensitive circles
// le plus grand // the greater
gp_Ax2 ax(myCenter, myDir); gp_Ax2 ax(myCenter, myDir);
Handle(Geom_Circle) Circ = new Geom_Circle(ax, myRad) ; Handle(Geom_Circle) Circ = new Geom_Circle(ax, myRad) ;
Handle(Select3D_SensitiveCircle) Handle(Select3D_SensitiveCircle)
sensit = new Select3D_SensitiveCircle (own, sensit = new Select3D_SensitiveCircle (own,
Circ); Circ);
aSelection->Add(sensit); aSelection->Add(sensit);
// le plus petit // the smaller
Circ->SetRadius(myRad/2); Circ->SetRadius(myRad/2);
sensit = new Select3D_SensitiveCircle (own, sensit = new Select3D_SensitiveCircle (own,
Circ); Circ);
aSelection->Add(sensit); aSelection->Add(sensit);
//Creation de 2 segments sensitifs pour la croix //Creation of 2 segments sensitive for the cross
Handle(Select3D_SensitiveSegment) seg; Handle(Select3D_SensitiveSegment) seg;
gp_Pnt otherPnt = myPnt.Mirrored(myCenter); gp_Pnt otherPnt = myPnt.Mirrored(myCenter);
seg = new Select3D_SensitiveSegment(own, seg = new Select3D_SensitiveSegment(own,

6
src/AIS/AIS_ConnectedInteractive.cxx
View File

@ -46,8 +46,8 @@ Standard_Integer AIS_ConnectedInteractive::Signature() const
void AIS_ConnectedInteractive:: void AIS_ConnectedInteractive::
Connect(const Handle(AIS_InteractiveObject)& anotherIObj) Connect(const Handle(AIS_InteractiveObject)& anotherIObj)
{ {
// Pour Avoir le temps de faire le Disconnect en dessous, // To have the time to Disconnect below,
// on garde l'ancien un peu. SMO. // the old is kept for a while.
if(myReference==anotherIObj) return; if(myReference==anotherIObj) return;
myOldReference = myReference; myOldReference = myReference;
//Disconnect(); //Disconnect();
@ -65,7 +65,7 @@ Connect(const Handle(AIS_InteractiveObject)& anotherIobj,
if(myLocation!=aLocation) if(myLocation!=aLocation)
myLocation = aLocation; myLocation = aLocation;
if(myReference!=anotherIobj) { if(myReference!=anotherIobj) {
myOldReference = myReference; // necessaire pour pouvoir faire le disconnect en dessous.. myOldReference = myReference; // necessary to disconnect below..
// Disconnect(); // Disconnect();
myReference = anotherIobj;} myReference = anotherIobj;}

16
src/AIS/AIS_ConnectedShape.cxx
View File

@ -128,7 +128,7 @@ void AIS_ConnectedShape::Compute(const Handle(Prs3d_Projector)& aProjector,
Aspect_TypeOfDeflection prevdef = defdrawer->TypeOfDeflection(); Aspect_TypeOfDeflection prevdef = defdrawer->TypeOfDeflection();
defdrawer->SetTypeOfDeflection(Aspect_TOD_RELATIVE); defdrawer->SetTypeOfDeflection(Aspect_TOD_RELATIVE);
// traitement HLRAngle et HLRDeviationCoefficient() // process HLRAngle and HLRDeviationCoefficient()
Standard_Real prevangl = myDrawer->HLRAngle(); Standard_Real prevangl = myDrawer->HLRAngle();
Standard_Real newangl = defdrawer->HLRAngle(); Standard_Real newangl = defdrawer->HLRAngle();
if (Abs(newangl- prevangl) > Precision::Angular()) { if (Abs(newangl- prevangl) > Precision::Angular()) {
@ -182,8 +182,8 @@ void AIS_ConnectedShape::ComputeSelection (const Handle(SelectMgr_Selection)& aS
{ {
UpdateShape(); UpdateShape();
aSelection->Clear(); aSelection->Clear();
// On regarde s'il n'y a pas des choses a faire sur la reference, // It is checked if there is nothing to do with the reference
// du type mise a jour... // of type update...
if(!myReference->HasSelection(aMode)) if(!myReference->HasSelection(aMode))
myReference->UpdateSelection(aMode); myReference->UpdateSelection(aMode);
@ -193,8 +193,8 @@ void AIS_ConnectedShape::ComputeSelection (const Handle(SelectMgr_Selection)& aS
if(RefSel->UpdateStatus()==SelectMgr_TOU_Full) if(RefSel->UpdateStatus()==SelectMgr_TOU_Full)
myReference->UpdateSelection(aMode); myReference->UpdateSelection(aMode);
//suivant le type de decomposition, on deduit les primitives connectees. // depending on the type of decomposition, connected primitives are subtracted
// il faut suivre l'ordre de creation de StdSelect_BRepSelectionTool... // it is necessary to follow the order of creation of StdSelect_BRepSelectionTool...
TopAbs_ShapeEnum TheType = AIS_Shape::SelectionType(aMode); TopAbs_ShapeEnum TheType = AIS_Shape::SelectionType(aMode);
Handle(StdSelect_BRepOwner) OWNR; Handle(StdSelect_BRepOwner) OWNR;
@ -235,8 +235,8 @@ void AIS_ConnectedShape::ComputeSelection (const Handle(SelectMgr_Selection)& aS
case TopAbs_SHAPE: case TopAbs_SHAPE:
default: default:
{ {
// Dans ce cas on n'a qu'un seul proprietaire pour l'ensemble des // In case if there is only one owner of the set of
// primitives sensibles... // sensible primitives...
OWNR = new StdSelect_BRepOwner(myOwnSh,this); OWNR = new StdSelect_BRepOwner(myOwnSh,this);
Standard_Boolean FirstIncr(Standard_True); Standard_Boolean FirstIncr(Standard_True);
for(RefSel->Init();RefSel->More();RefSel->Next()){ for(RefSel->Init();RefSel->More();RefSel->Next()){
@ -286,7 +286,7 @@ void AIS_ConnectedShape::UpdateShape(const Standard_Boolean WithTheLocation)
{ {
if(myReference.IsNull()) return; if(myReference.IsNull()) return;
// attention grosse ligne... // attention great line...
if(myReference->Type()!=AIS_KOI_Shape) return; if(myReference->Type()!=AIS_KOI_Shape) return;
Standard_Integer Sig = myReference->Signature(); Standard_Integer Sig = myReference->Signature();

6
src/AIS/AIS_EqualDistanceRelation.cxx
View File

@ -455,7 +455,7 @@ void AIS_EqualDistanceRelation::ComputeTwoEdgesLength( const Handle( Prs3d_Prese
Position = AIS::ProjectPointOnPlane( Position, Plane->Pln() ); Position = AIS::ProjectPointOnPlane( Position, Plane->Pln() );
} }
// recherche points attache // find attach points
if (!isInfinite1) { if (!isInfinite1) {
if (Position.Distance(ptat11) > Position.Distance(ptat12)) FirstAttach = ptat12; if (Position.Distance(ptat11) > Position.Distance(ptat12)) FirstAttach = ptat12;
else FirstAttach = ptat11; else FirstAttach = ptat11;
@ -823,8 +823,8 @@ void AIS_EqualDistanceRelation::ComputeOneEdgeOneVertexLength( const Handle( Prs
// computation of Val // computation of Val
Val = FirstAttach.Distance(SecondAttach); Val = FirstAttach.Distance(SecondAttach);
//Display des morceaux de raccordement vers la curve si elle //Display the pieces of attached to the curve if it is not
// n'est pas dans le WP // in the WP
if (!isOnPlanEdge) { // add presentation of projection of the edge in WP if (!isOnPlanEdge) { // add presentation of projection of the edge in WP
AIS::ComputeProjEdgePresentation(aPresentation,aDrawer,theedge,aCurve,ptonedge1,ptonedge2); AIS::ComputeProjEdgePresentation(aPresentation,aDrawer,theedge,aCurve,ptonedge1,ptonedge2);
} }

6
src/AIS/AIS_ExclusionFilter.cxx
View File

@ -175,13 +175,13 @@ Standard_Boolean AIS_ExclusionFilter::IsOk(const Handle(SelectMgr_EntityOwner)&
if(IO.IsNull()) if(IO.IsNull())
return Standard_False; return Standard_False;
// le type de l'ais n'est pas dans la map... // type of AIS is not in the map...
if(!myStoredTypes.IsBound(IO->Type())) if(!myStoredTypes.IsBound(IO->Type()))
return myIsExclusionFlagOn ; return myIsExclusionFlagOn ;
// le type de l'ais est dans la map et il n'y a pas de signature precisee // type of AIS is not in the map and there is no signature indicated
if(myStoredTypes(IO->Type()).IsEmpty()) if(myStoredTypes(IO->Type()).IsEmpty())
return !myIsExclusionFlagOn ; return !myIsExclusionFlagOn ;
// il y a une ou des signatures precisees... // one or several signatures are indicated...
if(IsSignatureIn(IO->Type(),IO->Signature())) if(IsSignatureIn(IO->Type(),IO->Signature()))
return !myIsExclusionFlagOn; return !myIsExclusionFlagOn;

46
src/AIS/AIS_FixRelation.cxx
View File

@ -180,8 +180,8 @@ void AIS_FixRelation::Compute(const Handle(PrsMgr_PresentationManager3d)&,
{ {
aPresentation->Clear(); aPresentation->Clear();
// Calcul du point de positionnement du symbole et du // Calculate position of the symbol and
// point d'attache du segment de raccord sur la shape // point of attach of the segment on the shape
gp_Pnt curpos; gp_Pnt curpos;
if (myFShape.ShapeType() == TopAbs_VERTEX) if (myFShape.ShapeType() == TopAbs_VERTEX)
ComputeVertex(TopoDS::Vertex(myFShape), curpos); ComputeVertex(TopoDS::Vertex(myFShape), curpos);
@ -191,14 +191,14 @@ void AIS_FixRelation::Compute(const Handle(PrsMgr_PresentationManager3d)&,
const gp_Dir& nor = myPlane->Axis().Direction(); const gp_Dir& nor = myPlane->Axis().Direction();
// calcul de la presentation // calculate presentation
//definition de la taille du symbole // definition of the symbol size
#ifdef BUC60915 #ifdef BUC60915
if( !myArrowSizeIsDefined ) if( !myArrowSizeIsDefined )
#endif #endif
myArrowSize = 5.; myArrowSize = 5.;
//creation du presentable //creation of the presentation
DsgPrs_FixPresentation::Add(aPresentation, DsgPrs_FixPresentation::Add(aPresentation,
myDrawer, myDrawer,
myPntAttach, myPntAttach,
@ -255,15 +255,15 @@ void AIS_FixRelation::ComputeSelection(const Handle(SelectMgr_Selection)& aSelec
{ {
Handle(SelectMgr_EntityOwner) own = new SelectMgr_EntityOwner(this,7); Handle(SelectMgr_EntityOwner) own = new SelectMgr_EntityOwner(this,7);
// creation d'un segment sensible pour le segment de raccordement // creation of segment sensible for the linked segment
// de la shape fixe au symbole 'Fix' // of the shape fixed to symbol 'Fix'
Handle(Select3D_SensitiveSegment) seg; Handle(Select3D_SensitiveSegment) seg;
seg = new Select3D_SensitiveSegment(own, seg = new Select3D_SensitiveSegment(own,
myPntAttach, myPntAttach,
myPosition); myPosition);
aSelection->Add(seg); aSelection->Add(seg);
// Creation de la zone sensible du symbole 'Fix' // Creation of the sensible zone of symbol 'Fix'
gp_Dir norm = myPlane->Axis().Direction(); gp_Dir norm = myPlane->Axis().Direction();
gp_Vec dirac(myPntAttach,myPosition); gp_Vec dirac(myPntAttach,myPosition);
@ -343,7 +343,7 @@ gp_Pnt AIS_FixRelation::ComputePosition(const Handle(Geom_Curve)& curv1,
const gp_Pnt& lastp2) const const gp_Pnt& lastp2) const
{ {
//--------------------------------------------------------- //---------------------------------------------------------
// calcul du point d'attache // calculate the point of attach
//--------------------------------------------------------- //---------------------------------------------------------
gp_Pnt curpos; gp_Pnt curpos;
@ -391,7 +391,7 @@ gp_Pnt AIS_FixRelation::ComputePosition(const Handle(Geom_Curve)& curv,
const gp_Pnt& lastp) const const gp_Pnt& lastp) const
{ {
//--------------------------------------------------------- //---------------------------------------------------------
// calcul du point d'attache // calculate the point of attach
//--------------------------------------------------------- //---------------------------------------------------------
gp_Pnt curpos; gp_Pnt curpos;
@ -435,7 +435,7 @@ void AIS_FixRelation::ComputeEdge(const TopoDS_Edge& FixEdge, gp_Pnt& curpos)
//--------------------------------------------------------- //---------------------------------------------------------
// calcul du point de positionnement du symbole 'fix' // calcul du point de positionnement du symbole 'fix'
//--------------------------------------------------------- //---------------------------------------------------------
//--> Dans le cas d'une droite //--> In case of a straight line
if (curEdge->IsKind(STANDARD_TYPE(Geom_Line))){ if (curEdge->IsKind(STANDARD_TYPE(Geom_Line))){
gp_Lin glin = Handle(Geom_Line)::DownCast(curEdge)->Lin(); gp_Lin glin = Handle(Geom_Line)::DownCast(curEdge)->Lin();
Standard_Real pfirst(ElCLib::Parameter(glin,ptbeg)); Standard_Real pfirst(ElCLib::Parameter(glin,ptbeg));
@ -443,7 +443,7 @@ void AIS_FixRelation::ComputeEdge(const TopoDS_Edge& FixEdge, gp_Pnt& curpos)
ComputeLinePosition(glin, curpos, pfirst, plast); ComputeLinePosition(glin, curpos, pfirst, plast);
} }
//--> Dans le cas d'un cercle //--> In case of a circle
else if (curEdge->IsKind(STANDARD_TYPE(Geom_Circle))) { else if (curEdge->IsKind(STANDARD_TYPE(Geom_Circle))) {
gp_Circ gcirc = Handle(Geom_Circle)::DownCast(curEdge)->Circ(); gp_Circ gcirc = Handle(Geom_Circle)::DownCast(curEdge)->Circ();
Standard_Real pfirst, plast; Standard_Real pfirst, plast;
@ -471,7 +471,7 @@ void AIS_FixRelation::ComputeLinePosition(const gp_Lin& glin,
Standard_Real& plast) Standard_Real& plast)
{ {
if (myAutomaticPosition) { if (myAutomaticPosition) {
// le point d'attache est choisi comme milieu du segment // point of attach is chosen as middle of the segment
myPntAttach = ElCLib::Value((pfirst+ plast)/2, glin); myPntAttach = ElCLib::Value((pfirst+ plast)/2, glin);
gp_Dir norm = myPlane ->Axis().Direction(); gp_Dir norm = myPlane ->Axis().Direction();
@ -485,14 +485,14 @@ void AIS_FixRelation::ComputeLinePosition(const gp_Lin& glin,
pos = myPosition; pos = myPosition;
Standard_Real linparam = ElCLib::Parameter(glin, pos); Standard_Real linparam = ElCLib::Parameter(glin, pos);
//cas ou la projection de position se situe entre les 2 vertex // case if the projection of position is located between 2 vertices
// de l'edge // de l'edge
if ( (linparam >= pfirst) && (linparam <= plast) ) if ( (linparam >= pfirst) && (linparam <= plast) )
myPntAttach = ElCLib::Value(linparam,glin); myPntAttach = ElCLib::Value(linparam,glin);
// cas ou la projection de Position est en dehors des limites // case if the projection of Position is outside of the limits
// de l'edge : alors on choisit comme point d'attache le point // of the edge : the point closest to the projection is chosen
// le plus proche de la projection // as the attach point
else { else {
Standard_Real pOnLin; Standard_Real pOnLin;
if (linparam > plast) if (linparam > plast)
@ -525,7 +525,7 @@ void AIS_FixRelation::ComputeCirclePosition(
Standard_Real& pfirst, Standard_Real& pfirst,
Standard_Real& plast) Standard_Real& plast)
{ {
// reajustement des parametres sur le cercle // readjust parametres on the circle
if (plast > 2*PI ) { if (plast > 2*PI ) {
Standard_Real nbtours = Floor(plast / (2*PI)); Standard_Real nbtours = Floor(plast / (2*PI));
plast -= nbtours*2*PI; plast -= nbtours*2*PI;
@ -533,8 +533,8 @@ void AIS_FixRelation::ComputeCirclePosition(
} }
if (myAutomaticPosition) { if (myAutomaticPosition) {
// le point d'attache est le "milieu" du segment (par rapport // the point attach is the "middle" of the segment (relatively
// aux parametres des vertex de debut et de fin de l'edge // to the parametres of start and end vertices of the edge
Standard_Real circparam = (pfirst + plast)/2.; Standard_Real circparam = (pfirst + plast)/2.;
@ -555,9 +555,9 @@ void AIS_FixRelation::ComputeCirclePosition(
} // if (myAutomaticPosition) } // if (myAutomaticPosition)
else { else {
// cas ou la projection de myPosition est en dehors des 2 // case if the projection of myPosition is outside of 2
// vertex de l'edge. Dans ce cas on reajuste le parametre // vertices of the edge. In this case the parameter is readjusted
// dans la portion valable du cercle // in the valid part of the circle
pos = myPosition; pos = myPosition;
Standard_Real circparam = ElCLib::Parameter(gcirc, pos); Standard_Real circparam = ElCLib::Parameter(gcirc, pos);

20
src/AIS/AIS_IdenticRelation.cxx
View File

@ -387,7 +387,7 @@ void AIS_IdenticRelation::Compute(const Handle_Prs3d_Projector& aProjector, cons
// "identic" presentation // "identic" presentation
// note : if we are in the case of lines, we create a segment between // note : if we are in the case of lines, we create a segment between
// myFAttach and mySAttach. In the case of Circles, we create // myFAttach and mySAttach. In the case of Circles, we create
// an arc of circle between the sames points.We Add a segment // an arc of circle between the sames points. We Add a segment
// to link Position to its projection on the curve described // to link Position to its projection on the curve described
// before. // before.
//======================================================================= //=======================================================================
@ -452,7 +452,7 @@ void AIS_IdenticRelation::ComputeSelection(const Handle(SelectMgr_Selection)& aS
seg = new Select3D_SensitiveSegment(own, myFAttach, mySAttach); seg = new Select3D_SensitiveSegment(own, myFAttach, mySAttach);
aSelection->Add(seg); aSelection->Add(seg);
//attach = projection de Position() sur la curve; //attach = projection of Position() on the curve;
gp_Vec v1 (myFAttach, mySAttach); gp_Vec v1 (myFAttach, mySAttach);
gp_Vec v2 (myFAttach, myPosition); gp_Vec v2 (myFAttach, myPosition);
if ( v1.IsParallel(v2, Precision::Angular()) ) if ( v1.IsParallel(v2, Precision::Angular()) )
@ -521,7 +521,7 @@ void AIS_IdenticRelation::ComputeTwoEdgesPresentation(const Handle(Prs3d_Present
// Treatement of the case of circles // Treatement of the case of circles
else if ( curv1->IsInstance(STANDARD_TYPE(Geom_Circle)) && curv2->IsInstance(STANDARD_TYPE(Geom_Circle)) ) { else if ( curv1->IsInstance(STANDARD_TYPE(Geom_Circle)) && curv2->IsInstance(STANDARD_TYPE(Geom_Circle)) ) {
//gp_Pnt curpos; //gp_Pnt curpos;
isCircle = Standard_True; // usefull for ComputeSelection isCircle = Standard_True; // useful for ComputeSelection
const Handle(Geom_Circle)& thecirc = (Handle(Geom_Circle)&) curv1; const Handle(Geom_Circle)& thecirc = (Handle(Geom_Circle)&) curv1;
ComputeTwoCirclesPresentation(aPrs, thecirc, firstp1, lastp1, firstp2, lastp2); ComputeTwoCirclesPresentation(aPrs, thecirc, firstp1, lastp1, firstp2, lastp2);
} }
@ -537,7 +537,7 @@ void AIS_IdenticRelation::ComputeTwoEdgesPresentation(const Handle(Prs3d_Present
else else
return; return;
// Calcul de la presentation des edges projettees // Calculate presentation of projected edges
if ( (myExtShape != 0) && !extCurv.IsNull()) { if ( (myExtShape != 0) && !extCurv.IsNull()) {
if (myExtShape == 1 ) if (myExtShape == 1 )
ComputeProjEdgePresentation(aPrs, TopoDS::Edge(myFShape), curv1, firstp1, lastp1); ComputeProjEdgePresentation(aPrs, TopoDS::Edge(myFShape), curv1, firstp1, lastp1);
@ -1529,7 +1529,7 @@ void AIS_IdenticRelation::ComputeTwoVerticesPresentation(const Handle(Prs3d_Pres
vals, vals,
myFAttach, myFAttach,
curpos); curpos);
// Calcul de la projection du vertex // Calculate the projection of vertex
if ( myExtShape == 1) if ( myExtShape == 1)
ComputeProjVertexPresentation(aPrs,FVertex,myFAttach); ComputeProjVertexPresentation(aPrs,FVertex,myFAttach);
else if ( myExtShape == 2) else if ( myExtShape == 2)
@ -1551,7 +1551,7 @@ Standard_Real AIS_IdenticRelation::ComputeSegSize() const
//function : ComputeDirection //function : ComputeDirection
//purpose : Compute a direction according to the different geometric //purpose : Compute a direction according to the different geometric
// elements connected to the vertex <VERT>, in way to not have // elements connected to the vertex <VERT>, in way to not have
// overlap between the symbol and them. // overlap between the symbol and them.
//======================================================================= //=======================================================================
Standard_Boolean AIS_IdenticRelation::ComputeDirection(const TopoDS_Wire& aWire, Standard_Boolean AIS_IdenticRelation::ComputeDirection(const TopoDS_Wire& aWire,
const TopoDS_Vertex& VERT, const TopoDS_Vertex& VERT,
@ -1665,12 +1665,12 @@ void AIS_IdenticRelation::ComputeOneEdgeOVertexPresentation(const Handle(Prs3d_P
if (myFShape.ShapeType() == TopAbs_VERTEX) { if (myFShape.ShapeType() == TopAbs_VERTEX) {
V = TopoDS::Vertex(myFShape); V = TopoDS::Vertex(myFShape);
E = TopoDS::Edge(mySShape); E = TopoDS::Edge(mySShape);
numedge = 2;// edge = 2 iem shape numedge = 2;// edge = 2nd shape
} }
else { else {
V = TopoDS::Vertex(mySShape); V = TopoDS::Vertex(mySShape);
E = TopoDS::Edge(myFShape); E = TopoDS::Edge(myFShape);
numedge = 1; // edge = 1 ere shape numedge = 1; // edge = 1st shape
} }
gp_Pnt ptonedge1,ptonedge2; gp_Pnt ptonedge1,ptonedge2;
Handle(Geom_Curve) aCurve; Handle(Geom_Curve) aCurve;
@ -1682,7 +1682,7 @@ void AIS_IdenticRelation::ComputeOneEdgeOVertexPresentation(const Handle(Prs3d_P
aPrs->SetInfiniteState(isInfinite); aPrs->SetInfiniteState(isInfinite);
AIS::ComputeGeometry(V, myFAttach, myPlane, isOnPlanVertex); AIS::ComputeGeometry(V, myFAttach, myPlane, isOnPlanVertex);
// on considere que seule la courbe peut etre projetee // only the curve can be projected
if (!isOnPlanEdge && !isOnPlanVertex) return; if (!isOnPlanEdge && !isOnPlanVertex) return;
if (!isOnPlanEdge) { if (!isOnPlanEdge) {
@ -1736,7 +1736,7 @@ void AIS_IdenticRelation::ComputeOneEdgeOVertexPresentation(const Handle(Prs3d_P
myFAttach, myFAttach,
curpos); curpos);
if (myExtShape != 0) { if (myExtShape != 0) {
if (!extCurv.IsNull()) { // c'est l'edge qui n'est pas dans le WP if (!extCurv.IsNull()) { // the edge is not in the WP
ComputeProjEdgePresentation(aPrs,E,(Handle(Geom_Line)&) aCurve,ptonedge1,ptonedge2); ComputeProjEdgePresentation(aPrs,E,(Handle(Geom_Line)&) aCurve,ptonedge1,ptonedge2);
} }
} }

24
src/AIS/AIS_InteractiveContext.cxx
View File

@ -860,8 +860,8 @@ Standard_Boolean AIS_InteractiveContext::KeepTemporary(const Handle(AIS_Interact
if(myObjects.IsBound(anIObj)) return Standard_False; if(myObjects.IsBound(anIObj)) return Standard_False;
if(WhichContext!=-1 && !myLocalContexts.IsBound(WhichContext)) return Standard_False; if(WhichContext!=-1 && !myLocalContexts.IsBound(WhichContext)) return Standard_False;
// Protection : si on essaye de conserver un objet temporaire // Protection : if one tries to preserve a temporary object
// qui n'est pas dans le contexte local actif... rob 11-06-97 // which is not in the local active context... rob 11-06-97
Standard_Integer IsItInLocal = myCurLocalIndex; Standard_Integer IsItInLocal = myCurLocalIndex;
Standard_Boolean Found(Standard_False); Standard_Boolean Found(Standard_False);
@ -1798,8 +1798,8 @@ void AIS_InteractiveContext::SetDisplayMode(const Handle(AIS_InteractiveObject)&
Handle(AIS_GlobalStatus) STATUS = myObjects(anIObj); Handle(AIS_GlobalStatus) STATUS = myObjects(anIObj);
// ENDCLE // ENDCLE
#ifndef OCC4373 #ifndef OCC4373
// l'objet interactif n'avait pas de mode propre : OldMode = Mode Session // the interactive object has no mode : OldMode = Mode Session
// avait deja un mode propre : OldMode = ancien mode Propre // already has a mode : OldMode = old mode Propre
Standard_Integer OldMode = anIObj->HasDisplayMode() ? anIObj->DisplayMode(): myDisplayMode; Standard_Integer OldMode = anIObj->HasDisplayMode() ? anIObj->DisplayMode(): myDisplayMode;
@ -2004,7 +2004,7 @@ void AIS_InteractiveContext::SetDeviationCoefficient(
if(!anIObj->HasInteractiveContext()) if(!anIObj->HasInteractiveContext())
anIObj->SetContext(this); anIObj->SetContext(this);
// A Modifier apres descente des methodes concernees de AIS_Shape dans InteractiveObject // To be modified after the related methods of AIS_Shape are passed to InteractiveObject
if(anIObj->Type()!=AIS_KOI_Object && anIObj->Type()!=AIS_KOI_Shape) return; if(anIObj->Type()!=AIS_KOI_Object && anIObj->Type()!=AIS_KOI_Shape) return;
if(anIObj->Signature()!=0) return; if(anIObj->Signature()!=0) return;
(*((Handle(AIS_Shape)*)&anIObj))->SetOwnDeviationCoefficient(aCoefficient); (*((Handle(AIS_Shape)*)&anIObj))->SetOwnDeviationCoefficient(aCoefficient);
@ -2047,7 +2047,7 @@ void AIS_InteractiveContext::SetHLRDeviationCoefficient(
if(!anIObj->HasInteractiveContext()) if(!anIObj->HasInteractiveContext())
anIObj->SetContext(this); anIObj->SetContext(this);
// A Modifier apres descente des methodes concernees de AIS_Shape dans InteractiveObject // To be modified after the related methods of AIS_Shape are passed to InteractiveObject
if(anIObj->Type()!=AIS_KOI_Object && anIObj->Type()!=AIS_KOI_Shape) return; if(anIObj->Type()!=AIS_KOI_Object && anIObj->Type()!=AIS_KOI_Shape) return;
if(anIObj->Signature()!=0) return; if(anIObj->Signature()!=0) return;
(*((Handle(AIS_Shape)*)&anIObj))->SetOwnHLRDeviationCoefficient(aCoefficient); (*((Handle(AIS_Shape)*)&anIObj))->SetOwnHLRDeviationCoefficient(aCoefficient);
@ -2092,7 +2092,7 @@ void AIS_InteractiveContext::SetDeviationAngle(
if(!anIObj->HasInteractiveContext()) if(!anIObj->HasInteractiveContext())
anIObj->SetContext(this); anIObj->SetContext(this);
// A Modifier apres descente des methodes concernees de AIS_Shape dans InteractiveObject // To be modified after the related methods of AIS_Shape are passed to InteractiveObject
if(anIObj->Type()!=AIS_KOI_Shape) return; if(anIObj->Type()!=AIS_KOI_Shape) return;
if(anIObj->Signature()!=0) return; if(anIObj->Signature()!=0) return;
(*((Handle(AIS_Shape)*)&anIObj))->SetOwnDeviationAngle(anAngle); (*((Handle(AIS_Shape)*)&anIObj))->SetOwnDeviationAngle(anAngle);
@ -2134,7 +2134,7 @@ void AIS_InteractiveContext::SetAngleAndDeviation(
if(!anIObj->HasInteractiveContext()) if(!anIObj->HasInteractiveContext())
anIObj->SetContext(this); anIObj->SetContext(this);
// A Modifier apres descente des methodes concernees de AIS_Shape dans InteractiveObject // To be modified after the related methods of AIS_Shape are passed to InteractiveObject
if(anIObj->Type()!=AIS_KOI_Shape) return; if(anIObj->Type()!=AIS_KOI_Shape) return;
if(anIObj->Signature()!=0) return; if(anIObj->Signature()!=0) return;
(*((Handle(AIS_Shape)*)&anIObj))->SetAngleAndDeviation(anAngle); (*((Handle(AIS_Shape)*)&anIObj))->SetAngleAndDeviation(anAngle);
@ -2162,7 +2162,7 @@ void AIS_InteractiveContext::SetHLRAngleAndDeviation(
if(!anIObj->HasInteractiveContext()) if(!anIObj->HasInteractiveContext())
anIObj->SetContext(this); anIObj->SetContext(this);
// A Modifier apres descente des methodes concernees de AIS_Shape dans InteractiveObject // To be modified after the related methods of AIS_Shape are passed to InteractiveObject
if(anIObj->Type()!=AIS_KOI_Shape) return; if(anIObj->Type()!=AIS_KOI_Shape) return;
if(anIObj->Signature()!=0) return; if(anIObj->Signature()!=0) return;
(*((Handle(AIS_Shape)*)&anIObj))->SetHLRAngleAndDeviation(anAngle); (*((Handle(AIS_Shape)*)&anIObj))->SetHLRAngleAndDeviation(anAngle);
@ -2205,7 +2205,7 @@ void AIS_InteractiveContext::SetHLRDeviationAngle(
if(!anIObj->HasInteractiveContext()) if(!anIObj->HasInteractiveContext())
anIObj->SetContext(this); anIObj->SetContext(this);
// A Modifier apres descente des methodes concernees de AIS_Shape dans InteractiveObject // To be modified after the related methods of AIS_Shape are passed to InteractiveObject
if( anIObj->Type()!=AIS_KOI_Shape) return; if( anIObj->Type()!=AIS_KOI_Shape) return;
if(anIObj->Signature()!=0) return; if(anIObj->Signature()!=0) return;
(*((Handle(AIS_Shape)*)&anIObj))->SetOwnHLRDeviationAngle(anAngle); (*((Handle(AIS_Shape)*)&anIObj))->SetOwnHLRDeviationAngle(anAngle);
@ -3004,7 +3004,7 @@ Standard_Boolean AIS_InteractiveContext::IsInLocal(const Handle_AIS_InteractiveO
Standard_Integer& TheIndex) const Standard_Integer& TheIndex) const
{ {
if(anIObj.IsNull()) return Standard_False; if(anIObj.IsNull()) return Standard_False;
// s'il existe au point neutre on retourne l'index 0 // if it exists at neutral point 0 index is returned
if(myObjects.IsBound(anIObj)) { if(myObjects.IsBound(anIObj)) {
TheIndex = 0; TheIndex = 0;
return Standard_False; return Standard_False;
@ -3048,7 +3048,7 @@ void AIS_InteractiveContext::InitAttributes()
HLA->SetWidth(1); HLA->SetWidth(1);
HLA->SetTypeOfLine(Aspect_TOL_DASH); HLA->SetTypeOfLine(Aspect_TOL_DASH);
// tolerance a 4 pixels... // tolerance to 4 pixels...
#ifdef BUC60688 #ifdef BUC60688
SetSensitivity(); SetSensitivity();
#else #else

20
src/AIS/AIS_InteractiveContext_1.cxx
View File

@ -198,12 +198,11 @@ AIS_StatusOfDetection AIS_InteractiveContext::MoveTo(const Standard_Integer XPix
if ( !myLocalContexts( myCurLocalIndex )->Filter()->IsOk( selector->OnePicked() ) ) if ( !myLocalContexts( myCurLocalIndex )->Filter()->IsOk( selector->OnePicked() ) )
return AIS_SOD_AllBad; return AIS_SOD_AllBad;
// si c'est le meme qu'au coup precedent -> fin
// Does nothing if previously detected object is equal to the current one // Does nothing if previously detected object is equal to the current one
if ( selector->OnePicked()->Selectable() == myLastPicked ) if ( selector->OnePicked()->Selectable() == myLastPicked )
return AIS_SOD_OnlyOneDetected; return AIS_SOD_OnlyOneDetected;
//si le precedent est un objet courant, on ne le desilighte pas, sinon si
// Previously detected object is unhilighted if it is not selected or hilighted // Previously detected object is unhilighted if it is not selected or hilighted
// with selection color if it is selected. Such highlighting with selection color // with selection color if it is selected. Such highlighting with selection color
// is needed only if myToHilightSelected flag is true. In this case previously detected // is needed only if myToHilightSelected flag is true. In this case previously detected
@ -233,7 +232,6 @@ AIS_StatusOfDetection AIS_InteractiveContext::MoveTo(const Standard_Integer XPix
myLastinMain = myLastPicked; myLastinMain = myLastPicked;
else else
myLastinColl = myLastPicked; myLastinColl = myLastPicked;
// si l'objet detecte n'est pas courant, on le hilighte...
#ifdef IMP191001 #ifdef IMP191001
// Highlight detected object if it is not selected or myToHilightSelected flag is true // Highlight detected object if it is not selected or myToHilightSelected flag is true
if ( !myLastPicked.IsNull() && if ( !myLastPicked.IsNull() &&
@ -297,8 +295,8 @@ AIS_StatusOfPick AIS_InteractiveContext::Select(const Standard_Integer XPMin,
const Handle(V3d_View)& aView, const Handle(V3d_View)& aView,
const Standard_Boolean updateviewer) const Standard_Boolean updateviewer)
{ {
// on prend tous les objets detectes par le selecteur, on vide les precedents objets courants, // all objects detected by the selector are taken, previous current objects are emptied,
// on met les nouveaux... // new objects are put...
if(HasOpenedContext()) if(HasOpenedContext())
return myLocalContexts(myCurLocalIndex)->Select(XPMin,YPMin,XPMax,YPMax,aView,updateviewer); return myLocalContexts(myCurLocalIndex)->Select(XPMin,YPMin,XPMax,YPMax,aView,updateviewer);
@ -367,8 +365,8 @@ AIS_StatusOfPick AIS_InteractiveContext::Select(const TColgp_Array1OfPnt2d& aPol
const Handle(V3d_View)& aView, const Handle(V3d_View)& aView,
const Standard_Boolean updateviewer) const Standard_Boolean updateviewer)
{ {
// on prend tous les objets detectes par le selecteur, on vide les precedents objets courants, // all objects detected by the selector are taken, previous current objects are emptied,
// on met les nouveaux... // new objects are put...
if(HasOpenedContext()) if(HasOpenedContext())
return myLocalContexts(myCurLocalIndex)->Select(aPolyline,aView,updateviewer); return myLocalContexts(myCurLocalIndex)->Select(aPolyline,aView,updateviewer);
@ -439,7 +437,7 @@ AIS_StatusOfPick AIS_InteractiveContext::Select(const Standard_Boolean updatevie
if(myWasLastMain) if(myWasLastMain)
return myLocalContexts(myCurLocalIndex)->Select(updateviewer); return myLocalContexts(myCurLocalIndex)->Select(updateviewer);
else else
// on a picke dans le collecteur, il faut faire un traitement special... // picking was done in the collector, special processing is required...
{ {
myLocalContexts(myCurLocalIndex)->SetSelected(myLastPicked,updateviewer); myLocalContexts(myCurLocalIndex)->SetSelected(myLastPicked,updateviewer);
return AIS_SOP_OneSelected; return AIS_SOP_OneSelected;
@ -624,7 +622,7 @@ AIS_StatusOfPick AIS_InteractiveContext::ShiftSelect( const TColgp_Array1OfPnt2d
void AIS_InteractiveContext::SetCurrentObject(const Handle(AIS_InteractiveObject)& anIObj, void AIS_InteractiveContext::SetCurrentObject(const Handle(AIS_InteractiveObject)& anIObj,
const Standard_Boolean updateviewer) const Standard_Boolean updateviewer)
{ {
// traitement d'un cas singulier... // single case processing...
if(NbCurrents()==1 && anIObj->State()==1){ if(NbCurrents()==1 && anIObj->State()==1){
Quantity_NameOfColor HiCol; Quantity_NameOfColor HiCol;
Standard_Boolean HasHiCol; Standard_Boolean HasHiCol;
@ -660,7 +658,7 @@ void AIS_InteractiveContext::SetCurrentObject(const Handle(AIS_InteractiveObject
sel->Next(); sel->Next();
} }
// ajout pour ne pas faire d'updateviewer intempestif... // added to avoid untimely viewer update...
AIS_Selection::ClearAndSelect(anIObj); AIS_Selection::ClearAndSelect(anIObj);
anIObj->State(1); anIObj->State(1);
Quantity_NameOfColor HiCol; Quantity_NameOfColor HiCol;

52
src/AIS/AIS_InteractiveContext_2.cxx
View File

@ -20,6 +20,8 @@
#include <Graphic3d_MapIteratorOfMapOfStructure.hxx> #include <Graphic3d_MapIteratorOfMapOfStructure.hxx>
#include <AIS_Selection.hxx> #include <AIS_Selection.hxx>
static TColStd_ListIteratorOfListOfInteger ItL;
//======================================================================= //=======================================================================
//function : OpenLocalContext //function : OpenLocalContext
//purpose : //purpose :
@ -32,8 +34,7 @@ OpenLocalContext(const Standard_Boolean UseDisplayedObjects,
const Standard_Boolean /*BothViewers*/) const Standard_Boolean /*BothViewers*/)
{ {
// on dehilighte les eventuelles entitees detectees juste avant l'ouverture // the entities eventually detected just before the context was opened are unhighlighted...
// du contexte...
if(!IsCurrent(myLastPicked)){ if(!IsCurrent(myLastPicked)){
if(!myLastPicked.IsNull()){ if(!myLastPicked.IsNull()){
Standard_Integer HiMod = myLastPicked->HasHilightMode()?myLastPicked->HilightMode():0; Standard_Integer HiMod = myLastPicked->HasHilightMode()?myLastPicked->HilightMode():0;
@ -45,7 +46,7 @@ OpenLocalContext(const Standard_Boolean UseDisplayedObjects,
myLocalContexts(myCurLocalIndex)->UnhilightLastDetected(mylastmoveview); myLocalContexts(myCurLocalIndex)->UnhilightLastDetected(mylastmoveview);
} }
// on met a 0 les entites liees a la selection dynamique au point neutre. // entities connected to dynamic selection at neutral point are set to 0.
myLastinMain.Nullify(); myLastinMain.Nullify();
myLastinColl.Nullify(); myLastinColl.Nullify();
@ -62,14 +63,22 @@ OpenLocalContext(const Standard_Boolean UseDisplayedObjects,
UseDisplayedObjects, UseDisplayedObjects,
AllowShapeDecomposition, AllowShapeDecomposition,
AcceptEraseOfTemporary); AcceptEraseOfTemporary);
NewLocal->MainSelector()->Set ((myLocalContexts.Extent() > 0)
? myLocalContexts (untilnow)->MainSelector()->Projector() // rob 16/04/97 Problems of asynchronous orders
: myMainSel->Projector()); if(myLocalContexts.Extent()>0){
const Select3D_Projector& Prj = myLocalContexts(untilnow)->MainSelector()->Projector();
NewLocal->MainSelector()->Set(Prj);
}
else{
const Select3D_Projector& Prj = myMainSel->Projector();
NewLocal->MainSelector()->Set(Prj);
}
NewLocal->MainSelector()->UpdateConversion(); NewLocal->MainSelector()->UpdateConversion();
myLocalContexts.Bind(myCurLocalIndex,NewLocal); myLocalContexts.Bind(myCurLocalIndex,NewLocal);
#ifdef DEB #ifdef DEB
cout<<"\tOpen Local Context No "<<myCurLocalIndex<<endl; cout<<"\tOpen Local Context No "<<myCurLocalIndex<<endl;
if(UseDisplayedObjects){ if(UseDisplayedObjects){
@ -83,6 +92,7 @@ OpenLocalContext(const Standard_Boolean UseDisplayedObjects,
cout<<"\t\tNo Objects Were Loaded "<<endl; cout<<"\t\tNo Objects Were Loaded "<<endl;
#endif #endif
return myCurLocalIndex; return myCurLocalIndex;
} }
//======================================================================= //=======================================================================
@ -111,7 +121,7 @@ void AIS_InteractiveContext::CloseLocalContext(const Standard_Integer Index,
return; return;
} }
// On va fermer le seul contexte local ouvert... // the only open local context is closed...
if(myLocalContexts.Extent()==1 && GoodIndex == myCurLocalIndex){ if(myLocalContexts.Extent()==1 && GoodIndex == myCurLocalIndex){
Standard_Boolean updateproj = !(myLocalContexts(myCurLocalIndex)->HasSameProjector(myMainSel->Projector())); Standard_Boolean updateproj = !(myLocalContexts(myCurLocalIndex)->HasSameProjector(myMainSel->Projector()));
@ -130,12 +140,12 @@ void AIS_InteractiveContext::CloseLocalContext(const Standard_Integer Index,
cout<<"No More Opened Local Context "<<endl; cout<<"No More Opened Local Context "<<endl;
} }
// Sinon on aura encore un contexte local d'ouvert apres la fermeture du courant // Otherwise the local context will be still open after the current is closed
else{ else{
Handle(StdSelect_ViewerSelector3d) VS = myLocalContexts(GoodIndex)->MainSelector(); Handle(StdSelect_ViewerSelector3d) VS = myLocalContexts(GoodIndex)->MainSelector();
myLocalContexts(GoodIndex)->Terminate(); myLocalContexts(GoodIndex)->Terminate();
myLocalContexts.UnBind(GoodIndex); myLocalContexts.UnBind(GoodIndex);
// on ferme le courant... // the current is closed...
if(GoodIndex==myCurLocalIndex){ if(GoodIndex==myCurLocalIndex){
myCurLocalIndex = HighestIndex(); myCurLocalIndex = HighestIndex();
const Handle(AIS_LocalContext)& LocCtx = myLocalContexts(myCurLocalIndex); const Handle(AIS_LocalContext)& LocCtx = myLocalContexts(myCurLocalIndex);
@ -257,7 +267,6 @@ Deactivate(const Handle(AIS_InteractiveObject)& anIObj)
{ {
if(!HasOpenedContext()){ if(!HasOpenedContext()){
if(!myObjects.IsBound(anIObj)) return; if(!myObjects.IsBound(anIObj)) return;
TColStd_ListIteratorOfListOfInteger ItL;
for(ItL.Initialize(myObjects(anIObj)->SelectionModes()); for(ItL.Initialize(myObjects(anIObj)->SelectionModes());
ItL.More(); ItL.More();
ItL.Next()){ ItL.Next()){
@ -302,9 +311,9 @@ void AIS_InteractiveContext::
ActivatedModes(const Handle(AIS_InteractiveObject)& anIObj, ActivatedModes(const Handle(AIS_InteractiveObject)& anIObj,
TColStd_ListOfInteger& theList) const TColStd_ListOfInteger& theList) const
{ {
TColStd_ListIteratorOfListOfInteger ItL;
if(!HasOpenedContext()){ if(!HasOpenedContext()){
if(myObjects.IsBound(anIObj)){ if(myObjects.IsBound(anIObj)){
//ItL is a static variable...
for(ItL.Initialize(myObjects(anIObj)->SelectionModes()); for(ItL.Initialize(myObjects(anIObj)->SelectionModes());
ItL.More(); ItL.More();
ItL.Next()) ItL.Next())
@ -383,7 +392,6 @@ SubIntensityOn(const Handle(AIS_InteractiveObject)& anIObj,
if(myObjects.IsBound(anIObj)){ if(myObjects.IsBound(anIObj)){
const Handle(AIS_GlobalStatus)& STAT = myObjects(anIObj); const Handle(AIS_GlobalStatus)& STAT = myObjects(anIObj);
STAT->SubIntensityOn(); STAT->SubIntensityOn();
TColStd_ListIteratorOfListOfInteger ItL;
for (ItL.Initialize(STAT->DisplayedModes());ItL.More();ItL.Next()) for (ItL.Initialize(STAT->DisplayedModes());ItL.More();ItL.Next())
myMainPM->Color(anIObj,mySubIntensity,ItL.Value()); myMainPM->Color(anIObj,mySubIntensity,ItL.Value());
} }
@ -437,7 +445,6 @@ SubIntensityOff(const Handle(AIS_InteractiveObject)& anIObj,
if(myObjects.IsBound(anIObj)){ if(myObjects.IsBound(anIObj)){
const Handle(AIS_GlobalStatus)& STAT = myObjects(anIObj); const Handle(AIS_GlobalStatus)& STAT = myObjects(anIObj);
STAT->SubIntensityOff(); STAT->SubIntensityOff();
TColStd_ListIteratorOfListOfInteger ItL;
for (ItL.Initialize(STAT->DisplayedModes());ItL.More();ItL.Next()) for (ItL.Initialize(STAT->DisplayedModes());ItL.More();ItL.Next())
myMainPM->Unhighlight(anIObj,ItL.Value()); myMainPM->Unhighlight(anIObj,ItL.Value());
if(STAT->IsHilighted()) if(STAT->IsHilighted())
@ -481,10 +488,11 @@ void AIS_InteractiveContext::SubIntensityOn(const Standard_Boolean updateviewer)
//======================================================================= //=======================================================================
void AIS_InteractiveContext::SubIntensityOff(const Standard_Boolean updateviewer) void AIS_InteractiveContext::SubIntensityOff(const Standard_Boolean updateviewer)
{ {
if(!HasOpenedContext()) return; if(!HasOpenedContext()) return;
AIS_DataMapIteratorOfDataMapOfIOStatus It (myObjects); AIS_DataMapIteratorOfDataMapOfIOStatus It (myObjects);
TColStd_ListIteratorOfListOfInteger ItL;
for(;It.More();It.Next()){ for(;It.More();It.Next()){
const Handle(AIS_GlobalStatus)& STAT = It.Value(); const Handle(AIS_GlobalStatus)& STAT = It.Value();
if(STAT->IsSubIntensityOn()) if(STAT->IsSubIntensityOn())
@ -492,7 +500,7 @@ void AIS_InteractiveContext::SubIntensityOff(const Standard_Boolean updateviewer
for(ItL.Initialize(STAT->DisplayedModes());ItL.More();ItL.Next()) for(ItL.Initialize(STAT->DisplayedModes());ItL.More();ItL.Next())
myMainPM->Unhighlight(It.Key()); myMainPM->Unhighlight(It.Key());
} }
if(updateviewer) myMainVwr->Update(); if(updateviewer) myMainVwr->Update();
} }
@ -768,7 +776,7 @@ Standard_Integer AIS_InteractiveContext::PurgeViewer(const Handle(V3d_Viewer)& V
Standard_Address Add = G->Owner(); Standard_Address Add = G->Owner();
if(Add==NULL){ if(Add==NULL){
G->Erase(); G->Erase();
G->Clear();// ca veut dire qu'elle n'est pas reference comme une presentation d'un InterfactiveObject... G->Clear();// it means that it is not referenced as a presentation of InterfactiveObject...
NbCleared++; NbCleared++;
} }
Handle(AIS_InteractiveObject) IO = (AIS_InteractiveObject*)Add; Handle(AIS_InteractiveObject) IO = (AIS_InteractiveObject*)Add;
@ -868,7 +876,7 @@ void AIS_InteractiveContext::ResetOriginalState(const Standard_Boolean updatevie
{ {
Standard_Boolean upd_main(Standard_False),upd_col(Standard_False); Standard_Boolean upd_main(Standard_False),upd_col(Standard_False);
TColStd_ListIteratorOfListOfInteger itl; TColStd_ListIteratorOfListOfInteger itl;
for (AIS_DataMapIteratorOfDataMapOfIOStatus it(myObjects);it.More();it.Next()){ for (AIS_DataMapIteratorOfDataMapOfIOStatus it(myObjects);it.More();it.Next()){
const Handle(AIS_InteractiveObject)& iobj = it.Key(); const Handle(AIS_InteractiveObject)& iobj = it.Key();
const Handle(AIS_GlobalStatus)& STAT = it.Value(); const Handle(AIS_GlobalStatus)& STAT = it.Value();
@ -876,7 +884,7 @@ void AIS_InteractiveContext::ResetOriginalState(const Standard_Boolean updatevie
case AIS_DS_Displayed:{ case AIS_DS_Displayed:{
upd_main = Standard_True; upd_main = Standard_True;
// partie display... // part display...
for(itl.Initialize(STAT->DisplayedModes());itl.More();itl.Next()) for(itl.Initialize(STAT->DisplayedModes());itl.More();itl.Next())
myMainPM->Display(iobj,itl.Value()); myMainPM->Display(iobj,itl.Value());
if(STAT->IsHilighted()){ if(STAT->IsHilighted()){
@ -885,7 +893,7 @@ void AIS_InteractiveContext::ResetOriginalState(const Standard_Boolean updatevie
else else
Hilight(iobj,Standard_False); Hilight(iobj,Standard_False);
} }
//partie selection //part selection
for(itl.Initialize(STAT->SelectionModes());itl.More();itl.Next()){ for(itl.Initialize(STAT->SelectionModes());itl.More();itl.Next()){
if(itl.Value()!=-1) if(itl.Value()!=-1)
mgrSelector->Activate(iobj,itl.Value(),myMainSel); mgrSelector->Activate(iobj,itl.Value(),myMainSel);

47
src/AIS/AIS_LengthDimension.cxx
View File

@ -97,7 +97,7 @@ AIS_LengthDimension::AIS_LengthDimension (const TopoDS_Face& aFirstFace,
//======================================================================= //=======================================================================
//function : Constructor //function : Constructor
//purpose : TwoFacesLength dimension (avec position et texte) //purpose : TwoFacesLength dimension (with position and text)
//======================================================================= //=======================================================================
AIS_LengthDimension::AIS_LengthDimension(const TopoDS_Face& aFirstFace, AIS_LengthDimension::AIS_LengthDimension(const TopoDS_Face& aFirstFace,
@ -129,8 +129,7 @@ AIS_LengthDimension::AIS_LengthDimension(const TopoDS_Face& aFirstFace,
//======================================================================= //=======================================================================
//function : AIS_LengthDimension //function : AIS_LengthDimension
//purpose : Distance Face - Edge pour chamfrein 3D //purpose : Distance Face - Edge for chamfer 3D
// Ajout Jean-Claude Vauthier le 17/06/98
//======================================================================= //=======================================================================
AIS_LengthDimension::AIS_LengthDimension (const TopoDS_Face& Face,const TopoDS_Edge& Edge,const Standard_Real Val,const TCollection_ExtendedString& Text) AIS_LengthDimension::AIS_LengthDimension (const TopoDS_Face& Face,const TopoDS_Edge& Edge,const Standard_Real Val,const TCollection_ExtendedString& Text)
@ -223,13 +222,13 @@ void AIS_LengthDimension::Compute(const Handle(PrsMgr_PresentationManager3d)&,
switch (myFShape.ShapeType()) { switch (myFShape.ShapeType()) {
case TopAbs_FACE: case TopAbs_FACE:
{ {
// cas longueur sur une face // case length on a face
ComputeOneFaceLength(aPresentation); ComputeOneFaceLength(aPresentation);
} }
break; break;
case TopAbs_EDGE: case TopAbs_EDGE:
{ {
// cas longueur d'un edge // case length of an edge
ComputeOneEdgeLength(aPresentation); ComputeOneEdgeLength(aPresentation);
} }
break; break;
@ -242,7 +241,7 @@ void AIS_LengthDimension::Compute(const Handle(PrsMgr_PresentationManager3d)&,
case TopAbs_FACE: case TopAbs_FACE:
{ {
if (mySShape.ShapeType () == TopAbs_FACE) { if (mySShape.ShapeType () == TopAbs_FACE) {
// cas longueur entre deux faces // case length between two faces
ComputeTwoFacesLength(aPresentation); ComputeTwoFacesLength(aPresentation);
} }
else if (mySShape.ShapeType () == TopAbs_EDGE) { else if (mySShape.ShapeType () == TopAbs_EDGE) {
@ -276,7 +275,7 @@ void AIS_LengthDimension::Compute(const Handle(PrsMgr_PresentationManager3d)&,
mySymbolPrs ); mySymbolPrs );
} }
else if (mySShape.ShapeType() == TopAbs_EDGE) { else if (mySShape.ShapeType() == TopAbs_EDGE) {
// cas longueur entre deux edges // case length between two edges
#ifdef BUC60915 #ifdef BUC60915
if( !myArrowSizeIsDefined ) if( !myArrowSizeIsDefined )
#endif #endif
@ -471,7 +470,7 @@ void AIS_LengthDimension::ComputeTwoFacesLength( const Handle( Prs3d_Presentatio
myDrawer->LengthAspect()->Arrow1Aspect()->SetLength( myArrowSize ); myDrawer->LengthAspect()->Arrow1Aspect()->SetLength( myArrowSize );
myDrawer->LengthAspect()->Arrow2Aspect()->SetLength( myArrowSize ); myDrawer->LengthAspect()->Arrow2Aspect()->SetLength( myArrowSize );
// Recherche du texte de la cote // Find text of the face
DsgPrs_LengthPresentation::Add( aPresentation, DsgPrs_LengthPresentation::Add( aPresentation,
myDrawer, myDrawer,
@ -676,18 +675,18 @@ void AIS_LengthDimension::ComputeTwoEdgesLength( const Handle( Prs3d_Presentatio
else { else {
curpos.SetXYZ((l1.Location().XYZ()+l2.Location().XYZ())/2.); curpos.SetXYZ((l1.Location().XYZ()+l2.Location().XYZ())/2.);
} }
// offset pour eviter confusion Edge et Dimension // offset to avoid confusion Edge and Dimension
gp_Vec offset(DirAttach); gp_Vec offset(DirAttach);
offset = offset*ArrowSize*(-10.); offset = offset*ArrowSize*(-10.);
curpos.Translate(offset); curpos.Translate(offset);
Position = curpos; Position = curpos;
} }
else { // on projette le point dans le plan else { // the point is projected in the plane
// it is patch! // it is patch!
Position = AIS::ProjectPointOnPlane( Position, Plane->Pln() ); Position = AIS::ProjectPointOnPlane( Position, Plane->Pln() );
} }
// recherche points attache // find attachment points
if (!isInfinite1) { if (!isInfinite1) {
if (Position.Distance(ptat11) > Position.Distance(ptat12)) FirstAttach = ptat12; if (Position.Distance(ptat11) > Position.Distance(ptat12)) FirstAttach = ptat12;
else FirstAttach = ptat11; else FirstAttach = ptat11;
@ -780,12 +779,12 @@ void AIS_LengthDimension::ComputeOneEdgeOneVertexLength( const Handle( Prs3d_Pre
if (FirstShape.ShapeType() == TopAbs_VERTEX) { if (FirstShape.ShapeType() == TopAbs_VERTEX) {
thevertex = TopoDS::Vertex(FirstShape); thevertex = TopoDS::Vertex(FirstShape);
theedge = TopoDS::Edge(SecondShape); theedge = TopoDS::Edge(SecondShape);
numedge = 2;// edge = 2 iem shape numedge = 2;// edge = 2nd shape
} }
else { else {
thevertex = TopoDS::Vertex(SecondShape); thevertex = TopoDS::Vertex(SecondShape);
theedge = TopoDS::Edge(FirstShape); theedge = TopoDS::Edge(FirstShape);
numedge = 1; // edge = 1 ere shape numedge = 1; // edge = 1st shape
} }
gp_Pnt ptonedge1,ptonedge2; gp_Pnt ptonedge1,ptonedge2;
@ -798,7 +797,7 @@ void AIS_LengthDimension::ComputeOneEdgeOneVertexLength( const Handle( Prs3d_Pre
aPresentation->SetInfiniteState(isInfinite); aPresentation->SetInfiniteState(isInfinite);
AIS::ComputeGeometry(thevertex, FirstAttach, Plane, isOnPlanVertex); AIS::ComputeGeometry(thevertex, FirstAttach, Plane, isOnPlanVertex);
// on considere que seule la courbe peut etre projetee // take into consideration that only the curve can be projected
if (!isOnPlanEdge && !isOnPlanVertex) if (!isOnPlanEdge && !isOnPlanVertex)
return; return;
@ -826,13 +825,13 @@ void AIS_LengthDimension::ComputeOneEdgeOneVertexLength( const Handle( Prs3d_Pre
if (AutomaticPos) { if (AutomaticPos) {
gp_Pnt p = ElCLib::Value(ElCLib::Parameter(l,FirstAttach),l); gp_Pnt p = ElCLib::Value(ElCLib::Parameter(l,FirstAttach),l);
gp_Pnt curpos((FirstAttach.XYZ()+p.XYZ())/2.); gp_Pnt curpos((FirstAttach.XYZ()+p.XYZ())/2.);
// offset pour eviter confusion Edge et Dimension // offset to avoid confusion Edge and Dimension
gp_Vec offset(DirAttach); gp_Vec offset(DirAttach);
offset = offset*ArrowSize*(-10.); offset = offset*ArrowSize*(-10.);
curpos.Translate(offset); curpos.Translate(offset);
Position = curpos; Position = curpos;
} }
else { // on projette le point dans le plan else { // the point is projected in the plane
// it is patch! // it is patch!
Position = AIS::ProjectPointOnPlane( Position, Plane->Pln() ); Position = AIS::ProjectPointOnPlane( Position, Plane->Pln() );
@ -943,7 +942,7 @@ void AIS_LengthDimension::ComputeTwoVerticesLength( const Handle( Prs3d_Presenta
if (AutomaticPos) { if (AutomaticPos) {
if (!samePoint) { if (!samePoint) {
gp_Pnt curpos((FirstAttach.XYZ()+SecondAttach.XYZ())/2.); gp_Pnt curpos((FirstAttach.XYZ()+SecondAttach.XYZ())/2.);
// offset pour eviter confusion Edge et Dimension // offset to avoid confusion Edge and Dimension
gp_Vec offset(DirAttach); gp_Vec offset(DirAttach);
offset = offset*ArrowSize*(-10.); offset = offset*ArrowSize*(-10.);
curpos.Translate(offset); curpos.Translate(offset);
@ -968,7 +967,7 @@ void AIS_LengthDimension::ComputeTwoVerticesLength( const Handle( Prs3d_Presenta
arr = la->Arrow2Aspect(); arr = la->Arrow2Aspect();
arr->SetLength(ArrowSize); arr->SetLength(ArrowSize);
// Type des fleches // Type of arrows
if ( ExtShape == 1) SymbolPrs = DsgPrs_AS_FIRSTPT_LASTAR; if ( ExtShape == 1) SymbolPrs = DsgPrs_AS_FIRSTPT_LASTAR;
else if (ExtShape == 2) SymbolPrs = DsgPrs_AS_FIRSTAR_LASTPT; else if (ExtShape == 2) SymbolPrs = DsgPrs_AS_FIRSTAR_LASTPT;
@ -984,7 +983,7 @@ void AIS_LengthDimension::ComputeTwoVerticesLength( const Handle( Prs3d_Presenta
Position, Position,
SymbolPrs); SymbolPrs);
// Calcul de la projection du vertex // Calculate the projection of the vertex
if ( ExtShape == 1) if ( ExtShape == 1)
AIS::ComputeProjVertexPresentation(aPresentation, aDrawer, FirstVertex, FirstAttach); AIS::ComputeProjVertexPresentation(aPresentation, aDrawer, FirstVertex, FirstAttach);
else if ( ExtShape == 2) else if ( ExtShape == 2)
@ -1117,10 +1116,10 @@ void AIS_LengthDimension::ComputeFaceSelection( const Handle( SelectMgr_Selectio
void AIS_LengthDimension::ComputeEdgeVertexSelection(const Handle(SelectMgr_Selection)& aSelection) void AIS_LengthDimension::ComputeEdgeVertexSelection(const Handle(SelectMgr_Selection)& aSelection)
{ {
// ********** NB -> // ********** NB ->
// dans le cas d'une contrainte par rapport au bord d'une face // in the case of a constraint relatively to the border of a face
// seule la shape de ce contour est valide // only the shape of this contour is valid
// Creation de 2 owner pour permettre l'edition de contraintes // Create 2 owner for edition of constraints
Handle(AIS_DimensionOwner) own1 = new AIS_DimensionOwner(this,7); Handle(AIS_DimensionOwner) own1 = new AIS_DimensionOwner(this,7);
Handle(AIS_DimensionOwner) own2 = new AIS_DimensionOwner(this,7); Handle(AIS_DimensionOwner) own2 = new AIS_DimensionOwner(this,7);
@ -1150,8 +1149,8 @@ void AIS_LengthDimension::ComputeEdgeVertexSelection(const Handle(SelectMgr_Sele
if (!Proj1.IsEqual(Proj2,confusion)) L3 = gce_MakeLin(Proj1,Proj2); if (!Proj1.IsEqual(Proj2,confusion)) L3 = gce_MakeLin(Proj1,Proj2);
else { else {
// cas ou la dimension est nulle // cas of zero dimension
// on choisit le own1 par defaut // own1 is chosen by default
L3 = gce_MakeLin(Proj1,myDirAttach); L3 = gce_MakeLin(Proj1,myDirAttach);
Standard_Real size(Min(myVal/100.+1.e-6,myArrowSize+1.e-6)); Standard_Real size(Min(myVal/100.+1.e-6,myArrowSize+1.e-6));
Handle(Select3D_SensitiveBox) box = new Select3D_SensitiveBox(own1,myPosition.X(),myPosition.Y(),myPosition.Z(), Handle(Select3D_SensitiveBox) box = new Select3D_SensitiveBox(own1,myPosition.X(),myPosition.Y(),myPosition.Z(),

81
src/AIS/AIS_LocalContext.cxx
View File

@ -164,7 +164,7 @@ Standard_Boolean AIS_LocalContext::Display(const Handle(AIS_InteractiveObject)&
Att->SetDecomposition(Standard_True); Att->SetDecomposition(Standard_True);
else else
Att->SetDecomposition(Standard_False); Att->SetDecomposition(Standard_False);
// statut temporaire ou non // status temporary or not
if(myCTX->DisplayStatus(anInteractive) == AIS_DS_None || if(myCTX->DisplayStatus(anInteractive) == AIS_DS_None ||
myCTX->DisplayStatus(anInteractive) == AIS_DS_Temporary) myCTX->DisplayStatus(anInteractive) == AIS_DS_Temporary)
Att->SetTemporary(Standard_True); Att->SetTemporary(Standard_True);
@ -429,23 +429,23 @@ Standard_Boolean AIS_LocalContext::Remove(const Handle(AIS_InteractiveObject)& a
TColStd_ListIteratorOfListOfInteger It; TColStd_ListIteratorOfListOfInteger It;
Standard_Boolean jobdone(Standard_False); Standard_Boolean jobdone(Standard_False);
// on regarde quel etaient ses attributs temporaires et on // it is checked which were the temporary attributes
// remet tout a 0 // and they are set to 0
// desactiver les modes stantard // desactivate standard modes
if(Att->Decomposed()){ if(Att->Decomposed()){
for(It.Initialize(myListOfStandardMode);It.More();It.Next()){ for(It.Initialize(myListOfStandardMode);It.More();It.Next()){
mySM->Deactivate(aSelectable,It.Value(),myMainVS); mySM->Deactivate(aSelectable,It.Value(),myMainVS);
} }
} }
// si objet ou presentations temporaires... // if object or temporary presentations...
if(Att->IsTemporary()) if(Att->IsTemporary())
{ {
if(Att->IsSubIntensityOn()) if(Att->IsSubIntensityOn())
myMainPM->Unhighlight(aSelectable,Att->HilightMode()); myMainPM->Unhighlight(aSelectable,Att->HilightMode());
// enlever quand bug sur clear corrige... // remove if bug on clear correct...
myMainPM->Erase(aSelectable,Att->DisplayMode()); myMainPM->Erase(aSelectable,Att->DisplayMode());
myMainPM->Clear(aSelectable,Att->DisplayMode()); myMainPM->Clear(aSelectable,Att->DisplayMode());
if(myMainPM->IsDisplayed(aSelectable,Att->HilightMode())) if(myMainPM->IsDisplayed(aSelectable,Att->HilightMode()))
@ -453,18 +453,16 @@ Standard_Boolean AIS_LocalContext::Remove(const Handle(AIS_InteractiveObject)& a
// myMainPM->Clear(aSelectable,Att->HilightMode()); // myMainPM->Clear(aSelectable,Att->HilightMode());
jobdone = Standard_True; jobdone = Standard_True;
} }
// si sous intensite // if below intensity
else else
{ {
if(Att->IsSubIntensityOn()) if(Att->IsSubIntensityOn())
myCTX->SubIntensityOff(aSelectable); myCTX->SubIntensityOff(aSelectable);
} }
// desactiver les modes propres stockes // desactivate stored proper modes
for(It.Initialize(Att->SelectionModes());It.More();It.Next()){ for(It.Initialize(Att->SelectionModes());It.More();It.Next()){
mySM->Deactivate(aSelectable,It.Value(),myMainVS); mySM->Deactivate(aSelectable,It.Value(),myMainVS);
} }
// pop : si je laisses cela plantes dans les elements de construction
// alors a toi de jouer ROB
// RemoveSelected(aSelectable); // RemoveSelected(aSelectable);
if(IsSelected(aSelectable)) if(IsSelected(aSelectable))
@ -544,17 +542,16 @@ Standard_Boolean AIS_LocalContext::Remove(const Handle(AIS_InteractiveObject)& a
void AIS_LocalContext::ActivateStandardMode(const TopAbs_ShapeEnum aType) void AIS_LocalContext::ActivateStandardMode(const TopAbs_ShapeEnum aType)
{ {
//on verifie qu'il n'esiste pas deja dans la liste //check if it is not in the list
TColStd_ListIteratorOfListOfInteger It(myListOfStandardMode); TColStd_ListIteratorOfListOfInteger It(myListOfStandardMode);
for(;It.More();It.Next()) for(;It.More();It.Next())
if(It.Value()==aType) return; if(It.Value()==aType) return;
Standard_Integer IMode = AIS_Shape::SelectionMode(aType); Standard_Integer IMode = AIS_Shape::SelectionMode(aType);
// on cree de facon cachee un filtre repondant ok au type // create a hidden filter answering ok to the type except for :
//sauf : // if the type is shape...
// si le type est shape... // if the filters already impact at the type <aType>
// si des filtres agissent deja sur le type <aType>
if(aType != TopAbs_SHAPE){ if(aType != TopAbs_SHAPE){
if(myStdFilters[IMode].IsNull()) if(myStdFilters[IMode].IsNull())
myStdFilters[IMode] = new StdSelect_ShapeTypeFilter(aType); myStdFilters[IMode] = new StdSelect_ShapeTypeFilter(aType);
@ -562,8 +559,8 @@ void AIS_LocalContext::ActivateStandardMode(const TopAbs_ShapeEnum aType)
myFilters->Add(myStdFilters[IMode]); myFilters->Add(myStdFilters[IMode]);
} }
// on active le mode pour tous les objets de type Shape // the mode is activated for all objects of type Shape
// acceptant la decomposition en mode standard. // accepting the decomposition in standard mode.
myListOfStandardMode.Append(IMode); myListOfStandardMode.Append(IMode);
AIS_DataMapIteratorOfDataMapOfSelStat ItM(myActiveObjects); AIS_DataMapIteratorOfDataMapOfSelStat ItM(myActiveObjects);
@ -620,8 +617,8 @@ void AIS_LocalContext::DeactivateStandardMode(const TopAbs_ShapeEnum aType)
void AIS_LocalContext::AddFilter(const Handle(SelectMgr_Filter)& aFilter) void AIS_LocalContext::AddFilter(const Handle(SelectMgr_Filter)& aFilter)
{ {
// on regarde si le filtre agit sur un type de sous shape // it is checked if the filter impacts at the type of active sub-shape
// active pour lequel on aurait deja mis un filtre de type... // for which a filter of type has been already implemented...
TColStd_ListIteratorOfListOfInteger It(myListOfStandardMode); TColStd_ListIteratorOfListOfInteger It(myListOfStandardMode);
@ -642,12 +639,11 @@ void AIS_LocalContext::RemoveFilter(const Handle(SelectMgr_Filter)& aFilter)
{ {
if(myFilters->IsIn(aFilter)) myFilters->Remove(aFilter); if(myFilters->IsIn(aFilter)) myFilters->Remove(aFilter);
// on regarde si le filtre concernait un type standard active. // it is checked if the filter for type standard is active.
// si oui , on regarde s'il en existe de semblables encore // if yes, it is checked there are still similarities among the
// parmi les filtres restant.. // remaining filters...
// s'il n'en reste pas , on remet le filtre standard // otherwise, the standard filter is restored to
// permettant de continuer a selectionner les modes // continu selecting active modes...
// actifs...
TColStd_ListIteratorOfListOfInteger It(myListOfStandardMode); TColStd_ListIteratorOfListOfInteger It(myListOfStandardMode);
TopAbs_ShapeEnum SE; TopAbs_ShapeEnum SE;
for(;It.More();It.Next()){ for(;It.More();It.Next()){
@ -660,25 +656,22 @@ void AIS_LocalContext::RemoveFilter(const Handle(SelectMgr_Filter)& aFilter)
Standard_Boolean AIS_LocalContext::HasSameProjector(const Handle(Select3D_Projector)& thePrj) const Standard_Boolean AIS_LocalContext::HasSameProjector(const Select3D_Projector& aPrj) const
{ {
const Handle(Select3D_Projector)& aCurPrj = myMainVS->Projector(); const Select3D_Projector& CurPrj = myMainVS->Projector();
if (aCurPrj->Perspective() != thePrj->Perspective()) if(CurPrj.Perspective()!=aPrj.Perspective()) return Standard_False;
return Standard_False; if(CurPrj.Perspective())
if (aCurPrj->Perspective() && aCurPrj->Focus() != thePrj->Focus()) if(CurPrj.Focus()!=aPrj.Focus()) return Standard_False;
return Standard_False; gp_GTrsf CurTrsf(CurPrj.Transformation());
const gp_GTrsf& aCurTrsf = aCurPrj->Transformation(); gp_GTrsf PrjTrsf(aPrj.Transformation());
const gp_GTrsf& aPrjTrsf = thePrj->Transformation();
for(Standard_Integer i=1;i<=3;i++){
for (Standard_Integer i = 1; i <= 3; ++i) for(Standard_Integer j=1;j<=3;j++){
{ if(CurTrsf.Value(i,j)!=PrjTrsf.Value(i,j))
for (Standard_Integer j = 1; j <= 3 ; ++j) return Standard_False;
{
if (aCurTrsf.Value (i, j) != aPrjTrsf.Value (i, j))
return Standard_False;
} }
} }
return Standard_True; return Standard_True;
} }
@ -695,7 +688,7 @@ void AIS_LocalContext::Terminate( const Standard_Boolean updateviewer )
myMapOfOwner.Clear(); myMapOfOwner.Clear();
mylastindex=0; mylastindex=0;
// nettoyons le selecteur... // clear the selector...
myMainVS->Clear(); myMainVS->Clear();
myCTX->SelectionManager()->Remove(myMainVS); myCTX->SelectionManager()->Remove(myMainVS);
@ -815,7 +808,7 @@ void AIS_LocalContext::Unhilight(const Handle(AIS_InteractiveObject)& anObject)
{ {
if(!myActiveObjects.IsBound(anObject)) return; if(!myActiveObjects.IsBound(anObject)) return;
// pour voir si d'aventure l'objet est quelque part ailleurs... // chieck if by hazard the object is somewhere else...
Standard_Integer Indx; Standard_Integer Indx;
Standard_Boolean IsSomeWhereElse = Standard_Boolean IsSomeWhereElse =
myCTX->IsInLocal(anObject,Indx) && Indx != myCTX->IndexOfCurrentLocal(); myCTX->IsInLocal(anObject,Indx) && Indx != myCTX->IndexOfCurrentLocal();
@ -1071,7 +1064,7 @@ void AIS_LocalContext::ClearObjects()
const Handle(AIS_LocalStatus)& CurAtt = It.Value(); const Handle(AIS_LocalStatus)& CurAtt = It.Value();
//TColStd_ListIteratorOfListOfInteger ItL; //TColStd_ListIteratorOfListOfInteger ItL;
// si objet temporaire on efface ses presentations geree par myMainPM // if object is temporary the presentations managed by myMainPM are removed
AIS_DisplayStatus TheDS = myCTX->DisplayStatus(SO); AIS_DisplayStatus TheDS = myCTX->DisplayStatus(SO);
if(TheDS != AIS_DS_Displayed){ if(TheDS != AIS_DS_Displayed){

74
src/AIS/AIS_LocalContext_1.cxx
View File

@ -110,7 +110,7 @@ AIS_StatusOfDetection AIS_LocalContext::MoveTo(const Standard_Integer Xpix,
const Standard_Integer Ypix, const Standard_Integer Ypix,
const Handle(V3d_View)& aview) const Handle(V3d_View)& aview)
{ {
// d'abord voir ce que le ViewerSelector donne // check that ViewerSelector gives
if(aview->Viewer()== myCTX->CurrentViewer()) { if(aview->Viewer()== myCTX->CurrentViewer()) {
#ifdef IMP160701 #ifdef IMP160701
//Nullify class members storing information about detected AIS objects. //Nullify class members storing information about detected AIS objects.
@ -128,7 +128,7 @@ AIS_StatusOfDetection AIS_LocalContext::MoveTo(const Standard_Integer Xpix,
EO = myMainVS->Picked(i_detect); EO = myMainVS->Picked(i_detect);
if(!EO.IsNull()){ if(!EO.IsNull()){
if(myFilters->IsOk(EO)) { if(myFilters->IsOk(EO)) {
myDetectedSeq.Append(i_detect); // normalement ils sont deja ranges dans le bon ordre... myDetectedSeq.Append(i_detect); // normallly they are already arranged in correct order...
#ifdef IMP160701 #ifdef IMP160701
Handle(AIS_InteractiveObject) anObj = Handle(AIS_InteractiveObject)::DownCast(EO->Selectable()); Handle(AIS_InteractiveObject) anObj = Handle(AIS_InteractiveObject)::DownCast(EO->Selectable());
if(!Handle(AIS_Shape)::DownCast(anObj).IsNull()) if(!Handle(AIS_Shape)::DownCast(anObj).IsNull())
@ -138,7 +138,7 @@ AIS_StatusOfDetection AIS_LocalContext::MoveTo(const Standard_Integer Xpix,
} }
} }
//resultat des courses.. //result of courses..
if(had_nothing || myDetectedSeq.IsEmpty()){ if(had_nothing || myDetectedSeq.IsEmpty()){
if(mylastindex !=0 && mylastindex <= myMapOfOwner.Extent()){ if(mylastindex !=0 && mylastindex <= myMapOfOwner.Extent()){
@ -153,9 +153,8 @@ AIS_StatusOfDetection AIS_LocalContext::MoveTo(const Standard_Integer Xpix,
return (had_nothing ? AIS_SOD_Nothing : AIS_SOD_AllBad); return (had_nothing ? AIS_SOD_Nothing : AIS_SOD_AllBad);
} }
// quelque chose... // all owners detected by the selector are passed to the
// on passe tous les proprietaires detectes par le selecteur // filters and correct ones are preserved...
// aux filtres et on garde les bons..
myCurDetected = 1; myCurDetected = 1;
EO = myMainVS->Picked(myDetectedSeq(myCurDetected)); EO = myMainVS->Picked(myDetectedSeq(myCurDetected));
@ -270,7 +269,7 @@ AIS_StatusOfPick AIS_LocalContext::Select(const Standard_Integer XPMin,
for(myMainVS->Init();myMainVS->More();myMainVS->Next()){ for(myMainVS->Init();myMainVS->More();myMainVS->Next()){
const Handle(SelectMgr_EntityOwner)& OWNR = myMainVS->Picked(); const Handle(SelectMgr_EntityOwner)& OWNR = myMainVS->Picked();
if(myFilters->IsOk(OWNR)){ if(myFilters->IsOk(OWNR)){
// rangeons ce proprietaire au chaud, il pourrait servir... // it can be helpfil to classify this owner immediately...
#ifdef BUC60569 #ifdef BUC60569
Standard_Integer state = OWNR->State(); Standard_Integer state = OWNR->State();
if( state < 1 ){ if( state < 1 ){
@ -365,8 +364,8 @@ AIS_StatusOfPick AIS_LocalContext::ShiftSelect(const Standard_Boolean updateview
return AIS_SOP_Error; return AIS_SOP_Error;
} }
//================================================== //==================================================
// Function: les objets deja selectionnes sont deselectionnes // Function: the already selected objects are unselected
// Purpose : les autres sont selectionnes. // Purpose : others are selected.
//================================================== //==================================================
AIS_StatusOfPick AIS_LocalContext::ShiftSelect(const Standard_Integer XPMin, AIS_StatusOfPick AIS_LocalContext::ShiftSelect(const Standard_Integer XPMin,
const Standard_Integer YPMin, const Standard_Integer YPMin,
@ -386,7 +385,7 @@ AIS_StatusOfPick AIS_LocalContext::ShiftSelect(const Standard_Integer XPMin,
#ifdef BUC60774 #ifdef BUC60774
return LastExt == 0 ? AIS_SOP_NothingSelected:AIS_SOP_Removed; return LastExt == 0 ? AIS_SOP_NothingSelected:AIS_SOP_Removed;
#else #else
return AIS_SOP_NothingSelected; // aucun effet si on a clique dans le vide return AIS_SOP_NothingSelected; // no effet if click on empty space
#endif #endif
AIS_Selection::SetCurrentSelection(mySelName.ToCString()); AIS_Selection::SetCurrentSelection(mySelName.ToCString());
@ -448,7 +447,7 @@ AIS_StatusOfPick AIS_LocalContext::Select(const TColgp_Array1OfPnt2d& aPolyline,
for(myMainVS->Init();myMainVS->More();myMainVS->Next()){ for(myMainVS->Init();myMainVS->More();myMainVS->Next()){
const Handle(SelectMgr_EntityOwner)& OWNR = myMainVS->Picked(); const Handle(SelectMgr_EntityOwner)& OWNR = myMainVS->Picked();
if(myFilters->IsOk(OWNR)){ if(myFilters->IsOk(OWNR)){
// rangeons ce proprietaire au chaud, il pourrait servir... // it can be helpfil to classify this owner immediately...
#ifdef BUC60953 #ifdef BUC60953
Standard_Integer state = OWNR->State(); Standard_Integer state = OWNR->State();
if( state < 1 ){ if( state < 1 ){
@ -590,7 +589,7 @@ void AIS_LocalContext::HilightPicked(const Standard_Boolean updateviewer)
Handle (PrsMgr_PresentationManager3d) PM = myMainPM; Handle (PrsMgr_PresentationManager3d) PM = myMainPM;
SelectMgr_DataMapOfObjectOwners aMap; SelectMgr_DataMapOfObjectOwners aMap;
// pour eviter les Pbs quand on est dans une boucle de recherche des objets selectionnes.... // to avoid problems when there is a loop searching for selected objects...
#if !defined OCC189 && !defined USE_MAP #if !defined OCC189 && !defined USE_MAP
const TColStd_Array1OfTransient& Obj = Sel->Objects()->Array1(); const TColStd_Array1OfTransient& Obj = Sel->Objects()->Array1();
for(Standard_Integer i =Obj.Lower();i<=Sel->NbStored();i++) for(Standard_Integer i =Obj.Lower();i<=Sel->NbStored();i++)
@ -876,7 +875,7 @@ SelectedApplicative() const
//======================================================================= //=======================================================================
//function : UpdateSelection //function : UpdateSelection
//purpose : devrait disparaitre ... //purpose : should disappear...
//======================================================================= //=======================================================================
void AIS_LocalContext::UpdateSelected(const Standard_Boolean updateviewer) void AIS_LocalContext::UpdateSelected(const Standard_Boolean updateviewer)
{ {
@ -955,15 +954,15 @@ void AIS_LocalContext::SetSelected(const Handle(AIS_InteractiveObject)& anIObj,
if(!IsValidForSelection(anIObj)) return; if(!IsValidForSelection(anIObj)) return;
UnhilightPicked(Standard_False); UnhilightPicked(Standard_False);
//1er cas , on trouve un proprietaire qui a deja <anIObj> comme proprietaire //1st case, owner already <anIObj> as owner
// et qui ne soit pas decompose... // and not separated is found...
Handle(AIS_Selection) sel = AIS_Selection::Selection(mySelName.ToCString()); Handle(AIS_Selection) sel = AIS_Selection::Selection(mySelName.ToCString());
//Standard_Boolean found(Standard_False); //Standard_Boolean found(Standard_False);
Handle(Standard_Transient) Tr; Handle(Standard_Transient) Tr;
Handle(SelectMgr_EntityOwner) EO = FindSelectedOwnerFromIO(anIObj); Handle(SelectMgr_EntityOwner) EO = FindSelectedOwnerFromIO(anIObj);
if(EO.IsNull()){ if(EO.IsNull()){
//regardons s'il a dans sa selection numero 0 un proprietaire qu'on pourrait triturer... //check if in selection number 0 there is an owner that can be triturated...
if(anIObj->HasSelection(0)){ if(anIObj->HasSelection(0)){
const Handle(SelectMgr_Selection)& SIOBJ = anIObj->Selection(0); const Handle(SelectMgr_Selection)& SIOBJ = anIObj->Selection(0);
SIOBJ->Init(); SIOBJ->Init();
@ -997,7 +996,7 @@ void AIS_LocalContext::AddOrRemoveSelected(const Handle(AIS_InteractiveObject)&
{ {
if(!IsValidForSelection(anIObj)) return; if(!IsValidForSelection(anIObj)) return;
UnhilightPicked(Standard_False); UnhilightPicked(Standard_False);
// d'abord regardons s'il est selectionne... // first check if it is selected...
Handle(SelectMgr_EntityOwner) EO; Handle(SelectMgr_EntityOwner) EO;
EO = FindSelectedOwnerFromIO(anIObj); EO = FindSelectedOwnerFromIO(anIObj);
@ -1042,7 +1041,7 @@ void AIS_LocalContext::AddOrRemoveSelected(const Handle(AIS_InteractiveObject)&
//======================================================================= //=======================================================================
//function : AddOrRemoveSelected //function : AddOrRemoveSelected
//purpose : A revoir... //purpose : To check...
//======================================================================= //=======================================================================
void AIS_LocalContext::AddOrRemoveSelected(const TopoDS_Shape& Sh, void AIS_LocalContext::AddOrRemoveSelected(const TopoDS_Shape& Sh,
const Standard_Boolean updateviewer) const Standard_Boolean updateviewer)
@ -1103,21 +1102,21 @@ void AIS_LocalContext::ManageDetected(const Handle(SelectMgr_EntityOwner)& aPick
// OK... // OK...
if(okStatus){ if(okStatus){
//======================================================================================================= //=======================================================================================================
// 2 cas : a- l'objet est dans la map des pickes: // 2 cases : a- object is in the map of picks:
// 1. c'est le meme index que le dernier detecte: ->On ne fait rien // 1. this is the same index as the last detected: -> Do nothing
// 2. sinon : // 2. otherwise :
// - si lastindex = 0 (aucun objet detecte au dernier move) // - if lastindex = 0 (no object was detected at the last step)
// on hilighte la prs de l'objet et on met lastindex = index(objet) // the object presentation is highlighted and lastindex = index(objet)
// - sinon : // - othrwise :
// on "desighlighte" la prs de l'objet correspondant a lastindex // the presentation of the object corresponding to lastindex is "unhighlighted"
// voire on l'efface si l'objet n'est pas visualise mais juste actif // it is removed if the object is not visualized but only active
// puis on hilighte la Prs de l'objet detecte ici et on met lastindex = index(objet) // then the presentation of the detected object is highlighted and lastindex = index(objet)
// b- l'objet n'est pas dans la map des objets pickes // b- the object is not in the map of picked objects
// - si lastindex != 0 (objet detecte au dernier move) on desighlighte ... // - if lastindex != 0 (object detected at the last step) it is unhighlighted ...
// si l'objet a ete decompose, on cree une prs pour la shape detectee et on ajoute // if the object was decomposed, presentation is created for the detected shape and the couple
// le couple (Proprietaire,Prs) dans la map. // (Proprietaire,Prs)is added in the map.
// sinon on met dans la map le couple(proprietaire, NullPrs) et on hilighte l'objet interactif // otherwise the couple(proprietaire, NullPrs) is placed in the map and the interactive object
// lui meme. // itself is highlighted.
// //
//======================================================================================================= //=======================================================================================================
@ -1237,7 +1236,7 @@ Standard_Boolean AIS_LocalContext::ComesFromDecomposition(const Standard_Integer
{ {
const Handle(SelectMgr_EntityOwner)& OWN = myMapOfOwner.FindKey(PickedIndex); const Handle(SelectMgr_EntityOwner)& OWN = myMapOfOwner.FindKey(PickedIndex);
Handle(SelectMgr_SelectableObject) aSel = OWN->Selectable(); Handle(SelectMgr_SelectableObject) aSel = OWN->Selectable();
if (myActiveObjects.IsBound (aSel)) { // debug de jmi if (myActiveObjects.IsBound (aSel)) { // debug of jmi
const Handle(AIS_LocalStatus)& Stat = myActiveObjects(aSel); const Handle(AIS_LocalStatus)& Stat = myActiveObjects(aSel);
return Stat->Decomposed(); return Stat->Decomposed();
} }
@ -1319,7 +1318,7 @@ Standard_Boolean AIS_LocalContext::IsValidForSelection(const Handle(AIS_Interact
Standard_Integer AIS_LocalContext::HilightNextDetected(const Handle(V3d_View)& V) Standard_Integer AIS_LocalContext::HilightNextDetected(const Handle(V3d_View)& V)
{ {
// on va jusqu'au prochain proprietaire // go to the next owner
if(myDetectedSeq.IsEmpty()) return Standard_False; if(myDetectedSeq.IsEmpty()) return Standard_False;
Standard_Integer L = myDetectedSeq.Length(); Standard_Integer L = myDetectedSeq.Length();
@ -1452,8 +1451,7 @@ void AIS_LocalContext::HilightTriangle(const Standard_Integer Rank,
//======================================================================= //=======================================================================
//function : FindSelectedOwnerFromIO //function : FindSelectedOwnerFromIO
//purpose : on regarde si l''un des proprietaires selectionnes represente //purpose : it is checked if one of the selected owners really presents IObj
// effectivement IObj
//======================================================================= //=======================================================================
Handle(SelectMgr_EntityOwner) AIS_LocalContext::FindSelectedOwnerFromIO Handle(SelectMgr_EntityOwner) AIS_LocalContext::FindSelectedOwnerFromIO
(const Handle(AIS_InteractiveObject)& anIObj) const (const Handle(AIS_InteractiveObject)& anIObj) const
@ -1499,7 +1497,7 @@ Handle(SelectMgr_EntityOwner) AIS_LocalContext::FindSelectedOwnerFromIO
//======================================================================= //=======================================================================
//function : FindSelectedOwnerFromShape //function : FindSelectedOwnerFromShape
//purpose : on regarde si l''un des proprietaires selectionnes represente effectivement IObj //purpose : it is checked if one of the selected owners really presents IObj
//======================================================================= //=======================================================================
Handle(SelectMgr_EntityOwner) AIS_LocalContext::FindSelectedOwnerFromShape(const TopoDS_Shape& sh) const Handle(SelectMgr_EntityOwner) AIS_LocalContext::FindSelectedOwnerFromShape(const TopoDS_Shape& sh) const
{ {

9
src/AIS/AIS_Plane.cxx
View File

@ -249,7 +249,6 @@ void AIS_Plane::Compute(const Handle(PrsMgr_PresentationManager3d)& ,
else if (aMode == 1){ else if (aMode == 1){
if (!myIsXYZPlane){ if (!myIsXYZPlane){
ComputeFrame(); ComputeFrame();
// a mettre ailleurs sans doute...
Handle(Prs3d_PlaneAspect) theaspect = myDrawer->PlaneAspect(); Handle(Prs3d_PlaneAspect) theaspect = myDrawer->PlaneAspect();
Handle(Graphic3d_Group) TheGroup = Prs3d_Root::CurrentGroup(aPresentation); Handle(Graphic3d_Group) TheGroup = Prs3d_Root::CurrentGroup(aPresentation);
gp_Pnt p1; gp_Pnt p1;
@ -341,8 +340,8 @@ void AIS_Plane::SetSize(const Standard_Real aLength)
void AIS_Plane::SetSize(const Standard_Real aXLength, void AIS_Plane::SetSize(const Standard_Real aXLength,
const Standard_Real aYLength) const Standard_Real aYLength)
{ {
//si le plan a deja une couleur ou une taille propre, //if the plane already has a proper color or size,
//il y a deja un PlaneAspect et un DatumAspect specifique //there is already a specific PlaneAspect and DatumAspect
Handle(Prs3d_PlaneAspect) PA; Handle(Prs3d_PlaneAspect) PA;
Handle(Prs3d_DatumAspect) DA; Handle(Prs3d_DatumAspect) DA;
@ -376,7 +375,7 @@ void AIS_Plane::SetSize(const Standard_Real aXLength,
//======================================================================= //=======================================================================
//function : UnsetSize //function : UnsetSize
//purpose : S'il ya une couleur, on recupere la taille du drawer du context... //purpose : If there is a color, the size is restaured from the drawer of the context...
//======================================================================= //=======================================================================
void AIS_Plane::UnsetSize() void AIS_Plane::UnsetSize()
{ {
@ -430,7 +429,7 @@ void AIS_Plane::SetColor(const Quantity_NameOfColor aCol)
void AIS_Plane::SetColor(const Quantity_Color &aCol) void AIS_Plane::SetColor(const Quantity_Color &aCol)
#endif #endif
{ {
// si le plan a deja sa propre taille, il y a un deja planeaspect cree // if the plane already has its proper size, there is an already created planeaspect
// Standard_Boolean yenadeja = hasOwnColor || myHasOwnSize; // Standard_Boolean yenadeja = hasOwnColor || myHasOwnSize;
Handle(Prs3d_PlaneAspect) PA; Handle(Prs3d_PlaneAspect) PA;
Handle(Prs3d_DatumAspect) DA; Handle(Prs3d_DatumAspect) DA;

2
src/AIS/AIS_PlaneTrihedron.cxx
View File

@ -64,7 +64,7 @@ AIS_PlaneTrihedron::AIS_PlaneTrihedron(const Handle(Geom_Plane)& aPlane)
DA->SecondAxisAspect()->SetColor(col); DA->SecondAxisAspect()->SetColor(col);
DA->SetDrawFirstAndSecondAxis(Standard_True); DA->SetDrawFirstAndSecondAxis(Standard_True);
DA->SetDrawThirdAxis(Standard_False); DA->SetDrawThirdAxis(Standard_False);
myDrawer->SetDatumAspect(DA); // odl - on en cree un specifique puisqu'on le modifie myDrawer->SetDatumAspect(DA); // odl - specific is created because it is modified
myShapes[0] = Position(); myShapes[0] = Position();
myShapes[1] = XAxis(); myShapes[1] = XAxis();
myShapes[2] = YAxis(); myShapes[2] = YAxis();

9
src/AIS/AIS_Selection.cxx
View File

@ -33,7 +33,6 @@
#define MaxSizeOfResult 100000 #define MaxSizeOfResult 100000
#endif #endif
// beurk mais moins qu''avant.... rob
static void AIS_Sel_CurrentSelection (Handle(AIS_Selection)& InputSel) static void AIS_Sel_CurrentSelection (Handle(AIS_Selection)& InputSel)
{ {
static Handle(AIS_Selection) theCurrentSelection; static Handle(AIS_Selection) theCurrentSelection;
@ -120,7 +119,7 @@ Standard_Boolean AIS_Selection::Find(const Standard_CString aName)
//======================================================================= //=======================================================================
Standard_Boolean AIS_Selection::SetCurrentSelection (const Standard_CString aName) Standard_Boolean AIS_Selection::SetCurrentSelection (const Standard_CString aName)
{ {
AIS_Selection::CreateSelection(aName); // juste pour voir... ????????????? AIS_Selection::CreateSelection(aName);
Handle(AIS_Selection) anAISSelection = AIS_Selection::Selection(aName) ; Handle(AIS_Selection) anAISSelection = AIS_Selection::Selection(aName) ;
@ -193,7 +192,7 @@ AIS_SelectStatus AIS_Selection::Select(const Handle(Standard_Transient)& anObjec
if(arr(i)==anObject) if(arr(i)==anObject)
Found=i; Found=i;
} }
// Il n''est pas dedans, on le rajoute.... // If it is not inside, it is added...
#ifdef BUC60953 #ifdef BUC60953
if ( !selected || Found == -1 ) { if ( !selected || Found == -1 ) {
@ -202,7 +201,6 @@ AIS_SelectStatus AIS_Selection::Select(const Handle(Standard_Transient)& anObjec
#endif #endif
if((S->myNb)+1>arr.Length()){ if((S->myNb)+1>arr.Length()){
Handle(TColStd_HArray1OfTransient) NiouTab = new TColStd_HArray1OfTransient(1,arr.Length()+MaxSizeOfResult); Handle(TColStd_HArray1OfTransient) NiouTab = new TColStd_HArray1OfTransient(1,arr.Length()+MaxSizeOfResult);
// oui bon, mais...
for(i=arr.Lower();i<=S->myNb;i++){ for(i=arr.Lower();i<=S->myNb;i++){
const Handle(Standard_Transient)& T = S->myresult->Value(i); const Handle(Standard_Transient)& T = S->myresult->Value(i);
NiouTab->SetValue(i,T); NiouTab->SetValue(i,T);
@ -215,7 +213,7 @@ AIS_SelectStatus AIS_Selection::Select(const Handle(Standard_Transient)& anObjec
S->myresult->SetValue(S->myNb,anObject); S->myresult->SetValue(S->myNb,anObject);
return AIS_SS_Added; return AIS_SS_Added;
} }
// il etait dedans on l''enleve... // it was inside and it is removed...
for(i=Found;i<=S->myNb;i++) for(i=Found;i<=S->myNb;i++)
arr(i)=arr(i+1); arr(i)=arr(i+1);
S->myNb--; S->myNb--;
@ -288,7 +286,6 @@ AIS_SelectStatus AIS_Selection::AddSelect(const Handle(Standard_Transient)& anOb
Standard_Integer i; Standard_Integer i;
if((S->myNb)+1>arr.Length()){ if((S->myNb)+1>arr.Length()){
Handle(TColStd_HArray1OfTransient) NiouTab = new TColStd_HArray1OfTransient(1,arr.Length()+MaxSizeOfResult); Handle(TColStd_HArray1OfTransient) NiouTab = new TColStd_HArray1OfTransient(1,arr.Length()+MaxSizeOfResult);
// oui bon, mais...
for(i=arr.Lower();i<=S->myNb;i++){ for(i=arr.Lower();i<=S->myNb;i++){
const Handle(Standard_Transient)& T = S->myresult->Value(i); const Handle(Standard_Transient)& T = S->myresult->Value(i);
NiouTab->SetValue(i,T); NiouTab->SetValue(i,T);

50
src/AIS/AIS_Shape.cxx
View File

@ -2,12 +2,6 @@
// Created: Fri Dec 20 17:18:37 1996 // Created: Fri Dec 20 17:18:37 1996
// Author: Robert COUBLANC // Author: Robert COUBLANC
// <rob@robox.paris1.matra-dtv.fr> // <rob@robox.paris1.matra-dtv.fr>
// Modified: Christiane ARMAND: 5/05/97: dans le compute on prend en
// compte le cas des objets infinis
// ROB : introduction des primitives connectees
// Pour le calcul des faces sensibles...
// oct-03-97 ROB : en fonction du type de shapes, on change les coeffs de polygonisation...
// (correction du Pb des cercles pas assez discretises...)
#define BUC60577 //GG_191099 Draw correct bounding box and Menage ... #define BUC60577 //GG_191099 Draw correct bounding box and Menage ...
@ -241,7 +235,7 @@ void AIS_Shape::Compute(const Handle(PrsMgr_PresentationManager3d)& /*aPresentat
} }
if (IsInfinite()) aPrs->SetInfiniteState(Standard_True); //pas de prise en compte lors du FITALL if (IsInfinite()) aPrs->SetInfiniteState(Standard_True); //not taken in account duting FITALL
switch (aMode) { switch (aMode) {
case 0:{ case 0:{
try { OCC_CATCH_SIGNALS StdPrs_WFDeflectionShape::Add(aPrs,myshape,myDrawer); } try { OCC_CATCH_SIGNALS StdPrs_WFDeflectionShape::Add(aPrs,myshape,myDrawer); }
@ -250,7 +244,7 @@ void AIS_Shape::Compute(const Handle(PrsMgr_PresentationManager3d)& /*aPresentat
cout << "AIS_Shape::Compute() failed"<< endl; cout << "AIS_Shape::Compute() failed"<< endl;
#endif #endif
cout << "a Shape should be incorrect : No Compute can be maked on it "<< endl; cout << "a Shape should be incorrect : No Compute can be maked on it "<< endl;
// on calcule une presentation de la boite englobante // presentation of the bounding box is calculated
// Compute(aPresentationManager,aPrs,2); // Compute(aPresentationManager,aPrs,2);
} }
break; break;
@ -275,7 +269,7 @@ void AIS_Shape::Compute(const Handle(PrsMgr_PresentationManager3d)& /*aPresentat
BRepTools::Clean(myshape); BRepTools::Clean(myshape);
} }
//shading seulement a partir de face... //shading only on face...
if ((Standard_Integer) myshape.ShapeType()>4) if ((Standard_Integer) myshape.ShapeType()>4)
StdPrs_WFDeflectionShape::Add(aPrs,myshape,myDrawer); StdPrs_WFDeflectionShape::Add(aPrs,myshape,myDrawer);
else { else {
@ -306,7 +300,7 @@ void AIS_Shape::Compute(const Handle(PrsMgr_PresentationManager3d)& /*aPresentat
} }
case 2: case 2:
{ {
// boite englobante // bounding box
if (IsInfinite()) StdPrs_WFDeflectionShape::Add(aPrs,myshape,myDrawer); if (IsInfinite()) StdPrs_WFDeflectionShape::Add(aPrs,myshape,myDrawer);
else DisplayBox(aPrs,BoundingBox(),myDrawer); else DisplayBox(aPrs,BoundingBox(),myDrawer);
} }
@ -379,7 +373,7 @@ void AIS_Shape::Compute(const Handle(Prs3d_Projector)& aProjector,
Aspect_TypeOfDeflection prevdef = defdrawer->TypeOfDeflection(); Aspect_TypeOfDeflection prevdef = defdrawer->TypeOfDeflection();
defdrawer->SetTypeOfDeflection(Aspect_TOD_RELATIVE); defdrawer->SetTypeOfDeflection(Aspect_TOD_RELATIVE);
// coefficients pour le calcul // coefficients for calculation
Standard_Real prevangle, newangle ,prevcoeff,newcoeff ; Standard_Real prevangle, newangle ,prevcoeff,newcoeff ;
if (OwnHLRDeviationAngle(newangle,prevangle) || OwnHLRDeviationCoefficient(newcoeff, prevcoeff)) if (OwnHLRDeviationAngle(newangle,prevangle) || OwnHLRDeviationCoefficient(newcoeff, prevcoeff))
@ -486,7 +480,7 @@ void AIS_Shape::ComputeSelection(const Handle(SelectMgr_Selection)& aSelection,
#else #else
TopExp_Explorer anExplor (myshape, TopAbs_VERTEX); TopExp_Explorer anExplor (myshape, TopAbs_VERTEX);
#endif #endif
if (!anExplor.More()) // Shape vide -> Assemblage vide. if (!anExplor.More()) // empty Shape -> empty Assembly.
return; return;
} }
@ -500,12 +494,12 @@ void AIS_Shape::ComputeSelection(const Handle(SelectMgr_Selection)& aSelection,
} }
#endif #endif
// POP on protege contre un plantage dans les couches basses // POP protection against crash in low layers
Standard_Real aDeflection = myDrawer->MaximalChordialDeviation(); Standard_Real aDeflection = myDrawer->MaximalChordialDeviation();
if (myDrawer->TypeOfDeflection() == Aspect_TOD_RELATIVE) if (myDrawer->TypeOfDeflection() == Aspect_TOD_RELATIVE)
{ {
// On calcule la fleche en fonction des min max globaux de la piece: // Vector is calculated depending on global min max of the part:
Bnd_Box aBndBox; //= BoundingBox(); ? Bnd_Box aBndBox; //= BoundingBox(); ?
BRepBndLib::Add (shape, aBndBox); BRepBndLib::Add (shape, aBndBox);
if (!aBndBox.IsVoid()) if (!aBndBox.IsVoid())
@ -583,7 +577,7 @@ void AIS_Shape::SetColor(const Quantity_Color &aCol)
myOwnColor = aCol; myOwnColor = aCol;
if(!myDrawer->HasShadingAspect()){ if(!myDrawer->HasShadingAspect()){
Handle(Prs3d_ShadingAspect) asp = new Prs3d_ShadingAspect(); Handle(Prs3d_ShadingAspect) asp = new Prs3d_ShadingAspect();
// recuperons le materiau reference... // retrieve the reference materials...
if(myDrawer->HasLink()){ if(myDrawer->HasLink()){
const Handle(Prs3d_Drawer)& refdr = myDrawer->Link(); const Handle(Prs3d_Drawer)& refdr = myDrawer->Link();
Graphic3d_MaterialAspect theRefMat = Graphic3d_MaterialAspect theRefMat =
@ -611,7 +605,7 @@ void AIS_Shape::SetColor(const Quantity_Color &aCol)
myDrawer->SetUnFreeBoundaryAspect(new Prs3d_LineAspect(aCol,Aspect_TOL_SOLID,WW)); myDrawer->SetUnFreeBoundaryAspect(new Prs3d_LineAspect(aCol,Aspect_TOL_SOLID,WW));
myDrawer->SetSeenLineAspect(new Prs3d_LineAspect(aCol,Aspect_TOL_SOLID,WW)); myDrawer->SetSeenLineAspect(new Prs3d_LineAspect(aCol,Aspect_TOL_SOLID,WW));
// modif du shading rapide... // fast shading modification...
if(!GetContext().IsNull()){ if(!GetContext().IsNull()){
if( GetContext()->MainPrsMgr()->HasPresentation(this,1)){ if( GetContext()->MainPrsMgr()->HasPresentation(this,1)){
Handle(Prs3d_Presentation) P = GetContext()->MainPrsMgr()->CastPresentation(this,1)->Presentation(); Handle(Prs3d_Presentation) P = GetContext()->MainPrsMgr()->CastPresentation(this,1)->Presentation();
@ -623,13 +617,6 @@ void AIS_Shape::SetColor(const Quantity_Color &aCol)
#else #else
a4bis->SetInteriorColor(Quantity_Color(aCol)); // Already done above in SetColor(...) a4bis->SetInteriorColor(Quantity_Color(aCol)); // Already done above in SetColor(...)
//***test rob : pour avoir la vraie couleur demandee en shading ***
// mais du coup, le shading est "plat" ...****
// Graphic3d_MaterialAspect FMAT = a4bis->FrontMaterial();
// FMAT.SetColor(Quantity_Color(aCol));
// a4bis->SetFrontMaterial(FMAT);
//******
P->SetPrimitivesAspect(myDrawer->ShadingAspect()->Aspect()); P->SetPrimitivesAspect(myDrawer->ShadingAspect()->Aspect());
G->SetGroupPrimitivesAspect(myDrawer->ShadingAspect()->Aspect()); G->SetGroupPrimitivesAspect(myDrawer->ShadingAspect()->Aspect());
#endif #endif
@ -646,7 +633,6 @@ void AIS_Shape::SetColor(const Quantity_Color &aCol)
void AIS_Shape::UnsetColor() void AIS_Shape::UnsetColor()
{ {
// Evitons les stupidites...
if(!HasColor() ){ myToRecomputeModes.Clear(); if(!HasColor() ){ myToRecomputeModes.Clear();
return;} return;}
@ -757,8 +743,8 @@ void AIS_Shape::SetWidth(const Standard_Real W)
#endif #endif
} }
myOwnWidth = W; myOwnWidth = W;
LoadRecomputable(0); // signifier qu'il faut recalculer uniquement le wireframe.... LoadRecomputable(0); // means that it is necessary to recompute only the wireframe....
LoadRecomputable(2); // et la boite englobante... LoadRecomputable(2); // and the bounding box...
} }
@ -817,7 +803,7 @@ void AIS_Shape::SetMaterial(const Graphic3d_NameOfMaterial aMat)
G->SetGroupPrimitivesAspect(a4bis); G->SetGroupPrimitivesAspect(a4bis);
} }
} }
myRecomputeEveryPrs =Standard_False; // aucun mode a recalculer :uniquement update viewer myRecomputeEveryPrs =Standard_False; // no mode to recalculate :only viewer update
myToRecomputeModes.Clear(); myToRecomputeModes.Clear();
} }
//======================================================================= //=======================================================================
@ -845,7 +831,7 @@ void AIS_Shape::SetMaterial(const Graphic3d_MaterialAspect& aMat)
G->SetGroupPrimitivesAspect(a4bis); G->SetGroupPrimitivesAspect(a4bis);
} }
} }
myRecomputeEveryPrs =Standard_False; // aucun mode a recalculer :uniquement update viewer myRecomputeEveryPrs =Standard_False; // no mode to recalculate :only viewer update
myToRecomputeModes.Clear(); myToRecomputeModes.Clear();
} }
@ -887,7 +873,7 @@ void AIS_Shape::UnsetMaterial()
G->SetGroupPrimitivesAspect(a4bis); G->SetGroupPrimitivesAspect(a4bis);
} }
} }
myRecomputeEveryPrs =Standard_False; // aucun mode a recalculer :uniquement update viewer myRecomputeEveryPrs =Standard_False; // no mode to recalculate :only viewer update
myToRecomputeModes.Clear(); myToRecomputeModes.Clear();
} }
@ -920,7 +906,7 @@ void AIS_Shape::SetTransparency(const Standard_Real AValue)
G->SetGroupPrimitivesAspect(a4bis); G->SetGroupPrimitivesAspect(a4bis);
} }
} }
myRecomputeEveryPrs =Standard_False; // aucun mode a recalculer :uniquement update viewer myRecomputeEveryPrs =Standard_False; // no mode to recalculate :only viewer update
myToRecomputeModes.Clear(); myToRecomputeModes.Clear();
} }
@ -956,7 +942,7 @@ void AIS_Shape::UnsetTransparency()
#endif #endif
} }
} }
myRecomputeEveryPrs =Standard_False; // aucun mode a recalculer :uniquement update viewer myRecomputeEveryPrs =Standard_False; // no mode to recalculate :only viewer update
myToRecomputeModes.Clear(); myToRecomputeModes.Clear();
} }
@ -983,7 +969,7 @@ const Bnd_Box& AIS_Shape::BoundingBox()
#else #else
TopExp_Explorer anExplor (myshape, TopAbs_VERTEX); TopExp_Explorer anExplor (myshape, TopAbs_VERTEX);
#endif #endif
if (!anExplor.More()) { // Shape vide -> Assemblage vide. if (!anExplor.More()) { // empty Shape -> empty Assembly.
myBB.SetVoid(); myBB.SetVoid();
return myBB; return myBB;
} }

16
src/AIS/AIS_TangentRelation.cxx
View File

@ -318,8 +318,8 @@ void AIS_TangentRelation::ComputeTwoEdgesTangent(const Handle(Prs3d_Presentation
} }
gp_Vec theVector; gp_Vec theVector;
gp_Pnt pint3d; // le point de tangence gp_Pnt pint3d; // tangency point
gp_Dir theDir; // la direction de la tangente gp_Dir theDir; // tangency direction
Standard_Real par_inter = 0.0; // parameter of tangency point Standard_Real par_inter = 0.0; // parameter of tangency point
if (found) if (found)
@ -327,18 +327,18 @@ void AIS_TangentRelation::ComputeTwoEdgesTangent(const Handle(Prs3d_Presentation
pint3d = BRep_Tool::Pnt(VCom); pint3d = BRep_Tool::Pnt(VCom);
} }
//Sinon, on le cherche comme si on savait que les 2 curves // Otherwise it is found as if it was known that 2 curves
// sont tangentes ( ce qui dooit etre le cas, tant pis pour les autres) // are tangents (which must be the cases)
switch (typArg) switch (typArg)
{ {
case 12: // line circle case 12: // circle line
{ {
const Handle(Geom_Line)& line = (Handle(Geom_Line)&) copy1; const Handle(Geom_Line)& line = (Handle(Geom_Line)&) copy1;
const Handle(Geom_Circle)& circle = (Handle(Geom_Circle)&) copy2; const Handle(Geom_Circle)& circle = (Handle(Geom_Circle)&) copy2;
if ( !found ) if ( !found )
{ {
// il suffit de projeter le centre du cercle sur la droite // it is enough to project the circus center on the straight line
par_inter = ElCLib::Parameter(line->Lin(), circle->Location()); par_inter = ElCLib::Parameter(line->Lin(), circle->Location());
pint3d = ElCLib::Value(par_inter, line->Lin()); pint3d = ElCLib::Value(par_inter, line->Lin());
} }
@ -360,7 +360,7 @@ void AIS_TangentRelation::ComputeTwoEdgesTangent(const Handle(Prs3d_Presentation
if (!found) if (!found)
{ {
// il suffit de projeter le centre du cercle sur la droite // it is enough to project the circus center on the straight line
par_inter = ElCLib::Parameter(line->Lin(), circle->Location()); par_inter = ElCLib::Parameter(line->Lin(), circle->Location());
pint3d = ElCLib::Value(par_inter, line->Lin()); pint3d = ElCLib::Value(par_inter, line->Lin());
} }

20
src/AIS/AIS_TexturedShape.cxx
View File

@ -342,10 +342,8 @@ void AIS_TexturedShape::Compute(const Handle(PrsMgr_PresentationManager3d)& /*aP
BRepTools::Update(myshape); BRepTools::Update(myshape);
Handle(Graphic3d_StructureManager) aStrucMana = GetContext()->MainPrsMgr()->StructureManager(); Handle(Graphic3d_StructureManager) aStrucMana = GetContext()->MainPrsMgr()->StructureManager();
{
Handle(Prs3d_ShadingAspect) aPrs3d_ShadingAspect = new Prs3d_ShadingAspect; myAspect = (new Prs3d_ShadingAspect())->Aspect();
myAspect = aPrs3d_ShadingAspect->Aspect();
}
if (!DoMapTexture) if (!DoMapTexture)
{ {
myAspect->SetTextureMapOff(); myAspect->SetTextureMapOff();
@ -423,21 +421,21 @@ void AIS_TexturedShape::Compute(const Handle(PrsMgr_PresentationManager3d)& /*aP
dVmax = (Vmax - Vmin); dVmax = (Vmax - Vmin);
Handle(Graphic3d_Group) mygroup = Prs3d_Root::CurrentGroup(aPrs); Handle(Graphic3d_Group) mygroup = Prs3d_Root::CurrentGroup(aPrs);
Standard_Integer nnn = myT->NbTriangles(); // nnn : nombre de triangles Standard_Integer nnn = myT->NbTriangles(); // nnn : number of triangles
Standard_Integer nt, n1, n2, n3 = 0; // nt : triangle courant Standard_Integer nt, n1, n2, n3 = 0; // nt : current triangle
// ni : sommet i du triangle courant // ni : top i of the current triangle
for (nt = 1; nt <= nnn; nt++) for (nt = 1; nt <= nnn; nt++)
{ {
#ifdef DEBUG #ifdef DEBUG
cout << "On traite actuellement le triangle : "<< nt <<"\n"; cout << "On traite actuellement le triangle : "<< nt <<"\n";
#endif #endif
if (SST.Orientation(myFace) == TopAbs_REVERSED) // si la face est "reversed" if (SST.Orientation(myFace) == TopAbs_REVERSED) // if the face is "reversed"
triangles(nt).Get(n1,n3,n2); // le triangle est n1,n3,n2 triangles(nt).Get(n1,n3,n2); // the triangle is n1,n3,n2
else else
triangles(nt).Get(n1,n2,n3); // le triangle est n1,n2,n3 triangles(nt).Get(n1,n2,n3); // the triangle is n1,n2,n3
if (TriangleIsValid (Nodes(n1),Nodes(n2),Nodes(n3)) ) if (TriangleIsValid (Nodes(n1),Nodes(n2),Nodes(n3)) )
{ // Associates a vertexNT to each node { // Associates vertexNT to each node
Graphic3d_Array1OfVertexNT Points(1,3); Graphic3d_Array1OfVertexNT Points(1,3);
Aspect_Array1OfEdge aretes(1,3); Aspect_Array1OfEdge aretes(1,3);

15
src/AIS/AIS_Trihedron.cxx
View File

@ -100,8 +100,8 @@ void AIS_Trihedron::SetSize(const Standard_Real aValue)
//======================================================================= //=======================================================================
//function : UnsetSize //function : UnsetSize
//purpose : si l'objet a 1 couleur, on reprend la taille //purpose : if the object has 1 color, the default size of the
// du drawer par defaut. sinon on nullifie le DatumAspect // drawer is reproduced, otherwise DatumAspect becomes null
//======================================================================= //=======================================================================
void AIS_Trihedron::UnsetSize() void AIS_Trihedron::UnsetSize()
@ -232,7 +232,6 @@ void AIS_Trihedron::Compute(
{ {
aPresentation->Clear(); aPresentation->Clear();
//CTS16254 : pas de prise en compte des axes lors du FITALL (fpo 18/07)
aPresentation->SetInfiniteState (Standard_True); aPresentation->SetInfiniteState (Standard_True);
switch(aMode){ switch(aMode){
case 0: case 0:
@ -266,14 +265,14 @@ void AIS_Trihedron::Compute(const Handle_Prs3d_Projector& aProjector,
void AIS_Trihedron::ComputeSelection(const Handle(SelectMgr_Selection)& aSelection, void AIS_Trihedron::ComputeSelection(const Handle(SelectMgr_Selection)& aSelection,
const Standard_Integer aMode) const Standard_Integer aMode)
{ {
// recuperation des points extremites du triedre. // retrieve the tops of the trihedron.
Standard_Integer Prior; Standard_Integer Prior;
Handle(SelectMgr_EntityOwner) eown; Handle(SelectMgr_EntityOwner) eown;
TColgp_Array1OfPnt PP(1,4),PO(1,4); TColgp_Array1OfPnt PP(1,4),PO(1,4);
ExtremityPoints(PP); ExtremityPoints(PP);
switch (aMode) { switch (aMode) {
case 0: case 0:
{ // triedre complet 1 seul proprietaire : this... priorite 5 (meme que faces) { // complete triedron only 1 owner : this... priority 5 (same as faces)
Prior = 5; Prior = 5;
eown = new SelectMgr_EntityOwner(this,Prior); eown = new SelectMgr_EntityOwner(this,Prior);
for (Standard_Integer i=1; i<=3;i++) for (Standard_Integer i=1; i<=3;i++)
@ -281,7 +280,7 @@ void AIS_Trihedron::ComputeSelection(const Handle(SelectMgr_Selection)& aSelecti
break; break;
} }
case 1: case 1:
{ //origine : { //origin :
Prior = 8; Prior = 8;
eown= new SelectMgr_EntityOwner(myShapes[0],Prior); eown= new SelectMgr_EntityOwner(myShapes[0],Prior);
@ -290,7 +289,7 @@ void AIS_Trihedron::ComputeSelection(const Handle(SelectMgr_Selection)& aSelecti
break; break;
} }
case 2: case 2:
{ //axes ... priorite 7 { //axes ... priority 7
Prior = 7; Prior = 7;
for (Standard_Integer i=1; i<=3;i++){ for (Standard_Integer i=1; i<=3;i++){
eown= new SelectMgr_EntityOwner(myShapes[i],Prior); eown= new SelectMgr_EntityOwner(myShapes[i],Prior);
@ -301,7 +300,7 @@ void AIS_Trihedron::ComputeSelection(const Handle(SelectMgr_Selection)& aSelecti
} }
case 3: case 3:
{ // plans principaux priorite 6 { // main planes priority 6
// PO(1) = PP(1); // PO(1) = PP(1);
// PO(4) = PP(1); // PO(4) = PP(1);
Prior =5; Prior =5;

6
src/BOP/BOP_SolidClassifier.cxx
View File

@ -66,9 +66,9 @@
myState = myPClassifier->State(); myState = myPClassifier->State();
const TopoDS_Shape& fres = myPClassifier->Face(); const TopoDS_Shape& fres = myPClassifier->Face();
if (fres.IsNull()) { if (fres.IsNull()) {
// NYI : en cas d'elimination des faces EXTERNAL et INTERNAL par le // NYI : in case of removal of EXTERNAL and INTERNAL faces by the
// classifier BRepClass3d_SolidClassifier, traiter quand meme ces faces // classifier BRepClass3d_SolidClassifier, process these faces
// pour generer l'etat ON/Solid quand le point est IN/face INTERNAL ou EXTERNAL // to generate state ON/Solid when the point is IN/face INTERNAL or EXTERNAL
return myState; return myState;
} }

28
src/BOP/BOP_WireEdgeSet.cxx
View File

@ -146,7 +146,7 @@ static void GetOrientationVOnE(const TopoDS_Shape& V,
//======================================================================= //=======================================================================
//function : MakeNeighboursList //function : MakeNeighboursList
//purpose : recherche des edges connexes a Earg par Varg //purpose : find edges connected to Earg by Varg
//======================================================================= //=======================================================================
const TopTools_ListOfShape & BOP_WireEdgeSet::MakeNeighboursList(const TopoDS_Shape& Earg, const TopTools_ListOfShape & BOP_WireEdgeSet::MakeNeighboursList(const TopoDS_Shape& Earg,
const TopoDS_Shape& Varg) const TopoDS_Shape& Varg)
@ -176,10 +176,10 @@ static void GetOrientationVOnE(const TopoDS_Shape& V,
if (newn >= 2 ) { if (newn >= 2 ) {
const TopoDS_Face& F = myFace; const TopoDS_Face& F = myFace;
// plusieurs aretes de couture connexes a E par V et telles que : // several sewing edges connected to E by V such as :
// orientation de V dans E # orientation de V dans ces aretes. // orientation of V in E # orientation of V in its edges.
// on ne garde,parmi les aretes de couture connexes, // one leaves among the connected sewing edges,
// que l'arete A qui verifie tg(E) ^ tg(A) > 0 // only edge A that checks tg(E) ^ tg(A) > 0
TopAbs_Orientation Eori; TopAbs_Orientation Eori;
gp_Vec2d d1E; gp_Pnt2d pE; gp_Vec2d d1E; gp_Pnt2d pE;
@ -244,11 +244,11 @@ static void GetOrientationVOnE(const TopoDS_Shape& V,
( (cross < 0) && oVE == TopAbs_FORWARD ); ( (cross < 0) && oVE == TopAbs_FORWARD );
if ( t2 ) { //-- t1 if ( t2 ) { //-- t1
// c'est la bonne IsClosed,on ne garde qu'elle parmi les IsClosed // this is proper IsClosed, only it is preserved among IsClosed
lclo.Next(); lclo.Next();
} }
else { else {
// on vire l'arete IsClosed // edge IsClosed is suspended
myCurrentShapeNeighbours.Remove(lclo); myCurrentShapeNeighbours.Remove(lclo);
} }
}// end of while (lclo.More()) }// end of while (lclo.More())
@ -327,11 +327,11 @@ static void GetOrientationVOnE(const TopoDS_Shape& V,
Standard_Boolean resu = Standard_False; Standard_Boolean resu = Standard_False;
TopAbs_Orientation o1,o2; TopAbs_Orientation o1,o2;
// SSCONNEX = False ==> on selectionne E2 de facon a creer ulterieurement // SSCONNEX = False ==> E2 is selected to create as many
// (defaut) autant de faces que de composantes connexes en UV. // (default) faces as there are components connected in UV.
// SSCONNEX = True ==> on prend toute arete E2 qui partage V avec E1 // SSCONNEX = True ==> the entire edge E2 sharing V with E1 is taken
// et telle que orientation(V/E1) # orientation(V/E2) // so that orientation(V/E1) # orientation(V/E2)
// ==> face de part et d'autre des coutures // ==> face of part and other sewings
if ((c1 && c2)) { if ((c1 && c2)) {
Standard_Boolean u1 = c1 ? IsUClosed(E1) : Standard_False; Standard_Boolean u1 = c1 ? IsUClosed(E1) : Standard_False;
Standard_Boolean v1 = c1 ? IsVClosed(E1) : Standard_False; Standard_Boolean v1 = c1 ? IsVClosed(E1) : Standard_False;
@ -345,8 +345,8 @@ static void GetOrientationVOnE(const TopoDS_Shape& V,
resu = VertexConnectsEdges(V,E1,E2,o1,o2); resu = VertexConnectsEdges(V,E1,E2,o1,o2);
} }
else { else {
// cto 012 O2 arete de couture de face cylindrique // cto 012 O2 sewing edge of cylindric face
// chainage des composantes splitees ON et OUT de meme orientation // chain of components split ON and OUT of the same orientation
TopAbs_Orientation oe1 = E1.Orientation(); TopAbs_Orientation oe1 = E1.Orientation();
TopAbs_Orientation oe2 = E2.Orientation(); TopAbs_Orientation oe2 = E2.Orientation();
Standard_Boolean iseq = E1.IsEqual(E2); Standard_Boolean iseq = E1.IsEqual(E2);

60
src/BRepBlend/BRepBlend.cdl
View File

@ -138,54 +138,52 @@ is
-- Edge/Face and evolutif radius -- Edge/Face and evolutif radius
class SurfRstConstRad; class SurfRstConstRad;
---Purpose: Copie de CSConstRad mais avec une pcurve sur surface ---Purpose: Copy of CSConstRad with pcurve on surface
-- comme support. -- as support.
class RstRstEvolRad; class RstRstEvolRad;
---Purpose: Function to approximate by AppSurface for ---Purpose: Function to approximate by AppSurface for
-- Edge/Edge and evolutif radius -- Edge/Edge and evolutif radius
-- --
class RstRstConstRad; class RstRstConstRad;
---Purpose: Copie de CSConstRad mais avec une pcurve sur surface ---Purpose: Copy of CSConstRad with a pcurve on surface
-- comme support. -- as support.
class SurfPointConstRadInv; class SurfPointConstRadInv;
---Purpose: Fonction de recadrage entre un point et une surface. ---Purpose: Function of reframing between a point and a surface.
class SurfCurvConstRadInv; class SurfCurvConstRadInv;
---Purpose: Fonction de recadrage entre une restriction surface de ---Purpose: Function of reframing between a restriction surface of the
-- la surface et une courbe. -- surface and a curve.
class SurfPointEvolRadInv; class SurfPointEvolRadInv;
---Purpose: Fonction de recadrage entre un point et une surface. ---Purpose: Fonction of reframing between a point and a surface.
class CurvPointRadInv; class CurvPointRadInv;
---Purpose: Fonction de recadrage entre un point et une courbe. ---Purpose: Function of reframing between a point and a curve.
-- valable dans les cas rsyon constant et rayon evolutif -- valid in cases of constant and progressive radius
class SurfCurvEvolRadInv; class SurfCurvEvolRadInv;
---Purpose: Fonction de recadrage entre une restriction surface de ---Purpose: Function of reframing between a surface restriction
-- la surface et une courbe. -- of the surface and a curve.
class SurfRstLineBuilder; class SurfRstLineBuilder;
---Purpose: Construction d'une BRepBlend_Line entre une surface et ---Purpose: Construction of a BRepBlend_Line between a surface and
-- une pcurve sur surface a partir d'une solution de -- a pcurve on surface from an approached
-- depart approchee. Les entrees sorties de ce builder -- starting solution. The output entries of this builder
-- sont de meme nature que celle d'un walking -- are of the same nature as of the traditional walking
-- traditionnel, mais les exigences sur la Line ne sont -- but the requirements on the Line are not the same
-- pas les memes. Si l'on garanti toujours la -- If the determination of validity range is always
-- determination du range de validite, on ne respecte -- guaranteed, the criteria of correct repartition of sections
-- plus les criteres de bonne repartition des sections en -- before smoothing are not respected. The resulting Line
-- vue d'un lissage. En resume la Line resultat est f(t) -- is f(t) oriented.
-- oriented.
class RstRstLineBuilder; class RstRstLineBuilder;
---Purpose: Construction d'une BRepBlend_Line entre deux pcurves a ---Purpose: Construction of a BRepBlend_Line between two pcurves
-- partir d'une solution de depart approchee. Les -- from an approached starting solution. The output
-- entrees sorties de ce builder sont de meme nature que -- entries of this builder are of the same nature
-- celle d'un walking traditionnel, mais les exigences -- as of a traditional walking, but the requirements
-- sur la Line ne sont pas les memes. Si l'on garanti -- to the Line are not the same. If the determination of validity range is always
-- toujours la determination du range de validite, on ne -- guaranteed, the criteria of correct repartition of sections
-- respecte plus les criteres de bonne repartition des -- before smoothing are not respected. The resulting Line
-- sections en vue d'un lissage. En resume la Line -- is f(t) oriented.
-- resultat est f(t) oriented.
end BRepBlend; end BRepBlend;

60
src/BRepBlend/BRepBlend_AppFuncRoot.cxx
View File

@ -42,10 +42,10 @@ BRepBlend_AppFuncRoot::BRepBlend_AppFuncRoot(Handle(BRepBlend_Line)& Line,
if (myTolerance(ii)>Tol2d) { myTolerance(ii) = Tol2d;} if (myTolerance(ii)>Tol2d) { myTolerance(ii) = Tol2d;}
} }
// Tableaux // Tables
Func.GetShape( NbPoles, NbKnots, Degree, NbPoles2d); Func.GetShape( NbPoles, NbKnots, Degree, NbPoles2d);
// Calcul du BaryCentre (cas rationnel). // Calculation of BaryCentre (rationnal case).
if (Func.IsRational()) { if (Func.IsRational()) {
Standard_Real Xmax =-1.e100, Xmin = 1.e100, Standard_Real Xmax =-1.e100, Xmin = 1.e100,
Ymax =-1.e100, Ymin = 1.e100, Ymax =-1.e100, Ymin = 1.e100,
@ -68,8 +68,8 @@ BRepBlend_AppFuncRoot::BRepBlend_AppFuncRoot(Handle(BRepBlend_Line)& Line,
//================================================================================ //================================================================================
// Function: D0 // Function: D0
// Purpose : Calcul de la section pour v = Param, si le calcul echoue on rend // Purpose : Calculation of section for v = Param, if calculation fails
// Standard_False. // Standard_False is raised.
//================================================================================ //================================================================================
Standard_Boolean BRepBlend_AppFuncRoot::D0(const Standard_Real Param, Standard_Boolean BRepBlend_AppFuncRoot::D0(const Standard_Real Param,
const Standard_Real First, const Standard_Real First,
@ -89,8 +89,8 @@ Standard_Boolean BRepBlend_AppFuncRoot::D0(const Standard_Real Param,
//================================================================================ //================================================================================
// Function: D1 // Function: D1
// Purpose : Calcul de la derive partiel de la section par rapport a v // Purpose : Calculation of the partial derivative of the section corresponding to v
// pour v = Param, si le calcul echoue on rend Standard_False. // for v = Param, if the calculation fails Standard_False is raised.
//================================================================================ //================================================================================
Standard_Boolean BRepBlend_AppFuncRoot::D1(const Standard_Real Param, Standard_Boolean BRepBlend_AppFuncRoot::D1(const Standard_Real Param,
const Standard_Real First, const Standard_Real First,
@ -119,9 +119,9 @@ Standard_Boolean BRepBlend_AppFuncRoot::D1(const Standard_Real Param,
//=========================================================================== //===========================================================================
// Function: D2 // Function: D2
// Purpose : Calcul de la derive et seconde partiel de la // Purpose : Calculation of the derivative and second partial of the
// section par rapport a v. // section corresponding to v.
// Pour v = Param, si le calcul echoue on rend Standard_False. // For v = Param, if the calculation fails Standard_False is raised.
//=========================================================================== //===========================================================================
Standard_Boolean BRepBlend_AppFuncRoot::D2(const Standard_Real Param, Standard_Boolean BRepBlend_AppFuncRoot::D2(const Standard_Real Param,
const Standard_Real First, const Standard_Real First,
@ -257,15 +257,15 @@ void BRepBlend_AppFuncRoot::GetMinimalWeight(TColStd_Array1OfReal& Weigths) cons
// //
// Function : SearchPoint // Function : SearchPoint
// //
// Purpose : Recherche du point solution au parametre Param (sur 2 Surfaces) // Purpose : Find point solution with parameter Param (on 2 Surfaces)
// //
// Algorithme : // Algorithm :
// 1) On recheche une solution approximative a partir des Points dejas calcules // 1) Approximative solution is found from already calculated Points
// 2) On Converge par une methode de type Newton // 2) Convergence is done by a method of type Newton
// //
// Causes possibles d'echecs : // Possible causes of fails :
// - Singularite sur les surfaces. // - Singularity on surfaces.
// - Manquent d'information dans la "line"issue du cheminement. // - no information oin the "line" resulting from processing.
// //
//================================================================================ //================================================================================
@ -275,24 +275,24 @@ Standard_Boolean BRepBlend_AppFuncRoot::SearchPoint(Blend_AppFunction& Func,
{ {
Standard_Boolean Trouve; Standard_Boolean Trouve;
Standard_Integer dim = Func.NbVariables(); Standard_Integer dim = Func.NbVariables();
// (1) Recherche d'un point d'init // (1) Find a point of init
Standard_Integer I1=1, I2=myLine->NbPoints(), Index; Standard_Integer I1=1, I2=myLine->NbPoints(), Index;
Standard_Real t1, t2; Standard_Real t1, t2;
// (1.a) On verifie que c'est a l'interieur // (1.a) It is checked if it is inside
if (Param < myLine->Point(I1).Parameter()) {return Standard_False;} if (Param < myLine->Point(I1).Parameter()) {return Standard_False;}
if (Param > myLine->Point(I2).Parameter()) {return Standard_False;} if (Param > myLine->Point(I2).Parameter()) {return Standard_False;}
// (1.b) On recheche l'intervalle // (1.b) Find the interval
Trouve = SearchLocation(Param, I1, I2, Index); Trouve = SearchLocation(Param, I1, I2, Index);
// (1.c) Si le point est dejas calcule on le recupere // (1.c) If the point is already calculated it is returned
if (Trouve) { if (Trouve) {
Pnt = myLine->Point(Index); Pnt = myLine->Point(Index);
Vec(XInit,Pnt); Vec(XInit,Pnt);
} }
else { else {
// (1.d) Intialisation par interpolation lineaire // (1.d) Intialisation by linear interpolation
Pnt = myLine->Point(Index); Pnt = myLine->Point(Index);
Vec(X1,Pnt); Vec(X1,Pnt);
t1 = Pnt.Parameter(); t1 = Pnt.Parameter();
@ -308,7 +308,7 @@ Standard_Boolean BRepBlend_AppFuncRoot::SearchPoint(Blend_AppFunction& Func,
} }
} }
// (2) Calcul effectif de la solution ------------------------ // (2) Calculation of the solution ------------------------
Func.Set(Param); Func.Set(Param);
Func.GetBounds(X1, X2); Func.GetBounds(X1, X2);
math_FunctionSetRoot rsnld(Func, myTolerance, 30); math_FunctionSetRoot rsnld(Func, myTolerance, 30);
@ -323,13 +323,13 @@ Standard_Boolean BRepBlend_AppFuncRoot::SearchPoint(Blend_AppFunction& Func,
} }
rsnld.Root(Sol); rsnld.Root(Sol);
// (3) Stockage du point // (3) Storage of the point
Point(Func,Param,Sol,Pnt); Point(Func,Param,Sol,Pnt);
// (4) Insertion du point si le cacul semble long. // (4) Insertion of the point if the calculation seems long.
if ((!Trouve)&&(rsnld.NbIterations()>3)) { if ((!Trouve)&&(rsnld.NbIterations()>3)) {
#ifdef DEB #ifdef DEB
cout << "Evaluation en t = " << Param << "donne" << endl; cout << "Evaluation in t = " << Param << "given" << endl;
rsnld.Dump(cout); rsnld.Dump(cout);
#endif #endif
myLine->InsertBefore(Index+1, Pnt); myLine->InsertBefore(Index+1, Pnt);
@ -342,11 +342,11 @@ Standard_Boolean BRepBlend_AppFuncRoot::SearchPoint(Blend_AppFunction& Func,
// //
// Function : SearchLocation // Function : SearchLocation
// //
// Purpose : Recherche dichotomiqique du rang de l'intervalle parametrique contenant // Purpose : Binary search of the line of the parametric interval containing
// Param dans la liste de points calcule (myline) // Param in the list of calculated points (myline)
// si le point de parametre Param est deja stocker dans la liste on rend // if the point of parameter Param is already stored in the list
// True et ParamIndex correspond au rang du Point. // True is raised and ParamIndex corresponds to line of Point.
// La complexite de cet algorithme est de log(n)/log(2) // Complexity of this algorithm is log(n)/log(2)
//================================================================================ //================================================================================
Standard_Boolean BRepBlend_AppFuncRoot::SearchLocation(const Standard_Real Param, Standard_Boolean BRepBlend_AppFuncRoot::SearchLocation(const Standard_Real Param,
const Standard_Integer FirstIndex, const Standard_Integer FirstIndex,

54
src/BRepBlend/BRepBlend_RstRstConstRad.cxx
View File

@ -220,7 +220,7 @@ Standard_Boolean BRepBlend_RstRstConstRad::IsSolution(const math_Vector& Sol,
if (Abs(valsol(1)) <= Tol && if (Abs(valsol(1)) <= Tol &&
Abs(valsol(2)) <= Tol ) { Abs(valsol(2)) <= Tol ) {
// Calcul des tangentes // Calculation of tangents
prmrst1 = Sol(1); prmrst1 = Sol(1);
pt2drst1 = rst1->Value(prmrst1); pt2drst1 = rst1->Value(prmrst1);
prmrst2 = Sol(2); prmrst2 = Sol(2);
@ -286,7 +286,7 @@ Standard_Boolean BRepBlend_RstRstConstRad::IsSolution(const math_Vector& Sol,
Sina = nplan.Dot(n1.Crossed(n2)); Sina = nplan.Dot(n1.Crossed(n2));
if (choix%2 != 0) { if (choix%2 != 0) {
Sina = -Sina; //nplan est change en -nplan Sina = -Sina; //nplan is changed into -nplan
} }
Angle = ACos(Cosa); Angle = ACos(Cosa);
@ -446,11 +446,11 @@ Blend_DecrochStatus BRepBlend_RstRstConstRad::Decroch(const math_Vector& Sol,
rstref1->Value(Sol(1)).Coord(u, v); rstref1->Value(Sol(1)).Coord(u, v);
surfref1->D1(u, v,PtTmp1,d1u,d1v); surfref1->D1(u, v,PtTmp1,d1u,d1v);
// Normale a la surface de reference 1 // Normal to the reference surface 1
NRst1 = d1u.Crossed(d1v); NRst1 = d1u.Crossed(d1v);
rstref2->Value(Sol(2)).Coord(u, v); rstref2->Value(Sol(2)).Coord(u, v);
surfref2->D1(u, v, PtTmp2, d1u, d1v); surfref2->D1(u, v, PtTmp2, d1u, d1v);
// Normale a la surface de reference 2 // Normal to the reference surface 2
NRst2 = d1u.Crossed(d1v); NRst2 = d1u.Crossed(d1v);
Standard_Boolean IsCenter; Standard_Boolean IsCenter;
@ -483,7 +483,7 @@ Blend_DecrochStatus BRepBlend_RstRstConstRad::Decroch(const math_Vector& Sol,
TgRst2.Reverse(); TgRst2.Reverse();
} }
// On retourne les vecteurs // The vectors are returned
if (NRst1InPlane.Dot(TgRst1) > -1.e-10) { if (NRst1InPlane.Dot(TgRst1) > -1.e-10) {
if (NRst2InPlane.Dot(TgRst2) < 1.e-10) { if (NRst2InPlane.Dot(TgRst2) < 1.e-10) {
return Blend_DecrochBoth; return Blend_DecrochBoth;
@ -530,7 +530,7 @@ void BRepBlend_RstRstConstRad::Set(const BlendFunc_SectionShape TypeSection)
//======================================================================= //=======================================================================
//function : CenterCircleRst1Rst2 //function : CenterCircleRst1Rst2
//purpose : Calculer le centre du cercle passant par les deux points des restrictions //purpose : Calculate the center of the circle passing by two points of restrictions
//======================================================================= //=======================================================================
Standard_Boolean BRepBlend_RstRstConstRad::CenterCircleRst1Rst2(const gp_Pnt& PtRst1, Standard_Boolean BRepBlend_RstRstConstRad::CenterCircleRst1Rst2(const gp_Pnt& PtRst1,
const gp_Pnt& PtRst2, const gp_Pnt& PtRst2,
@ -540,11 +540,11 @@ Standard_Boolean BRepBlend_RstRstConstRad::CenterCircleRst1Rst2(const gp_Pnt&
{ {
gp_Vec rst1rst2(PtRst1, PtRst2); gp_Vec rst1rst2(PtRst1, PtRst2);
gp_Vec vdmedNor; //,NRst1; vdmedNor vecteur directeur de la Mediatrice gp_Vec vdmedNor; //,NRst1; vdmedNor directong vector of the perpendicular bisector
Standard_Real norm2; Standard_Real norm2;
Standard_Real Dist;// distance entre le milieu de PtRst1,PtRst2 et Center Standard_Real Dist;// distance between the middle of PtRst1,PtRst2 and Center
// Calcul du centre du cercle // Calculate the center of the circle
VdMed = rst1rst2.Crossed(np); VdMed = rst1rst2.Crossed(np);
norm2 = rst1rst2.SquareMagnitude(); norm2 = rst1rst2.SquareMagnitude();
Dist = ray * ray - 0.25 * norm2; Dist = ray * ray - 0.25 * norm2;
@ -609,7 +609,7 @@ void BRepBlend_RstRstConstRad::Section(const Standard_Real Param,
Pdeb = 0; //ElCLib::Parameter(C, pts); Pdeb = 0; //ElCLib::Parameter(C, pts);
Pfin = ElCLib::Parameter(C, ptrst2); Pfin = ElCLib::Parameter(C, ptrst2);
// Test des angles negatif et quasi null : Cas Singulier // Test of angles negative and almost null : Special Case
if (Pfin > 1.5 * PI) { if (Pfin > 1.5 * PI) {
np.Reverse(); np.Reverse();
C.SetPosition(gp_Ax2(Center, np, ns)); C.SetPosition(gp_Ax2(Center, np, ns));
@ -646,7 +646,7 @@ Standard_Real BRepBlend_RstRstConstRad::GetSectionSize() const
void BRepBlend_RstRstConstRad::GetMinimalWeight(TColStd_Array1OfReal& Weights) const void BRepBlend_RstRstConstRad::GetMinimalWeight(TColStd_Array1OfReal& Weights) const
{ {
BlendFunc::GetMinimalWeights(mySShape, myTConv, minang, maxang, Weights ); BlendFunc::GetMinimalWeights(mySShape, myTConv, minang, maxang, Weights );
// On suppose que cela ne depend pas du Rayon! // It is supposed that it does not depend on the Radius!
} }
//======================================================================= //=======================================================================
@ -686,7 +686,7 @@ void BRepBlend_RstRstConstRad::GetShape (Standard_Integer& NbPoles,
//======================================================================= //=======================================================================
//function : GetTolerance //function : GetTolerance
//purpose : Determine les Tolerance a utiliser dans les approximations. //purpose : Determine Tolerances to be used in approximations.
//======================================================================= //=======================================================================
void BRepBlend_RstRstConstRad::GetTolerance(const Standard_Real BoundTol, void BRepBlend_RstRstConstRad::GetTolerance(const Standard_Real BoundTol,
@ -759,7 +759,7 @@ void BRepBlend_RstRstConstRad::Section(const Blend_Point& P,
Poles2d(Poles2d.Lower()).SetCoord(pt2d1.X(),pt2d1.Y()); Poles2d(Poles2d.Lower()).SetCoord(pt2d1.X(),pt2d1.Y());
Poles2d(Poles2d.Upper()).SetCoord(pt2d2.X(),pt2d2.Y()); Poles2d(Poles2d.Upper()).SetCoord(pt2d2.X(),pt2d2.Y());
// Cas Linear // Linear case
if (mySShape == BlendFunc_Linear) { if (mySShape == BlendFunc_Linear) {
Poles(low) = ptrst1; Poles(low) = ptrst1;
Poles(upp) = ptrst2; Poles(upp) = ptrst2;
@ -768,11 +768,11 @@ void BRepBlend_RstRstConstRad::Section(const Blend_Point& P,
return; return;
} }
// Calcul du centre du cercle // Calculate the center of the circle
Standard_Boolean IsCenter; Standard_Boolean IsCenter;
IsCenter = CenterCircleRst1Rst2(ptrst1, ptrst2, nplan, Center, NotUsed); IsCenter = CenterCircleRst1Rst2(ptrst1, ptrst2, nplan, Center, NotUsed);
// normales a la section aux points // normals to the section with points
ns = gp_Vec(Center, ptrst1).Normalized(); ns = gp_Vec(Center, ptrst1).Normalized();
ns2 = gp_Vec(Center, ptrst2).Normalized(); ns2 = gp_Vec(Center, ptrst2).Normalized();
@ -873,8 +873,8 @@ Standard_Boolean BRepBlend_RstRstConstRad::Section(const Blend_Point& P,
n2.Normalize(); n2.Normalize();
if (!istgt) { if (!istgt) {
// secmember contient les derivees des parametres sur les courbes // secmember contains derivatives of parameters on curves
// par rapport a t // compared to t
tgrst1 = secmember(1) * d11; tgrst1 = secmember(1) * d11;
tgrst2 = secmember(2) * d21; tgrst2 = secmember(2) * d21;
@ -887,7 +887,7 @@ Standard_Boolean BRepBlend_RstRstConstRad::Section(const Blend_Point& P,
if (Dist > 1.E-07) { if (Dist > 1.E-07) {
gp_Vec d1P1P2CrosNp, dmed; gp_Vec d1P1P2CrosNp, dmed;
d1P1P2CrosNp = d1rst1rst2.Crossed(nplan) + rst1rst2.Crossed(dnplan); d1P1P2CrosNp = d1rst1rst2.Crossed(nplan) + rst1rst2.Crossed(dnplan);
// derivee de la mediatrice // derivative of the perpendicular bisector
dmed = d1P1P2CrosNp - med.Dot(d1P1P2CrosNp) * med; dmed = d1P1P2CrosNp - med.Dot(d1P1P2CrosNp) * med;
dmed /= normmed; dmed /= normmed;
Dist = sqrt(Dist); Dist = sqrt(Dist);
@ -897,26 +897,26 @@ Standard_Boolean BRepBlend_RstRstConstRad::Section(const Blend_Point& P,
dmed.Reverse(); dmed.Reverse();
} }
// on met dans dmed la derivee du coefficient Dist // the derivative of coefficient Dist is located in dmed
dmed.SetLinearForm(Dist, dmed, d1Dist, med); dmed.SetLinearForm(Dist, dmed, d1Dist, med);
d1rst1rst2 *= 0.5; d1rst1rst2 *= 0.5;
// derivee de la Normale a la courbe en P1 // derivative of the Normal to the curve in P1
d1n1 = - (dmed + d1rst1rst2) / ray; d1n1 = - (dmed + d1rst1rst2) / ray;
// derivee de la Normale a la courbe en P2 // derivative of the Normal to the curve in P2
d1n2 = (d1rst1rst2 - dmed) / ray; d1n2 = (d1rst1rst2 - dmed) / ray;
} }
else { else {
d1rst1rst2 *= 0.5; d1rst1rst2 *= 0.5;
// Normale a la courbe en P1 // Normal to the curve in P1
d1n1 = - d1rst1rst2 / ray; d1n1 = - d1rst1rst2 / ray;
// Normale a la courbe en P2 // Normal to the curve in P2
d1n2 = d1rst1rst2 / ray; d1n2 = d1rst1rst2 / ray;
} }
} }
// Les poles 2d // Tops 2d
Poles2d(Poles2d.Lower()).SetCoord(pt2drst1.X(), pt2drst1.Y()); Poles2d(Poles2d.Lower()).SetCoord(pt2drst1.X(), pt2drst1.Y());
Poles2d(Poles2d.Upper()).SetCoord(pt2drst2.X(), pt2drst2.Y()); Poles2d(Poles2d.Upper()).SetCoord(pt2drst2.X(), pt2drst2.Y());
@ -931,7 +931,7 @@ Standard_Boolean BRepBlend_RstRstConstRad::Section(const Blend_Point& P,
DPoles2d(Poles2d.Upper()).SetCoord(a, b); DPoles2d(Poles2d.Upper()).SetCoord(a, b);
} }
// Cas Linear // Linear case
if (mySShape == BlendFunc_Linear) { if (mySShape == BlendFunc_Linear) {
Poles(low) = ptrst1; Poles(low) = ptrst1;
Poles(upp) = ptrst2; Poles(upp) = ptrst2;
@ -946,8 +946,8 @@ Standard_Boolean BRepBlend_RstRstConstRad::Section(const Blend_Point& P,
return (!istgt); return (!istgt);
} }
// Cas du cercle // Case of the circle
// tangente au centre du cercle // tangent to the center of the circle
if (!istgt) { if (!istgt) {
tgct.SetLinearForm(-ray, d1n1, tgrst1); tgct.SetLinearForm(-ray, d1n1, tgrst1);
} }

70
src/BRepBlend/BRepBlend_RstRstEvolRad.cxx
View File

@ -43,39 +43,39 @@ static void FusionneIntervalles(const TColStd_Array1OfReal& I1,
{ {
Standard_Integer ind1=1, ind2=1; Standard_Integer ind1=1, ind2=1;
Standard_Real Epspar = Precision::PConfusion()*0.99; Standard_Real Epspar = Precision::PConfusion()*0.99;
// en suposant que le positionement fonctionne a PConfusion()/2 // supposed that the positioning works with PConfusion()/2
Standard_Real v1, v2; Standard_Real v1, v2;
// Initialisations : les IND1 et IND2 pointent sur le 1er element // Initialisations : IND1 and IND2 point the 1st element
// de chacune des 2 tables a traiter.INDS pointe sur le dernier // of each of 2 tables to be processed. INDS points at the last
// element cree de TABSOR // created element of TABSOR
//--- On remplit TABSOR en parcourant TABLE1 et TABLE2 simultanement --- //--- TABSOR is filled by parsing TABLE1 and TABLE2 simultaneously ---
//------------------ en eliminant les occurrences multiples ------------ //------------------ and removing multiple occurrencies ------------
while ((ind1<=I1.Upper()) && (ind2<=I2.Upper())) { while ((ind1<=I1.Upper()) && (ind2<=I2.Upper())) {
v1 = I1(ind1); v1 = I1(ind1);
v2 = I2(ind2); v2 = I2(ind2);
if (Abs(v1-v2)<= Epspar) { if (Abs(v1-v2)<= Epspar) {
// Ici les elements de I1 et I2 conviennent . // elements of I1 and I2 fit here
Seq.Append((v1+v2)/2); Seq.Append((v1+v2)/2);
ind1++; ind1++;
ind2++; ind2++;
} }
else if (v1 < v2) { else if (v1 < v2) {
// Ici l' element de I1 convient. // element of I1 fits here.
Seq.Append(v1); Seq.Append(v1);
ind1++; ind1++;
} }
else { else {
// Ici l' element de TABLE2 convient. // element of TABLE2 fits here.
Seq.Append(v2); Seq.Append(v2);
ind2++; ind2++;
} }
} }
if (ind1>I1.Upper()) { if (ind1>I1.Upper()) {
//----- Ici I1 est epuise, on complete avec la fin de TABLE2 ------- //----- Here I1 is exhausted, completed using the end of TABLE2 -------
for (; ind2<=I2.Upper(); ind2++) { for (; ind2<=I2.Upper(); ind2++) {
Seq.Append(I2(ind2)); Seq.Append(I2(ind2));
@ -83,7 +83,7 @@ static void FusionneIntervalles(const TColStd_Array1OfReal& I1,
} }
if (ind2>I2.Upper()) { if (ind2>I2.Upper()) {
//----- Ici I2 est epuise, on complete avec la fin de I1 ------- //----- Here I2 is exhausted, completed using the end of I1 -------
for (; ind1<=I1.Upper(); ind1++) { for (; ind1<=I1.Upper(); ind1++) {
Seq.Append(I1(ind1)); Seq.Append(I1(ind1));
@ -291,7 +291,7 @@ Standard_Boolean BRepBlend_RstRstEvolRad::IsSolution(const math_Vector& Sol,
if (Abs(valsol(1)) <= Tol && if (Abs(valsol(1)) <= Tol &&
Abs(valsol(2)) <= Tol ) { Abs(valsol(2)) <= Tol ) {
// Calcul des tangentes // Calculation of tangents
prmrst1 = Sol(1); prmrst1 = Sol(1);
pt2drst1 = rst1->Value(prmrst1); pt2drst1 = rst1->Value(prmrst1);
prmrst2 = Sol(2); prmrst2 = Sol(2);
@ -517,11 +517,11 @@ Blend_DecrochStatus BRepBlend_RstRstEvolRad::Decroch(const math_Vector& Sol,
rstref1->Value(Sol(1)).Coord(u, v); rstref1->Value(Sol(1)).Coord(u, v);
surfref1->D1(u, v,PtTmp1,d1u,d1v); surfref1->D1(u, v,PtTmp1,d1u,d1v);
// Normale a la surface de reference 1 // Normal to the reference surface 1
NRst1 = d1u.Crossed(d1v); NRst1 = d1u.Crossed(d1v);
rstref2->Value(Sol(2)).Coord(u, v); rstref2->Value(Sol(2)).Coord(u, v);
surfref2->D1(u, v, PtTmp2, d1u, d1v); surfref2->D1(u, v, PtTmp2, d1u, d1v);
// Normale a la surface de reference 2 // Normal to the reference surface 2
NRst2 = d1u.Crossed(d1v); NRst2 = d1u.Crossed(d1v);
Standard_Boolean IsCenter; Standard_Boolean IsCenter;
@ -554,7 +554,7 @@ Blend_DecrochStatus BRepBlend_RstRstEvolRad::Decroch(const math_Vector& Sol,
TgRst2.Reverse(); TgRst2.Reverse();
} }
// On retourne les vecteurs // Vectors are returned
if (NRst1InPlane.Dot(TgRst1) > -1.e-10) { if (NRst1InPlane.Dot(TgRst1) > -1.e-10) {
if (NRst2InPlane.Dot(TgRst2) < 1.e-10) { if (NRst2InPlane.Dot(TgRst2) < 1.e-10) {
return Blend_DecrochBoth; return Blend_DecrochBoth;
@ -598,7 +598,7 @@ void BRepBlend_RstRstEvolRad::Set(const BlendFunc_SectionShape TypeSection)
//======================================================================= //=======================================================================
//function : CenterCircleRst1Rst2 //function : CenterCircleRst1Rst2
//purpose : Calculer le centre du cercle passant par les deux points des restrictions //purpose : Calculate the center of circle passing by two points of restrictions
//======================================================================= //=======================================================================
Standard_Boolean BRepBlend_RstRstEvolRad::CenterCircleRst1Rst2(const gp_Pnt& PtRst1, Standard_Boolean BRepBlend_RstRstEvolRad::CenterCircleRst1Rst2(const gp_Pnt& PtRst1,
const gp_Pnt& PtRst2, const gp_Pnt& PtRst2,
@ -608,11 +608,11 @@ Standard_Boolean BRepBlend_RstRstEvolRad::CenterCircleRst1Rst2(const gp_Pnt&
{ {
gp_Vec rst1rst2(PtRst1, PtRst2); gp_Vec rst1rst2(PtRst1, PtRst2);
gp_Vec vdmedNor; //,NRst1; vdmedNor vecteur directeur de la Mediatrice gp_Vec vdmedNor; //,NRst1; vdmedNor vector director of the perpendicular bisector
Standard_Real norm2; Standard_Real norm2;
Standard_Real Dist;// distance entre le milieu de PtRst1,PtRst2 et Center Standard_Real Dist;// distance between the middle of PtRst1,PtRst2 and Center
// Calcul du centre du cercle // Calculate the center of the circle
VdMed = rst1rst2.Crossed(np); VdMed = rst1rst2.Crossed(np);
norm2 = rst1rst2.SquareMagnitude(); norm2 = rst1rst2.SquareMagnitude();
Dist = ray * ray - 0.25 * norm2; Dist = ray * ray - 0.25 * norm2;
@ -678,7 +678,7 @@ void BRepBlend_RstRstEvolRad::Section(const Standard_Real Param,
Pdeb = 0; //ElCLib::Parameter(C, pts); Pdeb = 0; //ElCLib::Parameter(C, pts);
Pfin = ElCLib::Parameter(C, ptrst2); Pfin = ElCLib::Parameter(C, ptrst2);
// Test des angles negatif et quasi null : Cas Singulier // Test negative and quasi null angles: Special case
if (Pfin > 1.5 * PI) { if (Pfin > 1.5 * PI) {
np.Reverse(); np.Reverse();
C.SetPosition(gp_Ax2(Center, np, ns)); C.SetPosition(gp_Ax2(Center, np, ns));
@ -715,7 +715,7 @@ Standard_Real BRepBlend_RstRstEvolRad::GetSectionSize() const
void BRepBlend_RstRstEvolRad::GetMinimalWeight(TColStd_Array1OfReal& Weights) const void BRepBlend_RstRstEvolRad::GetMinimalWeight(TColStd_Array1OfReal& Weights) const
{ {
BlendFunc::GetMinimalWeights(mySShape, myTConv, minang, maxang, Weights ); BlendFunc::GetMinimalWeights(mySShape, myTConv, minang, maxang, Weights );
// On suppose que cela ne depend pas du Rayon! // It is supposed that it does not depend on the Radius!
} }
//======================================================================= //=======================================================================
@ -788,7 +788,7 @@ void BRepBlend_RstRstEvolRad::GetShape (Standard_Integer& NbPoles,
//======================================================================= //=======================================================================
//function : GetTolerance //function : GetTolerance
//purpose : Determine les Tolerance a utiliser dans les approximations. //purpose : Determine the Tolerance to be used in approximations.
//======================================================================= //=======================================================================
void BRepBlend_RstRstEvolRad::GetTolerance(const Standard_Real BoundTol, void BRepBlend_RstRstEvolRad::GetTolerance(const Standard_Real BoundTol,
@ -862,7 +862,7 @@ void BRepBlend_RstRstEvolRad::Section(const Blend_Point& P,
Poles2d(Poles2d.Lower()).SetCoord(pt2d1.X(),pt2d1.Y()); Poles2d(Poles2d.Lower()).SetCoord(pt2d1.X(),pt2d1.Y());
Poles2d(Poles2d.Upper()).SetCoord(pt2d2.X(),pt2d2.Y()); Poles2d(Poles2d.Upper()).SetCoord(pt2d2.X(),pt2d2.Y());
// Cas Linear // Linear Case
if (mySShape == BlendFunc_Linear) { if (mySShape == BlendFunc_Linear) {
Poles(low) = ptrst1; Poles(low) = ptrst1;
Poles(upp) = ptrst2; Poles(upp) = ptrst2;
@ -871,11 +871,11 @@ void BRepBlend_RstRstEvolRad::Section(const Blend_Point& P,
return; return;
} }
// Calcul du centre du cercle // Calculate the center of the circle
Standard_Boolean IsCenter; Standard_Boolean IsCenter;
IsCenter = CenterCircleRst1Rst2(ptrst1, ptrst2, nplan, Center, NotUsed); IsCenter = CenterCircleRst1Rst2(ptrst1, ptrst2, nplan, Center, NotUsed);
// normales a la section aux points // normals to the section with points
n1 = gp_Vec(Center, ptrst1).Normalized(); n1 = gp_Vec(Center, ptrst1).Normalized();
n2 = gp_Vec(Center, ptrst2).Normalized(); n2 = gp_Vec(Center, ptrst2).Normalized();
@ -975,8 +975,8 @@ Standard_Boolean BRepBlend_RstRstEvolRad::Section(const Blend_Point& P,
gp_Vec n1(Center, ptrst1), n2(Center, ptrst2); gp_Vec n1(Center, ptrst1), n2(Center, ptrst2);
if (!istgt) { if (!istgt) {
// secmember contient les derivees des parametres sur les courbes // secmember contains derivatives of parameters on curves
// par rapport a t // corresponding to t
tgrst1 = secmember(1) * d11; tgrst1 = secmember(1) * d11;
tgrst2 = secmember(2) * d21; tgrst2 = secmember(2) * d21;
@ -990,7 +990,7 @@ Standard_Boolean BRepBlend_RstRstEvolRad::Section(const Blend_Point& P,
if (Dist > 1.E-07) { if (Dist > 1.E-07) {
gp_Vec d1P1P2CrosNp, dmed; gp_Vec d1P1P2CrosNp, dmed;
d1P1P2CrosNp = d1rst1rst2.Crossed(nplan) + rst1rst2.Crossed(dnplan); d1P1P2CrosNp = d1rst1rst2.Crossed(nplan) + rst1rst2.Crossed(dnplan);
// derivee de la mediatrice // derivative of the bisector
dmed = d1P1P2CrosNp - med.Dot(d1P1P2CrosNp) * med; dmed = d1P1P2CrosNp - med.Dot(d1P1P2CrosNp) * med;
dmed /= normmed; dmed /= normmed;
Dist = sqrt(Dist); Dist = sqrt(Dist);
@ -1002,13 +1002,13 @@ Standard_Boolean BRepBlend_RstRstEvolRad::Section(const Blend_Point& P,
dmed.Reverse(); dmed.Reverse();
} }
// on met dans dmed la derivee du coefficient Dist // derivative of the coefficient Dist is located in dmed
dmed.SetLinearForm(Dist, dmed, d1Dist, med); dmed.SetLinearForm(Dist, dmed, d1Dist, med);
d1rst1rst2 *= 0.5; d1rst1rst2 *= 0.5;
// derivee de la Normale a la courbe en P1 // derivative of the Normal to the curve in P1
d1n1 = - (d1rst1rst2 + dmed + Invdray * n1) / ray; d1n1 = - (d1rst1rst2 + dmed + Invdray * n1) / ray;
// derivee de la Normale a la courbe en P2 // derivative of the Normal to the curve in P2
d1n2 = (d1rst1rst2 - dmed - Invdray * n2) / ray; d1n2 = (d1rst1rst2 - dmed - Invdray * n2) / ray;
} }
else { else {
@ -1024,7 +1024,7 @@ Standard_Boolean BRepBlend_RstRstEvolRad::Section(const Blend_Point& P,
n1.Normalize(); n1.Normalize();
n2.Normalize(); n2.Normalize();
// Les poles 2d // Tops 2D
Poles2d(Poles2d.Lower()).SetCoord(pt2drst1.X(), pt2drst1.Y()); Poles2d(Poles2d.Lower()).SetCoord(pt2drst1.X(), pt2drst1.Y());
Poles2d(Poles2d.Upper()).SetCoord(pt2drst2.X(), pt2drst2.Y()); Poles2d(Poles2d.Upper()).SetCoord(pt2drst2.X(), pt2drst2.Y());
@ -1039,7 +1039,7 @@ Standard_Boolean BRepBlend_RstRstEvolRad::Section(const Blend_Point& P,
DPoles2d(Poles2d.Upper()).SetCoord(a, b); DPoles2d(Poles2d.Upper()).SetCoord(a, b);
} }
// Cas Linear // Linear Case
if (mySShape == BlendFunc_Linear) { if (mySShape == BlendFunc_Linear) {
Poles(low) = ptrst1; Poles(low) = ptrst1;
Poles(upp) = ptrst2; Poles(upp) = ptrst2;
@ -1054,8 +1054,8 @@ Standard_Boolean BRepBlend_RstRstEvolRad::Section(const Blend_Point& P,
return (!istgt); return (!istgt);
} }
// Cas du cercle // Case of the circle
// tangente au centre du cercle // tangent to the center of the circle
if (!istgt) { if (!istgt) {
tgct.SetLinearForm(-ray, d1n1, -dray, n1, tgrst1); tgct.SetLinearForm(-ray, d1n1, -dray, n1, tgrst1);
} }

198
src/BRepBlend/BRepBlend_RstRstLineBuilder.cxx
View File

@ -31,7 +31,7 @@ static Standard_Integer IndexOfSection = 0;
extern Standard_Boolean Blend_GettraceDRAWSECT(); extern Standard_Boolean Blend_GettraceDRAWSECT();
//----------------------------------------------------- //-----------------------------------------------------
// Pour debug : visualisation de la section // For debug : visualisation of the section
static Standard_Boolean BBPP(const Standard_Real param, static Standard_Boolean BBPP(const Standard_Real param,
Blend_RstRstFunction& Func, Blend_RstRstFunction& Func,
const math_Vector& sol, const math_Vector& sol,
@ -80,27 +80,27 @@ static void tracederiv(Blend_RstRstFunction& Func,
Standard_Real scal = 1./ (param1 - param2); Standard_Real scal = 1./ (param1 - param2);
cout<<endl; cout<<endl;
cout<<"controle des derivees au point : "<<param1<<endl; cout<<"control of derivatives at point : "<<param1<<endl;
for(i = 1; i <= hp; i++){ for(i = 1; i <= hp; i++){
cout<<endl; cout<<endl;
cout<<"point : "<<i<<endl; cout<<"point : "<<i<<endl;
cout<<"dx calcule : "<<TDP1(i).X()<<endl; cout<<"dx calculated : "<<TDP1(i).X()<<endl;
cout<<"dx estime : "<<scal*(TP1(i).X()-TP2(i).X())<<endl; cout<<"dx estimated : "<<scal*(TP1(i).X()-TP2(i).X())<<endl;
cout<<"dy calcule : "<<TDP1(i).Y()<<endl; cout<<"dy calculated : "<<TDP1(i).Y()<<endl;
cout<<"dy estime : "<<scal*(TP1(i).Y()-TP2(i).Y())<<endl; cout<<"dy estimated : "<<scal*(TP1(i).Y()-TP2(i).Y())<<endl;
cout<<"dz calcule : "<<TDP1(i).Z()<<endl; cout<<"dz calculated : "<<TDP1(i).Z()<<endl;
cout<<"dz estime : "<<scal*(TP1(i).Z()-TP2(i).Z())<<endl; cout<<"dz estimated : "<<scal*(TP1(i).Z()-TP2(i).Z())<<endl;
cout<<"dw calcule : "<<TDW1(i)<<endl; cout<<"dw calculated : "<<TDW1(i)<<endl;
cout<<"dw estime : "<<scal*(TW1(i)-TW2(i))<<endl; cout<<"dw estimated : "<<scal*(TW1(i)-TW2(i))<<endl;
} }
for(i = 1; i <= hp2d; i++){ for(i = 1; i <= hp2d; i++){
cout<<endl; cout<<endl;
cout<<"point 2d : "<<i<<endl; cout<<"point 2d : "<<i<<endl;
cout<<"dx calcule : "<<TDP2d1(i).X()<<endl; cout<<"dx calculated : "<<TDP2d1(i).X()<<endl;
cout<<"dx estime : "<<scal*(TP2d1(i).X()-TP2d2(i).X())<<endl; cout<<"dx estimated : "<<scal*(TP2d1(i).X()-TP2d2(i).X())<<endl;
cout<<"dy calcule : "<<TDP2d1(i).Y()<<endl; cout<<"dy calculated : "<<TDP2d1(i).Y()<<endl;
cout<<"dy estime : "<<scal*(TP2d1(i).Y()-TP2d2(i).Y())<<endl; cout<<"dy estimated : "<<scal*(TP2d1(i).Y()-TP2d2(i).Y())<<endl;
} }
} }
@ -159,7 +159,7 @@ BRepBlend_RstRstLineBuilder::BRepBlend_RstRstLineBuilder
//======================================================================= //=======================================================================
//function : Perform //function : Perform
//purpose : lance le processus de cheminement //purpose : launch the processing
//======================================================================= //=======================================================================
void BRepBlend_RstRstLineBuilder::Perform(Blend_RstRstFunction& Func, void BRepBlend_RstRstLineBuilder::Perform(Blend_RstRstFunction& Func,
@ -229,7 +229,7 @@ void BRepBlend_RstRstLineBuilder::Perform(Blend_RstRstFunction& Func,
Drawsect(param, Func); Drawsect(param, Func);
} }
#endif #endif
// Mettre a jour la ligne. // Update the line.
line->Append(previousP); line->Append(previousP);
Standard_Real U, V; Standard_Real U, V;
U = previousP.ParameterOnC1(); U = previousP.ParameterOnC1();
@ -256,7 +256,7 @@ void BRepBlend_RstRstLineBuilder::Perform(Blend_RstRstFunction& Func,
//======================================================================= //=======================================================================
//function : PerformFirstSection //function : PerformFirstSection
//purpose : Creation de la premiere section //purpose : Creation of the first section
//======================================================================= //=======================================================================
Standard_Boolean BRepBlend_RstRstLineBuilder::PerformFirstSection Standard_Boolean BRepBlend_RstRstLineBuilder::PerformFirstSection
@ -340,9 +340,9 @@ Standard_Boolean BRepBlend_RstRstLineBuilder::PerformFirstSection
if (!recadrst1 && !recadp1 && !recadrst2 && !recadp2) return Standard_False; if (!recadrst1 && !recadp1 && !recadrst2 && !recadp2) return Standard_False;
// on regarde si on a decroche ou sorti du domaine 1 // it is checked if the contact was lost or domain 1 was left
if (recadp1 && recadrst1) { if (recadp1 && recadrst1) {
if (sens * (wrst1 - wp1) > tolgui){ //on sort du domaine d abord if (sens * (wrst1 - wp1) > tolgui){ //at first one leaves the domain
wrst1 = wp1; wrst1 = wp1;
trst12 = solinvp1(2); trst12 = solinvp1(2);
trst11 = BRepBlend_BlendTool::Parameter(Vtxp1, rst1); trst11 = BRepBlend_BlendTool::Parameter(Vtxp1, rst1);
@ -350,7 +350,7 @@ Standard_Boolean BRepBlend_RstRstLineBuilder::PerformFirstSection
Vtxrst2 = Vtxp1; Vtxrst2 = Vtxp1;
recadrst1 = Standard_False; recadrst1 = Standard_False;
} }
else { // on a decroche else { // the contact is lost
trst11 = solinvrst1(3); trst11 = solinvrst1(3);
trst12 = solinvrst1(2); trst12 = solinvrst1(2);
recadp1 = Standard_False; recadp1 = Standard_False;
@ -368,9 +368,9 @@ Standard_Boolean BRepBlend_RstRstLineBuilder::PerformFirstSection
trst12 = solinvrst1(2); trst12 = solinvrst1(2);
} }
// on regarde si on a decrocher ou sortie du domaine 2 // it is checked if the contact was lost or domain 2 was left
if (recadp2 && recadrst2) { if (recadp2 && recadrst2) {
if (sens * (wrst2 - wp2) > tolgui) { //on sort du domaine d abord if (sens * (wrst2 - wp2) > tolgui) { //at first one leaves the domain
wrst2 = wp2; wrst2 = wp2;
trst21 = solinvp2(2); trst21 = solinvp2(2);
trst22 = BRepBlend_BlendTool::Parameter(Vtxp2, rst2); trst22 = BRepBlend_BlendTool::Parameter(Vtxp2, rst2);
@ -396,7 +396,7 @@ Standard_Boolean BRepBlend_RstRstLineBuilder::PerformFirstSection
trst21 = solinvrst2(2); trst21 = solinvrst2(2);
} }
// on regarde sur laquelle des courbes on decroche en premier // it is checked on which curve the contact is lost earlier
if (recadrst1 && recadrst2) { if (recadrst1 && recadrst2) {
if (Abs(wrst1 - wrst2) < tolgui) { if (Abs(wrst1 - wrst2) < tolgui) {
State = Blend_OnRst12; State = Blend_OnRst12;
@ -405,14 +405,14 @@ Standard_Boolean BRepBlend_RstRstLineBuilder::PerformFirstSection
sol(2) = trst22; sol(2) = trst22;
} }
else if (sens * (wrst1 - wrst2) < 0) { else if (sens * (wrst1 - wrst2) < 0) {
// on decroche sur Rst1 // contact lost on Rst1
State = Blend_OnRst1; State = Blend_OnRst1;
param = wrst1; param = wrst1;
sol(1) = trst11; sol(1) = trst11;
sol(2) = trst12; sol(2) = trst12;
} }
else { else {
// on decroche sur rst2 // contact lost on rst2
State = Blend_OnRst2; State = Blend_OnRst2;
param = wrst2; param = wrst2;
sol(1) = trst21; sol(1) = trst21;
@ -421,7 +421,7 @@ Standard_Boolean BRepBlend_RstRstLineBuilder::PerformFirstSection
Func.Set(param); Func.Set(param);
} }
else if (recadrst1) { else if (recadrst1) {
// sol sur rst1 // ground on rst1
State = Blend_OnRst1; State = Blend_OnRst1;
param = wrst1; param = wrst1;
sol(1) = trst11; sol(1) = trst11;
@ -429,14 +429,14 @@ Standard_Boolean BRepBlend_RstRstLineBuilder::PerformFirstSection
Func.Set(param); Func.Set(param);
} }
else if (recadrst2) { else if (recadrst2) {
// sol sur rst2 // ground on rst2
State = Blend_OnRst2; State = Blend_OnRst2;
param = wrst2; param = wrst2;
sol(1) = trst21; sol(1) = trst21;
sol(2) = trst22; sol(2) = trst22;
Func.Set(param); Func.Set(param);
} }
// on regarde sur laquelle des courbes on sort en premier // it is checked on which curves one leaves first
else if (recadp1 && recadp2) { else if (recadp1 && recadp2) {
if (Abs(wrst1 - wrst2) < tolgui) { if (Abs(wrst1 - wrst2) < tolgui) {
State = Blend_OnRst12; State = Blend_OnRst12;
@ -445,14 +445,14 @@ Standard_Boolean BRepBlend_RstRstLineBuilder::PerformFirstSection
sol(2) = trst22; sol(2) = trst22;
} }
else if (sens * (wrst1 - wrst2) < 0) { else if (sens * (wrst1 - wrst2) < 0) {
// sol sur Rst1 // sol on Rst1
State = Blend_OnRst1; State = Blend_OnRst1;
param = wrst1; param = wrst1;
sol(1) = trst11; sol(1) = trst11;
sol(2) = trst12; sol(2) = trst12;
} }
else { else {
// sol sur rst2 // ground on rst2
State = Blend_OnRst2; State = Blend_OnRst2;
param = wrst2; param = wrst2;
sol(1) = trst21; sol(1) = trst21;
@ -461,7 +461,7 @@ Standard_Boolean BRepBlend_RstRstLineBuilder::PerformFirstSection
Func.Set(param); Func.Set(param);
} }
else if (recadp1) { else if (recadp1) {
// sol sur rst1 // ground on rst1
State = Blend_OnRst1; State = Blend_OnRst1;
param = wrst1; param = wrst1;
sol(1) = trst11; sol(1) = trst11;
@ -469,7 +469,7 @@ Standard_Boolean BRepBlend_RstRstLineBuilder::PerformFirstSection
Func.Set(param); Func.Set(param);
} }
else if (recadp2) { else if (recadp2) {
// sol sur rst2 // ground on rst2
State = Blend_OnRst2; State = Blend_OnRst2;
param = wrst2; param = wrst2;
sol(1) = trst21; sol(1) = trst21;
@ -515,7 +515,7 @@ Standard_Boolean BRepBlend_RstRstLineBuilder::Complete(Blend_RstRstFunction& F
//======================================================================= //=======================================================================
//function : InternalPerform //function : InternalPerform
//purpose : algorithme de cheminement sauf aux extremites //purpose : algorithm of processing without extremities
//======================================================================= //=======================================================================
void BRepBlend_RstRstLineBuilder::InternalPerform(Blend_RstRstFunction& Func, void BRepBlend_RstRstLineBuilder::InternalPerform(Blend_RstRstFunction& Func,
@ -527,7 +527,7 @@ void BRepBlend_RstRstLineBuilder::InternalPerform(Blend_RstRstFunction& Func,
{ {
Standard_Real stepw = pasmax; Standard_Real stepw = pasmax;
Standard_Integer nbp = line->NbPoints(); Standard_Integer nbp = line->NbPoints();
if(nbp >= 2){ //On reprend le dernier step s il n est pas trop petit. if(nbp >= 2){ //The last step is redone if it is not too small.
if(sens < 0.){ if(sens < 0.){
stepw = (line->Point(2).Parameter() - line->Point(1).Parameter()); stepw = (line->Point(2).Parameter() - line->Point(1).Parameter());
} }
@ -616,7 +616,7 @@ void BRepBlend_RstRstLineBuilder::InternalPerform(Blend_RstRstFunction& Func,
recadp1 = recadp2 = recadrst1 = recadrst2 = Standard_False; recadp1 = recadp2 = recadrst1 = recadrst2 = Standard_False;
echecrecad = Standard_False; echecrecad = Standard_False;
if (situonc1 != TopAbs_IN) { if (situonc1 != TopAbs_IN) {
// pb inverse rst/rst // pb inversion rst/rst
recadp1 = Recadre1(FinvP1, solinvp1, IsVtxp1, Vtxp1); recadp1 = Recadre1(FinvP1, solinvp1, IsVtxp1, Vtxp1);
if (recadp1) { if (recadp1) {
wp1 = solinvp1(1); wp1 = solinvp1(1);
@ -627,7 +627,7 @@ void BRepBlend_RstRstLineBuilder::InternalPerform(Blend_RstRstFunction& Func,
} }
if (situonc2 != TopAbs_IN) { if (situonc2 != TopAbs_IN) {
// pb inverse point/surf // pb inversion point/surf
recadp2 = Recadre2(FinvP2, solinvp2, IsVtxp2, Vtxp2); recadp2 = Recadre2(FinvP2, solinvp2, IsVtxp2, Vtxp2);
if (recadp2) { if (recadp2) {
wp2 = solinvp2(1); wp2 = solinvp2(1);
@ -638,7 +638,7 @@ void BRepBlend_RstRstLineBuilder::InternalPerform(Blend_RstRstFunction& Func,
} }
if (decroch == Blend_DecrochRst1 || decroch == Blend_DecrochBoth) { if (decroch == Blend_DecrochRst1 || decroch == Blend_DecrochBoth) {
// pb inverse rst1/surf1 // pb inversion rst1/surf1
recadrst1 = Recadre1(Func, Finv1, solinvrst1, IsVtxrst1, Vtxrst1); recadrst1 = Recadre1(Func, Finv1, solinvrst1, IsVtxrst1, Vtxrst1);
if (recadrst1) { if (recadrst1) {
wrst1 = solinvrst1(1); wrst1 = solinvrst1(1);
@ -663,9 +663,9 @@ void BRepBlend_RstRstLineBuilder::InternalPerform(Blend_RstRstFunction& Func,
if (recadp1 || recadp2 || recadrst1 || recadrst2) echecrecad = Standard_False; if (recadp1 || recadp2 || recadrst1 || recadrst2) echecrecad = Standard_False;
if (!echecrecad) { if (!echecrecad) {
// on regarde si on a decroche ou sorti du domaine 1 // it is checked if the contact was lost or domain 1 was left
if (recadp1 && recadrst1) { if (recadp1 && recadrst1) {
if (sens * (wrst1 - wp1) > tolgui){ //on sort du domaine d abord if (sens * (wrst1 - wp1) > tolgui){ //first one leaves the domain
wrst1 = wp1; wrst1 = wp1;
trst12 = solinvp1(2); trst12 = solinvp1(2);
trst11 = BRepBlend_BlendTool::Parameter(Vtxp1, rst1); trst11 = BRepBlend_BlendTool::Parameter(Vtxp1, rst1);
@ -673,7 +673,7 @@ void BRepBlend_RstRstLineBuilder::InternalPerform(Blend_RstRstFunction& Func,
Vtxrst2 = Vtxp1; Vtxrst2 = Vtxp1;
recadrst1 = Standard_False; recadrst1 = Standard_False;
} }
else { // on a decroche else { // contact is lost
trst11 = solinvrst1(3); trst11 = solinvrst1(3);
trst12 = solinvrst1(2); trst12 = solinvrst1(2);
recadp1 = Standard_False; recadp1 = Standard_False;
@ -691,9 +691,9 @@ void BRepBlend_RstRstLineBuilder::InternalPerform(Blend_RstRstFunction& Func,
trst12 = solinvrst1(2); trst12 = solinvrst1(2);
} }
// on regarde si on a decrocher ou sortie du domaine 2 // it is checked if the contact was lost or domain 2 was left
if (recadp2 && recadrst2) { if (recadp2 && recadrst2) {
if (sens * (wrst2 - wp2) > tolgui) { //on sort du domaine d abord if (sens * (wrst2 - wp2) > tolgui) { //first one leaves the domain
wrst2 = wp2; wrst2 = wp2;
trst21 = solinvp2(2); trst21 = solinvp2(2);
trst22 = BRepBlend_BlendTool::Parameter(Vtxp2, rst2); trst22 = BRepBlend_BlendTool::Parameter(Vtxp2, rst2);
@ -719,7 +719,7 @@ void BRepBlend_RstRstLineBuilder::InternalPerform(Blend_RstRstFunction& Func,
trst21 = solinvrst2(2); trst21 = solinvrst2(2);
} }
// on regarde sur laquelle des courbes on decroche en premier // it is checked on which curve the contact is lost earlier
if (recadrst1 && recadrst2) { if (recadrst1 && recadrst2) {
if (Abs(wrst1 - wrst2) < tolgui) { if (Abs(wrst1 - wrst2) < tolgui) {
State = Blend_OnRst12; State = Blend_OnRst12;
@ -729,7 +729,7 @@ void BRepBlend_RstRstLineBuilder::InternalPerform(Blend_RstRstFunction& Func,
sol(2) = trst22; sol(2) = trst22;
} }
else if (sens * (wrst1 - wrst2) < 0) { else if (sens * (wrst1 - wrst2) < 0) {
// on decroche sur Rst1 // contact is lost on Rst1
State = Blend_OnRst1; State = Blend_OnRst1;
decroch = Blend_DecrochRst1; decroch = Blend_DecrochRst1;
param = wrst1; param = wrst1;
@ -737,7 +737,7 @@ void BRepBlend_RstRstLineBuilder::InternalPerform(Blend_RstRstFunction& Func,
sol(2) = trst12; sol(2) = trst12;
} }
else { else {
// on decroche sur rst2 // contact is lost on rst2
State = Blend_OnRst2; State = Blend_OnRst2;
decroch = Blend_DecrochRst2; decroch = Blend_DecrochRst2;
param = wrst2; param = wrst2;
@ -747,7 +747,7 @@ void BRepBlend_RstRstLineBuilder::InternalPerform(Blend_RstRstFunction& Func,
Func.Set(param); Func.Set(param);
} }
else if (recadrst1) { else if (recadrst1) {
// sol sur rst1 // ground on rst1
State = Blend_OnRst1; State = Blend_OnRst1;
decroch = Blend_DecrochRst1; decroch = Blend_DecrochRst1;
param = wrst1; param = wrst1;
@ -756,7 +756,7 @@ void BRepBlend_RstRstLineBuilder::InternalPerform(Blend_RstRstFunction& Func,
Func.Set(param); Func.Set(param);
} }
else if (recadrst2) { else if (recadrst2) {
// sol sur rst2 // ground on rst2
State = Blend_OnRst2; State = Blend_OnRst2;
decroch = Blend_DecrochRst2; decroch = Blend_DecrochRst2;
param = wrst2; param = wrst2;
@ -764,7 +764,7 @@ void BRepBlend_RstRstLineBuilder::InternalPerform(Blend_RstRstFunction& Func,
sol(2) = trst22; sol(2) = trst22;
Func.Set(param); Func.Set(param);
} }
// on regarde sur laquelle des courbes on sort en premier // it is checked on which curve the contact is lost earlier
else if (recadp1 && recadp2) { else if (recadp1 && recadp2) {
if (Abs(wrst1 - wrst2) < tolgui) { if (Abs(wrst1 - wrst2) < tolgui) {
State = Blend_OnRst12; State = Blend_OnRst12;
@ -773,14 +773,14 @@ void BRepBlend_RstRstLineBuilder::InternalPerform(Blend_RstRstFunction& Func,
sol(2) = trst22; sol(2) = trst22;
} }
else if (sens * (wrst1 - wrst2) < 0) { else if (sens * (wrst1 - wrst2) < 0) {
// sol sur Rst1 // ground on Rst1
State = Blend_OnRst1; State = Blend_OnRst1;
param = wrst1; param = wrst1;
sol(1) = trst11; sol(1) = trst11;
sol(2) = trst12; sol(2) = trst12;
} }
else { else {
// sol sur rst2 // ground on rst2
State = Blend_OnRst2; State = Blend_OnRst2;
param = wrst2; param = wrst2;
sol(1) = trst21; sol(1) = trst21;
@ -789,7 +789,7 @@ void BRepBlend_RstRstLineBuilder::InternalPerform(Blend_RstRstFunction& Func,
Func.Set(param); Func.Set(param);
} }
else if (recadp1) { else if (recadp1) {
// sol sur rst1 // ground on rst1
State = Blend_OnRst1; State = Blend_OnRst1;
param = wrst1; param = wrst1;
sol(1) = trst11; sol(1) = trst11;
@ -797,7 +797,7 @@ void BRepBlend_RstRstLineBuilder::InternalPerform(Blend_RstRstFunction& Func,
Func.Set(param); Func.Set(param);
} }
else if (recadp2) { else if (recadp2) {
// sol sur rst2 // ground on rst2
State = Blend_OnRst2; State = Blend_OnRst2;
param = wrst2; param = wrst2;
sol(1) = trst21; sol(1) = trst21;
@ -811,8 +811,8 @@ void BRepBlend_RstRstLineBuilder::InternalPerform(Blend_RstRstFunction& Func,
State = TestArret(Func, Standard_True, State); State = TestArret(Func, Standard_True, State);
} }
else{ else{
// echec recadrage. On sort avec PointsConfondus // reframing failed. Leave with PointsConfondus
cout<<"echec recadrage"<<endl; cout<<"reframing failed"<<endl;
State = Blend_SamePoints; State = Blend_SamePoints;
} }
} }
@ -825,7 +825,7 @@ void BRepBlend_RstRstLineBuilder::InternalPerform(Blend_RstRstFunction& Func,
Drawsect(param, Func); Drawsect(param, Func);
} }
#endif #endif
// Mettre a jour la ligne. // Update the line.
if (sens > 0.) { if (sens > 0.) {
line->Append(previousP); line->Append(previousP);
} }
@ -841,7 +841,7 @@ void BRepBlend_RstRstLineBuilder::InternalPerform(Blend_RstRstFunction& Func,
previousP.ParameterOnC1(), previousP.ParameterOnC1(),
previousP.Parameter(), tolesp); previousP.Parameter(), tolesp);
MakeExtremity(Extrst2, Standard_False, rst2, sol(2), IsVtxrst2, Vtxrst2); MakeExtremity(Extrst2, Standard_False, rst2, sol(2), IsVtxrst2, Vtxrst2);
// Indiquer que fin sur Bound. // Show that end is on Bound.
} }
else { else {
param = param + sens * stepw; param = param + sens * stepw;
@ -864,12 +864,12 @@ void BRepBlend_RstRstLineBuilder::InternalPerform(Blend_RstRstFunction& Func,
previousP.Parameter(), tolesp); previousP.Parameter(), tolesp);
Arrive = Standard_True; Arrive = Standard_True;
if (line->NbPoints()>=2) { if (line->NbPoints()>=2) {
// Indiquer qu on s arrete en cours de cheminement // Show that there is a stop during processing
cout<<"On n avance plus dans le cheminement"<<endl; cout<<"No more advancement in the processing"<<endl;
} }
} }
else { else {
param = parprec + sens * stepw; // on ne risque pas de depasser Bound. param = parprec + sens * stepw; // there is no risk to exceed Bound.
} }
} }
break; break;
@ -881,7 +881,7 @@ void BRepBlend_RstRstLineBuilder::InternalPerform(Blend_RstRstFunction& Func,
Drawsect(param,Func); Drawsect(param,Func);
} }
#endif #endif
// Mettre a jour la ligne. // Update the line.
if (sens > 0.) { if (sens > 0.) {
line->Append(previousP); line->Append(previousP);
} }
@ -898,7 +898,7 @@ void BRepBlend_RstRstLineBuilder::InternalPerform(Blend_RstRstFunction& Func,
previousP.ParameterOnC1(), previousP.ParameterOnC1(),
previousP.Parameter(), tolesp); previousP.Parameter(), tolesp);
MakeExtremity(Extrst2, Standard_False, rst2, sol(2), IsVtxrst2, Vtxrst2); MakeExtremity(Extrst2, Standard_False, rst2, sol(2), IsVtxrst2, Vtxrst2);
// Indiquer que fin sur Bound. // Indicate that end is on Bound.
} }
else { else {
param = param + sens * stepw; param = param + sens * stepw;
@ -970,8 +970,8 @@ void BRepBlend_RstRstLineBuilder::InternalPerform(Blend_RstRstFunction& Func,
case Blend_SamePoints : case Blend_SamePoints :
{ {
// On arrete // Stop
cout << " Points confondus dans le cheminement" << endl; cout << " Mixed points in the processing" << endl;
Extrst1.SetValue(previousP.PointOnC1(), Extrst1.SetValue(previousP.PointOnC1(),
previousP.ParameterOnC1(), previousP.ParameterOnC1(),
previousP.Parameter(), tolesp); previousP.Parameter(), tolesp);
@ -1002,7 +1002,7 @@ void BRepBlend_RstRstLineBuilder::InternalPerform(Blend_RstRstFunction& Func,
//======================================================================= //=======================================================================
//function : Recadre1 //function : Recadre1
//purpose : On a decroche en 1 //purpose : Contact lost on 1
//======================================================================= //=======================================================================
Standard_Boolean BRepBlend_RstRstLineBuilder::Recadre1(Blend_RstRstFunction& Func, Standard_Boolean BRepBlend_RstRstLineBuilder::Recadre1(Blend_RstRstFunction& Func,
@ -1018,7 +1018,7 @@ Standard_Boolean BRepBlend_RstRstLineBuilder::Recadre1(Blend_RstRstFunction&
Solinv(2) = sol(2); Solinv(2) = sol(2);
Solinv(3) = sol(1); Solinv(3) = sol(1);
// On recherche le point de non decrochement // The point where contact is not lost is found
math_FunctionSetRoot rsnld(Finv, toler, 30); math_FunctionSetRoot rsnld(Finv, toler, 30);
rsnld.Perform(Finv, Solinv, infb, supb); rsnld.Perform(Finv, Solinv, infb, supb);
if (!rsnld.IsDone()) { if (!rsnld.IsDone()) {
@ -1028,8 +1028,8 @@ Standard_Boolean BRepBlend_RstRstLineBuilder::Recadre1(Blend_RstRstFunction&
rsnld.Root(Solinv); rsnld.Root(Solinv);
// On doit verifier la valeur de la fonction est bien // It is necessary to check if the function value meets the
// sur la seconde restriction // second restriction
if (Finv.IsSolution(Solinv, tolesp)) { if (Finv.IsSolution(Solinv, tolesp)) {
Standard_Real w = Solinv(2); Standard_Real w = Solinv(2);
if(w < rst2->FirstParameter() - toler(2)|| if(w < rst2->FirstParameter() - toler(2)||
@ -1037,7 +1037,7 @@ Standard_Boolean BRepBlend_RstRstLineBuilder::Recadre1(Blend_RstRstFunction&
return Standard_False; return Standard_False;
} }
// on regarde si on n est pas sur un Vertex // it is checked if it is on a Vertex
domain1->Initialize(rst1); domain1->Initialize(rst1);
domain1->InitVertexIterator(); domain1->InitVertexIterator();
IsVtx = !domain1->MoreVertex(); IsVtx = !domain1->MoreVertex();
@ -1055,8 +1055,8 @@ Standard_Boolean BRepBlend_RstRstLineBuilder::Recadre1(Blend_RstRstFunction&
if (!domain1->MoreVertex()) { if (!domain1->MoreVertex()) {
IsVtx = Standard_False; IsVtx = Standard_False;
} }
// On recalcule la section par resolution directe, sinon, on se recupere // The section is recalculated by direct solution, otherwise return
// des incoherences entre le parametre et sol dues au baillement. // incoherences between the parameter and the ground caused by yawn.
math_Vector infbound(1, 2), supbound(1, 2); math_Vector infbound(1, 2), supbound(1, 2);
math_Vector parinit(1, 2), tolerance(1, 2); math_Vector parinit(1, 2), tolerance(1, 2);
@ -1083,7 +1083,7 @@ Standard_Boolean BRepBlend_RstRstLineBuilder::Recadre1(Blend_RstRstFunction&
//======================================================================= //=======================================================================
//function : Recadre2 //function : Recadre2
//purpose : On a decroche sur Rst2 //purpose : Contact lost on Rst2
//======================================================================= //=======================================================================
Standard_Boolean BRepBlend_RstRstLineBuilder::Recadre2(Blend_RstRstFunction& Func, Standard_Boolean BRepBlend_RstRstLineBuilder::Recadre2(Blend_RstRstFunction& Func,
@ -1108,7 +1108,7 @@ Standard_Boolean BRepBlend_RstRstLineBuilder::Recadre2(Blend_RstRstFunction&
rsnld.Root(Solinv); rsnld.Root(Solinv);
// On doit verifier la valeur de la fonction // It is necessary to check the value of the function
if (Finv.IsSolution(Solinv, tolesp)) { if (Finv.IsSolution(Solinv, tolesp)) {
Standard_Real w = Solinv(2); Standard_Real w = Solinv(2);
if(w < rst1->FirstParameter() - toler(2)|| if(w < rst1->FirstParameter() - toler(2)||
@ -1133,9 +1133,9 @@ Standard_Boolean BRepBlend_RstRstLineBuilder::Recadre2(Blend_RstRstFunction&
if (!domain2->MoreVertex()) { if (!domain2->MoreVertex()) {
IsVtx = Standard_False; IsVtx = Standard_False;
} }
// On recalcule la section par resolution directe, sinon, on se recupere // The section is recalculated by direct solution, otherwise return
// des incoherences entre le parametre et sol dues au baillement. // incoherences between the parameter and the ground caused by yawn.
math_Vector infbound(1, 2), supbound(1, 2); math_Vector infbound(1, 2), supbound(1, 2);
math_Vector parinit(1,2), tolerance(1,2); math_Vector parinit(1,2), tolerance(1,2);
Func.GetTolerance(tolerance, tolesp); Func.GetTolerance(tolerance, tolesp);
@ -1157,7 +1157,7 @@ Standard_Boolean BRepBlend_RstRstLineBuilder::Recadre2(Blend_RstRstFunction&
//======================================================================= //=======================================================================
//function : Recadre //function : Recadre
//purpose : On est en fin de la courbe rst1 //purpose : This is the end of curve rst1
//======================================================================= //=======================================================================
Standard_Boolean BRepBlend_RstRstLineBuilder::Recadre1(Blend_CurvPointFuncInv& FinvP, Standard_Boolean BRepBlend_RstRstLineBuilder::Recadre1(Blend_CurvPointFuncInv& FinvP,
@ -1165,8 +1165,8 @@ Standard_Boolean BRepBlend_RstRstLineBuilder::Recadre1(Blend_CurvPointFuncInv&
Standard_Boolean& IsVtx, Standard_Boolean& IsVtx,
Handle(Adaptor3d_HVertex)& Vtx) Handle(Adaptor3d_HVertex)& Vtx)
{ {
// On se place sur le dernier ou le premier point, suivant le // One is located on the last or the first point, following the
// sens de cheminement. // direction of processing.
gp_Pnt2d p2drst1; gp_Pnt2d p2drst1;
Standard_Real firstrst1 = rst1->FirstParameter(); Standard_Real firstrst1 = rst1->FirstParameter();
Standard_Real lastrst1 = rst1->LastParameter(); Standard_Real lastrst1 = rst1->LastParameter();
@ -1223,7 +1223,7 @@ Standard_Boolean BRepBlend_RstRstLineBuilder::Recadre1(Blend_CurvPointFuncInv&
//======================================================================= //=======================================================================
//function : Recadre2 //function : Recadre2
//purpose : On est en fin de la courbe rst2 //purpose : This is the end of curve rst2
//======================================================================= //=======================================================================
Standard_Boolean BRepBlend_RstRstLineBuilder::Recadre2(Blend_CurvPointFuncInv& FinvP, Standard_Boolean BRepBlend_RstRstLineBuilder::Recadre2(Blend_CurvPointFuncInv& FinvP,
@ -1231,8 +1231,8 @@ Standard_Boolean BRepBlend_RstRstLineBuilder::Recadre2(Blend_CurvPointFuncInv&
Standard_Boolean& IsVtx, Standard_Boolean& IsVtx,
Handle(Adaptor3d_HVertex)& Vtx) Handle(Adaptor3d_HVertex)& Vtx)
{ {
// On se place sur le dernier ou le premier point, suivant le // One is located on the last or the first point, following the
// sens de cheminement. // direction of processing.
gp_Pnt2d p2drst2; gp_Pnt2d p2drst2;
Standard_Real firstrst2 = rst2->FirstParameter(); Standard_Real firstrst2 = rst2->FirstParameter();
Standard_Real lastrst2 = rst2->LastParameter(); Standard_Real lastrst2 = rst2->LastParameter();
@ -1337,7 +1337,7 @@ void BRepBlend_RstRstLineBuilder::Transition(const Standard_Boolean OnF
//======================================================================= //=======================================================================
//function : MakeExtremity //function : MakeExtremity
//purpose : fabrique l extremite d une courbe //purpose : produce the extremity of a curve
//======================================================================= //=======================================================================
void BRepBlend_RstRstLineBuilder::MakeExtremity(BRepBlend_Extremity& Extrem, void BRepBlend_RstRstLineBuilder::MakeExtremity(BRepBlend_Extremity& Extrem,
@ -1408,9 +1408,9 @@ void BRepBlend_RstRstLineBuilder::MakeExtremity(BRepBlend_Extremity&
Blend_Status BRepBlend_RstRstLineBuilder::CheckDeflectionOnRst1(const Blend_Point& CurPoint) Blend_Status BRepBlend_RstRstLineBuilder::CheckDeflectionOnRst1(const Blend_Point& CurPoint)
{ {
//Controles 3d du Blend_CSWalking. //Controls 3d of Blend_CSWalking.
// regle par tests dans U4 correspond a 11.478 d // rule by tests in U4 corresponds to 11.478
const Standard_Real CosRef3D = 0.98; const Standard_Real CosRef3D = 0.98;
Standard_Real Cosi, Cosi2; Standard_Real Cosi, Cosi2;
Standard_Boolean curpointistangent = CurPoint.IsTangencyPoint(); Standard_Boolean curpointistangent = CurPoint.IsTangencyPoint();
@ -1438,7 +1438,7 @@ Blend_Status BRepBlend_RstRstLineBuilder::CheckDeflectionOnRst1(const Blend_Poin
if (!prevpointistangent) prevNorme = prevTg.SquareMagnitude(); if (!prevpointistangent) prevNorme = prevTg.SquareMagnitude();
if (Norme <= tolesp * tolesp) { if (Norme <= tolesp * tolesp) {
// il faudra peut etre forcer meme point // it can be necessary to force the same point
return Blend_SamePoints; return Blend_SamePoints;
} }
if(!prevpointistangent){ if(!prevpointistangent){
@ -1446,7 +1446,7 @@ Blend_Status BRepBlend_RstRstLineBuilder::CheckDeflectionOnRst1(const Blend_Poin
return Blend_SamePoints; return Blend_SamePoints;
} }
Cosi = sens * Corde * prevTg; Cosi = sens * Corde * prevTg;
if (Cosi < 0.) { // angle 3d>pi/2. --> retour arriere if (Cosi < 0.) { // angle 3d>pi/2. --> return back
return Blend_Backward; return Blend_Backward;
} }
@ -1457,7 +1457,7 @@ Blend_Status BRepBlend_RstRstLineBuilder::CheckDeflectionOnRst1(const Blend_Poin
} }
if(!curpointistangent){ if(!curpointistangent){
// Voir s il faut faire le controle sur le signe de prevtg*Tgsurf // Check if it is necessary to control the sign of prevtg*Tgsurf
Cosi = sens * Corde * Tgsurf; Cosi = sens * Corde * Tgsurf;
Cosi2 = Cosi * Cosi / Tgsurf.SquareMagnitude() / Norme; Cosi2 = Cosi * Cosi / Tgsurf.SquareMagnitude() / Norme;
if (Cosi2 < CosRef3D || Cosi < 0.) { if (Cosi2 < CosRef3D || Cosi < 0.) {
@ -1466,7 +1466,7 @@ Blend_Status BRepBlend_RstRstLineBuilder::CheckDeflectionOnRst1(const Blend_Poin
} }
if (!curpointistangent && !prevpointistangent) { if (!curpointistangent && !prevpointistangent) {
// Estimation de la fleche courante // Estimation of the current arrow
Standard_Real FlecheCourante = Standard_Real FlecheCourante =
(prevTg.Normalized().XYZ() - Tgsurf.Normalized().XYZ()).SquareModulus() * Norme / 64.; (prevTg.Normalized().XYZ() - Tgsurf.Normalized().XYZ()).SquareModulus() * Norme / 64.;
@ -1474,7 +1474,7 @@ Blend_Status BRepBlend_RstRstLineBuilder::CheckDeflectionOnRst1(const Blend_Poin
return Blend_StepTooSmall; return Blend_StepTooSmall;
} }
if (FlecheCourante > fleche * fleche) { if (FlecheCourante > fleche * fleche) {
// pas trop grand : commentaire interessant // not too great
return Blend_StepTooLarge; return Blend_StepTooLarge;
} }
} }
@ -1489,9 +1489,9 @@ Blend_Status BRepBlend_RstRstLineBuilder::CheckDeflectionOnRst1(const Blend_Poin
Blend_Status BRepBlend_RstRstLineBuilder::CheckDeflectionOnRst2(const Blend_Point& CurPoint) Blend_Status BRepBlend_RstRstLineBuilder::CheckDeflectionOnRst2(const Blend_Point& CurPoint)
{ {
//Controles 3d du Blend_CSWalking. //3D Controls of Blend_CSWalking.
// regle par tests dans U4 correspond a 11.478 d // rule by tests in U4 corresponding to 11.478 d
const Standard_Real CosRef3D = 0.98; const Standard_Real CosRef3D = 0.98;
Standard_Real Cosi, Cosi2; Standard_Real Cosi, Cosi2;
Standard_Boolean curpointistangent = CurPoint.IsTangencyPoint(); Standard_Boolean curpointistangent = CurPoint.IsTangencyPoint();
@ -1520,7 +1520,7 @@ Blend_Status BRepBlend_RstRstLineBuilder::CheckDeflectionOnRst2(const Blend_Poin
if (!prevpointistangent) prevNorme = prevTg.SquareMagnitude(); if (!prevpointistangent) prevNorme = prevTg.SquareMagnitude();
if (Norme <= tolesp * tolesp){ if (Norme <= tolesp * tolesp){
// il faudra peut etre forcer meme point // it can be necessary to force the same point
return Blend_SamePoints; return Blend_SamePoints;
} }
if (!prevpointistangent) { if (!prevpointistangent) {
@ -1528,7 +1528,7 @@ Blend_Status BRepBlend_RstRstLineBuilder::CheckDeflectionOnRst2(const Blend_Poin
return Blend_SamePoints; return Blend_SamePoints;
} }
Cosi = sens * Corde * prevTg; Cosi = sens * Corde * prevTg;
if (Cosi < 0.) { // angle 3d>pi/2. --> retour arriere if (Cosi < 0.) { // angle 3d>pi/2. --> return back
return Blend_Backward; return Blend_Backward;
} }
@ -1539,7 +1539,7 @@ Blend_Status BRepBlend_RstRstLineBuilder::CheckDeflectionOnRst2(const Blend_Poin
} }
if (!curpointistangent) { if (!curpointistangent) {
// Voir s il faut faire le controle sur le signe de prevtg*Tgsurf // Check if it is necessary to control the sign of prevtg*Tgsurf
Cosi = sens * Corde * Tgsurf; Cosi = sens * Corde * Tgsurf;
Cosi2 = Cosi * Cosi / Tgsurf.SquareMagnitude() / Norme; Cosi2 = Cosi * Cosi / Tgsurf.SquareMagnitude() / Norme;
if (Cosi2 < CosRef3D || Cosi < 0.) { if (Cosi2 < CosRef3D || Cosi < 0.) {
@ -1548,7 +1548,7 @@ Blend_Status BRepBlend_RstRstLineBuilder::CheckDeflectionOnRst2(const Blend_Poin
} }
if(!curpointistangent && !prevpointistangent){ if(!curpointistangent && !prevpointistangent){
// Estimation de la fleche courante // Estimation of the current arrow
Standard_Real FlecheCourante = Standard_Real FlecheCourante =
(prevTg.Normalized().XYZ() - Tgsurf.Normalized().XYZ()).SquareModulus() * Norme/64.; (prevTg.Normalized().XYZ() - Tgsurf.Normalized().XYZ()).SquareModulus() * Norme/64.;
@ -1556,7 +1556,7 @@ Blend_Status BRepBlend_RstRstLineBuilder::CheckDeflectionOnRst2(const Blend_Poin
return Blend_StepTooSmall; return Blend_StepTooSmall;
} }
if (FlecheCourante > fleche * fleche) { if (FlecheCourante > fleche * fleche) {
// pas trop grand : commentaire interessant // not too great
return Blend_StepTooLarge; return Blend_StepTooLarge;
} }
} }
@ -1700,7 +1700,7 @@ Standard_Boolean BRepBlend_RstRstLineBuilder::CheckInside(Blend_RstRstFunction&
math_Vector tolerance(1, 2); math_Vector tolerance(1, 2);
Func.GetTolerance(tolerance, tolesp); Func.GetTolerance(tolerance, tolesp);
//cote pcurve 1. //face pcurve 1.
Standard_Real v = sol(1); Standard_Real v = sol(1);
if(v < rst1->FirstParameter() - tolerance(2)|| if(v < rst1->FirstParameter() - tolerance(2)||
v > rst1->LastParameter() + tolerance(2)){ v > rst1->LastParameter() + tolerance(2)){
@ -1712,7 +1712,7 @@ Standard_Boolean BRepBlend_RstRstLineBuilder::CheckInside(Blend_RstRstFunction&
} }
else SituOnC1 = TopAbs_ON; else SituOnC1 = TopAbs_ON;
//cote pcurve 2. //face pcurve 2.
v = sol(2); v = sol(2);
if(v < rst2->FirstParameter() - tolerance(2)|| if(v < rst2->FirstParameter() - tolerance(2)||
v > rst2->LastParameter() + tolerance(2)){ v > rst2->LastParameter() + tolerance(2)){
@ -1725,7 +1725,7 @@ Standard_Boolean BRepBlend_RstRstLineBuilder::CheckInside(Blend_RstRstFunction&
else SituOnC2 = TopAbs_ON; else SituOnC2 = TopAbs_ON;
//decrochage //lost contact
gp_Vec tgrst1, norst1, tgrst2, norst2; gp_Vec tgrst1, norst1, tgrst2, norst2;
Decroch = Func.Decroch(sol,tgrst1, norst1, tgrst2, norst2); Decroch = Func.Decroch(sol,tgrst1, norst1, tgrst2, norst2);

48
src/BRepBlend/BRepBlend_SurfRstConstRad.cxx
View File

@ -132,7 +132,7 @@ Standard_Boolean BRepBlend_SurfRstConstRad::Derivatives(const math_Vector& X,
vref.Divide(norm); vref.Divide(norm);
vref.SetLinearForm(ray,vref,gp_Vec(ptrst,pts)); vref.SetLinearForm(ray,vref,gp_Vec(ptrst,pts));
// Derivee par rapport a u1 // Derivative by u1
temp = d2u1.Crossed(d1v1).Added(d1u1.Crossed(d2uv1)); temp = d2u1.Crossed(d1v1).Added(d1u1.Crossed(d2uv1));
grosterme = ncrossns.Dot(nplan.Crossed(temp))/norm/norm; grosterme = ncrossns.Dot(nplan.Crossed(temp))/norm/norm;
resul.SetLinearForm(-ray/norm*(grosterme*ndotns-nplan.Dot(temp)),nplan, resul.SetLinearForm(-ray/norm*(grosterme*ndotns-nplan.Dot(temp)),nplan,
@ -144,7 +144,7 @@ Standard_Boolean BRepBlend_SurfRstConstRad::Derivatives(const math_Vector& X,
D(3,1) = D(3,1) * 2.; D(3,1) = D(3,1) * 2.;
// Derivee par rapport a v1 // Derivative by v1
temp = d2uv1.Crossed(d1v1).Added(d1u1.Crossed(d2v1)); temp = d2uv1.Crossed(d1v1).Added(d1u1.Crossed(d2v1));
grosterme = ncrossns.Dot(nplan.Crossed(temp))/norm/norm; grosterme = ncrossns.Dot(nplan.Crossed(temp))/norm/norm;
resul.SetLinearForm(-ray/norm*(grosterme*ndotns-nplan.Dot(temp)),nplan, resul.SetLinearForm(-ray/norm*(grosterme*ndotns-nplan.Dot(temp)),nplan,
@ -201,9 +201,9 @@ Standard_Boolean BRepBlend_SurfRstConstRad::Values(const math_Vector& X,
temp = vref/ray; temp = vref/ray;
// F(3) = vref.SquareMagnitude() - ray*ray; // F(3) = vref.SquareMagnitude() - ray*ray;
F(3) = (temp.SquareMagnitude() - 1)*ray*ray; // plus stable numeriquement F(3) = (temp.SquareMagnitude() - 1)*ray*ray; // more stable numerically
// Derivee par rapport a u1 // Derivative by u1
temp = d2u1.Crossed(d1v1).Added(d1u1.Crossed(d2uv1)); temp = d2u1.Crossed(d1v1).Added(d1u1.Crossed(d2uv1));
grosterme = ncrossns.Dot(nplan.Crossed(temp))/norm/norm; grosterme = ncrossns.Dot(nplan.Crossed(temp))/norm/norm;
resul.SetLinearForm(-ray/norm*(grosterme*ndotns-nplan.Dot(temp)),nplan, resul.SetLinearForm(-ray/norm*(grosterme*ndotns-nplan.Dot(temp)),nplan,
@ -216,7 +216,7 @@ Standard_Boolean BRepBlend_SurfRstConstRad::Values(const math_Vector& X,
// Derivee par rapport a v1 // Derivative by v1
temp = d2uv1.Crossed(d1v1).Added(d1u1.Crossed(d2v1)); temp = d2uv1.Crossed(d1v1).Added(d1u1.Crossed(d2v1));
grosterme = ncrossns.Dot(nplan.Crossed(temp))/norm/norm; grosterme = ncrossns.Dot(nplan.Crossed(temp))/norm/norm;
resul.SetLinearForm(-ray/norm*(grosterme*ndotns-nplan.Dot(temp)),nplan, resul.SetLinearForm(-ray/norm*(grosterme*ndotns-nplan.Dot(temp)),nplan,
@ -339,7 +339,7 @@ Standard_Boolean BRepBlend_SurfRstConstRad::IsSolution(const math_Vector& Sol,
Abs(valsol(2)) <= Tol && Abs(valsol(2)) <= Tol &&
Abs(valsol(3)) <= 2*Tol*Abs(ray) ) { Abs(valsol(3)) <= 2*Tol*Abs(ray) ) {
// Calcul des tangentes // Calculation of tangents
pt2ds = gp_Pnt2d(Sol(1),Sol(2)); pt2ds = gp_Pnt2d(Sol(1),Sol(2));
prmrst = Sol(3); prmrst = Sol(3);
@ -395,14 +395,14 @@ Standard_Boolean BRepBlend_SurfRstConstRad::IsSolution(const math_Vector& Sol,
tg2drst.SetCoord(a,b); tg2drst.SetCoord(a,b);
} }
// mise a jour de maxang // update of maxang
if(ray>0.) ns.Reverse(); if(ray>0.) ns.Reverse();
ns2 = -resul.Normalized(); ns2 = -resul.Normalized();
Cosa = ns.Dot(ns2); Cosa = ns.Dot(ns2);
Sina = nplan.Dot(ns.Crossed(ns2)); Sina = nplan.Dot(ns.Crossed(ns2));
if (choix%2 != 0) { if (choix%2 != 0) {
Sina = -Sina; //nplan est change en -nplan Sina = -Sina; //nplan is changed to -nplan
} }
Angle = ACos(Cosa); Angle = ACos(Cosa);
@ -578,7 +578,7 @@ Standard_Boolean BRepBlend_SurfRstConstRad::Decroch(const math_Vector& Sol,
Standard_Real dot, NT = NRstInPlane.Magnitude(); Standard_Real dot, NT = NRstInPlane.Magnitude();
NT *= TgRst.Magnitude(); NT *= TgRst.Magnitude();
if (Abs(NT) < 1.e-7) { if (Abs(NT) < 1.e-7) {
return Standard_False; // Singularite ou Incoherence. return Standard_False; // Singularity or Incoherence.
} }
dot = NRstInPlane.Dot(TgRst); dot = NRstInPlane.Dot(TgRst);
dot /= NT; dot /= NT;
@ -663,7 +663,7 @@ void BRepBlend_SurfRstConstRad::Section(const Standard_Real Param,
Pdeb = 0; //ElCLib::Parameter(C,pts); Pdeb = 0; //ElCLib::Parameter(C,pts);
Pfin = ElCLib::Parameter(C,ptrst); Pfin = ElCLib::Parameter(C,ptrst);
// Test des angles negatif et quasi null : Cas Singulier // Test negative and almost null angles : Special case
if (Pfin>1.5*PI) { if (Pfin>1.5*PI) {
np.Reverse(); np.Reverse();
C.SetPosition(gp_Ax2(Center,np,ns)); C.SetPosition(gp_Ax2(Center,np,ns));
@ -700,7 +700,7 @@ Standard_Real BRepBlend_SurfRstConstRad::GetSectionSize() const
void BRepBlend_SurfRstConstRad::GetMinimalWeight(TColStd_Array1OfReal& Weights) const void BRepBlend_SurfRstConstRad::GetMinimalWeight(TColStd_Array1OfReal& Weights) const
{ {
BlendFunc::GetMinimalWeights(mySShape, myTConv, minang, maxang, Weights ); BlendFunc::GetMinimalWeights(mySShape, myTConv, minang, maxang, Weights );
// On suppose que cela ne depend pas du Rayon! // It is supposed that it does not depend on the Radius!
} }
//======================================================================= //=======================================================================
@ -740,7 +740,7 @@ void BRepBlend_SurfRstConstRad::GetShape (Standard_Integer& NbPoles,
//======================================================================= //=======================================================================
//function : GetTolerance //function : GetTolerance
//purpose : Determine les Tolerance a utiliser dans les approximations. //purpose : Find Tolerance to be used in approximations.
//======================================================================= //=======================================================================
void BRepBlend_SurfRstConstRad::GetTolerance(const Standard_Real BoundTol, void BRepBlend_SurfRstConstRad::GetTolerance(const Standard_Real BoundTol,
@ -803,7 +803,7 @@ void BRepBlend_SurfRstConstRad::Section(const Blend_Point& P,
nplan = d1gui.Normalized(); nplan = d1gui.Normalized();
P.ParametersOnS(u1,v1); P.ParametersOnS(u1,v1);
w = P.ParameterOnC(); //jlr : point sur courbe pas sur surface w = P.ParameterOnC(); //jlr : point on curve not on surface
gp_Pnt2d pt2d = rst->Value(w); gp_Pnt2d pt2d = rst->Value(w);
surf->D1(u1,v1,pts,d1u1,d1v1); surf->D1(u1,v1,pts,d1u1,d1v1);
@ -813,7 +813,7 @@ void BRepBlend_SurfRstConstRad::Section(const Blend_Point& P,
Poles2d(Poles2d.Lower()).SetCoord(u1,v1); Poles2d(Poles2d.Lower()).SetCoord(u1,v1);
Poles2d(Poles2d.Upper()).SetCoord(pt2d.X(),pt2d.Y()); Poles2d(Poles2d.Upper()).SetCoord(pt2d.X(),pt2d.Y());
// Cas Linear // Linear Case
if (mySShape == BlendFunc_Linear) { if (mySShape == BlendFunc_Linear) {
Poles(low) = pts; Poles(low) = pts;
Poles(upp) = ptrst; Poles(upp) = ptrst;
@ -903,13 +903,13 @@ Standard_Boolean BRepBlend_SurfRstConstRad::Section
ndotns = nplan.Dot(ns); ndotns = nplan.Dot(ns);
norm = ncrossns.Magnitude(); norm = ncrossns.Magnitude();
if (norm < Eps) { if (norm < Eps) {
norm = 1; // Insufisant, mais il ne faut pas planter norm = 1; // Not enough, but it is not necessary to stop
#if DEB #if DEB
cout << " SurfRstConstRad : Surface singuliere " << endl; cout << " SurfRstConstRad : Singular Surface " << endl;
#endif #endif
} }
// Derivee de n1 par rapport a w // Derivative of n1 corresponding to w
grosterme = ncrossns.Dot(dnplan.Crossed(ns))/norm/norm; grosterme = ncrossns.Dot(dnplan.Crossed(ns))/norm/norm;
dnw.SetLinearForm((dnplan.Dot(ns)-grosterme*ndotns)/norm,nplan, dnw.SetLinearForm((dnplan.Dot(ns)-grosterme*ndotns)/norm,nplan,
@ -918,8 +918,8 @@ Standard_Boolean BRepBlend_SurfRstConstRad::Section
temp.SetLinearForm(ndotns/norm,nplan, -1./norm,ns); temp.SetLinearForm(ndotns/norm,nplan, -1./norm,ns);
resul.SetLinearForm(ray,temp,gp_Vec(ptrst,pts)); resul.SetLinearForm(ray,temp,gp_Vec(ptrst,pts));
secmember(3) = dnw.Dot(resul); // jag 950105 il manquait ray secmember(3) = dnw.Dot(resul);
secmember(3) = -2.*ray*secmember(3); // jag 950105 il manquait ray secmember(3) = -2.*ray*secmember(3);
math_Gauss Resol(gradsol, 1.e-9); math_Gauss Resol(gradsol, 1.e-9);
@ -943,14 +943,14 @@ Standard_Boolean BRepBlend_SurfRstConstRad::Section
tgs.SetLinearForm(secmember(1),d1u1,secmember(2),d1v1); tgs.SetLinearForm(secmember(1),d1u1,secmember(2),d1v1);
tgrst = secmember(3)*d1; tgrst = secmember(3)*d1;
// Derivee de n1 par rapport a u1 // Derivative of n1 corresponding to u1
temp = d2u1.Crossed(d1v1).Added(d1u1.Crossed(d2uv1)); temp = d2u1.Crossed(d1v1).Added(d1u1.Crossed(d2uv1));
grosterme = ncrossns.Dot(nplan.Crossed(temp))/norm/norm; grosterme = ncrossns.Dot(nplan.Crossed(temp))/norm/norm;
resulu.SetLinearForm(-(grosterme*ndotns-nplan.Dot(temp))/norm,nplan, resulu.SetLinearForm(-(grosterme*ndotns-nplan.Dot(temp))/norm,nplan,
grosterme/norm,ns, grosterme/norm,ns,
-1./norm,temp); -1./norm,temp);
// Derivee de n1 par rapport a v1 // Derivative of n1 corresponding to v1
temp = d2uv1.Crossed(d1v1).Added(d1u1.Crossed(d2v1)); temp = d2uv1.Crossed(d1v1).Added(d1u1.Crossed(d2v1));
grosterme = ncrossns.Dot(nplan.Crossed(temp))/norm/norm; grosterme = ncrossns.Dot(nplan.Crossed(temp))/norm/norm;
resulv.SetLinearForm(-(grosterme*ndotns-nplan.Dot(temp))/norm,nplan, resulv.SetLinearForm(-(grosterme*ndotns-nplan.Dot(temp))/norm,nplan,
@ -972,7 +972,7 @@ Standard_Boolean BRepBlend_SurfRstConstRad::Section
ns2 = -resul.Normalized(); ns2 = -resul.Normalized();
} }
// Les poles 2d // Tops 2D
Poles2d(Poles2d.Lower()).SetCoord(sol(1),sol(2)); Poles2d(Poles2d.Lower()).SetCoord(sol(1),sol(2));
Poles2d(Poles2d.Upper()).SetCoord(pt2drst.X(),pt2drst.Y()); Poles2d(Poles2d.Upper()).SetCoord(pt2drst.X(),pt2drst.Y());
@ -984,7 +984,7 @@ Standard_Boolean BRepBlend_SurfRstConstRad::Section
DPoles2d(Poles2d.Upper()).SetCoord(a,b); DPoles2d(Poles2d.Upper()).SetCoord(a,b);
} }
// Cas Linear // Linear Case
if (mySShape == BlendFunc_Linear) { if (mySShape == BlendFunc_Linear) {
Poles(low) = pts; Poles(low) = pts;
Poles(upp) = ptrst; Poles(upp) = ptrst;
@ -999,7 +999,7 @@ Standard_Boolean BRepBlend_SurfRstConstRad::Section
return (!istgt); return (!istgt);
} }
// Cas du cercle // Case of the circle
Center.SetXYZ(pts.XYZ()+ray*ns.XYZ()); Center.SetXYZ(pts.XYZ()+ray*ns.XYZ());
if (!istgt) { if (!istgt) {
tgct = tgs.Added(ray*dnw); tgct = tgs.Added(ray*dnw);

70
src/BRepBlend/BRepBlend_SurfRstEvolRad.cxx
View File

@ -41,39 +41,39 @@ static void FusionneIntervalles(const TColStd_Array1OfReal& I1,
{ {
Standard_Integer ind1=1, ind2=1; Standard_Integer ind1=1, ind2=1;
Standard_Real Epspar = Precision::PConfusion()*0.99; Standard_Real Epspar = Precision::PConfusion()*0.99;
// en suposant que le positionement fonctionne a PConfusion()/2 // it is supposed that positioning works with PConfusion()/2
Standard_Real v1, v2; Standard_Real v1, v2;
// Initialisations : les IND1 et IND2 pointent sur le 1er element // Initialisation : IND1 and IND2 point at the first element
// de chacune des 2 tables a traiter.INDS pointe sur le dernier // of each of 2 tables to be processed. INDS points at the last
// element cree de TABSOR // element created by TABSOR
//--- On remplit TABSOR en parcourant TABLE1 et TABLE2 simultanement --- //--- TABSOR is filled by parsing TABLE1 and TABLE2 simultaneously ---
//------------------ en eliminant les occurrences multiples ------------ //------------------ and eliminating multiple occurrencies ------------
while ((ind1<=I1.Upper()) && (ind2<=I2.Upper())) { while ((ind1<=I1.Upper()) && (ind2<=I2.Upper())) {
v1 = I1(ind1); v1 = I1(ind1);
v2 = I2(ind2); v2 = I2(ind2);
if (Abs(v1-v2)<= Epspar) { if (Abs(v1-v2)<= Epspar) {
// Ici les elements de I1 et I2 conviennent . // Here the elements of I1 and I2 fit.
Seq.Append((v1+v2)/2); Seq.Append((v1+v2)/2);
ind1++; ind1++;
ind2++; ind2++;
} }
else if (v1 < v2) { else if (v1 < v2) {
// Ici l' element de I1 convient. // Here the element of I1 fits.
Seq.Append(v1); Seq.Append(v1);
ind1++; ind1++;
} }
else { else {
// Ici l' element de TABLE2 convient. // Here the element of TABLE2 fits.
Seq.Append(v2); Seq.Append(v2);
ind2++; ind2++;
} }
} }
if (ind1>I1.Upper()) { if (ind1>I1.Upper()) {
//----- Ici I1 est epuise, on complete avec la fin de TABLE2 ------- //----- Here I1 is exhausted, completed with the end of TABLE2 -------
for (; ind2<=I2.Upper(); ind2++) { for (; ind2<=I2.Upper(); ind2++) {
Seq.Append(I2(ind2)); Seq.Append(I2(ind2));
@ -81,7 +81,7 @@ static void FusionneIntervalles(const TColStd_Array1OfReal& I1,
} }
if (ind2>I2.Upper()) { if (ind2>I2.Upper()) {
//----- Ici I2 est epuise, on complete avec la fin de I1 ------- //----- Here I2 is exhausted, completed with the end of I1 -------
for (; ind1<=I1.Upper(); ind1++) { for (; ind1<=I1.Upper(); ind1++) {
Seq.Append(I1(ind1)); Seq.Append(I1(ind1));
@ -91,7 +91,7 @@ static void FusionneIntervalles(const TColStd_Array1OfReal& I1,
//======================================================================= //=======================================================================
//function : BRepBlend_SurfRstEvolRad //function : BRepBlend_SurfRstEvolRad
//purpose : Contructeur //purpose : Contructor
//======================================================================= //=======================================================================
BRepBlend_SurfRstEvolRad::BRepBlend_SurfRstEvolRad BRepBlend_SurfRstEvolRad::BRepBlend_SurfRstEvolRad
(const Handle(Adaptor3d_HSurface)& Surf, (const Handle(Adaptor3d_HSurface)& Surf,
@ -188,7 +188,7 @@ Standard_Boolean BRepBlend_SurfRstEvolRad::Derivatives
vref.Divide(norm); vref.Divide(norm);
vref.SetLinearForm(ray,vref,gp_Vec(ptrst,pts)); vref.SetLinearForm(ray,vref,gp_Vec(ptrst,pts));
// Derivee par rapport a u1 // Derivative corresponding to u1
temp = d2u1.Crossed(d1v1).Added(d1u1.Crossed(d2uv1)); temp = d2u1.Crossed(d1v1).Added(d1u1.Crossed(d2uv1));
grosterme = ncrossns.Dot(nplan.Crossed(temp))/norm/norm; grosterme = ncrossns.Dot(nplan.Crossed(temp))/norm/norm;
resul.SetLinearForm(-ray/norm*(grosterme*ndotns-nplan.Dot(temp)),nplan, resul.SetLinearForm(-ray/norm*(grosterme*ndotns-nplan.Dot(temp)),nplan,
@ -199,7 +199,7 @@ Standard_Boolean BRepBlend_SurfRstEvolRad::Derivatives
D(3,1) = 2.*(resul.Dot(vref)); D(3,1) = 2.*(resul.Dot(vref));
// Derivee par rapport a v1 // Derivative corresponding to v1
temp = d2uv1.Crossed(d1v1).Added(d1u1.Crossed(d2v1)); temp = d2uv1.Crossed(d1v1).Added(d1u1.Crossed(d2v1));
grosterme = ncrossns.Dot(nplan.Crossed(temp))/norm/norm; grosterme = ncrossns.Dot(nplan.Crossed(temp))/norm/norm;
resul.SetLinearForm(-ray/norm*(grosterme*ndotns-nplan.Dot(temp)),nplan, resul.SetLinearForm(-ray/norm*(grosterme*ndotns-nplan.Dot(temp)),nplan,
@ -257,7 +257,7 @@ Standard_Boolean BRepBlend_SurfRstEvolRad::Values
F(3) = vref.SquareMagnitude() - ray*ray; F(3) = vref.SquareMagnitude() - ray*ray;
// Derivee par rapport a u1 // Derivative corresponding to u1
temp = d2u1.Crossed(d1v1).Added(d1u1.Crossed(d2uv1)); temp = d2u1.Crossed(d1v1).Added(d1u1.Crossed(d2uv1));
grosterme = ncrossns.Dot(nplan.Crossed(temp))/norm/norm; grosterme = ncrossns.Dot(nplan.Crossed(temp))/norm/norm;
resul.SetLinearForm(-ray/norm*(grosterme*ndotns-nplan.Dot(temp)),nplan, resul.SetLinearForm(-ray/norm*(grosterme*ndotns-nplan.Dot(temp)),nplan,
@ -268,7 +268,7 @@ Standard_Boolean BRepBlend_SurfRstEvolRad::Values
D(3,1) = 2.*(resul.Dot(vref)); D(3,1) = 2.*(resul.Dot(vref));
// Derivee par rapport a v1 // Derivative corresponding to v1
temp = d2uv1.Crossed(d1v1).Added(d1u1.Crossed(d2v1)); temp = d2uv1.Crossed(d1v1).Added(d1u1.Crossed(d2v1));
grosterme = ncrossns.Dot(nplan.Crossed(temp))/norm/norm; grosterme = ncrossns.Dot(nplan.Crossed(temp))/norm/norm;
resul.SetLinearForm(-ray/norm*(grosterme*ndotns-nplan.Dot(temp)),nplan, resul.SetLinearForm(-ray/norm*(grosterme*ndotns-nplan.Dot(temp)),nplan,
@ -317,8 +317,8 @@ void BRepBlend_SurfRstEvolRad::Set(const Standard_Real Param)
//======================================================================= //=======================================================================
//function : //function :
//purpose : Segmente la courbe a sa partie utile. //purpose : Segments the curve in its useful part.
// La precision est prise arbitrairement petite !? // Precision is taken arbitrary small !?
//======================================================================= //=======================================================================
void BRepBlend_SurfRstEvolRad::Set void BRepBlend_SurfRstEvolRad::Set
(const Standard_Real First, (const Standard_Real First,
@ -391,7 +391,7 @@ const Standard_Real Tol)
Abs(valsol(2)) <= Tol && Abs(valsol(2)) <= Tol &&
Abs(valsol(3)) <= 2*Tol*Abs(ray) ) { Abs(valsol(3)) <= 2*Tol*Abs(ray) ) {
// Calcul des tangentes // Calculation of tangents
pt2ds = gp_Pnt2d(Sol(1),Sol(2)); pt2ds = gp_Pnt2d(Sol(1),Sol(2));
prmrst = Sol(3); prmrst = Sol(3);
@ -451,14 +451,14 @@ const Standard_Real Tol)
else { else {
istangent = Standard_True; istangent = Standard_True;
} }
// mise a jour de maxang // update of maxang
if(ray>0.) ns.Reverse(); if(ray>0.) ns.Reverse();
ns2 = -resul.Normalized(); ns2 = -resul.Normalized();
Cosa = ns.Dot(ns2); Cosa = ns.Dot(ns2);
Sina = nplan.Dot(ns.Crossed(ns2)); Sina = nplan.Dot(ns.Crossed(ns2));
if (choix%2 != 0) { if (choix%2 != 0) {
Sina = -Sina; //nplan est change en -nplan Sina = -Sina; //nplan is changed into -nplan
} }
Angle = ACos(Cosa); Angle = ACos(Cosa);
@ -625,7 +625,7 @@ gp_Vec& TgS) const
Standard_Real dot, NT = NRstInPlane.Magnitude(); Standard_Real dot, NT = NRstInPlane.Magnitude();
NT *= TgRst.Magnitude(); NT *= TgRst.Magnitude();
if (Abs(NT) < 1.e-7) { if (Abs(NT) < 1.e-7) {
return Standard_False; // Singularite ou Incoherence. return Standard_False; // Singularity or Incoherence.
} }
dot = NRstInPlane.Dot(TgRst); dot = NRstInPlane.Dot(TgRst);
dot /= NT; dot /= NT;
@ -707,7 +707,7 @@ gp_Circ& C)
Pdeb = 0.; //ElCLib::Parameter(C,pts); Pdeb = 0.; //ElCLib::Parameter(C,pts);
Pfin = ElCLib::Parameter(C,ptrst); Pfin = ElCLib::Parameter(C,ptrst);
// Test des angles negatif et quasi null : Cas Singulier // Test negative and almost null angles : Single Case
if (Pfin>1.5*PI) { if (Pfin>1.5*PI) {
np.Reverse(); np.Reverse();
C.SetPosition(gp_Ax2(Center,np,ns)); C.SetPosition(gp_Ax2(Center,np,ns));
@ -741,7 +741,7 @@ gp_Circ& C)
void BRepBlend_SurfRstEvolRad::GetMinimalWeight(TColStd_Array1OfReal& Weigths) const void BRepBlend_SurfRstEvolRad::GetMinimalWeight(TColStd_Array1OfReal& Weigths) const
{ {
BlendFunc::GetMinimalWeights(mySShape, myTConv, minang, maxang, Weigths ); BlendFunc::GetMinimalWeights(mySShape, myTConv, minang, maxang, Weigths );
// On suppose que cela ne depend pas du Rayon! // It is supposed that it does not depend on the Radius!
} }
//======================================================================= //=======================================================================
@ -914,13 +914,13 @@ TColStd_Array1OfReal& DWeigths)
ndotns = nplan.Dot(ns); ndotns = nplan.Dot(ns);
norm = ncrossns.Magnitude(); norm = ncrossns.Magnitude();
if (norm < Eps) { if (norm < Eps) {
norm = 1; // Insufisant, mais il ne faut pas planter norm = 1; // Not enough, but it is not necessary to stop
#if DEB #if DEB
cout << " SurfRstEvolRad : Surface singuliere " << endl; cout << " SurfRstEvolRad : Surface single " << endl;
#endif #endif
} }
// Derivee de n1 par rapport a w // Derivative of n1 corresponding to w
grosterme = ncrossns.Dot(dnplan.Crossed(ns))/norm/norm; grosterme = ncrossns.Dot(dnplan.Crossed(ns))/norm/norm;
dnw.SetLinearForm((dnplan.Dot(ns)-grosterme*ndotns)/norm,nplan, dnw.SetLinearForm((dnplan.Dot(ns)-grosterme*ndotns)/norm,nplan,
@ -953,14 +953,14 @@ TColStd_Array1OfReal& DWeigths)
tgs.SetLinearForm(secmember(1),d1u1,secmember(2),d1v1); tgs.SetLinearForm(secmember(1),d1u1,secmember(2),d1v1);
tgrst = secmember(3)*d1; tgrst = secmember(3)*d1;
// Derivee de n1 par rapport a u1 // Derivative of n1 corresponding to u1
temp = d2u1.Crossed(d1v1).Added(d1u1.Crossed(d2uv1)); temp = d2u1.Crossed(d1v1).Added(d1u1.Crossed(d2uv1));
grosterme = ncrossns.Dot(nplan.Crossed(temp))/norm/norm; grosterme = ncrossns.Dot(nplan.Crossed(temp))/norm/norm;
resulu.SetLinearForm(-(grosterme*ndotns-nplan.Dot(temp))/norm,nplan, resulu.SetLinearForm(-(grosterme*ndotns-nplan.Dot(temp))/norm,nplan,
grosterme/norm,ns, grosterme/norm,ns,
-1./norm,temp); -1./norm,temp);
// Derivee de n1 par rapport a v1 // Derivative of n1 corresponding to v1
temp = d2uv1.Crossed(d1v1).Added(d1u1.Crossed(d2v1)); temp = d2uv1.Crossed(d1v1).Added(d1u1.Crossed(d2v1));
grosterme = ncrossns.Dot(nplan.Crossed(temp))/norm/norm; grosterme = ncrossns.Dot(nplan.Crossed(temp))/norm/norm;
resulv.SetLinearForm(-(grosterme*ndotns-nplan.Dot(temp))/norm,nplan, resulv.SetLinearForm(-(grosterme*ndotns-nplan.Dot(temp))/norm,nplan,
@ -986,7 +986,7 @@ TColStd_Array1OfReal& DWeigths)
istgt = Standard_True; istgt = Standard_True;
} }
// Les poles 2d // Tops 2D
Poles2d(Poles2d.Lower()).SetCoord(sol(1),sol(2)); Poles2d(Poles2d.Lower()).SetCoord(sol(1),sol(2));
Poles2d(Poles2d.Upper()).SetCoord(pt2drst.X(),pt2drst.Y()); Poles2d(Poles2d.Upper()).SetCoord(pt2drst.X(),pt2drst.Y());
@ -998,7 +998,7 @@ TColStd_Array1OfReal& DWeigths)
DPoles2d(Poles2d.Upper()).SetCoord(a,b); DPoles2d(Poles2d.Upper()).SetCoord(a,b);
} }
// Cas Linear // Linear Case
if (mySShape == BlendFunc_Linear) { if (mySShape == BlendFunc_Linear) {
Poles(low) = pts; Poles(low) = pts;
Poles(upp) = ptrst; Poles(upp) = ptrst;
@ -1013,7 +1013,7 @@ TColStd_Array1OfReal& DWeigths)
return (!istgt); return (!istgt);
} }
// Cas du cercle // Case of the circle
Center.SetXYZ(pts.XYZ()+ray*ns.XYZ()); Center.SetXYZ(pts.XYZ()+ray*ns.XYZ());
if (!istgt) { if (!istgt) {
tgct.SetLinearForm(ray,dnw,dray,ns,tgs); tgct.SetLinearForm(ray,dnw,dray,ns,tgs);
@ -1030,7 +1030,7 @@ TColStd_Array1OfReal& DWeigths)
dnplan.Reverse(); dnplan.Reverse();
} }
if (!istgt) { if (!istgt) {
if (ray < 0.) { // pour eviter la connerie Abs(dray) qques lignes plus bas if (ray < 0.) { // to avoid Abs(dray) some lines below
rayprim = -dray; rayprim = -dray;
} }
else rayprim = dray; else rayprim = dray;
@ -1103,7 +1103,7 @@ TColStd_Array1OfReal& Weigths)
nplan = d1gui.Normalized(); nplan = d1gui.Normalized();
P.ParametersOnS(u1,v1); P.ParametersOnS(u1,v1);
w = P.ParameterOnC(); //jlr : point sur courbe pas sur surface w = P.ParameterOnC(); //jlr : point on curve not on surface
gp_Pnt2d pt2d = rst->Value(w); gp_Pnt2d pt2d = rst->Value(w);
surf->D1(u1,v1,pts,d1u1,d1v1); surf->D1(u1,v1,pts,d1u1,d1v1);
@ -1114,7 +1114,7 @@ TColStd_Array1OfReal& Weigths)
Poles2d(Poles2d.Lower()).SetCoord(u1,v1); Poles2d(Poles2d.Lower()).SetCoord(u1,v1);
Poles2d(Poles2d.Upper()).SetCoord(pt2d.X(),pt2d.Y()); Poles2d(Poles2d.Upper()).SetCoord(pt2d.X(),pt2d.Y());
// Cas Linear // Linear case
if (mySShape == BlendFunc_Linear) { if (mySShape == BlendFunc_Linear) {
Poles(low) = pts; Poles(low) = pts;
Poles(upp) = ptrst; Poles(upp) = ptrst;

130
src/BRepBlend/BRepBlend_SurfRstLineBuilder.cxx
View File

@ -29,7 +29,7 @@
#endif #endif
static Standard_Integer IndexOfSection = 0; static Standard_Integer IndexOfSection = 0;
extern Standard_Boolean Blend_GettraceDRAWSECT(); extern Standard_Boolean Blend_GettraceDRAWSECT();
// Pour debug : visualisation de la section // for debug : visualisation of the section
static Standard_Boolean BBPP(const Standard_Real param, static Standard_Boolean BBPP(const Standard_Real param,
Blend_SurfRstFunction& Func, Blend_SurfRstFunction& Func,
const math_Vector& sol, const math_Vector& sol,
@ -74,27 +74,27 @@ static void tracederiv(Blend_SurfRstFunction& Func,
Standard_Real scal = 1./(param1-param2); Standard_Real scal = 1./(param1-param2);
cout<<endl; cout<<endl;
cout<<"controle des derivees au point : "<<param1<<endl; cout<<"control derivatives at point : "<<param1<<endl;
for(i = 1; i <= hp; i++){ for(i = 1; i <= hp; i++){
cout<<endl; cout<<endl;
cout<<"point : "<<i<<endl; cout<<"point : "<<i<<endl;
cout<<"dx calcule : "<<TDP1(i).X()<<endl; cout<<"dx calculated : "<<TDP1(i).X()<<endl;
cout<<"dx estime : "<<scal*(TP1(i).X()-TP2(i).X())<<endl; cout<<"dx estimated : "<<scal*(TP1(i).X()-TP2(i).X())<<endl;
cout<<"dy calcule : "<<TDP1(i).Y()<<endl; cout<<"dy calculated : "<<TDP1(i).Y()<<endl;
cout<<"dy estime : "<<scal*(TP1(i).Y()-TP2(i).Y())<<endl; cout<<"dy estimated : "<<scal*(TP1(i).Y()-TP2(i).Y())<<endl;
cout<<"dz calcule : "<<TDP1(i).Z()<<endl; cout<<"dz calculated : "<<TDP1(i).Z()<<endl;
cout<<"dz estime : "<<scal*(TP1(i).Z()-TP2(i).Z())<<endl; cout<<"dz estimated : "<<scal*(TP1(i).Z()-TP2(i).Z())<<endl;
cout<<"dw calcule : "<<TDW1(i)<<endl; cout<<"dw calculated : "<<TDW1(i)<<endl;
cout<<"dw estime : "<<scal*(TW1(i)-TW2(i))<<endl; cout<<"dw estimated : "<<scal*(TW1(i)-TW2(i))<<endl;
} }
for(i = 1; i <= hp2d; i++){ for(i = 1; i <= hp2d; i++){
cout<<endl; cout<<endl;
cout<<"point 2d : "<<i<<endl; cout<<"point 2d : "<<i<<endl;
cout<<"dx calcule : "<<TDP2d1(i).X()<<endl; cout<<"dx calculated : "<<TDP2d1(i).X()<<endl;
cout<<"dx estime : "<<scal*(TP2d1(i).X()-TP2d2(i).X())<<endl; cout<<"dx estimated : "<<scal*(TP2d1(i).X()-TP2d2(i).X())<<endl;
cout<<"dy calcule : "<<TDP2d1(i).Y()<<endl; cout<<"dy calculated : "<<TDP2d1(i).Y()<<endl;
cout<<"dy estime : "<<scal*(TP2d1(i).Y()-TP2d2(i).Y())<<endl; cout<<"dy estimated : "<<scal*(TP2d1(i).Y()-TP2d2(i).Y())<<endl;
} }
} }
@ -133,8 +133,8 @@ static void Drawsect(const Standard_Real param,
//======================================================================= //=======================================================================
//function : ArcToRecadre //function : ArcToRecadre
//purpose : Cherche un arc candidat //purpose : Find a suitable arc
// PrevIndex est utilise pour rejeter un arc deja teste // PrevIndex is used to reject an already tested arc
//======================================================================= //=======================================================================
Standard_Integer BRepBlend_SurfRstLineBuilder:: Standard_Integer BRepBlend_SurfRstLineBuilder::
@ -265,7 +265,7 @@ void BRepBlend_SurfRstLineBuilder::Perform(Blend_SurfRstFunction& Func,
Drawsect(param,Func); Drawsect(param,Func);
} }
#endif #endif
// Mettre a jour la ligne. // Update the line.
line->Append(previousP); line->Append(previousP);
Standard_Real U,V; Standard_Real U,V;
previousP.ParametersOnS(U,V); previousP.ParametersOnS(U,V);
@ -365,7 +365,7 @@ Standard_Boolean BRepBlend_SurfRstLineBuilder::PerformFirstSection
} }
if (!recads && !recadp && !recadrst) return Standard_False; if (!recads && !recadp && !recadrst) return Standard_False;
if (recadp && recadrst) { if (recadp && recadrst) {
if(sens*(wrst-wp) > tolgui){ //on sort du domaine d abord if(sens*(wrst-wp) > tolgui){ //first one leaves the domain
wrst = wp; wrst = wp;
U = solinvp(2); U = solinvp(2);
V = solinvp(3); V = solinvp(3);
@ -402,7 +402,7 @@ Standard_Boolean BRepBlend_SurfRstLineBuilder::PerformFirstSection
sol(3) = solinvs(2); sol(3) = solinvs(2);
} }
else if(sens*(ws-wrst)<0){ else if(sens*(ws-wrst)<0){
// sol sur surf // ground on surf
State = Blend_OnRst1; State = Blend_OnRst1;
param = ws; param = ws;
Arc->Value(solinvs(3)).Coord(U,V); Arc->Value(solinvs(3)).Coord(U,V);
@ -411,7 +411,7 @@ Standard_Boolean BRepBlend_SurfRstLineBuilder::PerformFirstSection
sol(3) = solinvs(2); sol(3) = solinvs(2);
} }
else{ else{
// sol sur rst // ground on rst
State = Blend_OnRst2; State = Blend_OnRst2;
param = wrst; param = wrst;
sol(1) = U; sol(1) = U;
@ -421,7 +421,7 @@ Standard_Boolean BRepBlend_SurfRstLineBuilder::PerformFirstSection
Func.Set(param); Func.Set(param);
} }
else if(recads){ else if(recads){
// sol sur surf // ground on surf
State = Blend_OnRst1; State = Blend_OnRst1;
param = ws; param = ws;
Arc->Value(solinvs(3)).Coord(U,V); Arc->Value(solinvs(3)).Coord(U,V);
@ -431,7 +431,7 @@ Standard_Boolean BRepBlend_SurfRstLineBuilder::PerformFirstSection
Func.Set(param); Func.Set(param);
} }
else if(recadrst){ else if(recadrst){
// sol sur rst // ground on rst
State = Blend_OnRst2; State = Blend_OnRst2;
param = wrst; param = wrst;
sol(1) = U; sol(1) = U;
@ -487,7 +487,7 @@ void BRepBlend_SurfRstLineBuilder::InternalPerform(Blend_SurfRstFunction& Func,
{ {
Standard_Real stepw = pasmax; Standard_Real stepw = pasmax;
Standard_Integer nbp = line->NbPoints(); Standard_Integer nbp = line->NbPoints();
if(nbp >= 2){ //On reprend le dernier step s il n est pas trop petit. if(nbp >= 2){ //The last step is reproduced if it is not too small.
if(sens < 0.){ if(sens < 0.){
stepw = (line->Point(2).Parameter() - line->Point(1).Parameter()); stepw = (line->Point(2).Parameter() - line->Point(1).Parameter());
} }
@ -585,7 +585,7 @@ void BRepBlend_SurfRstLineBuilder::InternalPerform(Blend_SurfRstFunction& Func,
recads = Recadre(FinvC,solinvs,Arc,IsVtxs,Vtxs); recads = Recadre(FinvC,solinvs,Arc,IsVtxs,Vtxs);
if (recads) { if (recads) {
ws = solinvs(1); ws = solinvs(1);
// Il faut reevaluer le decrochage (BUC60360) // It is necessary to reevaluate the deviation (BUC60360)
gp_Vec t, n; gp_Vec t, n;
Func.Set(ws); Func.Set(ws);
Arc->Value(solinvs(3)).Coord(U,V); Arc->Value(solinvs(3)).Coord(U,V);
@ -622,7 +622,7 @@ void BRepBlend_SurfRstLineBuilder::InternalPerform(Blend_SurfRstFunction& Func,
if(recadp || recads || recadrst) echecrecad = Standard_False; if(recadp || recads || recadrst) echecrecad = Standard_False;
if (!echecrecad) { if (!echecrecad) {
if (recadp && recadrst) { if (recadp && recadrst) {
if(sens*(wrst-wp) > tolgui){ //on sort du domaine d abord if(sens*(wrst-wp) > tolgui){ //first one leaves the domain
wrst = wp; wrst = wp;
U = solinvp(2); U = solinvp(2);
V = solinvp(3); V = solinvp(3);
@ -661,7 +661,7 @@ void BRepBlend_SurfRstLineBuilder::InternalPerform(Blend_SurfRstFunction& Func,
sol(3) = solinvs(3); sol(3) = solinvs(3);
} }
else if(sens*(ws-wrst)<0){ else if(sens*(ws-wrst)<0){
// sol sur surf // ground on surf
decroch = 0; decroch = 0;
State = Blend_OnRst1; State = Blend_OnRst1;
param = ws; param = ws;
@ -671,7 +671,7 @@ void BRepBlend_SurfRstLineBuilder::InternalPerform(Blend_SurfRstFunction& Func,
sol(3) = solinvs(2); sol(3) = solinvs(2);
} }
else{ else{
// sol sur rst // ground on rst
State = Blend_OnRst2; State = Blend_OnRst2;
param = wrst; param = wrst;
sol(1) = U; sol(1) = U;
@ -681,7 +681,7 @@ void BRepBlend_SurfRstLineBuilder::InternalPerform(Blend_SurfRstFunction& Func,
Func.Set(param); Func.Set(param);
} }
else if(recads){ else if(recads){
// sol sur surf // ground on surf
State = Blend_OnRst1; State = Blend_OnRst1;
param = ws; param = ws;
Arc->Value(solinvs(3)).Coord(U,V); Arc->Value(solinvs(3)).Coord(U,V);
@ -691,7 +691,7 @@ void BRepBlend_SurfRstLineBuilder::InternalPerform(Blend_SurfRstFunction& Func,
Func.Set(param); Func.Set(param);
} }
else if(recadrst){ else if(recadrst){
// sol sur rst // ground on rst
State = Blend_OnRst2; State = Blend_OnRst2;
param = wrst; param = wrst;
sol(1) = U; sol(1) = U;
@ -705,9 +705,9 @@ void BRepBlend_SurfRstLineBuilder::InternalPerform(Blend_SurfRstFunction& Func,
State = TestArret(Func,Standard_True,State); State = TestArret(Func,Standard_True,State);
} }
else{ else{
// echec recadrage. On sort avec PointsConfondus // Failed reframing. Leave with PointsConfondus
#if DEB #if DEB
cout<<"SurfRstLineBuilder : echec recadrage"<<endl; cout<<"SurfRstLineBuilder : failed reframing"<<endl;
#endif #endif
State = Blend_SamePoints; State = Blend_SamePoints;
} }
@ -721,7 +721,7 @@ void BRepBlend_SurfRstLineBuilder::InternalPerform(Blend_SurfRstFunction& Func,
Drawsect(param,Func); Drawsect(param,Func);
} }
#endif #endif
// Mettre a jour la ligne. // Update the line.
if (sens>0.) { if (sens>0.) {
line->Append(previousP); line->Append(previousP);
} }
@ -737,7 +737,7 @@ void BRepBlend_SurfRstLineBuilder::InternalPerform(Blend_SurfRstFunction& Func,
sol(1),sol(2), sol(1),sol(2),
previousP.Parameter(),tolesp); previousP.Parameter(),tolesp);
MakeExtremity(Extrst,Standard_False,rst,sol(3),IsVtxrst,Vtxrst); MakeExtremity(Extrst,Standard_False,rst,sol(3),IsVtxrst,Vtxrst);
// Indiquer que fin sur Bound. // Indicate end on Bound.
} }
else { else {
param = param + sens*stepw; param = param + sens*stepw;
@ -760,14 +760,14 @@ void BRepBlend_SurfRstLineBuilder::InternalPerform(Blend_SurfRstFunction& Func,
previousP.Parameter(),tolesp); previousP.Parameter(),tolesp);
Arrive = Standard_True; Arrive = Standard_True;
if (line->NbPoints()>=2) { if (line->NbPoints()>=2) {
// Indiquer qu on s arrete en cours de cheminement // Indicate that one stops during the processing
#if DEB #if DEB
cout<<"SurfRstLineBuilder :On n avance plus dans le cheminement"<<endl; cout<<"SurfRstLineBuilder : No advancement in the processing"<<endl;
#endif #endif
} }
} }
else { else {
param = parprec + sens*stepw; // on ne risque pas de depasser Bound. param = parprec + sens*stepw; // no risk to exceed Bound.
} }
} }
break; break;
@ -779,7 +779,7 @@ void BRepBlend_SurfRstLineBuilder::InternalPerform(Blend_SurfRstFunction& Func,
Drawsect(param,Func); Drawsect(param,Func);
} }
#endif #endif
// Mettre a jour la ligne. // Update the line.
if (sens>0.) { if (sens>0.) {
line->Append(previousP); line->Append(previousP);
} }
@ -795,7 +795,7 @@ void BRepBlend_SurfRstLineBuilder::InternalPerform(Blend_SurfRstFunction& Func,
Exts.SetValue(previousP.PointOnS(),sol(1),sol(2), Exts.SetValue(previousP.PointOnS(),sol(1),sol(2),
previousP.Parameter(),tolesp); previousP.Parameter(),tolesp);
MakeExtremity(Extrst,Standard_False,rst,sol(3),IsVtxrst,Vtxrst); MakeExtremity(Extrst,Standard_False,rst,sol(3),IsVtxrst,Vtxrst);
// Indiquer que fin sur Bound. // Indicate end on Bound.
} }
else { else {
param = param + sens*stepw; param = param + sens*stepw;
@ -866,9 +866,9 @@ void BRepBlend_SurfRstLineBuilder::InternalPerform(Blend_SurfRstFunction& Func,
case Blend_SamePoints : case Blend_SamePoints :
{ {
// On arrete // Stop
#if DEB #if DEB
cout << "SurfRstLineBuilder Points confondus dans le cheminement" << endl; cout << "SurfRstLineBuilder Points mixed in the processing" << endl;
#endif #endif
previousP.ParametersOnS(U,V); previousP.ParametersOnS(U,V);
Exts.SetValue(previousP.PointOnS(),U,V, Exts.SetValue(previousP.PointOnS(),U,V,
@ -899,7 +899,7 @@ void BRepBlend_SurfRstLineBuilder::InternalPerform(Blend_SurfRstFunction& Func,
//======================================================================= //=======================================================================
//function : Recadre //function : Recadre
//purpose : Recadre une section Surface / Restriction //purpose : Reframe section Surface / Restriction
//======================================================================= //=======================================================================
Standard_Boolean BRepBlend_SurfRstLineBuilder::Recadre(Blend_SurfCurvFuncInv& FinvC, Standard_Boolean BRepBlend_SurfRstLineBuilder::Recadre(Blend_SurfCurvFuncInv& FinvC,
@ -949,19 +949,19 @@ Standard_Boolean BRepBlend_SurfRstLineBuilder::Recadre(Blend_SurfCurvFuncInv&
#endif #endif
} }
else { else {
// On doit verifier la valeur de la fonction // It is necessary to check the value of the function
rsnld.Root(Solinv); rsnld.Root(Solinv);
recadre = FinvC.IsSolution(Solinv,tolesp); recadre = FinvC.IsSolution(Solinv,tolesp);
} }
// En cas d'echecs, on regarde si un autre arc // In case of fail, it is checked if another arc
// peut faire l'affaire (cas des sorties a proximite d'un vertex) // can be useful (case of output at the proximity of a vertex)
if (!recadre) { if (!recadre) {
IndexSol = ArcToRecadre(sol, IndexSol, IndexSol = ArcToRecadre(sol, IndexSol,
lastpt2d, pt2d, pmin); lastpt2d, pt2d, pmin);
if (IndexSol == 0) { if (IndexSol == 0) {
return Standard_False; // Pas d'autre solution return Standard_False; // No other solution
} }
domain1->Init(); domain1->Init();
@ -988,7 +988,7 @@ Standard_Boolean BRepBlend_SurfRstLineBuilder::Recadre(Blend_SurfCurvFuncInv&
#endif #endif
} }
else { else {
// On doit verifier la valeur de la fonction // It is necessary to check the value of the function
rsnld.Root(Solinv); rsnld.Root(Solinv);
recadre = FinvC.IsSolution(Solinv,tolesp); recadre = FinvC.IsSolution(Solinv,tolesp);
} }
@ -1074,8 +1074,8 @@ Standard_Boolean BRepBlend_SurfRstLineBuilder::Recadre(Blend_SurfRstFunction&
if (!domain2->MoreVertex()) { if (!domain2->MoreVertex()) {
IsVtx = Standard_False; IsVtx = Standard_False;
} }
// On recalcule la section par resolution directe, sinon, on se recupere // The section is recalculated by direct resolution, otherwise
// des incoherences entre le parametre et sol dues au baillement. // incoherences between the parameter and the ground caused by yawn are returned.
math_Vector infbound(1,3),supbound(1,3); math_Vector infbound(1,3),supbound(1,3);
math_Vector parinit(1,3),tolerance(1,3); math_Vector parinit(1,3),tolerance(1,3);
@ -1285,9 +1285,9 @@ void BRepBlend_SurfRstLineBuilder::MakeExtremity(BRepBlend_Extremity&
Blend_Status BRepBlend_SurfRstLineBuilder::CheckDeflectionOnSurf(const Blend_Point& CurPoint) Blend_Status BRepBlend_SurfRstLineBuilder::CheckDeflectionOnSurf(const Blend_Point& CurPoint)
{ {
//Controles 3d du Blend_CSWalking. //Controls 3d of Blend_CSWalking.
// regle par tests dans U4 correspond a 11.478 d // rule by tests in U4 corresponds to 11.478 d
const Standard_Real CosRef3D = 0.98; const Standard_Real CosRef3D = 0.98;
Standard_Real Cosi=0, Cosi2=0; Standard_Real Cosi=0, Cosi2=0;
Standard_Boolean curpointistangent = CurPoint.IsTangencyPoint(); Standard_Boolean curpointistangent = CurPoint.IsTangencyPoint();
@ -1314,7 +1314,7 @@ Blend_Status BRepBlend_SurfRstLineBuilder::CheckDeflectionOnSurf(const Blend_Poi
if(!prevpointistangent) prevNorme = prevTg.SquareMagnitude(); if(!prevpointistangent) prevNorme = prevTg.SquareMagnitude();
if (Norme <= tolesp*tolesp){ if (Norme <= tolesp*tolesp){
// il faudra peut etre forcer meme point // it can be necessary to force same point
return Blend_SamePoints; return Blend_SamePoints;
} }
if(!prevpointistangent){ if(!prevpointistangent){
@ -1322,7 +1322,7 @@ Blend_Status BRepBlend_SurfRstLineBuilder::CheckDeflectionOnSurf(const Blend_Poi
return Blend_SamePoints; return Blend_SamePoints;
} }
Cosi = sens*Corde*prevTg; Cosi = sens*Corde*prevTg;
if (Cosi <0.) { // angle 3d>pi/2. --> retour arriere if (Cosi <0.) { // angle 3d>pi/2. --> return back
return Blend_Backward; return Blend_Backward;
} }
@ -1333,7 +1333,7 @@ Blend_Status BRepBlend_SurfRstLineBuilder::CheckDeflectionOnSurf(const Blend_Poi
} }
if(!curpointistangent){ if(!curpointistangent){
// Voir s il faut faire le controle sur le signe de prevtg*Tgsurf // Check if it is necessary to control the sign of prevtg*Tgsurf
Cosi = sens*Corde*Tgsurf; Cosi = sens*Corde*Tgsurf;
Cosi2 = Cosi * Cosi / Tgsurf.SquareMagnitude() / Norme; Cosi2 = Cosi * Cosi / Tgsurf.SquareMagnitude() / Norme;
if (Cosi2 < CosRef3D || Cosi < 0.) { if (Cosi2 < CosRef3D || Cosi < 0.) {
@ -1342,7 +1342,7 @@ Blend_Status BRepBlend_SurfRstLineBuilder::CheckDeflectionOnSurf(const Blend_Poi
} }
if(!curpointistangent && !prevpointistangent){ if(!curpointistangent && !prevpointistangent){
// Estimation de la fleche courante // Estimation of the current arrow
Standard_Real FlecheCourante = Standard_Real FlecheCourante =
(prevTg.Normalized().XYZ()-Tgsurf.Normalized().XYZ()).SquareModulus()*Norme/64.; (prevTg.Normalized().XYZ()-Tgsurf.Normalized().XYZ()).SquareModulus()*Norme/64.;
@ -1350,7 +1350,7 @@ Blend_Status BRepBlend_SurfRstLineBuilder::CheckDeflectionOnSurf(const Blend_Poi
return Blend_StepTooSmall; return Blend_StepTooSmall;
} }
if (FlecheCourante > fleche*fleche) { if (FlecheCourante > fleche*fleche) {
// pas trop grand : commentaire interessant // not too great :
return Blend_StepTooLarge; return Blend_StepTooLarge;
} }
} }
@ -1365,9 +1365,9 @@ Blend_Status BRepBlend_SurfRstLineBuilder::CheckDeflectionOnSurf(const Blend_Poi
Blend_Status BRepBlend_SurfRstLineBuilder::CheckDeflectionOnRst(const Blend_Point& CurPoint) Blend_Status BRepBlend_SurfRstLineBuilder::CheckDeflectionOnRst(const Blend_Point& CurPoint)
{ {
//Controles 3d du Blend_CSWalking. //Controls 3D of Blend_CSWalking.
// regle par tests dans U4 correspond a 11.478 d // rule by tests in U4 corresponds to 11.478 d
const Standard_Real CosRef3D = 0.98; const Standard_Real CosRef3D = 0.98;
Standard_Real Cosi, Cosi2; Standard_Real Cosi, Cosi2;
Standard_Boolean curpointistangent = CurPoint.IsTangencyPoint(); Standard_Boolean curpointistangent = CurPoint.IsTangencyPoint();
@ -1394,7 +1394,7 @@ Blend_Status BRepBlend_SurfRstLineBuilder::CheckDeflectionOnRst(const Blend_Poin
if(!prevpointistangent) prevNorme = prevTg.SquareMagnitude(); if(!prevpointistangent) prevNorme = prevTg.SquareMagnitude();
if (Norme <= tolesp*tolesp){ if (Norme <= tolesp*tolesp){
// il faudra peut etre forcer meme point // it can be necessary to force same point
return Blend_SamePoints; return Blend_SamePoints;
} }
if(!prevpointistangent){ if(!prevpointistangent){
@ -1402,7 +1402,7 @@ Blend_Status BRepBlend_SurfRstLineBuilder::CheckDeflectionOnRst(const Blend_Poin
return Blend_SamePoints; return Blend_SamePoints;
} }
Cosi = sens*Corde*prevTg; Cosi = sens*Corde*prevTg;
if (Cosi <0.) { // angle 3d>pi/2. --> retour arriere if (Cosi <0.) { // angle 3d>pi/2. --> return back
return Blend_Backward; return Blend_Backward;
} }
@ -1413,7 +1413,7 @@ Blend_Status BRepBlend_SurfRstLineBuilder::CheckDeflectionOnRst(const Blend_Poin
} }
if(!curpointistangent){ if(!curpointistangent){
// Voir s il faut faire le controle sur le signe de prevtg*Tgsurf // Check if it is necessary to control the sign of prevtg*Tgsurf
Cosi = sens*Corde*Tgsurf; Cosi = sens*Corde*Tgsurf;
Cosi2 = Cosi * Cosi / Tgsurf.SquareMagnitude() / Norme; Cosi2 = Cosi * Cosi / Tgsurf.SquareMagnitude() / Norme;
if (Cosi2 < CosRef3D || Cosi < 0.) { if (Cosi2 < CosRef3D || Cosi < 0.) {
@ -1422,7 +1422,7 @@ Blend_Status BRepBlend_SurfRstLineBuilder::CheckDeflectionOnRst(const Blend_Poin
} }
if(!curpointistangent && !prevpointistangent){ if(!curpointistangent && !prevpointistangent){
// Estimation de la fleche courante // Estimation of the current arrow
Standard_Real FlecheCourante = Standard_Real FlecheCourante =
(prevTg.Normalized().XYZ()-Tgsurf.Normalized().XYZ()).SquareModulus()*Norme/64.; (prevTg.Normalized().XYZ()-Tgsurf.Normalized().XYZ()).SquareModulus()*Norme/64.;
@ -1430,7 +1430,7 @@ Blend_Status BRepBlend_SurfRstLineBuilder::CheckDeflectionOnRst(const Blend_Poin
return Blend_StepTooSmall; return Blend_StepTooSmall;
} }
if (FlecheCourante > fleche*fleche) { if (FlecheCourante > fleche*fleche) {
// pas trop grand : commentaire interessant // not too great
return Blend_StepTooLarge; return Blend_StepTooLarge;
} }
} }
@ -1568,7 +1568,7 @@ Standard_Boolean BRepBlend_SurfRstLineBuilder::CheckInside(Blend_SurfRstFunction
{ {
math_Vector tolerance(1,3); math_Vector tolerance(1,3);
Func.GetTolerance(tolerance,tolesp); Func.GetTolerance(tolerance,tolesp);
//cote pcurve. //face pcurve.
Standard_Real w = sol(3); Standard_Real w = sol(3);
if(w < rst->FirstParameter() - tolerance(3)|| if(w < rst->FirstParameter() - tolerance(3)||
w > rst->LastParameter() + tolerance(3)){ w > rst->LastParameter() + tolerance(3)){
@ -1580,11 +1580,11 @@ Standard_Boolean BRepBlend_SurfRstLineBuilder::CheckInside(Blend_SurfRstFunction
} }
else SituOnC = TopAbs_ON; else SituOnC = TopAbs_ON;
//cote surface //face surface
gp_Pnt2d p2d(sol(1),sol(2)); gp_Pnt2d p2d(sol(1),sol(2));
SituOnS = domain1->Classify(p2d,Min(tolerance(1),tolerance(2)),0); SituOnS = domain1->Classify(p2d,Min(tolerance(1),tolerance(2)),0);
//decrochage //lost contact
gp_Vec tgs,nors; gp_Vec tgs,nors;
Decroch = Func.Decroch(sol,tgs,nors); Decroch = Func.Decroch(sol,tgs,nors);

194
src/BlendFunc/BlendFunc_ConstRad.cxx
View File

@ -3,9 +3,9 @@
// Author: Jacques GOUSSARD // Author: Jacques GOUSSARD
// Copyright: OPEN CASCADE 1993 // Copyright: OPEN CASCADE 1993
// Modified 09/09/1996 PMN Ajout de Nb(Intervalls), IsRationnal // Modified 09/09/1996 PMN Adde Nb(Intervalls), IsRationnal
// Optimisation, utilisation de GetCircle // Optimisation, use of GetCircle
// Modified 20/02/1998 PMN Gestion des surfaces singulieres // Modified 20/02/1998 PMN Singular surfaces management
#include <BlendFunc_ConstRad.ixx> #include <BlendFunc_ConstRad.ixx>
@ -43,7 +43,7 @@ BlendFunc_ConstRad::BlendFunc_ConstRad(const Handle(Adaptor3d_HSurface)& S1,
distmin(RealLast()), distmin(RealLast()),
mySShape(BlendFunc_Rational) mySShape(BlendFunc_Rational)
{ {
// Initialisaton des variables de controle du cache. // Initialisaton of cash control variables.
tval = -9.876e100; tval = -9.876e100;
xval.Init(-9.876e100); xval.Init(-9.876e100);
myXOrder = -1; myXOrder = -1;
@ -116,11 +116,11 @@ void BlendFunc_ConstRad::Set(const BlendFunc_SectionShape TypeSection)
//======================================================================= //=======================================================================
//function : ComputeValues //function : ComputeValues
//purpose : Passage OBLIGATOIRE pour tous les calculs //purpose : OBLIGATORY passage for all calculations
// Cette methode gere les positionemment sur Surfaces et Courbe // This method manages positioning on Surfaces and Curves
// Calcul les equation et leurs derives partielle // Calculate the equations and their partial derivates
// Stock certains resultat intermediaire dans les champs pour etre // Stock certain intermediate results in fields to
// utiliser dans d'autre methodes. // use in other methods.
//======================================================================= //=======================================================================
Standard_Boolean BlendFunc_ConstRad::ComputeValues(const math_Vector& X, Standard_Boolean BlendFunc_ConstRad::ComputeValues(const math_Vector& X,
@ -128,7 +128,7 @@ Standard_Boolean BlendFunc_ConstRad::ComputeValues(const math_Vector& X,
const Standard_Boolean byParam, const Standard_Boolean byParam,
const Standard_Real Param) const Standard_Real Param)
{ {
// declaration statique afin d'eviter la realloc systematique // static declaration to avoid systematic reallocation
static gp_Vec d3u1,d3v1,d3uuv1,d3uvv1,d3u2,d3v2,d3uuv2,d3uvv2; static gp_Vec d3u1,d3v1,d3uuv1,d3uvv1,d3u2,d3v2,d3uuv2,d3uvv2;
static gp_Vec d1gui, d2gui, d3gui; static gp_Vec d1gui, d2gui, d3gui;
@ -136,10 +136,10 @@ Standard_Boolean BlendFunc_ConstRad::ComputeValues(const math_Vector& X,
static Standard_Real invnormtg, dinvnormtg; static Standard_Real invnormtg, dinvnormtg;
Standard_Real T = Param, aux; Standard_Real T = Param, aux;
// Cas du parametre implicite // Case of implicite parameter
if ( !byParam) { T = param;} if ( !byParam) { T = param;}
// Le travail est il dejas fait ? // Is the work already done ?
Standard_Boolean myX_OK = (Order<=myXOrder) ; Standard_Boolean myX_OK = (Order<=myXOrder) ;
for (Standard_Integer ii=1; ((ii<=X.Length()) && myX_OK); ii++) { for (Standard_Integer ii=1; ((ii<=X.Length()) && myX_OK); ii++) {
myX_OK = ( X(ii) == xval(ii) ); myX_OK = ( X(ii) == xval(ii) );
@ -152,12 +152,12 @@ Standard_Boolean BlendFunc_ConstRad::ComputeValues(const math_Vector& X,
return Standard_True; return Standard_True;
} }
// Traitement de t // Processing of t
if (!t_OK) { if (!t_OK) {
tval = T; tval = T;
if (byParam) { myTOrder = Order;} if (byParam) { myTOrder = Order;}
else { myTOrder = 0;} else { myTOrder = 0;}
//----- Positionement sur la courbe ---------------- //----- Positioning on the curve ----------------
switch (myTOrder) { switch (myTOrder) {
case 0 : case 0 :
{ {
@ -196,11 +196,11 @@ Standard_Boolean BlendFunc_ConstRad::ComputeValues(const math_Vector& X,
} }
} }
// Traitement de X // Processing of X
if (!myX_OK) { if (!myX_OK) {
xval = X; xval = X;
myXOrder = Order; myXOrder = Order;
//-------------- Positionement sur les surfaces ----------------- //-------------- Positioning on surfaces -----------------
switch (myXOrder) { switch (myXOrder) {
case 0 : case 0 :
{ {
@ -238,7 +238,7 @@ Standard_Boolean BlendFunc_ConstRad::ComputeValues(const math_Vector& X,
default: default:
return Standard_False; return Standard_False;
} }
// Cas des surfaces degeneree // Case of degenerated surfaces
if (nsurf1.Magnitude() < Eps ) { if (nsurf1.Magnitude() < Eps ) {
//gp_Vec normal; //gp_Vec normal;
gp_Pnt2d P(X(1), X(2)); gp_Pnt2d P(X(1), X(2));
@ -253,7 +253,7 @@ Standard_Boolean BlendFunc_ConstRad::ComputeValues(const math_Vector& X,
} }
} }
// -------------------- Positionement a l'ordre 0 --------------------- // -------------------- Positioning of order 0 ---------------------
Standard_Real invnorm1, invnorm2, ndotns1, ndotns2, theD; Standard_Real invnorm1, invnorm2, ndotns1, ndotns2, theD;
gp_Vec ncrossns1,ncrossns2,resul,temp; gp_Vec ncrossns1,ncrossns2,resul,temp;
@ -271,14 +271,14 @@ Standard_Boolean BlendFunc_ConstRad::ComputeValues(const math_Vector& X,
if (invnorm1 > Eps) invnorm1 = ((Standard_Real) 1) /invnorm1; if (invnorm1 > Eps) invnorm1 = ((Standard_Real) 1) /invnorm1;
else { else {
invnorm1 = 1; // Insufisant, mais il ne faut pas planter invnorm1 = 1; // Unsatisfactory, but it is not necessary to crash
#if DEB #if DEB
cout << " ConstRad : Surface singuliere " << endl; cout << " ConstRad : Surface singuliere " << endl;
#endif #endif
} }
if (invnorm2 > Eps) invnorm2 = ((Standard_Real) 1) /invnorm2; if (invnorm2 > Eps) invnorm2 = ((Standard_Real) 1) /invnorm2;
else { else {
invnorm2 = 1; // Insufisant, mais il ne faut pas planter invnorm2 = 1; // Unsatisfactory, but it is not necessary to crash
#if DEB #if DEB
cout << " ConstRad : Surface singuliere " << endl; cout << " ConstRad : Surface singuliere " << endl;
#endif #endif
@ -299,7 +299,7 @@ Standard_Boolean BlendFunc_ConstRad::ComputeValues(const math_Vector& X,
E(3) = resul.Y(); E(3) = resul.Y();
E(4) = resul.Z(); E(4) = resul.Z();
// -------------------- Positionement a l'ordre 1 --------------------- // -------------------- Positioning of order 1 ---------------------
if (Order >= 1) { if (Order >= 1) {
Standard_Real grosterme, cube, carre; Standard_Real grosterme, cube, carre;
@ -310,7 +310,7 @@ Standard_Boolean BlendFunc_ConstRad::ComputeValues(const math_Vector& X,
DEDX(1,4) = nplan.Dot(d1v2)/2; DEDX(1,4) = nplan.Dot(d1v2)/2;
cube =invnorm1*invnorm1*invnorm1; cube =invnorm1*invnorm1*invnorm1;
// Derivee par rapport a u1 // Derived in relation to u1
grosterme = - ncrossns1.Dot(nplan.Crossed(dns1u1))*cube; grosterme = - ncrossns1.Dot(nplan.Crossed(dns1u1))*cube;
dndu1.SetLinearForm( grosterme*ndotns1 dndu1.SetLinearForm( grosterme*ndotns1
+ invnorm1*nplan.Dot(dns1u1), nplan, + invnorm1*nplan.Dot(dns1u1), nplan,
@ -322,7 +322,7 @@ Standard_Boolean BlendFunc_ConstRad::ComputeValues(const math_Vector& X,
DEDX(3,1) = resul.Y(); DEDX(3,1) = resul.Y();
DEDX(4,1) = resul.Z(); DEDX(4,1) = resul.Z();
// Derivee par rapport a v1 // Derived in relation to v1
grosterme = - ncrossns1.Dot(nplan.Crossed(dns1v1))*cube; grosterme = - ncrossns1.Dot(nplan.Crossed(dns1v1))*cube;
dndv1.SetLinearForm( grosterme*ndotns1 dndv1.SetLinearForm( grosterme*ndotns1
@ -336,7 +336,7 @@ Standard_Boolean BlendFunc_ConstRad::ComputeValues(const math_Vector& X,
DEDX(4,2) = resul.Z(); DEDX(4,2) = resul.Z();
cube = invnorm2*invnorm2*invnorm2; cube = invnorm2*invnorm2*invnorm2;
// Derivee par rapport a u2 // Derived in relation to u2
grosterme = - ncrossns2.Dot(nplan.Crossed(dns1u2))*cube; grosterme = - ncrossns2.Dot(nplan.Crossed(dns1u2))*cube;
dndu2.SetLinearForm( grosterme*ndotns2 dndu2.SetLinearForm( grosterme*ndotns2
+invnorm2*nplan.Dot(dns1u2), nplan, +invnorm2*nplan.Dot(dns1u2), nplan,
@ -348,7 +348,7 @@ Standard_Boolean BlendFunc_ConstRad::ComputeValues(const math_Vector& X,
DEDX(3,3) = resul.Y(); DEDX(3,3) = resul.Y();
DEDX(4,3) = resul.Z(); DEDX(4,3) = resul.Z();
// Derivee par rapport a v2 // Derived in relation to v2
grosterme = -ncrossns2.Dot(nplan.Crossed(dns1v2))*cube; grosterme = -ncrossns2.Dot(nplan.Crossed(dns1v2))*cube;
dndv2.SetLinearForm( grosterme*ndotns2 dndv2.SetLinearForm( grosterme*ndotns2
+invnorm2*nplan.Dot(dns1v2), nplan, +invnorm2*nplan.Dot(dns1v2), nplan,
@ -362,13 +362,13 @@ Standard_Boolean BlendFunc_ConstRad::ComputeValues(const math_Vector& X,
if (byParam) { if (byParam) {
temp.SetXYZ( (pts1.XYZ()+pts2.XYZ())/2 - ptgui.XYZ()); temp.SetXYZ( (pts1.XYZ()+pts2.XYZ())/2 - ptgui.XYZ());
// Derivee de n1 par rapport a w // Derived from n1 in relation to w
grosterme = ncrossns1.Dot(dnplan.Crossed(nsurf1))*invnorm1*invnorm1; grosterme = ncrossns1.Dot(dnplan.Crossed(nsurf1))*invnorm1*invnorm1;
dn1w.SetLinearForm((dnplan.Dot(nsurf1)-grosterme*ndotns1)*invnorm1, nplan, dn1w.SetLinearForm((dnplan.Dot(nsurf1)-grosterme*ndotns1)*invnorm1, nplan,
ndotns1*invnorm1,dnplan, ndotns1*invnorm1,dnplan,
grosterme*invnorm1,nsurf1); grosterme*invnorm1,nsurf1);
// Derivee de n2 par rapport a w // Derivee from n2 in relation to w
grosterme = ncrossns2.Dot(dnplan.Crossed(nsurf2))*invnorm2*invnorm2; grosterme = ncrossns2.Dot(dnplan.Crossed(nsurf2))*invnorm2*invnorm2;
dn2w.SetLinearForm((dnplan.Dot(nsurf2)-grosterme*ndotns2)*invnorm2,nplan, dn2w.SetLinearForm((dnplan.Dot(nsurf2)-grosterme*ndotns2)*invnorm2,nplan,
ndotns2*invnorm2,dnplan, ndotns2*invnorm2,dnplan,
@ -380,7 +380,7 @@ Standard_Boolean BlendFunc_ConstRad::ComputeValues(const math_Vector& X,
DEDT(3) = ray1*dn1w.Y() - ray2*dn2w.Y(); DEDT(3) = ray1*dn1w.Y() - ray2*dn2w.Y();
DEDT(4) = ray1*dn1w.Z() - ray2*dn2w.Z(); DEDT(4) = ray1*dn1w.Z() - ray2*dn2w.Z();
} }
// ------ Positionemement a l'ordre 2 ----------------------------- // ------ Positioning of order 2 -----------------------------
if (Order == 2) { if (Order == 2) {
// gp_Vec d2ndu1, d2ndu2, d2ndv1, d2ndv2, d2nduv1, d2nduv2; // gp_Vec d2ndu1, d2ndu2, d2ndv1, d2ndv2, d2nduv1, d2nduv2;
gp_Vec d2ns1u1, d2ns1u2, d2ns1v1, d2ns1v2, d2ns1uv1, d2ns1uv2; gp_Vec d2ns1u1, d2ns1u2, d2ns1v1, d2ns1v2, d2ns1uv1, d2ns1uv2;
@ -400,8 +400,8 @@ Standard_Boolean BlendFunc_ConstRad::ComputeValues(const math_Vector& X,
// ================ // ================
carre = invnorm1*invnorm1; carre = invnorm1*invnorm1;
cube = carre*invnorm1; cube = carre*invnorm1;
// Derivee double par rapport a u1 // Derived double compared to u1
// Derivation de la norme // Derived from the norm
d2ns1u1.SetLinearForm(1, d3u1.Crossed(d1v1), d2ns1u1.SetLinearForm(1, d3u1.Crossed(d1v1),
2, d2u1.Crossed(d2uv1), 2, d2u1.Crossed(d2uv1),
1, d1u1.Crossed(d3uuv1)); 1, d1u1.Crossed(d3uuv1));
@ -425,8 +425,8 @@ Standard_Boolean BlendFunc_ConstRad::ComputeValues(const math_Vector& X,
D2EDX2(3,1,1) = resul.Y(); D2EDX2(3,1,1) = resul.Y();
D2EDX2(4,1,1) = resul.Z(); D2EDX2(4,1,1) = resul.Z();
// Derivee double par rapport a u1, v1 // Derived double compared to u1, v1
// Derivation de la norme // Derived from the norm
d2ns1uv1 = (d3uuv1.Crossed(d1v1)) d2ns1uv1 = (d3uuv1.Crossed(d1v1))
+ (d2u1 .Crossed(d2v1)) + (d2u1 .Crossed(d2v1))
+ (d1u1 .Crossed(d3uvv1)); + (d1u1 .Crossed(d3uvv1));
@ -435,7 +435,7 @@ Standard_Boolean BlendFunc_ConstRad::ComputeValues(const math_Vector& X,
DSecn = (nplan.Crossed(dns1v1)).Dot(nplan.Crossed(dns1u1)) DSecn = (nplan.Crossed(dns1v1)).Dot(nplan.Crossed(dns1u1))
+ ncrossns1.Dot(nplan.Crossed(d2ns1uv1)); + ncrossns1.Dot(nplan.Crossed(d2ns1uv1));
grosterme = (3*uterm*vterm*carre-DSecn)*cube; grosterme = (3*uterm*vterm*carre-DSecn)*cube;
uterm *= -cube; //et seulement maintenant uterm *= -cube; //and only now
vterm *= -cube; vterm *= -cube;
p1 = nplan.Dot(dns1u1); p1 = nplan.Dot(dns1u1);
@ -456,8 +456,8 @@ Standard_Boolean BlendFunc_ConstRad::ComputeValues(const math_Vector& X,
D2EDX2(3,2,1) = D2EDX2(3,1,2) = resul.Y(); D2EDX2(3,2,1) = D2EDX2(3,1,2) = resul.Y();
D2EDX2(4,2,1) = D2EDX2(4,1,2) = resul.Z(); D2EDX2(4,2,1) = D2EDX2(4,1,2) = resul.Z();
// Derivee double par rapport a v1 // Derived double compared to v1
// Derivation de la norme // Derived from the norm
d2ns1v1.SetLinearForm(1, d1u1.Crossed(d3v1), d2ns1v1.SetLinearForm(1, d1u1.Crossed(d3v1),
2, d2uv1.Crossed(d2v1), 2, d2uv1.Crossed(d2v1),
1, d3uvv1.Crossed(d1v1)); 1, d3uvv1.Crossed(d1v1));
@ -486,8 +486,8 @@ Standard_Boolean BlendFunc_ConstRad::ComputeValues(const math_Vector& X,
// ================ // ================
carre = invnorm2*invnorm2; carre = invnorm2*invnorm2;
cube = carre*invnorm2; cube = carre*invnorm2;
// Derivee double par rapport a u2 // Derived double compared to u2
// Derivation de la norme // Derived from the norm
d2ns1u2.SetLinearForm(1, d3u2.Crossed(d1v2), d2ns1u2.SetLinearForm(1, d3u2.Crossed(d1v2),
2, d2u2.Crossed(d2uv2), 2, d2u2.Crossed(d2uv2),
1, d1u2.Crossed(d3uuv2)); 1, d1u2.Crossed(d3uuv2));
@ -511,8 +511,8 @@ Standard_Boolean BlendFunc_ConstRad::ComputeValues(const math_Vector& X,
D2EDX2(3,3,3) = resul.Y(); D2EDX2(3,3,3) = resul.Y();
D2EDX2(4,3,3) = resul.Z(); D2EDX2(4,3,3) = resul.Z();
// Derivee double par rapport a u2, v2 // Derived double compared to u2, v2
// Derivation de la norme // Derived from the norm
d2ns1uv2 = (d3uuv2.Crossed(d1v2)) d2ns1uv2 = (d3uuv2.Crossed(d1v2))
+ (d2u2 .Crossed(d2v2)) + (d2u2 .Crossed(d2v2))
+ (d1u2 .Crossed(d3uvv2)); + (d1u2 .Crossed(d3uvv2));
@ -521,7 +521,7 @@ Standard_Boolean BlendFunc_ConstRad::ComputeValues(const math_Vector& X,
DSecn = (nplan.Crossed(dns1v2)).Dot(nplan.Crossed(dns1u2)) DSecn = (nplan.Crossed(dns1v2)).Dot(nplan.Crossed(dns1u2))
+ ncrossns2.Dot(nplan.Crossed(d2ns1uv2)); + ncrossns2.Dot(nplan.Crossed(d2ns1uv2));
grosterme = (3*uterm*vterm*carre-DSecn)*cube; grosterme = (3*uterm*vterm*carre-DSecn)*cube;
uterm *= -cube; //et seulement maintenant uterm *= -cube; //and only now
vterm *= -cube; vterm *= -cube;
p1 = nplan.Dot(dns1u2); p1 = nplan.Dot(dns1u2);
@ -542,8 +542,8 @@ Standard_Boolean BlendFunc_ConstRad::ComputeValues(const math_Vector& X,
D2EDX2(3,4,3) = D2EDX2(3,3,4) = resul.Y(); D2EDX2(3,4,3) = D2EDX2(3,3,4) = resul.Y();
D2EDX2(4,4,3) = D2EDX2(4,3,4) = resul.Z(); D2EDX2(4,4,3) = D2EDX2(4,3,4) = resul.Z();
// Derivee double par rapport a v2 // Derived double compared to v2
// Derivation de la norme // Derived from the norm
d2ns1v2.SetLinearForm(1, d1u2.Crossed(d3v2), d2ns1v2.SetLinearForm(1, d1u2.Crossed(d3v2),
2, d2uv2.Crossed(d2v2), 2, d2uv2.Crossed(d2v2),
1, d3uvv2.Crossed(d1v2)); 1, d3uvv2.Crossed(d1v2));
@ -570,7 +570,7 @@ Standard_Boolean BlendFunc_ConstRad::ComputeValues(const math_Vector& X,
if (byParam) { if (byParam) {
Standard_Real tterm; Standard_Real tterm;
// ---------- Derivation double en t, X -------------------------- // ---------- Derivation double in t, X --------------------------
D2EDXDT(1,1) = dnplan.Dot(d1u1)/2; D2EDXDT(1,1) = dnplan.Dot(d1u1)/2;
D2EDXDT(1,2) = dnplan.Dot(d1v1)/2; D2EDXDT(1,2) = dnplan.Dot(d1v1)/2;
D2EDXDT(1,3) = dnplan.Dot(d1u2)/2; D2EDXDT(1,3) = dnplan.Dot(d1u2)/2;
@ -578,10 +578,10 @@ Standard_Boolean BlendFunc_ConstRad::ComputeValues(const math_Vector& X,
carre = invnorm1*invnorm1; carre = invnorm1*invnorm1;
cube = carre*invnorm1; cube = carre*invnorm1;
//--> Derivee par rapport a u1 et t //--> Derived compared to u1 and t
tterm = ncrossns1.Dot(dnplan.Crossed(nsurf1)); tterm = ncrossns1.Dot(dnplan.Crossed(nsurf1));
smallterm = - tterm*cube; smallterm = - tterm*cube;
// Derivation de la norme // Derived from the norm
uterm = ncrossns1.Dot(nplan. Crossed(dns1u1)); uterm = ncrossns1.Dot(nplan. Crossed(dns1u1));
DSecn = (nplan.Crossed(dns1u1)).Dot(dnplan.Crossed(nsurf1)) DSecn = (nplan.Crossed(dns1u1)).Dot(dnplan.Crossed(nsurf1))
+ ncrossns1.Dot(dnplan.Crossed(dns1u1)); + ncrossns1.Dot(dnplan.Crossed(dns1u1));
@ -606,8 +606,8 @@ Standard_Boolean BlendFunc_ConstRad::ComputeValues(const math_Vector& X,
D2EDXDT(3,1) = resul.Y(); D2EDXDT(3,1) = resul.Y();
D2EDXDT(4,1) = resul.Z(); D2EDXDT(4,1) = resul.Z();
//--> Derivee par rapport a v1 et t //--> Derived compared to v1 and t
// Derivation de la norme // Derived from the norm
uterm = ncrossns1.Dot(nplan. Crossed(dns1v1)); uterm = ncrossns1.Dot(nplan. Crossed(dns1v1));
DSecn = (nplan. Crossed(dns1v1)).Dot(dnplan.Crossed(nsurf1)) DSecn = (nplan. Crossed(dns1v1)).Dot(dnplan.Crossed(nsurf1))
+ ncrossns1.Dot(dnplan.Crossed(dns1v1)); + ncrossns1.Dot(dnplan.Crossed(dns1v1));
@ -633,10 +633,10 @@ Standard_Boolean BlendFunc_ConstRad::ComputeValues(const math_Vector& X,
carre = invnorm2*invnorm2; carre = invnorm2*invnorm2;
cube = carre*invnorm2; cube = carre*invnorm2;
//--> Derivee par rapport a u2 et t //--> Derived compared to u2 and t
tterm = ncrossns2.Dot(dnplan.Crossed(nsurf2)); tterm = ncrossns2.Dot(dnplan.Crossed(nsurf2));
smallterm = -tterm*cube; smallterm = -tterm*cube;
// Derivation de la norme // Derived from the norm
uterm = ncrossns2.Dot(nplan. Crossed(dns1u2)); uterm = ncrossns2.Dot(nplan. Crossed(dns1u2));
DSecn = (nplan. Crossed(dns1u2)).Dot(dnplan.Crossed(nsurf2)) DSecn = (nplan. Crossed(dns1u2)).Dot(dnplan.Crossed(nsurf2))
+ ncrossns2.Dot(dnplan.Crossed(dns1u2)); + ncrossns2.Dot(dnplan.Crossed(dns1u2));
@ -661,8 +661,8 @@ Standard_Boolean BlendFunc_ConstRad::ComputeValues(const math_Vector& X,
D2EDXDT(3,3) = resul.Y(); D2EDXDT(3,3) = resul.Y();
D2EDXDT(4,3) = resul.Z(); D2EDXDT(4,3) = resul.Z();
//--> Derivee par rapport a v2 et t //--> Derived compared to v2 and t
// Derivation de la norme // Derived from the norm
uterm = ncrossns2.Dot(nplan. Crossed(dns1v2)); uterm = ncrossns2.Dot(nplan. Crossed(dns1v2));
DSecn = (nplan.Crossed(dns1v2)).Dot(dnplan.Crossed(nsurf2)) DSecn = (nplan.Crossed(dns1v2)).Dot(dnplan.Crossed(nsurf2))
+ ncrossns2.Dot(dnplan.Crossed(dns1v2)); + ncrossns2.Dot(dnplan.Crossed(dns1v2));
@ -688,11 +688,11 @@ Standard_Boolean BlendFunc_ConstRad::ComputeValues(const math_Vector& X,
D2EDXDT(4,4) = resul.Z(); D2EDXDT(4,4) = resul.Z();
// ---------- Derivation double en t ----------------------------- // ---------- Derivation double in t -----------------------------
// Derivee de n1 par rapport a w // Derived from n1 compared to w
carre = invnorm1*invnorm1; carre = invnorm1*invnorm1;
cube = carre*invnorm1; cube = carre*invnorm1;
// Derivation de la norme // Derived from the norm
DPrim = ncrossns1.Dot(dnplan.Crossed(nsurf1)); DPrim = ncrossns1.Dot(dnplan.Crossed(nsurf1));
smallterm = - 2*DPrim*cube; smallterm = - 2*DPrim*cube;
DSecn = (dnplan.Crossed(nsurf1)).SquareMagnitude() DSecn = (dnplan.Crossed(nsurf1)).SquareMagnitude()
@ -711,10 +711,10 @@ Standard_Boolean BlendFunc_ConstRad::ComputeValues(const math_Vector& X,
ndotns1*invnorm1, d2nplan); ndotns1*invnorm1, d2nplan);
d2n1w += temp; d2n1w += temp;
// Derivee de n2 par rapport a w // Derived from n2 compared to w
carre = invnorm2*invnorm2; carre = invnorm2*invnorm2;
cube = carre*invnorm2; cube = carre*invnorm2;
// Derivation de la norme // Derived from the norm
DPrim = ncrossns2.Dot(dnplan.Crossed(nsurf2)); DPrim = ncrossns2.Dot(dnplan.Crossed(nsurf2));
smallterm = - 2*DPrim*cube; smallterm = - 2*DPrim*cube;
DSecn = (dnplan.Crossed(nsurf2)).SquareMagnitude() DSecn = (dnplan.Crossed(nsurf2)).SquareMagnitude()
@ -756,8 +756,8 @@ void BlendFunc_ConstRad::Set(const Standard_Real Param)
//======================================================================= //=======================================================================
//function : Set //function : Set
//purpose : Segmente la courbe a sa partie utile. //purpose : Segmentation of the useful part of the curve
// La prcision est prise arbitrairement petite !? // Precision is taken at random and small !?
//======================================================================= //=======================================================================
void BlendFunc_ConstRad::Set(const Standard_Real First, const Standard_Real Last) void BlendFunc_ConstRad::Set(const Standard_Real First, const Standard_Real Last)
@ -821,7 +821,7 @@ Standard_Boolean BlendFunc_ConstRad::IsSolution(const math_Vector& Sol, const St
if (Abs(E(1)) <= Tol && if (Abs(E(1)) <= Tol &&
E(2)*E(2) + E(3)*E(3) + E(4)*E(4) <= Tol*Tol) { E(2)*E(2) + E(3)*E(3) + E(4)*E(4) <= Tol*Tol) {
// on recopie localement ns1, ns2, np afin de ne pas ecraser les champs ! // ns1, ns2 and np are copied locally to avoid crushing the fields !
gp_Vec ns1,ns2,np; gp_Vec ns1,ns2,np;
ns1 = nsurf1; ns1 = nsurf1;
ns2 = nsurf2; ns2 = nsurf2;
@ -829,13 +829,13 @@ Standard_Boolean BlendFunc_ConstRad::IsSolution(const math_Vector& Sol, const St
norm = nplan.Crossed(ns1).Magnitude(); norm = nplan.Crossed(ns1).Magnitude();
if (norm < Eps) { if (norm < Eps) {
norm = 1; // Insufisant, mais il ne faut pas planter norm = 1; // Unsatisfactory, but it is not necessary to stop
} }
ns1.SetLinearForm(nplan.Dot(ns1)/norm,nplan, -1./norm, ns1); ns1.SetLinearForm(nplan.Dot(ns1)/norm,nplan, -1./norm, ns1);
norm = nplan.Crossed(ns2).Magnitude(); norm = nplan.Crossed(ns2).Magnitude();
if (norm < Eps) { if (norm < Eps) {
norm = 1; // Insufisant, mais il ne faut pas planter norm = 1; // Unsatisfactory, but it is not necessary to stop
} }
ns2.SetLinearForm(nplan.Dot(ns2)/norm,nplan, -1./norm, ns2); ns2.SetLinearForm(nplan.Dot(ns2)/norm,nplan, -1./norm, ns2);
@ -882,7 +882,7 @@ Standard_Boolean BlendFunc_ConstRad::IsSolution(const math_Vector& Sol, const St
tg22d.SetCoord(solution(3),solution(4)); tg22d.SetCoord(solution(3),solution(4));
} }
// mise a jour de maxang // update of maxang
if (ray1 > 0.) { if (ray1 > 0.) {
ns1.Reverse(); ns1.Reverse();
@ -893,13 +893,13 @@ Standard_Boolean BlendFunc_ConstRad::IsSolution(const math_Vector& Sol, const St
Cosa = ns1.Dot(ns2); Cosa = ns1.Dot(ns2);
Sina = np.Dot(ns1.Crossed(ns2)); Sina = np.Dot(ns1.Crossed(ns2));
if (choix%2 != 0) { if (choix%2 != 0) {
Sina = -Sina; //nplan est change en -nplan Sina = -Sina; //nplan is changed in -nplan
} }
if(Cosa > 1.) {Cosa = 1.; Sina = 0.;} if(Cosa > 1.) {Cosa = 1.; Sina = 0.;}
Angle = ACos(Cosa); Angle = ACos(Cosa);
// Recadrage sur ]-pi/2, 3pi/2] // Reframing on ]-pi/2, 3pi/2]
if (Sina <0.) { if (Sina <0.) {
if (Cosa > 0.) Angle = -Angle; if (Cosa > 0.) Angle = -Angle;
else Angle = 2.*PI - Angle; else Angle = 2.*PI - Angle;
@ -1158,12 +1158,12 @@ void BlendFunc_ConstRad::Section(const Standard_Real Param,
Standard_Real norm1; Standard_Real norm1;
norm1 = nplan.Crossed(ns1).Magnitude(); norm1 = nplan.Crossed(ns1).Magnitude();
if (norm1 < Eps) { if (norm1 < Eps) {
norm1 = 1; // Insufisant, mais il ne faut pas planter norm1 = 1; // Unsatisfactory, but it is not necessary to stop
} }
ns1.SetLinearForm(nplan.Dot(ns1)/norm1,nplan, -1./norm1,ns1); ns1.SetLinearForm(nplan.Dot(ns1)/norm1,nplan, -1./norm1,ns1);
Center.SetXYZ(pts1.XYZ()+ray1*ns1.XYZ()); Center.SetXYZ(pts1.XYZ()+ray1*ns1.XYZ());
// on oriente ns1 du centre vers pts1, // ns1 is oriented from the center to pts1,
if (ray1 > 0.) { if (ray1 > 0.) {
ns1.Reverse(); ns1.Reverse();
@ -1175,7 +1175,7 @@ void BlendFunc_ConstRad::Section(const Standard_Real Param,
C.SetPosition(gp_Ax2(Center,np,ns1)); C.SetPosition(gp_Ax2(Center,np,ns1));
Pdeb = 0.; Pdeb = 0.;
Pfin = ElCLib::Parameter(C,pts2); Pfin = ElCLib::Parameter(C,pts2);
// Test des angles negatif et quasi null : Cas Singulier // Test negative and almost null angles : Singular Case
if (Pfin>1.5*PI) { if (Pfin>1.5*PI) {
np.Reverse(); np.Reverse();
C.SetPosition(gp_Ax2(Center,np,ns1)); C.SetPosition(gp_Ax2(Center,np,ns1));
@ -1210,7 +1210,7 @@ Standard_Real BlendFunc_ConstRad::GetSectionSize() const
void BlendFunc_ConstRad::GetMinimalWeight(TColStd_Array1OfReal& Weigths) const void BlendFunc_ConstRad::GetMinimalWeight(TColStd_Array1OfReal& Weigths) const
{ {
BlendFunc::GetMinimalWeights(mySShape, myTConv, minang, maxang, Weigths ); BlendFunc::GetMinimalWeights(mySShape, myTConv, minang, maxang, Weigths );
// On suppose que cela ne depend pas du Rayon! // It is supposed that it does not depend on the Radius!
} }
//======================================================================= //=======================================================================
@ -1251,7 +1251,7 @@ void BlendFunc_ConstRad::GetShape (Standard_Integer& NbPoles,
//======================================================================= //=======================================================================
//function : GetTolerance //function : GetTolerance
//purpose : Determine les Tolerances a utiliser dans les approximations. //purpose : Determine Tolerances used for approximations.
//======================================================================= //=======================================================================
void BlendFunc_ConstRad::GetTolerance(const Standard_Real BoundTol, void BlendFunc_ConstRad::GetTolerance(const Standard_Real BoundTol,
const Standard_Real SurfTol, const Standard_Real SurfTol,
@ -1318,7 +1318,7 @@ void BlendFunc_ConstRad::Section(const Blend_Point& P,
Ok = ComputeValues(X, 0, Standard_True, prm); Ok = ComputeValues(X, 0, Standard_True, prm);
distmin = Min (distmin, pts1.Distance(pts2)); distmin = Min (distmin, pts1.Distance(pts2));
// on recopie localement ns1, ns2, np afin de ne pas ecraser les champs ! // ns1, ns2, np are copied locally to avoid crushing the fields !
ns1 = nsurf1; ns1 = nsurf1;
ns2 = nsurf2; ns2 = nsurf2;
np = nplan; np = nplan;
@ -1339,13 +1339,13 @@ void BlendFunc_ConstRad::Section(const Blend_Point& P,
norm1 = nplan.Crossed(ns1).Magnitude(); norm1 = nplan.Crossed(ns1).Magnitude();
norm2 = nplan.Crossed(ns2).Magnitude(); norm2 = nplan.Crossed(ns2).Magnitude();
if (norm1 < Eps) { if (norm1 < Eps) {
norm1 = 1; // Insufisant, mais il ne faut pas planter norm1 = 1; // Unsatisfactory, but it is not necessary to stop
//#if DEB //#if DEB
// cout << " ConstRad : Surface singuliere " << endl; // cout << " ConstRad : Surface singuliere " << endl;
//#endif //#endif
} }
if (norm2 < Eps) { if (norm2 < Eps) {
norm2 = 1; // Insufisant, mais il ne faut pas planter norm2 = 1; // Unsatisfactory, but it is not necessary to stop
//#if DEB //#if DEB
// cout << " ConstRad : Surface singuliere " << endl; // cout << " ConstRad : Surface singuliere " << endl;
//#endif //#endif
@ -1356,8 +1356,8 @@ void BlendFunc_ConstRad::Section(const Blend_Point& P,
Center.SetXYZ(pts1.XYZ()+ray1*ns1.XYZ()); Center.SetXYZ(pts1.XYZ()+ray1*ns1.XYZ());
// on oriente ns1 (resp. ns2) du centre vers pts1 (resp. pts2), // ns1 (resp. ns2) is oriented from center to pts1 (resp. pts2),
// et on rend direct le triedre ns1,ns2,nplan. // and the triedron ns1,ns2,nplan is made direct.
if (ray1 > 0.) { if (ray1 > 0.) {
ns1.Reverse(); ns1.Reverse();
@ -1405,11 +1405,11 @@ Standard_Boolean BlendFunc_ConstRad::Section
P.ParametersOnS1(sol(1),sol(2)); P.ParametersOnS1(sol(1),sol(2));
P.ParametersOnS2(sol(3),sol(4)); P.ParametersOnS2(sol(3),sol(4));
// Calculs des equations // Calculation of equations
ComputeValues(sol, 1, Standard_True, prm); ComputeValues(sol, 1, Standard_True, prm);
distmin = Min (distmin, pts1.Distance(pts2)); distmin = Min (distmin, pts1.Distance(pts2));
// on recopie localement ns1, ns2, np afin de ne pas ecraser les champs ! // ns1, ns2, np are copied locally to avoid crushing the fields !
ns1 = nsurf1; ns1 = nsurf1;
ns2 = nsurf2; ns2 = nsurf2;
np = nplan; np = nplan;
@ -1417,7 +1417,7 @@ Standard_Boolean BlendFunc_ConstRad::Section
if ( ! pts1.IsEqual(pts2, 1.e-4)) { if ( ! pts1.IsEqual(pts2, 1.e-4)) {
// Calcul des derives Traitement Normal // Calculation of derivates Processing Normal
math_Gauss Resol(DEDX, 1.e-9); math_Gauss Resol(DEDX, 1.e-9);
if (Resol.IsDone()) { if (Resol.IsDone()) {
@ -1443,7 +1443,7 @@ Standard_Boolean BlendFunc_ConstRad::Section
} }
// Les poles 2d // Tops 2d
Poles2d(Poles2d.Lower()).SetCoord(sol(1),sol(2)); Poles2d(Poles2d.Lower()).SetCoord(sol(1),sol(2));
Poles2d(Poles2d.Upper()).SetCoord(sol(3),sol(4)); Poles2d(Poles2d.Upper()).SetCoord(sol(3),sol(4));
if (!istgt) { if (!istgt) {
@ -1451,7 +1451,7 @@ Standard_Boolean BlendFunc_ConstRad::Section
DPoles2d(Poles2d.Upper()).SetCoord(secmember(3),secmember(4)); DPoles2d(Poles2d.Upper()).SetCoord(secmember(3),secmember(4));
} }
// on traite le cas linear... // the linear case is processed...
if (mySShape == BlendFunc_Linear) { if (mySShape == BlendFunc_Linear) {
Poles(low) = pts1; Poles(low) = pts1;
Poles(upp) = pts2; Poles(upp) = pts2;
@ -1466,17 +1466,17 @@ Standard_Boolean BlendFunc_ConstRad::Section
return (!istgt); return (!istgt);
} }
// Cas du cercle // Case of the circle
norm1 = nplan.Crossed(ns1).Magnitude(); norm1 = nplan.Crossed(ns1).Magnitude();
norm2 = nplan.Crossed(ns2).Magnitude(); norm2 = nplan.Crossed(ns2).Magnitude();
if (norm1 < Eps) { if (norm1 < Eps) {
norm1 = 1; // Insufisant, mais il ne faut pas planter norm1 = 1; // Unsatisfactory, but it is not necessary to stop
#if DEB #if DEB
cout << " ConstRad : Surface singuliere " << endl; cout << " ConstRad : Surface singuliere " << endl;
#endif #endif
} }
if (norm2 < Eps) { if (norm2 < Eps) {
norm2 = 1; // Insufisant, mais il ne faut pas planter norm2 = 1; // Unsatisfactory, but it is not necessary to stop
#if DEB #if DEB
cout << " ConstRad : Surface singuliere " << endl; cout << " ConstRad : Surface singuliere " << endl;
#endif #endif
@ -1490,8 +1490,8 @@ Standard_Boolean BlendFunc_ConstRad::Section
tgc.SetLinearForm(ray1,dnorm1w,tg1); // = tg1.Added(ray1*dn1w); tgc.SetLinearForm(ray1,dnorm1w,tg1); // = tg1.Added(ray1*dn1w);
} }
// On oriente ns1 du centre vers pts1, et ns2 du centre vers pts2 // ns1 is oriented from the center to pts1, and ns2 from the center to pts2
// et on rend le triedre ns1,ns2,nplan direct // and the trihedron ns1,ns2,nplan is made direct
if (ray1 > 0.) { if (ray1 > 0.) {
ns1.Reverse(); ns1.Reverse();
@ -1609,7 +1609,7 @@ Standard_Boolean BlendFunc_ConstRad::Section
# endif # endif
*/ */
// Calculs des equations // Calculation of equations
ComputeValues(X, 2, Standard_True, prm); ComputeValues(X, 2, Standard_True, prm);
distmin = Min (distmin, pts1.Distance(pts2)); distmin = Min (distmin, pts1.Distance(pts2));
@ -1707,19 +1707,19 @@ Standard_Boolean BlendFunc_ConstRad::Section
#endif #endif
*/ */
// on recopie localement ns1, ns2, np afin de ne pas ecraser les champs ! // ns1, ns2, np are copied locally to avois crushing the fields !
ns1 = nsurf1; ns1 = nsurf1;
ns2 = nsurf2; ns2 = nsurf2;
np = nplan; np = nplan;
dnp = dnplan; dnp = dnplan;
d2np = d2nplan; d2np = d2nplan;
// Calcul des derives // Calculation of derivatives
if ( ! pts1.IsEqual(pts2, 1.e-4)) { if ( ! pts1.IsEqual(pts2, 1.e-4)) {
math_Gauss Resol(DEDX, 1.e-9); // !Tol a affiner !!!!! math_Gauss Resol(DEDX, 1.e-9); // Precise tolerance !!!!!
// Calcul des derives Traitement Normal // Calculation of derivatives Processing Normal
if (Resol.IsDone()) { if (Resol.IsDone()) {
Resol.Solve(-DEDT, sol); Resol.Solve(-DEDT, sol);
D2EDX2.Multiply(sol, D2DXdSdt); D2EDX2.Multiply(sol, D2DXdSdt);
@ -1779,7 +1779,7 @@ Standard_Boolean BlendFunc_ConstRad::Section
d2norm2w.SetLinearForm(secmember(3),dndu2, secmember(4),dndv2, temp); d2norm2w.SetLinearForm(secmember(3),dndu2, secmember(4),dndv2, temp);
} }
// Les poles 2d // Tops 2d
Poles2d(Poles2d.Lower()).SetCoord(X(1),X(2)); Poles2d(Poles2d.Lower()).SetCoord(X(1),X(2));
Poles2d(Poles2d.Upper()).SetCoord(X(3),X(4)); Poles2d(Poles2d.Upper()).SetCoord(X(3),X(4));
if (!istgt) { if (!istgt) {
@ -1789,7 +1789,7 @@ Standard_Boolean BlendFunc_ConstRad::Section
D2Poles2d(Poles2d.Upper()).SetCoord(secmember(3), secmember(4)); D2Poles2d(Poles2d.Upper()).SetCoord(secmember(3), secmember(4));
} }
// on traite le cas linear... // linear case is processed...
if (mySShape == BlendFunc_Linear) { if (mySShape == BlendFunc_Linear) {
Poles(low) = pts1; Poles(low) = pts1;
Poles(upp) = pts2; Poles(upp) = pts2;
@ -1808,17 +1808,17 @@ Standard_Boolean BlendFunc_ConstRad::Section
return (!istgt); return (!istgt);
} }
// Cas du cercle // Case of circle
norm1 = nplan.Crossed(ns1).Magnitude(); norm1 = nplan.Crossed(ns1).Magnitude();
norm2 = nplan.Crossed(ns2).Magnitude(); norm2 = nplan.Crossed(ns2).Magnitude();
if (norm1 < Eps) { if (norm1 < Eps) {
norm1 = 1; // Insufisant, mais il ne faut pas planter norm1 = 1; // Unsatisfactory, but it is not necessary to stop
#if DEB #if DEB
cout << " ConstRad : Surface singuliere " << endl; cout << " ConstRad : Surface singuliere " << endl;
#endif #endif
} }
if (norm2 < Eps) { if (norm2 < Eps) {
norm2 = 1; // Insufisant, mais il ne faut pas planter norm2 = 1; // Unsatisfactory, but it is not necessary to stop
#if DEB #if DEB
cout << " ConstRad : Surface singuliere " << endl; cout << " ConstRad : Surface singuliere " << endl;
#endif #endif
@ -1833,8 +1833,8 @@ Standard_Boolean BlendFunc_ConstRad::Section
dtgc.SetLinearForm(ray1, d2norm1w, dtg1); dtgc.SetLinearForm(ray1, d2norm1w, dtg1);
} }
// On oriente ns1 du centre vers pts1, et ns2 du centre vers pts2 // ns1 is oriented from the center to pts1 and ns2 from the center to pts2
// et on rend le triedre ns1,ns2,nplan direct // trihedron ns1,ns2,nplan is made direct
if (ray1 > 0.) { if (ray1 > 0.) {
ns1.Reverse(); ns1.Reverse();
@ -1908,7 +1908,7 @@ gp_Ax1 BlendFunc_ConstRad::AxeRot (const Standard_Real Prm)
axrot.SetDirection(dirax); axrot.SetDirection(dirax);
} }
else { else {
axrot.SetDirection(np); // Pour ne pas planter axrot.SetDirection(np); // To avoid stop
} }
if (dnp.Magnitude() >= gp::Resolution()) { if (dnp.Magnitude() >= gp::Resolution()) {
oriax.SetXYZ(ptgui.XYZ()+ oriax.SetXYZ(ptgui.XYZ()+

34
src/BlendFunc/BlendFunc_ConstRadInv.cxx
View File

@ -202,7 +202,7 @@ Standard_Boolean BlendFunc_ConstRadInv::Value(const math_Vector& X,
//#endif //#endif
} }
if (norm2 < Eps) { if (norm2 < Eps) {
norm2 = 1; // Insufisant, mais il ne faut pas planter norm2 = 1; // Unsatisfactory, but it is not necessary to stop
//#if DEB //#if DEB
// cout << " ConstRadInv : Surface singuliere " << endl; // cout << " ConstRadInv : Surface singuliere " << endl;
//#endif //#endif
@ -288,13 +288,13 @@ Standard_Boolean BlendFunc_ConstRadInv::Derivatives(const math_Vector& X,
norm1 = ncrossns1.Magnitude(); norm1 = ncrossns1.Magnitude();
norm2 = ncrossns2.Magnitude(); norm2 = ncrossns2.Magnitude();
if (norm1 < Eps) { if (norm1 < Eps) {
norm1 = 1; // Insufisant, mais il ne faut pas planter norm1 = 1; // Unsatisfactory, but it is not necessary to stop
#if DEB #if DEB
cout << " ConstRadInv : Surface singuliere " << endl; cout << " ConstRadInv : Surface singuliere " << endl;
#endif #endif
} }
if (norm2 < Eps) { if (norm2 < Eps) {
norm2 = 1; // Insufisant, mais il ne faut pas planter norm2 = 1; // Unsatisfactory, but it is not necessary to stop
#if DEB #if DEB
cout << " ConstRadInv : Surface singuliere " << endl; cout << " ConstRadInv : Surface singuliere " << endl;
#endif #endif
@ -303,7 +303,7 @@ Standard_Boolean BlendFunc_ConstRadInv::Derivatives(const math_Vector& X,
ndotns1 = nplan.Dot(ns1); ndotns1 = nplan.Dot(ns1);
ndotns2 = nplan.Dot(ns2); ndotns2 = nplan.Dot(ns2);
// Derivee par rapport a u1 // Derived compared to u1
temp = d2u1.Crossed(d1v1).Added(d1u1.Crossed(d2uv1)); temp = d2u1.Crossed(d1v1).Added(d1u1.Crossed(d2uv1));
grosterme = ncrossns1.Dot(nplan.Crossed(temp))/norm1/norm1; grosterme = ncrossns1.Dot(nplan.Crossed(temp))/norm1/norm1;
@ -313,7 +313,7 @@ Standard_Boolean BlendFunc_ConstRadInv::Derivatives(const math_Vector& X,
d1u1); d1u1);
// Derivee par rapport a v1 // Derived compared to v1
temp = d2uv1.Crossed(d1v1).Added(d1u1.Crossed(d2v1)); temp = d2uv1.Crossed(d1v1).Added(d1u1.Crossed(d2v1));
grosterme = ncrossns1.Dot(nplan.Crossed(temp))/norm1/norm1; grosterme = ncrossns1.Dot(nplan.Crossed(temp))/norm1/norm1;
@ -338,8 +338,8 @@ Standard_Boolean BlendFunc_ConstRadInv::Derivatives(const math_Vector& X,
} }
// derivee par rapport a w (parametre sur ligne guide) // derived compared to w (parameter on guideline)
// On considere ici que le rayon est constant // It is assumed that the radius is constant
grosterme = ncrossns1.Dot(dnplan.Crossed(ns1))/norm1/norm1; grosterme = ncrossns1.Dot(dnplan.Crossed(ns1))/norm1/norm1;
resul1.SetLinearForm(-ray1/norm1*(grosterme*ndotns1-dnplan.Dot(ns1)),nplan, resul1.SetLinearForm(-ray1/norm1*(grosterme*ndotns1-dnplan.Dot(ns1)),nplan,
@ -359,7 +359,7 @@ Standard_Boolean BlendFunc_ConstRadInv::Derivatives(const math_Vector& X,
// Derivee par rapport a u2 // Derived compared to u2
temp = d2u2.Crossed(d1v2).Added(d1u2.Crossed(d2uv2)); temp = d2u2.Crossed(d1v2).Added(d1u2.Crossed(d2uv2));
grosterme = ncrossns2.Dot(nplan.Crossed(temp))/norm2/norm2; grosterme = ncrossns2.Dot(nplan.Crossed(temp))/norm2/norm2;
resul1.SetLinearForm(ray2/norm2*(grosterme*ndotns2-nplan.Dot(temp)),nplan, resul1.SetLinearForm(ray2/norm2*(grosterme*ndotns2-nplan.Dot(temp)),nplan,
@ -367,7 +367,7 @@ Standard_Boolean BlendFunc_ConstRadInv::Derivatives(const math_Vector& X,
ray2/norm2,temp); ray2/norm2,temp);
resul1.Subtract(d1u2); resul1.Subtract(d1u2);
// Derivee par rapport a v2 // Derived compared to v2
temp = d2uv2.Crossed(d1v2).Added(d1u2.Crossed(d2v2)); temp = d2uv2.Crossed(d1v2).Added(d1u2.Crossed(d2v2));
grosterme = ncrossns2.Dot(nplan.Crossed(temp))/norm2/norm2; grosterme = ncrossns2.Dot(nplan.Crossed(temp))/norm2/norm2;
resul2.SetLinearForm(ray2/norm2*(grosterme*ndotns2-nplan.Dot(temp)),nplan, resul2.SetLinearForm(ray2/norm2*(grosterme*ndotns2-nplan.Dot(temp)),nplan,
@ -469,13 +469,13 @@ Standard_Boolean BlendFunc_ConstRadInv::Values(const math_Vector& X,
norm1 = ncrossns1.Magnitude(); norm1 = ncrossns1.Magnitude();
norm2 = ncrossns2.Magnitude(); norm2 = ncrossns2.Magnitude();
if (norm1 < Eps) { if (norm1 < Eps) {
norm1 = 1; // Insufisant, mais il ne faut pas planter norm1 = 1; // Unsatisfactory, but it is not necessary to stop
#if DEB #if DEB
cout << " ConstRadInv : Surface singuliere " << endl; cout << " ConstRadInv : Surface singuliere " << endl;
#endif #endif
} }
if (norm2 < Eps) { if (norm2 < Eps) {
norm2 = 1; // Insufisant, mais il ne faut pas planter norm2 = 1; // Unsatisfactory, but it is not necessary to stop
#if DEB #if DEB
cout << " ConstRadInv : Surface singuliere " << endl; cout << " ConstRadInv : Surface singuliere " << endl;
#endif #endif
@ -493,7 +493,7 @@ Standard_Boolean BlendFunc_ConstRadInv::Values(const math_Vector& X,
F(3) = resul1.Y(); F(3) = resul1.Y();
F(4) = resul1.Z(); F(4) = resul1.Z();
// Derivee par rapport a u1 // Derived compared to u1
temp = d2u1.Crossed(d1v1).Added(d1u1.Crossed(d2uv1)); temp = d2u1.Crossed(d1v1).Added(d1u1.Crossed(d2uv1));
grosterme = ncrossns1.Dot(nplan.Crossed(temp))/norm1/norm1; grosterme = ncrossns1.Dot(nplan.Crossed(temp))/norm1/norm1;
@ -503,7 +503,7 @@ Standard_Boolean BlendFunc_ConstRadInv::Values(const math_Vector& X,
d1u1); d1u1);
// Derivee par rapport a v1 // Derived compared to v1
temp = d2uv1.Crossed(d1v1).Added(d1u1.Crossed(d2v1)); temp = d2uv1.Crossed(d1v1).Added(d1u1.Crossed(d2v1));
grosterme = ncrossns1.Dot(nplan.Crossed(temp))/norm1/norm1; grosterme = ncrossns1.Dot(nplan.Crossed(temp))/norm1/norm1;
@ -527,8 +527,8 @@ Standard_Boolean BlendFunc_ConstRadInv::Values(const math_Vector& X,
D(4,4) = resul2.Z(); D(4,4) = resul2.Z();
} }
// derivee par rapport a w (parametre sur ligne guide) // derived compared to w (parameter on guideline)
// On considere ici que le rayon est constant // It is assumed that the raduis is constant
grosterme = ncrossns1.Dot(dnplan.Crossed(ns1))/norm1/norm1; grosterme = ncrossns1.Dot(dnplan.Crossed(ns1))/norm1/norm1;
resul1.SetLinearForm(-ray1/norm1*(grosterme*ndotns1-dnplan.Dot(ns1)),nplan, resul1.SetLinearForm(-ray1/norm1*(grosterme*ndotns1-dnplan.Dot(ns1)),nplan,
@ -548,7 +548,7 @@ Standard_Boolean BlendFunc_ConstRadInv::Values(const math_Vector& X,
// Derivee par rapport a u2 // Derived compared to u2
temp = d2u2.Crossed(d1v2).Added(d1u2.Crossed(d2uv2)); temp = d2u2.Crossed(d1v2).Added(d1u2.Crossed(d2uv2));
grosterme = ncrossns2.Dot(nplan.Crossed(temp))/norm2/norm2; grosterme = ncrossns2.Dot(nplan.Crossed(temp))/norm2/norm2;
resul1.SetLinearForm(ray2/norm2*(grosterme*ndotns2-nplan.Dot(temp)),nplan, resul1.SetLinearForm(ray2/norm2*(grosterme*ndotns2-nplan.Dot(temp)),nplan,
@ -556,7 +556,7 @@ Standard_Boolean BlendFunc_ConstRadInv::Values(const math_Vector& X,
ray2/norm2,temp); ray2/norm2,temp);
resul1.Subtract(d1u2); resul1.Subtract(d1u2);
// Derivee par rapport a v2 // Derived compared to v2
temp = d2uv2.Crossed(d1v2).Added(d1u2.Crossed(d2v2)); temp = d2uv2.Crossed(d1v2).Added(d1u2.Crossed(d2v2));
grosterme = ncrossns2.Dot(nplan.Crossed(temp))/norm2/norm2; grosterme = ncrossns2.Dot(nplan.Crossed(temp))/norm2/norm2;
resul2.SetLinearForm(ray2/norm2*(grosterme*ndotns2-nplan.Dot(temp)),nplan, resul2.SetLinearForm(ray2/norm2*(grosterme*ndotns2-nplan.Dot(temp)),nplan,

14
src/BlendFunc/BlendFunc_Corde.cdl
View File

@ -6,11 +6,11 @@
class Corde from BlendFunc class Corde from BlendFunc
---Purpose: Cette fonction calcule le point pts sur la courbe intersection ---Purpose: This function calculates point (pts) on the curve of
-- entre la normale a une courbe (guide) en un parametre choisi -- intersection between the normal to a curve (guide)
-- et une surface (surf), tel que pts soit a une distance -- in a chosen parameter and a surface (surf), so
-- donnee de guide. -- that pts was at a given distance from the guide.
-- X(1),X(2) sont les parametres U,V de pts sur surf. -- X(1),X(2) are the parameters U,V of pts on surf.
uses Vector from math, uses Vector from math,
@ -110,8 +110,8 @@ is
DerFguide(me: in out; Sol : Vector from math; DerF : out Vec2d from gp); DerFguide(me: in out; Sol : Vector from math; DerF : out Vec2d from gp);
---Purpose: Derivee de la fonction par rapport au parametre ---Purpose: Derived of the function compared to the parameter
-- de la ligne guide -- of the guideline
IsSolution(me : in out; IsSolution(me : in out;

2
src/BlendFunc/BlendFunc_Corde.cxx
View File

@ -199,7 +199,7 @@ Standard_Boolean BlendFunc_Corde::IsSolution(const math_Vector& Sol, const Stand
secmember(2) = 2.*d1gui.Dot(temp); secmember(2) = 2.*d1gui.Dot(temp);
// gradsol*der = secmember // gradsol*der = secmember
// avec der(1) = dU/dW, der(2) = dU/dW, W est le parametre de guide // with der(1) = dU/dW, der(2) = dU/dW, W is the guide parameter
math_Gauss Resol(gradsol); math_Gauss Resol(gradsol);
if (Resol.IsDone()) { if (Resol.IsDone()) {

213
src/BlendFunc/BlendFunc_EvolRad.cxx
View File

@ -3,11 +3,6 @@
// Author: Jacques GOUSSARD // Author: Jacques GOUSSARD
// Copyright: OPEN CASCADE 1993 // Copyright: OPEN CASCADE 1993
// Modified 10/09/1996 PMN Ajout de (Nb)Intervalles, IsRationnal
// + Optimisation.
// Modified 26/04/1997 PMN Traitement des Singularites
// Modified 23/06/1997 PMN Pb de division par 0
// Modified 20/02/1998 PMN Gestion des surfaces singulieres
#include <BlendFunc_EvolRad.ixx> #include <BlendFunc_EvolRad.ixx>
@ -35,39 +30,39 @@ static void FusionneIntervalles(const TColStd_Array1OfReal& I1,
{ {
Standard_Integer ind1=1, ind2=1; Standard_Integer ind1=1, ind2=1;
Standard_Real Epspar = Precision::PConfusion()*0.99; Standard_Real Epspar = Precision::PConfusion()*0.99;
// en suposant que le positionement fonctionne a PConfusion()/2 // supposed that positioning works with PConfusion()/2
Standard_Real v1, v2; Standard_Real v1, v2;
// Initialisations : les IND1 et IND2 pointent sur le 1er element // Initialisation : IND1 and IND2 point at the 1st element
// de chacune des 2 tables a traiter.INDS pointe sur le dernier // of each of 2 tables to be processed. INDS points at the last
// element cree de TABSOR // element of TABSOR
//--- On remplit TABSOR en parcourant TABLE1 et TABLE2 simultanement --- //--- TABSOR is filled by parsing TABLE1 and TABLE2 simultaneously ---
//------------------ en eliminant les occurrences multiples ------------ //------------------ by removing multiple occurrencies ------------
while ((ind1<=I1.Upper()) && (ind2<=I2.Upper())) { while ((ind1<=I1.Upper()) && (ind2<=I2.Upper())) {
v1 = I1(ind1); v1 = I1(ind1);
v2 = I2(ind2); v2 = I2(ind2);
if (Abs(v1-v2)<= Epspar) { if (Abs(v1-v2)<= Epspar) {
// Ici les elements de I1 et I2 conviennent . // Here elements of I1 and I2 are suitable.
Seq.Append((v1+v2)/2); Seq.Append((v1+v2)/2);
ind1++; ind1++;
ind2++; ind2++;
} }
else if (v1 < v2) { else if (v1 < v2) {
// Ici l' element de I1 convient. // Here the element of I1 is suitable.
Seq.Append(v1); Seq.Append(v1);
ind1++; ind1++;
} }
else { else {
// Ici l' element de TABLE2 convient. // Here the element of TABLE2 is suitable.
Seq.Append(v2); Seq.Append(v2);
ind2++; ind2++;
} }
} }
if (ind1>I1.Upper()) { if (ind1>I1.Upper()) {
//----- Ici I1 est epuise, on complete avec la fin de TABLE2 ------- //----- Here I1 is empty, to be completed with the end of TABLE2 -------
for (; ind2<=I2.Upper(); ind2++) { for (; ind2<=I2.Upper(); ind2++) {
Seq.Append(I2(ind2)); Seq.Append(I2(ind2));
@ -75,7 +70,7 @@ static void FusionneIntervalles(const TColStd_Array1OfReal& I1,
} }
if (ind2>I2.Upper()) { if (ind2>I2.Upper()) {
//----- Ici I2 est epuise, on complete avec la fin de I1 ------- //----- Here I2 is empty, to be completed with the end of I1 -------
for (; ind1<=I1.Upper(); ind1++) { for (; ind1<=I1.Upper(); ind1++) {
Seq.Append(I1(ind1)); Seq.Append(I1(ind1));
@ -110,7 +105,7 @@ BlendFunc_EvolRad::BlendFunc_EvolRad(const Handle(Adaptor3d_HSurface)& S1,
fevol = Law; fevol = Law;
tevol = Law; tevol = Law;
// Initialisaton des variables de controle du cache. // Initialisaton of cash control variables.
tval = -9.876e100; tval = -9.876e100;
xval.Init(-9.876e100); xval.Init(-9.876e100);
myXOrder = -1; myXOrder = -1;
@ -183,11 +178,11 @@ void BlendFunc_EvolRad::Set(const BlendFunc_SectionShape TypeSection)
//======================================================================= //=======================================================================
//function : ComputeValues //function : ComputeValues
//purpose : Passage OBLIGATOIRE pour tous les calculs //purpose : OBLIGATORY passage for all computations
// Cette methode gere les positionemment sur Surfaces et Courbe // This method manages the positioning on Surfaces and Curves
// Calcul les equation et leurs derives partielle // Partial calculation of equations and their derivatives
// Stock certains resultat intermediaire dans les champs pour etre // Storage of some intermediary results in fields to be
// utiliser dans d'autre methodes. // used in other methods.
//======================================================================= //=======================================================================
Standard_Boolean BlendFunc_EvolRad::ComputeValues(const math_Vector& X, Standard_Boolean BlendFunc_EvolRad::ComputeValues(const math_Vector& X,
@ -195,7 +190,7 @@ Standard_Boolean BlendFunc_EvolRad::ComputeValues(const math_Vector& X,
const Standard_Boolean byParam, const Standard_Boolean byParam,
const Standard_Real Param) const Standard_Real Param)
{ {
// declaration statique afin d'eviter la realloc systematique // static declaration to avoid systematic realloc
static gp_Vec d3u1,d3v1,d3uuv1,d3uvv1,d3u2,d3v2,d3uuv2,d3uvv2; static gp_Vec d3u1,d3v1,d3uuv1,d3uvv1,d3u2,d3v2,d3uuv2,d3uvv2;
static gp_Vec d1gui, d2gui, d3gui; static gp_Vec d1gui, d2gui, d3gui;
@ -203,10 +198,10 @@ Standard_Boolean BlendFunc_EvolRad::ComputeValues(const math_Vector& X,
static Standard_Real invnormtg, dinvnormtg; static Standard_Real invnormtg, dinvnormtg;
Standard_Real T = Param, aux; Standard_Real T = Param, aux;
// Cas du parametre implicite // Case of implicit parameter
if ( !byParam) { T = param;} if ( !byParam) { T = param;}
// Le travail est il dejas fait ? // The work is done already?
Standard_Boolean lX_OK = (Order<=myXOrder); Standard_Boolean lX_OK = (Order<=myXOrder);
Standard_Integer ii; Standard_Integer ii;
for (ii=1; ((ii<=X.Length()) && lX_OK); ii++) { for (ii=1; ((ii<=X.Length()) && lX_OK); ii++) {
@ -220,12 +215,12 @@ Standard_Boolean BlendFunc_EvolRad::ComputeValues(const math_Vector& X,
return Standard_True; return Standard_True;
} }
// Traitement de t // Processing of t
if (!t_OK) { if (!t_OK) {
tval = T; tval = T;
if (byParam) { myTOrder = Order;} if (byParam) { myTOrder = Order;}
else { myTOrder = 0;} else { myTOrder = 0;}
//----- Positionement sur la courbe et la loi---------------- //----- Positioning on the curve and the law----------------
switch (myTOrder) { switch (myTOrder) {
case 0 : case 0 :
{ {
@ -269,11 +264,11 @@ Standard_Boolean BlendFunc_EvolRad::ComputeValues(const math_Vector& X,
} }
} }
// Traitement de X // Processing of X
if (!lX_OK) { if (!lX_OK) {
xval = X; xval = X;
myXOrder = Order; myXOrder = Order;
//-------------- Positionement sur les surfaces ----------------- //-------------- Positioning on surfaces -----------------
switch (myXOrder) { switch (myXOrder) {
case 0 : case 0 :
{ {
@ -308,7 +303,7 @@ Standard_Boolean BlendFunc_EvolRad::ComputeValues(const math_Vector& X,
default: default:
return Standard_False; return Standard_False;
} }
// Cas des surfaces degeneree // Case of degenerated surfaces
if (nsurf1.Magnitude() < Eps ) { if (nsurf1.Magnitude() < Eps ) {
// gp_Vec normal; // gp_Vec normal;
gp_Pnt2d P(X(1), X(2)); gp_Pnt2d P(X(1), X(2));
@ -323,7 +318,7 @@ Standard_Boolean BlendFunc_EvolRad::ComputeValues(const math_Vector& X,
} }
} }
// -------------------- Positionement a l'ordre 0 --------------------- // -------------------- Positioning of order 0 ---------------------
Standard_Real invnorm1, invnorm2, ndotns1, ndotns2, theD; Standard_Real invnorm1, invnorm2, ndotns1, ndotns2, theD;
Standard_Real ray1 = sg1*ray; Standard_Real ray1 = sg1*ray;
Standard_Real ray2 = sg2*ray; Standard_Real ray2 = sg2*ray;
@ -342,14 +337,14 @@ Standard_Boolean BlendFunc_EvolRad::ComputeValues(const math_Vector& X,
if (invnorm1 > Eps) invnorm1 = ((Standard_Real) 1) /invnorm1; if (invnorm1 > Eps) invnorm1 = ((Standard_Real) 1) /invnorm1;
else { else {
invnorm1 = 1; // Insufisant, mais il ne faut pas planter invnorm1 = 1; // Unsatisfactory, but it is not necessary to stop
#if DEB #if DEB
cout << " EvolRad : Surface singuliere " << endl; cout << " EvolRad : Surface singuliere " << endl;
#endif #endif
} }
if (invnorm2 > Eps) invnorm2 = ((Standard_Real) 1) /invnorm2; if (invnorm2 > Eps) invnorm2 = ((Standard_Real) 1) /invnorm2;
else { else {
invnorm2 = 1; // Insufisant, mais il ne faut pas planter invnorm2 = 1; // Unsatisfactory, but it is not necessary to stop
#if DEB #if DEB
cout << " EvolRad : Surface singuliere " << endl; cout << " EvolRad : Surface singuliere " << endl;
#endif #endif
@ -371,7 +366,7 @@ Standard_Boolean BlendFunc_EvolRad::ComputeValues(const math_Vector& X,
E(3) = resul.Y(); E(3) = resul.Y();
E(4) = resul.Z(); E(4) = resul.Z();
// -------------------- Positionement a l'ordre 1 --------------------- // -------------------- Positioning of order 1 ---------------------
if (Order >= 1) { if (Order >= 1) {
Standard_Real grosterme, cube, carre; Standard_Real grosterme, cube, carre;
@ -381,7 +376,7 @@ Standard_Boolean BlendFunc_EvolRad::ComputeValues(const math_Vector& X,
DEDX(1,4) = nplan.Dot(d1v2)/2; DEDX(1,4) = nplan.Dot(d1v2)/2;
cube =invnorm1*invnorm1*invnorm1; cube =invnorm1*invnorm1*invnorm1;
// Derivee par rapport a u1 // Derived compared to u1
grosterme = - ncrossns1.Dot(nplan.Crossed(dns1u1))*cube; grosterme = - ncrossns1.Dot(nplan.Crossed(dns1u1))*cube;
dndu1.SetLinearForm( grosterme*ndotns1 dndu1.SetLinearForm( grosterme*ndotns1
+ invnorm1*nplan.Dot(dns1u1), nplan, + invnorm1*nplan.Dot(dns1u1), nplan,
@ -393,7 +388,7 @@ Standard_Boolean BlendFunc_EvolRad::ComputeValues(const math_Vector& X,
DEDX(3,1) = resul.Y(); DEDX(3,1) = resul.Y();
DEDX(4,1) = resul.Z(); DEDX(4,1) = resul.Z();
// Derivee par rapport a v1 // Derived compared to v1
grosterme = - ncrossns1.Dot(nplan.Crossed(dns1v1))*cube; grosterme = - ncrossns1.Dot(nplan.Crossed(dns1v1))*cube;
dndv1.SetLinearForm( grosterme*ndotns1 dndv1.SetLinearForm( grosterme*ndotns1
+invnorm1*nplan.Dot(dns1v1), nplan, +invnorm1*nplan.Dot(dns1v1), nplan,
@ -418,7 +413,7 @@ Standard_Boolean BlendFunc_EvolRad::ComputeValues(const math_Vector& X,
DEDX(3,3) = resul.Y(); DEDX(3,3) = resul.Y();
DEDX(4,3) = resul.Z(); DEDX(4,3) = resul.Z();
// Derivee par rapport a v2 // Derived compared to v2
grosterme = -ncrossns2.Dot(nplan.Crossed(dns1v2))*cube; grosterme = -ncrossns2.Dot(nplan.Crossed(dns1v2))*cube;
dndv2.SetLinearForm( grosterme*ndotns2 dndv2.SetLinearForm( grosterme*ndotns2
+invnorm2*nplan.Dot(dns1v2), nplan, +invnorm2*nplan.Dot(dns1v2), nplan,
@ -432,13 +427,13 @@ Standard_Boolean BlendFunc_EvolRad::ComputeValues(const math_Vector& X,
if (byParam) { if (byParam) {
temp.SetXYZ( (pts1.XYZ()+pts2.XYZ())/2 - ptgui.XYZ()); temp.SetXYZ( (pts1.XYZ()+pts2.XYZ())/2 - ptgui.XYZ());
// Derivee de n1 par rapport a w // Derived from n1 compared to w
grosterme = ncrossns1.Dot(dnplan.Crossed(nsurf1))*invnorm1*invnorm1; grosterme = ncrossns1.Dot(dnplan.Crossed(nsurf1))*invnorm1*invnorm1;
dn1w.SetLinearForm((dnplan.Dot(nsurf1)-grosterme*ndotns1)*invnorm1, nplan, dn1w.SetLinearForm((dnplan.Dot(nsurf1)-grosterme*ndotns1)*invnorm1, nplan,
ndotns1*invnorm1,dnplan, ndotns1*invnorm1,dnplan,
grosterme*invnorm1,nsurf1); grosterme*invnorm1,nsurf1);
// Derivee de n2 par rapport a w // Derived from n2 compared to w
grosterme = ncrossns2.Dot(dnplan.Crossed(nsurf2))*invnorm2*invnorm2; grosterme = ncrossns2.Dot(dnplan.Crossed(nsurf2))*invnorm2*invnorm2;
dn2w.SetLinearForm((dnplan.Dot(nsurf2)-grosterme*ndotns2)*invnorm2,nplan, dn2w.SetLinearForm((dnplan.Dot(nsurf2)-grosterme*ndotns2)*invnorm2,nplan,
ndotns2*invnorm2,dnplan, ndotns2*invnorm2,dnplan,
@ -454,7 +449,7 @@ Standard_Boolean BlendFunc_EvolRad::ComputeValues(const math_Vector& X,
DEDT(3) = resul.Y(); DEDT(3) = resul.Y();
DEDT(4) = resul.Z(); DEDT(4) = resul.Z();
} }
// ------ Positionemement a l'ordre 2 ----------------------------- // ------ Positioning of order 2 -----------------------------
if (Order == 2) { if (Order == 2) {
// gp_Vec d2ndu1, d2ndu2, d2ndv1, d2ndv2, d2nduv1, d2nduv2; // gp_Vec d2ndu1, d2ndu2, d2ndv1, d2ndv2, d2nduv1, d2nduv2;
gp_Vec d2ns1u1, d2ns1u2, d2ns1v1, d2ns1v2, d2ns1uv1, d2ns1uv2; gp_Vec d2ns1u1, d2ns1u2, d2ns1v1, d2ns1v2, d2ns1uv1, d2ns1uv2;
@ -474,8 +469,8 @@ Standard_Boolean BlendFunc_EvolRad::ComputeValues(const math_Vector& X,
// ================ // ================
carre = invnorm1*invnorm1; carre = invnorm1*invnorm1;
cube = carre*invnorm1; cube = carre*invnorm1;
// Derivee double par rapport a u1 // Derived double compared to u1
// Derivation de la norme // Derived from the norm
d2ns1u1.SetLinearForm(1, d3u1.Crossed(d1v1), d2ns1u1.SetLinearForm(1, d3u1.Crossed(d1v1),
2, d2u1.Crossed(d2uv1), 2, d2u1.Crossed(d2uv1),
1, d1u1.Crossed(d3uuv1)); 1, d1u1.Crossed(d3uuv1));
@ -499,8 +494,8 @@ Standard_Boolean BlendFunc_EvolRad::ComputeValues(const math_Vector& X,
D2EDX2(3,1,1) = resul.Y(); D2EDX2(3,1,1) = resul.Y();
D2EDX2(4,1,1) = resul.Z(); D2EDX2(4,1,1) = resul.Z();
// Derivee double par rapport a u1, v1 // Derived double compared to u1, v1
// Derivation de la norme // Derived from the norm
d2ns1uv1 = (d3uuv1.Crossed(d1v1)) d2ns1uv1 = (d3uuv1.Crossed(d1v1))
+ (d2u1 .Crossed(d2v1)) + (d2u1 .Crossed(d2v1))
+ (d1u1 .Crossed(d3uvv1)); + (d1u1 .Crossed(d3uvv1));
@ -509,7 +504,7 @@ Standard_Boolean BlendFunc_EvolRad::ComputeValues(const math_Vector& X,
DSecn = (nplan.Crossed(dns1v1)).Dot(nplan.Crossed(dns1u1)) DSecn = (nplan.Crossed(dns1v1)).Dot(nplan.Crossed(dns1u1))
+ ncrossns1.Dot(nplan.Crossed(d2ns1uv1)); + ncrossns1.Dot(nplan.Crossed(d2ns1uv1));
grosterme = (3*uterm*vterm*carre-DSecn)*cube; grosterme = (3*uterm*vterm*carre-DSecn)*cube;
uterm *= -cube; //et seulement maintenant uterm *= -cube; //and only now
vterm *= -cube; vterm *= -cube;
p1 = nplan.Dot(dns1u1); p1 = nplan.Dot(dns1u1);
@ -530,8 +525,8 @@ Standard_Boolean BlendFunc_EvolRad::ComputeValues(const math_Vector& X,
D2EDX2(3,2,1) = D2EDX2(3,1,2) = resul.Y(); D2EDX2(3,2,1) = D2EDX2(3,1,2) = resul.Y();
D2EDX2(4,2,1) = D2EDX2(4,1,2) = resul.Z(); D2EDX2(4,2,1) = D2EDX2(4,1,2) = resul.Z();
// Derivee double par rapport a v1 // Derived double compared to v1
// Derivation de la norme // Derived from the norm
d2ns1v1.SetLinearForm(1, d1u1.Crossed(d3v1), d2ns1v1.SetLinearForm(1, d1u1.Crossed(d3v1),
2, d2uv1.Crossed(d2v1), 2, d2uv1.Crossed(d2v1),
1, d3uvv1.Crossed(d1v1)); 1, d3uvv1.Crossed(d1v1));
@ -560,8 +555,8 @@ Standard_Boolean BlendFunc_EvolRad::ComputeValues(const math_Vector& X,
// ================ // ================
carre = invnorm2*invnorm2; carre = invnorm2*invnorm2;
cube = carre*invnorm2; cube = carre*invnorm2;
// Derivee double par rapport a u2 // Derived double compared to u2
// Derivation de la norme // Derived from the norm
d2ns1u2.SetLinearForm(1, d3u2.Crossed(d1v2), d2ns1u2.SetLinearForm(1, d3u2.Crossed(d1v2),
2, d2u2.Crossed(d2uv2), 2, d2u2.Crossed(d2uv2),
1, d1u2.Crossed(d3uuv2)); 1, d1u2.Crossed(d3uuv2));
@ -585,8 +580,8 @@ Standard_Boolean BlendFunc_EvolRad::ComputeValues(const math_Vector& X,
D2EDX2(3,3,3) = resul.Y(); D2EDX2(3,3,3) = resul.Y();
D2EDX2(4,3,3) = resul.Z(); D2EDX2(4,3,3) = resul.Z();
// Derivee double par rapport a u2, v2 // Derived double compared to u2, v2
// Derivation de la norme // Derived from the norm
d2ns1uv2 = (d3uuv2.Crossed(d1v2)) d2ns1uv2 = (d3uuv2.Crossed(d1v2))
+ (d2u2 .Crossed(d2v2)) + (d2u2 .Crossed(d2v2))
+ (d1u2 .Crossed(d3uvv2)); + (d1u2 .Crossed(d3uvv2));
@ -595,7 +590,7 @@ Standard_Boolean BlendFunc_EvolRad::ComputeValues(const math_Vector& X,
DSecn = (nplan.Crossed(dns1v2)).Dot(nplan.Crossed(dns1u2)) DSecn = (nplan.Crossed(dns1v2)).Dot(nplan.Crossed(dns1u2))
+ ncrossns2.Dot(nplan.Crossed(d2ns1uv2)); + ncrossns2.Dot(nplan.Crossed(d2ns1uv2));
grosterme = (3*uterm*vterm*carre-DSecn)*cube; grosterme = (3*uterm*vterm*carre-DSecn)*cube;
uterm *= -cube; //et seulement maintenant uterm *= -cube; //and only now
vterm *= -cube; vterm *= -cube;
p1 = nplan.Dot(dns1u2); p1 = nplan.Dot(dns1u2);
@ -616,8 +611,8 @@ Standard_Boolean BlendFunc_EvolRad::ComputeValues(const math_Vector& X,
D2EDX2(3,4,3) = D2EDX2(3,3,4) = resul.Y(); D2EDX2(3,4,3) = D2EDX2(3,3,4) = resul.Y();
D2EDX2(4,4,3) = D2EDX2(4,3,4) = resul.Z(); D2EDX2(4,4,3) = D2EDX2(4,3,4) = resul.Z();
// Derivee double par rapport a v2 // Derived double compared to v2
// Derivation de la norme // Derived from the norm
d2ns1v2.SetLinearForm(1, d1u2.Crossed(d3v2), d2ns1v2.SetLinearForm(1, d1u2.Crossed(d3v2),
2, d2uv2.Crossed(d2v2), 2, d2uv2.Crossed(d2v2),
1, d3uvv2.Crossed(d1v2)); 1, d3uvv2.Crossed(d1v2));
@ -644,7 +639,7 @@ Standard_Boolean BlendFunc_EvolRad::ComputeValues(const math_Vector& X,
if (byParam) { if (byParam) {
Standard_Real tterm; Standard_Real tterm;
// ---------- Derivation double en t, X -------------------------- // ---------- Double Derivation on t, X --------------------------
D2EDXDT(1,1) = dnplan.Dot(d1u1)/2; D2EDXDT(1,1) = dnplan.Dot(d1u1)/2;
D2EDXDT(1,2) = dnplan.Dot(d1v1)/2; D2EDXDT(1,2) = dnplan.Dot(d1v1)/2;
D2EDXDT(1,3) = dnplan.Dot(d1u2)/2; D2EDXDT(1,3) = dnplan.Dot(d1u2)/2;
@ -652,10 +647,10 @@ Standard_Boolean BlendFunc_EvolRad::ComputeValues(const math_Vector& X,
carre = invnorm1*invnorm1; carre = invnorm1*invnorm1;
cube = carre*invnorm1; cube = carre*invnorm1;
//--> Derivee par rapport a u1 et t //--> Derived compared to u1 and t
tterm = ncrossns1.Dot(dnplan.Crossed(nsurf1)); tterm = ncrossns1.Dot(dnplan.Crossed(nsurf1));
smallterm = - tterm*cube; smallterm = - tterm*cube;
// Derivation de la norme // Derived from the norm
uterm = ncrossns1.Dot(nplan. Crossed(dns1u1)); uterm = ncrossns1.Dot(nplan. Crossed(dns1u1));
DSecn = (nplan.Crossed(dns1u1)).Dot(dnplan.Crossed(nsurf1)) DSecn = (nplan.Crossed(dns1u1)).Dot(dnplan.Crossed(nsurf1))
+ ncrossns1.Dot(dnplan.Crossed(dns1u1)); + ncrossns1.Dot(dnplan.Crossed(dns1u1));
@ -680,8 +675,8 @@ Standard_Boolean BlendFunc_EvolRad::ComputeValues(const math_Vector& X,
D2EDXDT(3,1) = resul.Y(); D2EDXDT(3,1) = resul.Y();
D2EDXDT(4,1) = resul.Z(); D2EDXDT(4,1) = resul.Z();
//--> Derivee par rapport a v1 et t //--> Derived compared to v1 and t
// Derivation de la norme // Derived from the norm
uterm = ncrossns1.Dot(nplan. Crossed(dns1v1)); uterm = ncrossns1.Dot(nplan. Crossed(dns1v1));
DSecn = (nplan. Crossed(dns1v1)).Dot(dnplan.Crossed(nsurf1)) DSecn = (nplan. Crossed(dns1v1)).Dot(dnplan.Crossed(nsurf1))
+ ncrossns1.Dot(dnplan.Crossed(dns1v1)); + ncrossns1.Dot(dnplan.Crossed(dns1v1));
@ -707,10 +702,10 @@ Standard_Boolean BlendFunc_EvolRad::ComputeValues(const math_Vector& X,
carre = invnorm2*invnorm2; carre = invnorm2*invnorm2;
cube = carre*invnorm2; cube = carre*invnorm2;
//--> Derivee par rapport a u2 et t //--> Derived compared to u2 and t
tterm = ncrossns2.Dot(dnplan.Crossed(nsurf2)); tterm = ncrossns2.Dot(dnplan.Crossed(nsurf2));
smallterm = -tterm*cube; smallterm = -tterm*cube;
// Derivation de la norme // Derived from the norm
uterm = ncrossns2.Dot(nplan. Crossed(dns1u2)); uterm = ncrossns2.Dot(nplan. Crossed(dns1u2));
DSecn = (nplan. Crossed(dns1u2)).Dot(dnplan.Crossed(nsurf2)) DSecn = (nplan. Crossed(dns1u2)).Dot(dnplan.Crossed(nsurf2))
+ ncrossns2.Dot(dnplan.Crossed(dns1u2)); + ncrossns2.Dot(dnplan.Crossed(dns1u2));
@ -735,8 +730,8 @@ Standard_Boolean BlendFunc_EvolRad::ComputeValues(const math_Vector& X,
D2EDXDT(3,3) = resul.Y(); D2EDXDT(3,3) = resul.Y();
D2EDXDT(4,3) = resul.Z(); D2EDXDT(4,3) = resul.Z();
//--> Derivee par rapport a v2 et t //--> Derived compared to v2 and t
// Derivation de la norme // Derived from the norm
uterm = ncrossns2.Dot(nplan. Crossed(dns1v2)); uterm = ncrossns2.Dot(nplan. Crossed(dns1v2));
DSecn = (nplan.Crossed(dns1v2)).Dot(dnplan.Crossed(nsurf2)) DSecn = (nplan.Crossed(dns1v2)).Dot(dnplan.Crossed(nsurf2))
+ ncrossns2.Dot(dnplan.Crossed(dns1v2)); + ncrossns2.Dot(dnplan.Crossed(dns1v2));
@ -762,11 +757,11 @@ Standard_Boolean BlendFunc_EvolRad::ComputeValues(const math_Vector& X,
D2EDXDT(4,4) = resul.Z(); D2EDXDT(4,4) = resul.Z();
// ---------- Derivation double en t ----------------------------- // ---------- Double derivation on t -----------------------------
// Derivee de n1 par rapport a w // Derived from n1 compared to w
carre = invnorm1*invnorm1; carre = invnorm1*invnorm1;
cube = carre*invnorm1; cube = carre*invnorm1;
// Derivation de la norme // Derived from the norm
DPrim = ncrossns1.Dot(dnplan.Crossed(nsurf1)); DPrim = ncrossns1.Dot(dnplan.Crossed(nsurf1));
smallterm = - 2*DPrim*cube; smallterm = - 2*DPrim*cube;
DSecn = (dnplan.Crossed(nsurf1)).SquareMagnitude() DSecn = (dnplan.Crossed(nsurf1)).SquareMagnitude()
@ -785,10 +780,10 @@ Standard_Boolean BlendFunc_EvolRad::ComputeValues(const math_Vector& X,
ndotns1*invnorm1, d2nplan); ndotns1*invnorm1, d2nplan);
d2n1w += temp; d2n1w += temp;
// Derivee de n2 par rapport a w // Derived from n2 compared to w
carre = invnorm2*invnorm2; carre = invnorm2*invnorm2;
cube = carre*invnorm2; cube = carre*invnorm2;
// Derivation de la norme // Derived from the norm
DPrim = ncrossns2.Dot(dnplan.Crossed(nsurf2)); DPrim = ncrossns2.Dot(dnplan.Crossed(nsurf2));
smallterm = - 2*DPrim*cube; smallterm = - 2*DPrim*cube;
DSecn = (dnplan.Crossed(nsurf2)).SquareMagnitude() DSecn = (dnplan.Crossed(nsurf2)).SquareMagnitude()
@ -840,8 +835,8 @@ void BlendFunc_EvolRad::Set(const Standard_Real Param)
//======================================================================= //=======================================================================
//function : Set //function : Set
//purpose : Segmente la courbe a sa partie utile. //purpose : Segments curve in its useful part.
// La precision est prise arbitrairement petite !? // Small precision is taken at random
//======================================================================= //=======================================================================
void BlendFunc_EvolRad::Set(const Standard_Real First, void BlendFunc_EvolRad::Set(const Standard_Real First,
@ -912,7 +907,7 @@ Standard_Boolean BlendFunc_EvolRad::IsSolution(const math_Vector& Sol,
if (Abs(E(1)) <= Tol && if (Abs(E(1)) <= Tol &&
E(2)*E(2) + E(3)*E(3) + E(4)*E(4) <= Tol*Tol) { E(2)*E(2) + E(3)*E(3) + E(4)*E(4) <= Tol*Tol) {
// on recopie localement ns1, ns2, np afin de ne pas ecraser les champs ! // ns1, ns2, np are copied locally to avoid crushing the fields !
gp_Vec ns1, ns2, np; gp_Vec ns1, ns2, np;
ns1 = nsurf1; ns1 = nsurf1;
ns2 = nsurf2; ns2 = nsurf2;
@ -920,13 +915,13 @@ Standard_Boolean BlendFunc_EvolRad::IsSolution(const math_Vector& Sol,
norm = nplan.Crossed(ns1).Magnitude(); norm = nplan.Crossed(ns1).Magnitude();
if (norm < Eps) { if (norm < Eps) {
norm = 1; // Insufisant, mais il ne faut pas planter norm = 1; // Unsatisfactory, but it is not necessary to stop
} }
ns1.SetLinearForm(nplan.Dot(ns1)/norm,nplan, -1./norm, ns1); ns1.SetLinearForm(nplan.Dot(ns1)/norm,nplan, -1./norm, ns1);
norm = nplan.Crossed(ns2).Magnitude(); norm = nplan.Crossed(ns2).Magnitude();
if (norm < Eps) { if (norm < Eps) {
norm = 1; // Insufisant, mais il ne faut pas planter norm = 1; // Unsatisfactory, but it is not necessary to stop
} }
ns2.SetLinearForm(nplan.Dot(ns2)/norm,nplan, -1./norm, ns2); ns2.SetLinearForm(nplan.Dot(ns2)/norm,nplan, -1./norm, ns2);
@ -957,7 +952,7 @@ Standard_Boolean BlendFunc_EvolRad::IsSolution(const math_Vector& Sol,
else { else {
istangent = Standard_True; istangent = Standard_True;
} }
// mise a jour de maxang // update of maxang
if (sg1 > 0.) { // sg1*ray if (sg1 > 0.) { // sg1*ray
ns1.Reverse(); ns1.Reverse();
@ -968,12 +963,12 @@ Standard_Boolean BlendFunc_EvolRad::IsSolution(const math_Vector& Sol,
Cosa = ns1.Dot(ns2); Cosa = ns1.Dot(ns2);
Sina = nplan.Dot(ns1.Crossed(ns2)); Sina = nplan.Dot(ns1.Crossed(ns2));
if (choix%2 != 0) { if (choix%2 != 0) {
Sina = -Sina; //nplan est change en -nplan Sina = -Sina; //nplan is changed into -nplan
} }
if(Cosa > 1.) {Cosa = 1.; Sina = 0.;} if(Cosa > 1.) {Cosa = 1.; Sina = 0.;}
Angle = ACos(Cosa); Angle = ACos(Cosa);
// Recadrage sur ]-pi/2, 3pi/2] // Reframing on ]-pi/2, 3pi/2]
if (Sina <0.) { if (Sina <0.) {
if (Cosa > 0.) Angle = -Angle; if (Cosa > 0.) Angle = -Angle;
else Angle = 2.*PI - Angle; else Angle = 2.*PI - Angle;
@ -1147,13 +1142,13 @@ void BlendFunc_EvolRad::Section(const Standard_Real Param,
Standard_Real norm1; Standard_Real norm1;
norm1 = nplan.Crossed(ns1).Magnitude(); norm1 = nplan.Crossed(ns1).Magnitude();
if (norm1 < Eps) { if (norm1 < Eps) {
norm1 = 1; // Insufisant, mais il ne faut pas planter norm1 = 1; // Unsatisfactory, but it is not necessary to stop
} }
ns1.SetLinearForm(nplan.Dot(ns1)/norm1,nplan, -1./norm1,ns1); ns1.SetLinearForm(nplan.Dot(ns1)/norm1,nplan, -1./norm1,ns1);
Center.SetXYZ(pts1.XYZ()+sg1*ray*ns1.XYZ()); Center.SetXYZ(pts1.XYZ()+sg1*ray*ns1.XYZ());
// on oriente ns1 du centre vers pts1 // ns1 is oriented from the center to pts1
if (sg1 > 0.) { if (sg1 > 0.) {
ns1.Reverse(); ns1.Reverse();
} }
@ -1164,7 +1159,7 @@ void BlendFunc_EvolRad::Section(const Standard_Real Param,
C.SetPosition(gp_Ax2(Center,np,ns1)); C.SetPosition(gp_Ax2(Center,np,ns1));
Pdeb = 0.; Pdeb = 0.;
Pfin = ElCLib::Parameter(C,pts2); Pfin = ElCLib::Parameter(C,pts2);
// Test des angles negatif et quasi null : Cas Singulier // Test of negative and almost null angles : Single Case
if (Pfin>1.5*PI) { if (Pfin>1.5*PI) {
np.Reverse(); np.Reverse();
C.SetPosition(gp_Ax2(Center,np,ns1)); C.SetPosition(gp_Ax2(Center,np,ns1));
@ -1353,7 +1348,7 @@ void BlendFunc_EvolRad::GetShape (Standard_Integer& NbPoles,
//======================================================================= //=======================================================================
//function : GetTolerance //function : GetTolerance
//purpose : Determine les Tolerance a utiliser dans les approximations. //purpose : Determine the Tolerance to be used in approximations.
//======================================================================= //=======================================================================
void BlendFunc_EvolRad::GetTolerance(const Standard_Real BoundTol, void BlendFunc_EvolRad::GetTolerance(const Standard_Real BoundTol,
const Standard_Real SurfTol, const Standard_Real SurfTol,
@ -1362,7 +1357,7 @@ void BlendFunc_EvolRad::GetTolerance(const Standard_Real BoundTol,
math_Vector& Tol1d) const math_Vector& Tol1d) const
{ {
Standard_Integer low = Tol3d.Lower() , up=Tol3d.Upper(); Standard_Integer low = Tol3d.Lower() , up=Tol3d.Upper();
Standard_Real rayon = lengthmin/maxang; // on deduit un rayon Standard_Real rayon = lengthmin/maxang; // a radius is subtracted
Standard_Real Tol; Standard_Real Tol;
Tol= GeomFill::GetTolerance(myTConv, maxang, rayon, Tol= GeomFill::GetTolerance(myTConv, maxang, rayon,
AngleTol, SurfTol); AngleTol, SurfTol);
@ -1418,11 +1413,11 @@ void BlendFunc_EvolRad::Section(const Blend_Point& P,
P.ParametersOnS1(X(1), X(2)); P.ParametersOnS1(X(1), X(2));
P.ParametersOnS2(X(3), X(4)); P.ParametersOnS2(X(3), X(4));
// Calcul et stokage de la distmin // Calculation and storage of distmin
Ok = ComputeValues(X, 0, Standard_True, prm); Ok = ComputeValues(X, 0, Standard_True, prm);
distmin = Min (distmin, pts1.Distance(pts2)); distmin = Min (distmin, pts1.Distance(pts2));
// on recopie localement ns1, ns2, np afin de ne pas ecraser les champs ! // ns1, ns2, np are copied locally to avoid crashing the fields !
ns1 = nsurf1; ns1 = nsurf1;
ns2 = nsurf2; ns2 = nsurf2;
np = nplan; np = nplan;
@ -1443,13 +1438,13 @@ void BlendFunc_EvolRad::Section(const Blend_Point& P,
norm1 = nplan.Crossed(ns1).Magnitude(); norm1 = nplan.Crossed(ns1).Magnitude();
norm2 = nplan.Crossed(ns2).Magnitude(); norm2 = nplan.Crossed(ns2).Magnitude();
if (norm1 < Eps) { if (norm1 < Eps) {
norm1 = 1; // Insufisant, mais il ne faut pas planter norm1 = 1; // Unsatisfactory, but it is not necessary to stop
#if DEB #if DEB
cout << " EvolRad : Surface singuliere " << endl; cout << " EvolRad : Surface singuliere " << endl;
#endif #endif
} }
if (norm2 < Eps) { if (norm2 < Eps) {
norm2 = 1; // Insufisant, mais il ne faut pas planter norm2 = 1; // Unsatisfactory, but it is not necessary to stop
#if DEB #if DEB
cout << " EvolRad : Surface singuliere " << endl; cout << " EvolRad : Surface singuliere " << endl;
#endif #endif
@ -1461,8 +1456,8 @@ void BlendFunc_EvolRad::Section(const Blend_Point& P,
Center.SetXYZ(pts1.XYZ()+sg1*ray*ns1.XYZ()); Center.SetXYZ(pts1.XYZ()+sg1*ray*ns1.XYZ());
// on oriente ns1 (resp. ns2) du centre vers pts1 (resp. pts2), // ns1 (resp. ns2) is oriented from center to pts1 (resp. pts2),
// et on rend direct le triedre ns1,ns2,nplan. // and the trihedron ns1,ns2,nplan is made direct.
if (sg1 > 0.) { if (sg1 > 0.) {
ns1.Reverse(); ns1.Reverse();
@ -1509,11 +1504,11 @@ Standard_Boolean BlendFunc_EvolRad::Section
P.ParametersOnS1(sol(1),sol(2)); P.ParametersOnS1(sol(1),sol(2));
P.ParametersOnS2(sol(3),sol(4)); P.ParametersOnS2(sol(3),sol(4));
// Calculs des equations // Calculation of equations
ComputeValues(sol, 1, Standard_True, prm); ComputeValues(sol, 1, Standard_True, prm);
distmin = Min (distmin, pts1.Distance(pts2)); distmin = Min (distmin, pts1.Distance(pts2));
// on recopie localement ns1, ns2, np afin de ne pas ecraser les champs ! // ns1, ns2, np are copied locally to avoid crashing fields !
ns1 = nsurf1; ns1 = nsurf1;
ns2 = nsurf2; ns2 = nsurf2;
np = nplan; np = nplan;
@ -1521,7 +1516,7 @@ Standard_Boolean BlendFunc_EvolRad::Section
rayprim = dray; rayprim = dray;
if ( ! pts1.IsEqual(pts2, 1.e-4)) { if ( ! pts1.IsEqual(pts2, 1.e-4)) {
// Calcul des derives Traitement Normal // Calculation of derived Normal processing
math_Gauss Resol(DEDX, 1.e-9); math_Gauss Resol(DEDX, 1.e-9);
if (Resol.IsDone()) { if (Resol.IsDone()) {
@ -1549,7 +1544,7 @@ Standard_Boolean BlendFunc_EvolRad::Section
} }
// Les poles 2d // Tops 2D
Poles2d(Poles2d.Lower()).SetCoord(sol(1),sol(2)); Poles2d(Poles2d.Lower()).SetCoord(sol(1),sol(2));
Poles2d(Poles2d.Upper()).SetCoord(sol(3),sol(4)); Poles2d(Poles2d.Upper()).SetCoord(sol(3),sol(4));
if (!istgt) { if (!istgt) {
@ -1557,7 +1552,7 @@ Standard_Boolean BlendFunc_EvolRad::Section
DPoles2d(Poles2d.Upper()).SetCoord(secmember(3),secmember(4)); DPoles2d(Poles2d.Upper()).SetCoord(secmember(3),secmember(4));
} }
// on traite le cas linear... // the linear case is processed...
if (mySShape == BlendFunc_Linear) { if (mySShape == BlendFunc_Linear) {
Poles(low) = pts1; Poles(low) = pts1;
Poles(upp) = pts2; Poles(upp) = pts2;
@ -1572,17 +1567,17 @@ Standard_Boolean BlendFunc_EvolRad::Section
return (!istgt); return (!istgt);
} }
// Cas du cercle // Case of the circle
norm1 = nplan.Crossed(ns1).Magnitude(); norm1 = nplan.Crossed(ns1).Magnitude();
norm2 = nplan.Crossed(ns2).Magnitude(); norm2 = nplan.Crossed(ns2).Magnitude();
if (norm1 < Eps) { if (norm1 < Eps) {
norm1 = 1; // Insufisant, mais il ne faut pas planter norm1 = 1; // Unsatisfactory, but it is not necessary to stop
#if DEB #if DEB
cout << " EvolRad : Surface singuliere " << endl; cout << " EvolRad : Surface singuliere " << endl;
#endif #endif
} }
if (norm2 < Eps) { if (norm2 < Eps) {
norm2 = 1; // Insufisant, mais il ne faut pas planter norm2 = 1; // Unsatisfactory, but it is not necessary to stop
#if DEB #if DEB
cout << " EvolRad : Surface singuliere " << endl; cout << " EvolRad : Surface singuliere " << endl;
#endif #endif
@ -1598,8 +1593,8 @@ Standard_Boolean BlendFunc_EvolRad::Section
tg1); tg1);
} }
// On oriente ns1 du centre vers pts1, et ns2 du centre vers pts2 // ns1 is oriented from center to pts1, and ns2 from center to pts2
// et on rend le triedre ns1,ns2,nplan direct // and the trihedron ns1,ns2,nplan is made direct
if (sg1 > 0.) { if (sg1 > 0.) {
ns1.Reverse(); ns1.Reverse();
@ -1618,7 +1613,7 @@ Standard_Boolean BlendFunc_EvolRad::Section
dnp.Reverse(); dnp.Reverse();
} }
if (ray < 0.) { // pour eviter la connerie Abs(dray) qques lignes plus bas if (ray < 0.) { // to avoid Abs(dray) some lines below
rayprim = -rayprim; rayprim = -rayprim;
} }
@ -1818,7 +1813,7 @@ Standard_Boolean BlendFunc_EvolRad::Section
#endif #endif
*/ */
// on recopie localement ns1, ns2, np afin de ne pas ecraser les champs ! // ns1, ns2, np are copied locally to avoid crashing the fields
ns1 = nsurf1; ns1 = nsurf1;
ns2 = nsurf2; ns2 = nsurf2;
np = nplan; np = nplan;
@ -1828,8 +1823,8 @@ Standard_Boolean BlendFunc_EvolRad::Section
raysecn = d2ray; raysecn = d2ray;
if ( ! pts1.IsEqual(pts2, 1.e-4)) { if ( ! pts1.IsEqual(pts2, 1.e-4)) {
math_Gauss Resol(DEDX, 1.e-9); // !Tol a affiner !!!!! math_Gauss Resol(DEDX, 1.e-9); // Tolerance to precise
// Calcul des derives Traitement Normal // Calculation of derived Normal Processing
if (Resol.IsDone()) { if (Resol.IsDone()) {
Resol.Solve(-DEDT, sol); Resol.Solve(-DEDT, sol);
D2EDX2.Multiply(sol, D2DXdSdt); D2EDX2.Multiply(sol, D2DXdSdt);
@ -1889,7 +1884,7 @@ Standard_Boolean BlendFunc_EvolRad::Section
d2norm2w.SetLinearForm(secmember(3),dndu2, secmember(4),dndv2, temp); d2norm2w.SetLinearForm(secmember(3),dndu2, secmember(4),dndv2, temp);
} }
// Les poles 2d // Tops 2d
Poles2d(Poles2d.Lower()).SetCoord(X(1),X(2)); Poles2d(Poles2d.Lower()).SetCoord(X(1),X(2));
Poles2d(Poles2d.Upper()).SetCoord(X(3),X(4)); Poles2d(Poles2d.Upper()).SetCoord(X(3),X(4));
if (!istgt) { if (!istgt) {
@ -1899,7 +1894,7 @@ Standard_Boolean BlendFunc_EvolRad::Section
D2Poles2d(Poles2d.Upper()).SetCoord(secmember(3), secmember(4)); D2Poles2d(Poles2d.Upper()).SetCoord(secmember(3), secmember(4));
} }
// on traite le cas linear... // the linear is processed...
if (mySShape == BlendFunc_Linear) { if (mySShape == BlendFunc_Linear) {
Poles(low) = pts1; Poles(low) = pts1;
Poles(upp) = pts2; Poles(upp) = pts2;
@ -1918,17 +1913,17 @@ Standard_Boolean BlendFunc_EvolRad::Section
return (!istgt); return (!istgt);
} }
// Cas du cercle // Case of the circle
norm1 = nplan.Crossed(ns1).Magnitude(); norm1 = nplan.Crossed(ns1).Magnitude();
norm2 = nplan.Crossed(ns2).Magnitude(); norm2 = nplan.Crossed(ns2).Magnitude();
if (norm1 < Eps) { if (norm1 < Eps) {
norm1 = 1; // Insufisant, mais il ne faut pas planter norm1 = 1; // Unsatisfactory, but it is not necessary to stop
#if DEB #if DEB
cout << " EvolRad : Surface singuliere " << endl; cout << " EvolRad : Surface singuliere " << endl;
#endif #endif
} }
if (norm2 < Eps) { if (norm2 < Eps) {
norm2 = 1; // Insufisant, mais il ne faut pas planter norm2 = 1; // Unsatisfactory, but it is not necessary to stop
#if DEB #if DEB
cout << " EvolRad : Surface singuliere " << endl; cout << " EvolRad : Surface singuliere " << endl;
#endif #endif
@ -1948,8 +1943,8 @@ Standard_Boolean BlendFunc_EvolRad::Section
dtgc += dtg1; dtgc += dtg1;
} }
// On oriente ns1 du centre vers pts1, et ns2 du centre vers pts2 // ns1 is oriented from the center to pts1, and ns2 from the center to pts2
// et on rend le triedre ns1,ns2,nplan direct // and the trihedron ns1,ns2,nplan is made direct
if (sg1 > 0.) { if (sg1 > 0.) {
ns1.Reverse(); ns1.Reverse();
@ -1971,7 +1966,7 @@ Standard_Boolean BlendFunc_EvolRad::Section
d2np.Reverse(); d2np.Reverse();
} }
if (ray < 0.) { // pour eviter la connerie Abs(dray) qques lignes plus bas if (ray < 0.) { // to avoid Abs(dray) several lines below
rayprim = -rayprim; rayprim = -rayprim;
raysecn = -raysecn; raysecn = -raysecn;
} }

40
src/ChFi2d/ChFi2d_Builder.cxx
View File

@ -372,7 +372,7 @@ TopoDS_Vertex ChFi2d_Builder::RemoveFillet(const TopoDS_Edge& Fillet)
if (status == ChFi2d_ConnexionError) return commonVertex; if (status == ChFi2d_ConnexionError) return commonVertex;
TopoDS_Edge basisEdge1, basisEdge2, E1, E2; TopoDS_Edge basisEdge1, basisEdge2, E1, E2;
// E1 and E2 are the adjacentes edges to Fillet // E1 and E2 are the adjacent edges to Fillet
if (adjEdge1.IsSame(Fillet)) E1 = adjEdge2; if (adjEdge1.IsSame(Fillet)) E1 = adjEdge2;
else E1 = adjEdge1; else E1 = adjEdge1;
@ -429,7 +429,7 @@ TopoDS_Vertex ChFi2d_Builder::RemoveFillet(const TopoDS_Edge& Fillet)
newEdge1.Location(E1.Location()); newEdge1.Location(E1.Location());
} // if (firstVertex ... } // if (firstVertex ...
else if (lastVertex.IsSame(connectionE1Fillet)) { else if (lastVertex.IsSame(connectionE1Fillet)) {
// syntaxe invalide sur NT // syntax wrong on NT
// const Handle(Geom_Curve)& curve = // const Handle(Geom_Curve)& curve =
// BRep_Tool::Curve(E1, loc, first, last); // BRep_Tool::Curve(E1, loc, first, last);
Handle(Geom_Curve) curve = BRep_Tool::Curve(E1, loc, first, last); Handle(Geom_Curve) curve = BRep_Tool::Curve(E1, loc, first, last);
@ -452,7 +452,7 @@ TopoDS_Vertex ChFi2d_Builder::RemoveFillet(const TopoDS_Edge& Fillet)
else { else {
// It means the edge support one fillet on each end. // It means the edge support one fillet on each end.
if (firstVertex.IsSame(connectionE2Fillet)) { if (firstVertex.IsSame(connectionE2Fillet)) {
// syntaxe invalide sur NT // syntax wrong on NT
// const Handle(Geom_Curve)& curve = // const Handle(Geom_Curve)& curve =
// BRep_Tool::Curve(E2, loc, first, last); // BRep_Tool::Curve(E2, loc, first, last);
Handle(Geom_Curve) curve = BRep_Tool::Curve(E2, loc, first, last); Handle(Geom_Curve) curve = BRep_Tool::Curve(E2, loc, first, last);
@ -462,7 +462,7 @@ TopoDS_Vertex ChFi2d_Builder::RemoveFillet(const TopoDS_Edge& Fillet)
newEdge2.Location(E2.Location()); newEdge2.Location(E2.Location());
} // if (firstVertex ... } // if (firstVertex ...
else if (lastVertex.IsSame(connectionE2Fillet)) { else if (lastVertex.IsSame(connectionE2Fillet)) {
// syntaxe invalide sur NT // syntax wrong on NT
// const Handle(Geom_Curve)& curve = // const Handle(Geom_Curve)& curve =
// BRep_Tool::Curve(E2, loc, first, last); // BRep_Tool::Curve(E2, loc, first, last);
Handle(Geom_Curve) curve = BRep_Tool::Curve(E2, loc, first, last); Handle(Geom_Curve) curve = BRep_Tool::Curve(E2, loc, first, last);
@ -650,7 +650,7 @@ TopoDS_Edge ChFi2d_Builder::BuildNewEdge(const TopoDS_Edge& E1,
gp_Pnt Pnew = BRep_Tool::Pnt(NewExtr); gp_Pnt Pnew = BRep_Tool::Pnt(NewExtr);
Standard_Boolean PonctualEdge = Standard_False; Standard_Boolean PonctualEdge = Standard_False;
Standard_Real Tol = Precision::Confusion(); Standard_Real Tol = Precision::Confusion();
// syntaxe invalide sur NT // syntax wrong on NT
// const Handle(Geom_Curve)& curve = // const Handle(Geom_Curve)& curve =
// BRep_Tool::Curve(E1, first, last); // BRep_Tool::Curve(E1, first, last);
Handle(Geom_Curve) curve = BRep_Tool::Curve(E1, first, last); Handle(Geom_Curve) curve = BRep_Tool::Curve(E1, first, last);
@ -765,7 +765,7 @@ TopoDS_Edge ChFi2d_Builder::BuildFilletEdge(const TopoDS_Vertex& V,
TopoDS_Vertex V4 = TopExp::LastVertex(E2); TopoDS_Vertex V4 = TopExp::LastVertex(E2);
//======================================================================== //========================================================================
// On a trouve un premier arc. + // The first arc is found. +
//======================================================================== //========================================================================
TopAbs_Orientation O1,O2; TopAbs_Orientation O1,O2;
@ -783,7 +783,7 @@ TopoDS_Edge ChFi2d_Builder::BuildFilletEdge(const TopoDS_Vertex& V,
Standard_Real param1,param2,param3,param4; Standard_Real param1,param2,param3,param4;
//======================================================================== //========================================================================
// Sauvegarde des parties non modifiees sur les aretes touchees. + // Save non-modified parts of edges concerned. +
//======================================================================== //========================================================================
if (V1.IsSame(V)) { if (V1.IsSame(V)) {
@ -808,7 +808,7 @@ TopoDS_Edge ChFi2d_Builder::BuildFilletEdge(const TopoDS_Vertex& V,
} }
//======================================================================== //========================================================================
// Recuperation des supports geometriques. + // Restore geometric supports. +
//======================================================================== //========================================================================
Handle(Geom2d_Curve) C1,C2; Handle(Geom2d_Curve) C1,C2;
@ -818,7 +818,7 @@ TopoDS_Edge ChFi2d_Builder::BuildFilletEdge(const TopoDS_Vertex& V,
C2 = BRep_Tool::CurveOnSurface(E2,newFace,ufirst2,ulast2); C2 = BRep_Tool::CurveOnSurface(E2,newFace,ufirst2,ulast2);
//======================================================================== //========================================================================
// Determination du cote pour le conge. + // Determination of the face for fillet. +
//======================================================================== //========================================================================
gp_Pnt2d p; gp_Pnt2d p;
@ -865,9 +865,9 @@ TopoDS_Edge ChFi2d_Builder::BuildFilletEdge(const TopoDS_Vertex& V,
Ve3 = Ve1; Ve3 = Ve1;
Ve4 = Ve2; Ve4 = Ve2;
// traitement des point de tangence ou de rebroussement // processing of tangency or downcast point
if (Ve1.IsParallel(Ve2,Precision::Angular())) { if (Ve1.IsParallel(Ve2,Precision::Angular())) {
// Ve1 et Ve2 sont paralleles : on met cross a 0 // Ve1 and Ve2 are parallel : cross at 0
cross = 0.; cross = 0.;
if (param1<param2) { if (param1<param2) {
Ve3 = -Ve1; Ve3 = -Ve1;
@ -877,11 +877,11 @@ TopoDS_Edge ChFi2d_Builder::BuildFilletEdge(const TopoDS_Vertex& V,
} }
if (! Ve4.IsOpposite(Ve3,Precision::Angular())) { if (! Ve4.IsOpposite(Ve3,Precision::Angular())) {
// Il y a un vrai point de tangence, on arrete // There is a true tangency point and the calculation is stopped
status = ChFi2d_TangencyError; status = ChFi2d_TangencyError;
return filletEdge; return filletEdge;
} }
// Sinon, c'est un point de rebroussement, on continue // Otherwise this is a downcast point, and the calculation is continued
} }
GccEnt_Position Qual1,Qual2; GccEnt_Position Qual1,Qual2;
@ -973,7 +973,7 @@ TopoDS_Edge ChFi2d_Builder::BuildFilletEdge(const TopoDS_Vertex& V,
Fillet.Tangency2(nsol,PPU1,PPU2,Ptg2); Fillet.Tangency2(nsol,PPU1,PPU2,Ptg2);
dist = Ptg2.Distance(p); dist = Ptg2.Distance(p);
inside = (PPU2<param3 && PPU2>param4) || (PPU2<param4 && PPU2>param3); inside = (PPU2<param3 && PPU2>param4) || (PPU2<param4 && PPU2>param3);
// cas de l'arc de cercle passant sur la couture // case of arc of circle passing on the sewing
if ( ( basisC2->DynamicType() == STANDARD_TYPE(Geom2d_Circle) ) && if ( ( basisC2->DynamicType() == STANDARD_TYPE(Geom2d_Circle) ) &&
( (2*PI<param3 && 2*PI>param4) || (2*PI<param4 && 2*PI>param3) ) ) { ( (2*PI<param3 && 2*PI>param4) || (2*PI<param4 && 2*PI>param3) ) ) {
// cas param3<param4 // cas param3<param4
@ -999,14 +999,14 @@ TopoDS_Edge ChFi2d_Builder::BuildFilletEdge(const TopoDS_Vertex& V,
Fillet.Tangency1(numsol,U1,U2,Ptg1); Fillet.Tangency1(numsol,U1,U2,Ptg1);
Fillet.Tangency2(numsol,Vv1,Vv2,Ptg2); Fillet.Tangency2(numsol,Vv1,Vv2,Ptg2);
// verification de la validite des parametres // check the validity of parameters
inside = (U2<param1 && U2>param2) || (U2<param2 && U2>param1); inside = (U2<param1 && U2>param2) || (U2<param2 && U2>param1);
if ( (basisC1->DynamicType() == STANDARD_TYPE(Geom2d_Circle)) if ( (basisC1->DynamicType() == STANDARD_TYPE(Geom2d_Circle))
&& ( (2*PI<param1 && 2*PI>param2) || (2*PI<param2 && 2*PI>param1) ) ) { && ( (2*PI<param1 && 2*PI>param2) || (2*PI<param2 && 2*PI>param1) ) ) {
// arc de cercle contenant l'origine du cercle // arc of circle containing the circle origin
// cas param1<param2 // case param1<param2
inside = (param1<U2 && U2<2*PI) || (0<=U2 && U2<param2-2*PI); inside = (param1<U2 && U2<2*PI) || (0<=U2 && U2<param2-2*PI);
// cas param2<param1 // case param2<param1
inside = inside || (param2<U2 && U2<2*PI) || (0<=U2 && U2<param1-2*PI); inside = inside || (param2<U2 && U2<2*PI) || (0<=U2 && U2<param1-2*PI);
} }
if (!inside) { if (!inside) {
@ -1017,7 +1017,7 @@ TopoDS_Edge ChFi2d_Builder::BuildFilletEdge(const TopoDS_Vertex& V,
inside = (Vv2<param3 && Vv2>param4) || (Vv2<param4 && Vv2>param3); inside = (Vv2<param3 && Vv2>param4) || (Vv2<param4 && Vv2>param3);
if ( (basisC2->DynamicType() == STANDARD_TYPE(Geom2d_Circle)) if ( (basisC2->DynamicType() == STANDARD_TYPE(Geom2d_Circle))
&& ( (2*PI<param3 && 2*PI>param4) || (2*PI<param4 && 2*PI>param3) ) ) { && ( (2*PI<param3 && 2*PI>param4) || (2*PI<param4 && 2*PI>param3) ) ) {
// arc de cercle contenant l'origine du cercle // arc of circle containing the circle origin
// cas param3<param4 // cas param3<param4
inside = (param3<Vv2 && Vv2<2*PI) || (0<=Vv2 && Vv2<param4-2*PI); inside = (param3<Vv2 && Vv2<2*PI) || (0<=Vv2 && Vv2<param4-2*PI);
// cas param4<param3 // cas param4<param3
@ -1049,7 +1049,7 @@ TopoDS_Edge ChFi2d_Builder::BuildFilletEdge(const TopoDS_Vertex& V,
} }
//======================================================================= //=======================================================================
// Mise a jour des sommets du conge. + // Update tops of the fillet. +
//======================================================================= //=======================================================================
gp_Pnt Pntbid; gp_Pnt Pntbid;
gp_Pnt2d sommet; gp_Pnt2d sommet;

16
src/ChFi3d/ChFi3d.cxx
View File

@ -22,8 +22,8 @@
//======================================================================= //=======================================================================
//function : ConcaveSide //function : ConcaveSide
//purpose : calcule le cote concave au voisinage de la frontiere //purpose : calculate the concave face at the neighborhood of the border of
// de 2 faces. // 2 faces.
//======================================================================= //=======================================================================
Standard_Integer ChFi3d::ConcaveSide(const BRepAdaptor_Surface& S1, Standard_Integer ChFi3d::ConcaveSide(const BRepAdaptor_Surface& S1,
@ -111,9 +111,9 @@ Standard_Integer ChFi3d::ConcaveSide(const BRepAdaptor_Surface& S1,
} }
} }
else { else {
//les faces sont localement tangentes on bidouille!! //the faces are locally tangent - this is fake!
if(dint1.Dot(dint2) < 0.){ if(dint1.Dot(dint2) < 0.){
//ici c'est une regularite oubliee //This is a forgotten regularity
gp_Vec DDU, DDV, DDUV; gp_Vec DDU, DDV, DDUV;
S1.D2(p2d1.X(),p2d1.Y(),pt1,DU1,DV1,DDU,DDV,DDUV); S1.D2(p2d1.X(),p2d1.Y(),pt1,DU1,DV1,DDU,DDV,DDUV);
DU1 += ( DU1 * dint1 < 0) ? -DDU : DDU; DU1 += ( DU1 * dint1 < 0) ? -DDU : DDU;
@ -143,15 +143,15 @@ Standard_Integer ChFi3d::ConcaveSide(const BRepAdaptor_Surface& S1,
} }
else { else {
#ifdef DEB #ifdef DEB
cout<<"ConcaveSide : pas de cote concave"<<endl; cout<<"ConcaveSide : no concave face"<<endl;
#endif #endif
//ce 10 montre que la face en bout est dans le prolongement de l'une des deux faces d'appui //This 10 shows that the face at end is in the extension of one of two base faces
return 10; return 10;
} }
} }
else { else {
//ici ca rebrousse, on prend des points dans les faces //here it turns back, the points are taken in faces
//ni trop pres ni trop loin, comme on peut. //neither too close nor too far as much as possible.
Standard_Real u,v; Standard_Real u,v;
#ifdef DEB #ifdef DEB
// Standard_Real deport = 1000*BRep_Tool::Tolerance(E); // Standard_Real deport = 1000*BRep_Tool::Tolerance(E);

59
src/ChFi3d/ChFi3d_Builder.cdl
View File

@ -66,7 +66,7 @@ raises
is is
-- Construction et donnees generales. -- Construction and general data.
------------------------------------- -------------------------------------
Delete(me:out) is virtual; Delete(me:out) is virtual;
@ -84,7 +84,7 @@ is
AngularTolerance : Real); AngularTolerance : Real);
-- Acquisition et interrogation concernant les trajets. -- Acquisition and questioning on trajectories.
------------------------------------------------------- -------------------------------------------------------
Remove(me : in out; E : Edge from TopoDS) Remove(me : in out; E : Edge from TopoDS)
@ -166,20 +166,19 @@ is
is static; is static;
-- Le calcul et la recuperation des resultats. -- Calculation and the restoration of results.
---------------------------------------------- ----------------------------------------------
Compute(me : in out) Compute(me : in out)
---Purpose: calculation general ---Purpose: general calculation of geometry on all edges,
-- -geometrie sur l ensemble des aretes, -- topologic reconstruction.
-- -reconstruction topologique
is static; is static;
IsDone(me) returns Boolean from Standard is static; IsDone(me) returns Boolean from Standard is static;
---Purpose: returns True if the computation is success ---Purpose: returns True if the computation is success
Shape(me) returns Shape from TopoDS Shape(me) returns Shape from TopoDS
---Purpose: if (Isdone()) rend le resultat. ---Purpose: if (Isdone()) makes the result.
raises NoSuchObject from Standard raises NoSuchObject from Standard
---Purpose: if (!Isdone()) ---Purpose: if (!Isdone())
is static; is static;
@ -486,9 +485,9 @@ is
Intf,Intl : in out Boolean from Standard) Intf,Intl : in out Boolean from Standard)
returns Boolean from Standard is static; returns Boolean from Standard is static;
---Purpose: Methode, implementee dans les heritants, calculant ---Purpose: Method, implemented in the inheritants, calculates
-- les elements de construction de la surface (conge -- the elements of construction of the surface (fillet or
-- ou chanfrein). -- chamfer).
CallPerformSurf(me : in out; CallPerformSurf(me : in out;
Stripe : in out Stripe from ChFiDS; Stripe : in out Stripe from ChFiDS;
@ -535,9 +534,9 @@ is
Intf,Intl : in out Boolean from Standard) Intf,Intl : in out Boolean from Standard)
returns Boolean returns Boolean
is deferred protected; is deferred protected;
---Purpose: Methode, implementee dans les heritants, calculant ---Purpose: Method, implemented in the inheritants, calculating
-- les elements de construction de la surface (conge -- elements of construction of the surface (fillet or
-- ou chanfrein). -- chamfer).
PerformSurf(me : in out; PerformSurf(me : in out;
Data : out SequenceOfSurfData from ChFiDS; Data : out SequenceOfSurfData from ChFiDS;
@ -856,7 +855,7 @@ is
Forward : Boolean from Standard; Forward : Boolean from Standard;
RecP1, RecRst1 : Boolean from Standard; RecP1, RecRst1 : Boolean from Standard;
RecP2, RecRst2 : Boolean from Standard) RecP2, RecRst2 : Boolean from Standard)
---Purpose: Calculated a Line of contact edge/edge. ---Purpose: Calculates a Line of contact edge/edge.
returns Boolean from Standard is static protected; returns Boolean from Standard is static protected;
@ -917,57 +916,57 @@ is
fields fields
-- La piece d entree -- Input part
myShape : Shape from TopoDS; myShape : Shape from TopoDS;
-- Donnees numeriques (tolerances) REMARQUE : il faut virer les tol2d!!! -- Numeric data (tolerances) NOTE : suspend tol2d!!!
angular : Real from Standard; -- tangence entre aretes angular : Real from Standard; -- tangency of edges
tolappangle : Real from Standard is protected; -- approx angulaire tolappangle : Real from Standard is protected; -- angular approximation
tolesp : Real from Standard is protected; -- confusion 3d : def 1.e-4 tolesp : Real from Standard is protected; -- confusion 3d : def 1.e-4
tol2d : Real from Standard is protected; -- confusion 2d : def 1.e-5 tol2d : Real from Standard is protected; -- confusion 2d : def 1.e-5
tolapp3d : Real from Standard is protected; -- approx 3d : def 1.e-4 tolapp3d : Real from Standard is protected; -- approx 3d : def 1.e-4
tolapp2d : Real from Standard is protected; -- approx 2d : def 1.e-5 tolapp2d : Real from Standard is protected; -- approx 2d : def 1.e-5
fleche : Real from Standard is protected; -- fleche du walking : def 1.e-6 fleche : Real from Standard is protected; -- vector of walking : def 1.e-6
-- Continuite pour la geometrie approximee -- Continuity for the approximated geometry
myConti : Shape from GeomAbs is protected; myConti : Shape from GeomAbs is protected;
-- Maps de pointeurs arrieres pour travailler -- Maps of back-pointers to work
myEFMap : Map from ChFiDS is protected; myEFMap : Map from ChFiDS is protected;
myESoMap : Map from ChFiDS is protected; myESoMap : Map from ChFiDS is protected;
myEShMap : Map from ChFiDS is protected; myEShMap : Map from ChFiDS is protected;
myVFMap : Map from ChFiDS is protected; myVFMap : Map from ChFiDS is protected;
myVEMap : Map from ChFiDS is protected; myVEMap : Map from ChFiDS is protected;
-- Les outils de stockage et de reconstruction -- Tools of storage and reconstruction
myDS : HDataStructure from TopOpeBRepDS is protected; myDS : HDataStructure from TopOpeBRepDS is protected;
myCoup : HBuilder from TopOpeBRepBuild is protected; myCoup : HBuilder from TopOpeBRepBuild is protected;
-- Les outils de stockage interne -- Tools of internal storage
myListStripe : ListOfStripe from ChFiDS is protected; myListStripe : ListOfStripe from ChFiDS is protected;
myVDataMap : StripeMap from ChFiDS is protected; myVDataMap : StripeMap from ChFiDS is protected;
myRegul : Regularities from ChFiDS is protected; myRegul : Regularities from ChFiDS is protected;
-- Les stripes dont le calcul a plante -- Stripes the calculation which of hangs
badstripes : ListOfStripe from ChFiDS is protected; badstripes : ListOfStripe from ChFiDS is protected;
-- Les vertex au voisinage desquels la finition a plante -- Vertexes in the neighborhood which of the finition hangs
badvertices : ListOfShape from TopTools is protected; badvertices : ListOfShape from TopTools is protected;
-- donnees calculees pendant le compute pour l historique -- Data calculated during the computation for the history
myGenerated : ListOfShape from TopTools; myGenerated : ListOfShape from TopTools;
myEVIMap : DataMapOfShapeListOfInteger from TopTools is protected; myEVIMap : DataMapOfShapeListOfInteger from TopTools is protected;
-- flag si tout s est bien passe -- flag if all has passed well
done : Boolean from Standard is protected; done : Boolean from Standard is protected;
-- le resultat -- result
myShapeResult : Shape from TopoDS; myShapeResult : Shape from TopoDS;
-- flag si il y a un resultat partiel(badshape) -- flag there is partial result (badshape)
hasresult : Boolean from Standard is protected; hasresult : Boolean from Standard is protected;
-- resultat partiel eventuel -- eventual partial result
badShape : Shape from TopoDS; badShape : Shape from TopoDS;

41
src/ChFi3d/ChFi3d_Builder.cxx
View File

@ -57,7 +57,7 @@
#ifdef DEB #ifdef DEB
#include <OSD_Chronometer.hxx> #include <OSD_Chronometer.hxx>
// variables pour les performances // variables for performances
OSD_Chronometer cl_total,cl_extent,cl_perfsetofsurf,cl_perffilletonvertex, OSD_Chronometer cl_total,cl_extent,cl_perfsetofsurf,cl_perffilletonvertex,
@ -208,7 +208,7 @@ void ChFi3d_Builder::Compute()
TestTopOpe::Shapes(myShape,bids); TestTopOpe::Shapes(myShape,bids);
#endif #endif
// remplissage de myVDatatMap // filling of myVDatatMap
ChFiDS_ListIteratorOfListOfStripe itel; ChFiDS_ListIteratorOfListOfStripe itel;
for (itel.Initialize(myListStripe);itel.More(); itel.Next()) { for (itel.Initialize(myListStripe);itel.More(); itel.Next()) {
@ -221,7 +221,7 @@ void ChFi3d_Builder::Compute()
else if (itel.Value()->Spine()->LastStatus() == ChFiDS_FreeBoundary) else if (itel.Value()->Spine()->LastStatus() == ChFiDS_FreeBoundary)
ExtentOneCorner(itel.Value()->Spine()->LastVertex(),itel.Value()); ExtentOneCorner(itel.Value()->Spine()->LastVertex(),itel.Value());
} }
// preanalyse pour evaluer les prolongements. // preanalysis to evaluate the extensions.
ExtentAnalyse(); ExtentAnalyse();
@ -230,7 +230,7 @@ void ChFi3d_Builder::Compute()
ChFi3d_InitChron(cl_perfsetofsurf); ChFi3d_InitChron(cl_perfsetofsurf);
#endif #endif
// Construction de la bande de conge sur chaque stripe. // Construction of the stripe of fillet on each stripe.
for (itel.Initialize(myListStripe);itel.More(); itel.Next()) { for (itel.Initialize(myListStripe);itel.More(); itel.Next()) {
itel.Value()->Spine()->SetErrorStatus(ChFiDS_Ok); itel.Value()->Spine()->SetErrorStatus(ChFiDS_Ok);
try { try {
@ -257,7 +257,7 @@ void ChFi3d_Builder::Compute()
ChFi3d_InitChron(cl_perffilletonvertex); ChFi3d_InitChron(cl_perffilletonvertex);
#endif #endif
//construire les conges sur chaque vertex +alimenter la Ds //construct fillets on each vertex + feed the Ds
if (done) { if (done) {
//Standard_Integer nbresult=0; //Standard_Integer nbresult=0;
// for (Standard_Integer j=1;j<=myVDataMap.Extent();j++) { // for (Standard_Integer j=1;j<=myVDataMap.Extent();j++) {
@ -351,8 +351,8 @@ void ChFi3d_Builder::Compute()
if (done) { if (done) {
BRep_Builder B1; BRep_Builder B1;
CompleteDS(DStr,myShape); CompleteDS(DStr,myShape);
//Update des tolerances sur vertex au max des aretes adjacentes ou //Update tolerances on vertex to max adjacent edges or
//Update des tolerances sur arete degeneree au max des vertex adjacents. //Update tolerances on degenerated edge to max of adjacent vertexes.
TopOpeBRepDS_CurveExplorer cex(DStr); TopOpeBRepDS_CurveExplorer cex(DStr);
for(;cex.More();cex.Next()){ for(;cex.More();cex.Next()){
TopOpeBRepDS_Curve& c = *((TopOpeBRepDS_Curve*)(void*)&(cex.Curve())); TopOpeBRepDS_Curve& c = *((TopOpeBRepDS_Curve*)(void*)&(cex.Curve()));
@ -421,7 +421,8 @@ void ChFi3d_Builder::Compute()
its = myCoup->Merged(curshape,TopAbs_IN); its = myCoup->Merged(curshape,TopAbs_IN);
if(!its.More()) B1.Add(myShapeResult,curshape); if(!its.More()) B1.Add(myShapeResult,curshape);
else { else {
//Si l'ancien type est du Shape est un Shell, on mettre un Shell et non un Solid, Il reste neanmoins un pbleme pour compound de Shell ouvert. //If the old type of Shape is Shell, Shell is placed instead of Solid,
//However there is a problem for compound of open Shell.
while (its.More()) { while (its.More()) {
const TopAbs_ShapeEnum letype = curshape.ShapeType(); const TopAbs_ShapeEnum letype = curshape.ShapeType();
if (letype == TopAbs_SHELL){ if (letype == TopAbs_SHELL){
@ -461,7 +462,7 @@ void ChFi3d_Builder::Compute()
ChFi3d_InitChron(cl_setregul); ChFi3d_InitChron(cl_setregul);
#endif #endif
// On code les regularites apres coup. // Regularities are coded after cutting.
SetRegul(); SetRegul();
@ -475,7 +476,7 @@ void ChFi3d_Builder::Compute()
#endif #endif
// affichage des temps pour les perfs // display of time for perfs
#ifdef DEB #ifdef DEB
cout<<endl; cout<<endl;
@ -546,7 +547,7 @@ void ChFi3d_Builder::Compute()
//======================================================================= //=======================================================================
//function : PerformSingularCorner //function : PerformSingularCorner
//purpose : Charge le vertex et les aretes degeneree. //purpose : Load vertex and degenerated edges.
//======================================================================= //=======================================================================
void ChFi3d_Builder::PerformSingularCorner void ChFi3d_Builder::PerformSingularCorner
@ -565,17 +566,17 @@ void ChFi3d_Builder::PerformSingularCorner
#endif #endif
for (It.Initialize(myVDataMap(Index)), i=0; It.More(); It.Next(),i++){ for (It.Initialize(myVDataMap(Index)), i=0; It.More(); It.Next(),i++){
stripe = It.Value(); stripe = It.Value();
// la SurfData en cause et ses CommonPoints, // SurfData concerned and its CommonPoints,
Standard_Integer sens = 0; Standard_Integer sens = 0;
Standard_Integer num = ChFi3d_IndexOfSurfData(Vtx,stripe,sens); Standard_Integer num = ChFi3d_IndexOfSurfData(Vtx,stripe,sens);
Standard_Boolean isfirst = (sens == 1); Standard_Boolean isfirst = (sens == 1);
Fd = stripe->SetOfSurfData()->Sequence().Value(num); Fd = stripe->SetOfSurfData()->Sequence().Value(num);
const ChFiDS_CommonPoint& CV1 = Fd->Vertex(isfirst,1); const ChFiDS_CommonPoint& CV1 = Fd->Vertex(isfirst,1);
const ChFiDS_CommonPoint& CV2 = Fd->Vertex(isfirst,2); const ChFiDS_CommonPoint& CV2 = Fd->Vertex(isfirst,2);
// Est ce toujours degenere ? // Is it always degenerated ?
if ( CV1.Point().IsEqual( CV2.Point(), 0) ) { if ( CV1.Point().IsEqual( CV2.Point(), 0) ) {
// si oui on stoke le vertex dans la stripe // if yes the vertex is stored in the stripe
// et on fabrique l'arete en bout // and the edge at end is created
if (i==0) Ivtx = ChFi3d_IndexPointInDS(CV1, DStr); if (i==0) Ivtx = ChFi3d_IndexPointInDS(CV1, DStr);
Standard_Real tolreached; Standard_Real tolreached;
Standard_Real Pardeb, Parfin; Standard_Real Pardeb, Parfin;
@ -638,14 +639,14 @@ void ChFi3d_Builder::PerformFilletOnVertex
for (It.Initialize(myVDataMap(Index)), i=0; It.More(); It.Next(),i++){ for (It.Initialize(myVDataMap(Index)), i=0; It.More(); It.Next(),i++){
stripe = It.Value(); stripe = It.Value();
sp = stripe->Spine(); sp = stripe->Spine();
// la SurfData en cause et ses CommonPoints, // SurfData and its CommonPoints,
Standard_Integer sens = 0; Standard_Integer sens = 0;
Standard_Integer num = ChFi3d_IndexOfSurfData(Vtx,stripe,sens); Standard_Integer num = ChFi3d_IndexOfSurfData(Vtx,stripe,sens);
isfirst = (sens == 1); isfirst = (sens == 1);
Fd = stripe->SetOfSurfData()->Sequence().Value(num); Fd = stripe->SetOfSurfData()->Sequence().Value(num);
const ChFiDS_CommonPoint& CV1 = Fd->Vertex(isfirst,1); const ChFiDS_CommonPoint& CV1 = Fd->Vertex(isfirst,1);
const ChFiDS_CommonPoint& CV2 = Fd->Vertex(isfirst,2); const ChFiDS_CommonPoint& CV2 = Fd->Vertex(isfirst,2);
// Est ce toujours degenere ? // Is it always degenerated ?
if ( CV1.Point().IsEqual( CV2.Point(), 0) ) if ( CV1.Point().IsEqual( CV2.Point(), 0) )
nondegenere = Standard_False; nondegenere = Standard_False;
else toujoursdegenere = Standard_False; else toujoursdegenere = Standard_False;
@ -671,7 +672,7 @@ void ChFi3d_Builder::PerformFilletOnVertex
nba=nba/2;*/ nba=nba/2;*/
Standard_Integer nba = ChFi3d_NumberOfEdges(Vtx, myVEMap); Standard_Integer nba = ChFi3d_NumberOfEdges(Vtx, myVEMap);
if (nondegenere) { // Traitement normal if (nondegenere) { // Normal processing
switch (i) { switch (i) {
case 1 : case 1 :
{ {
@ -753,9 +754,9 @@ void ChFi3d_Builder::PerformFilletOnVertex
} }
} }
} }
else { // Traitement des cas singulier else { // Single case processing
if (toujoursdegenere) PerformSingularCorner(Index); if (toujoursdegenere) PerformSingularCorner(Index);
else PerformMoreThreeCorner(Index, i);//Derniere chance... else PerformMoreThreeCorner(Index, i);//Last chance...
} }
} }

1622
src/ChFi3d/ChFi3d_Builder_0.cxx
View File

File diff suppressed because it is too large Load Diff

61
src/ChFi3d/ChFi3d_Builder_1.cxx
View File

@ -375,9 +375,9 @@ Handle(TopOpeBRepBuild_HBuilder) ChFi3d_Builder::Builder()const
//======================================================================= //=======================================================================
//function : ChFi3d_FaceTangency //function : ChFi3d_FaceTangency
//purpose : determiner si les faces en vis a vis des edges sont tangents //purpose : determine if the faces opposing to edges are tangent
// pour aller des faces en vis a vis sur e0 vers les faces en vis // to go from opposing faces on e0 to opposing faces
//a vis sur e1 ,considerer l ensemble des faces partant du sommet commun // on e1, consider all faces starting at a common top.
//======================================================================= //=======================================================================
Standard_Boolean ChFi3d_Builder::FaceTangency(const TopoDS_Edge& E0, Standard_Boolean ChFi3d_Builder::FaceTangency(const TopoDS_Edge& E0,
@ -389,7 +389,7 @@ Standard_Boolean ChFi3d_Builder::FaceTangency(const TopoDS_Edge& E0,
Standard_Integer Nbf; Standard_Integer Nbf;
TopoDS_Face F[2]; TopoDS_Face F[2];
//On verifie qu on ne chaine pas sur une arete de regularite. //It is checked if the connection is not on a regular edge.
for (It.Initialize(myEFMap(E1)), Nbf= 0 ;It.More();It.Next(), Nbf++) { for (It.Initialize(myEFMap(E1)), Nbf= 0 ;It.More();It.Next(), Nbf++) {
if (Nbf>1) if (Nbf>1)
Standard_ConstructionError::Raise("ChFi3d_Builder:only 2 faces"); Standard_ConstructionError::Raise("ChFi3d_Builder:only 2 faces");
@ -430,7 +430,7 @@ Standard_Boolean ChFi3d_Builder::FaceTangency(const TopoDS_Edge& E0,
//======================================================================= //=======================================================================
//function : TangentExtremity //function : TangentExtremity
//purpose : Test si 2 face sont tangentes en bout d'une edge //purpose : Test if 2 faces are tangent at the end of an edge
//======================================================================= //=======================================================================
static Standard_Boolean TangentExtremity(const TopoDS_Vertex& V, static Standard_Boolean TangentExtremity(const TopoDS_Vertex& V,
const TopoDS_Edge& E, const TopoDS_Edge& E,
@ -461,7 +461,7 @@ static Standard_Boolean TangentExtremity(const TopoDS_Vertex& V,
n1.SetXYZ(theProp1.Normal().XYZ()); n1.SetXYZ(theProp1.Normal().XYZ());
if (O1 == TopAbs_REVERSED) n1.Reverse(); if (O1 == TopAbs_REVERSED) n1.Reverse();
} }
else return Standard_False; // On ne sait pas ... else return Standard_False; // It is not known...
Handle(Geom2d_Curve) pc2 = BRep_Tool::CurveOnSurface(e2,f2,f,l); Handle(Geom2d_Curve) pc2 = BRep_Tool::CurveOnSurface(e2,f2,f,l);
@ -471,14 +471,14 @@ static Standard_Boolean TangentExtremity(const TopoDS_Vertex& V,
n2.SetXYZ(theProp2.Normal().XYZ()); n2.SetXYZ(theProp2.Normal().XYZ());
if(O2 == TopAbs_REVERSED) n2.Reverse(); if(O2 == TopAbs_REVERSED) n2.Reverse();
} }
else return Standard_False; // On ne sait pas ... else return Standard_False; // It is not known...
return (n1.Angle(n2) < tang); return (n1.Angle(n2) < tang);
} }
//======================================================================= //=======================================================================
//function : TangentOnVertex //function : TangentOnVertex
//purpose : Test si les faces support d'une edge sont tangente en bout. //purpose : Test if support faces of an edge are tangent at end.
//======================================================================= //=======================================================================
static Standard_Boolean TangentOnVertex(const TopoDS_Vertex& V, static Standard_Boolean TangentOnVertex(const TopoDS_Vertex& V,
const TopoDS_Edge& E, const TopoDS_Edge& E,
@ -495,10 +495,9 @@ static Standard_Boolean TangentOnVertex(const TopoDS_Vertex& V,
//======================================================================= //=======================================================================
//function : PerformExtremity //function : PerformExtremity
//purpose : Dans le cas ou PerformElement a renvoye BreakPoint //purpose : In case if PerformElement returned BreakPoint at one or
// a l une ou l autre des extremites, on essaye de raffiner // another extremity, it is attempted to refine
// en fonction des concavite entres les faces voisines du // depending on concavities between neighbour faces of the top.
// sommet.
//======================================================================= //=======================================================================
void ChFi3d_Builder::PerformExtremity (const Handle(ChFiDS_Spine)& Spine) void ChFi3d_Builder::PerformExtremity (const Handle(ChFiDS_Spine)& Spine)
@ -520,7 +519,7 @@ void ChFi3d_Builder::PerformExtremity (const Handle(ChFiDS_Spine)& Spine)
E[0] = Spine->Edges(iedge); E[0] = Spine->Edges(iedge);
V = Spine->LastVertex(); V = Spine->LastVertex();
} }
//On verifie avant tout que l on ne meurt pas en tangence. //Before all it is checked if the tangency is not dead.
E[0] = Spine->Edges(iedge); E[0] = Spine->Edges(iedge);
ConexFaces (Spine,iedge,0,hs1,hs2); ConexFaces (Spine,iedge,0,hs1,hs2);
if(TangentExtremity(V,E[0],hs1,hs2,angular)){ if(TangentExtremity(V,E[0],hs1,hs2,angular)){
@ -554,7 +553,7 @@ void ChFi3d_Builder::PerformExtremity (const Handle(ChFiDS_Spine)& Spine)
} }
else{ else{
#ifdef DEB #ifdef DEB
cout<<"sommet a plus de 3 aretes"<<endl; cout<<"top has more than 3 edges"<<endl;
#endif #endif
sommetpourri = Standard_True; sommetpourri = Standard_True;
break; break;
@ -570,7 +569,6 @@ void ChFi3d_Builder::PerformExtremity (const Handle(ChFiDS_Spine)& Spine)
} }
} }
//petite verue pour debug avec MPS.
if (!Spine->IsPeriodic()) { if (!Spine->IsPeriodic()) {
TopTools_ListIteratorOfListOfShape It,Jt; TopTools_ListIteratorOfListOfShape It,Jt;
Standard_Integer nbf = 0, jf = 0; Standard_Integer nbf = 0, jf = 0;
@ -586,7 +584,7 @@ void ChFi3d_Builder::PerformExtremity (const Handle(ChFiDS_Spine)& Spine)
if(nbf>3) { if(nbf>3) {
Spine->SetFirstStatus(ChFiDS_BreakPoint); Spine->SetFirstStatus(ChFiDS_BreakPoint);
#if DEB #if DEB
cout<<"sommet a : "<<nbf<<" faces."<<endl; cout<<"top has : "<<nbf<<" faces."<<endl;
#endif #endif
} }
nbf = 0, jf = 0; nbf = 0, jf = 0;
@ -602,7 +600,7 @@ void ChFi3d_Builder::PerformExtremity (const Handle(ChFiDS_Spine)& Spine)
if(nbf>3) { if(nbf>3) {
Spine->SetLastStatus(ChFiDS_BreakPoint); Spine->SetLastStatus(ChFiDS_BreakPoint);
#if DEB #if DEB
cout<<"sommet a : "<<nbf<<" faces."<<endl; cout<<"top has : "<<nbf<<" faces."<<endl;
#endif #endif
} }
} }
@ -610,10 +608,9 @@ void ChFi3d_Builder::PerformExtremity (const Handle(ChFiDS_Spine)& Spine)
//======================================================================= //=======================================================================
//function : PerformElement //function : PerformElement
//purpose : rechercher l ensemble des edges tangents entre eux ; //purpose : find all mutually tangent edges ;
// Chaque edge retenu a 2 faces en vis // Each edge has 2 opposing faces. For 2 adjacent tangent edges it is required that
// a vis pour 2 edges adjacents tangents il faut que les faces en vis a vis // the opposing faces were tangent.
// soient tangentes
//======================================================================= //=======================================================================
Standard_Boolean ChFi3d_Builder::PerformElement(const Handle(ChFiDS_Spine)& Spine) Standard_Boolean ChFi3d_Builder::PerformElement(const Handle(ChFiDS_Spine)& Spine)
@ -629,7 +626,7 @@ Standard_Boolean ChFi3d_Builder::PerformElement(const Handle(ChFiDS_Spine)& Spin
TopoDS_Vertex Ve1,VStart,FVEc,LVEc,FVEv,LVEv; TopoDS_Vertex Ve1,VStart,FVEc,LVEc,FVEv,LVEv;
TopoDS_Edge Ev,Ec(Spine->Edges(1)); TopoDS_Edge Ev,Ec(Spine->Edges(1));
if(BRep_Tool::Degenerated(Ec)) return 0; if(BRep_Tool::Degenerated(Ec)) return 0;
//on controle que l arete est bien une arete de cassure //it is checked if the edge is a cut edge
TopoDS_Face ff1,ff2; TopoDS_Face ff1,ff2;
ChFi3d_conexfaces(Ec,ff1,ff2,myEFMap); ChFi3d_conexfaces(Ec,ff1,ff2,myEFMap);
if(ff1.IsNull() || ff2.IsNull()) return 0; if(ff1.IsNull() || ff2.IsNull()) return 0;
@ -650,7 +647,7 @@ Standard_Boolean ChFi3d_Builder::PerformElement(const Handle(ChFiDS_Spine)& Spin
#else #else
ChFiDS_State CurSt; ChFiDS_State CurSt;
#endif #endif
if (VStart.IsSame(LVEc)) {//cas ou un seul edge ferme if (VStart.IsSame(LVEc)) {//case if only one edge is closed
CEc.Initialize(Ec); CEc.Initialize(Ec);
Wl = BRep_Tool::Parameter(VStart,Ec); Wl = BRep_Tool::Parameter(VStart,Ec);
CEc.D1(Wl,P2,V1); CEc.D1(Wl,P2,V1);
@ -670,7 +667,7 @@ Standard_Boolean ChFi3d_Builder::PerformElement(const Handle(ChFiDS_Spine)& Spin
Spine->SetLastStatus(CurSt); Spine->SetLastStatus(CurSt);
Spine->SetFirstStatus(CurSt); Spine->SetFirstStatus(CurSt);
} }
else { // Progression aval else { // Downstream progression
FVEc = VStart; FVEc = VStart;
TopAbs_Orientation Or1; TopAbs_Orientation Or1;
while (!Fini) { while (!Fini) {
@ -700,18 +697,18 @@ Standard_Boolean ChFi3d_Builder::PerformElement(const Handle(ChFiDS_Spine)& Spin
Standard_Boolean rev = (Or1 != curor); Standard_Boolean rev = (Or1 != curor);
Standard_Boolean OnAjoute = Standard_False; Standard_Boolean OnAjoute = Standard_False;
if (FaceTangency(Ec,Ev,FVEv)) { if (FaceTangency(Ec,Ev,FVEv)) {
//il n'y a pas besoin de tolerance // there is no need of tolerance
// pour se decider (PRO9486) la regularite suffit. // to make a decision (PRO9486) the regularity is enough.
// On verifie quand meme le non rebrousement (PRO9810) // However, the abcense of turn-back is checked (PRO9810)
OnAjoute = ((!rev && av1v2 < PI/2) OnAjoute = ((!rev && av1v2 < PI/2)
||(rev && av1v2 > PI/2)); ||(rev && av1v2 > PI/2));
// Il faut faire Attention au cas singulier (cf CTS21610_1) // mate attention to the single case (cf CTS21610_1)
if (OnAjoute && (degeneOnEc || if (OnAjoute && (degeneOnEc ||
TangentOnVertex(LVEc, Ev,myEFMap, ta)) ) TangentOnVertex(LVEc, Ev,myEFMap, ta)) )
OnAjoute=((!rev && av1v2 < ta) || (rev && (PI - av1v2) < ta)); OnAjoute=((!rev && av1v2 < ta) || (rev && (PI - av1v2) < ta));
} }
if (OnAjoute) { if (OnAjoute) {
Fini = Standard_False; // Si Si cela peut etre util (Cf PRO14713) Fini = Standard_False; // If this can be useful (Cf PRO14713)
Ec = Ev; Ec = Ev;
// Ec = TopoDS::Edge(Ev); // Ec = TopoDS::Edge(Ev);
Ec.Orientation(Or1); Ec.Orientation(Or1);
@ -733,8 +730,6 @@ Standard_Boolean ChFi3d_Builder::PerformElement(const Handle(ChFiDS_Spine)& Spin
Nbface++) {} Nbface++) {}
if (Nbface> 1) CurSt = ChFiDS_BreakPoint; if (Nbface> 1) CurSt = ChFiDS_BreakPoint;
Fini = ((!rev && av1v2 < ta) || (rev && (PI - av1v2) < ta)); Fini = ((!rev && av1v2 < ta) || (rev && (PI - av1v2) < ta));
//attention dans le cas ou sur un vertex il part 3 edges dont l edge courant
//+un edge bord libre et un edge cassure le status sera au pif
} }
} }
} }
@ -744,7 +739,7 @@ Standard_Boolean ChFi3d_Builder::PerformElement(const Handle(ChFiDS_Spine)& Spin
if (CurSt == ChFiDS_Closed) { if (CurSt == ChFiDS_Closed) {
Spine->SetFirstStatus(CurSt); Spine->SetFirstStatus(CurSt);
} }
else {// Progression amont else {// Upstream progression
Fini = Standard_False; Fini = Standard_False;
Ec = Spine->Edges(1); Ec = Spine->Edges(1);
curor = Ec.Orientation(); curor = Ec.Orientation();
@ -797,8 +792,6 @@ Standard_Boolean ChFi3d_Builder::PerformElement(const Handle(ChFiDS_Spine)& Spin
Nbface++) {} Nbface++) {}
if (Nbface> 1) CurSt = ChFiDS_BreakPoint; if (Nbface> 1) CurSt = ChFiDS_BreakPoint;
Fini = ((!rev && av1v2 < ta) || (rev && (PI - av1v2) < ta)); Fini = ((!rev && av1v2 < ta) || (rev && (PI - av1v2) < ta));
//attention dans le cas ou sur un vertex il part 3 edges dont l edge courant
//+un edge bord libre et un edge cassure le status sera au pif
} }
} }
} }

436
src/ChFi3d/ChFi3d_Builder_2.cxx
View File

File diff suppressed because it is too large Load Diff

275
src/ChFi3d/ChFi3d_Builder_6.cxx
View File

@ -77,7 +77,7 @@
#include <TopTools_ListIteratorOfListOfShape.hxx> #include <TopTools_ListIteratorOfListOfShape.hxx>
#ifdef DEB #ifdef DEB
// Pour les mesures. // For measurements.
#include <OSD_Chronometer.hxx> #include <OSD_Chronometer.hxx>
//static OSD_Chronometer appclock; //static OSD_Chronometer appclock;
#endif #endif
@ -251,8 +251,8 @@ static void CompParam(Geom2dAdaptor_Curve Carc,
const Standard_Real preftg) const Standard_Real preftg)
{ {
Standard_Boolean found = 0; Standard_Boolean found = 0;
//(1) On verifie si les paramtres fournies sont bon //(1) It is checked if the provided parameters are good
// cas ou les pcurves sont paramtres comme la spine. // if pcurves have the same parameters as the spine.
gp_Pnt2d point = Carc.Value(prefarc); gp_Pnt2d point = Carc.Value(prefarc);
Standard_Real distini = point.Distance(Ctg->Value(preftg)); Standard_Real distini = point.Distance(Ctg->Value(preftg));
if (distini <= Precision::PConfusion()) { if (distini <= Precision::PConfusion()) {
@ -261,9 +261,9 @@ static void CompParam(Geom2dAdaptor_Curve Carc,
found = Standard_True; found = Standard_True;
} }
else { else {
//(2) On intersecte //(2) Intersection
#ifdef DEB #ifdef DEB
cout<< "CompParam : mauvais parametres on intersecte"<<endl; cout<< "CompParam : bad intersection parameters"<<endl;
#endif #endif
IntRes2d_IntersectionPoint int2d; IntRes2d_IntersectionPoint int2d;
Geom2dInt_GInter Intersection; Geom2dInt_GInter Intersection;
@ -278,7 +278,7 @@ static void CompParam(Geom2dAdaptor_Curve Carc,
nbseg = Intersection.NbSegments(); nbseg = Intersection.NbSegments();
if ( nbseg > 0 ){ if ( nbseg > 0 ){
#ifdef DEB #ifdef DEB
cout<< "segments d intersection sur les restrictions"<<endl; cout<< "segments of intersection on the restrictions"<<endl;
#endif #endif
} }
nbpt = Intersection.NbPoints(); nbpt = Intersection.NbPoints();
@ -298,23 +298,23 @@ static void CompParam(Geom2dAdaptor_Curve Carc,
} }
if(!found){ if(!found){
// (3) On projette... // (3) Projection...
#ifdef DEB #ifdef DEB
cout<<"CompParam : echec intersection PC, on projette."<<endl; cout<<"CompParam : failed intersection PC, projection is created."<<endl;
#endif #endif
parc = prefarc; parc = prefarc;
Geom2dAPI_ProjectPointOnCurve projector(point,Ctg); Geom2dAPI_ProjectPointOnCurve projector(point,Ctg);
if(projector.NbPoints() == 0){ if(projector.NbPoints() == 0){
// Cela arrive parfois dans les cas singuliers ou l'on sort // This happens in some cases when there is a vertex
// en bout de spine sur vertex... // at the end of spine...
ptg = preftg; ptg = preftg;
#ifdef DEB #ifdef DEB
cout<<"CompParam : echec proj p2d/c2d, on prend l'extremite!" <<endl; cout<<"CompParam : failed proj p2d/c2d, the extremity is taken!" <<endl;
#endif #endif
} }
else { else {
// On controle que l'on n'as pas calculer n'importe quoi (EDC402 C2) // It is checked if everything was calculated correctly (EDC402 C2)
if (projector.LowerDistance() < distini) if (projector.LowerDistance() < distini)
ptg = projector.LowerDistanceParameter(); ptg = projector.LowerDistanceParameter();
else ptg = preftg; else ptg = preftg;
@ -324,8 +324,8 @@ static void CompParam(Geom2dAdaptor_Curve Carc,
//======================================================================= //=======================================================================
//function : CompBlendPoint //function : CompBlendPoint
//purpose : fabrique le BlendPoint correspondant a une tangence sur Vertex //purpose : create BlendPoint corresponding to a tangency on Vertex
// pmn : 15/10/1997 : renvoi false, si l'on n' a pas de pcurve // pmn : 15/10/1997 : returns false, if there is no pcurve
//======================================================================= //=======================================================================
static Standard_Boolean CompBlendPoint(const TopoDS_Vertex& V, static Standard_Boolean CompBlendPoint(const TopoDS_Vertex& V,
@ -355,7 +355,7 @@ static Standard_Boolean CompBlendPoint(const TopoDS_Vertex& V,
//======================================================================= //=======================================================================
//function : UpdateLine //function : UpdateLine
//purpose : Met a jour les extremites apres une invalidation partiel //purpose : Updates extremities after a partial invalidation
//======================================================================= //=======================================================================
static void UpdateLine(Handle(BRepBlend_Line)& Line, static void UpdateLine(Handle(BRepBlend_Line)& Line,
@ -398,8 +398,8 @@ static void UpdateLine(Handle(BRepBlend_Line)& Line,
//======================================================================= //=======================================================================
//function : CompleteData //function : CompleteData
//purpose : Calcule les courbes et les CommonPoints a partir des donnees //purpose : Calculates curves and CommonPoints from the data
// calculees par remplissage. // calculated by filling.
//======================================================================= //=======================================================================
Standard_Boolean ChFi3d_Builder::CompleteData Standard_Boolean ChFi3d_Builder::CompleteData
@ -436,7 +436,7 @@ Standard_Boolean ChFi3d_Builder::CompleteData
if(!Gf1) Data->ChangeVertexLastOnS1().SetPoint(Surfcoin->Value(ULast,VFirst)); if(!Gf1) Data->ChangeVertexLastOnS1().SetPoint(Surfcoin->Value(ULast,VFirst));
if(!Gf2) Data->ChangeVertexLastOnS2().SetPoint(Surfcoin->Value(ULast,VLast)); if(!Gf2) Data->ChangeVertexLastOnS2().SetPoint(Surfcoin->Value(ULast,VLast));
//calcul des courbes cote S1 //calculate curves side S1
Handle(Geom_Curve) Crv3d1; Handle(Geom_Curve) Crv3d1;
if(!PC1.IsNull()) Crv3d1= Surfcoin->VIso(VFirst); if(!PC1.IsNull()) Crv3d1= Surfcoin->VIso(VFirst);
gp_Pnt2d pd1(UFirst,VFirst), pf1(ULast,VFirst); gp_Pnt2d pd1(UFirst,VFirst), pf1(ULast,VFirst);
@ -466,7 +466,7 @@ Standard_Boolean ChFi3d_Builder::CompleteData
Fint1.SetFirstParameter(UFirst); Fint1.SetFirstParameter(UFirst);
Fint1.SetLastParameter(ULast); Fint1.SetLastParameter(ULast);
Fint1.SetInterference(Index1OfCurve,tra1,c2dtrim,PCurveOnSurf); Fint1.SetInterference(Index1OfCurve,tra1,c2dtrim,PCurveOnSurf);
//calcul des courbes cote S2 //calculate curves side S2
Handle(Geom_Curve) Crv3d2; Handle(Geom_Curve) Crv3d2;
if(!PC2.IsNull()) Crv3d2 = Surfcoin->VIso(VLast); if(!PC2.IsNull()) Crv3d2 = Surfcoin->VIso(VLast);
gp_Pnt2d pd2(UFirst,VLast), pf2(ULast,VLast); gp_Pnt2d pd2(UFirst,VLast), pf2(ULast,VLast);
@ -499,11 +499,10 @@ Standard_Boolean ChFi3d_Builder::CompleteData
//======================================================================= //=======================================================================
//function : CompleteData //function : CompleteData
//purpose : Calcule la surface les courbes et eventuellement les //purpose : Calculates the surface of curves and eventually
// CommonPoints a partir des donnees calculees dans // CommonPoints from the data calculated in ComputeData.
// ComputeData.
// //
// 11/08/1996 : Utilisation de F(t) // 11/08/1996 : Use of F(t)
// //
//======================================================================= //=======================================================================
@ -543,7 +542,7 @@ Standard_Boolean ChFi3d_Builder::CompleteData
//======================================================================= //=======================================================================
//function : CompleteData //function : CompleteData
//purpose : Nouvelle surcharge pour les fonctions surf/rst //purpose : New overload for functions surf/rst
// jlr le 28/07/97 branchement F(t) // jlr le 28/07/97 branchement F(t)
//======================================================================= //=======================================================================
@ -566,7 +565,7 @@ Standard_Boolean ChFi3d_Builder::CompleteData
myConti); myConti);
if (!approx.IsDone()) { if (!approx.IsDone()) {
#ifdef DEB #ifdef DEB
cout << "Approximation non faite !!!" << endl; cout << "Approximation is not done!" << endl;
#endif #endif
return Standard_False; return Standard_False;
} }
@ -581,7 +580,7 @@ Standard_Boolean ChFi3d_Builder::CompleteData
//======================================================================= //=======================================================================
//function : CompleteData //function : CompleteData
//purpose : Nouvelle surcharge pour les fonctions rst/rst //purpose : New overload for functions rst/rst
// jlr le 28/07/97 branchement F(t) // jlr le 28/07/97 branchement F(t)
//======================================================================= //=======================================================================
@ -619,7 +618,7 @@ Standard_Boolean ChFi3d_Builder::CompleteData
//======================================================================= //=======================================================================
//function : StoreData //function : StoreData
//purpose : Recopie d un resultat d approx dans une SurfData. //purpose : Copy of an approximation result in SurfData.
//======================================================================= //=======================================================================
Standard_Boolean ChFi3d_Builder::StoreData(Handle(ChFiDS_SurfData)& Data, Standard_Boolean ChFi3d_Builder::StoreData(Handle(ChFiDS_SurfData)& Data,
@ -634,7 +633,7 @@ Standard_Boolean ChFi3d_Builder::StoreData(Handle(ChFiDS_SurfData)& Data,
const Standard_Boolean Gf2, const Standard_Boolean Gf2,
const Standard_Boolean Reversed) const Standard_Boolean Reversed)
{ {
// Petits outils pour les controles. // Small control tools.
static Handle(GeomAdaptor_HCurve) checkcurve; static Handle(GeomAdaptor_HCurve) checkcurve;
if(checkcurve.IsNull()) checkcurve = new GeomAdaptor_HCurve(); if(checkcurve.IsNull()) checkcurve = new GeomAdaptor_HCurve();
GeomAdaptor_Curve& chc = checkcurve->ChangeCurve(); GeomAdaptor_Curve& chc = checkcurve->ChangeCurve();
@ -653,8 +652,8 @@ Standard_Boolean ChFi3d_Builder::StoreData(Handle(ChFiDS_SurfData)& Data,
} }
TopOpeBRepDS_DataStructure& DStr = myDS->ChangeDS(); TopOpeBRepDS_DataStructure& DStr = myDS->ChangeDS();
// On rend l espace parametric de la surface carre a defaut de pouvoir // By default parametric space is created using a square surface
// parametrer en U par # R*teta // a revoir lbo 29/08/97 // to be able to parameterize in U by # R*teta // a revoir lbo 29/08/97
const TColStd_Array1OfReal& ku = approx.SurfUKnots(); const TColStd_Array1OfReal& ku = approx.SurfUKnots();
const TColStd_Array1OfReal& kv = approx.SurfVKnots(); const TColStd_Array1OfReal& kv = approx.SurfVKnots();
Standard_Real larg = (kv(kv.Upper())-kv(kv.Lower())); Standard_Real larg = (kv(kv.Upper())-kv(kv.Lower()));
@ -665,7 +664,7 @@ Standard_Boolean ChFi3d_Builder::StoreData(Handle(ChFiDS_SurfData)& Data,
kku,kv, kku,kv,
approx.SurfUMults(),approx.SurfVMults(), approx.SurfUMults(),approx.SurfVMults(),
approx.UDegree(),approx.VDegree()); approx.UDegree(),approx.VDegree());
// prolongement de la surface // extension of the surface
Standard_Real length1,length2; Standard_Real length1,length2;
length1=Data->FirstExtensionValue(); length1=Data->FirstExtensionValue();
@ -701,7 +700,7 @@ Standard_Boolean ChFi3d_Builder::StoreData(Handle(ChFiDS_SurfData)& Data,
Standard_Integer ion1 = 1, ion2 = 2; Standard_Integer ion1 = 1, ion2 = 2;
if(Reversed) { Uon1 = ULast; Uon2 = UFirst; ion1 = 2; ion2 = 1; } if(Reversed) { Uon1 = ULast; Uon2 = UFirst; ion1 = 2; ion2 = 1; }
// On remplit la SurfData pour ce qui concerne S1, // The SurfData is filled in what concerns S1,
Handle(Geom_Curve) Crv3d1 = Surf->UIso(Uon1); Handle(Geom_Curve) Crv3d1 = Surf->UIso(Uon1);
gp_Pnt2d pori1(Uon1,0.); gp_Pnt2d pori1(Uon1,0.);
gp_Lin2d lfil1(pori1,gp::DY2d()); gp_Lin2d lfil1(pori1,gp::DY2d());
@ -718,7 +717,7 @@ Standard_Boolean ChFi3d_Builder::StoreData(Handle(ChFiDS_SurfData)& Data,
if(!ChFi3d_CheckSameParameter(checkcurve,PCurveOnFace,S1,tolC1,tolcheck)){ if(!ChFi3d_CheckSameParameter(checkcurve,PCurveOnFace,S1,tolC1,tolcheck)){
#ifdef DEB #ifdef DEB
cout<<"tol approx sous evaluee : "<<tolC1<<" pour "<<tolcheck<<endl; cout<<"aaproximate tolerance under-valued : "<<tolC1<<" for "<<tolcheck<<endl;
#endif #endif
tolC1 = tolcheck; tolC1 = tolcheck;
} }
@ -758,7 +757,7 @@ Standard_Boolean ChFi3d_Builder::StoreData(Handle(ChFiDS_SurfData)& Data,
else TraOn1 = ChFi3d_TrsfTrans(lin->TransitionOnS1()); else TraOn1 = ChFi3d_TrsfTrans(lin->TransitionOnS1());
Fint1.SetInterference(Index1OfCurve,TraOn1,PCurveOnFace,PCurveOnSurf); Fint1.SetInterference(Index1OfCurve,TraOn1,PCurveOnFace,PCurveOnSurf);
// on remplit la SurfData pour ce qui concerne S2, // SurfData is filled in what concerns S2,
Handle(Geom_Curve) Crv3d2 = Surf->UIso(Uon2); Handle(Geom_Curve) Crv3d2 = Surf->UIso(Uon2);
gp_Pnt2d pori2(Uon2,0.); gp_Pnt2d pori2(Uon2,0.);
gp_Lin2d lfil2(pori2,gp::DY2d()); gp_Lin2d lfil2(pori2,gp::DY2d());
@ -771,7 +770,7 @@ Standard_Boolean ChFi3d_Builder::StoreData(Handle(ChFiDS_SurfData)& Data,
chc.Load(Crv3d2,par1,par2); chc.Load(Crv3d2,par1,par2);
if(!ChFi3d_CheckSameParameter(checkcurve,PCurveOnFace,S2,tolC2,tolcheck)){ if(!ChFi3d_CheckSameParameter(checkcurve,PCurveOnFace,S2,tolC2,tolcheck)){
#ifdef DEB #ifdef DEB
cout<<"tol approx sous evaluee : "<<tolC2<<" pour "<<tolcheck<<endl; cout<<"approximate tolerance under-evaluated : "<<tolC2<<" for "<<tolcheck<<endl;
#endif #endif
tolC2 = tolcheck; tolC2 = tolcheck;
} }
@ -817,7 +816,7 @@ Standard_Boolean ChFi3d_Builder::StoreData(Handle(ChFiDS_SurfData)& Data,
(Index2OfCurve,TopAbs_FORWARD,bidpc,PCurveOnSurf); (Index2OfCurve,TopAbs_FORWARD,bidpc,PCurveOnSurf);
} }
// on calcule l orientation du conge par rapport aux faces, // the orientation of the fillet in relation to the faces is evaluated,
Handle(Adaptor3d_HSurface) Sref = S1; Handle(Adaptor3d_HSurface) Sref = S1;
PCurveOnFace = Fint1.PCurveOnFace(); PCurveOnFace = Fint1.PCurveOnFace();
@ -885,7 +884,7 @@ Standard_Boolean ChFi3d_Builder::StoreData(Handle(ChFiDS_SurfData)& Data,
if(!Gf2 && !S2.IsNull()) if(!Gf2 && !S2.IsNull())
ChFi3d_FilCommonPoint(lin->EndPointOnSecond(),lin->TransitionOnS2(), ChFi3d_FilCommonPoint(lin->EndPointOnSecond(),lin->TransitionOnS2(),
Standard_False, Data->ChangeVertex(0,ion2),tolC2); Standard_False, Data->ChangeVertex(0,ion2),tolC2);
// Les parametres sur l ElSpine // Parameters on ElSpine
Standard_Integer nbp = lin->NbPoints(); Standard_Integer nbp = lin->NbPoints();
Data->FirstSpineParam(lin->Point(1).Parameter()); Data->FirstSpineParam(lin->Point(1).Parameter());
Data->LastSpineParam(lin->Point(nbp).Parameter()); Data->LastSpineParam(lin->Point(nbp).Parameter());
@ -896,8 +895,7 @@ Standard_Boolean ChFi3d_Builder::StoreData(Handle(ChFiDS_SurfData)& Data,
//======================================================================= //=======================================================================
//function : ComputeData //function : ComputeData
//purpose : Chapeau du cheminement edge/face pour le contournement //purpose : Head of the path edge/face for the bypass of obstacle.
// d obstacle.
//======================================================================= //=======================================================================
Standard_Boolean ChFi3d_Builder::ComputeData Standard_Boolean ChFi3d_Builder::ComputeData
@ -948,7 +946,7 @@ Standard_Boolean ChFi3d_Builder::ComputeData
#else #else
Standard_Integer Nbpnt; Standard_Integer Nbpnt;
#endif #endif
// on recadre la solution de depart a la demande. // the initial solution is reframed if necessary.
math_Vector ParSol(1,3); math_Vector ParSol(1,3);
Standard_Real NewFirst = PFirst; Standard_Real NewFirst = PFirst;
if(RecP || RecS || RecRst){ if(RecP || RecS || RecRst){
@ -956,7 +954,7 @@ Standard_Boolean ChFi3d_Builder::ComputeData
tolesp,TolGuide,RecRst,RecP,RecS, tolesp,TolGuide,RecRst,RecP,RecS,
NewFirst,ParSol)){ NewFirst,ParSol)){
#ifdef DEB #ifdef DEB
cout<<"ChFi3d_Builder::ComputeData : echec calcul first section"<<endl; cout<<"ChFi3d_Builder::ComputeData : calculation fail first section"<<endl;
#endif #endif
return Standard_False; return Standard_False;
} }
@ -971,7 +969,7 @@ Standard_Boolean ChFi3d_Builder::ComputeData
if (!TheWalk.IsDone()) { if (!TheWalk.IsDone()) {
#ifdef DEB #ifdef DEB
cout << "Cheminement non fait" << endl; cout << "Path not created" << endl;
#endif #endif
return Standard_False; return Standard_False;
} }
@ -979,7 +977,7 @@ Standard_Boolean ChFi3d_Builder::ComputeData
if (reverse) { if (reverse) {
if (!TheWalk.Complete(Func,FInv,FInvP,FInvC,SpLast)) { if (!TheWalk.Complete(Func,FInv,FInvP,FInvC,SpLast)) {
#ifdef DEB #ifdef DEB
cout << "Complement non fait" << endl; cout << "Not completed" << endl;
#endif #endif
} }
} }
@ -990,14 +988,14 @@ Standard_Boolean ChFi3d_Builder::ComputeData
if (Nbpnt <= 1 && again == 0) { if (Nbpnt <= 1 && again == 0) {
again++; again++;
#ifdef DEB #ifdef DEB
cout <<"1 seul point de cheminement on essaye MS/50."<<endl; cout <<"one point of the path MS/50 is attempted."<<endl;
#endif #endif
MS = MS/50.; Target = Targetsov; MS = MS/50.; Target = Targetsov;
} }
else if (Nbpnt<=nbptmin && again == 0) { else if (Nbpnt<=nbptmin && again == 0) {
again++; again++;
#ifdef DEB #ifdef DEB
cout <<"Nombre de points insuffisant on reduit le pas"<<endl; cout <<"Number of points is too small, the step is reduced"<<endl;
#endif #endif
Standard_Real u1 = Lin->Point(1).Parameter(); Standard_Real u1 = Lin->Point(1).Parameter();
Standard_Real u2 = Lin->Point(Nbpnt).Parameter(); Standard_Real u2 = Lin->Point(Nbpnt).Parameter();
@ -1007,7 +1005,7 @@ Standard_Boolean ChFi3d_Builder::ComputeData
} }
else if(Nbpnt<=nbptmin){ else if(Nbpnt<=nbptmin){
#ifdef DEB #ifdef DEB
cout <<"Nombre de points toujours insuffisant on sort"<<endl; cout <<"Number of points is still too small, quit"<<endl;
#endif #endif
return Standard_False; return Standard_False;
} }
@ -1029,8 +1027,7 @@ Standard_Boolean ChFi3d_Builder::ComputeData
//======================================================================= //=======================================================================
//function : ComputeData //function : ComputeData
//purpose : Chapeau du cheminement edge/edge pour le contournement //purpose : Heading of the path edge/edge for the bypass of obstacle.
// d obstacle.
//======================================================================= //=======================================================================
Standard_Boolean ChFi3d_Builder::ComputeData Standard_Boolean ChFi3d_Builder::ComputeData
@ -1085,7 +1082,7 @@ Standard_Boolean ChFi3d_Builder::ComputeData
#else #else
Standard_Integer Nbpnt; Standard_Integer Nbpnt;
#endif #endif
// on recadre la solution de depart a la demande. // the initial solution is reframed if necessary.
math_Vector ParSol(1,2); math_Vector ParSol(1,2);
Standard_Real NewFirst = PFirst; Standard_Real NewFirst = PFirst;
if (RecP1 || RecRst1 || RecP2 || RecRst2) { if (RecP1 || RecRst1 || RecP2 || RecRst2) {
@ -1093,7 +1090,7 @@ Standard_Boolean ChFi3d_Builder::ComputeData
tolesp, TolGuide, RecRst1, RecP1, RecRst2, RecP2, tolesp, TolGuide, RecRst1, RecP1, RecRst2, RecP2,
NewFirst, ParSol)){ NewFirst, ParSol)){
#ifdef DEB #ifdef DEB
cout<<"ChFi3d_Builder::ComputeData : echec calcul first section"<<endl; cout<<"ChFi3d_Builder::ComputeData : fail calculation first section"<<endl;
#endif #endif
return Standard_False; return Standard_False;
} }
@ -1108,7 +1105,7 @@ Standard_Boolean ChFi3d_Builder::ComputeData
if (!TheWalk.IsDone()) { if (!TheWalk.IsDone()) {
#ifdef DEB #ifdef DEB
cout << "Cheminement non fait" << endl; cout << "Path not done" << endl;
#endif #endif
return Standard_False; return Standard_False;
} }
@ -1116,7 +1113,7 @@ Standard_Boolean ChFi3d_Builder::ComputeData
if (reverse) { if (reverse) {
if (!TheWalk.Complete(Func, FInv1, FInvP1, FInv2, FInvP2, SpLast)) { if (!TheWalk.Complete(Func, FInv1, FInvP1, FInv2, FInvP2, SpLast)) {
#ifdef DEB #ifdef DEB
cout << "Complement non fait" << endl; cout << "Not completed" << endl;
#endif #endif
} }
} }
@ -1127,14 +1124,14 @@ Standard_Boolean ChFi3d_Builder::ComputeData
if (Nbpnt <= 1 && again == 0) { if (Nbpnt <= 1 && again == 0) {
again++; again++;
#ifdef DEB #ifdef DEB
cout <<"1 seul point de cheminement on essaye MS/50."<<endl; cout <<"one point of path MS/50 is attempted."<<endl;
#endif #endif
MS = MS/50.; Target = Targetsov; MS = MS/50.; Target = Targetsov;
} }
else if (Nbpnt<=nbptmin && again == 0) { else if (Nbpnt<=nbptmin && again == 0) {
again++; again++;
#ifdef DEB #ifdef DEB
cout <<"Nombre de points insuffisant on reduit le pas"<<endl; cout <<"Number of points is too small, the step is reduced"<<endl;
#endif #endif
Standard_Real u1 = Lin->Point(1).Parameter(); Standard_Real u1 = Lin->Point(1).Parameter();
Standard_Real u2 = Lin->Point(Nbpnt).Parameter(); Standard_Real u2 = Lin->Point(Nbpnt).Parameter();
@ -1143,7 +1140,7 @@ Standard_Boolean ChFi3d_Builder::ComputeData
} }
else if(Nbpnt<=nbptmin){ else if(Nbpnt<=nbptmin){
#ifdef DEB #ifdef DEB
cout <<"Nombre de points toujours insuffisant on sort"<<endl; cout <<"Number of points is still too small, quit"<<endl;
#endif #endif
return Standard_False; return Standard_False;
} }
@ -1171,8 +1168,7 @@ Standard_Boolean ChFi3d_Builder::ComputeData
//======================================================================= //=======================================================================
//function : SimulData //function : SimulData
//purpose : Chapeau du cheminement edge/face pour le contournement //purpose : Heading of the path edge/face for the bypass of obstacle in simulation mode.
// d obstacle en mode simulation.
//======================================================================= //=======================================================================
Standard_Boolean ChFi3d_Builder::SimulData Standard_Boolean ChFi3d_Builder::SimulData
@ -1220,7 +1216,7 @@ Standard_Boolean ChFi3d_Builder::SimulData
#else #else
Standard_Integer Nbpnt; Standard_Integer Nbpnt;
#endif #endif
// on recadre la solution de depart a la demande. // the starting solution is reframed if needed.
math_Vector ParSol(1,3); math_Vector ParSol(1,3);
Standard_Real NewFirst = PFirst; Standard_Real NewFirst = PFirst;
if(RecP || RecS || RecRst){ if(RecP || RecS || RecRst){
@ -1229,7 +1225,7 @@ Standard_Boolean ChFi3d_Builder::SimulData
NewFirst,ParSol)){ NewFirst,ParSol)){
#ifdef DEB #ifdef DEB
cout<<"ChFi3d_Builder::SimulData : echec calcul first section"<<endl; cout<<"ChFi3d_Builder::SimulData : fail calculate first section"<<endl;
#endif #endif
return Standard_False; return Standard_False;
} }
@ -1243,14 +1239,14 @@ Standard_Boolean ChFi3d_Builder::SimulData
MS,TolGuide,ParSol,tolesp,Fleche,Appro); MS,TolGuide,ParSol,tolesp,Fleche,Appro);
if (!TheWalk.IsDone()) { if (!TheWalk.IsDone()) {
#ifdef DEB #ifdef DEB
cout << "Cheminement non fait" << endl; cout << "Path not done" << endl;
#endif #endif
return Standard_False; return Standard_False;
} }
if (reverse) { if (reverse) {
if (!TheWalk.Complete(Func,FInv,FInvP,FInvC,SpLast)) { if (!TheWalk.Complete(Func,FInv,FInvP,FInvC,SpLast)) {
#ifdef DEB #ifdef DEB
cout << "Complement non fait" << endl; cout << "Not completed" << endl;
#endif #endif
} }
} }
@ -1259,14 +1255,14 @@ Standard_Boolean ChFi3d_Builder::SimulData
if (Nbpnt <= 1 && again == 0) { if (Nbpnt <= 1 && again == 0) {
again++; again++;
#ifdef DEB #ifdef DEB
cout <<"1 seul point de cheminement on essaye MS/50."<<endl; cout <<"one point of path MS/50 is attempted."<<endl;
#endif #endif
MS = MS/50.; Target = Targetsov; MS = MS/50.; Target = Targetsov;
} }
else if (Nbpnt <= NbSecMin && again == 0) { else if (Nbpnt <= NbSecMin && again == 0) {
again++; again++;
#ifdef DEB #ifdef DEB
cout <<"Nombre de points insuffisant on reduit le pas"<<endl; cout <<"Number of points is too small, the step is reduced"<<endl;
#endif #endif
Standard_Real u1 = Lin->Point(1).Parameter(); Standard_Real u1 = Lin->Point(1).Parameter();
Standard_Real u2 = Lin->Point(Nbpnt).Parameter(); Standard_Real u2 = Lin->Point(Nbpnt).Parameter();
@ -1275,7 +1271,7 @@ Standard_Boolean ChFi3d_Builder::SimulData
} }
else if(Nbpnt<=NbSecMin){ else if(Nbpnt<=NbSecMin){
#ifdef DEB #ifdef DEB
cout <<"Nombre de points toujours insuffisant on sort"<<endl; cout <<"Number of points is still too small, quit"<<endl;
#endif #endif
return Standard_False; return Standard_False;
} }
@ -1297,8 +1293,8 @@ Standard_Boolean ChFi3d_Builder::SimulData
//======================================================================= //=======================================================================
//function : SimulData //function : SimulData
//purpose : Chapeau du cheminement edge/edge pour le contournement //purpose : Heading of path edge/edge for the bypass
// d obstacle en mode simulation. // of obstacle in simulation mode.
//======================================================================= //=======================================================================
Standard_Boolean ChFi3d_Builder::SimulData Standard_Boolean ChFi3d_Builder::SimulData
@ -1350,7 +1346,7 @@ Standard_Boolean ChFi3d_Builder::SimulData
#else #else
Standard_Integer Nbpnt; Standard_Integer Nbpnt;
#endif #endif
// on recadre la solution de depart a la demande. // The initial solution is reframed if necessary.
math_Vector ParSol(1,2); math_Vector ParSol(1,2);
Standard_Real NewFirst = PFirst; Standard_Real NewFirst = PFirst;
if (RecP1 || RecRst1 || RecP2 || RecRst2) { if (RecP1 || RecRst1 || RecP2 || RecRst2) {
@ -1359,7 +1355,7 @@ Standard_Boolean ChFi3d_Builder::SimulData
NewFirst,ParSol)){ NewFirst,ParSol)){
#ifdef DEB #ifdef DEB
cout<<"ChFi3d_Builder::SimulData : echec calcul first section"<<endl; cout<<"ChFi3d_Builder::SimulData : calculation fail first section"<<endl;
#endif #endif
return Standard_False; return Standard_False;
} }
@ -1373,14 +1369,14 @@ Standard_Boolean ChFi3d_Builder::SimulData
MS, TolGuide, ParSol, tolesp, Fleche, Appro); MS, TolGuide, ParSol, tolesp, Fleche, Appro);
if (!TheWalk.IsDone()) { if (!TheWalk.IsDone()) {
#ifdef DEB #ifdef DEB
cout << "Cheminement non fait" << endl; cout << "Path not created" << endl;
#endif #endif
return Standard_False; return Standard_False;
} }
if (reverse) { if (reverse) {
if (!TheWalk.Complete(Func, FInv1, FInvP1, FInv2, FInvP2, SpLast)) { if (!TheWalk.Complete(Func, FInv1, FInvP1, FInv2, FInvP2, SpLast)) {
#ifdef DEB #ifdef DEB
cout << "Complement non fait" << endl; cout << "Not completed" << endl;
#endif #endif
} }
} }
@ -1389,14 +1385,14 @@ Standard_Boolean ChFi3d_Builder::SimulData
if (Nbpnt <= 1 && again == 0) { if (Nbpnt <= 1 && again == 0) {
again++; again++;
#ifdef DEB #ifdef DEB
cout <<"1 seul point de cheminement on essaye MS/50."<<endl; cout <<"only one point of path MS/50 is attempted."<<endl;
#endif #endif
MS = MS/50.; Target = Targetsov; MS = MS/50.; Target = Targetsov;
} }
else if (Nbpnt <= NbSecMin && again == 0) { else if (Nbpnt <= NbSecMin && again == 0) {
again++; again++;
#ifdef DEB #ifdef DEB
cout <<"Nombre de points insuffisant on reduit le pas"<<endl; cout <<"Number of points is too small, the step is reduced"<<endl;
#endif #endif
Standard_Real u1 = Lin->Point(1).Parameter(); Standard_Real u1 = Lin->Point(1).Parameter();
Standard_Real u2 = Lin->Point(Nbpnt).Parameter(); Standard_Real u2 = Lin->Point(Nbpnt).Parameter();
@ -1405,7 +1401,7 @@ Standard_Boolean ChFi3d_Builder::SimulData
} }
else if(Nbpnt<=NbSecMin){ else if(Nbpnt<=NbSecMin){
#ifdef DEB #ifdef DEB
cout <<"Nombre de points toujours insuffisant on sort"<<endl; cout <<"Number of points is still too small, quit"<<endl;
#endif #endif
return Standard_False; return Standard_False;
} }
@ -1435,7 +1431,7 @@ Standard_Boolean ChFi3d_Builder::SimulData
//======================================================================= //=======================================================================
//function : ComputeData //function : ComputeData
//purpose : Construction d un conge elementaire par cheminement. //purpose : Construction of elementary fillet by path.
// //
//======================================================================= //=======================================================================
@ -1469,27 +1465,27 @@ Standard_Boolean ChFi3d_Builder::ComputeData
const Standard_Boolean RecOnS1, const Standard_Boolean RecOnS1,
const Standard_Boolean RecOnS2) const Standard_Boolean RecOnS2)
{ {
//Les prolongements en cas de sortie des deux domaines sont faits //The extrensions are created in case of output of two domains
//de facon directe et non plus par cheminement ( trop hasardeux ). //directly and not by path ( too hasardous ).
Data->FirstExtensionValue(0); Data->FirstExtensionValue(0);
Data-> LastExtensionValue(0); Data-> LastExtensionValue(0);
//On recupere les faces eventuelles pour les tests de saut d edge. //The eventual faces are restored to test the jump of edge.
TopoDS_Face F1, F2; TopoDS_Face F1, F2;
Handle(BRepAdaptor_HSurface) HS = Handle(BRepAdaptor_HSurface)::DownCast(S1); Handle(BRepAdaptor_HSurface) HS = Handle(BRepAdaptor_HSurface)::DownCast(S1);
if(!HS.IsNull()) F1 = HS->ChangeSurface().Face(); if(!HS.IsNull()) F1 = HS->ChangeSurface().Face();
HS = Handle(BRepAdaptor_HSurface)::DownCast(S2); HS = Handle(BRepAdaptor_HSurface)::DownCast(S2);
if(!HS.IsNull()) F2 = HS->ChangeSurface().Face(); if(!HS.IsNull()) F2 = HS->ChangeSurface().Face();
// Variables d'encadrement du cheminement // Path framing variables
Standard_Real TolGuide=tolguide, TolEsp = tolesp; Standard_Real TolGuide=tolguide, TolEsp = tolesp;
Standard_Integer nbptmin = 4; Standard_Integer nbptmin = 4;
BRepBlend_Walking TheWalk(S1,S2,I1,I2); BRepBlend_Walking TheWalk(S1,S2,I1,I2);
//Debut du carnage, on eteint les controles 2d du cheminement //Start of removal, 2D path controls
//qui s'accomodent mal des surfaces a parametrages non homogenes //that qui s'accomodent mal des surfaces a parametrages non homogenes
//en u et en v. //en u et en v are extinguished.
TheWalk.Check2d(0); TheWalk.Check2d(0);
Standard_Real MS = MaxStep; Standard_Real MS = MaxStep;
@ -1497,9 +1493,8 @@ Standard_Boolean ChFi3d_Builder::ComputeData
Standard_Real SpFirst = HGuide->FirstParameter(); Standard_Real SpFirst = HGuide->FirstParameter();
Standard_Real SpLast = HGuide->LastParameter(); Standard_Real SpLast = HGuide->LastParameter();
// Lorsque le point de depart est interne, on chemine // When the start point is inside, the path goes first to the left
// d abord a gauche afin de determiner le Last pour les // to determine the Last for the periodicals.
// periodiques.
Standard_Boolean reverse = (!Forward || Inside); Standard_Boolean reverse = (!Forward || Inside);
Standard_Real Target; Standard_Real Target;
if(reverse){ if(reverse){
@ -1511,8 +1506,8 @@ Standard_Boolean ChFi3d_Builder::ComputeData
if(!intl) Target = Last; if(!intl) Target = Last;
} }
// Dans le cas de singularite pre-determinee, // In case if the singularity is pre-determined,
// on en informe le cheminement // the path is indicated.
if (!Spine.IsNull()){ if (!Spine.IsNull()){
if (Spine->IsTangencyExtremity(Standard_True)) { if (Spine->IsTangencyExtremity(Standard_True)) {
TopoDS_Vertex V = Spine->FirstVertex(); TopoDS_Vertex V = Spine->FirstVertex();
@ -1546,7 +1541,7 @@ Standard_Boolean ChFi3d_Builder::ComputeData
} }
} }
//On recadre la solution de depart a la demande. //The starting solution is reframed if necessary.
//**********************************************// //**********************************************//
math_Vector ParSol(1,4); math_Vector ParSol(1,4);
Standard_Real NewFirst = PFirst; Standard_Real NewFirst = PFirst;
@ -1555,7 +1550,7 @@ Standard_Boolean ChFi3d_Builder::ComputeData
tolesp,TolGuide,RecOnS1,RecOnS2, tolesp,TolGuide,RecOnS1,RecOnS2,
NewFirst,ParSol)){ NewFirst,ParSol)){
#ifdef DEB #ifdef DEB
cout<<"ChFi3d_Builder::ComputeData : echec calcul first section"<<endl; cout<<"ChFi3d_Builder::ComputeData : calculation fail first section"<<endl;
#endif #endif
return Standard_False; return Standard_False;
} }
@ -1564,7 +1559,7 @@ Standard_Boolean ChFi3d_Builder::ComputeData
ParSol = Soldep; ParSol = Soldep;
} }
//On calcule d abord la partie valide, sans souci des prolongements. //First the valid part is calculate, without caring for the extensions.
//******************************************************************// //******************************************************************//
Standard_Integer again = 0; Standard_Integer again = 0;
Standard_Boolean tchernobyl = 0; Standard_Boolean tchernobyl = 0;
@ -1574,15 +1569,15 @@ Standard_Boolean ChFi3d_Builder::ComputeData
Standard_Real u1sov, u2sov; Standard_Real u1sov, u2sov;
#endif #endif
TopoDS_Face bif; TopoDS_Face bif;
//Un pas max coherent, mais grand, on compte sur la fleche pour detecter //Max step is relevant, but too great, the vector is required to detect
//les vrillages. //the twists.
if( (Abs(Last-First) <= MS * 5.) && if( (Abs(Last-First) <= MS * 5.) &&
(Abs(Last-First) >= 0.01*Abs(NewFirst-Target)) ){ (Abs(Last-First) >= 0.01*Abs(NewFirst-Target)) ){
MS = Abs(Last-First)*0.2; MS = Abs(Last-First)*0.2;
} }
while(again < 3){ while(again < 3){
//On chemine. //Path.
if(!again && (MS < 5*TolGuide)) MS = 5*TolGuide; if(!again && (MS < 5*TolGuide)) MS = 5*TolGuide;
else { else {
if (5*TolGuide > MS) TolGuide = MS/5; if (5*TolGuide > MS) TolGuide = MS/5;
@ -1592,7 +1587,7 @@ Standard_Boolean ChFi3d_Builder::ComputeData
ParSol,TolEsp,Fleche,Appro); ParSol,TolEsp,Fleche,Appro);
if (!TheWalk.IsDone()) { if (!TheWalk.IsDone()) {
#ifdef DEB #ifdef DEB
cout << "Cheminement non fait" << endl; cout << "Path is not created" << endl;
#endif #endif
return Standard_False; return Standard_False;
} }
@ -1608,18 +1603,18 @@ Standard_Boolean ChFi3d_Builder::ComputeData
if (Inside) complmnt = TheWalk.Complete(Func,FInv,SpLast); if (Inside) complmnt = TheWalk.Complete(Func,FInv,SpLast);
if(!complmnt){ if(!complmnt){
#ifdef DEB #ifdef DEB
cout << "Complement non fait" << endl; cout << "Not completed" << endl;
#endif #endif
return Standard_False; return Standard_False;
} }
//On controle le resultat avec deux criteres : //The result is controlled using two criterions :
//- y a-t-il assez de points, //- if there is enough points,
//- est-on alle assez loin. //- if one has gone far enough.
Nbpnt = Lin->NbPoints(); Nbpnt = Lin->NbPoints();
if (Nbpnt == 0){ if (Nbpnt == 0){
#ifdef DEB #ifdef DEB
cout <<"0 point de cheminement on sort."<<endl; cout <<"0 point of path, quit."<<endl;
#endif #endif
return Standard_False; return Standard_False;
} }
@ -1640,12 +1635,11 @@ Standard_Boolean ChFi3d_Builder::ComputeData
okfin = (narc1 > 0 || narc2 > 0 || (Last-lpointpar) < 10*TolGuide); okfin = (narc1 > 0 || narc2 > 0 || (Last-lpointpar) < 10*TolGuide);
} }
if(!okdeb || !okfin || Nbpnt == 1){ if(!okdeb || !okfin || Nbpnt == 1){
//Ca frotte, on eteint les controles on espere evaluer un pas max //It drags, the controls are extended, it is expected to evaluate a
//satisfaisant, et on serre les fesses!!!. Si c est deja fait on //satisfactory maximum step. If it already done, quit.
//sort.
if(tchernobyl){ if(tchernobyl){
#ifdef DEB #ifdef DEB
cout <<"Ca frotte meme sans controle, on sort."<<endl; cout <<"If it drags without control, quit."<<endl;
#endif #endif
return Standard_False; return Standard_False;
} }
@ -1653,14 +1647,14 @@ Standard_Boolean ChFi3d_Builder::ComputeData
TheWalk.Check(0); TheWalk.Check(0);
if (Nbpnt == 1){ if (Nbpnt == 1){
#ifdef DEB #ifdef DEB
cout <<"1 seul point de cheminement on essaye MS/100"<<endl; cout <<"only one point of path MS/100 is attempted"<<endl;
cout <<"et on eteint les controles."<<endl; cout <<"and the controls are extended."<<endl;
#endif #endif
MS *= 0.01; MS *= 0.01;
} }
else{ else{
#ifdef DEB #ifdef DEB
cout <<"Ca frotte on eteint les controles."<<endl; cout <<"It drags, the controls are extended."<<endl;
#endif #endif
MS = (lpointpar-fpointpar)/Nbpnt; //EvalStep(Lin); MS = (lpointpar-fpointpar)/Nbpnt; //EvalStep(Lin);
} }
@ -1668,7 +1662,7 @@ Standard_Boolean ChFi3d_Builder::ComputeData
else if (Nbpnt < nbptmin){ else if (Nbpnt < nbptmin){
if(again == 0){ if(again == 0){
#ifdef DEB #ifdef DEB
cout <<"Nombre de points insuffisant on reduit le pas"<<endl; cout <<"Number of points is too small, the step is reduced"<<endl;
#endif #endif
u1sov = fpointpar; u1sov = fpointpar;
u2sov = lpointpar; u2sov = lpointpar;
@ -1678,13 +1672,13 @@ Standard_Boolean ChFi3d_Builder::ComputeData
if(Abs(fpointpar-u1sov)>=TolGuide || if(Abs(fpointpar-u1sov)>=TolGuide ||
Abs(lpointpar-u2sov)>=TolGuide){ Abs(lpointpar-u2sov)>=TolGuide){
#ifdef DEB #ifdef DEB
cout <<"Nombre de points encore insuffisant on reduit le pas"<<endl; cout <<"Number of points is still too small, the step is reduced"<<endl;
#endif #endif
MS = (lpointpar - fpointpar) * factor; MS = (lpointpar - fpointpar) * factor;
} }
else{ else{
#ifdef DEB #ifdef DEB
cout <<"Nombre de points toujours insuffisant on sort"<<endl; cout <<"Number of points is still too small, quit"<<endl;
#endif #endif
return Standard_False; return Standard_False;
} }
@ -1699,20 +1693,20 @@ Standard_Boolean ChFi3d_Builder::ComputeData
if(TheWalk.TwistOnS1()){ if(TheWalk.TwistOnS1()){
Data->TwistOnS1(Standard_True); Data->TwistOnS1(Standard_True);
#ifdef DEB #ifdef DEB
cout<<"Cheminement complet mais VRILLE sur S1"<<endl; cout<<"Path completed, but TWIST on S1"<<endl;
#endif #endif
} }
if(TheWalk.TwistOnS2()){ if(TheWalk.TwistOnS2()){
Data->TwistOnS2(Standard_True); Data->TwistOnS2(Standard_True);
#ifdef DEB #ifdef DEB
cout<<"Cheminement complet mais VRILLE sur S2"<<endl; cout<<"Parh completed, but TWIST on S2"<<endl;
#endif #endif
} }
//Ici on a un resultat plus ou moins presentable mais qui recouvre //Here there is a more or less presentable result
//la zone minimum visee. //however it covers a the minimum zone.
//On attaque les prolongements. //The extensions are targeted.
//*****************************// //*****************************//
Gd1 = Gd2 = Gf1 = Gf2 = Standard_False; Gd1 = Gd2 = Gf1 = Gf2 = Standard_False;
@ -1743,7 +1737,7 @@ Standard_Boolean ChFi3d_Builder::ComputeData
Standard_True, Data->ChangeVertexFirstOnS1(),tolesp); Standard_True, Data->ChangeVertexFirstOnS1(),tolesp);
debarc1 = Standard_True; debarc1 = Standard_True;
if(!SearchFace(Spine,Data->VertexFirstOnS1(),F1,bif)){ if(!SearchFace(Spine,Data->VertexFirstOnS1(),F1,bif)){
//On regarde si ce n'est pas un obstacle. //It is checked if there is not an obstacle.
debcas1 = Standard_True; debcas1 = Standard_True;
if(!Spine.IsNull()){ if(!Spine.IsNull()){
if(Spine->IsPeriodic()){ if(Spine->IsPeriodic()){
@ -1761,7 +1755,7 @@ Standard_Boolean ChFi3d_Builder::ComputeData
Standard_True, Data->ChangeVertexFirstOnS2(),tolesp); Standard_True, Data->ChangeVertexFirstOnS2(),tolesp);
debarc2 = Standard_True; debarc2 = Standard_True;
if(!SearchFace(Spine,Data->VertexFirstOnS2(),F2,bif)){ if(!SearchFace(Spine,Data->VertexFirstOnS2(),F2,bif)){
//On regarde si ce n'est pas un obstacle. //It is checked if it is not an obstacle.
debcas2 = Standard_True; debcas2 = Standard_True;
if(!Spine.IsNull()){ if(!Spine.IsNull()){
if(Spine->IsPeriodic()){ if(Spine->IsPeriodic()){
@ -1782,7 +1776,7 @@ Standard_Boolean ChFi3d_Builder::ComputeData
if(oncontinue) { if(oncontinue) {
TheWalk.ClassificationOnS1(!debarc1); TheWalk.ClassificationOnS1(!debarc1);
TheWalk.ClassificationOnS2(!debarc2); TheWalk.ClassificationOnS2(!debarc2);
TheWalk.Check2d(Standard_True); // Il faut etre severe (PMN) TheWalk.Check2d(Standard_True); // It should be strict (PMN)
TheWalk.Continu(Func,FInv,Target); TheWalk.Continu(Func,FInv,Target);
TheWalk.ClassificationOnS1(Standard_True); TheWalk.ClassificationOnS1(Standard_True);
TheWalk.ClassificationOnS2(Standard_True); TheWalk.ClassificationOnS2(Standard_True);
@ -1798,7 +1792,7 @@ Standard_Boolean ChFi3d_Builder::ComputeData
Standard_True, Data->ChangeVertexFirstOnS1(),tolesp); Standard_True, Data->ChangeVertexFirstOnS1(),tolesp);
debarc1 = Standard_True; debarc1 = Standard_True;
if(!SearchFace(Spine,Data->VertexFirstOnS1(),F1,bif)){ if(!SearchFace(Spine,Data->VertexFirstOnS1(),F1,bif)){
//On regarde si ce n'est pas un obstacle. //It is checked if it is not an obstacle.
debcas1 = Standard_True; debcas1 = Standard_True;
// if(!Spine.IsNull()) { // if(!Spine.IsNull()) {
// if(Spine->IsPeriodic()){ // if(Spine->IsPeriodic()){
@ -1819,7 +1813,7 @@ Standard_Boolean ChFi3d_Builder::ComputeData
Standard_True, Data->ChangeVertexFirstOnS2(),tolesp); Standard_True, Data->ChangeVertexFirstOnS2(),tolesp);
debarc2 = Standard_True; debarc2 = Standard_True;
if(!SearchFace(Spine,Data->VertexFirstOnS2(),F2,bif)){ if(!SearchFace(Spine,Data->VertexFirstOnS2(),F2,bif)){
//On regarde si ce n'est pas un obstacle. //It is checked if it is not an obstacle.
debcas2 = Standard_True; debcas2 = Standard_True;
// if(!Spine.IsNull()){ // if(!Spine.IsNull()){
// if(Spine->IsPeriodic()){ // if(Spine->IsPeriodic()){
@ -1854,7 +1848,7 @@ Standard_Boolean ChFi3d_Builder::ComputeData
Standard_False, Data->ChangeVertexLastOnS1(),tolesp); Standard_False, Data->ChangeVertexLastOnS1(),tolesp);
finarc1 = Standard_True; finarc1 = Standard_True;
if(!SearchFace(Spine,Data->VertexLastOnS1(),F1,bif)){ if(!SearchFace(Spine,Data->VertexLastOnS1(),F1,bif)){
//On regarde si ce n'est pas un obstacle. //It is checked if it is not an obstacle.
fincas1 = Standard_True; fincas1 = Standard_True;
if(!Spine.IsNull()){ if(!Spine.IsNull()){
finobst1 = IsObst(Data->VertexLastOnS1(), finobst1 = IsObst(Data->VertexLastOnS1(),
@ -1867,7 +1861,7 @@ Standard_Boolean ChFi3d_Builder::ComputeData
Standard_False, Data->ChangeVertexLastOnS2(),tolesp); Standard_False, Data->ChangeVertexLastOnS2(),tolesp);
finarc2 = Standard_True; finarc2 = Standard_True;
if(!SearchFace(Spine,Data->VertexLastOnS2(),F2,bif)){ if(!SearchFace(Spine,Data->VertexLastOnS2(),F2,bif)){
//On regarde si ce n'est pas un obstacle. //It is checked if it is not an obstacle.
fincas2 = Standard_True; fincas2 = Standard_True;
if(!Spine.IsNull()){ if(!Spine.IsNull()){
finobst2 = IsObst(Data->VertexLastOnS2(), finobst2 = IsObst(Data->VertexLastOnS2(),
@ -1883,7 +1877,7 @@ Standard_Boolean ChFi3d_Builder::ComputeData
if(oncontinue){ if(oncontinue){
TheWalk.ClassificationOnS1(!finarc1); TheWalk.ClassificationOnS1(!finarc1);
TheWalk.ClassificationOnS2(!finarc2); TheWalk.ClassificationOnS2(!finarc2);
TheWalk.Check2d(Standard_True); // Il faut etre severe (PMN) TheWalk.Check2d(Standard_True); // It should be strict (PMN)
TheWalk.Continu(Func,FInv,Target); TheWalk.Continu(Func,FInv,Target);
TheWalk.ClassificationOnS1(Standard_True); TheWalk.ClassificationOnS1(Standard_True);
TheWalk.ClassificationOnS2(Standard_True); TheWalk.ClassificationOnS2(Standard_True);
@ -1899,7 +1893,7 @@ Standard_Boolean ChFi3d_Builder::ComputeData
Standard_False, Data->ChangeVertexLastOnS1(),tolesp); Standard_False, Data->ChangeVertexLastOnS1(),tolesp);
finarc1 = Standard_True; finarc1 = Standard_True;
if(!SearchFace(Spine,Data->VertexLastOnS1(),F1,bif)){ if(!SearchFace(Spine,Data->VertexLastOnS1(),F1,bif)){
//On regarde si ce n'est pas un obstacle. //It is checked if it is not an obstacle.
fincas1 = Standard_True; fincas1 = Standard_True;
// if(!Spine.IsNull()){ // if(!Spine.IsNull()){
// finobst1 = IsObst(Data->VertexLastOnS1(), // finobst1 = IsObst(Data->VertexLastOnS1(),
@ -1948,8 +1942,8 @@ Standard_Boolean ChFi3d_Builder::ComputeData
Gd1 = debcas1/* && !debobst1*/; // skv(occ67) Gd1 = debcas1/* && !debobst1*/; // skv(occ67)
Gd2 = debcas2/* && !debobst2*/; // skv(occ67) Gd2 = debcas2/* && !debobst2*/; // skv(occ67)
if ((debarc1^debarc2) && !unseulsuffitdeb && (First!=SpFirst)) { if ((debarc1^debarc2) && !unseulsuffitdeb && (First!=SpFirst)) {
// Cas de cheminement incomplet, cela finit surement mal : // Case of incomplete path, of course this ends badly :
// on tronque le resultat au lieu de sortie. // the result is truncated instead of exit.
Standard_Real sortie; Standard_Real sortie;
Standard_Integer ind; Standard_Integer ind;
if (debarc1) sortie = Data->VertexFirstOnS1().Parameter(); if (debarc1) sortie = Data->VertexFirstOnS1().Parameter();
@ -1989,7 +1983,7 @@ Standard_Boolean ChFi3d_Builder::ComputeData
|| backwContinueFailed; // eap || backwContinueFailed; // eap
else if (intf && unseulsuffitdeb && (intf<5)) { else if (intf && unseulsuffitdeb && (intf<5)) {
intf = (Gd1 || Gd2); intf = (Gd1 || Gd2);
// On controle qu'il n'y pas de nouvelle face. // It is checked if there is no new face.
if (intf && if (intf &&
((!debcas1 && debarc1) || (!debcas2 && debarc2)) ) intf = 0; ((!debcas1 && debarc1) || (!debcas2 && debarc2)) ) intf = 0;
} }
@ -2000,8 +1994,8 @@ Standard_Boolean ChFi3d_Builder::ComputeData
Gf1 = fincas1/* && !finobst1*/; // skv(occ67) Gf1 = fincas1/* && !finobst1*/; // skv(occ67)
Gf2 = fincas2/* && !finobst2*/; // skv(occ67) Gf2 = fincas2/* && !finobst2*/; // skv(occ67)
if ((finarc1 ^finarc2) && !unseulsuffitfin && (Last!=SpLast)) { if ((finarc1 ^finarc2) && !unseulsuffitfin && (Last!=SpLast)) {
// Cas de cheminement incomplet, cela finit surement mal : // Case of incomplete path, of course, this ends badly :
// on tronque le resultat au lieu de sortie. // the result is truncated instead of exit.
Standard_Real sortie; Standard_Real sortie;
Standard_Integer ind; Standard_Integer ind;
if (finarc1) sortie = Data->VertexLastOnS1().Parameter(); if (finarc1) sortie = Data->VertexLastOnS1().Parameter();
@ -2018,7 +2012,7 @@ Standard_Boolean ChFi3d_Builder::ComputeData
} }
} }
else if ((intl>=5) && !finarc1 && !finarc2 && (Last!=SpLast) ) { else if ((intl>=5) && !finarc1 && !finarc2 && (Last!=SpLast) ) {
// Idem dans le cas ou toute la "Lin" constitue un prolongement // The same in case when the entire "Lin" is an extension
Standard_Real sortie = (First+2*Last)/3; Standard_Real sortie = (First+2*Last)/3;
Standard_Integer ind; Standard_Integer ind;
if (Last - sortie > tolesp) { if (Last - sortie > tolesp) {
@ -2042,7 +2036,7 @@ Standard_Boolean ChFi3d_Builder::ComputeData
if (intl && !unseulsuffitfin) intl = (Gf1 && Gf2)//; if (intl && !unseulsuffitfin) intl = (Gf1 && Gf2)//;
|| forwContinueFailed; // eap || forwContinueFailed; // eap
else if (intl && unseulsuffitfin && (intl<5)) { else if (intl && unseulsuffitfin && (intl<5)) {
intl = (Gf1 || Gf2);// On controle qu'il n'y pas de nouvelle face. intl = (Gf1 || Gf2);// It is checked if there is no new face.
if (intl && if (intl &&
((!fincas1 && finarc1) || (!fincas2 && finarc2)) ) intl = 0; ((!fincas1 && finarc1) || (!fincas2 && finarc2)) ) intl = 0;
} }
@ -2111,7 +2105,7 @@ Standard_Boolean ChFi3d_Builder::SimulData
tolesp,TolGuide,RecOnS1,RecOnS2, tolesp,TolGuide,RecOnS1,RecOnS2,
NewFirst,ParSol)){ NewFirst,ParSol)){
#ifdef DEB #ifdef DEB
cout<<"ChFi3d_Builder::SimulData : echec calcul first section"<<endl; cout<<"ChFi3d_Builder::SimulData : calculation fail first section"<<endl;
#endif #endif
return Standard_False; return Standard_False;
} }
@ -2121,9 +2115,8 @@ Standard_Boolean ChFi3d_Builder::SimulData
} }
Standard_Integer again = 0; Standard_Integer again = 0;
while(again < 3){ while(again < 3){
// Lorsque le point de depart est interne, on chemine // When the start point is inside, the path goes first to the left
// d abord a gauche afin de determiner le Last pour les // to determine the Last for the periodicals.
// periodiques.
if(!again && (MS < 5*TolGuide)) MS = 5*TolGuide; if(!again && (MS < 5*TolGuide)) MS = 5*TolGuide;
else { else {
if (5*TolGuide > MS) TolGuide = MS/5; if (5*TolGuide > MS) TolGuide = MS/5;
@ -2135,7 +2128,7 @@ Standard_Boolean ChFi3d_Builder::SimulData
if (!TheWalk.IsDone()) { if (!TheWalk.IsDone()) {
#ifdef DEB #ifdef DEB
cout << "Cheminement non fait" << endl; cout << "Path not created" << endl;
#endif #endif
return Standard_False; return Standard_False;
} }
@ -2151,7 +2144,7 @@ Standard_Boolean ChFi3d_Builder::SimulData
if (Inside) complmnt = TheWalk.Complete(Func,FInv,SpLast); if (Inside) complmnt = TheWalk.Complete(Func,FInv,SpLast);
if(!complmnt){ if(!complmnt){
#ifdef DEB #ifdef DEB
cout << "Complement non fait" << endl; cout << "Not completed" << endl;
#endif #endif
return Standard_False; return Standard_False;
} }
@ -2160,14 +2153,14 @@ Standard_Boolean ChFi3d_Builder::SimulData
Standard_Real factor = 1./(NbSecMin + 1); Standard_Real factor = 1./(NbSecMin + 1);
if (Nbpnt == 0){ if (Nbpnt == 0){
#ifdef DEB #ifdef DEB
cout <<"0 point de cheminement on sort."<<endl; cout <<"0 point of path, quit."<<endl;
#endif #endif
return Standard_False; return Standard_False;
} }
else if (Nbpnt == 1 && again == 0) { else if (Nbpnt == 1 && again == 0) {
again++; again++;
#ifdef DEB #ifdef DEB
cout <<"1 seul point de cheminement on essaye MS/100."<<endl; cout <<"only one point of path, MS/100 is attempted."<<endl;
#endif #endif
MS *= 0.01; Target = Targetsov; MS *= 0.01; Target = Targetsov;
u1sov = u2sov = Lin->Point(1).Parameter(); u1sov = u2sov = Lin->Point(1).Parameter();
@ -2175,7 +2168,7 @@ Standard_Boolean ChFi3d_Builder::SimulData
else if (Nbpnt< NbSecMin && again == 0) { else if (Nbpnt< NbSecMin && again == 0) {
again++; again++;
#ifdef DEB #ifdef DEB
cout <<"Nombre de points insuffisant on reduit le pas"<<endl; cout <<"Number of points is too small, the step is reduced"<<endl;
#endif #endif
Standard_Real u1 = u1sov = Lin->Point(1).Parameter(); Standard_Real u1 = u1sov = Lin->Point(1).Parameter();
Standard_Real u2 = u2sov = Lin->Point(Nbpnt).Parameter(); Standard_Real u2 = u2sov = Lin->Point(Nbpnt).Parameter();
@ -2188,21 +2181,21 @@ Standard_Boolean ChFi3d_Builder::SimulData
if(Abs(u1-u1sov)>=TolGuide || Abs(u2-u2sov)>=TolGuide){ if(Abs(u1-u1sov)>=TolGuide || Abs(u2-u2sov)>=TolGuide){
again++; again++;
#ifdef DEB #ifdef DEB
cout <<"Nombre de points encore insuffisant on reduit le pas"<<endl; cout <<"Number of points is still too small, the step is reduced"<<endl;
#endif #endif
MS /= 100; MS /= 100;
Target = Targetsov; Target = Targetsov;
} }
else{ else{
#ifdef DEB #ifdef DEB
cout <<"Nombre de points toujours insuffisant on sort"<<endl; cout <<"Number of points is still too small, quit"<<endl;
#endif #endif
return Standard_False; return Standard_False;
} }
} }
else if(Nbpnt < NbSecMin){ else if(Nbpnt < NbSecMin){
#ifdef DEB #ifdef DEB
cout <<"Nombre de points toujours insuffisant on sort"<<endl; cout <<"Number of points is still too small, quit"<<endl;
#endif #endif
return Standard_False; return Standard_False;
} }

375
src/ChFi3d/ChFi3d_Builder_C1.cxx
View File

@ -159,9 +159,9 @@ static Standard_Real recadre(const Standard_Real p,
//======================================================================= //=======================================================================
//function : Update //function : Update
//purpose : Calcul de l intersection entre la face en bout et la ligne //purpose : Calculate the intersection of the face at the end of
// de tangence pour mise a jour du CommonPoint et de son // the tangency line to update CommonPoint and its
// parametre dans la FaceInterference. // parameter in FaceInterference.
//======================================================================= //=======================================================================
static Standard_Boolean Update(Handle(Adaptor3d_HSurface)& fb, static Standard_Boolean Update(Handle(Adaptor3d_HSurface)& fb,
@ -215,9 +215,9 @@ static Standard_Boolean Update(Handle(Adaptor3d_HSurface)& fb,
Standard_Real& wop) Standard_Real& wop)
{ {
IntCurveSurface_HInter Intersection; IntCurveSurface_HInter Intersection;
//verifier que dans les KPart les bornes de la ligne de tangence //check if in KPart the limits of the tangency line
//sont deja en place a ce stade. //are already in place at this stage.
//Modif de lvt : on recadre les cas periodiques surtout si on a rien trouve. //Modif lvt : the periodic cases are reframed, espercially if nothing was found.
Standard_Real w,uf = ct->FirstParameter(),ul = ct->LastParameter(); Standard_Real w,uf = ct->FirstParameter(),ul = ct->LastParameter();
#ifndef DEB #ifndef DEB
Standard_Real wbis = 0.; Standard_Real wbis = 0.;
@ -305,9 +305,9 @@ static Standard_Boolean IntersUpdateOnSame(Handle(GeomAdaptor_HSurface)& HGs,
gp_Pnt2d& FprolUV, gp_Pnt2d& FprolUV,
Standard_Real& c3dU) Standard_Real& c3dU)
{ {
// rajouter ici des criteres plus ou moins restrictifs pour // add more or less restrictive criterions to
// decider si on fait l intersection avec la face en bout // decide if the intersection is done with the face at
// etendue ou si on aiguille sur bouchon. // extended end or if the end is sharp.
Standard_Real uf = FIop.FirstParameter(); Standard_Real uf = FIop.FirstParameter();
Standard_Real ul = FIop.LastParameter(); Standard_Real ul = FIop.LastParameter();
Handle(GeomAdaptor_HCurve) Hc3df; Handle(GeomAdaptor_HCurve) Hc3df;
@ -330,9 +330,9 @@ static Standard_Boolean IntersUpdateOnSame(Handle(GeomAdaptor_HSurface)& HGs,
//======================================================================= //=======================================================================
//function : Update //function : Update
//purpose : Calcul de l extrema curveonsurf/curveonsurf pour privilegier //purpose : Calculate the extrema curveonsurf/curveonsurf to prefer
// les valeurs concernant la trace on surf et la pcurve sur la // the values concerning the trace on surf and the pcurve on the
// face en bout. // face at end.
//======================================================================= //=======================================================================
static Standard_Boolean Update(Handle(Adaptor3d_HSurface)& face, static Standard_Boolean Update(Handle(Adaptor3d_HSurface)& face,
@ -419,7 +419,7 @@ static void ChFi3d_ExtendSurface (Handle(Geom_Surface) & S ,
//======================================================================= //=======================================================================
//function : ComputeCurve2d //function : ComputeCurve2d
//purpose : calcule le 2d de la courbe Ct sur la face Face //purpose : calculate the 2d of the curve Ct on face Face
//======================================================================= //=======================================================================
static void ComputeCurve2d (Handle(Geom_Curve )& Ct, static void ComputeCurve2d (Handle(Geom_Curve )& Ct,
@ -514,20 +514,19 @@ Standard_Boolean ChFi3d_SelectStripe(ChFiDS_ListIteratorOfListOfStripe & It,
} }
//======================================================================= //=======================================================================
//function : PerformOneCorner //function : PerformOneCorner
//purpose : Calcul d un coin a trois aretes incidentes et un conge //purpose : Calculate a corner with three edges and a fillet.
// incident. // 3 separate case: (22/07/94 only 1st is implemented)
// 3 cas distincts : (22/07/94 seul le 1er est traite)
// //
// - meme concavite sur les trois edges, intersection avec la // - same concavity on three edges, intersection with the
// face en bout, // face at end,
// - concavite des 2 edges de sortie opposee a celle du conge, // - concavity of 2 outgoing edges is opposite to the one of the fillet,
// si la face en bout s y prete, idem cas 1 sur face etendue, // if the face at end is ready for that, the same in case 1 on extended face,
// sinon on fait un petit bouchon avec GeomFill, // otherwise a small cap is done with GeomFill,
// - un seul edge de sortie de concavite opposee a celle du // - only one outgoing edge has concavity opposed to the edge of the
// conge et du troisieme edge, on relie le sommet au coin // fillet and the third edge, the top of the corner is reread
// dans le vide du conge et on bouche, soit en agrandissant // in the empty of the fillet and closed, either by extending the face
// la face en bout si celle ci est plane et orthogonale a // at end if it is plane and orthogonal to the
// l edge guide, soit par un bouchon type GeomFill. // guiding edge, or by a cap of type GeomFill.
// //
// <thePrepareOnSame> means that only needed thing is redefinition // <thePrepareOnSame> means that only needed thing is redefinition
// of intersection pameter of OnSame-Stripe with <Arcprol> // of intersection pameter of OnSame-Stripe with <Arcprol>
@ -540,11 +539,11 @@ void ChFi3d_Builder::PerformOneCorner(const Standard_Integer Index,
TopOpeBRepDS_DataStructure& DStr = myDS->ChangeDS(); TopOpeBRepDS_DataStructure& DStr = myDS->ChangeDS();
#ifdef DEB #ifdef DEB
OSD_Chronometer ch;// init perf pour PerformSetOfKPart OSD_Chronometer ch;// init perf for PerformSetOfKPart
#endif #endif
// le sommet, // the top,
const TopoDS_Vertex& Vtx = myVDataMap.FindKey(Index); const TopoDS_Vertex& Vtx = myVDataMap.FindKey(Index);
// On recupere le conge concerne, // The fillet is returned,
ChFiDS_ListIteratorOfListOfStripe StrIt; ChFiDS_ListIteratorOfListOfStripe StrIt;
StrIt.Initialize(myVDataMap(Index)); StrIt.Initialize(myVDataMap(Index));
if ( ! ChFi3d_SelectStripe (StrIt, Vtx, thePrepareOnSame)) return; if ( ! ChFi3d_SelectStripe (StrIt, Vtx, thePrepareOnSame)) return;
@ -552,24 +551,24 @@ void ChFi3d_Builder::PerformOneCorner(const Standard_Integer Index,
const Handle(ChFiDS_Spine) spine = stripe->Spine(); const Handle(ChFiDS_Spine) spine = stripe->Spine();
ChFiDS_SequenceOfSurfData& SeqFil = ChFiDS_SequenceOfSurfData& SeqFil =
stripe->ChangeSetOfSurfData()->ChangeSequence(); stripe->ChangeSetOfSurfData()->ChangeSequence();
// la SurfData en cause et ses CommonPoints, // SurfData and its CommonPoints,
Standard_Integer sens = 0; Standard_Integer sens = 0;
// Choisit la bonne SurfData // Choose proper SurfData
Standard_Integer num = ChFi3d_IndexOfSurfData(Vtx,stripe,sens); Standard_Integer num = ChFi3d_IndexOfSurfData(Vtx,stripe,sens);
Standard_Boolean isfirst = (sens == 1); Standard_Boolean isfirst = (sens == 1);
if (isfirst) { if (isfirst) {
for (; num<SeqFil.Length() && ( for (; num<SeqFil.Length() && (
(SeqFil.Value(num)->IndexOfS1()==0) || (SeqFil.Value(num)->IndexOfS1()==0) ||
(SeqFil.Value(num)->IndexOfS2()==0) ); ) { (SeqFil.Value(num)->IndexOfS2()==0) ); ) {
SeqFil.Remove(num); // On elimine le surplus SeqFil.Remove(num); // The surplus is removed
} }
} }
else { else {
for (; num>1 && ( for (; num>1 && (
(SeqFil.Value(num)->IndexOfS1()==0) || (SeqFil.Value(num)->IndexOfS1()==0) ||
(SeqFil.Value(num)->IndexOfS2()==0) ); ) { (SeqFil.Value(num)->IndexOfS2()==0) ); ) {
SeqFil.Remove(num);// On elimine le surplus SeqFil.Remove(num);// The surplus is removed
num--; num--;
} }
} }
@ -577,10 +576,10 @@ void ChFi3d_Builder::PerformOneCorner(const Standard_Integer Index,
Handle(ChFiDS_SurfData)& Fd = SeqFil.ChangeValue(num); Handle(ChFiDS_SurfData)& Fd = SeqFil.ChangeValue(num);
ChFiDS_CommonPoint& CV1 = Fd->ChangeVertex(isfirst,1); ChFiDS_CommonPoint& CV1 = Fd->ChangeVertex(isfirst,1);
ChFiDS_CommonPoint& CV2 = Fd->ChangeVertex(isfirst,2); ChFiDS_CommonPoint& CV2 = Fd->ChangeVertex(isfirst,2);
//Pour evaluer la boule des nouveaux points. //To evaluate the new points.
Bnd_Box box1,box2; Bnd_Box box1,box2;
// On traite separement les cas bouchon des cas intersection. // The cases of cap and intersection are processed separately.
// ---------------------------------------------------------- // ----------------------------------------------------------
ChFiDS_State stat; ChFiDS_State stat;
if (isfirst) stat = spine->FirstStatus(); if (isfirst) stat = spine->FirstStatus();
@ -625,9 +624,7 @@ void ChFi3d_Builder::PerformOneCorner(const Standard_Integer Index,
if (!CV1.IsOnArc() && !CV2.IsOnArc()) if (!CV1.IsOnArc() && !CV2.IsOnArc())
Standard_Failure::Raise("Corner OnSame : no point on arc"); Standard_Failure::Raise("Corner OnSame : no point on arc");
else if (CV1.IsOnArc() && CV2.IsOnArc()) { else if (CV1.IsOnArc() && CV2.IsOnArc()) {
// on explore pour detromper les KPart qui seraient sortis Standard_Boolean sur1 = 0, sur2 = 0;
// au diable.
Standard_Boolean sur1 = 0, sur2 = 0;
for(ex.Init(CV1.Arc(),TopAbs_VERTEX); ex.More(); ex.Next()) { for(ex.Init(CV1.Arc(),TopAbs_VERTEX); ex.More(); ex.Next()) {
if (Vtx.IsSame(ex.Current())) { if (Vtx.IsSame(ex.Current())) {
sur1 = 1; sur1 = 1;
@ -654,7 +651,7 @@ void ChFi3d_Builder::PerformOneCorner(const Standard_Integer Index,
Fad = TopoDS::Face(DStr.Shape(Fd->Index(IFadArc))); Fad = TopoDS::Face(DStr.Shape(Fd->Index(IFadArc)));
Fop = TopoDS::Face(DStr.Shape(Fd->Index(IFopArc))); Fop = TopoDS::Face(DStr.Shape(Fd->Index(IFopArc)));
TopTools_ListIteratorOfListOfShape It; TopTools_ListIteratorOfListOfShape It;
// On recupere la face en bout sans controle de son unicite. // The face at end is returned without check of its unicity.
for(It.Initialize(myEFMap(Arcpiv));It.More();It.Next()) { for(It.Initialize(myEFMap(Arcpiv));It.More();It.Next()) {
if (!Fad.IsSame(It.Value())) { if (!Fad.IsSame(It.Value())) {
Fv = TopoDS::Face(It.Value()); Fv = TopoDS::Face(It.Value());
@ -662,7 +659,7 @@ void ChFi3d_Builder::PerformOneCorner(const Standard_Integer Index,
} }
} }
// est-ce que la face en bout contient le Vertex ? // Does the face at bout contain the Vertex ?
Standard_Boolean isinface = Standard_False; Standard_Boolean isinface = Standard_False;
for (ex.Init(Fv,TopAbs_VERTEX); ex.More(); ex.Next()) { for (ex.Init(Fv,TopAbs_VERTEX); ex.More(); ex.Next()) {
if (ex.Current().IsSame(Vtx)) { if (ex.Current().IsSame(Vtx)) {
@ -677,7 +674,7 @@ void ChFi3d_Builder::PerformOneCorner(const Standard_Integer Index,
Fad = TopoDS::Face(DStr.Shape(Fd->Index(IFadArc))); Fad = TopoDS::Face(DStr.Shape(Fd->Index(IFadArc)));
Fop = TopoDS::Face(DStr.Shape(Fd->Index(IFopArc))); Fop = TopoDS::Face(DStr.Shape(Fd->Index(IFopArc)));
//TopTools_ListIteratorOfListOfShape It; //TopTools_ListIteratorOfListOfShape It;
// On recupere la face en bout sans controle de son unicite. // The face at end is returned without check of its unicity.
for(It.Initialize(myEFMap(Arcpiv));It.More();It.Next()) { for(It.Initialize(myEFMap(Arcpiv));It.More();It.Next()) {
if (!Fad.IsSame(It.Value())) { if (!Fad.IsSame(It.Value())) {
Fv = TopoDS::Face(It.Value()); Fv = TopoDS::Face(It.Value());
@ -687,13 +684,13 @@ void ChFi3d_Builder::PerformOneCorner(const Standard_Integer Index,
} }
if (Fv.IsNull()) StdFail_NotDone::Raise if (Fv.IsNull()) StdFail_NotDone::Raise
("OneCorner : face en bout non trouvee"); ("OneCorner : face at end not found");
Fv.Orientation(TopAbs_FORWARD); Fv.Orientation(TopAbs_FORWARD);
Fad.Orientation(TopAbs_FORWARD); Fad.Orientation(TopAbs_FORWARD);
Fop.Orientation(TopAbs_FORWARD); Fop.Orientation(TopAbs_FORWARD);
// On recupere de meme l edge qui sera a prolonger. // The edge that will be extended is returned.
for(It.Initialize(myVEMap(Vtx));It.More() && Arcprol.IsNull();It.Next()) { for(It.Initialize(myVEMap(Vtx));It.More() && Arcprol.IsNull();It.Next()) {
if (!Arcpiv.IsSame(It.Value())) { if (!Arcpiv.IsSame(It.Value())) {
for(ex.Init(Fv,TopAbs_EDGE); ex.More(); ex.Next()) { for(ex.Init(Fv,TopAbs_EDGE); ex.More(); ex.Next()) {
@ -734,17 +731,16 @@ void ChFi3d_Builder::PerformOneCorner(const Standard_Integer Index,
Bad.Initialize(Fad); Bad.Initialize(Fad);
Bop.Initialize(Fop); Bop.Initialize(Fop);
} }
//dans le cas OnSame on va devoir modifier le CommonPoint //in case of OnSame it is necessary to modify the CommonPoint
//dans le vide et son parametre dans la FaceInterference. //in the empty and its parameter in the FaceInterference.
//On les recupere donc tous deux dans des references //They are both returned in non const references. Attention the modifications are done behind
//non const. Attention les modifs se font dans le dos
//de CV1,CV2,Fi1,Fi2. //de CV1,CV2,Fi1,Fi2.
ChFiDS_CommonPoint& CPopArc = Fd->ChangeVertex(isfirst,IFopArc); ChFiDS_CommonPoint& CPopArc = Fd->ChangeVertex(isfirst,IFopArc);
ChFiDS_FaceInterference& FiopArc = Fd->ChangeInterference(IFopArc); ChFiDS_FaceInterference& FiopArc = Fd->ChangeInterference(IFopArc);
ChFiDS_CommonPoint& CPadArc = Fd->ChangeVertex(isfirst,IFadArc); ChFiDS_CommonPoint& CPadArc = Fd->ChangeVertex(isfirst,IFadArc);
ChFiDS_FaceInterference& FiadArc = Fd->ChangeInterference(IFadArc); ChFiDS_FaceInterference& FiadArc = Fd->ChangeInterference(IFadArc);
//on initialise le parametre du vertex en l air a la valeur de son //the parameter of the vertex in the air is initialiced with the value of
//copain d en face (point sur arc). //its opposite (point on arc).
Standard_Real wop = Fd->ChangeInterference(IFadArc).Parameter(isfirst); Standard_Real wop = Fd->ChangeInterference(IFadArc).Parameter(isfirst);
Handle(Geom_Curve) c3df; Handle(Geom_Curve) c3df;
Handle(GeomAdaptor_HSurface) Handle(GeomAdaptor_HSurface)
@ -855,7 +851,7 @@ void ChFi3d_Builder::PerformOneCorner(const Standard_Integer Index,
Udeb = Cc->FirstParameter(); Udeb = Cc->FirstParameter();
Ufin = Cc->LastParameter(); Ufin = Cc->LastParameter();
// on determine si la courbe a une intersection avec l'arete de couture // determine if the curve has an intersection with edge of sewing
ChFi3d_Couture(Fv,couture,edgecouture); ChFi3d_Couture(Fv,couture,edgecouture);
@ -947,9 +943,9 @@ void ChFi3d_Builder::PerformOneCorner(const Standard_Integer Index,
stripe->SetIndexPoint(ChFi3d_IndexPointInDS(CV2,DStr),isfirst,2); stripe->SetIndexPoint(ChFi3d_IndexPointInDS(CV2,DStr),isfirst,2);
if (!intcouture) { if (!intcouture) {
// il n'y a pas d'intersection avec l'arete de couture // there is no intersection with the sewing edge
// on stocke la courbe Cc dans la stripe // the curve Cc is stored in the stripe
// le stockage dans la DS se fera par FILDS. // the storage in the DS is not done by FILDS.
TopOpeBRepDS_Curve Tc(Cc,tolreached); TopOpeBRepDS_Curve Tc(Cc,tolreached);
ICurve = DStr.AddCurve(Tc); ICurve = DStr.AddCurve(Tc);
@ -1136,11 +1132,11 @@ void ChFi3d_Builder::PerformOneCorner(const Standard_Integer Index,
stripe->SetParameters(isfirst,Udeb,Ufin); stripe->SetParameters(isfirst,Udeb,Ufin);
} }
else { else {
// on stocke les courbes curv1 et curv2 dans la DS // curves curv1 are curv2 stored in the DS
// ces courbes ne seront pas reconstruites par FILDS car // these curves will not be reconstructed by FILDS as
// on met stripe->InDS(isfirst); // one places stripe->InDS(isfirst);
// interferences de curv1 et curv2 sur Fv // interferences of curv1 and curv2 on Fv
ComputeCurve2d(curv1,Fv,c2d1); ComputeCurve2d(curv1,Fv,c2d1);
Handle(TopOpeBRepDS_SurfaceCurveInterference) InterFv; Handle(TopOpeBRepDS_SurfaceCurveInterference) InterFv;
InterFv = ChFi3d_FilCurveInDS(Icurv1,IShape,c2d1,Et); InterFv = ChFi3d_FilCurveInDS(Icurv1,IShape,c2d1,Et);
@ -1148,7 +1144,7 @@ void ChFi3d_Builder::PerformOneCorner(const Standard_Integer Index,
ComputeCurve2d(curv2,Fv,c2d2); ComputeCurve2d(curv2,Fv,c2d2);
InterFv = ChFi3d_FilCurveInDS(Icurv2,IShape,c2d2,Et); InterFv = ChFi3d_FilCurveInDS(Icurv2,IShape,c2d2,Et);
DStr.ChangeShapeInterferences(IShape).Append(InterFv); DStr.ChangeShapeInterferences(IShape).Append(InterFv);
// interferences de curv1 et curv2 sur Isurf // interferences of curv1 and curv2 on Isurf
if (Fd->Orientation()== Fv.Orientation()) Et=TopAbs::Reverse(Et); if (Fd->Orientation()== Fv.Orientation()) Et=TopAbs::Reverse(Et);
c2d1=new Geom2d_TrimmedCurve(Ps,Udeb,par2); c2d1=new Geom2d_TrimmedCurve(Ps,Udeb,par2);
InterFv = ChFi3d_FilCurveInDS(Icurv1,Isurf,c2d1,Et); InterFv = ChFi3d_FilCurveInDS(Icurv1,Isurf,c2d1,Et);
@ -1157,7 +1153,7 @@ void ChFi3d_Builder::PerformOneCorner(const Standard_Integer Index,
InterFv = ChFi3d_FilCurveInDS(Icurv2,Isurf,c2d2,Et); InterFv = ChFi3d_FilCurveInDS(Icurv2,Isurf,c2d2,Et);
DStr.ChangeSurfaceInterferences(Isurf).Append(InterFv); DStr.ChangeSurfaceInterferences(Isurf).Append(InterFv);
// limitation de l'arete de couture // limitation of the sewing edge
Standard_Integer Iarc=DStr.AddShape(edgecouture); Standard_Integer Iarc=DStr.AddShape(edgecouture);
Handle(TopOpeBRepDS_CurvePointInterference) Interfedge; Handle(TopOpeBRepDS_CurvePointInterference) Interfedge;
TopAbs_Orientation ori; TopAbs_Orientation ori;
@ -1172,7 +1168,7 @@ void ChFi3d_Builder::PerformOneCorner(const Standard_Integer Index,
Interfedge = ChFi3d_FilPointInDS(ori,Iarc,indpt,par1); Interfedge = ChFi3d_FilPointInDS(ori,Iarc,indpt,par1);
DStr.ChangeShapeInterferences(Iarc).Append(Interfedge); DStr.ChangeShapeInterferences(Iarc).Append(Interfedge);
// creation des CurveInterferences de Icurv1 et Icurv2 // creation of CurveInterferences from Icurv1 and Icurv2
stripe->InDS(isfirst); stripe->InDS(isfirst);
Standard_Integer ind1= stripe->IndexPoint(isfirst,1); Standard_Integer ind1= stripe->IndexPoint(isfirst,1);
Standard_Integer ind2= stripe->IndexPoint(isfirst,2); Standard_Integer ind2= stripe->IndexPoint(isfirst,2);
@ -1192,14 +1188,14 @@ void ChFi3d_Builder::PerformOneCorner(const Standard_Integer Index,
if (onsame && inters) { if (onsame && inters) {
// VARIANT 1: // VARIANT 1:
// On rajoute le petit bout de courbe qui manque pour l extension // A small missing end of curve is added for the extension
// de la face en bout et la limitation de la face opposee. // of the face at end and the limitation of the opposing face.
// VARIANT 2 : extend Arcprol, not create new small edge // VARIANT 2 : extend Arcprol, not create new small edge
// To do: modify for intcouture // To do: modify for intcouture
const Standard_Boolean variant1 = Standard_True; const Standard_Boolean variant1 = Standard_True;
// Tout d abord on coupe les ponts avec l arete de la spine. // First of all the ponts are cut with the edge of the spine.
Standard_Integer IArcspine = DStr.AddShape(Arcspine); Standard_Integer IArcspine = DStr.AddShape(Arcspine);
Standard_Integer IVtx = DStr.AddShape(Vtx); Standard_Integer IVtx = DStr.AddShape(Vtx);
#ifndef DEB #ifndef DEB
@ -1220,7 +1216,7 @@ void ChFi3d_Builder::PerformOneCorner(const Standard_Integer Index,
interfv = ChFi3d_FilVertexInDS(OVtx,IArcspine,IVtx,parVtx); interfv = ChFi3d_FilVertexInDS(OVtx,IArcspine,IVtx,parVtx);
DStr.ChangeShapeInterferences(IArcspine).Append(interfv); DStr.ChangeShapeInterferences(IArcspine).Append(interfv);
// On construit maintenant les courbes qui manquent. // Now the missing curves are constructed.
TopoDS_Vertex V2; TopoDS_Vertex V2;
for(ex.Init(Arcprol.Oriented(TopAbs_FORWARD),TopAbs_VERTEX); for(ex.Init(Arcprol.Oriented(TopAbs_FORWARD),TopAbs_VERTEX);
ex.More(); ex.Next()) { ex.More(); ex.Next()) {
@ -1267,8 +1263,8 @@ void ChFi3d_Builder::PerformOneCorner(const Standard_Integer Index,
TopOpeBRepDS_Curve Zob(zob3d,tolreached); TopOpeBRepDS_Curve Zob(zob3d,tolreached);
Standard_Integer IZob = DStr.AddCurve(Zob); Standard_Integer IZob = DStr.AddCurve(Zob);
// on determine si Fop a une arete de couture // it is determined if Fop has an edge of sewing
// on determine si la courbe a une intersection avec l'arete de couture // it is determined if the curve has an intersection with the edge of sewing
//TopoDS_Edge edgecouture; //TopoDS_Edge edgecouture;
//Standard_Boolean couture; //Standard_Boolean couture;
@ -1299,7 +1295,7 @@ void ChFi3d_Builder::PerformOneCorner(const Standard_Integer Index,
} }
if (intcouture) { if (intcouture) {
// interference de curv1 et curv2 sur Ishape // interference of curv1 and curv2 on Ishape
Et = TopAbs::Reverse(TopAbs::Compose(OVtx,OArcprolv)); Et = TopAbs::Reverse(TopAbs::Compose(OVtx,OArcprolv));
ComputeCurve2d(curv1,Fop,c2d1); ComputeCurve2d(curv1,Fop,c2d1);
Handle(TopOpeBRepDS_SurfaceCurveInterference) Handle(TopOpeBRepDS_SurfaceCurveInterference)
@ -1309,7 +1305,7 @@ void ChFi3d_Builder::PerformOneCorner(const Standard_Integer Index,
InterFv = ChFi3d_FilCurveInDS(Icurv2,IShape,/*zob2dv*/c2d2,Et); InterFv = ChFi3d_FilCurveInDS(Icurv2,IShape,/*zob2dv*/c2d2,Et);
DStr.ChangeShapeInterferences(IShape).Append(InterFv); DStr.ChangeShapeInterferences(IShape).Append(InterFv);
// limitation de l'arete de couture // limitation of the sewing edge
Standard_Integer Iarc=DStr.AddShape(edgecouture); Standard_Integer Iarc=DStr.AddShape(edgecouture);
Handle(TopOpeBRepDS_CurvePointInterference) Interfedge; Handle(TopOpeBRepDS_CurvePointInterference) Interfedge;
TopAbs_Orientation ori; TopAbs_Orientation ori;
@ -1324,7 +1320,7 @@ void ChFi3d_Builder::PerformOneCorner(const Standard_Integer Index,
Interfedge = ChFi3d_FilPointInDS(ori,Iarc,indpt,par1); Interfedge = ChFi3d_FilPointInDS(ori,Iarc,indpt,par1);
DStr.ChangeShapeInterferences(Iarc).Append(Interfedge); DStr.ChangeShapeInterferences(Iarc).Append(Interfedge);
// interference de curv1 et curv2 sur Iop // interference of curv1 and curv2 on Iop
Standard_Integer Iop = DStr.AddShape(Fop); Standard_Integer Iop = DStr.AddShape(Fop);
Et = TopAbs::Reverse(TopAbs::Compose(OVtx,OArcprolop)); Et = TopAbs::Reverse(TopAbs::Compose(OVtx,OArcprolop));
Handle(TopOpeBRepDS_SurfaceCurveInterference) Interfop; Handle(TopOpeBRepDS_SurfaceCurveInterference) Interfop;
@ -1397,8 +1393,8 @@ void ChFi3d_Builder::PerformOneCorner(const Standard_Integer Index,
//======================================================================= //=======================================================================
//function : cherche_face //function : cherche_face
//purpose : recherche de la face F appartenant a la map , differente des faces //purpose : find face F belonging to the map, different from faces
// F1 F2 F3 et contenant l'edge E // F1 F2 F3 and containing edge E
//======================================================================= //=======================================================================
static void cherche_face (const TopTools_ListOfShape & map, static void cherche_face (const TopTools_ListOfShape & map,
@ -1429,7 +1425,7 @@ static void cherche_face (const TopTools_ListOfShape & map,
//======================================================================= //=======================================================================
//function : cherche_edge1 //function : cherche_edge1
//purpose : cherche l'edge commune entre les faces F1 et F2 //purpose : find common edge between faces F1 and F2
//======================================================================= //=======================================================================
static void cherche_edge1 (const TopoDS_Face & F1, static void cherche_edge1 (const TopoDS_Face & F1,
@ -1459,7 +1455,7 @@ static void cherche_edge1 (const TopoDS_Face & F1,
//======================================================================= //=======================================================================
//function : containV //function : containV
//purpose : renvoie vrai si le vertex V appartient a F1 //purpose : return true if vertex V belongs to F1
//======================================================================= //=======================================================================
static Standard_Boolean containV(const TopoDS_Face & F1, static Standard_Boolean containV(const TopoDS_Face & F1,
@ -1483,7 +1479,7 @@ static Standard_Boolean containV(const TopoDS_Face & F1,
//======================================================================= //=======================================================================
//function : containE //function : containE
//purpose : renvoie vrai si le l'edge E appartient a F1 //purpose : return true if edge E belongs to F1
//======================================================================= //=======================================================================
static Standard_Boolean containE(const TopoDS_Face & F1, static Standard_Boolean containE(const TopoDS_Face & F1,
@ -1552,11 +1548,11 @@ static Standard_Boolean IsShrink(const Geom2dAdaptor_Curve PC,
void ChFi3d_Builder::PerformIntersectionAtEnd(const Standard_Integer Index) void ChFi3d_Builder::PerformIntersectionAtEnd(const Standard_Integer Index)
{ {
//intersection en bout d'un conge avec au moins deux faces // intersection at end of fillet with at least two faces
// traite les cas suivants: // process the following cases:
// - sommet a n (n>3) aretes adjacentes // - top has n (n>3) adjacent edges
// - sommet a 3 aretes dont le conge sur une des aretes arrive sur plus // - top has 3 edges and fillet on one of edges touches
// d'une face // more than one face
#ifdef DEB #ifdef DEB
OSD_Chronometer ch;// init perf OSD_Chronometer ch;// init perf
@ -1576,7 +1572,7 @@ void ChFi3d_Builder::PerformIntersectionAtEnd(const Standard_Integer Index)
//Standard_Integer sense; //Standard_Integer sense;
TopoDS_Edge edgelibre1,edgelibre2,EdgeSpine; TopoDS_Edge edgelibre1,edgelibre2,EdgeSpine;
Standard_Boolean bordlibre; Standard_Boolean bordlibre;
// determination du nombre de faces et d'aretes // determine the number of faces and edges
TopTools_Array1OfShape tabedg(0,nn); TopTools_Array1OfShape tabedg(0,nn);
TopoDS_Face F1,F2; TopoDS_Face F1,F2;
Standard_Integer nface=ChFi3d_nbface(myVFMap(Vtx)); Standard_Integer nface=ChFi3d_nbface(myVFMap(Vtx));
@ -1586,8 +1582,7 @@ void ChFi3d_Builder::PerformIntersectionAtEnd(const Standard_Integer Index)
ChFi3d_ChercheBordsLibres(myVEMap,Vtx,bordlibre,edgelibre1,edgelibre2); ChFi3d_ChercheBordsLibres(myVEMap,Vtx,bordlibre,edgelibre1,edgelibre2);
if (bordlibre) nbarete=(nbarete-2)/2 +2; if (bordlibre) nbarete=(nbarete-2)/2 +2;
else nbarete=nbarete/2; else nbarete=nbarete/2;
// on determine s'il y a une arete de couture, l'arete de couture // it is determined if there is an edge of sewing and it face
// et la face qui a une arete de couture
TopoDS_Face facecouture; TopoDS_Face facecouture;
TopoDS_Edge edgecouture; TopoDS_Edge edgecouture;
@ -1599,7 +1594,7 @@ void ChFi3d_Builder::PerformIntersectionAtEnd(const Standard_Integer Index)
if (couture) if (couture)
facecouture=fcur; facecouture=fcur;
} }
// on determine si l'une des aretes adjacente au conge est reguliere // it is determined if one of edges adjacent to the fillet is regular
Standard_Boolean reg1,reg2; Standard_Boolean reg1,reg2;
TopoDS_Edge Ecur,Eadj1,Eadj2; TopoDS_Edge Ecur,Eadj1,Eadj2;
TopoDS_Face Fga,Fdr; TopoDS_Face Fga,Fdr;
@ -1639,7 +1634,7 @@ void ChFi3d_Builder::PerformIntersectionAtEnd(const Standard_Integer Index)
reg2=isTangentFaces(Eadj2,Fga,Fdr); reg2=isTangentFaces(Eadj2,Fga,Fdr);
// Modified by Sergey KHROMOV - Fri Dec 21 17:58:24 2001 End // Modified by Sergey KHROMOV - Fri Dec 21 17:58:24 2001 End
// on cherche les deux faces communes a l'edge // two faces common to the edge are found
if (reg1 || reg2) { if (reg1 || reg2) {
Standard_Boolean compoint1=Standard_False; Standard_Boolean compoint1=Standard_False;
Standard_Boolean compoint2=Standard_False; Standard_Boolean compoint2=Standard_False;
@ -1660,8 +1655,8 @@ void ChFi3d_Builder::PerformIntersectionAtEnd(const Standard_Integer Index)
} }
} }
} }
// on a une seule face en bout si FindFace est vrai et si la face // there is only one face at end if FindFace is true and if the face
// n'est pas la face avec arete de couture // is not the face with sewing edge
TopoDS_Face face; TopoDS_Face face;
Handle(ChFiDS_SurfData) Fd = SeqFil.ChangeValue(num); Handle(ChFiDS_SurfData) Fd = SeqFil.ChangeValue(num);
ChFiDS_CommonPoint& CV1 = Fd->ChangeVertex(isfirst,1); ChFiDS_CommonPoint& CV1 = Fd->ChangeVertex(isfirst,1);
@ -1699,7 +1694,7 @@ void ChFi3d_Builder::PerformIntersectionAtEnd(const Standard_Integer Index)
SDprev = SeqFil(num1); SDprev = SeqFil(num1);
IsurfPrev = SDprev->Surf(); IsurfPrev = SDprev->Surf();
} }
// calcul de l' orientation orcourbe des courbes en bout // calculate the orientation of curves at end
Standard_Real tolpt=1.e-4; Standard_Real tolpt=1.e-4;
Standard_Real tolreached; Standard_Real tolreached;
@ -1789,11 +1784,10 @@ void ChFi3d_Builder::PerformIntersectionAtEnd(const Standard_Integer Index)
} }
/***********************************************************************/ /***********************************************************************/
// recherche des faces a intersecter avec le conge et des edges servant // find faces intersecting with the fillet and edges limiting intersections
// a limiter ces intersections // nbface is the nb of faces intersected, Face[i] contais the faces
// nbface est le nb de faces a intersecter, Face[i] contient les faces // to intersect (i=0.. nbface-1). Edge[i] contains edges limiting
// a intersecter (i=0.. nbface-1). Edge[i] contient les edges limitant // the intersections (i=0 ..nbface)
// les intersections (i=0 ..nbface)
/**********************************************************************/ /**********************************************************************/
Standard_Integer nb = 1,nbface; Standard_Integer nb = 1,nbface;
@ -1820,9 +1814,9 @@ void ChFi3d_Builder::PerformIntersectionAtEnd(const Standard_Integer Index)
Edge[nbface]=CV2.Arc(); Edge[nbface]=CV2.Arc();
tabedg.SetValue(0,Edge[0]); tabedg.SetValue(0,Edge[0]);
tabedg.SetValue(nbface,Edge[nbface]); tabedg.SetValue(nbface,Edge[nbface]);
// traitement d'un conge arrivant sur un vertex // processing of a fillet arriving on a vertex
// l'edge contenue dans CV.Arc n'est pas forcement la bonne // edge contained in CV.Arc is not inevitably good
// on cherche l'edge concernee par l'intersection // the edge concerned by the intersection is found
Standard_Real dist1,dist2; Standard_Real dist1,dist2;
if (CV1.IsVertex()) { if (CV1.IsVertex()) {
@ -1885,8 +1879,8 @@ void ChFi3d_Builder::PerformIntersectionAtEnd(const Standard_Integer Index)
} }
} }
if (!onecorner) { if (!onecorner) {
// Lorsqu'il y a une arete de regularite les faces adjacentes a l'edge // If there is a regular edge, the faces adjacent to it
// ne sont pas dans Fd->IndexOfS1 ou Fd->IndexOfS2 // are not in Fd->IndexOfS1 or Fd->IndexOfS2
// TopoDS_Face Find1 ,Find2; // TopoDS_Face Find1 ,Find2;
// if (isfirst) // if (isfirst)
@ -1902,9 +1896,9 @@ void ChFi3d_Builder::PerformIntersectionAtEnd(const Standard_Integer Index)
// } // }
// } // }
// si nface =3 on a un sommet a trois arete avec un conge incident // if nface =3 there is a top with 3 edges and a fillet
// dont les commons points sont sur des faces differentes // and their common points are on different faces
// sinon on est dans le cas d'un sommet a plus de 3 aretes // otherwise there is a case when a top has more than 3 edges
if (nface==3) { if (nface==3) {
if (CV1.IsVertex ()) findonf1=Standard_True; if (CV1.IsVertex ()) findonf1=Standard_True;
@ -1945,10 +1939,9 @@ void ChFi3d_Builder::PerformIntersectionAtEnd(const Standard_Integer Index)
} }
} }
// findonf1 findonf2 indiquent si F1 et ou F2 sont adajacentes // findonf1 findonf2 show if F1 and/or F2 are adjacent
// a plusieurs faces en bout // to many faces at end
// on determine ces faces en bout ainsi que les edges concernees par // the faces at end and intersected edges are found
// les intersections
if (findonf1 && !isOnSame1) { if (findonf1 && !isOnSame1) {
if (CV1.TransitionOnArc()==TopAbs_FORWARD) if (CV1.TransitionOnArc()==TopAbs_FORWARD)
@ -1965,7 +1958,7 @@ void ChFi3d_Builder::PerformIntersectionAtEnd(const Standard_Integer Index)
cherche_edge1(Face[nb-1],Face[nb],Edge[nb]); cherche_edge1(Face[nb-1],Face[nb],Edge[nb]);
nb++; nb++;
if (nb>=nn) Standard_Failure::Raise if (nb>=nn) Standard_Failure::Raise
("IntersectionAtEnd : nb de faces limites atteint"); ("IntersectionAtEnd : the max number of faces reached");
} }
if (!findonf2) Edge[nb]=CV2.Arc(); if (!findonf2) Edge[nb]=CV2.Arc();
} }
@ -1987,7 +1980,7 @@ void ChFi3d_Builder::PerformIntersectionAtEnd(const Standard_Integer Index)
cherche_edge1(Face[nb-1],Face[nb],Edge[nb]); cherche_edge1(Face[nb-1],Face[nb],Edge[nb]);
nb++; nb++;
if (nb>=nn) Standard_Failure::Raise if (nb>=nn) Standard_Failure::Raise
("IntersectionAtEnd : nb de faces limites atteint"); ("IntersectionAtEnd : the max number of faces reached");
} }
Edge[nb]=CV2.Arc(); Edge[nb]=CV2.Arc();
} }
@ -2001,8 +1994,8 @@ void ChFi3d_Builder::PerformIntersectionAtEnd(const Standard_Integer Index)
else { else {
// on est dans le cas d'un sommet a plus de trois aretes // this is the case when a top has more than three edges
// on determine les faces et les aretes concernees // the faces and edges concerned are found
Standard_Boolean /*trouve,*/possible1, possible2; Standard_Boolean /*trouve,*/possible1, possible2;
trouve = possible1 = possible2 = Standard_False; trouve = possible1 = possible2 = Standard_False;
TopExp_Explorer ex; TopExp_Explorer ex;
@ -2034,7 +2027,7 @@ void ChFi3d_Builder::PerformIntersectionAtEnd(const Standard_Integer Index)
return; return;
} }
if (nbarete==4) { if (nbarete==4) {
// si deux edges consecutives sont G1 on a une seule face d'intersection // if two consecutive edges are G1 there is only one face of intersection
Standard_Real ang1=0.0; Standard_Real ang1=0.0;
TopoDS_Vertex Vcom; TopoDS_Vertex Vcom;
trouve=Standard_False; trouve=Standard_False;
@ -2106,8 +2099,8 @@ void ChFi3d_Builder::PerformIntersectionAtEnd(const Standard_Integer Index)
Standard_Boolean extend=Standard_False; Standard_Boolean extend=Standard_False;
Handle(Geom_Surface) Sfacemoins1,Sface; Handle(Geom_Surface) Sfacemoins1,Sface;
/***************************************************************************/ /***************************************************************************/
// calcul de l'intersection entre le conge et chaque face // calculate intersection of the fillet and each face
// et stockage dans la DS // and storage in the DS
/***************************************************************************/ /***************************************************************************/
for (nb=1;nb<=nbface;nb++) { for (nb=1;nb<=nbface;nb++) {
prolface[nb-1]=0; prolface[nb-1]=0;
@ -2137,10 +2130,10 @@ void ChFi3d_Builder::PerformIntersectionAtEnd(const Standard_Integer Index)
Handle(Geom_Curve) cint; Handle(Geom_Curve) cint;
Handle(Geom2d_Curve) C2dint1, C2dint2,cface,cfacemoins1; Handle(Geom2d_Curve) C2dint1, C2dint2,cface,cfacemoins1;
////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////
// determination des intersections entre les edges et le conge // determine intersections of edges and the fillet
// pour trouver les limitations des intersections face - conge // to find limitations of intersections face - fillet
////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////
if (nb==1) { if (nb==1) {
Hc1 = BRep_Tool::CurveOnSurface(Edge[0],Face[0],Ubid,Ubid); Hc1 = BRep_Tool::CurveOnSurface(Edge[0],Face[0],Ubid,Ubid);
@ -2174,7 +2167,7 @@ void ChFi3d_Builder::PerformIntersectionAtEnd(const Standard_Integer Index)
} }
else { else {
if (Hc1.IsNull()) { if (Hc1.IsNull()) {
// on a pas trouve de courbe 2d . On etend Sfacemoins1 et on y projette // curve 2d not found. Sfacemoins1 is extended and projection is done there
// CV1.Point () // CV1.Point ()
ChFi3d_ExtendSurface(Sfacemoins1,prolface[0]); ChFi3d_ExtendSurface(Sfacemoins1,prolface[0]);
if (prolface[0]) { if (prolface[0]) {
@ -2337,8 +2330,7 @@ void ChFi3d_Builder::PerformIntersectionAtEnd(const Standard_Integer Index)
else { else {
Hc2 = BRep_Tool::CurveOnSurface(E2,Face[nbface-1],Ubid,Ubid); Hc2 = BRep_Tool::CurveOnSurface(E2,Face[nbface-1],Ubid,Ubid);
if (Hc2.IsNull()) { if (Hc2.IsNull()) {
// on a pas trouve de courbe 2d , on etend Sfacemoins1 // curve 2d is not found, Sfacemoins1 is extended CV2.Point() is projected there
// on y projette CV2.Point()
ChFi3d_ExtendSurface(Sfacemoins1,prolface[0]); ChFi3d_ExtendSurface(Sfacemoins1,prolface[0]);
if (prolface[0]) { if (prolface[0]) {
@ -2403,8 +2395,7 @@ void ChFi3d_Builder::PerformIntersectionAtEnd(const Standard_Integer Index)
if (prolface[nb-1]) Bs.Initialize(faceprol[nb-1]); if (prolface[nb-1]) Bs.Initialize(faceprol[nb-1]);
else Bs.Initialize(Face[nb-1]); else Bs.Initialize(Face[nb-1]);
// decalage des parametres s'ils ne sont pas dans // offset of parameters if they are not in the same period
// la meme periode
// commented by eap 30 May 2002 occ354 // commented by eap 30 May 2002 occ354
// the following code may cause trimming a wrong part of periodic surface // the following code may cause trimming a wrong part of periodic surface
@ -2466,7 +2457,7 @@ void ChFi3d_Builder::PerformIntersectionAtEnd(const Standard_Integer Index)
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
// calcul des intersections face - conge // calculate intersections face - fillet
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
if (!ChFi3d_ComputeCurves(HGs,HBs,Pardeb,Parfin,Cc, if (!ChFi3d_ComputeCurves(HGs,HBs,Pardeb,Parfin,Cc,
@ -2474,9 +2465,9 @@ void ChFi3d_Builder::PerformIntersectionAtEnd(const Standard_Integer Index)
PerformMoreThreeCorner (Index,1); PerformMoreThreeCorner (Index,1);
return; return;
} }
// stockage des informations dans la structure de donnees // storage of information in the data structure
// eval tolerances // evaluate tolerances
p1=Cc->FirstParameter(); p1=Cc->FirstParameter();
p2=Cc->LastParameter(); p2=Cc->LastParameter();
Standard_Real to1,to2; Standard_Real to1,to2;
@ -2499,7 +2490,7 @@ void ChFi3d_Builder::PerformIntersectionAtEnd(const Standard_Integer Index)
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
// stokage dans la DS de la courbe d'intersection // storage in the DS of the intersection curve
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
Standard_Boolean Isvtx1=0; Standard_Boolean Isvtx1=0;
@ -2547,7 +2538,7 @@ void ChFi3d_Builder::PerformIntersectionAtEnd(const Standard_Integer Index)
DStr.ChangeCurveInterferences(indcurve[nb-1]).Append(Interfp2); DStr.ChangeCurveInterferences(indcurve[nb-1]).Append(Interfp2);
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
// stockage pour la face // storage for the face
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
#ifndef DEB #ifndef DEB
@ -2558,7 +2549,7 @@ void ChFi3d_Builder::PerformIntersectionAtEnd(const Standard_Integer Index)
orface=Face[nb-1].Orientation(); orface=Face[nb-1].Orientation();
if (orface==orsurfdata ) orien = TopAbs::Reverse(orcourbe); if (orface==orsurfdata ) orien = TopAbs::Reverse(orcourbe);
else orien = orcourbe ; else orien = orcourbe ;
// limitation des edges des faces // limitation of edges of faces
if (nb==1) { if (nb==1) {
Standard_Integer Iarc1= DStr.AddShape(Edge[0]); Standard_Integer Iarc1= DStr.AddShape(Edge[0]);
Interfedge[0]= ChFi3d_FilPointInDS(CV1.TransitionOnArc(),Iarc1, Interfedge[0]= ChFi3d_FilPointInDS(CV1.TransitionOnArc(),Iarc1,
@ -2954,8 +2945,7 @@ void ChFi3d_Builder::PerformIntersectionAtEnd(const Standard_Integer Index)
//======================================================================= //=======================================================================
//function : PerformMoreSurfdata //function : PerformMoreSurfdata
//purpose : determine les intersections en bout sur plusieurs //purpose : determine intersections at end on several surfdata
// surfdata
//======================================================================= //=======================================================================
void ChFi3d_Builder::PerformMoreSurfdata(const Standard_Integer Index) void ChFi3d_Builder::PerformMoreSurfdata(const Standard_Integer Index)
{ {
@ -3593,10 +3583,10 @@ void ChFi3d_Builder::PerformMoreSurfdata(const Standard_Integer Index)
} }
// Modified by Sergey KHROMOV - Thu Apr 11 12:23:40 2002 End // Modified by Sergey KHROMOV - Thu Apr 11 12:23:40 2002 End
//======================================================================= //==============================================================
//function : FindFace //function : FindFace
//purpose : attention ne marche que si une seule face en commun entre //purpose : attention it works only if there is only one common face
// P1,P2,V // between P1,P2,V
//=========================================================== //===========================================================
@ -3617,7 +3607,7 @@ Standard_Boolean ChFi3d_Builder::FindFace(const TopoDS_Vertex& V,
{ {
if (P1.IsVertex() || P2.IsVertex()) { if (P1.IsVertex() || P2.IsVertex()) {
#ifdef DEB #ifdef DEB
cout<<"changement de face sur vertex plantatoire"<<endl; cout<<"change of face on vertex"<<endl;
#endif #endif
} }
if (!(P1.IsOnArc() && P2.IsOnArc())) { if (!(P1.IsOnArc() && P2.IsOnArc())) {
@ -3643,7 +3633,7 @@ Standard_Boolean ChFi3d_Builder::FindFace(const TopoDS_Vertex& V,
} }
#ifdef DEB #ifdef DEB
if(!ContainsV){ if(!ContainsV){
cout<<"FindFace : l extremite de la spine n est pas dans la face en bout"<<endl; cout<<"FindFace : the extremity of the spine is not in the end face"<<endl;
} }
#endif #endif
return Found; return Found;
@ -3651,14 +3641,14 @@ Standard_Boolean ChFi3d_Builder::FindFace(const TopoDS_Vertex& V,
//======================================================================= //=======================================================================
//function : MoreSurfdata //function : MoreSurfdata
//purpose : detecte si l'intersection en bout concerne plusieurs Surfdata //purpose : detects if the intersection at end concerns several Surfdata
//======================================================================= //=======================================================================
Standard_Boolean ChFi3d_Builder::MoreSurfdata(const Standard_Integer Index) const Standard_Boolean ChFi3d_Builder::MoreSurfdata(const Standard_Integer Index) const
{ {
// l'intersection en bout se fait sur plusieurs surfdata si : // intersection at end is created on several surfdata if :
// -le nb de surfdata concernant le vertex est superieur a 1 . // - the number of surfdata concerning the vertex is more than 1.
// -et si l'avant derniere surfdata a un de ses commonpoints sur un des // - and if the last but one surfdata has one of commonpoints on one of
// deux arcs qui constituent les intersections de la face en bout et du conge // two arcs, which constitute the intersections of the face at end and of the fillet
ChFiDS_ListIteratorOfListOfStripe It; ChFiDS_ListIteratorOfListOfStripe It;
It.Initialize(myVDataMap(Index)); It.Initialize(myVDataMap(Index));
@ -3677,7 +3667,7 @@ Standard_Boolean ChFi3d_Builder::MoreSurfdata(const Standard_Integer Index) cons
TopoDS_Face Fv; TopoDS_Face Fv;
Standard_Boolean inters,oksurf; Standard_Boolean inters,oksurf;
nbsurf= stripe->SetOfSurfData()->Length(); nbsurf= stripe->SetOfSurfData()->Length();
// Fv est la face en bout // Fv is the face at end
inters = FindFace(Vtx,CV1,CV2,Fv); inters = FindFace(Vtx,CV1,CV2,Fv);
if (sens==1) { if (sens==1) {
num1=1; num1=1;
@ -3692,7 +3682,7 @@ Standard_Boolean ChFi3d_Builder::MoreSurfdata(const Standard_Integer Index) cons
if (nbsurf!=1 && inters) { if (nbsurf!=1 && inters) {
// determination de arc1 et arc2 intersection du conge et de la face en bout // determination of arc1 and arc2 intersection of the fillet and the face at end
TopoDS_Edge arc1,arc2; TopoDS_Edge arc1,arc2;
TopTools_ListIteratorOfListOfShape ItE; TopTools_ListIteratorOfListOfShape ItE;
@ -3735,7 +3725,7 @@ Standard_Boolean ChFi3d_Builder::MoreSurfdata(const Standard_Integer Index) cons
} }
//Cas des conges sur sommet a 4 aretes avec une aretes sur la meme geometrie que l'arete du conge //Case of fillets on top with 4 edges, one of them is on the same geometry as the edgeof the fillet
void ChFi3d_Builder::IntersectMoreCorner(const Standard_Integer Index) void ChFi3d_Builder::IntersectMoreCorner(const Standard_Integer Index)
@ -3745,33 +3735,33 @@ void ChFi3d_Builder::IntersectMoreCorner(const Standard_Integer Index)
#ifdef DEB #ifdef DEB
OSD_Chronometer ch;// init perf pour PerformSetOfKPart OSD_Chronometer ch;// init perf pour PerformSetOfKPart
#endif #endif
// On recupere le conge concerne, // The fillet is returned,
ChFiDS_ListIteratorOfListOfStripe StrIt; ChFiDS_ListIteratorOfListOfStripe StrIt;
StrIt.Initialize(myVDataMap(Index)); StrIt.Initialize(myVDataMap(Index));
Handle(ChFiDS_Stripe) stripe = StrIt.Value(); Handle(ChFiDS_Stripe) stripe = StrIt.Value();
const Handle(ChFiDS_Spine) spine = stripe->Spine(); const Handle(ChFiDS_Spine) spine = stripe->Spine();
ChFiDS_SequenceOfSurfData& SeqFil = ChFiDS_SequenceOfSurfData& SeqFil =
stripe->ChangeSetOfSurfData()->ChangeSequence(); stripe->ChangeSetOfSurfData()->ChangeSequence();
// le sommet, // the top,
const TopoDS_Vertex& Vtx = myVDataMap.FindKey(Index); const TopoDS_Vertex& Vtx = myVDataMap.FindKey(Index);
// la SurfData en cause et ses CommonPoints, // the SurfData concerned and its CommonPoints,
Standard_Integer sens = 0; Standard_Integer sens = 0;
// Choisit la bonne SurfData // Choose the proper SurfData
Standard_Integer num = ChFi3d_IndexOfSurfData(Vtx,stripe,sens); Standard_Integer num = ChFi3d_IndexOfSurfData(Vtx,stripe,sens);
Standard_Boolean isfirst = (sens == 1); Standard_Boolean isfirst = (sens == 1);
if (isfirst) { if (isfirst) {
for (; num<SeqFil.Length() && ( for (; num<SeqFil.Length() && (
(SeqFil.Value(num)->IndexOfS1()==0) || (SeqFil.Value(num)->IndexOfS1()==0) ||
(SeqFil.Value(num)->IndexOfS2()==0) ); ) { (SeqFil.Value(num)->IndexOfS2()==0) ); ) {
SeqFil.Remove(num); // On elimine le surplus SeqFil.Remove(num); // The surplus is removed
} }
} }
else { else {
for (; num>1 && ( for (; num>1 && (
(SeqFil.Value(num)->IndexOfS1()==0) || (SeqFil.Value(num)->IndexOfS1()==0) ||
(SeqFil.Value(num)->IndexOfS2()==0) ); ) { (SeqFil.Value(num)->IndexOfS2()==0) ); ) {
SeqFil.Remove(num);// On elimine le surplus SeqFil.Remove(num);// The surplus is removed
num--; num--;
} }
} }
@ -3779,10 +3769,10 @@ void ChFi3d_Builder::IntersectMoreCorner(const Standard_Integer Index)
Handle(ChFiDS_SurfData)& Fd = SeqFil.ChangeValue(num); Handle(ChFiDS_SurfData)& Fd = SeqFil.ChangeValue(num);
ChFiDS_CommonPoint& CV1 = Fd->ChangeVertex(isfirst,1); ChFiDS_CommonPoint& CV1 = Fd->ChangeVertex(isfirst,1);
ChFiDS_CommonPoint& CV2 = Fd->ChangeVertex(isfirst,2); ChFiDS_CommonPoint& CV2 = Fd->ChangeVertex(isfirst,2);
//Pour evaluer la boule des nouveaux points. //To evaluate the cloud of new points.
Bnd_Box box1,box2; Bnd_Box box1,box2;
// On traite separement les cas bouchon des cas intersection. // The cases of cap are processed separately from intersection.
// ---------------------------------------------------------- // ----------------------------------------------------------
TopoDS_Face Fv,Fad,Fop,Fopbis; TopoDS_Face Fv,Fad,Fop,Fopbis;
@ -3824,8 +3814,6 @@ void ChFi3d_Builder::IntersectMoreCorner(const Standard_Integer Index)
if(!CV1.IsOnArc() && !CV2.IsOnArc()) if(!CV1.IsOnArc() && !CV2.IsOnArc())
Standard_Failure::Raise("Corner intersmore : no point on arc"); Standard_Failure::Raise("Corner intersmore : no point on arc");
else if(CV1.IsOnArc() && CV2.IsOnArc()){ else if(CV1.IsOnArc() && CV2.IsOnArc()){
// on explore pour detromper les KPart qui seraient sortis
// au diable.
Standard_Boolean sur1 = 0, sur2 = 0; Standard_Boolean sur1 = 0, sur2 = 0;
for(ex.Init(CV1.Arc(),TopAbs_VERTEX); ex.More(); ex.Next()){ for(ex.Init(CV1.Arc(),TopAbs_VERTEX); ex.More(); ex.Next()){
if(Vtx.IsSame(ex.Current())) { if(Vtx.IsSame(ex.Current())) {
@ -3848,7 +3836,7 @@ void ChFi3d_Builder::IntersectMoreCorner(const Standard_Integer Index)
Fad = TopoDS::Face(DStr.Shape(Fd->Index(IFadArc))); Fad = TopoDS::Face(DStr.Shape(Fd->Index(IFadArc)));
Fop = TopoDS::Face(DStr.Shape(Fd->Index(IFopArc))); Fop = TopoDS::Face(DStr.Shape(Fd->Index(IFopArc)));
TopTools_ListIteratorOfListOfShape It; TopTools_ListIteratorOfListOfShape It;
// On recupere la face en bout sans controle de son unicite. // The face at end is returned without control of its unicity.
for(It.Initialize(myEFMap(Arcpiv));It.More();It.Next()) { for(It.Initialize(myEFMap(Arcpiv));It.More();It.Next()) {
if(!Fad.IsSame(It.Value())){ if(!Fad.IsSame(It.Value())){
Fv = TopoDS::Face(It.Value()); Fv = TopoDS::Face(It.Value());
@ -3856,7 +3844,7 @@ void ChFi3d_Builder::IntersectMoreCorner(const Standard_Integer Index)
} }
} }
// est-ce que la face en bout contient le Vertex ? // does the face at end contain the Vertex ?
Standard_Boolean isinface = Standard_False; Standard_Boolean isinface = Standard_False;
for (ex.Init(Fv,TopAbs_VERTEX); ex.More(); ex.Next()){ for (ex.Init(Fv,TopAbs_VERTEX); ex.More(); ex.Next()){
if (ex.Current().IsSame(Vtx)) { if (ex.Current().IsSame(Vtx)) {
@ -3871,8 +3859,8 @@ void ChFi3d_Builder::IntersectMoreCorner(const Standard_Integer Index)
Fad = TopoDS::Face(DStr.Shape(Fd->Index(IFadArc))); Fad = TopoDS::Face(DStr.Shape(Fd->Index(IFadArc)));
Fop = TopoDS::Face(DStr.Shape(Fd->Index(IFopArc))); Fop = TopoDS::Face(DStr.Shape(Fd->Index(IFopArc)));
//TopTools_ListIteratorOfListOfShape It; //TopTools_ListIteratorOfListOfShape It;
// On recupere la face en bout sans controle de son unicite. // The face at end is returned without control of its unicity.
for(It.Initialize(myEFMap(Arcpiv));It.More();It.Next()) { for(It.Initialize(myEFMap(Arcpiv));It.More();It.Next()) {
if(!Fad.IsSame(It.Value())){ if(!Fad.IsSame(It.Value())){
Fv = TopoDS::Face(It.Value()); Fv = TopoDS::Face(It.Value());
break; break;
@ -3881,12 +3869,12 @@ void ChFi3d_Builder::IntersectMoreCorner(const Standard_Integer Index)
} }
if(Fv.IsNull()) StdFail_NotDone::Raise if(Fv.IsNull()) StdFail_NotDone::Raise
("OneCorner : face en bout non trouvee"); ("OneCorner : face at end is not found");
Fv.Orientation(TopAbs_FORWARD); Fv.Orientation(TopAbs_FORWARD);
Fad.Orientation(TopAbs_FORWARD); Fad.Orientation(TopAbs_FORWARD);
// On recupere de meme l edge qui sera a prolonger. // In the same way the edge to be extended is returned.
for(It.Initialize(myVEMap(Vtx));It.More() && Arcprol.IsNull();It.Next()){ for(It.Initialize(myVEMap(Vtx));It.More() && Arcprol.IsNull();It.Next()){
if(!Arcpiv.IsSame(It.Value())){ if(!Arcpiv.IsSame(It.Value())){
for(ex.Init(Fv,TopAbs_EDGE); ex.More(); ex.Next()){ for(ex.Init(Fv,TopAbs_EDGE); ex.More(); ex.Next()){
@ -3899,16 +3887,16 @@ void ChFi3d_Builder::IntersectMoreCorner(const Standard_Integer Index)
} }
} }
//Fopbis est la face contenant la trace du conge dont le CP.Arc() ne contient pas Vtx. //Fopbis is the face containing the trace of fillet CP.Arc() which of does not contain Vtx.
//Normalement soit Fobis est la meme que Fop (cylindre), soit Fobis est G1 avec Fop. //Normallly Fobis is either the same as Fop (cylinder), or Fobis is G1 with Fop.
Fopbis.Orientation(TopAbs_FORWARD); Fopbis.Orientation(TopAbs_FORWARD);
//on appelle Fop la 4eme face inutilisee du vertex //Fop calls the 4th face non-used for the vertex
cherche_face(myVFMap(Vtx),Arcprol,Fad,Fv,Fv,Fopbis); cherche_face(myVFMap(Vtx),Arcprol,Fad,Fv,Fv,Fopbis);
Fop.Orientation(TopAbs_FORWARD); Fop.Orientation(TopAbs_FORWARD);
if(Arcprol.IsNull()) StdFail_NotDone::Raise if(Arcprol.IsNull()) StdFail_NotDone::Raise
("OneCorner : edge a prolonger non trouve"); ("OneCorner : edge to be extended is not found");
for(ex.Init(Fopbis,TopAbs_EDGE); ex.More(); ex.Next()){ for(ex.Init(Fopbis,TopAbs_EDGE); ex.More(); ex.Next()){
if(Arcprol.IsSame(ex.Current())) { if(Arcprol.IsSame(ex.Current())) {
OArcprolop = ex.Current().Orientation(); OArcprolop = ex.Current().Orientation();
@ -3932,17 +3920,17 @@ void ChFi3d_Builder::IntersectMoreCorner(const Standard_Integer Index)
Bad.Initialize(Fad); Bad.Initialize(Fad);
Bop.Initialize(Fop); Bop.Initialize(Fop);
} }
// on va devoir modifier le CommonPoint // it is necessary to modify the CommonPoint
//dans le vide et son parametre dans la FaceInterference. // in the space and its parameter in FaceInterference.
//On les recupere donc tous deux dans des references // So both of them are returned in references
//non const. Attention les modifs se font dans le dos // non const. Attention the modifications are done behind
//de CV1,CV2,Fi1,Fi2. // CV1,CV2,Fi1,Fi2.
ChFiDS_CommonPoint& CPopArc = Fd->ChangeVertex(isfirst,IFopArc); ChFiDS_CommonPoint& CPopArc = Fd->ChangeVertex(isfirst,IFopArc);
ChFiDS_FaceInterference& FiopArc = Fd->ChangeInterference(IFopArc); ChFiDS_FaceInterference& FiopArc = Fd->ChangeInterference(IFopArc);
ChFiDS_CommonPoint& CPadArc = Fd->ChangeVertex(isfirst,IFadArc); ChFiDS_CommonPoint& CPadArc = Fd->ChangeVertex(isfirst,IFadArc);
ChFiDS_FaceInterference& FiadArc = Fd->ChangeInterference(IFadArc); ChFiDS_FaceInterference& FiadArc = Fd->ChangeInterference(IFadArc);
//on initialise le parametre du vertex en l air a la valeur de son // the parameter of the vertex is initialized with the value
//copain d en face (point sur arc). // of its opposing vertex (point on arc).
Standard_Real wop = Fd->ChangeInterference(IFadArc).Parameter(isfirst); Standard_Real wop = Fd->ChangeInterference(IFadArc).Parameter(isfirst);
Handle(Geom_Curve) c3df; Handle(Geom_Curve) c3df;
Handle(GeomAdaptor_HSurface) Handle(GeomAdaptor_HSurface)
@ -3950,9 +3938,9 @@ void ChFi3d_Builder::IntersectMoreCorner(const Standard_Integer Index)
gp_Pnt2d p2dbout; gp_Pnt2d p2dbout;
{ {
// rajouter ici des criteres plus ou moins restrictifs pour // add here more or less restrictive criteria to
// decider si on fait l intersection avec la face en bout // decide if the intersection with face is done at the
// etendue ou si on aiguille sur bouchon. // extended end or if there will be a cap on sharp end.
c3df = DStr.Curve(FiopArc.LineIndex()).Curve(); c3df = DStr.Curve(FiopArc.LineIndex()).Curve();
Standard_Real uf = FiopArc.FirstParameter(); Standard_Real uf = FiopArc.FirstParameter();
Standard_Real ul = FiopArc.LastParameter(); Standard_Real ul = FiopArc.LastParameter();
@ -3968,8 +3956,7 @@ void ChFi3d_Builder::IntersectMoreCorner(const Standard_Integer Index)
// if(!inters && BRep_Tool::Continuity(Arcprol,Fv,Fop) != GeomAbs_C0){ // if(!inters && BRep_Tool::Continuity(Arcprol,Fv,Fop) != GeomAbs_C0){
if(!inters && isTangentFaces(Arcprol,Fv,Fop)){ if(!inters && isTangentFaces(Arcprol,Fv,Fop)){
// Modified by Sergey KHROMOV - Fri Dec 21 18:08:29 2001 End // Modified by Sergey KHROMOV - Fri Dec 21 18:08:29 2001 End
// Arcprol etant une arete de tangence on tente un // Arcprol is an edge of tangency, ultimate adjustment by an extrema curve/curve is attempted.
// ultime rattrappage par un extrema curve/curve.
Standard_Real ff,ll; Standard_Real ff,ll;
Handle(Geom2d_Curve) gpcprol = BRep_Tool::CurveOnSurface(Arcprol,Fv,ff,ll); Handle(Geom2d_Curve) gpcprol = BRep_Tool::CurveOnSurface(Arcprol,Fv,ff,ll);
Handle(Geom2dAdaptor_HCurve) pcprol = new Geom2dAdaptor_HCurve(gpcprol); Handle(Geom2dAdaptor_HCurve) pcprol = new Geom2dAdaptor_HCurve(gpcprol);
@ -4042,12 +4029,12 @@ void ChFi3d_Builder::IntersectMoreCorner(const Standard_Integer Index)
if (!ChFi3d_ComputeCurves(HGs,HBs,Pardeb,Parfin,Cc, if (!ChFi3d_ComputeCurves(HGs,HBs,Pardeb,Parfin,Cc,
Ps, Ps,
Pc,tolesp,tol2d,tolreached)) Pc,tolesp,tol2d,tolreached))
Standard_Failure::Raise("OneCorner : echec calcul intersection"); Standard_Failure::Raise("OneCorner : failed calculation intersection");
Udeb = Cc->FirstParameter(); Udeb = Cc->FirstParameter();
Ufin = Cc->LastParameter(); Ufin = Cc->LastParameter();
// on determine si la courbe a une intersection avec l'arete de couture // check if the curve has an intersection with sewing edge
ChFi3d_Couture(Fv,couture,edgecouture); ChFi3d_Couture(Fv,couture,edgecouture);
@ -4095,7 +4082,7 @@ void ChFi3d_Builder::IntersectMoreCorner(const Standard_Integer Index)
} }
else{ else{
Standard_NotImplemented::Raise("OneCorner : bouchon non ecrit"); Standard_NotImplemented::Raise("OneCorner : cap not written");
} }
Standard_Integer IShape = DStr.AddShape(Fv); Standard_Integer IShape = DStr.AddShape(Fv);
#ifndef DEB #ifndef DEB
@ -4140,9 +4127,9 @@ void ChFi3d_Builder::IntersectMoreCorner(const Standard_Integer Index)
stripe->SetIndexPoint(ChFi3d_IndexPointInDS(CV2,DStr),isfirst,2); stripe->SetIndexPoint(ChFi3d_IndexPointInDS(CV2,DStr),isfirst,2);
if (!intcouture) { if (!intcouture) {
// il n'y a pas d'intersection avec l'arete de couture // there is no intersection with edge of sewing
// on stocke la courbe Cc dans la stripe // curve Cc is stored in the stripe
// le stockage dans la DS se fera par FILDS. // the storage in the DS is done by FILDS.
TopOpeBRepDS_Curve Tc(Cc,tolreached); TopOpeBRepDS_Curve Tc(Cc,tolreached);
ICurve = DStr.AddCurve(Tc); ICurve = DStr.AddCurve(Tc);
@ -4154,11 +4141,11 @@ void ChFi3d_Builder::IntersectMoreCorner(const Standard_Integer Index)
stripe->SetParameters(isfirst,Udeb,Ufin); stripe->SetParameters(isfirst,Udeb,Ufin);
} }
else { else {
// on stocke les courbes curv1 et curv2 dans la DS // curves curv1 and curv2 are stored in the DS
// ces courbes ne seront pas reconstruites par FILDS car // these curves are not reconstructed by FILDS as
// on met stripe->InDS(isfirst); // stripe->InDS(isfirst) is placed;
// interferences de curv1 et curv2 sur Fv // interferences of curv1 and curv2 on Fv
ComputeCurve2d(curv1,Fv,c2d1); ComputeCurve2d(curv1,Fv,c2d1);
Handle(TopOpeBRepDS_SurfaceCurveInterference) InterFv; Handle(TopOpeBRepDS_SurfaceCurveInterference) InterFv;
InterFv = ChFi3d_FilCurveInDS(Icurv1,IShape,c2d1,Et); InterFv = ChFi3d_FilCurveInDS(Icurv1,IShape,c2d1,Et);
@ -4166,7 +4153,7 @@ void ChFi3d_Builder::IntersectMoreCorner(const Standard_Integer Index)
ComputeCurve2d(curv2,Fv,c2d2); ComputeCurve2d(curv2,Fv,c2d2);
InterFv = ChFi3d_FilCurveInDS(Icurv2,IShape,c2d2,Et); InterFv = ChFi3d_FilCurveInDS(Icurv2,IShape,c2d2,Et);
DStr.ChangeShapeInterferences(IShape).Append(InterFv); DStr.ChangeShapeInterferences(IShape).Append(InterFv);
// interferences de curv1 et curv2 sur Isurf // interferences of curv1 and curv2 on Isurf
if (Fd->Orientation()== Fv.Orientation()) Et=TopAbs::Reverse(Et); if (Fd->Orientation()== Fv.Orientation()) Et=TopAbs::Reverse(Et);
c2d1=new Geom2d_TrimmedCurve(Ps,Udeb,par2); c2d1=new Geom2d_TrimmedCurve(Ps,Udeb,par2);
InterFv = ChFi3d_FilCurveInDS(Icurv1,Isurf,c2d1,Et); InterFv = ChFi3d_FilCurveInDS(Icurv1,Isurf,c2d1,Et);
@ -4175,7 +4162,7 @@ void ChFi3d_Builder::IntersectMoreCorner(const Standard_Integer Index)
InterFv = ChFi3d_FilCurveInDS(Icurv2,Isurf,c2d2,Et); InterFv = ChFi3d_FilCurveInDS(Icurv2,Isurf,c2d2,Et);
DStr.ChangeSurfaceInterferences(Isurf).Append(InterFv); DStr.ChangeSurfaceInterferences(Isurf).Append(InterFv);
// limitation de l'arete de couture // limitation of the sewing edge
Standard_Integer Iarc=DStr.AddShape(edgecouture); Standard_Integer Iarc=DStr.AddShape(edgecouture);
Handle(TopOpeBRepDS_CurvePointInterference) Interfedge; Handle(TopOpeBRepDS_CurvePointInterference) Interfedge;
TopAbs_Orientation ori; TopAbs_Orientation ori;
@ -4190,7 +4177,7 @@ void ChFi3d_Builder::IntersectMoreCorner(const Standard_Integer Index)
Interfedge = ChFi3d_FilPointInDS(ori,Iarc,indpt,par1); Interfedge = ChFi3d_FilPointInDS(ori,Iarc,indpt,par1);
DStr.ChangeShapeInterferences(Iarc).Append(Interfedge); DStr.ChangeShapeInterferences(Iarc).Append(Interfedge);
// creation des CurveInterferences de Icurv1 et Icurv2 // creation of CurveInterferences from Icurv1 and Icurv2
stripe->InDS(isfirst); stripe->InDS(isfirst);
Standard_Integer ind1= stripe->IndexPoint(isfirst,1); Standard_Integer ind1= stripe->IndexPoint(isfirst,1);
Standard_Integer ind2= stripe->IndexPoint(isfirst,2); Standard_Integer ind2= stripe->IndexPoint(isfirst,2);
@ -4211,10 +4198,10 @@ void ChFi3d_Builder::IntersectMoreCorner(const Standard_Integer Index)
if( inters){ if( inters){
// //
// On rajoute le petit bout de courbe qui manque pour l extension // The small end of curve missing for the extension
// de la face en bout et la limitation de la face opposee. // of the face at end and the limitation of the opposing face is added.
// Tout d abord on coupe les ponts avec l arete de la spine. // Above all the points cut the points with the edge of the spine.
Standard_Integer IArcspine = DStr.AddShape(Arcspine); Standard_Integer IArcspine = DStr.AddShape(Arcspine);
Standard_Integer IVtx = DStr.AddShape(Vtx); Standard_Integer IVtx = DStr.AddShape(Vtx);
TopAbs_Orientation OVtx2; TopAbs_Orientation OVtx2;
@ -4237,7 +4224,7 @@ void ChFi3d_Builder::IntersectMoreCorner(const Standard_Integer Index)
DStr.ChangeShapeInterferences(IArcspine).Append(interfv); DStr.ChangeShapeInterferences(IArcspine).Append(interfv);
//Modif de lvt pour trouver la suite de Arcprol dans l'autre face //Modif of lvt to find the suite of Arcprol in the other face
{ {
TopTools_ListIteratorOfListOfShape It; TopTools_ListIteratorOfListOfShape It;
for (It.Initialize(myVEMap(Vtx)); It.More(); It.Next()){ for (It.Initialize(myVEMap(Vtx)); It.More(); It.Next()){
@ -4249,9 +4236,9 @@ void ChFi3d_Builder::IntersectMoreCorner(const Standard_Integer Index)
} }
} }
} }
//fin de modif //end of modif
// On construit maintenant les courbes qui manquent. //Now the missing curves are constructed.
for(ex.Init(Arcprolbis.Oriented(TopAbs_FORWARD),TopAbs_VERTEX); for(ex.Init(Arcprolbis.Oriented(TopAbs_FORWARD),TopAbs_VERTEX);
ex.More(); ex.Next()){ ex.More(); ex.Next()){
if(Vtx.IsSame(ex.Current())) { if(Vtx.IsSame(ex.Current())) {
@ -4266,7 +4253,7 @@ void ChFi3d_Builder::IntersectMoreCorner(const Standard_Integer Index)
break; break;
} }
} }
// on determine si Fop a une arete de couture // it is checked if Fop has a sewing edge
// TopoDS_Edge edgecouture; // TopoDS_Edge edgecouture;
// Standard_Boolean couture; // Standard_Boolean couture;
@ -4325,7 +4312,7 @@ void ChFi3d_Builder::IntersectMoreCorner(const Standard_Integer Index)
TopOpeBRepDS_Curve Zob(zob3d,tolreached); TopOpeBRepDS_Curve Zob(zob3d,tolreached);
Standard_Integer IZob = DStr.AddCurve(Zob); Standard_Integer IZob = DStr.AddCurve(Zob);
// on ne determine pas si la courbe a une intersection avec l'arete de couture // it is not determined if the curve has an intersection with the sewing edge
{ {

110
src/ChFi3d/ChFi3d_Builder_C2.cxx
View File

@ -115,10 +115,9 @@ static void Reduce(const Standard_Real& p1,
//======================================================================= //=======================================================================
//function : PerformTwoCornerbyInter //function : PerformTwoCornerbyInter
//purpose : Effectue un PerformTwoCorner par intersection. //purpose : Performs PerformTwoCorner by intersection.
// Dans le cas Biseau on utilise pour tous les cas le // In case of Biseau for all cases the
// cheminement biparam/biparam; on reapproxime alors la courbe // path is used; 3D curve and 2 pcurves are approximated.
// 3d et les 2 pcurves .
//======================================================================= //=======================================================================
Standard_Integer ChFi3d_Builder::PerformTwoCornerbyInter(const Standard_Integer Index) Standard_Integer ChFi3d_Builder::PerformTwoCornerbyInter(const Standard_Integer Index)
@ -128,10 +127,10 @@ Standard_Integer ChFi3d_Builder::PerformTwoCornerbyInter(const Standard_Integer
const TopoDS_Vertex& Vtx = myVDataMap.FindKey(Index); const TopoDS_Vertex& Vtx = myVDataMap.FindKey(Index);
TopOpeBRepDS_DataStructure& DStr = myDS->ChangeDS(); TopOpeBRepDS_DataStructure& DStr = myDS->ChangeDS();
//On extrait les informations necessaires sur les conges //Information on fillets is extracted
//------------------------------------------------------ //------------------------------------------------------
//le premier //the first
//---------- //----------
ChFiDS_ListIteratorOfListOfStripe It; ChFiDS_ListIteratorOfListOfStripe It;
It.Initialize(myVDataMap(Index)); It.Initialize(myVDataMap(Index));
@ -143,7 +142,7 @@ Standard_Integer ChFi3d_Builder::PerformTwoCornerbyInter(const Standard_Integer
Corner1->ChangeSetOfSurfData()->ChangeSequence(); Corner1->ChangeSetOfSurfData()->ChangeSequence();
Handle(ChFiDS_SurfData)& Fd1 = SeqFil1.ChangeValue(IFd1); Handle(ChFiDS_SurfData)& Fd1 = SeqFil1.ChangeValue(IFd1);
//le deuxieme //the second
//---------- //----------
It.Next(); It.Next();
Handle(ChFiDS_Stripe)& Corner2 = It.Value(); Handle(ChFiDS_Stripe)& Corner2 = It.Value();
@ -158,10 +157,10 @@ Standard_Integer ChFi3d_Builder::PerformTwoCornerbyInter(const Standard_Integer
Corner2->ChangeSetOfSurfData()->ChangeSequence(); Corner2->ChangeSetOfSurfData()->ChangeSequence();
Handle(ChFiDS_SurfData)& Fd2 = SeqFil2.ChangeValue(IFd2); Handle(ChFiDS_SurfData)& Fd2 = SeqFil2.ChangeValue(IFd2);
// On analyse les concavites, dans le cas de concavites differentes, // The concavities are analysed in case of differents concavities,
// prevoir un raccord evolutif du type ThreeCorner de R vers 0. // preview an evolutionary connection of type ThreeCorner of R to 0.
// Sinon on recherche la face en vis a vis // Otherwise the opposite face
// et l intersection eventuelle des 2 pcurves sur cette face. // and the eventual intersection of 2 pcurves on this face are found.
ChFiDS_State Stat1,Stat2; ChFiDS_State Stat1,Stat2;
Standard_Boolean isfirst1 = (Sens1 == 1); Standard_Boolean isfirst1 = (Sens1 == 1);
@ -187,8 +186,8 @@ Standard_Integer ChFi3d_Builder::PerformTwoCornerbyInter(const Standard_Integer
return done; return done;
} }
if (!OkinterCC) { if (!OkinterCC) {
// On calcule l'intersection des pcurves sans les restreindre par les // The intersection of pcurves is calculated without restricting them by
// common point // common points.
OkinterCC= ChFi3d_IsInFront(DStr,Corner1,Corner2,IFd1,IFd2,Sens1,Sens2, OkinterCC= ChFi3d_IsInFront(DStr,Corner1,Corner2,IFd1,IFd2,Sens1,Sens2,
UIntPC1,UIntPC2,FaCo,SameSide, UIntPC1,UIntPC2,FaCo,SameSide,
IFaCo1,IFaCo2,Okvisavis,Vtx,Standard_True,1); IFaCo1,IFaCo2,Okvisavis,Vtx,Standard_True,1);
@ -196,29 +195,29 @@ Standard_Integer ChFi3d_Builder::PerformTwoCornerbyInter(const Standard_Integer
if (!Okvisavis) { if (!Okvisavis) {
#if DEB #if DEB
cout<<"TwoCorner : pas de face commune"<<endl; cout<<"TwoCorner : no common face"<<endl;
#endif #endif
done=Standard_False; done=Standard_False;
return done; return done;
} }
if (!OkinterCC) { if (!OkinterCC) {
#if DEB #if DEB
cout<<"biseau : echec intersection des lignes de tangence sur face commune"<<endl; cout<<"biseau : failed intersection of tangency lines on common face"<<endl;
#endif #endif
done=Standard_False; done=Standard_False;
return done; return done;
} }
Standard_Integer IFaArc1 = 3-IFaCo1, IFaArc2 = 3-IFaCo2; Standard_Integer IFaArc1 = 3-IFaCo1, IFaArc2 = 3-IFaCo2;
// On verifie que les conges ont bien un commonpoint sur un arc commun. // It is checked if the fillets have a commonpoint on a common arc.
// Cet edge est le pivot du biseau ou de la rotule. // This edge is the pivot of the bevel or of the kneecap.
ChFiDS_CommonPoint& CP1 = Fd1->ChangeVertex(isfirst1,IFaArc1); ChFiDS_CommonPoint& CP1 = Fd1->ChangeVertex(isfirst1,IFaArc1);
ChFiDS_CommonPoint& CP2 = Fd2->ChangeVertex(isfirst2,IFaArc2); ChFiDS_CommonPoint& CP2 = Fd2->ChangeVertex(isfirst2,IFaArc2);
if (!CP1.IsOnArc() || !CP2.IsOnArc()) { if (!CP1.IsOnArc() || !CP2.IsOnArc()) {
#if DEB #if DEB
cout<<"echec 1 des 2 conges n est pas sur arc"<<endl; cout<<"fail 1 of 2 fillets are not on arc"<<endl;
#endif #endif
done=Standard_False; done=Standard_False;
return done; return done;
@ -226,7 +225,7 @@ Standard_Integer ChFi3d_Builder::PerformTwoCornerbyInter(const Standard_Integer
if ( ! CP1.Arc().IsSame( CP2.Arc()) ) { if ( ! CP1.Arc().IsSame( CP2.Arc()) ) {
// look like OnSame + OnDiff case (eap, Arp 9 2002, occ266) // look like OnSame + OnDiff case (eap, Arp 9 2002, occ266)
#if DEB #if DEB
cout<<"PerformTwoCornerbyInter(): conges ne sont pas sur la meme arc"<<endl; cout<<"PerformTwoCornerbyInter(): fillets are not on the same arc"<<endl;
#endif #endif
done = Standard_True; done = Standard_True;
PerformMoreThreeCorner(Index, 2); PerformMoreThreeCorner(Index, 2);
@ -269,9 +268,8 @@ Standard_Integer ChFi3d_Builder::PerformTwoCornerbyInter(const Standard_Integer
} }
} }
if(!ok1 || !ok2){ if(!ok1 || !ok2){
//On est dans un contexte merdique
#if DEB #if DEB
cout<<"echec une des surfaces n a pas de face d appui commune avec l edge pivot"<<endl; cout<<"fail one of surfaces has no common base face with the pivot edge"<<endl;
#endif #endif
done=Standard_False; done=Standard_False;
return done; return done;
@ -287,7 +285,7 @@ Standard_Integer ChFi3d_Builder::PerformTwoCornerbyInter(const Standard_Integer
Handle(Geom_Curve) Gc; Handle(Geom_Curve) Gc;
if(sameparam) { if(sameparam) {
// Du cote face commune, calcul de Pardeb. // Side common face, calculation of Pardeb.
ChFi3d_ComputesIntPC (Fd1->Interference(IFaCo1), ChFi3d_ComputesIntPC (Fd1->Interference(IFaCo1),
Fd2->Interference(IFaCo2), Fd2->Interference(IFaCo2),
HS1,HS2,UIntPC1,UIntPC2); HS1,HS2,UIntPC1,UIntPC2);
@ -298,7 +296,7 @@ Standard_Integer ChFi3d_Builder::PerformTwoCornerbyInter(const Standard_Integer
Pardeb(3)= UV.X(); Pardeb(4)=UV.Y(); Pardeb(3)= UV.X(); Pardeb(4)=UV.Y();
gp_Pnt PFaCo = HS1->Surface().Value(Pardeb(1),Pardeb(2)); gp_Pnt PFaCo = HS1->Surface().Value(Pardeb(1),Pardeb(2));
// Du cote arc, calcul de Parfin. // Side arc, calculation of Parfin.
Standard_Real UIntArc1 = Fd1->Interference(IFaArc1).Parameter(isfirst1); Standard_Real UIntArc1 = Fd1->Interference(IFaArc1).Parameter(isfirst1);
Standard_Real UIntArc2 = Fd2->Interference(IFaArc2).Parameter(isfirst2); Standard_Real UIntArc2 = Fd2->Interference(IFaArc2).Parameter(isfirst2);
@ -318,7 +316,7 @@ Standard_Integer ChFi3d_Builder::PerformTwoCornerbyInter(const Standard_Integer
!ChFi3d_ComputeCurves(HS1,HS2,Pardeb,Parfin,Gc, !ChFi3d_ComputeCurves(HS1,HS2,Pardeb,Parfin,Gc,
PGc1,PGc2,tolesp,tol2d,tolreached)) { PGc1,PGc2,tolesp,tol2d,tolreached)) {
#if DEB #if DEB
cout<<"echec calcul biseau echec interSS"<<endl; cout<<"failed to calculate bevel error interSS"<<endl;
#endif #endif
done=Standard_False; done=Standard_False;
return done; return done;
@ -327,12 +325,12 @@ Standard_Integer ChFi3d_Builder::PerformTwoCornerbyInter(const Standard_Integer
!ChFi3d_ComputeCurves(HS1,HS2,Parfin,Pardeb,Gc, !ChFi3d_ComputeCurves(HS1,HS2,Parfin,Pardeb,Gc,
PGc1,PGc2,tolesp,tol2d,tolreached)) { PGc1,PGc2,tolesp,tol2d,tolreached)) {
#if DEB #if DEB
cout<<"echec calcul biseau echec interSS"<<endl; cout<<"failed to calculate bevel error interSS"<<endl;
#endif #endif
done=Standard_False; done=Standard_False;
return done; return done;
} }
// On met a jour les CornerData avec les resultats de l intersection. // CornerData are updated with results of the intersection.
Standard_Real WFirst = Gc->FirstParameter(); Standard_Real WFirst = Gc->FirstParameter();
Standard_Real WLast = Gc->LastParameter(); Standard_Real WLast = Gc->LastParameter();
Standard_Integer Ipoin1; Standard_Integer Ipoin1;
@ -370,7 +368,7 @@ Standard_Integer ChFi3d_Builder::PerformTwoCornerbyInter(const Standard_Integer
isfirst2,IFaCo2); isfirst2,IFaCo2);
Corner2->SetIndexPoint(Corner1->IndexPoint(isfirst1,IFaArc1), Corner2->SetIndexPoint(Corner1->IndexPoint(isfirst1,IFaArc1),
isfirst2,IFaArc2); isfirst2,IFaArc2);
//On update les tolerances des points. //The tolerances of points are updated.
Bnd_Box bco,barc; Bnd_Box bco,barc;
if(IFaCo1 == 1) ChFi3d_EnlargeBox(DStr,Corner1,Fd1,bco,barc,isfirst1); if(IFaCo1 == 1) ChFi3d_EnlargeBox(DStr,Corner1,Fd1,bco,barc,isfirst1);
else ChFi3d_EnlargeBox(DStr,Corner1,Fd1,barc,bco,isfirst1); else ChFi3d_EnlargeBox(DStr,Corner1,Fd1,barc,bco,isfirst1);
@ -382,12 +380,12 @@ Standard_Integer ChFi3d_Builder::PerformTwoCornerbyInter(const Standard_Integer
ChFi3d_SetPointTolerance(DStr,bco,Corner1->IndexPoint(isfirst1,IFaCo1)); ChFi3d_SetPointTolerance(DStr,bco,Corner1->IndexPoint(isfirst1,IFaCo1));
} }
else { else {
// Il faut identifier la surface qui deborde, // It is necessary to identify the border surface,
// trouver le point de fin de l intersection Surf/Surf // find the end point of the intersection Surf/Surf
// par l intersection de la ligne de tangence du petit sur // by the intersection of the tangency line of the small
// la face opposee avec la surface du gros, // on the opposing face with the surface of the big,
// et enfin intersecter le gros avec la face en bout // and finally intersect the big with the face at end
// entre ce point et le point sur arc. // between this point and the point on arc.
#ifndef DEB #ifndef DEB
Standard_Boolean parcrois = Standard_False ; Standard_Boolean parcrois = Standard_False ;
#else #else
@ -427,11 +425,11 @@ Standard_Integer ChFi3d_Builder::PerformTwoCornerbyInter(const Standard_Integer
isfirstBig = isfirst1; isfirstSma = isfirst2; isfirstBig = isfirst1; isfirstSma = isfirst2;
} }
//Intersection du gros avec le petit : //Intersection of the big with the small :
//------------------------------------ //------------------------------------
// Pardeb (parametres du point PFaCo) // Pardeb (parameters of point PFaCo)
// on verifie l'intersection // the intersection is checked
ChFi3d_ComputesIntPC (SmaFD->Interference(IFaCoSma), ChFi3d_ComputesIntPC (SmaFD->Interference(IFaCoSma),
BigFD->Interference(IFaCoBig), BigFD->Interference(IFaCoBig),
SmaHS,BigHS,UIntPCSma,UIntPCBig); SmaHS,BigHS,UIntPCSma,UIntPCBig);
@ -442,7 +440,7 @@ Standard_Integer ChFi3d_Builder::PerformTwoCornerbyInter(const Standard_Integer
Pardeb(1)= UVi.X(); Pardeb(2)=UVi.Y(); Pardeb(1)= UVi.X(); Pardeb(2)=UVi.Y();
gp_Pnt PFaCo = SmaHS->Value(UVi.X(),UVi.Y()); gp_Pnt PFaCo = SmaHS->Value(UVi.X(),UVi.Y());
// Parfin (parametres du point PMil) // Parfin (parameters of point PMil)
const ChFiDS_FaceInterference& FiArcSma = SmaFD->Interference(IFaArcSma); const ChFiDS_FaceInterference& FiArcSma = SmaFD->Interference(IFaArcSma);
Handle(Geom_Curve) ctg = DStr.Curve(FiArcSma.LineIndex()).Curve(); Handle(Geom_Curve) ctg = DStr.Curve(FiArcSma.LineIndex()).Curve();
Handle(GeomAdaptor_HCurve) Hctg = new GeomAdaptor_HCurve(); Handle(GeomAdaptor_HCurve) Hctg = new GeomAdaptor_HCurve();
@ -467,7 +465,7 @@ Standard_Integer ChFi3d_Builder::PerformTwoCornerbyInter(const Standard_Integer
} }
if(!ChFi3d_IntCS(BigHS,Hctg,UVi,wi)){ if(!ChFi3d_IntCS(BigHS,Hctg,UVi,wi)){
#if DEB #if DEB
cout<<"biseau : echec inter C S"<<endl; cout<<"bevel : failed inter C S"<<endl;
#endif #endif
done=Standard_False; done=Standard_False;
return done; return done;
@ -481,12 +479,12 @@ Standard_Integer ChFi3d_Builder::PerformTwoCornerbyInter(const Standard_Integer
if (!ChFi3d_ComputeCurves(SmaHS,BigHS,Pardeb,Parfin,Gc, if (!ChFi3d_ComputeCurves(SmaHS,BigHS,Pardeb,Parfin,Gc,
PGc1,PGc2,tolesp,tol2d,tolreached)) { PGc1,PGc2,tolesp,tol2d,tolreached)) {
#if DEB #if DEB
cout<<"echec calcul biseau echec interSS"<<endl; cout<<"failed to calculate bevel failed interSS"<<endl;
#endif #endif
done=Standard_False; done=Standard_False;
return done; return done;
} }
// On met a jour la SmaCD, c est fini pour elle. // SmaCD is updated, for it this is all.
Standard_Real WFirst = Gc->FirstParameter(); Standard_Real WFirst = Gc->FirstParameter();
Standard_Real WLast = Gc->LastParameter(); Standard_Real WLast = Gc->LastParameter();
Standard_Integer IpointCo, IpointMil, IpointArc; Standard_Integer IpointCo, IpointMil, IpointArc;
@ -514,7 +512,7 @@ Standard_Integer ChFi3d_Builder::PerformTwoCornerbyInter(const Standard_Integer
SmaCD->SetIndexPoint(IpointMil,isfirstSma,IFaArcSma); SmaCD->SetIndexPoint(IpointMil,isfirstSma,IFaArcSma);
if (IFaCoSma == 2) SmaCD->SetOrientation(TopAbs_REVERSED,isfirstSma); if (IFaCoSma == 2) SmaCD->SetOrientation(TopAbs_REVERSED,isfirstSma);
// Pour la BigCD on met ces premiers resultats dans la DS. // For BigCD the first results are met in the DS.
BigCD->SetIndexPoint(IpointCo,isfirstBig,IFaCoBig); BigCD->SetIndexPoint(IpointCo,isfirstBig,IFaCoBig);
BigFD->ChangeVertex(isfirstBig,IFaCoBig) = psmaco; BigFD->ChangeVertex(isfirstBig,IFaCoBig) = psmaco;
BigFD->ChangeInterference(IFaCoBig).SetParameter(UIntPCBig,isfirstBig); BigFD->ChangeInterference(IFaCoBig).SetParameter(UIntPCBig,isfirstBig);
@ -526,7 +524,7 @@ Standard_Integer ChFi3d_Builder::PerformTwoCornerbyInter(const Standard_Integer
Interfp = ChFi3d_FilPointInDS(TopAbs_REVERSED,ICurv,IpointMil,WLast); Interfp = ChFi3d_FilPointInDS(TopAbs_REVERSED,ICurv,IpointMil,WLast);
Li.Append(Interfp); Li.Append(Interfp);
// la transition des courbes d intersection sur la Big // the transition of curves of intersection on the Big
TopAbs_Orientation tra = BigFD->InterferenceOnS1().Transition(); TopAbs_Orientation tra = BigFD->InterferenceOnS1().Transition();
TopAbs_Orientation ofac = DStr.Shape(BigFD->IndexOfS1()).Orientation(); TopAbs_Orientation ofac = DStr.Shape(BigFD->IndexOfS1()).Orientation();
TopAbs_Orientation ofil = BigFD->Orientation(); TopAbs_Orientation ofil = BigFD->Orientation();
@ -540,18 +538,18 @@ Standard_Integer ChFi3d_Builder::PerformTwoCornerbyInter(const Standard_Integer
Interfc = ChFi3d_FilCurveInDS (ICurv,ISurf,PGc2,tracurv); Interfc = ChFi3d_FilCurveInDS (ICurv,ISurf,PGc2,tracurv);
DStr.ChangeSurfaceInterferences(ISurf).Append(Interfc); DStr.ChangeSurfaceInterferences(ISurf).Append(Interfc);
//On update les tolerances des points (on commence). //The tolerances of points are updated (beginning).
Bnd_Box bco,bmil,barc; Bnd_Box bco,bmil,barc;
if(IFaCoSma == 1) ChFi3d_EnlargeBox(DStr,SmaCD,SmaFD,bco,bmil,isfirstSma); if(IFaCoSma == 1) ChFi3d_EnlargeBox(DStr,SmaCD,SmaFD,bco,bmil,isfirstSma);
else ChFi3d_EnlargeBox(DStr,SmaCD,SmaFD,bmil,bco,isfirstSma); else ChFi3d_EnlargeBox(DStr,SmaCD,SmaFD,bmil,bco,isfirstSma);
ChFi3d_EnlargeBox(BigHS,PGc2,WFirst,WLast,bco,bmil); ChFi3d_EnlargeBox(BigHS,PGc2,WFirst,WLast,bco,bmil);
// Intersection du gros avec la face en bout : // Intersection of the big with the face at end :
// ------------------------------------------- // -------------------------------------------
// Pardeb (parametres de PMil) // Pardeb (parameters of PMil)
// On rejoue l intersection courbe surface mais avec la representation // The intersection curve surface is tried again, now with representation
// pcurve on face de la courbe pour etre bien sur. // pcurve on face of the curve to be sure.
TopoDS_Face F = TopoDS::Face(DStr.Shape(SmaFD->Index(IFaArcSma))); TopoDS_Face F = TopoDS::Face(DStr.Shape(SmaFD->Index(IFaArcSma)));
Handle(BRepAdaptor_HSurface) HF = new BRepAdaptor_HSurface(F); Handle(BRepAdaptor_HSurface) HF = new BRepAdaptor_HSurface(F);
Standard_Real fsma = FiArcSma.FirstParameter(); Standard_Real fsma = FiArcSma.FirstParameter();
@ -570,7 +568,7 @@ Standard_Integer ChFi3d_Builder::PerformTwoCornerbyInter(const Standard_Integer
Handle(Adaptor3d_HCurveOnSurface) Hconsf = new Adaptor3d_HCurveOnSurface(consf); Handle(Adaptor3d_HCurveOnSurface) Hconsf = new Adaptor3d_HCurveOnSurface(consf);
if(!ChFi3d_IntCS(BigHS,Hconsf,UVi,wi)) { if(!ChFi3d_IntCS(BigHS,Hconsf,UVi,wi)) {
#if DEB #if DEB
cout<<"biseau : echec inter C S"<<endl; cout<<"bevel : failed inter C S"<<endl;
#endif #endif
done=Standard_False; done=Standard_False;
return done; return done;
@ -580,7 +578,7 @@ Standard_Integer ChFi3d_Builder::PerformTwoCornerbyInter(const Standard_Integer
Pardeb(1) = UVi.X(); Pardeb(2) = UVi.Y(); Pardeb(1) = UVi.X(); Pardeb(2) = UVi.Y();
gp_Pnt2d ppff1 = UVi; gp_Pnt2d ppff1 = UVi;
// Parfin (parametres du point cpend) // Parfin (parameters of the point cpend)
Standard_Real ptg = BigFD->Interference(IFaArcBig).Parameter(isfirstBig); Standard_Real ptg = BigFD->Interference(IFaArcBig).Parameter(isfirstBig);
UVi = BigFD->Interference(IFaArcBig).PCurveOnSurf()->Value(ptg); UVi = BigFD->Interference(IFaArcBig).PCurveOnSurf()->Value(ptg);
Parfin(3) = UVi.X(); Parfin(4) = UVi.Y(); Parfin(3) = UVi.X(); Parfin(4) = UVi.Y();
@ -595,21 +593,21 @@ Standard_Integer ChFi3d_Builder::PerformTwoCornerbyInter(const Standard_Integer
// Intersection. // Intersection.
Standard_Real uu1,uu2,vv1,vv2; Standard_Real uu1,uu2,vv1,vv2;
ChFi3d_Boite(ppff1,ppff2,uu1,uu2,vv1,vv2); ChFi3d_Boite(ppff1,ppff2,uu1,uu2,vv1,vv2);
// pour le cas ou les deux chanfreins sont sur deux aretes OnSame, // for the case when two chamfers are on two edges OnSame,
// il faut etendre la surface portant F, sinon, au moins ne pas la // it is necessary to extend the surface carrying F, or at least
// restreindre. // not to limit it.
ChFi3d_BoundFac(HF->ChangeSurface(),uu1,uu2,vv1,vv2,Standard_True); ChFi3d_BoundFac(HF->ChangeSurface(),uu1,uu2,vv1,vv2,Standard_True);
if (!ChFi3d_ComputeCurves(HF,BigHS,Pardeb,Parfin,Gc, if (!ChFi3d_ComputeCurves(HF,BigHS,Pardeb,Parfin,Gc,
PGc1,PGc2,tolesp,tol2d,tolreached)) { PGc1,PGc2,tolesp,tol2d,tolreached)) {
#if DEB #if DEB
cout<<"echec calcul biseau echec interSS"<<endl; cout<<"fail calculation bevel fail interSS"<<endl;
#endif #endif
done=Standard_False; done=Standard_False;
return done; return done;
} }
// On finit de mettre a jour la BigCD et la DS. // End of update of the BigCD and the DS.
WFirst = Gc->FirstParameter(); WFirst = Gc->FirstParameter();
WLast = Gc->LastParameter(); WLast = Gc->LastParameter();
ICurv = DStr.AddCurve(TopOpeBRepDS_Curve(Gc,tolreached)); ICurv = DStr.AddCurve(TopOpeBRepDS_Curve(Gc,tolreached));
@ -626,7 +624,7 @@ Standard_Integer ChFi3d_Builder::PerformTwoCornerbyInter(const Standard_Integer
DStr.ChangeSurfaceInterferences(ISurf).Append(Interfc); DStr.ChangeSurfaceInterferences(ISurf).Append(Interfc);
BigCD->InDS(isfirstBig); BigCD->InDS(isfirstBig);
// Et enfin on met dans la DS les informations cote face. // Finally the information on faces is placed in the DS.
Standard_Integer IShape = DStr.AddShape(F); Standard_Integer IShape = DStr.AddShape(F);
if(SmaFD->Surf() == BigFD->Surf()){ if(SmaFD->Surf() == BigFD->Surf()){
tracurv = TopAbs::Compose(etest.Orientation(), tracurv = TopAbs::Compose(etest.Orientation(),
@ -646,7 +644,7 @@ Standard_Integer ChFi3d_Builder::PerformTwoCornerbyInter(const Standard_Integer
Interfc = ChFi3d_FilCurveInDS(ICurv,IShape,PGc1,tracurv); Interfc = ChFi3d_FilCurveInDS(ICurv,IShape,PGc1,tracurv);
DStr.ChangeShapeInterferences(IShape).Append(Interfc); DStr.ChangeShapeInterferences(IShape).Append(Interfc);
//On update les tolerances des points (on finit). //The tolerances of points are updated (end).
Handle(ChFiDS_Stripe) bidst; Handle(ChFiDS_Stripe) bidst;
if(IFaCoBig == 1) ChFi3d_EnlargeBox(DStr,bidst,BigFD,bco,barc,isfirstBig); if(IFaCoBig == 1) ChFi3d_EnlargeBox(DStr,bidst,BigFD,bco,barc,isfirstBig);
else ChFi3d_EnlargeBox(DStr,bidst,BigFD,barc,bco,isfirstBig); else ChFi3d_EnlargeBox(DStr,bidst,BigFD,barc,bco,isfirstBig);

285
src/ChFi3d/ChFi3d_Builder_CnCrn.cxx
View File

@ -236,7 +236,7 @@ static void RemoveSD(Handle(ChFiDS_Stripe)& Stripe,
//======================================================================= //=======================================================================
//function : cherche_edge1 //function : cherche_edge1
//purpose : cherche l'edge commune entre les faces F1 et F2 //purpose : find common edge of faces F1 and F2
//======================================================================= //=======================================================================
static void cherche_edge1 (const TopoDS_Face & F1, static void cherche_edge1 (const TopoDS_Face & F1,
@ -266,9 +266,9 @@ static void cherche_edge1 (const TopoDS_Face & F1,
//======================================================================= //=======================================================================
//function : CurveHermite //function : CurveHermite
//purpose : calcule une courbe 3d au moyen des polynomes d'Hermite. //purpose : calculate a curve 3d using polynoms of Hermite.
// l'arete ic est une arete de regularite . On construit une courbe 3d entre // the edge is a regular edge. Curve 3D is constructed
// les aretes icmoins et icplus. // between edges icmoins and icplus.
//======================================================================= //=======================================================================
static void CurveHermite (const TopOpeBRepDS_DataStructure& DStr, static void CurveHermite (const TopOpeBRepDS_DataStructure& DStr,
@ -437,7 +437,7 @@ static void CurveHermite (const TopOpeBRepDS_DataStructure& DStr,
//======================================================================= //=======================================================================
//function : CalculDroite //function : CalculDroite
//purpose : calcule une droite 2d passant par le point p2d1 et de direction xdir ydir //purpose : calculate a 2D straight line passing through point p2d1 and direction xdir ydir
//======================================================================= //=======================================================================
static void CalculDroite(const gp_Pnt2d & p2d1, static void CalculDroite(const gp_Pnt2d & p2d1,
@ -452,7 +452,7 @@ static void CalculDroite(const gp_Pnt2d & p2d1,
//======================================================================= //=======================================================================
//function : CalculBatten //function : CalculBatten
//purpose : calcule un batten entre les courbes 2d curv2d1 et curv2d2 aux points p2d1 et p2d2 //purpose : calcule a batten between curves 2d curv2d1 and curv2d2 at points p2d1 and p2d2
//======================================================================= //=======================================================================
static void CalculBatten (const Handle (GeomAdaptor_HSurface) ASurf, static void CalculBatten (const Handle (GeomAdaptor_HSurface) ASurf,
@ -514,7 +514,7 @@ static void CalculBatten (const Handle (GeomAdaptor_HSurface) ASurf,
Ok = Bat.Compute(Iana,25,1.e-2); Ok = Bat.Compute(Iana,25,1.e-2);
#if DEB #if DEB
if (!Ok) { if (!Ok) {
cout<<"pas de batten :"; cout<<"no batten :";
Bat.Dump(cout); Bat.Dump(cout);
} }
#endif #endif
@ -539,8 +539,8 @@ static void CalculBatten (const Handle (GeomAdaptor_HSurface) ASurf,
//======================================================================= //=======================================================================
//function : OrientationIcNonVive //function : OrientationIcNonVive
//purpose : calcule l'orientation de la courbe de raccord entre ic et icplus sachant que ic //purpose : calculate the orientation of the curve between ic and icplus knowing that ic
// n'est pas une arete vive // is not a living edge.
//======================================================================= //=======================================================================
static void OrientationIcNonVive (const Handle(ChFiDS_Stripe) & CDic, static void OrientationIcNonVive (const Handle(ChFiDS_Stripe) & CDic,
@ -563,8 +563,8 @@ static void OrientationIcNonVive (const Handle(ChFiDS_Stripe) & CDic,
//======================================================================= //=======================================================================
//function : OrientationIcplusNonVive //function : OrientationIcplusNonVive
//purpose : calcule l'orientation de la courbe de raccord entre ic et icplus sachant que icplus //purpose : calculate the orientation of the curve between ic and icplus knowing that icplus
// n'est pas une arete vive; // is not a living edge;
//======================================================================= //=======================================================================
static void OrientationIcplusNonVive (const Handle(ChFiDS_Stripe) & CDicplus, static void OrientationIcplusNonVive (const Handle(ChFiDS_Stripe) & CDicplus,
@ -588,8 +588,8 @@ static void OrientationIcplusNonVive (const Handle(ChFiDS_Stripe) & CDicplus,
//======================================================================= //=======================================================================
//function : OrientationAreteViveConsecutive //function : OrientationAreteViveConsecutive
//purpose : calcule l'orientation de la courbe de raccord entre les aretes ic et icplus //purpose : calculate the orientation of the curve between edges ic and icplus
// ou ic et icplus sont vives consecutives // where ic and icplus are consecutively living
//======================================================================= //=======================================================================
static void OrientationAreteViveConsecutive (const TopoDS_Shape & Fviveicicplus, static void OrientationAreteViveConsecutive (const TopoDS_Shape & Fviveicicplus,
@ -597,7 +597,7 @@ static void OrientationAreteViveConsecutive (const TopoDS_Shape & Fviveicicplus,
const TopoDS_Vertex & V1, const TopoDS_Vertex & V1,
TopAbs_Orientation & orien) TopAbs_Orientation & orien)
{ // orinterf est l'orientation de l'edge ic par rapport a la face Fviveicicplus prise FORWARD { // orinterf is orientation of edge ic corresponding to face Fviveicicplus taken FORWARD
#ifndef DEB #ifndef DEB
TopAbs_Orientation orinterf = TopAbs_FORWARD; TopAbs_Orientation orinterf = TopAbs_FORWARD;
#else #else
@ -612,8 +612,8 @@ static void OrientationAreteViveConsecutive (const TopoDS_Shape & Fviveicicplus,
break; break;
} }
} }
// si V1 est le vertex REVERSED de l'edge ic alors la courbe de // if V1 is vertex REVERSED of edge ic the curve
// raccord a la meme orientation que ic // has the same orientation as ic
TopoDS_Vertex vl; TopoDS_Vertex vl;
vl=TopExp::LastVertex(E); vl=TopExp::LastVertex(E);
if (vl.IsSame(V1)){ if (vl.IsSame(V1)){
@ -628,7 +628,7 @@ static void OrientationAreteViveConsecutive (const TopoDS_Shape & Fviveicicplus,
//======================================================================= //=======================================================================
//function : PerformTwoCornerSameExt //function : PerformTwoCornerSameExt
//purpose : calcule l'intersection entre les deux stripes stripe1 et stripe2 //purpose : calculate intersection between two stripes stripe1 and stripe2
//======================================================================= //=======================================================================
static void PerformTwoCornerSameExt(TopOpeBRepDS_DataStructure& DStr, static void PerformTwoCornerSameExt(TopOpeBRepDS_DataStructure& DStr,
@ -754,7 +754,7 @@ static void PerformTwoCornerSameExt(TopOpeBRepDS_DataStructure& DStr,
//======================================================================= //=======================================================================
//function : CpOnEdge //function : CpOnEdge
//purpose : determine si la surfdata num a un common point sur Eadj1 ou Eadj2 //purpose : determine if surfdata num has a common point on Eadj1 or Eadj2
//======================================================================= //=======================================================================
static void CpOnEdge (const Handle(ChFiDS_Stripe) & stripe, static void CpOnEdge (const Handle(ChFiDS_Stripe) & stripe,
@ -780,7 +780,7 @@ static void CpOnEdge (const Handle(ChFiDS_Stripe) & stripe,
//======================================================================= //=======================================================================
//function : RemoveSurfData //function : RemoveSurfData
//purpose : pour chaque stripe suppression des surfdatas initiles //purpose : for each stripe removal of unused surfdatas
//======================================================================= //=======================================================================
static void RemoveSurfData (const ChFiDS_StripeMap & myVDataMap, static void RemoveSurfData (const ChFiDS_StripeMap & myVDataMap,
@ -815,9 +815,9 @@ static void RemoveSurfData (const ChFiDS_StripeMap & myVDataMap,
Standard_Integer ind; Standard_Integer ind;
if (sense==1) { if (sense==1) {
ind=0; ind=0;
// parmi les surfdatas on cherche le plus grand indice ind tel que // among surfdatas find the greatest indice ind so that
// la surfdata ait un de ses commonpoint sur Eadj1 et Eadj2 // surfdata could have one of commonpoint on Eadj1 and Eadj2
// on supprime les surfdata de 1 a ind-1 // remove surfdata from 1 to ind-1
for (Standard_Integer i=1;i<=nbsurf;i++) { for (Standard_Integer i=1;i<=nbsurf;i++) {
CpOnEdge (It.Value(),i,isfirst,Eadj1,Eadj2,compoint); CpOnEdge (It.Value(),i,isfirst,Eadj1,Eadj2,compoint);
if (compoint) ind=i; if (compoint) ind=i;
@ -826,9 +826,9 @@ static void RemoveSurfData (const ChFiDS_StripeMap & myVDataMap,
} }
else { else {
ind=num; ind=num;
// parmi les surfdatas on cherche le plus petit indice ind tel que // among surfdatas find the smallest indice ind so that
// la surfdata ait un de ses commonpoint sur Eadj1 et Eadj2 // surfdata could have one of commonpoint on Eadj1 and Eadj2
// on supprime les surfdata de ind+1 a num // remove surfdata from ind+1 to num
for (Standard_Integer i=num;i>=1;i--) { for (Standard_Integer i=num;i>=1;i--) {
CpOnEdge (It.Value(),i,isfirst,Eadj1,Eadj2,compoint); CpOnEdge (It.Value(),i,isfirst,Eadj1,Eadj2,compoint);
if (compoint) ind=i; if (compoint) ind=i;
@ -971,7 +971,7 @@ static TopAbs_Orientation PlateOrientation(const Handle(Geom_Surface)& thePlateS
//======================================================================= //=======================================================================
//function : PerformMoreThreeCorner //function : PerformMoreThreeCorner
//purpose : Traite le cas d'un sommet a n aretes. //purpose : Process case of a top with n edges.
//======================================================================= //=======================================================================
void ChFi3d_Builder::PerformMoreThreeCorner(const Standard_Integer Jndex, void ChFi3d_Builder::PerformMoreThreeCorner(const Standard_Integer Jndex,
@ -1061,8 +1061,7 @@ void ChFi3d_Builder::PerformMoreThreeCorner(const Standard_Integer Jndex,
TopoDS_Face F1,F2; TopoDS_Face F1,F2;
gp_Vec SumFaceNormalAtV1(0,0,0); // is used to define Plate orientation gp_Vec SumFaceNormalAtV1(0,0,0); // is used to define Plate orientation
// on determine s'il y a une arete de couture // it is determined if there is a sewing edge
// la face qui a une arete de couture et l'arete de couture
Standard_Boolean couture=Standard_False; Standard_Boolean couture=Standard_False;
TopoDS_Face facecouture; TopoDS_Face facecouture;
TopoDS_Edge edgecouture; TopoDS_Edge edgecouture;
@ -1073,10 +1072,10 @@ void ChFi3d_Builder::PerformMoreThreeCorner(const Standard_Integer Jndex,
facecouture=fcur; facecouture=fcur;
} }
// On enleve les surfdata inutiles // unused surfdata are removed
RemoveSurfData (myVDataMap, myEFMap,edgecouture,facecouture,V1); RemoveSurfData (myVDataMap, myEFMap,edgecouture,facecouture,V1);
// tri des aretes et des faces // parse edges and faces
trouve=Standard_False; trouve=Standard_False;
TopoDS_Edge Enext; TopoDS_Edge Enext;
TopoDS_Vertex VV; TopoDS_Vertex VV;
@ -1100,7 +1099,7 @@ void ChFi3d_Builder::PerformMoreThreeCorner(const Standard_Integer Jndex,
ChFi3d_cherche_edge(V1,Evive,Fcur,Enext,VV); ChFi3d_cherche_edge(V1,Evive,Fcur,Enext,VV);
trouve= !Enext.IsNull(); trouve= !Enext.IsNull();
} }
// find sum of all face normales at V1 // find sum of all face normals at V1
SummarizeNormal(V1, Fcur, Ecur, SumFaceNormalAtV1); SummarizeNormal(V1, Fcur, Ecur, SumFaceNormalAtV1);
Standard_Integer nbcouture=0; Standard_Integer nbcouture=0;
@ -1111,7 +1110,7 @@ void ChFi3d_Builder::PerformMoreThreeCorner(const Standard_Integer Jndex,
} }
else ChFi3d_cherche_edge(V1,Evive,Fcur,Enext,VV); else ChFi3d_cherche_edge(V1,Evive,Fcur,Enext,VV);
if (Enext.IsNull())Standard_Failure::Raise if (Enext.IsNull())Standard_Failure::Raise
("PerformMoreThreeCorner: pb dans le tri des aretes et des faces"); ("PerformMoreThreeCorner: pb in the parsing of edges and faces");
if (Enext.IsSame(edgelibre1)|| Enext.IsSame(edgelibre2)) { if (Enext.IsSame(edgelibre1)|| Enext.IsSame(edgelibre2)) {
CD.SetValue(ii, cdbid); CD.SetValue(ii, cdbid);
Index.SetValue(ii, 0); Index.SetValue(ii, 0);
@ -1146,7 +1145,7 @@ void ChFi3d_Builder::PerformMoreThreeCorner(const Standard_Integer Jndex,
jf.SetValue(ii, 0); jf.SetValue(ii, 0);
} }
else { else {
// on cherche si Enext est dans la map des stripes // it is found if Enext is in the map of stripes
TopoDS_Edge EE; TopoDS_Edge EE;
/*Standard_Boolean */trouve = Standard_False; /*Standard_Boolean */trouve = Standard_False;
for (It.Initialize(myVDataMap(Jndex));It.More()&&!trouve;It.Next()) { for (It.Initialize(myVDataMap(Jndex));It.More()&&!trouve;It.Next()) {
@ -1168,7 +1167,7 @@ void ChFi3d_Builder::PerformMoreThreeCorner(const Standard_Integer Jndex,
Evive.SetValue(ii, Enext); Evive.SetValue(ii, Enext);
} }
else { else {
// l'arete ii est vive // edge ii is alive
CD.SetValue(ii, cdbid); CD.SetValue(ii, cdbid);
Index.SetValue(ii, 0); Index.SetValue(ii, 0);
sens.SetValue(ii, -1); sens.SetValue(ii, -1);
@ -1179,7 +1178,7 @@ void ChFi3d_Builder::PerformMoreThreeCorner(const Standard_Integer Jndex,
Evive.SetValue(ii, Enext); Evive.SetValue(ii, Enext);
jf.SetValue(ii, 0); jf.SetValue(ii, 0);
} }
// On cherche la face Fnext!=Fcur qui contient Enext // Face Fnext!=Fcur containing Enext
Fnext=Fcur; Fnext=Fcur;
ChFi3d_cherche_face1(myEFMap(Enext),Fcur,Fnext); ChFi3d_cherche_face1(myEFMap(Enext),Fcur,Fnext);
Indices(nedge,ii,icplus,icmoins); Indices(nedge,ii,icplus,icmoins);
@ -1189,11 +1188,11 @@ void ChFi3d_Builder::PerformMoreThreeCorner(const Standard_Integer Jndex,
numfa.SetValue(icplus,ii,numfa.Value(ii,icplus)); numfa.SetValue(icplus,ii,numfa.Value(ii,icplus));
Standard_Integer numface1,numface2; Standard_Integer numface1,numface2;
if (trouve) { if (trouve) {
// on regarde si numfa correspond a IndexOfS1 ou IndexOfS2 // it is checked if numfa corresponds to IndexOfS1 or IndexOfS2
// on met a jour en consequence jf // jf is updated is consequently updated
// si ce n'est pas le cas on recherche parmi les faces precedentes // if it is not the case among the previous faces are found
// celle qui correspond a IndexOfs1 IndexOfS2 et on remet a jour // those which correspond to IndexOfs1 IndexOfS2 and
// numfa et Fvive (cts16288) // numfa and Fvive are reupdated (cts16288)
numface2 = SurfIndex(CD, ii, Index.Value(ii), FACE2); numface2 = SurfIndex(CD, ii, Index.Value(ii), FACE2);
if (numface2==numfa.Value(ii,icplus)) if (numface2==numfa.Value(ii,icplus))
jf.SetValue(ii, 2); jf.SetValue(ii, 2);
@ -1239,8 +1238,8 @@ void ChFi3d_Builder::PerformMoreThreeCorner(const Standard_Integer Jndex,
} }
} }
} }
// on verifie qu'une arete de regularite n'est pas tangente a une autre arete // it is checked if a regular edge is not tangent to another edge
// dans ce cas on ne la considere pas comme reguliere (cts60072) // in case if it is not considered regular (cts60072)
for (ic=0;ic<nedge;ic++) { for (ic=0;ic<nedge;ic++) {
if (regul.Value(ic) ) { if (regul.Value(ic) ) {
trouve=Standard_False; trouve=Standard_False;
@ -1259,10 +1258,9 @@ void ChFi3d_Builder::PerformMoreThreeCorner(const Standard_Integer Jndex,
} }
} }
// la variable deuxconges permet de detecter les cas ou on a un sommet a // variable deuxconges allows detecting cases when there is a top with
// n aretes et deux conges sur deux aretes tangentes qui ne sont pas // n edges and two fillets on two tangent edges that are not free borders
// des bords libres // the connecting curves start from the fillet and end on top
// les courbes de raccord partent du conge jusqu'au sommet
Standard_Boolean deuxconges,deuxcgnontg; Standard_Boolean deuxconges,deuxcgnontg;
deuxconges=Standard_False; deuxconges=Standard_False;
@ -1280,9 +1278,8 @@ void ChFi3d_Builder::PerformMoreThreeCorner(const Standard_Integer Jndex,
} }
} }
// on utilise la variable deuxconges dans le cas particulier // variable deuxconges is used in the special case when there are
// ou on a deux conges et si les deux autres aretes vives // two fillets and if two other living edges are tangent (cts60072)
// sont tangentes (cts60072)
if (nconges==2 && nedge==4) { if (nconges==2 && nedge==4) {
TopoDS_Edge E1,E2; TopoDS_Edge E1,E2;
for (ic=0;ic<nedge&&!deuxconges;ic++) { for (ic=0;ic<nedge&&!deuxconges;ic++) {
@ -1331,10 +1328,10 @@ void ChFi3d_Builder::PerformMoreThreeCorner(const Standard_Integer Jndex,
PerformOneCorner (Jndex, Standard_True); PerformOneCorner (Jndex, Standard_True);
} }
// si le commonpoint est sur une arete qui n'a pas comme // if the commonpoint is on an edge that does not have a
// extremite le vertex , on determine a nouveau Evive // vertex at the extremity, Evive is found anew
// On determine a nouveau Fvive si elle ne correspondant // Fvive is found anew if it does not correspond
// pas a une des deux faces adjacentes a Evive (cts16288) // to two faces adjacent to Evive (cts16288)
if (!deuxconges && !isOnSameDiff) if (!deuxconges && !isOnSameDiff)
for (ic=0;ic<nedge;ic++) { for (ic=0;ic<nedge;ic++) {
@ -1411,7 +1408,7 @@ void ChFi3d_Builder::PerformMoreThreeCorner(const Standard_Integer Jndex,
} }
} }
// on recupere la premiere arete libre si elle existe // the first free edge is restored if it exists
trouve=Standard_False; trouve=Standard_False;
for (ic=0; ic<nedge&&!trouve;ic++) { for (ic=0; ic<nedge&&!trouve;ic++) {
TopoDS_Edge ecom; TopoDS_Edge ecom;
@ -1422,7 +1419,7 @@ void ChFi3d_Builder::PerformMoreThreeCorner(const Standard_Integer Jndex,
} }
} }
// determination de la distance de recul distmin a ne pas depasser // determine the minimum recoil distance that can't be exceeded
Standard_Boolean distmini=Standard_False; Standard_Boolean distmini=Standard_False;
gp_Pnt som=BRep_Tool::Pnt(V1),pic; gp_Pnt som=BRep_Tool::Pnt(V1),pic;
gp_Pnt2d p2; gp_Pnt2d p2;
@ -1445,8 +1442,7 @@ void ChFi3d_Builder::PerformMoreThreeCorner(const Standard_Integer Jndex,
if (dst<distmin) distmin=dst; if (dst<distmin) distmin=dst;
} }
// calcul des intersections entre les stripes et determination des parametres // calculate intersections between stripes and determine the parameters on each pcurve
// sur chaque pcurve
Standard_Boolean inters=Standard_True; Standard_Boolean inters=Standard_True;
for (ic=0;ic<nedge;ic++) { for (ic=0;ic<nedge;ic++) {
Indices(nedge,ic,icplus,icmoins); Indices(nedge,ic,icplus,icmoins);
@ -1461,8 +1457,7 @@ void ChFi3d_Builder::PerformMoreThreeCorner(const Standard_Integer Jndex,
Handle(ChFiDS_Stripe) strip; Handle(ChFiDS_Stripe) strip;
Standard_Real angedg; Standard_Real angedg;
Standard_Integer iface; Standard_Integer iface;
// si les deux aretes sont tangentes on ne tente pas // if two edges are tangent the intersection is not attempted (cts60046)
// l'intersection (cts60046)
angedg=Abs(ChFi3d_AngleEdge(V1,TopoDS::Edge(Evive.Value(ic)),TopoDS::Edge(Evive.Value(icplus)))); angedg=Abs(ChFi3d_AngleEdge(V1,TopoDS::Edge(Evive.Value(ic)),TopoDS::Edge(Evive.Value(icplus))));
if (Abs(angedg-PI)>0.01) if (Abs(angedg-PI)>0.01)
ok = ChFi3d_SearchFD(DStr,CD.Value(ic),CD.Value(icplus),sens.Value(ic),sens.Value(icplus), ok = ChFi3d_SearchFD(DStr,CD.Value(ic),CD.Value(icplus),sens.Value(ic),sens.Value(icplus),
@ -1470,9 +1465,9 @@ void ChFi3d_Builder::PerformMoreThreeCorner(const Standard_Integer Jndex,
Index.Value(ic),Index.Value(icplus), Index.Value(ic),Index.Value(icplus),
face,sameside,jf1,jfp); face,sameside,jf1,jfp);
else ok=Standard_False; else ok=Standard_False;
// s'il y a une intersection on regarde si la surfdata ou il y a l'intersection // if there is an intersection it is checked if surfdata with the intersection
// correspond a la premiere ou a la derniere // corresponds to the first or the last
// si ce n'est pas le cas on enleve de la SD les surfdata // if this is not the case, the surfdata are removed from SD
if (ok) { if (ok) {
if (i1!=Index.Value(ic) ){ if (i1!=Index.Value(ic) ){
@ -1556,8 +1551,8 @@ void ChFi3d_Builder::PerformMoreThreeCorner(const Standard_Integer Jndex,
if (!oksea.Value(ic) ) inters=Standard_False; if (!oksea.Value(ic) ) inters=Standard_False;
} }
// cas ou il n'y a pas que des intersections // case if there are only intersections
// les parametres sur les Pcurves sont les extremites de la stripe // the parametres on Pcurves are the extremities of the stripe
Standard_Real para; Standard_Real para;
if (!inters) { if (!inters) {
for (ic=0;ic<nedge;ic++) { for (ic=0;ic<nedge;ic++) {
@ -1607,7 +1602,7 @@ void ChFi3d_Builder::PerformMoreThreeCorner(const Standard_Integer Jndex,
} }
} }
// calcul de la distance max du sommet a chaque point // calculate max distance to the top at each point
TColStd_Array1OfReal dist1(0,size); TColStd_Array1OfReal dist1(0,size);
TColStd_Array1OfReal dist2(0,size); TColStd_Array1OfReal dist2(0,size);
Standard_Real distance=0.; Standard_Real distance=0.;
@ -1636,8 +1631,8 @@ void ChFi3d_Builder::PerformMoreThreeCorner(const Standard_Integer Jndex,
} }
} }
// decalage des parametres et elimination des points d'intersections // offset of parameters and removal of intersection points
// trop proches du sommet // too close to the top
Standard_Real ec, dist; Standard_Real ec, dist;
if (!deuxconges && !deuxcgnontg) if (!deuxconges && !deuxcgnontg)
@ -1645,7 +1640,7 @@ void ChFi3d_Builder::PerformMoreThreeCorner(const Standard_Integer Jndex,
Indices(nedge,ic,icplus,icmoins); Indices(nedge,ic,icplus,icmoins);
if (sharp.Value(ic) ) { if (sharp.Value(ic) ) {
BRepAdaptor_Curve C(TopoDS::Edge(Evive.Value(ic))); BRepAdaptor_Curve C(TopoDS::Edge(Evive.Value(ic)));
// pour passer d'une distance 3d a une distance parametrique // to pass from 3D distance to a parametric distance
if (!tangentregul(ic)) if (!tangentregul(ic))
ec = distance*100*C.Resolution(0.01); ec = distance*100*C.Resolution(0.01);
else ec=0.0; else ec=0.0;
@ -1657,7 +1652,7 @@ void ChFi3d_Builder::PerformMoreThreeCorner(const Standard_Integer Jndex,
para=p.Value(ic,icmoins) - ec; para=p.Value(ic,icmoins) - ec;
p.SetValue(ic,icmoins,para); p.SetValue(ic,icmoins,para);
} }
// il faudra etre sur de rester sur l'edge // it is necessary to be on to remain on the edge
p.SetValue(ic,icplus, p.Value(ic,icmoins)); p.SetValue(ic,icplus, p.Value(ic,icmoins));
} }
else if (!distmini) { else if (!distmini) {
@ -1701,7 +1696,7 @@ void ChFi3d_Builder::PerformMoreThreeCorner(const Standard_Integer Jndex,
} }
} }
// on tente de limiter l'arete vive par un des commonpoint // it is attempted to limit the edge by a commonpoint
// //
Standard_Real tolcp=0; Standard_Real tolcp=0;
@ -1731,10 +1726,10 @@ void ChFi3d_Builder::PerformMoreThreeCorner(const Standard_Integer Jndex,
if (!sharp.Value(icmoins) && !sharp.Value(icplus)) if (!sharp.Value(icmoins) && !sharp.Value(icplus))
samecompoint=cp1.Point().Distance(cp2.Point())<tolapp; samecompoint=cp1.Point().Distance(cp2.Point())<tolapp;
if ((dS<d1 || dS<d2)&& !samecompoint) { if ((dS<d1 || dS<d2)&& !samecompoint) {
// on recule jusqu'aux Common Points // step back till Common Points
// sans sortir de l'Edge ?? // without leaving the Edge ??
if (d2<d1 &&cp1.IsOnArc() ) { if (d2<d1 &&cp1.IsOnArc() ) {
// on choisit cp1 // cp1 is chosen
p.SetValue(ic,icmoins, cp1.ParameterOnArc()); p.SetValue(ic,icmoins, cp1.ParameterOnArc());
p.SetValue(ic,icplus, p.Value(ic,icmoins)); p.SetValue(ic,icplus, p.Value(ic,icmoins));
isfirst=(sens.Value(icplus)==1); isfirst=(sens.Value(icplus)==1);
@ -1744,7 +1739,7 @@ void ChFi3d_Builder::PerformMoreThreeCorner(const Standard_Integer Jndex,
if (cp1.Tolerance()>tolcp &&cp1.Tolerance()<1 ) tolcp=cp1.Tolerance(); if (cp1.Tolerance()>tolcp &&cp1.Tolerance()<1 ) tolcp=cp1.Tolerance();
} }
else if( cp2.IsOnArc()){ else if( cp2.IsOnArc()){
// on choisit cp2 // cp2 is chosen
p.SetValue(ic,icmoins, cp2.ParameterOnArc()); p.SetValue(ic,icmoins, cp2.ParameterOnArc());
p.SetValue(ic,icplus, p.Value(ic,icmoins)); p.SetValue(ic,icplus, p.Value(ic,icmoins));
isfirst=(sens.Value(icmoins)==1); isfirst=(sens.Value(icmoins)==1);
@ -1754,11 +1749,11 @@ void ChFi3d_Builder::PerformMoreThreeCorner(const Standard_Integer Jndex,
} }
} }
else { else {
// on se recale sur un Common Point uniquement si on en est tres pres // step back till Common Point only if it is very close
if (!sharp.Value(icplus)) { if (!sharp.Value(icplus)) {
if ((cp1.Point().Distance(PE)<cp1.Tolerance() || if ((cp1.Point().Distance(PE)<cp1.Tolerance() ||
samecompoint || nconges==1) && cp1.IsOnArc()) { samecompoint || nconges==1) && cp1.IsOnArc()) {
// on est tres proche de cp1 // it is very close to cp1
p.SetValue(ic,icmoins, cp1.ParameterOnArc()); p.SetValue(ic,icmoins, cp1.ParameterOnArc());
ponctuel.SetValue(ic,Standard_True); ponctuel.SetValue(ic,Standard_True);
p.SetValue(ic,icplus, p.Value(ic,icmoins)); p.SetValue(ic,icplus, p.Value(ic,icmoins));
@ -1772,7 +1767,7 @@ void ChFi3d_Builder::PerformMoreThreeCorner(const Standard_Integer Jndex,
if (!sharp.Value(icmoins)){ if (!sharp.Value(icmoins)){
if ((cp2.Point().Distance(PE)<cp2.Tolerance() || if ((cp2.Point().Distance(PE)<cp2.Tolerance() ||
samecompoint || nconges==1) && cp2.IsOnArc()) { samecompoint || nconges==1) && cp2.IsOnArc()) {
// on est tres proche de cp2 // it is very close to cp2
ponctuel.SetValue(icmoins,Standard_True); ponctuel.SetValue(icmoins,Standard_True);
p.SetValue(ic,icmoins, cp2.ParameterOnArc()); p.SetValue(ic,icmoins, cp2.ParameterOnArc());
p.SetValue(ic,icplus,p.Value(ic,icmoins)); p.SetValue(ic,icplus,p.Value(ic,icmoins));
@ -1786,8 +1781,8 @@ void ChFi3d_Builder::PerformMoreThreeCorner(const Standard_Integer Jndex,
} }
} }
// dans le cas d'un bord libre on prend le parametre correspondant // in case of a free border the parameter corresponding
// au common point sur l'arete libre. // to the common point on the free edge is chosen.
for (ic=0;ic<nedge;ic++) { for (ic=0;ic<nedge;ic++) {
if (TopoDS::Edge(Evive.Value(ic)).IsSame(edgelibre1) || if (TopoDS::Edge(Evive.Value(ic)).IsSame(edgelibre1) ||
@ -1821,11 +1816,11 @@ void ChFi3d_Builder::PerformMoreThreeCorner(const Standard_Integer Jndex,
} }
} }
// si ic est une arete de regularite, on cherche l'arete indfin qui ne // if ic is a regular edge, one finds edge indfin which is not
// soit pas une arete de regularite, on construit une courbe 3d // a regular edge, and construtc a curve 3d
// entre les aretes (ou stripes ) icmoins et indfin. // between edges (or stripes ) icmoins and indfin.
// On projette ensuite cette courbe3d sur toutes les faces (nbface) qui // Then this courbe3d is projected on all faces (nbface) that
// separent icmoins et indfin // separate icmoins and indfin
#ifndef DEB #ifndef DEB
Standard_Integer nbface = 0; Standard_Integer nbface = 0;
#else #else
@ -1922,7 +1917,7 @@ void ChFi3d_Builder::PerformMoreThreeCorner(const Standard_Integer Jndex,
} }
} }
// cas ou la courbe de raccord entre ic et icplus traverse plusieurs faces // case when the conncting curve between ic and icplus crosses many faces
TopTools_SequenceOfShape Ecom; TopTools_SequenceOfShape Ecom;
TopTools_SequenceOfShape Eproj; TopTools_SequenceOfShape Eproj;
@ -1984,9 +1979,9 @@ void ChFi3d_Builder::PerformMoreThreeCorner(const Standard_Integer Jndex,
} }
} }
// cas ou deux conges ont les memes commonpoints // case when two fillets have the same commonpoints
// on procede alors par intersection // one continues then by intersection
// on verifie cependant que les extremites de l'intersection coincident avec les commonpoints // it is checked if the extremities of the intersection coincide with commonpoints
Standard_Boolean intersection=Standard_False, introuve; Standard_Boolean intersection=Standard_False, introuve;
if (nconges==2 && !deuxconges) { if (nconges==2 && !deuxconges) {
@ -2034,10 +2029,10 @@ void ChFi3d_Builder::PerformMoreThreeCorner(const Standard_Integer Jndex,
} }
} }
// declaration pour plate // declaration for plate
GeomPlate_BuildPlateSurface PSurf(3,10,3,tol2d,tolesp,angular); GeomPlate_BuildPlateSurface PSurf(3,10,3,tol2d,tolesp,angular);
// calcul des courbes sur surface pour chaque stripe // calculation of curves on surface for each stripe
for (ic=0;ic<nedge;ic++) { for (ic=0;ic<nedge;ic++) {
gp_Pnt2d p2d1, p2d2; gp_Pnt2d p2d1, p2d2;
if (!sharp.Value(ic)) { if (!sharp.Value(ic)) {
@ -2050,7 +2045,7 @@ void ChFi3d_Builder::PerformMoreThreeCorner(const Standard_Integer Jndex,
indice= SurfIndex(CD, ic, i.Value(ic,icplus), ChFiSURFACE); indice= SurfIndex(CD, ic, i.Value(ic,icplus), ChFiSURFACE);
Handle (GeomAdaptor_HSurface) Asurf = Handle (GeomAdaptor_HSurface) Asurf =
new GeomAdaptor_HSurface(DStr.Surface(indice).Surface()); new GeomAdaptor_HSurface(DStr.Surface(indice).Surface());
// calcul de la courbe 2d // calculation of curve 2d
xdir= p2d2.X()-p2d1.X(); xdir= p2d2.X()-p2d1.X();
ydir= p2d2.Y()-p2d1.Y(); ydir= p2d2.Y()-p2d1.Y();
Standard_Real l0 = sqrt(xdir*xdir+ ydir*ydir ); Standard_Real l0 = sqrt(xdir*xdir+ ydir*ydir );
@ -2066,7 +2061,7 @@ void ChFi3d_Builder::PerformMoreThreeCorner(const Standard_Integer Jndex,
new GeomPlate_CurveConstraint(HCons,Order.Value(ic),10,tolesp,angular,0.1); new GeomPlate_CurveConstraint(HCons,Order.Value(ic),10,tolesp,angular,0.1);
PSurf.Add(Cont); PSurf.Add(Cont);
// calcul des indices de points et de la courbe pour la DS // calculate indexes of points and of the curve for the DS
isfirst=(sens.Value(ic)==1); isfirst=(sens.Value(ic)==1);
GeomLib::BuildCurve3d(tolapp,CurvOnS,CurvOnS.FirstParameter(), GeomLib::BuildCurve3d(tolapp,CurvOnS,CurvOnS.FirstParameter(),
CurvOnS.LastParameter(),Curv3d,maxapp,avedev); CurvOnS.LastParameter(),Curv3d,maxapp,avedev);
@ -2080,13 +2075,13 @@ void ChFi3d_Builder::PerformMoreThreeCorner(const Standard_Integer Jndex,
TopOpeBRepDS_Point tpoint2 (point2,maxapp); TopOpeBRepDS_Point tpoint2 (point2,maxapp);
errapp.SetValue(ic,maxapp); errapp.SetValue(ic,maxapp);
if (ic==0) { if (ic==0) {
// il faut creer les deux points // it is necessary to create two points
indpoint.SetValue(ic,0,DStr.AddPoint(tpoint1)); indpoint.SetValue(ic,0,DStr.AddPoint(tpoint1));
indpoint.SetValue(ic,1,DStr.AddPoint(tpoint2)); indpoint.SetValue(ic,1,DStr.AddPoint(tpoint2));
} }
else { else {
// les points existent peut-etre deja sur un conge // probably the points are already on the fillet
// (intersection precedente,...) // (previous intersection...)
trouve = Standard_False; trouve = Standard_False;
for (ii=0;ii<ic&&(!trouve);ii++) { for (ii=0;ii<ic&&(!trouve);ii++) {
if (!sharp.Value(ii)) { if (!sharp.Value(ii)) {
@ -2114,7 +2109,7 @@ void ChFi3d_Builder::PerformMoreThreeCorner(const Standard_Integer Jndex,
indpoint.SetValue(ic,1,DStr.AddPoint(tpoint2)); indpoint.SetValue(ic,1,DStr.AddPoint(tpoint2));
} }
// mise a jour de la stripe // update of the stripe
isurf1=3-jf.Value(ic); isurf2=jf.Value(ic); isurf1=3-jf.Value(ic); isurf2=jf.Value(ic);
if (isurf1==2) CD.Value(ic)->SetOrientation(TopAbs_REVERSED,isfirst); if (isurf1==2) CD.Value(ic)->SetOrientation(TopAbs_REVERSED,isfirst);
CD.Value(ic)->SetCurve(indcurve3d.Value(n3d),isfirst); CD.Value(ic)->SetCurve(indcurve3d.Value(n3d),isfirst);
@ -2137,7 +2132,7 @@ void ChFi3d_Builder::PerformMoreThreeCorner(const Standard_Integer Jndex,
} }
} }
// calcul des indices de points pour les aretes vives // calculate the indices of points for living edges
for (ic=0;ic<nedge;ic++) { for (ic=0;ic<nedge;ic++) {
if (sharp.Value(ic)) { if (sharp.Value(ic)) {
Indices(nedge,ic,icplus,icmoins); Indices(nedge,ic,icplus,icmoins);
@ -2156,7 +2151,7 @@ void ChFi3d_Builder::PerformMoreThreeCorner(const Standard_Integer Jndex,
cp = CD.Value(icplus)->SetOfSurfData()->Value(i.Value(icplus,ic))-> cp = CD.Value(icplus)->SetOfSurfData()->Value(i.Value(icplus,ic))->
ChangeVertex (isfirst,jfp); ChangeVertex (isfirst,jfp);
if ( cp.Point().Distance(PE) <= Max(1.e-4,tolcp)) { if ( cp.Point().Distance(PE) <= Max(1.e-4,tolcp)) {
// l'arete a ete limitee par le 1er CommonPoint de CD[icplus] // edge was limited by the 1st CommonPoint of CD[icplus]
indpoint.SetValue(ic,0,indpoint.Value(icplus,0)); indpoint.SetValue(ic,0,indpoint.Value(icplus,0));
indpoint.SetValue(ic,1,indpoint.Value(icplus,0)); indpoint.SetValue(ic,1,indpoint.Value(icplus,0));
} }
@ -2166,7 +2161,7 @@ void ChFi3d_Builder::PerformMoreThreeCorner(const Standard_Integer Jndex,
cp = CD.Value(icmoins)->SetOfSurfData()->Value(i.Value(icmoins,ic))-> cp = CD.Value(icmoins)->SetOfSurfData()->Value(i.Value(icmoins,ic))->
ChangeVertex (isfirst,jf.Value(icmoins)); ChangeVertex (isfirst,jf.Value(icmoins));
if ( cp.Point().Distance(PE) <= Max(1.e-4,tolcp)) { if ( cp.Point().Distance(PE) <= Max(1.e-4,tolcp)) {
// l'arete a ete limitee par le 2eme CommonPoint de CD[icmoins] // edge was limited by the 2nd CommonPoint of CD[icmoins]
if (indpoint.Value(ic,0)==0) { if (indpoint.Value(ic,0)==0) {
indpoint.SetValue(ic,0, indpoint.Value(icmoins,1)); indpoint.SetValue(ic,0, indpoint.Value(icmoins,1));
indpoint.SetValue(ic,1, indpoint.Value(icmoins,1)); indpoint.SetValue(ic,1, indpoint.Value(icmoins,1));
@ -2180,8 +2175,8 @@ void ChFi3d_Builder::PerformMoreThreeCorner(const Standard_Integer Jndex,
} }
} }
// calcul des courbes intermediaires reliant deux stripes dans le cas ou il n'y a pas // calculation of intermediary curves connecting two stripes in case if
// d'intersection. La courbe peut etre une droite une projection ou un batten // there is no intersection. The curve is a straight line, projection or batten
Standard_Boolean raccordbatten; Standard_Boolean raccordbatten;
if (!inters) { if (!inters) {
@ -2204,8 +2199,8 @@ void ChFi3d_Builder::PerformMoreThreeCorner(const Standard_Integer Jndex,
Handle (GeomAdaptor_HSurface) Asurf; Handle (GeomAdaptor_HSurface) Asurf;
Standard_Real u1bid,u2bid; Standard_Real u1bid,u2bid;
// recuperation de la premiere courbe 2d // return the 1st curve 2d
// et du premier point de raccordement // and the 1st connection point
if (sharp.Value(ic)) if (sharp.Value(ic))
curv2d1 = BRep_Tool::CurveOnSurface(TopoDS::Edge(Evive.Value(ic)),TopoDS::Face(Fvive.Value(ic,icplus)), curv2d1 = BRep_Tool::CurveOnSurface(TopoDS::Edge(Evive.Value(ic)),TopoDS::Face(Fvive.Value(ic,icplus)),
u1bid,u2bid); u1bid,u2bid);
@ -2231,7 +2226,7 @@ void ChFi3d_Builder::PerformMoreThreeCorner(const Standard_Integer Jndex,
if (tolu>tolv) ratio=tolu/tolv; if (tolu>tolv) ratio=tolu/tolv;
else ratio=tolv/tolu; else ratio=tolv/tolu;
// dans le cas d'une arete de couture on recadre les parametres // in case of a sewing edge the parameters are reframed
if (couture) { if (couture) {
Standard_Boolean PI1=Standard_False, PI2=Standard_False; Standard_Boolean PI1=Standard_False, PI2=Standard_False;
Standard_Real xx; Standard_Real xx;
@ -2257,7 +2252,7 @@ void ChFi3d_Builder::PerformMoreThreeCorner(const Standard_Integer Jndex,
Standard_Real l0 = sqrt(xdir*xdir+ ydir*ydir ); Standard_Real l0 = sqrt(xdir*xdir+ ydir*ydir );
if (l0<1.e-7|| ponctuel.Value(ic)) { if (l0<1.e-7|| ponctuel.Value(ic)) {
// raccord inutile // unused connection
n3d--; n3d--;
ponctuel.SetValue(ic,Standard_True); ponctuel.SetValue(ic,Standard_True);
if (!deuxconges) { if (!deuxconges) {
@ -2271,13 +2266,13 @@ void ChFi3d_Builder::PerformMoreThreeCorner(const Standard_Integer Jndex,
} }
} }
} }
else { // le raccord est soit une droite soit une projection soit un batten else { // the connection is a straight line, projection or batten
if (ratio>10 && nconges==1) raccordbatten=Standard_True; if (ratio>10 && nconges==1) raccordbatten=Standard_True;
if (ratio>10 && raccordbatten) { if (ratio>10 && raccordbatten) {
CalculDroite(p2d1,xdir,ydir,pcurve); CalculDroite(p2d1,xdir,ydir,pcurve);
raccordbatten=Standard_False; raccordbatten=Standard_False;
} }
else if (!raccordbatten){ // on recupere les courbes projetees else if (!raccordbatten){ // the projected curves are returned
if (regul.Value(ic)) { if (regul.Value(ic)) {
if (cproj2.Value(ic).IsNull()){ if (cproj2.Value(ic).IsNull()){
raccordbatten=Standard_True; raccordbatten=Standard_True;
@ -2304,7 +2299,7 @@ void ChFi3d_Builder::PerformMoreThreeCorner(const Standard_Integer Jndex,
contraint2=Standard_True; contraint2=Standard_True;
if (raccordbatten) { if (raccordbatten) {
#ifdef DEB #ifdef DEB
ChFi3d_InitChron(ch);// init performances pour les batten ChFi3d_InitChron(ch);// initial performances for battens
#endif #endif
Standard_Boolean inverseic,inverseicplus; Standard_Boolean inverseic,inverseicplus;
if (sharp.Value(ic)) { if (sharp.Value(ic)) {
@ -2330,17 +2325,17 @@ void ChFi3d_Builder::PerformMoreThreeCorner(const Standard_Integer Jndex,
CalculBatten(Asurf,TopoDS::Face(Fvive(ic,icplus)),xdir,ydir,p2d1,p2d2,contraint1,contraint2,curv2d1,curv2d2,p.Value(ic,icplus), CalculBatten(Asurf,TopoDS::Face(Fvive(ic,icplus)),xdir,ydir,p2d1,p2d2,contraint1,contraint2,curv2d1,curv2d2,p.Value(ic,icplus),
p.Value(icplus,ic),inverseic,inverseicplus,pcurve); p.Value(icplus,ic),inverseic,inverseicplus,pcurve);
#ifdef DEB #ifdef DEB
ChFi3d_ResultChron( ch,t_batten); // result performances pour les batten ChFi3d_ResultChron( ch,t_batten); // resulting performances for battens
#endif #endif
} }
// construction des frontieres pour Plate // construction of borders for Plate
Handle (Geom2dAdaptor_HCurve) Acurv=new Geom2dAdaptor_HCurve(pcurve); Handle (Geom2dAdaptor_HCurve) Acurv=new Geom2dAdaptor_HCurve(pcurve);
Adaptor3d_CurveOnSurface CurvOnS (Acurv,Asurf); Adaptor3d_CurveOnSurface CurvOnS (Acurv,Asurf);
Handle(Adaptor3d_HCurveOnSurface) HCons = Handle(Adaptor3d_HCurveOnSurface) HCons =
new Adaptor3d_HCurveOnSurface(CurvOnS); new Adaptor3d_HCurveOnSurface(CurvOnS);
// on met des contraintes G1 si les aretes ic et icplus ne sont pas toutes les deux vives // constraints G1 are set if edges ic and icplus are not both alive
Order.SetValue(n3d,0); Order.SetValue(n3d,0);
@ -2358,7 +2353,7 @@ void ChFi3d_Builder::PerformMoreThreeCorner(const Standard_Integer Jndex,
new GeomPlate_CurveConstraint(HCons,Order.Value(n3d),10,tolesp,angular,0.1); new GeomPlate_CurveConstraint(HCons,Order.Value(n3d),10,tolesp,angular,0.1);
PSurf.Add(Cont); PSurf.Add(Cont);
//calcul de la courbe 3d si ce n'est pas une projection //calculation of curve 3d if it is not a projection
if (curveint.IsNull()) { if (curveint.IsNull()) {
GeomLib::BuildCurve3d(tolapp,CurvOnS,CurvOnS.FirstParameter(), GeomLib::BuildCurve3d(tolapp,CurvOnS,CurvOnS.FirstParameter(),
CurvOnS.LastParameter(),Curv3d,maxapp1,avedev); CurvOnS.LastParameter(),Curv3d,maxapp1,avedev);
@ -2367,13 +2362,13 @@ void ChFi3d_Builder::PerformMoreThreeCorner(const Standard_Integer Jndex,
curveint= new Geom_TrimmedCurve(Curv3d,pardeb,parfin); curveint= new Geom_TrimmedCurve(Curv3d,pardeb,parfin);
} }
//stockage dans la DS //storage in the DS
TopOpeBRepDS_Curve tcurv3d( curveint,maxapp1); TopOpeBRepDS_Curve tcurv3d( curveint,maxapp1);
indcurve3d.SetValue(n3d, DStr.AddCurve(tcurv3d)); indcurve3d.SetValue(n3d, DStr.AddCurve(tcurv3d));
pardeb=curveint->FirstParameter(); pardeb=curveint->FirstParameter();
parfin=curveint->LastParameter(); parfin=curveint->LastParameter();
if ( sharp.Value(icplus) && indpoint.Value(icplus,0) == 0) { if ( sharp.Value(icplus) && indpoint.Value(icplus,0) == 0) {
// il faut initialiser indpoint[icplus][0] et indpoint[icplus][1] // it is necessary to initialize indpoint[icplus][0] and indpoint[icplus][1]
gp_Pnt point2; gp_Pnt point2;
point2 =curveint->Value(parfin); point2 =curveint->Value(parfin);
TopOpeBRepDS_Point tpoint2 (point2,maxapp); TopOpeBRepDS_Point tpoint2 (point2,maxapp);
@ -2401,7 +2396,7 @@ void ChFi3d_Builder::PerformMoreThreeCorner(const Standard_Integer Jndex,
tpt2.Tolerance (tpt2.Tolerance()+maxapp1); tpt2.Tolerance (tpt2.Tolerance()+maxapp1);
} }
// calcul de l'orientation de la courbe // calculate orientation of the curve
TopAbs_Orientation orinterf; TopAbs_Orientation orinterf;
if (!sharp.Value(ic)) { if (!sharp.Value(ic)) {
OrientationIcNonVive(CD.Value(ic),jf.Value(ic),i.Value(ic,icplus),sens.Value(ic),orinterf); OrientationIcNonVive(CD.Value(ic),jf.Value(ic),i.Value(ic,icplus),sens.Value(ic),orinterf);
@ -2415,11 +2410,11 @@ void ChFi3d_Builder::PerformMoreThreeCorner(const Standard_Integer Jndex,
Interfc=ChFi3d_FilCurveInDS(indcurve3d.Value(n3d),numfa.Value(ic,icplus),pcurve,orinterf); Interfc=ChFi3d_FilCurveInDS(indcurve3d.Value(n3d),numfa.Value(ic,icplus),pcurve,orinterf);
DStr.ChangeShapeInterferences(numfa.Value(ic,icplus)).Append(Interfc); DStr.ChangeShapeInterferences(numfa.Value(ic,icplus)).Append(Interfc);
} }
} // fin du traitement par arete } // end of processing by edge
} // fin de la boucle sur les aretes } // end of the loop on edges
} // fin du traitement pour les courbes intermediaires } // end of processing for intermediary curves
// stockage dans la DS des courbes projetees sur plusieurs faces // storage in the DS of curves projected on several faces
for (ic=0;ic<nedge;ic++) { for (ic=0;ic<nedge;ic++) {
if (moresurf.Value(ic) ){ if (moresurf.Value(ic) ){
TopoDS_Vertex Vf,Vl; TopoDS_Vertex Vf,Vl;
@ -2495,7 +2490,7 @@ void ChFi3d_Builder::PerformMoreThreeCorner(const Standard_Integer Jndex,
} }
} }
//calcul de l'orientation //calculation of the orientation
TopAbs_Orientation orinterf; TopAbs_Orientation orinterf;
if (P1.Distance(Pcom)>1.e-4) { if (P1.Distance(Pcom)>1.e-4) {
if (orvt==TopAbs_FORWARD) { if (orvt==TopAbs_FORWARD) {
@ -2529,7 +2524,7 @@ void ChFi3d_Builder::PerformMoreThreeCorner(const Standard_Integer Jndex,
} }
} }
// cas ou les deux bords libres sont tangents // case when two free borders are tangent
if (droit) if (droit)
for (ic=0;ic<nedge;ic++) { for (ic=0;ic<nedge;ic++) {
Handle(Geom_Curve) curve,ctrim,rcurve; Handle(Geom_Curve) curve,ctrim,rcurve;
@ -2602,19 +2597,19 @@ void ChFi3d_Builder::PerformMoreThreeCorner(const Standard_Integer Jndex,
} }
#ifdef DEB #ifdef DEB
ChFi3d_InitChron(ch); // init performances pour plate ChFi3d_InitChron(ch); // init performances for plate
#endif #endif
PSurf.Perform(); PSurf.Perform();
#ifdef DEB #ifdef DEB
ChFi3d_ResultChron(ch, t_plate); //result performances pour plate ChFi3d_ResultChron(ch, t_plate); //result performances for plate
#endif #endif
// appel a l'approx // call of approx
#ifdef DEB #ifdef DEB
ChFi3d_InitChron(ch); // init performances pour approxplate ChFi3d_InitChron(ch); // init performances for approxplate
#endif #endif
if (PSurf.IsDone()) { if (PSurf.IsDone()) {
Standard_Integer nbcarreau=9; Standard_Integer nbcarreau=9;
@ -2636,10 +2631,10 @@ void ChFi3d_Builder::PerformMoreThreeCorner(const Standard_Integer Jndex,
apperror=Mapp.CriterionError()*coef; apperror=Mapp.CriterionError()*coef;
#ifdef DEB #ifdef DEB
ChFi3d_ResultChron(ch, t_approxplate); // result performances pour approxplate ChFi3d_ResultChron(ch, t_approxplate); // result performances for approxplate
#endif #endif
// Stockage de la surface plate et des courbes correspondantes dans la DS // Storage of the surface plate and corresponding curves in the DS
TopAbs_Orientation orplate,orsurfdata,orpcurve,orien; TopAbs_Orientation orplate,orsurfdata,orpcurve,orien;
#ifdef DEB #ifdef DEB
@ -2664,9 +2659,9 @@ void ChFi3d_Builder::PerformMoreThreeCorner(const Standard_Integer Jndex,
TopOpeBRepDS_ListOfInterference& SolidInterfs = TopOpeBRepDS_ListOfInterference& SolidInterfs =
DStr.ChangeShapeInterferences(SolInd); DStr.ChangeShapeInterferences(SolInd);
// dans le cas ou l'on relie au sommet , il faut que les // in case when one rereads at top, it is necessary that
// aretes vives qui arrivent au sommet soient enlevees de la DS. // alive edges that arrive at the top should be removed from the DS.
// Pour cela on les stocke dans la DS avec leur orientation inverse // For this they are stored in the DS with their inverted orientation
Standard_Integer nbedge; Standard_Integer nbedge;
TopExp_Explorer ex; TopExp_Explorer ex;
if (deuxconges) if (deuxconges)
@ -2699,8 +2694,8 @@ void ChFi3d_Builder::PerformMoreThreeCorner(const Standard_Integer Jndex,
} }
} }
// calcul de l'orientation de Plate orplate par rapport aux surfdata // calculate orientation of Plate orplate corresponding to surfdata
// on fait le calcul par rapport a la premiere la stripe // calculation corresponding to the first stripe
Indices(nedge,0,icplus,icmoins); Indices(nedge,0,icplus,icmoins);
isfirst=(sens.Value(0)==1); isfirst=(sens.Value(0)==1);
const Handle(ChFiDS_SurfData)& Fd = const Handle(ChFiDS_SurfData)& Fd =
@ -2723,7 +2718,7 @@ void ChFi3d_Builder::PerformMoreThreeCorner(const Standard_Integer Jndex,
// else orplate=TopAbs::Reverse(orsurfdata); // else orplate=TopAbs::Reverse(orsurfdata);
orplate = PlateOrientation(Surf,PSurf.Curves2d(),SumFaceNormalAtV1); orplate = PlateOrientation(Surf,PSurf.Curves2d(),SumFaceNormalAtV1);
// creation de la solidinterderence pour Plate // creation of solidinterderence for Plate
Handle(TopOpeBRepDS_SolidSurfaceInterference) SSI = Handle(TopOpeBRepDS_SolidSurfaceInterference) SSI =
new TopOpeBRepDS_SolidSurfaceInterference(TopOpeBRepDS_Transition(orplate), new TopOpeBRepDS_SolidSurfaceInterference(TopOpeBRepDS_Transition(orplate),
TopOpeBRepDS_SOLID, TopOpeBRepDS_SOLID,
@ -2732,9 +2727,9 @@ void ChFi3d_Builder::PerformMoreThreeCorner(const Standard_Integer Jndex,
Isurf); Isurf);
SolidInterfs.Append(SSI); SolidInterfs.Append(SSI);
// calcul de l'orientation orien des pcurves de Plate // calculate orientation orien of pcurves of Plate
// les courbes allant de ic a icplus les pcurves de Plate // the curves from ic to icplus the pcurves of Plate
// ont toutes la meme orientation // all have the same orientation
Standard_Integer Ishape1,Ishape2; Standard_Integer Ishape1,Ishape2;
#ifndef DEB #ifndef DEB
TopAbs_Orientation trafil1 = TopAbs_FORWARD, trafil2 = TopAbs_FORWARD; TopAbs_Orientation trafil1 = TopAbs_FORWARD, trafil2 = TopAbs_FORWARD;
@ -2822,7 +2817,7 @@ void ChFi3d_Builder::PerformMoreThreeCorner(const Standard_Integer Jndex,
Indices(nedge,ic,icplus,icmoins); Indices(nedge,ic,icplus,icmoins);
isfirst=(sens.Value(ic)==1); isfirst=(sens.Value(ic)==1);
// calcul des curves interference relatives aux stripes // calculate curves interference relative to stripes
apperror=Mapp.CriterionError()*coef; apperror=Mapp.CriterionError()*coef;
pardeb=CD.Value(ic)->PCurve(isfirst)->FirstParameter(); pardeb=CD.Value(ic)->PCurve(isfirst)->FirstParameter();
@ -2842,7 +2837,7 @@ void ChFi3d_Builder::PerformMoreThreeCorner(const Standard_Integer Jndex,
tpt1.Tolerance (tpt1.Tolerance()+apperror); tpt1.Tolerance (tpt1.Tolerance()+apperror);
tpt2.Tolerance (tpt2.Tolerance()+apperror ); tpt2.Tolerance (tpt2.Tolerance()+apperror );
// calcul de la surfaceinterference // calculate surfaceinterference
Interfc=ChFi3d_FilCurveInDS(indcurve3d.Value(n3d),Isurf, Interfc=ChFi3d_FilCurveInDS(indcurve3d.Value(n3d),Isurf,
PSurf.Curves2d()->Value(n3d),orien); PSurf.Curves2d()->Value(n3d),orien);
DStr.ChangeSurfaceInterferences(Isurf).Append(Interfc); DStr.ChangeSurfaceInterferences(Isurf).Append(Interfc);
@ -2854,13 +2849,13 @@ void ChFi3d_Builder::PerformMoreThreeCorner(const Standard_Integer Jndex,
} }
} }
// stockages des courbes de raccords // storage of connection curves
for (ic=0; ic<nedge;ic++) { for (ic=0; ic<nedge;ic++) {
Indices(nedge,ic,icplus,icmoins); Indices(nedge,ic,icplus,icmoins);
if (!oksea.Value(ic)) { if (!oksea.Value(ic)) {
if (sharp.Value(ic) &&!deuxconges) { if (sharp.Value(ic) &&!deuxconges) {
// limitation de l'arete vive // limitation of the alive edge
TopAbs_Orientation ori; TopAbs_Orientation ori;
gp_Pnt Pf,Pl,sommet1; gp_Pnt Pf,Pl,sommet1;
TopoDS_Vertex Vd = TopExp::FirstVertex(TopoDS::Edge(Evive.Value(ic))); TopoDS_Vertex Vd = TopExp::FirstVertex(TopoDS::Edge(Evive.Value(ic)));
@ -2878,7 +2873,7 @@ void ChFi3d_Builder::PerformMoreThreeCorner(const Standard_Integer Jndex,
} }
if (!ponctuel.Value(ic) && !libre.Value(ic)) { if (!ponctuel.Value(ic) && !libre.Value(ic)) {
// raccord effectif // actual connection
if (!moresurf.Value(ic)){ if (!moresurf.Value(ic)){
n3d++; n3d++;
TopOpeBRepDS_Curve& tcourb1 = DStr.ChangeCurve(indcurve3d.Value(n3d)); TopOpeBRepDS_Curve& tcourb1 = DStr.ChangeCurve(indcurve3d.Value(n3d));
@ -2903,7 +2898,7 @@ void ChFi3d_Builder::PerformMoreThreeCorner(const Standard_Integer Jndex,
} }
} }
//stockage des courbes projetees sur plusieurs faces //storage of curves projected on several faces
for (ic=0; ic<nedge;ic++) { for (ic=0; ic<nedge;ic++) {
Indices(nedge,ic,icplus,icmoins); Indices(nedge,ic,icplus,icmoins);
if (moresurf(ic)) if (moresurf(ic))
@ -2929,7 +2924,7 @@ void ChFi3d_Builder::PerformMoreThreeCorner(const Standard_Integer Jndex,
} }
} }
// stockage des courbes dans le cas de bords libres tangents // storage of curves in case of tangent free borders
if (droit) if (droit)
for (ic=0; ic<nedge;ic++) { for (ic=0; ic<nedge;ic++) {
Indices(nedge,ic,icplus,icmoins); Indices(nedge,ic,icplus,icmoins);
@ -2945,14 +2940,14 @@ void ChFi3d_Builder::PerformMoreThreeCorner(const Standard_Integer Jndex,
} }
} }
} }
else { // il n'y a qu'un resultat partiel else { // there is only one partial result
done=Standard_False; done=Standard_False;
hasresult=Standard_True; hasresult=Standard_True;
for (ic=0; ic<nedge;ic++) { for (ic=0; ic<nedge;ic++) {
Indices(nedge,ic,icplus,icmoins); Indices(nedge,ic,icplus,icmoins);
if (!oksea.Value(ic)) { if (!oksea.Value(ic)) {
if (sharp.Value(ic) &&!deuxconges) { if (sharp.Value(ic) &&!deuxconges) {
// limitation de l'arete vive // limitation of the alive edge
TopAbs_Orientation ori; TopAbs_Orientation ori;
gp_Pnt Pf,Pl,sommet1; gp_Pnt Pf,Pl,sommet1;
TopoDS_Vertex Vd = TopExp::FirstVertex(TopoDS::Edge(Evive.Value(ic))); TopoDS_Vertex Vd = TopExp::FirstVertex(TopoDS::Edge(Evive.Value(ic)));

94
src/ChFi3d/ChFi3d_Builder_SpKP.cxx
View File

@ -57,7 +57,7 @@ extern void ChFi3d_CheckSurfData(const TopOpeBRepDS_DataStructure& DStr,
#endif #endif
//======================================================================= //=======================================================================
//function : CompTra //function : CompTra
//purpose : Calcule la Transition d'un point de debut. //purpose : Calculate the Transition from start point.
//======================================================================= //=======================================================================
static TopAbs_Orientation CompTra (const TopAbs_Orientation O1, static TopAbs_Orientation CompTra (const TopAbs_Orientation O1,
@ -71,7 +71,7 @@ static TopAbs_Orientation CompTra (const TopAbs_Orientation O1,
//======================================================================= //=======================================================================
//function : CompCommonpoint //function : CompCommonpoint
//purpose : Remplit le commonpoint dans le cas d un vertex. //purpose : Fill the commonpoint in case of a vertex.
//======================================================================= //=======================================================================
static void CompCommonPoint (ChFiDS_CommonPoint& FilPoint, static void CompCommonPoint (ChFiDS_CommonPoint& FilPoint,
@ -95,8 +95,7 @@ static void CompCommonPoint (ChFiDS_CommonPoint& FilPoint,
//======================================================================= //=======================================================================
//function : CpInterf //function : CpInterf
//purpose : Construit une nouvelle SurfData partageant les faces, //purpose : Construct new SurfData sharing faces, surface and curves.
// la surface et les courbes.
//======================================================================= //=======================================================================
static ChFiDS_FaceInterference CpInterf (TopOpeBRepDS_DataStructure& DStr, static ChFiDS_FaceInterference CpInterf (TopOpeBRepDS_DataStructure& DStr,
@ -121,8 +120,7 @@ static ChFiDS_FaceInterference CpInterf (TopOpeBRepDS_DataStructure& DStr,
//======================================================================= //=======================================================================
//function : CpSD //function : CpSD
//purpose : Construit une nouvelle SurfData partageant les faces, //purpose : Construct new SurfData sharing faces, surface and curves.
// la surface et les courbes.
//======================================================================= //=======================================================================
static Handle(ChFiDS_SurfData) CpSD ( TopOpeBRepDS_DataStructure& DStr, static Handle(ChFiDS_SurfData) CpSD ( TopOpeBRepDS_DataStructure& DStr,
@ -185,7 +183,7 @@ static Standard_Real ComputeAbscissa(const BRepAdaptor_Curve& C,
default: default:
return 0; return 0;
} }
Standard_NotImplemented::Raise("calcul abscisse non traite "); Standard_NotImplemented::Raise("calculate abscisse non-processed");
return 0.; return 0.;
} }
@ -215,7 +213,7 @@ static Standard_Real ParamOnSpine(const TopOpeBRepDS_DataStructure& DStr,
return Nl; return Nl;
} }
else { else {
//construction du plan contenant la section de CD au parametre ptg. //construction of the plane containing the section of CD with parameter ptg.
gp_Pnt PP; gp_Pnt PP;
gp_Vec VV; gp_Vec VV;
Handle(Geom_Curve) c3d; Handle(Geom_Curve) c3d;
@ -232,7 +230,7 @@ static Standard_Real ParamOnSpine(const TopOpeBRepDS_DataStructure& DStr,
Handle(GeomAdaptor_HSurface) Handle(GeomAdaptor_HSurface)
plan = new GeomAdaptor_HSurface(GeomAdaptor_Surface(pln)); plan = new GeomAdaptor_HSurface(GeomAdaptor_Surface(pln));
// intersection plan spine. // intersection plane spine.
Standard_Boolean found = Standard_False; Standard_Boolean found = Standard_False;
Standard_Boolean fini = Standard_False; Standard_Boolean fini = Standard_False;
Standard_Integer sens = 1; Standard_Integer sens = 1;
@ -322,7 +320,7 @@ void ChFi3d_Builder::Trunc(const Handle(ChFiDS_SurfData)& SD,
const Standard_Integer cntlFiOnS) const Standard_Integer cntlFiOnS)
{ {
TopOpeBRepDS_DataStructure& DStr = myDS->ChangeDS(); TopOpeBRepDS_DataStructure& DStr = myDS->ChangeDS();
//On recupere points et tangentes sur edge et spine. // Return points and tangents on edge and spine.
Standard_Real wtg = SD->InterferenceOnS1().Parameter(isfirst); Standard_Real wtg = SD->InterferenceOnS1().Parameter(isfirst);
Standard_Boolean bid; Standard_Boolean bid;
Standard_Real wsp = ParamOnSpine(DStr,wtg,SD,Spine,iedge,0,0,tolesp,bid); Standard_Real wsp = ParamOnSpine(DStr,wtg,SD,Spine,iedge,0,0,tolesp,bid);
@ -332,7 +330,7 @@ void ChFi3d_Builder::Trunc(const Handle(ChFiDS_SurfData)& SD,
const BRepAdaptor_Curve& bc = Spine->CurrentElementarySpine(iedge); const BRepAdaptor_Curve& bc = Spine->CurrentElementarySpine(iedge);
//Modif contre Vertex isole sur spine //Modif against Vertex isolated on spine
TopoDS_Edge support = bc.Edge(); TopoDS_Edge support = bc.Edge();
TopExp::Vertices(support,bout1,bout2); TopExp::Vertices(support,bout1,bout2);
if (support.Orientation() == TopAbs_REVERSED) { if (support.Orientation() == TopAbs_REVERSED) {
@ -383,7 +381,7 @@ void ChFi3d_Builder::Trunc(const Handle(ChFiDS_SurfData)& SD,
} }
} }
} }
//modif de lvt contre vertex isole //modification of lvt against isolated vertex
if(!tron && YaUnVoisin(Spine,iedge,ivois,isfirst)) { if(!tron && YaUnVoisin(Spine,iedge,ivois,isfirst)) {
TopTools_ListIteratorOfListOfShape It; TopTools_ListIteratorOfListOfShape It;
Standard_Integer nbed = -2; Standard_Integer nbed = -2;
@ -503,7 +501,7 @@ static Standard_Boolean Tri(const Geom2dHatch_Hatcher& H,
if (iSansFirst != 0) { if (iSansFirst != 0) {
if (iSansLast == 0) { if (iSansLast == 0) {
#ifdef DEB #ifdef DEB
cout<<"Tri : Pb de Hatcher"<<endl; cout<<"Parsing : Pb of Hatcher"<<endl;
#endif #endif
return 0; return 0;
} }
@ -561,7 +559,7 @@ static void FillSD (TopOpeBRepDS_DataStructure& DStr,
CD->ChangeVertex(isFirst,ons).SetPoint(Surf->Value(x,y)); CD->ChangeVertex(isFirst,ons).SetPoint(Surf->Value(x,y));
} }
else { else {
//Modification pour tromper les vertex deja existants //Modification to find already existing vertexes
Standard_Integer LeType = 1; Standard_Integer LeType = 1;
Standard_Integer NbInt = pPH->NbPoints(); Standard_Integer NbInt = pPH->NbPoints();
if (NbInt>1) { if (NbInt>1) {
@ -626,8 +624,7 @@ static void FillSD (TopOpeBRepDS_DataStructure& DStr,
//======================================================================= //=======================================================================
//function : SplitKPart //function : SplitKPart
//purpose : Reconstitue les SurfData en fonction des restrictions //purpose : Reconstruct SurfData depending on restrictions of faces.
// des faces.
//======================================================================= //=======================================================================
Standard_Boolean ChFi3d_Builder::SplitKPart Standard_Boolean ChFi3d_Builder::SplitKPart
@ -642,7 +639,7 @@ Standard_Boolean ChFi3d_Builder::SplitKPart
Standard_Boolean& intf, Standard_Boolean& intf,
Standard_Boolean& intl) Standard_Boolean& intl)
{ {
//On lance le hachurage de chacune des faces par les lignes de tangence. //The the hatching of each faces is started by tangency lines.
Standard_Real pitol = Precision::PIntersection(); Standard_Real pitol = Precision::PIntersection();
@ -654,7 +651,7 @@ Standard_Boolean ChFi3d_Builder::SplitKPart
#endif #endif
Standard_Integer Nb1 = 1,Nb2 = 1; Standard_Integer Nb1 = 1,Nb2 = 1;
// Decoupe des lignes de tangence (hachurage). // Cutting of tangency lines (hatching).
Geom2dHatch_Intersector Inter(pitol,pitol); Geom2dHatch_Intersector Inter(pitol,pitol);
Geom2dHatch_Hatcher H1(Inter,tol2d,tolesp), H2(Inter,tol2d,tolesp); Geom2dHatch_Hatcher H1(Inter,tol2d,tolesp), H2(Inter,tol2d,tolesp);
Standard_Integer ie; Standard_Integer ie;
@ -678,7 +675,7 @@ Standard_Boolean ChFi3d_Builder::SplitKPart
Nb1 = H1.NbDomains(iH1); Nb1 = H1.NbDomains(iH1);
if(Nb1 == 0) { if(Nb1 == 0) {
#ifdef DEB #ifdef DEB
cout<<"SplitKPart : ligne de tangence en dehors de la face"<<endl; cout<<"SplitKPart : tangency line out of the face"<<endl;
#endif #endif
return Standard_False; return Standard_False;
} }
@ -704,13 +701,13 @@ Standard_Boolean ChFi3d_Builder::SplitKPart
Nb2 = H2.NbDomains(iH2); Nb2 = H2.NbDomains(iH2);
if(Nb2 == 0) { if(Nb2 == 0) {
#ifdef DEB #ifdef DEB
cout<<"SplitKPart : ligne de tangence en dehors de la face"<<endl; cout<<"SplitKPart : tangency line out of the face"<<endl;
#endif #endif
return Standard_False; return Standard_False;
} }
} }
//Recuperation des vertex deb et fin de Spine //Return start and end vertexes of the Spine
TopoDS_Vertex bout1,bout2,boutemp; TopoDS_Vertex bout1,bout2,boutemp;
const BRepAdaptor_Curve& bc = Spine->CurrentElementarySpine(Iedge); const BRepAdaptor_Curve& bc = Spine->CurrentElementarySpine(Iedge);
TopoDS_Edge support = bc.Edge(); TopoDS_Edge support = bc.Edge();
@ -721,7 +718,7 @@ Standard_Boolean ChFi3d_Builder::SplitKPart
bout1 = boutemp; bout1 = boutemp;
} }
// Recuperation des faces. // Return faces.
TopoDS_Face F1, F2; TopoDS_Face F1, F2;
Handle(BRepAdaptor_HSurface) Handle(BRepAdaptor_HSurface)
bhs = Handle(BRepAdaptor_HSurface)::DownCast(S1); bhs = Handle(BRepAdaptor_HSurface)::DownCast(S1);
@ -730,7 +727,7 @@ Standard_Boolean ChFi3d_Builder::SplitKPart
if(!bhs.IsNull()) F2 = bhs->ChangeSurface().Face(); if(!bhs.IsNull()) F2 = bhs->ChangeSurface().Face();
TopoDS_Face FBID; TopoDS_Face FBID;
// Restriction des SurfDatas par les lignes decoupees. // Restriction of SurfDatas by cut lines.
TopOpeBRepDS_DataStructure& DStr = myDS->ChangeDS(); TopOpeBRepDS_DataStructure& DStr = myDS->ChangeDS();
Handle(ChFiDS_SurfData) CD = Data; Handle(ChFiDS_SurfData) CD = Data;
CD->ChangeIndexOfS1(DStr.AddShape(F1)); CD->ChangeIndexOfS1(DStr.AddShape(F1));
@ -746,22 +743,21 @@ Standard_Boolean ChFi3d_Builder::SplitKPart
if (C1.IsNull() && C2.IsNull()) { if (C1.IsNull() && C2.IsNull()) {
#ifdef DEB #ifdef DEB
cout<<"SplitData : 2 lignes nulles hachurage impossible"<<endl; cout<<"SplitData : 2 zero lines hatching impossible"<<endl;
#endif #endif
return Standard_False; return Standard_False;
} }
else if (C1.IsNull() || (Nb1 == 1 && !H1.Domain(iH1,1).HasFirstPoint())) { else if (C1.IsNull() || (Nb1 == 1 && !H1.Domain(iH1,1).HasFirstPoint())) {
// On verifie que le point 2d de l arete degeneree est bien dans // It is checked if the point 2d of the degenerated edge is in the face.
// la face.
if (C1.IsNull()) { if (C1.IsNull()) {
gp_Pnt2d p2d1 = CD->Get2dPoints(0,1); gp_Pnt2d p2d1 = CD->Get2dPoints(0,1);
TopAbs_State situ = I1->Classify(p2d1,1.e-8,0); TopAbs_State situ = I1->Classify(p2d1,1.e-8,0);
if(situ == TopAbs_OUT) return Standard_False; if(situ == TopAbs_OUT) return Standard_False;
} }
// Tri des domaines par parametres croissants, // Parsing of domains by increasing parameters,
if(!Tri(H2,iH2,Ind2,wref,0.,pitol,Nb2)) return 0; if(!Tri(H2,iH2,Ind2,wref,0.,pitol,Nb2)) return 0;
// Remplissage des SurfData // Filling of SurfData
for(Standard_Integer i = 1; i <= Nb2; i++) { for(Standard_Integer i = 1; i <= Nb2; i++) {
const HatchGen_Domain& Dom2 = H2.Domain(iH2,Ind2(i)); const HatchGen_Domain& Dom2 = H2.Domain(iH2,Ind2(i));
FillSD(DStr,CD,M2,Dom2,Dom2.FirstPoint().Parameter(),1,2,pitol,bout1); FillSD(DStr,CD,M2,Dom2,Dom2.FirstPoint().Parameter(),1,2,pitol,bout1);
@ -787,17 +783,16 @@ Standard_Boolean ChFi3d_Builder::SplitKPart
} }
} }
else if (C2.IsNull() || (Nb2 == 1 && !H2.Domain(iH2,1).HasFirstPoint())) { else if (C2.IsNull() || (Nb2 == 1 && !H2.Domain(iH2,1).HasFirstPoint())) {
// On verifie que le point 2d de l arete degeneree est bien dans // It is checked if the point 2d of the degenerated is in the face.
// la face.
if (C2.IsNull()) { if (C2.IsNull()) {
gp_Pnt2d p2d2 = CD->Get2dPoints(0,2); gp_Pnt2d p2d2 = CD->Get2dPoints(0,2);
TopAbs_State situ = I2->Classify(p2d2,1.e-8,0); TopAbs_State situ = I2->Classify(p2d2,1.e-8,0);
if(situ == TopAbs_OUT) return Standard_False; if(situ == TopAbs_OUT) return Standard_False;
} }
// Tri des domaines par parametres croissants, // Parsing of domains by increasing parameters,
if(!Tri(H1,iH1,Ind1,wref,0.,pitol,Nb1)) return 0; if(!Tri(H1,iH1,Ind1,wref,0.,pitol,Nb1)) return 0;
// Remplissage des SurfData // Filling of SurfData
for(Standard_Integer i = 1; i <= Nb1; i++) { for(Standard_Integer i = 1; i <= Nb1; i++) {
const HatchGen_Domain& Dom1 = H1.Domain(iH1,Ind1(i)); const HatchGen_Domain& Dom1 = H1.Domain(iH1,Ind1(i));
FillSD(DStr,CD,M1,Dom1,Dom1.FirstPoint().Parameter(),1,1,pitol,bout1); FillSD(DStr,CD,M1,Dom1,Dom1.FirstPoint().Parameter(),1,1,pitol,bout1);
@ -824,9 +819,8 @@ Standard_Boolean ChFi3d_Builder::SplitKPart
} }
else { else {
// Tri des domaines par parametres croissants, // Parsing of domains by increasing parameters,
// lorsqu il y a un cercle 2d sur un plan, on // if there is a 2d circle on a plane, one goes on 2D line of opposite face.
// se cale sur la ligne 2d d en face.
Standard_Real period1 = 0., period2 = 0.; Standard_Real period1 = 0., period2 = 0.;
if(ll1.IsPeriodic()) { if(ll1.IsPeriodic()) {
if(!Tri(H2,iH2,Ind2,wref,0.,pitol,Nb2)) return 0; if(!Tri(H2,iH2,Ind2,wref,0.,pitol,Nb2)) return 0;
@ -840,7 +834,7 @@ Standard_Boolean ChFi3d_Builder::SplitKPart
} }
// Remplissage des SurfData // Filling of SurfData
TColStd_SequenceOfInteger ion1, ion2; TColStd_SequenceOfInteger ion1, ion2;
for(Standard_Integer i = 1; i <= Nb1; i++) { for(Standard_Integer i = 1; i <= Nb1; i++) {
const HatchGen_Domain& Dom1 = H1.Domain(iH1,Ind1(i)); const HatchGen_Domain& Dom1 = H1.Domain(iH1,Ind1(i));
@ -878,15 +872,15 @@ Standard_Boolean ChFi3d_Builder::SplitKPart
} }
} }
// Traitement des prolongements. // Processing of extensions.
// Ne pas tronquer, sinon, pb d'intersection pour les PerformCorner // Do not truncate, otherwise, problems of intersection for PerformCorner
// ----------------------------------------------------------------- // -----------------------------------------------------------------
// A l'appel de SplitKPart dans PerformSetOfKPart, les spines ont ete // After call of SplitKPart in PerformSetOfKPart, spines have been
// justement, prolongees aux extremites par les methodes Extent pour permettre // extended to the extremities by methods Extent to permit
// les intersections. On conserve les extensions des SurfData. // intersections. Extensions of SurfData are preserved.
if(intf) { if(intf) {
// On est en debut de spine // We are at the beginning of the spine
//------------------------- //-------------------------
Standard_Integer ifirst = 0; Standard_Integer ifirst = 0;
Standard_Real dist = RealLast(), ptg, dsp; Standard_Real dist = RealLast(), ptg, dsp;
@ -978,7 +972,7 @@ Standard_Boolean ChFi3d_Builder::SplitKPart
} }
} }
if(intl) { if(intl) {
// on est en fin de spine // we are at the end of the spine
//----------------------- //-----------------------
Standard_Integer ilast = 0; Standard_Integer ilast = 0;
Standard_Real dist = RealLast(), ptg, dsp; Standard_Real dist = RealLast(), ptg, dsp;
@ -1075,7 +1069,7 @@ Standard_Boolean ChFi3d_Builder::SplitKPart
} }
if(!intf) { if(!intf) {
// On vire les SurfData entierement avant le debut de l'arete. // SurfData are entirely suspended before the beginning of the edge.
Standard_Boolean okdoc = SetData.IsEmpty(); Standard_Boolean okdoc = SetData.IsEmpty();
Standard_Integer i = 1; Standard_Integer i = 1;
while(!okdoc) { while(!okdoc) {
@ -1088,7 +1082,7 @@ Standard_Boolean ChFi3d_Builder::SplitKPart
} }
} }
if(!intl) { if(!intl) {
// On vire les SurfData entierement apres la fin de l'arete. // SurfData are entirely suspended after the end of the edge.
Standard_Boolean okdoc = SetData.IsEmpty(); Standard_Boolean okdoc = SetData.IsEmpty();
Standard_Integer i = 1; Standard_Integer i = 1;
while(!okdoc) { while(!okdoc) {
@ -1102,7 +1096,7 @@ Standard_Boolean ChFi3d_Builder::SplitKPart
okdoc = (SetData.IsEmpty() || i > SetData.Length()); okdoc = (SetData.IsEmpty() || i > SetData.Length());
} }
} }
// Ajout des parametres de la spine sur les SurfDatas. // Add parameters of the spine on SurfDatas.
// for (Standard_Integer i = 1; i <= SetData.Length(); i++) { // for (Standard_Integer i = 1; i <= SetData.Length(); i++) {
Standard_Integer i; Standard_Integer i;
for ( i = 1; i <= SetData.Length(); i++) { for ( i = 1; i <= SetData.Length(); i++) {
@ -1125,11 +1119,11 @@ Standard_Boolean ChFi3d_Builder::SplitKPart
} }
if (intf && !SetData.IsEmpty()) { if (intf && !SetData.IsEmpty()) {
// prolongement de la spine par extension // extension of the spine
Spine->SetFirstParameter(SetData.First()->FirstSpineParam()); Spine->SetFirstParameter(SetData.First()->FirstSpineParam());
} }
else { else {
// Troncature au debut. // Trnncation at the beginning.
for (i = 1; i <= SetData.Length(); i++) { for (i = 1; i <= SetData.Length(); i++) {
Handle(ChFiDS_SurfData)& CD8 = SetData.ChangeValue(i); Handle(ChFiDS_SurfData)& CD8 = SetData.ChangeValue(i);
Standard_Real fsp = CD8->FirstSpineParam(); Standard_Real fsp = CD8->FirstSpineParam();
@ -1151,11 +1145,11 @@ Standard_Boolean ChFi3d_Builder::SplitKPart
if (intl && !SetData.IsEmpty()) { if (intl && !SetData.IsEmpty()) {
// prolongement de la spine par extension // extension of the spine
Spine->SetLastParameter(SetData.Last()->LastSpineParam()); Spine->SetLastParameter(SetData.Last()->LastSpineParam());
} }
else { else {
// Troncature a la fin. // Truncation at the end.
for (i = SetData.Length(); i >= 1; i--) { for (i = SetData.Length(); i >= 1; i--) {
Handle(ChFiDS_SurfData)& CD9 = SetData.ChangeValue(i); Handle(ChFiDS_SurfData)& CD9 = SetData.ChangeValue(i);
Standard_Real fsp = CD9->FirstSpineParam(); Standard_Real fsp = CD9->FirstSpineParam();

88
src/ChFi3d/ChFi3d_ChBuilder.cxx
View File

@ -80,10 +80,10 @@ void SearchCommonFaces(const ChFiDS_Map& EFMap,
//======================================================================= //=======================================================================
//function : ExtentSpinesOnCommonFace //function : ExtentSpinesOnCommonFace
//purpose : Etend les spines des deux chanfreins de distances dis1,dis2 //purpose : Extend spines of two chamfers by distance dis1,dis2
// sur leur face commune // on their common face
// Les deux lignes guides Spine1 et Spine2 qui se coupent en V // Two guide lines Spine1 and Spine2 cross in V
// isfirst(i) = False si Spine(i) est orientee vers V (i = 1,2) // isfirst(i) = False if Spine(i) is oriented to V (i = 1,2)
//======================================================================= //=======================================================================
void ExtentSpineOnCommonFace(Handle(ChFiDS_Spine)& Spine1, void ExtentSpineOnCommonFace(Handle(ChFiDS_Spine)& Spine1,
@ -96,8 +96,8 @@ void ExtentSpineOnCommonFace(Handle(ChFiDS_Spine)& Spine1,
{ {
Standard_Real tolesp = 1.e-7; Standard_Real tolesp = 1.e-7;
// On determine alpha, l'angle d'ouverture entre les // alpha, the opening angle between two
// tangentes des deux lignes guides en V // tangents of two guidelines in V is found
Standard_Real tga1,tga2; Standard_Real tga1,tga2;
Standard_Real d1plus = 0., d2plus = 0.; Standard_Real d1plus = 0., d2plus = 0.;
@ -129,7 +129,7 @@ void ExtentSpineOnCommonFace(Handle(ChFiDS_Spine)& Spine1,
d2plus = dis2/tga2; d2plus = dis2/tga2;
} }
//on prolonge avec les distances calculees //extension by the calculated distance
if (d1plus > 0.) { if (d1plus > 0.) {
d1plus *= 3.; d1plus *= 3.;
if (isfirst1){ if (isfirst1){
@ -286,7 +286,7 @@ void ChFi3d_ChBuilder::SetDist(const Standard_Real Dis,
} }
else else
Standard_DomainError::Raise("la face n'est commune a aucune des edges du contour"); Standard_DomainError::Raise("the face is not common to any of edges of the contour");
} }
} }
@ -425,7 +425,7 @@ void ChFi3d_ChBuilder::SetDists(const Standard_Real Dis1,
else csp->SetDists(Dis1,Dis2); else csp->SetDists(Dis1,Dis2);
} }
else else
Standard_DomainError::Raise("la face n'est commune a aucune des edges du contour"); Standard_DomainError::Raise("the face is not common to any of edges of the contour");
} }
} }
@ -574,7 +574,7 @@ void ChFi3d_ChBuilder::SetDistAngle(const Standard_Real Dis,
} }
} }
else else
Standard_DomainError::Raise("la face n'est commune a aucune des edges du contour"); Standard_DomainError::Raise("the face is not common to any edges of the contour");
} }
} }
@ -647,11 +647,11 @@ void ChFi3d_ChBuilder::Simulate (const Standard_Integer IC)
#ifdef DEB #ifdef DEB
if(ChFi3d_GettraceCHRON()){ if(ChFi3d_GettraceCHRON()){
simul.Stop(); simul.Stop();
cout<<"Temps total simulation : "; cout<<"Total simulation time : ";
simul.Show(); simul.Show();
cout<<"dont temps construction spine : "; cout<<"Spine construction time : ";
elspine.Show(); elspine.Show();
cout<<"et temps cheminement : "; cout<<"and progression time : ";
chemine.Show(); chemine.Show();
} }
#endif #endif
@ -798,19 +798,19 @@ ChFi3d_ChBuilder::SimulSurf(Handle(ChFiDS_SurfData)& Data,
if (chsp.IsNull()) if (chsp.IsNull())
Standard_ConstructionError::Raise Standard_ConstructionError::Raise
("SimulSurf : la spine n est pas celle d un chanfrein"); ("SimulSurf : this is not the spine of a chamfer");
Standard_Real radius; Standard_Real radius;
// Des parametres souples!!! // Flexible parameters!
Standard_Real la = HGuide->LastParameter(), fi = HGuide->FirstParameter(); Standard_Real la = HGuide->LastParameter(), fi = HGuide->FirstParameter();
Standard_Real longueur = la - fi; Standard_Real longueur = la - fi;
Standard_Real MaxStep = longueur * 0.05; Standard_Real MaxStep = longueur * 0.05;
Standard_Real radiusspine = 0, locfleche, w; Standard_Real radiusspine = 0, locfleche, w;
gp_Pnt Pbid; gp_Pnt Pbid;
gp_Vec d1,d2; gp_Vec d1,d2;
// Puisque l ElSpine est parametree par une quasi-abscissecurviligne, // As ElSpine is parameterized by a curvilinear quasi-abscissa,
// on evalue le rayon min par 1/D2 max; // the min radius is estimated as 1/D2 max;
//for(Standard_Integer i = 0; i <= 20; i++){ //for(Standard_Integer i = 0; i <= 20; i++){
Standard_Integer i; Standard_Integer i;
for( i = 0; i <= 20; i++){ for( i = 0; i <= 20; i++){
@ -831,7 +831,7 @@ ChFi3d_ChBuilder::SimulSurf(Handle(ChFiDS_SurfData)& Data,
Standard_Real dis; Standard_Real dis;
chsp->GetDist(dis); chsp->GetDist(dis);
radius = Max(dis, radiusspine); radius = Max(dis, radiusspine);
locfleche = radius*1.e-2; //critere graphique locfleche = radius*1.e-2; //graphic criterion
BRepBlend_Chamfer Func(S1,S2,HGuide); BRepBlend_Chamfer Func(S1,S2,HGuide);
BRepBlend_ChamfInv FInv(S1,S2,HGuide); BRepBlend_ChamfInv FInv(S1,S2,HGuide);
@ -911,7 +911,7 @@ ChFi3d_ChBuilder::SimulSurf(Handle(ChFiDS_SurfData)& Data,
chsp->Dists(dis1, dis2); chsp->Dists(dis1, dis2);
radius = Max(dis1, dis2); radius = Max(dis1, dis2);
radius = Max(radius, radiusspine); radius = Max(radius, radiusspine);
locfleche = radius*1.e-2; //critere graphique locfleche = radius*1.e-2; //graphic criterion
BRepBlend_Chamfer Func(S1,S2,HGuide); BRepBlend_Chamfer Func(S1,S2,HGuide);
BRepBlend_ChamfInv FInv(S1,S2,HGuide); BRepBlend_ChamfInv FInv(S1,S2,HGuide);
@ -992,7 +992,7 @@ ChFi3d_ChBuilder::SimulSurf(Handle(ChFiDS_SurfData)& Data,
chsp->GetDistAngle(dis, angle, disonF1); chsp->GetDistAngle(dis, angle, disonF1);
radius = Max(dis, dis * tan(angle)); radius = Max(dis, dis * tan(angle));
radius = Max(radius, radiusspine); radius = Max(radius, radiusspine);
locfleche = radius*1.e-2; //critere graphique locfleche = radius*1.e-2; //graphic criterion
Standard_Integer Ch = FindChoiceDistAngle(Choix, disonF1); Standard_Integer Ch = FindChoiceDistAngle(Choix, disonF1);
@ -1271,7 +1271,7 @@ Standard_Boolean ChFi3d_ChBuilder::PerformFirstSection
if (chsp.IsNull()) if (chsp.IsNull())
Standard_ConstructionError::Raise Standard_ConstructionError::Raise
("PerformSurf : la spine n est pas celle d un chanfrein"); ("PerformSurf : this is not the spine of a chamfer");
Standard_Real TolGuide = HGuide->Resolution(tolesp) ; Standard_Real TolGuide = HGuide->Resolution(tolesp) ;
@ -1284,7 +1284,7 @@ Standard_Boolean ChFi3d_ChBuilder::PerformFirstSection
Func.Set(dis,dis,Choix); Func.Set(dis,dis,Choix);
BRepBlend_Walking TheWalk(S1,S2,I1,I2); BRepBlend_Walking TheWalk(S1,S2,I1,I2);
//calcul d'une solution de depart approchee //calculate an approximate starting solution
gp_Vec TgF, TgL, tmp1, tmp2, d1gui; gp_Vec TgF, TgL, tmp1, tmp2, d1gui;
gp_Pnt pt1, pt2, ptgui; gp_Pnt pt1, pt2, ptgui;
gp_XYZ temp; gp_XYZ temp;
@ -1341,7 +1341,7 @@ Standard_Boolean ChFi3d_ChBuilder::PerformFirstSection
Func.Set(dis1,dis2,Choix); Func.Set(dis1,dis2,Choix);
BRepBlend_Walking TheWalk(S1,S2,I1,I2); BRepBlend_Walking TheWalk(S1,S2,I1,I2);
//calcul d'une solution de depart approchee //calculate an approximate starting solution
gp_Vec TgF, TgL, tmp1, tmp2, d1gui; gp_Vec TgF, TgL, tmp1, tmp2, d1gui;
gp_Pnt pt1, pt2, ptgui; gp_Pnt pt1, pt2, ptgui;
gp_XYZ temp; gp_XYZ temp;
@ -1402,7 +1402,7 @@ Standard_Boolean ChFi3d_ChBuilder::PerformFirstSection
Func.Set(dis1, angle, Ch); Func.Set(dis1, angle, Ch);
BRepBlend_Walking TheWalk(S1,S2,I1,I2); BRepBlend_Walking TheWalk(S1,S2,I1,I2);
//calcul d'une solution de depart approchee //calculate an approximate starting solution
gp_Vec TgF, TgL, tmp1, tmp2, d1gui; gp_Vec TgF, TgL, tmp1, tmp2, d1gui;
gp_Pnt pt1, pt2, ptgui; gp_Pnt pt1, pt2, ptgui;
gp_XYZ temp; gp_XYZ temp;
@ -1464,7 +1464,7 @@ Standard_Boolean ChFi3d_ChBuilder::PerformFirstSection
Func.Set(dis1, angle, Ch); Func.Set(dis1, angle, Ch);
BRepBlend_Walking TheWalk(S2,S1,I2,I1); BRepBlend_Walking TheWalk(S2,S1,I2,I1);
//calcul d'une solution de depart approchee //calculate an approximate starting solution
gp_Vec TgF, TgL, tmp1, tmp2, d1gui; gp_Vec TgF, TgL, tmp1, tmp2, d1gui;
gp_Pnt pt1, pt2, ptgui; gp_Pnt pt1, pt2, ptgui;
gp_XYZ temp; gp_XYZ temp;
@ -1573,7 +1573,7 @@ ChFi3d_ChBuilder::PerformSurf(ChFiDS_SequenceOfSurfData& SeqData,
if (chsp.IsNull()) if (chsp.IsNull())
Standard_ConstructionError::Raise Standard_ConstructionError::Raise
("PerformSurf : la spine n est pas celle d un chanfrein"); ("PerformSurf : this is not the spine of a chamfer");
Standard_Boolean gd1,gd2,gf1,gf2; Standard_Boolean gd1,gd2,gf1,gf2;
Handle(BRepBlend_Line) lin; Handle(BRepBlend_Line) lin;
@ -1596,7 +1596,7 @@ ChFi3d_ChBuilder::PerformSurf(ChFiDS_SequenceOfSurfData& SeqData,
gd1,gd2,gf1,gf2,RecOnS1,RecOnS2); gd1,gd2,gf1,gf2,RecOnS1,RecOnS2);
if(!done) return Standard_False; // ratrappage possible PMN 14/05/1998 if(!done) return Standard_False; // ratrappage possible PMN 14/05/1998
done = CompleteData(Data,Func,lin,S1,S2,Or,gd1,gd2,gf1,gf2); done = CompleteData(Data,Func,lin,S1,S2,Or,gd1,gd2,gf1,gf2);
if(!done) Standard_Failure::Raise("PerformSurf : Echec approximation!"); if(!done) Standard_Failure::Raise("PerformSurf : Fail of approximation!");
} }
else if (chsp->IsChamfer() == ChFiDS_TwoDist) { else if (chsp->IsChamfer() == ChFiDS_TwoDist) {
BRepBlend_Chamfer Func(S1,S2,HGuide); BRepBlend_Chamfer Func(S1,S2,HGuide);
@ -1612,7 +1612,7 @@ ChFi3d_ChBuilder::PerformSurf(ChFiDS_SequenceOfSurfData& SeqData,
gd1,gd2,gf1,gf2,RecOnS1,RecOnS2); gd1,gd2,gf1,gf2,RecOnS1,RecOnS2);
if(!done) return Standard_False; // ratrappage possible PMN 14/05/1998 if(!done) return Standard_False; // ratrappage possible PMN 14/05/1998
done = CompleteData(Data,Func,lin,S1,S2,Or,gd1,gd2,gf1,gf2); done = CompleteData(Data,Func,lin,S1,S2,Or,gd1,gd2,gf1,gf2);
if(!done) Standard_Failure::Raise("PerformSurf : Echec approximation!"); if(!done) Standard_Failure::Raise("PerformSurf : Fail of approximation!");
} }
else { else {
Standard_Real d1, angle; Standard_Real d1, angle;
@ -1634,7 +1634,7 @@ ChFi3d_ChBuilder::PerformSurf(ChFiDS_SequenceOfSurfData& SeqData,
if(!done) return Standard_False; // ratrappage possible PMN 14/05/1998 if(!done) return Standard_False; // ratrappage possible PMN 14/05/1998
done = CompleteData(Data,Func,lin,S1,S2,Or,gd1,gd2,gf1,gf2); done = CompleteData(Data,Func,lin,S1,S2,Or,gd1,gd2,gf1,gf2);
if(!done) Standard_Failure::Raise("PerformSurf : Echec approximation!"); if(!done) Standard_Failure::Raise("PerformSurf : Fail of approximation!");
} }
else { else {
Standard_Real Rtemp; Standard_Real Rtemp;
@ -1665,7 +1665,7 @@ ChFi3d_ChBuilder::PerformSurf(ChFiDS_SequenceOfSurfData& SeqData,
Data->ChangeVertexLastOnS2() = tmp; Data->ChangeVertexLastOnS2() = tmp;
if(!done) return Standard_False; // ratrappage possible PMN 14/05/1998 if(!done) return Standard_False; // ratrappage possible PMN 14/05/1998
done = CompleteData(Data,Func,lin,S1,S2,Or2,gd1,gd2,gf1,gf2, Standard_True); done = CompleteData(Data,Func,lin,S1,S2,Or2,gd1,gd2,gf1,gf2, Standard_True);
if(!done) Standard_Failure::Raise("PerformSurf : Echec approximation!"); if(!done) Standard_Failure::Raise("PerformSurf : Fail of approximation!");
} }
} }
@ -1766,7 +1766,7 @@ void ChFi3d_ChBuilder::PerformSurf(ChFiDS_SequenceOfSurfData& ,
//======================================================================= //=======================================================================
//function : ExtentOneCorner //function : ExtentOneCorner
//purpose : extends the spine of the stripe S on the side of the vertex V //purpose : extends the spine of the stripe S on the side of the vertex V
// PMN : 28/11/97 : Reprend le code des conges, et cela semble marcher mieux... // PMN : 28/11/97 : Reproduces the code of fillets, and it seems to work better...
//======================================================================= //=======================================================================
void ChFi3d_ChBuilder::ExtentOneCorner(const TopoDS_Vertex& V, void ChFi3d_ChBuilder::ExtentOneCorner(const TopoDS_Vertex& V,
@ -1776,7 +1776,7 @@ void ChFi3d_ChBuilder::ExtentOneCorner(const TopoDS_Vertex& V,
Standard_Real Coeff = 0.5; Standard_Real Coeff = 0.5;
Handle(ChFiDS_Spine) Spine = S->Spine(); Handle(ChFiDS_Spine) Spine = S->Spine();
ChFi3d_IndexOfSurfData(V,S,Sens); ChFi3d_IndexOfSurfData(V,S,Sens);
if (Spine->IsTangencyExtremity((Sens == 1))) return; //Pas de prolongement sur queue if (Spine->IsTangencyExtremity((Sens == 1))) return; //No extension on queue
Standard_Real dU = Spine->LastParameter(Spine->NbEdges()); Standard_Real dU = Spine->LastParameter(Spine->NbEdges());
if (Sens == 1) { if (Sens == 1) {
Spine->SetFirstParameter(-dU*Coeff); Spine->SetFirstParameter(-dU*Coeff);
@ -1939,7 +1939,7 @@ void ChFi3d_ChBuilder::ExtentTwoCorner(const TopoDS_Vertex& V,
} }
else { else {
chsp[i]->GetDistAngle(tmd, tmpang, disonF1); chsp[i]->GetDistAngle(tmd, tmpang, disonF1);
// on fait un calcul grossier de la distance 2 // an approximate calculation of distance 2 is done
if (disonF1) { if (disonF1) {
d[j] = tmd; d[j] = tmd;
d[j+1] = tmd * tan(tmpang); d[j+1] = tmd * tan(tmpang);
@ -1983,8 +1983,8 @@ void ChFi3d_ChBuilder::ExtentTwoCorner(const TopoDS_Vertex& V,
if (State[0] == ChFiDS_AllSame ){ if (State[0] == ChFiDS_AllSame ){
/* /*
// On cherche l'intersection du chanfrein le plus gros (sur l'arete incidente) // The greatest intersection of the chamfer is found (on the incident edge)
// avec la face en bout // with the face at end
i = 0; i = 0;
j = 1; j = 1;
if(dOnArc[j] > dOnArc[i]) { if(dOnArc[j] > dOnArc[i]) {
@ -1994,7 +1994,7 @@ void ChFi3d_ChBuilder::ExtentTwoCorner(const TopoDS_Vertex& V,
} }
ExtentOneCorner( V, Stripe[i] ); */ ExtentOneCorner( V, Stripe[i] ); */
// il faut que les deux chanfreins touchent la face en bout // it is necessary that two chamfers touch the face at end
for (j=0; j<2; j++) for (j=0; j<2; j++)
ExtentOneCorner( V, Stripe[j] ); ExtentOneCorner( V, Stripe[j] );
} }
@ -2066,7 +2066,7 @@ void ChFi3d_ChBuilder::ExtentThreeCorner(const TopoDS_Vertex& V,
} }
else { else {
chsp[i]->GetDistAngle(tmd, tmpangle, disonF1); chsp[i]->GetDistAngle(tmd, tmpangle, disonF1);
// on fait un calcul grossier de la distance 2 // an approximate calculation of distance 2 is done
if (disonF1) { if (disonF1) {
d[i][0] = tmd; d[i][0] = tmd;
@ -2080,8 +2080,8 @@ void ChFi3d_ChBuilder::ExtentThreeCorner(const TopoDS_Vertex& V,
} }
// dis[i][j] la distance du chanfrein i sur la face commune avec // dis[i][j] distance from chamfer i on the common face with
// le chanfrein j // chamfer j
Standard_Real dis[3][3]; Standard_Real dis[3][3];
for (i=0; i<3; i++) { for (i=0; i<3; i++) {
@ -2176,8 +2176,7 @@ void ChFi3d_ChBuilder::SetRegul()
//======================================================================= //=======================================================================
//function : ConexFaces //function : ConexFaces
//purpose : F1, F2 connexes a l'edge telles que F1 corresponde //purpose : F1, F2 are connected to edge so that F1 corresponds to distance
// a dis
//======================================================================= //=======================================================================
void ChFi3d_ChBuilder::ConexFaces (const Handle(ChFiDS_Spine)& Spine, void ChFi3d_ChBuilder::ConexFaces (const Handle(ChFiDS_Spine)& Spine,
@ -2190,7 +2189,7 @@ void ChFi3d_ChBuilder::ConexFaces (const Handle(ChFiDS_Spine)& Spine,
Standard_Integer RC,Choix; Standard_Integer RC,Choix;
TopoDS_Face f1,f2,ff1,ff2; TopoDS_Face f1,f2,ff1,ff2;
//calcul de l'orientation de reference //calculate the reference orientation
// ChFi3d_Builder::StripeOrientations is private // ChFi3d_Builder::StripeOrientations is private
SearchCommonFaces(myEFMap,Spine->Edges(1),ff1,ff2); SearchCommonFaces(myEFMap,Spine->Edges(1),ff1,ff2);
ff1.Orientation(TopAbs_FORWARD); ff1.Orientation(TopAbs_FORWARD);
@ -2199,7 +2198,7 @@ void ChFi3d_ChBuilder::ConexFaces (const Handle(ChFiDS_Spine)& Spine,
Sb2.Initialize(ff2); Sb2.Initialize(ff2);
RC = ChFi3d::ConcaveSide(Sb1,Sb2,Spine->Edges(1),tmp1,tmp2); RC = ChFi3d::ConcaveSide(Sb1,Sb2,Spine->Edges(1),tmp1,tmp2);
//calcul des faces connexes //calculate the connected faces
SearchCommonFaces(myEFMap,Spine->Edges(IEdge),f1,f2); SearchCommonFaces(myEFMap,Spine->Edges(IEdge),f1,f2);
Sb1.Initialize(f1); Sb1.Initialize(f1);
Sb2.Initialize(f2); Sb2.Initialize(f2);
@ -2218,8 +2217,7 @@ void ChFi3d_ChBuilder::ConexFaces (const Handle(ChFiDS_Spine)& Spine,
//======================================================================= //=======================================================================
//function : FindChoiceDistAngle //function : FindChoiceDistAngle
//purpose : F1, F2 connexes a l'edge telles que F1 corresponde //purpose : F1, F2 connected to the edge so that F1 corresponds to distance
// a dis
//======================================================================= //=======================================================================
Standard_Integer ChFi3d_ChBuilder::FindChoiceDistAngle(const Standard_Integer Choice, Standard_Integer ChFi3d_ChBuilder::FindChoiceDistAngle(const Standard_Integer Choice,

29
src/ChFi3d/ChFi3d_Debug.cxx
View File

@ -33,7 +33,7 @@ OSD_Chronometer simul,elspine,chemine;
#endif #endif
//********************************* //*********************************
// chronometrage de la simulation // timing of the simulation
//********************************* //*********************************
static Standard_Boolean ChFi3d_traceCHRON = Standard_False; static Standard_Boolean ChFi3d_traceCHRON = Standard_False;
@ -43,7 +43,7 @@ Standard_Boolean ChFi3d_GettraceCHRON()
{ return ChFi3d_traceCHRON; } { return ChFi3d_traceCHRON; }
//********************************* //*********************************
// trace d une ligne de cheminement // trace a line of path
//********************************* //*********************************
static Standard_Boolean ChFi3d_traceDRAWWALK = Standard_False; static Standard_Boolean ChFi3d_traceDRAWWALK = Standard_False;
@ -53,7 +53,7 @@ Standard_Boolean ChFi3d_GettraceDRAWWALK()
{ return ChFi3d_traceDRAWWALK; } { return ChFi3d_traceDRAWWALK; }
//********************************** //**********************************
// trace d une ligne d intersection // trace a line of intersection
//********************************** //**********************************
static Standard_Boolean ChFi3d_traceDRAWINT = Standard_False; static Standard_Boolean ChFi3d_traceDRAWINT = Standard_False;
@ -63,7 +63,7 @@ Standard_Boolean ChFi3d_GettraceDRAWINT()
{ return ChFi3d_traceDRAWINT; } { return ChFi3d_traceDRAWINT; }
//************************************************* //*************************************************
// recuperation des surfaces des conges approximes. // return surfaces of approximated fillets.
//************************************************* //*************************************************
static Standard_Boolean ChFi3d_traceDRAWFIL = Standard_False; static Standard_Boolean ChFi3d_traceDRAWFIL = Standard_False;
@ -74,7 +74,7 @@ Standard_Boolean ChFi3d_GettraceDRAWFIL()
//************************************************* //*************************************************
// recuperation des faces elargie pour le cheminement. // return extended faces for the path.
//************************************************* //*************************************************
static Standard_Boolean ChFi3d_traceDRAWENLARGE = Standard_False; static Standard_Boolean ChFi3d_traceDRAWENLARGE = Standard_False;
@ -84,7 +84,7 @@ Standard_Boolean ChFi3d_GettraceDRAWENLARGE()
{ return ChFi3d_traceDRAWENLARGE; } { return ChFi3d_traceDRAWENLARGE; }
//************************************************* //*************************************************
// recuperation de la ligne guide pour les coins triples. // return the guideline for the triple corners.
//************************************************* //*************************************************
static Standard_Boolean ChFi3d_traceDRAWSPINE = Standard_False; static Standard_Boolean ChFi3d_traceDRAWSPINE = Standard_False;
@ -94,7 +94,7 @@ Standard_Boolean ChFi3d_GettraceDRAWSPINE()
{ return ChFi3d_traceDRAWSPINE; } { return ChFi3d_traceDRAWSPINE; }
//************************************************* //*************************************************
// set du type de ligne guide pour les coins triples. // set the type of guideline for the triple corners.
//************************************************* //*************************************************
void ChFi3d_SetcontextSPINEBEZIER(const Standard_Boolean b); void ChFi3d_SetcontextSPINEBEZIER(const Standard_Boolean b);
@ -135,7 +135,7 @@ Standard_Boolean ChFi3d_GetcontextSPINECE()
{ return ChFi3d_contextSPINECE; } { return ChFi3d_contextSPINECE; }
//************************************************* //*************************************************
// Passage force par le cheminement pour les KPart // Forced passage by the path for KPart
//************************************************* //*************************************************
static Standard_Boolean ChFi3d_contextFORCEBLEND = Standard_False; static Standard_Boolean ChFi3d_contextFORCEBLEND = Standard_False;
void ChFi3d_SetcontextFORCEBLEND(const Standard_Boolean b) void ChFi3d_SetcontextFORCEBLEND(const Standard_Boolean b)
@ -150,7 +150,7 @@ Standard_Boolean ChFi3d_GetcontextFORCEFILLING()
{ return ChFi3d_contextFORCEFILLING; } { return ChFi3d_contextFORCEFILLING; }
//************************************************* //*************************************************
// Pas d optimisation pour les approx // No optimization for approx
//************************************************* //*************************************************
static Standard_Boolean ChFi3d_contextNOOPT = Standard_False; static Standard_Boolean ChFi3d_contextNOOPT = Standard_False;
void ChFi3d_SetcontextNOOPT(const Standard_Boolean b) void ChFi3d_SetcontextNOOPT(const Standard_Boolean b)
@ -159,7 +159,7 @@ Standard_Boolean ChFi3d_GetcontextNOOPT()
{ return ChFi3d_contextNOOPT; } { return ChFi3d_contextNOOPT; }
// *********************************************** // ***********************************************
// initialisation et resultat d'un chrono // initialization and result of a chrono
//************************************************ //************************************************
Standard_EXPORT void ChFi3d_InitChron(OSD_Chronometer& ch) Standard_EXPORT void ChFi3d_InitChron(OSD_Chronometer& ch)
{ {
@ -179,9 +179,8 @@ Standard_EXPORT void ChFi3d_ResultChron( OSD_Chronometer & ch,
//============================================================== //==============================================================
// function : ChFi3d_CheckSurfData // function : ChFi3d_CheckSurfData
// purpose : fonction permettant de tracer une SurfData afin // purpose : function allows to trace SurfData to check
// de verifier la bonne construction de tous les // construction of all elements, namely pcurves
// elements, notamment des pcurves
//============================================================== //==============================================================
#ifdef DRAW #ifdef DRAW
static Standard_Integer NbSD = 0; static Standard_Integer NbSD = 0;
@ -189,8 +188,8 @@ static Standard_Integer NbSD = 0;
void ChFi3d_CheckSurfData(const TopOpeBRepDS_DataStructure& DStr, void ChFi3d_CheckSurfData(const TopOpeBRepDS_DataStructure& DStr,
const Handle(ChFiDS_SurfData)& Data) const Handle(ChFiDS_SurfData)& Data)
{ {
//trace de la surface definie par le chanfrein ou le conge //trace of the surface defined by the chamfer or the fillet
// correspondant a la SurfData // corresponding to SurfData
Handle(Geom_Surface) surf = (DStr.Surface( Data->Surf())).Surface(); Handle(Geom_Surface) surf = (DStr.Surface( Data->Surf())).Surface();
if (!surf.IsNull()){ if (!surf.IsNull()){

126
src/ChFi3d/ChFi3d_FilBuilder.cxx
View File

@ -417,7 +417,7 @@ void ChFi3d_FilBuilder::SetLaw(const Standard_Integer IC,
const TopoDS_Edge& E, const TopoDS_Edge& E,
const Handle(Law_Function)& L) const Handle(Law_Function)& L)
{ {
// Voir si il ne faut pas faire un controle des bounds ici!!!!! // Check if it is necessary to check borders!
if(IC <= NbElements()) { if(IC <= NbElements()) {
Handle(ChFiDS_FilSpine) fsp = Handle(ChFiDS_FilSpine)::DownCast(Value(IC)); Handle(ChFiDS_FilSpine) fsp = Handle(ChFiDS_FilSpine)::DownCast(Value(IC));
fsp->ChangeLaw(E) = L; fsp->ChangeLaw(E) = L;
@ -448,11 +448,11 @@ void ChFi3d_FilBuilder::Simulate (const Standard_Integer IC)
#ifdef DEB #ifdef DEB
if(ChFi3d_GettraceCHRON()){ if(ChFi3d_GettraceCHRON()){
simul.Stop(); simul.Stop();
cout<<"Temps total simulation : "; cout<<"Total simulation time : ";
simul.Show(); simul.Show();
cout<<"dont temps construction spine : "; cout<<"Spine construction time : ";
elspine.Show(); elspine.Show();
cout<<"et temps cheminement : "; cout<<"and process time : ";
chemine.Show(); chemine.Show();
} }
#endif #endif
@ -613,12 +613,12 @@ ChFi3d_FilBuilder::SimulSurf(Handle(ChFiDS_SurfData)& Data,
{ {
Handle(ChFiDS_FilSpine) fsp = Handle(ChFiDS_FilSpine)::DownCast(Spine); Handle(ChFiDS_FilSpine) fsp = Handle(ChFiDS_FilSpine)::DownCast(Spine);
if(fsp.IsNull()) Standard_ConstructionError::Raise if(fsp.IsNull()) Standard_ConstructionError::Raise
("SimulSurf : la spine n est pas celle d un conge"); ("SimulSurf : this is not the spine of the fillet");
Handle(BRepBlend_Line) lin; Handle(BRepBlend_Line) lin;
#ifdef DEB #ifdef DEB
// TopAbs_Orientation Or = S1->ChangeSurface().Face().Orientation(); // TopAbs_Orientation Or = S1->ChangeSurface().Face().Orientation();
#endif #endif
// Des parametres souples!!! // Flexible parameters!!!
Standard_Real locfleche, MaxStep; Standard_Real locfleche, MaxStep;
SimulParams(HGuide,fsp,MaxStep,locfleche); SimulParams(HGuide,fsp,MaxStep,locfleche);
Handle(ChFiDS_SecHArray1) sec; Handle(ChFiDS_SecHArray1) sec;
@ -757,10 +757,10 @@ void ChFi3d_FilBuilder::SimulSurf(Handle(ChFiDS_SurfData)& Data,
{ {
Handle(ChFiDS_FilSpine) fsp = Handle(ChFiDS_FilSpine)::DownCast(Spine); Handle(ChFiDS_FilSpine) fsp = Handle(ChFiDS_FilSpine)::DownCast(Spine);
if(fsp.IsNull()) Standard_ConstructionError::Raise if(fsp.IsNull()) Standard_ConstructionError::Raise
("PerformSurf : la spine n est pas celle d un conge"); ("PerformSurf : this is not the spine of the fillet");
Handle(BRepBlend_Line) lin; Handle(BRepBlend_Line) lin;
// Des parametres souples!!! // Flexible parameters!
Standard_Real locfleche, MaxStep; Standard_Real locfleche, MaxStep;
SimulParams(HGuide,fsp,MaxStep,locfleche); SimulParams(HGuide,fsp,MaxStep,locfleche);
Handle(ChFiDS_SecHArray1) sec; Handle(ChFiDS_SecHArray1) sec;
@ -793,7 +793,7 @@ void ChFi3d_FilBuilder::SimulSurf(Handle(ChFiDS_SurfData)& Data,
PFirst,MaxStep,locfleche,TolGuide,First,Last, PFirst,MaxStep,locfleche,TolGuide,First,Last,
Soldep,4,Inside,Appro,Forward,RecP,RecS,RecRst); Soldep,4,Inside,Appro,Forward,RecP,RecS,RecRst);
if(!done) { if(!done) {
Standard_Failure::Raise("SimulSurf : Echec cheminement!"); Standard_Failure::Raise("SimulSurf : Failed process!");
} }
Standard_Integer nbp = lin->NbPoints(); Standard_Integer nbp = lin->NbPoints();
sec = new ChFiDS_SecHArray1(1,nbp); sec = new ChFiDS_SecHArray1(1,nbp);
@ -832,7 +832,7 @@ void ChFi3d_FilBuilder::SimulSurf(Handle(ChFiDS_SurfData)& Data,
func,finv,finvp,finvc, func,finv,finvp,finvc,
PFirst,MaxStep,locfleche,TolGuide,First,Last, PFirst,MaxStep,locfleche,TolGuide,First,Last,
Soldep,4,Inside,Appro,Forward,RecP,RecS,RecRst); Soldep,4,Inside,Appro,Forward,RecP,RecS,RecRst);
if(!done) Standard_Failure::Raise("SimulSurf : Echec !"); if(!done) Standard_Failure::Raise("SimulSurf : Fail !");
Standard_Integer nbp = lin->NbPoints(); Standard_Integer nbp = lin->NbPoints();
sec = new ChFiDS_SecHArray1(1,nbp); sec = new ChFiDS_SecHArray1(1,nbp);
for(Standard_Integer i = 1; i <= nbp; i++){ for(Standard_Integer i = 1; i <= nbp; i++){
@ -880,7 +880,7 @@ void ChFi3d_FilBuilder::SimulSurf(Handle(ChFiDS_SurfData)& Data,
const Handle(BRepAdaptor_HSurface)& HSref2, const Handle(BRepAdaptor_HSurface)& HSref2,
const Handle(BRepAdaptor_HCurve2d)& PCref2, const Handle(BRepAdaptor_HCurve2d)& PCref2,
Standard_Boolean& Decroch2, Standard_Boolean& Decroch2,
const Standard_Real /*Fleche*/, const Standard_Real /*Arrow*/,
const Standard_Real TolGuide, const Standard_Real TolGuide,
Standard_Real& First, Standard_Real& First,
Standard_Real& Last, Standard_Real& Last,
@ -894,10 +894,10 @@ void ChFi3d_FilBuilder::SimulSurf(Handle(ChFiDS_SurfData)& Data,
{ {
Handle(ChFiDS_FilSpine) fsp = Handle(ChFiDS_FilSpine)::DownCast(Spine); Handle(ChFiDS_FilSpine) fsp = Handle(ChFiDS_FilSpine)::DownCast(Spine);
if(fsp.IsNull()) Standard_ConstructionError::Raise if(fsp.IsNull()) Standard_ConstructionError::Raise
("PerformSurf : la spine n est pas celle d un conge"); ("PerformSurf : it is not the spine of a fillet");
Handle(BRepBlend_Line) lin; Handle(BRepBlend_Line) lin;
// Des parametres souples!!! // Flexible parameters!
Standard_Real locfleche, MaxStep; Standard_Real locfleche, MaxStep;
SimulParams(HGuide,fsp,MaxStep,locfleche); SimulParams(HGuide,fsp,MaxStep,locfleche);
Handle(ChFiDS_SecHArray1) sec; Handle(ChFiDS_SecHArray1) sec;
@ -929,7 +929,7 @@ void ChFi3d_FilBuilder::SimulSurf(Handle(ChFiDS_SurfData)& Data,
func,finv,finvp,finvc, func,finv,finvp,finvc,
PFirst,MaxStep,locfleche,TolGuide,First,Last, PFirst,MaxStep,locfleche,TolGuide,First,Last,
Soldep,4,Inside,Appro,Forward,RecP,RecS,RecRst); Soldep,4,Inside,Appro,Forward,RecP,RecS,RecRst);
if(!done) Standard_Failure::Raise("SimulSurf : Echec cheminement!"); if(!done) Standard_Failure::Raise("SimulSurf : Failed Processing!");
Standard_Integer nbp = lin->NbPoints(); Standard_Integer nbp = lin->NbPoints();
sec = new ChFiDS_SecHArray1(1,nbp); sec = new ChFiDS_SecHArray1(1,nbp);
for(Standard_Integer i = 1; i <= nbp; i++){ for(Standard_Integer i = 1; i <= nbp; i++){
@ -967,7 +967,7 @@ void ChFi3d_FilBuilder::SimulSurf(Handle(ChFiDS_SurfData)& Data,
func,finv,finvp,finvc, func,finv,finvp,finvc,
PFirst,MaxStep,locfleche,TolGuide,First,Last, PFirst,MaxStep,locfleche,TolGuide,First,Last,
Soldep,4,Inside,Appro,Forward,RecP,RecS,RecRst); Soldep,4,Inside,Appro,Forward,RecP,RecS,RecRst);
if(!done) Standard_Failure::Raise("SimulSurf : Echec !"); if(!done) Standard_Failure::Raise("SimulSurf : Fail !");
Standard_Integer nbp = lin->NbPoints(); Standard_Integer nbp = lin->NbPoints();
sec = new ChFiDS_SecHArray1(1,nbp); sec = new ChFiDS_SecHArray1(1,nbp);
for(Standard_Integer i = 1; i <= nbp; i++){ for(Standard_Integer i = 1; i <= nbp; i++){
@ -1037,10 +1037,10 @@ void ChFi3d_FilBuilder::SimulSurf(Handle(ChFiDS_SurfData)& Data,
{ {
Handle(ChFiDS_FilSpine) fsp = Handle(ChFiDS_FilSpine)::DownCast(Spine); Handle(ChFiDS_FilSpine) fsp = Handle(ChFiDS_FilSpine)::DownCast(Spine);
if(fsp.IsNull()) Standard_ConstructionError::Raise if(fsp.IsNull()) Standard_ConstructionError::Raise
("PerformSurf : la spine n est pas celle d un conge"); ("PerformSurf : it is not the spine of a fillet");
Handle(BRepBlend_Line) lin; Handle(BRepBlend_Line) lin;
// Des parametres souples!!! // Flexible parameters!
Standard_Real locfleche, MaxStep; Standard_Real locfleche, MaxStep;
SimulParams(HGuide,fsp,MaxStep,locfleche); SimulParams(HGuide,fsp,MaxStep,locfleche);
Handle(ChFiDS_SecHArray1) sec; Handle(ChFiDS_SecHArray1) sec;
@ -1082,7 +1082,7 @@ void ChFi3d_FilBuilder::SimulSurf(Handle(ChFiDS_SurfData)& Data,
func, finv1, finvp1, finv2, finvp2, func, finv1, finvp1, finv2, finvp2,
PFirst, MaxStep, locfleche, TolGuide, First, Last, PFirst, MaxStep, locfleche, TolGuide, First, Last,
Soldep, 4, Inside, Appro, Forward, RecP1, RecRst1, RecP2, RecRst2); Soldep, 4, Inside, Appro, Forward, RecP1, RecRst1, RecP2, RecRst2);
if(!done) Standard_Failure::Raise("SimulSurf : Echec cheminement!"); if(!done) Standard_Failure::Raise("SimulSurf : Failed processing!");
Standard_Integer nbp = lin->NbPoints(); Standard_Integer nbp = lin->NbPoints();
sec = new ChFiDS_SecHArray1(1,nbp); sec = new ChFiDS_SecHArray1(1,nbp);
for(Standard_Integer i = 1; i <= nbp; i++){ for(Standard_Integer i = 1; i <= nbp; i++){
@ -1135,7 +1135,7 @@ void ChFi3d_FilBuilder::SimulSurf(Handle(ChFiDS_SurfData)& Data,
PFirst, MaxStep, locfleche, TolGuide, First, Last, PFirst, MaxStep, locfleche, TolGuide, First, Last,
Soldep, 4, Inside, Appro, Forward, RecP1, RecRst1, RecP2, RecRst2); Soldep, 4, Inside, Appro, Forward, RecP1, RecRst1, RecP2, RecRst2);
if(!done) Standard_Failure::Raise("SimulSurf : Echec !"); if(!done) Standard_Failure::Raise("SimulSurf : Fail !");
Standard_Integer nbp = lin->NbPoints(); Standard_Integer nbp = lin->NbPoints();
sec = new ChFiDS_SecHArray1(1, nbp); sec = new ChFiDS_SecHArray1(1, nbp);
for(Standard_Integer i = 1; i <= nbp; i++){ for(Standard_Integer i = 1; i <= nbp; i++){
@ -1192,7 +1192,7 @@ Standard_Boolean ChFi3d_FilBuilder::PerformFirstSection
{ {
Handle(ChFiDS_FilSpine) fsp = Handle(ChFiDS_FilSpine)::DownCast(Spine); Handle(ChFiDS_FilSpine) fsp = Handle(ChFiDS_FilSpine)::DownCast(Spine);
if(fsp.IsNull()) Standard_ConstructionError::Raise if(fsp.IsNull()) Standard_ConstructionError::Raise
("PerformSurf : la spine n est pas celle d un conge"); ("PerformSurf : this is not the spine of a fillet");
Standard_Real TolGuide = HGuide->Resolution(tolesp); Standard_Real TolGuide = HGuide->Resolution(tolesp);
if(fsp->IsConstant()){ if(fsp->IsConstant()){
BRepBlend_ConstRad Func(S1,S2,HGuide); BRepBlend_ConstRad Func(S1,S2,HGuide);
@ -1246,7 +1246,7 @@ ChFi3d_FilBuilder::PerformSurf(ChFiDS_SequenceOfSurfData& SeqData,
Handle(ChFiDS_SurfData) Data = SeqData(1); Handle(ChFiDS_SurfData) Data = SeqData(1);
Handle(ChFiDS_FilSpine) fsp = Handle(ChFiDS_FilSpine)::DownCast(Spine); Handle(ChFiDS_FilSpine) fsp = Handle(ChFiDS_FilSpine)::DownCast(Spine);
if(fsp.IsNull()) Standard_ConstructionError::Raise if(fsp.IsNull()) Standard_ConstructionError::Raise
("PerformSurf : la spine n est pas celle d un conge"); ("PerformSurf : this is not the spine of a fillet");
Standard_Boolean gd1,gd2,gf1,gf2, maybesingular; Standard_Boolean gd1,gd2,gf1,gf2, maybesingular;
Handle(BRepBlend_Line) lin; Handle(BRepBlend_Line) lin;
TopAbs_Orientation Or = S1->ChangeSurface().Face().Orientation(); TopAbs_Orientation Or = S1->ChangeSurface().Face().Orientation();
@ -1273,7 +1273,7 @@ ChFi3d_FilBuilder::PerformSurf(ChFiDS_SequenceOfSurfData& SeqData,
ChFi3d_ResultChron(ch , t_computedata);// result perf ComputeData ChFi3d_ResultChron(ch , t_computedata);// result perf ComputeData
#endif #endif
if(!done) return Standard_False; // ratrappage possible PMN 14/05/1998 if(!done) return Standard_False; // recovery is possible PMN 14/05/1998
#ifdef DEB #ifdef DEB
ChFi3d_InitChron(ch);// init perf CompleteData ChFi3d_InitChron(ch);// init perf CompleteData
@ -1285,7 +1285,7 @@ ChFi3d_FilBuilder::PerformSurf(ChFiDS_SequenceOfSurfData& SeqData,
ChFi3d_ResultChron(ch , t_completedata);// result perf CompleteData ChFi3d_ResultChron(ch , t_completedata);// result perf CompleteData
#endif #endif
if(!done) Standard_Failure::Raise("PerformSurf : Echec approximation!"); if(!done) Standard_Failure::Raise("PerformSurf : Failed approximation!");
maybesingular = (Func.GetMinimalDistance()<=100*tolapp3d); maybesingular = (Func.GetMinimalDistance()<=100*tolapp3d);
} }
else { else {
@ -1319,7 +1319,7 @@ ChFi3d_FilBuilder::PerformSurf(ChFiDS_SequenceOfSurfData& SeqData,
ChFi3d_ResultChron(ch , t_completedata);// result perf CompleteData ChFi3d_ResultChron(ch , t_completedata);// result perf CompleteData
#endif #endif
if(!done) Standard_Failure::Raise("PerformSurf : Echec approximation!"); if(!done) Standard_Failure::Raise("PerformSurf : Failed approximation!");
maybesingular = (Func.GetMinimalDistance()<=100*tolapp3d); maybesingular = (Func.GetMinimalDistance()<=100*tolapp3d);
} }
if (maybesingular) SplitSurf(SeqData, lin); if (maybesingular) SplitSurf(SeqData, lin);
@ -1360,7 +1360,7 @@ void ChFi3d_FilBuilder::PerformSurf(ChFiDS_SequenceOfSurfData& SeqData
Handle(ChFiDS_SurfData) Data = SeqData(1); Handle(ChFiDS_SurfData) Data = SeqData(1);
Handle(ChFiDS_FilSpine) fsp = Handle(ChFiDS_FilSpine)::DownCast(Spine); Handle(ChFiDS_FilSpine) fsp = Handle(ChFiDS_FilSpine)::DownCast(Spine);
if(fsp.IsNull()) Standard_ConstructionError::Raise if(fsp.IsNull()) Standard_ConstructionError::Raise
("PerformSurf : la spine n est pas celle d un conge"); ("PerformSurf : this is not the spine of a fillet");
Handle(BRepBlend_Line) lin; Handle(BRepBlend_Line) lin;
Standard_Real PFirst = First; Standard_Real PFirst = First;
Standard_Boolean maybesingular; Standard_Boolean maybesingular;
@ -1392,11 +1392,11 @@ void ChFi3d_FilBuilder::PerformSurf(ChFiDS_SequenceOfSurfData& SeqData
Soldep,Inside,Appro,Forward,RecP,RecS,RecRst); Soldep,Inside,Appro,Forward,RecP,RecS,RecRst);
if(!done) { if(!done) {
Spine->SetErrorStatus(ChFiDS_WalkingFailure); Spine->SetErrorStatus(ChFiDS_WalkingFailure);
Standard_Failure::Raise("PerformSurf : Echec cheminement!"); Standard_Failure::Raise("PerformSurf : Failed processing!");
} }
TopAbs_Orientation Or = HS2->ChangeSurface().Face().Orientation(); TopAbs_Orientation Or = HS2->ChangeSurface().Face().Orientation();
done = CompleteData(Data,func,lin,HS1,HS2,Or,1); done = CompleteData(Data,func,lin,HS1,HS2,Or,1);
if(!done) Standard_Failure::Raise("PerformSurf : Echec approximation!"); if(!done) Standard_Failure::Raise("PerformSurf : Failed approximation!");
maybesingular = (func.GetMinimalDistance()<=100*tolapp3d); maybesingular = (func.GetMinimalDistance()<=100*tolapp3d);
} }
else { else {
@ -1426,11 +1426,11 @@ void ChFi3d_FilBuilder::PerformSurf(ChFiDS_SequenceOfSurfData& SeqData
Soldep,Inside,Appro,Forward,RecP,RecS,RecRst); Soldep,Inside,Appro,Forward,RecP,RecS,RecRst);
if(!done) { if(!done) {
Spine->SetErrorStatus(ChFiDS_WalkingFailure); Spine->SetErrorStatus(ChFiDS_WalkingFailure);
Standard_Failure::Raise("PerformSurf : Echec cheminement!"); Standard_Failure::Raise("PerformSurf : Failed processing!");
} }
TopAbs_Orientation Or = HS2->ChangeSurface().Face().Orientation(); TopAbs_Orientation Or = HS2->ChangeSurface().Face().Orientation();
done = CompleteData(Data,func,lin,HS1,HS2,Or,1); done = CompleteData(Data,func,lin,HS1,HS2,Or,1);
if(!done) Standard_Failure::Raise("PerformSurf : Echec approximation!"); if(!done) Standard_Failure::Raise("PerformSurf : Failed approximation!");
maybesingular = (func.GetMinimalDistance()<=100*tolapp3d); maybesingular = (func.GetMinimalDistance()<=100*tolapp3d);
} }
if (maybesingular) SplitSurf(SeqData, lin); if (maybesingular) SplitSurf(SeqData, lin);
@ -1470,7 +1470,7 @@ void ChFi3d_FilBuilder::PerformSurf(ChFiDS_SequenceOfSurfData& SeqData
Handle(ChFiDS_SurfData) Data = SeqData(1);; Handle(ChFiDS_SurfData) Data = SeqData(1);;
Handle(ChFiDS_FilSpine) fsp = Handle(ChFiDS_FilSpine)::DownCast(Spine); Handle(ChFiDS_FilSpine) fsp = Handle(ChFiDS_FilSpine)::DownCast(Spine);
if(fsp.IsNull()) Standard_ConstructionError::Raise if(fsp.IsNull()) Standard_ConstructionError::Raise
("PerformSurf : la spine n est pas celle d un conge"); ("PerformSurf : this is not the spine of a fillet");
Handle(BRepBlend_Line) lin; Handle(BRepBlend_Line) lin;
Standard_Real PFirst = First; Standard_Real PFirst = First;
Standard_Boolean maybesingular; Standard_Boolean maybesingular;
@ -1502,11 +1502,11 @@ void ChFi3d_FilBuilder::PerformSurf(ChFiDS_SequenceOfSurfData& SeqData
Soldep,Inside,Appro,Forward,RecP,RecS,RecRst); Soldep,Inside,Appro,Forward,RecP,RecS,RecRst);
if(!done) { if(!done) {
Spine->SetErrorStatus(ChFiDS_WalkingFailure); Spine->SetErrorStatus(ChFiDS_WalkingFailure);
Standard_Failure::Raise("PerformSurf : Echec cheminement!"); Standard_Failure::Raise("PerformSurf : Failed processing!");
} }
TopAbs_Orientation Or = HS1->ChangeSurface().Face().Orientation(); TopAbs_Orientation Or = HS1->ChangeSurface().Face().Orientation();
done = CompleteData(Data,func,lin,HS1,HS2,Or,0); done = CompleteData(Data,func,lin,HS1,HS2,Or,0);
if(!done) Standard_Failure::Raise("PerformSurf : Echec approximation!"); if(!done) Standard_Failure::Raise("PerformSurf : Failed approximation!");
maybesingular = (func.GetMinimalDistance()<=100*tolapp3d); maybesingular = (func.GetMinimalDistance()<=100*tolapp3d);
} }
else { else {
@ -1534,11 +1534,11 @@ void ChFi3d_FilBuilder::PerformSurf(ChFiDS_SequenceOfSurfData& SeqData
Soldep,Inside,Appro,Forward,RecP,RecS,RecRst); Soldep,Inside,Appro,Forward,RecP,RecS,RecRst);
if(!done) { if(!done) {
Spine->SetErrorStatus(ChFiDS_WalkingFailure); Spine->SetErrorStatus(ChFiDS_WalkingFailure);
Standard_Failure::Raise("PerformSurf : Echec cheminement!"); Standard_Failure::Raise("PerformSurf : Failed processing!");
} }
TopAbs_Orientation Or = HS1->ChangeSurface().Face().Orientation(); TopAbs_Orientation Or = HS1->ChangeSurface().Face().Orientation();
done = CompleteData(Data,func,lin,HS1,HS2,Or,0); done = CompleteData(Data,func,lin,HS1,HS2,Or,0);
if(!done) Standard_Failure::Raise("PerformSurf : Echec approximation!"); if(!done) Standard_Failure::Raise("PerformSurf : Failed approximation!");
maybesingular = (func.GetMinimalDistance()<=100*tolapp3d); maybesingular = (func.GetMinimalDistance()<=100*tolapp3d);
} }
if (maybesingular) SplitSurf(SeqData, lin); if (maybesingular) SplitSurf(SeqData, lin);
@ -1589,7 +1589,7 @@ void ChFi3d_FilBuilder::PerformSurf(ChFiDS_SequenceOfSurfData& SeqData
Handle(ChFiDS_SurfData) Data = SeqData(1);; Handle(ChFiDS_SurfData) Data = SeqData(1);;
Handle(ChFiDS_FilSpine) fsp = Handle(ChFiDS_FilSpine)::DownCast(Spine); Handle(ChFiDS_FilSpine) fsp = Handle(ChFiDS_FilSpine)::DownCast(Spine);
if(fsp.IsNull()) Standard_ConstructionError::Raise if(fsp.IsNull()) Standard_ConstructionError::Raise
("PerformSurf : la spine n est pas celle d un conge"); ("PerformSurf : this is not the spine of a fillet");
Handle(BRepBlend_Line) lin; Handle(BRepBlend_Line) lin;
Standard_Real PFirst = First; Standard_Real PFirst = First;
Standard_Boolean maybesingular; Standard_Boolean maybesingular;
@ -1629,11 +1629,11 @@ void ChFi3d_FilBuilder::PerformSurf(ChFiDS_SequenceOfSurfData& SeqData
Soldep, Inside, Appro, Forward, RecP1, RecRst1, RecP2, RecRst2); Soldep, Inside, Appro, Forward, RecP1, RecRst1, RecP2, RecRst2);
if(!done) { if(!done) {
Spine->SetErrorStatus(ChFiDS_WalkingFailure); Spine->SetErrorStatus(ChFiDS_WalkingFailure);
Standard_Failure::Raise("PerformSurf : Echec cheminement!"); Standard_Failure::Raise("PerformSurf : Failed processing!");
} }
TopAbs_Orientation Or = HS1->ChangeSurface().Face().Orientation(); TopAbs_Orientation Or = HS1->ChangeSurface().Face().Orientation();
done = CompleteData(Data, func, lin, HS1, HS2, Or); done = CompleteData(Data, func, lin, HS1, HS2, Or);
if(!done) Standard_Failure::Raise("PerformSurf : Echec approximation!"); if(!done) Standard_Failure::Raise("PerformSurf : Failed approximation!");
maybesingular = (func.GetMinimalDistance()<=100*tolapp3d); maybesingular = (func.GetMinimalDistance()<=100*tolapp3d);
} }
else { else {
@ -1674,11 +1674,11 @@ void ChFi3d_FilBuilder::PerformSurf(ChFiDS_SequenceOfSurfData& SeqData
if(!done) { if(!done) {
Spine->SetErrorStatus(ChFiDS_WalkingFailure); Spine->SetErrorStatus(ChFiDS_WalkingFailure);
Standard_Failure::Raise("PerformSurf : Echec cheminement!"); Standard_Failure::Raise("PerformSurf : Failed processing!");
} }
TopAbs_Orientation Or = HS1->ChangeSurface().Face().Orientation(); TopAbs_Orientation Or = HS1->ChangeSurface().Face().Orientation();
done = CompleteData(Data, func, lin, HS1, HS2, Or); done = CompleteData(Data, func, lin, HS1, HS2, Or);
if(!done) Standard_Failure::Raise("PerformSurf : Echec approximation!"); if(!done) Standard_Failure::Raise("PerformSurf : Failed approximation!");
maybesingular = (func.GetMinimalDistance()<=100*tolapp3d); maybesingular = (func.GetMinimalDistance()<=100*tolapp3d);
@ -1716,13 +1716,13 @@ void ChFi3d_FilBuilder::SplitSurf(ChFiDS_SequenceOfSurfData& SeqData,
Standard_Real precedant, suivant, courant; Standard_Real precedant, suivant, courant;
Standard_Real a, b, c; Standard_Real a, b, c;
// (1) Rechecheche des vi tel que l'iso v=vi soit ponctuelles // (1) Finds vi so that iso v=vi is punctual
VFirst = Min( ref->InterferenceOnS1().FirstParameter(), VFirst = Min( ref->InterferenceOnS1().FirstParameter(),
ref->InterferenceOnS2().FirstParameter() ); ref->InterferenceOnS2().FirstParameter() );
VLast = Max( ref->InterferenceOnS1().LastParameter(), VLast = Max( ref->InterferenceOnS1().LastParameter(),
ref->InterferenceOnS2().LastParameter() ); ref->InterferenceOnS2().LastParameter() );
// (1.1) Recherche du premier point a l'interieur // (1.1) Finds the first point inside
for (ii=1; ii<=Nbpnt && Line->Point(ii).Parameter()<VFirst; ii++) {} for (ii=1; ii<=Nbpnt && Line->Point(ii).Parameter()<VFirst; ii++) {}
if (ii==1) ii++; if (ii==1) ii++;
P = Line->Point(ii); P = Line->Point(ii);
@ -1733,7 +1733,7 @@ void ChFi3d_FilBuilder::SplitSurf(ChFiDS_SequenceOfSurfData& SeqData,
precedant = P.PointOnS1().Distance(P.PointOnS2()); precedant = P.PointOnS1().Distance(P.PointOnS2());
ii ++; ii ++;
// (1.2) Recherche d'un minimum par "points" // (1.2) Find a minimum by "points"
for ( ; ii<=Nbpnt && Line->Point(ii).Parameter()<=VLast; ii++) { for ( ; ii<=Nbpnt && Line->Point(ii).Parameter()<=VLast; ii++) {
for (;ii<=Nbpnt && for (;ii<=Nbpnt &&
Line->Point(ii).Parameter()<VLast && Line->Point(ii).Parameter()<VLast &&
@ -1743,7 +1743,7 @@ void ChFi3d_FilBuilder::SplitSurf(ChFiDS_SequenceOfSurfData& SeqData,
c = pnt.Parameter(); c = pnt.Parameter();
suivant = pnt.PointOnS1().Distance(pnt.PointOnS2()); suivant = pnt.PointOnS1().Distance(pnt.PointOnS2());
if ( (courant < precedant) && (courant < suivant) ) { if ( (courant < precedant) && (courant < suivant) ) {
// (1.3) Recherche du minimum exact // (1.3) Find the exact minimum
math_FunctionRoot Resol(Fonc, (a+c)/2, math_FunctionRoot Resol(Fonc, (a+c)/2,
tol2d,//Surf->VResolution(toleps), tol2d,//Surf->VResolution(toleps),
a, c, a, c,
@ -1753,7 +1753,7 @@ void ChFi3d_FilBuilder::SplitSurf(ChFiDS_SequenceOfSurfData& SeqData,
Fonc.Value(Resol.Root(), Val); Fonc.Value(Resol.Root(), Val);
if (Val< tolapp3d) { if (Val< tolapp3d) {
// On insere la solution (en evitant les risques de confusion) // the solution (avoiding the risks of confusion)
if (LesVi.Length()==0) { if (LesVi.Length()==0) {
if ( (racine > VFirst+tol2d) && if ( (racine > VFirst+tol2d) &&
(racine < VLast -tol2d) ) { (racine < VLast -tol2d) ) {
@ -1770,18 +1770,18 @@ void ChFi3d_FilBuilder::SplitSurf(ChFiDS_SequenceOfSurfData& SeqData,
} }
else { else {
# if DEB # if DEB
cout << "Echec calcul de la longeur minimum" << endl; cout << "Failed calculation of the minimum length" << endl;
# endif # endif
} }
} }
// mise a jour si non duplication // update if non duplication
a = b; a = b;
precedant = courant; precedant = courant;
b = c; b = c;
courant = suivant; courant = suivant;
} }
// (2) Mise a jour de la sequence de SurfData // (2) Update of the sequence of SurfData
if (LesVi.Length()>0) { if (LesVi.Length()>0) {
TopOpeBRepDS_DataStructure& DStru = myDS->ChangeDS(); TopOpeBRepDS_DataStructure& DStru = myDS->ChangeDS();
Handle(ChFiDS_SurfData) SD; Handle(ChFiDS_SurfData) SD;
@ -1793,7 +1793,7 @@ void ChFi3d_FilBuilder::SplitSurf(ChFiDS_SequenceOfSurfData& SeqData,
for (ii=1 ; ii<=LesVi.Length(); ii++) { for (ii=1 ; ii<=LesVi.Length(); ii++) {
T = LesVi(ii); T = LesVi(ii);
// (2.0) copie et insertion // (2.0) copy and insertion
SD = new (ChFiDS_SurfData); SD = new (ChFiDS_SurfData);
SD->Copy(ref); SD->Copy(ref);
SeqData.InsertBefore(ii, SD); SeqData.InsertBefore(ii, SD);
@ -1804,7 +1804,7 @@ void ChFi3d_FilBuilder::SplitSurf(ChFiDS_SequenceOfSurfData& SeqData,
C2 = DStru.Curve(SD->InterferenceOnS2().LineIndex()); C2 = DStru.Curve(SD->InterferenceOnS2().LineIndex());
SD->ChangeInterferenceOnS2().SetLineIndex(DStru.AddCurve(C2)); SD->ChangeInterferenceOnS2().SetLineIndex(DStru.AddCurve(C2));
// (2.1) Modif des common Point // (2.1) Modification of common Point
SD-> ChangeVertexLastOnS1().Reset(); SD-> ChangeVertexLastOnS1().Reset();
SD-> ChangeVertexLastOnS2().Reset(); SD-> ChangeVertexLastOnS2().Reset();
ref->ChangeVertexFirstOnS1().Reset(); ref->ChangeVertexFirstOnS1().Reset();
@ -1824,13 +1824,13 @@ void ChFi3d_FilBuilder::SplitSurf(ChFiDS_SequenceOfSurfData& SeqData,
ref->ChangeVertexFirstOnS1().SetTolerance(VertexTol); ref->ChangeVertexFirstOnS1().SetTolerance(VertexTol);
ref->ChangeVertexFirstOnS2().SetTolerance(VertexTol); ref->ChangeVertexFirstOnS2().SetTolerance(VertexTol);
// (2.2) Modif des interferences // (2.2) Modification of interferences
SD->ChangeInterferenceOnS1().SetLastParameter(T); SD->ChangeInterferenceOnS1().SetLastParameter(T);
SD->ChangeInterferenceOnS2().SetLastParameter(T); SD->ChangeInterferenceOnS2().SetLastParameter(T);
ref->ChangeInterferenceOnS1().SetFirstParameter(T); ref->ChangeInterferenceOnS1().SetFirstParameter(T);
ref->ChangeInterferenceOnS2().SetFirstParameter(T); ref->ChangeInterferenceOnS2().SetFirstParameter(T);
// Les parametres sur l ElSpine // Parameters on ElSpine
SD->LastSpineParam(T); SD->LastSpineParam(T);
ref->FirstSpineParam(T); ref->FirstSpineParam(T);
} }
@ -1845,8 +1845,8 @@ void ChFi3d_FilBuilder::SplitSurf(ChFiDS_SequenceOfSurfData& SeqData,
void ChFi3d_FilBuilder::ExtentOneCorner(const TopoDS_Vertex& V, void ChFi3d_FilBuilder::ExtentOneCorner(const TopoDS_Vertex& V,
const Handle(ChFiDS_Stripe)& S) const Handle(ChFiDS_Stripe)& S)
{ {
// revoir en utilisant les donnees au bout des conges (point,rayon,normale // review by using the data at end of fillets (point, radius, normal
// aux faces et tangentes a la ligne guide. // to the faces and tangents of the guideline).
#ifndef DEB #ifndef DEB
Standard_Integer Sens = 0; Standard_Integer Sens = 0;
#else #else
@ -1857,10 +1857,10 @@ void ChFi3d_FilBuilder::ExtentOneCorner(const TopoDS_Vertex& V,
ChFi3d_IndexOfSurfData(V,S,Sens); ChFi3d_IndexOfSurfData(V,S,Sens);
Standard_Real dU = Spine->LastParameter(Spine->NbEdges()); Standard_Real dU = Spine->LastParameter(Spine->NbEdges());
if (Spine->IsTangencyExtremity((Sens == 1))) if (Spine->IsTangencyExtremity((Sens == 1)))
return; //Pas de prolongement sur queue de billard return; //No extension in the queue
if (Spine->Status((Sens == 1)) == ChFiDS_FreeBoundary) { if (Spine->Status((Sens == 1)) == ChFiDS_FreeBoundary) {
Coeff *= 2; // Il faut aller j'usquau bout.Il faudrait evaluer la longeur Coeff *= 2; // It is necessary to go to the end and to evaluate the length
} }
if (Sens == 1) { if (Sens == 1) {
@ -1881,8 +1881,8 @@ void ChFi3d_FilBuilder::ExtentOneCorner(const TopoDS_Vertex& V,
void ChFi3d_FilBuilder::ExtentTwoCorner(const TopoDS_Vertex& V, void ChFi3d_FilBuilder::ExtentTwoCorner(const TopoDS_Vertex& V,
const ChFiDS_ListOfStripe& LS) const ChFiDS_ListOfStripe& LS)
{ {
// revoir en utilisant les donnees au bout des conges (point,rayon,normale // Review by using the data at end of fillets (point, radius, normal
// aux faces et tangentes a la ligne guide. // to faces and tangents to the guideline.
Standard_Integer Sens; Standard_Integer Sens;
Standard_Real Coeff = 0.3, Eval=0.0, dU, rad; Standard_Real Coeff = 0.3, Eval=0.0, dU, rad;
Standard_Integer IE; Standard_Integer IE;
@ -1891,7 +1891,7 @@ void ChFi3d_FilBuilder::ExtentTwoCorner(const TopoDS_Vertex& V,
Handle(ChFiDS_Stripe) Stripe; Handle(ChFiDS_Stripe) Stripe;
Handle(ChFiDS_Spine) Spine; Handle(ChFiDS_Spine) Spine;
// On calcul une valeur de prolongement symetrique // A value of symetric extension is calculated
for ( ; itel.More(); itel.Next()) { for ( ; itel.More(); itel.Next()) {
Stripe = itel.Value(); Stripe = itel.Value();
Spine = Stripe->Spine(); Spine = Stripe->Spine();
@ -1913,13 +1913,13 @@ void ChFi3d_FilBuilder::ExtentTwoCorner(const TopoDS_Vertex& V,
if (dU > Eval) Eval = dU; if (dU > Eval) Eval = dU;
} }
// On applique // One applies
for (itel.Initialize(LS) ; itel.More(); itel.Next()) { for (itel.Initialize(LS) ; itel.More(); itel.Next()) {
IE = ChFi3d_IndexOfSurfData(V,itel.Value(),Sens); IE = ChFi3d_IndexOfSurfData(V,itel.Value(),Sens);
if (!FF && Stripe == itel.Value()) Sens = -Sens; if (!FF && Stripe == itel.Value()) Sens = -Sens;
Stripe = itel.Value(); Stripe = itel.Value();
Spine = Stripe->Spine(); Spine = Stripe->Spine();
if (! Spine->IsTangencyExtremity((Sens == 1))) { //Pas de prolongement sur queue if (! Spine->IsTangencyExtremity((Sens == 1))) { //No extension on queue
if (Sens == 1){ if (Sens == 1){
Spine->SetFirstParameter(-Eval); Spine->SetFirstParameter(-Eval);
Spine->SetFirstTgt(0.); Spine->SetFirstTgt(0.);
@ -1943,8 +1943,8 @@ void ChFi3d_FilBuilder::ExtentTwoCorner(const TopoDS_Vertex& V,
void ChFi3d_FilBuilder::ExtentThreeCorner(const TopoDS_Vertex& V, void ChFi3d_FilBuilder::ExtentThreeCorner(const TopoDS_Vertex& V,
const ChFiDS_ListOfStripe& LS) const ChFiDS_ListOfStripe& LS)
{ {
// revoir en utilisant les donnees au bout des conges (point,rayon,normale // Review by using the data at end of fillets (point, radius, normal
// aux faces et tangentes a la ligne guide. // to faces and tangents to the guideline.
#ifndef DEB #ifndef DEB
Standard_Integer Sens = 0; Standard_Integer Sens = 0;
#else #else
@ -1963,7 +1963,7 @@ void ChFi3d_FilBuilder::ExtentThreeCorner(const TopoDS_Vertex& V,
} }
} }
Handle(ChFiDS_Spine) Spine = Stripe->Spine(); Handle(ChFiDS_Spine) Spine = Stripe->Spine();
if (Spine->IsTangencyExtremity((Sens == 1))) return; //Pas de prolongement sur queue if (Spine->IsTangencyExtremity((Sens == 1))) return; //No extension on queue
Standard_Real dU = Spine->LastParameter(Spine->NbEdges()); Standard_Real dU = Spine->LastParameter(Spine->NbEdges());
if (Sens == 1){ if (Sens == 1){
Spine->SetFirstParameter(-dU*Coeff); Spine->SetFirstParameter(-dU*Coeff);

100
src/ChFi3d/ChFi3d_FilBuilder_C2.cxx
View File

@ -99,10 +99,10 @@ extern void ChFi3d_ResultChron(OSD_Chronometer & ch,Standard_Real& time);
//======================================================================= //=======================================================================
//function : ToricRotule //function : ToricRotule
//purpose : Teste si on est dans un cas particulier de rotule torique. //purpose : Test if it is a particular case of torus routine.
// Il faut trois plans avec deux conges incidents constants // Three planes with two constant incident fillets
// de meme rayon et la troisieme face perpendiculaire aux // of the same radius and the third face perpendicular to
// deux autres. // two others are required.
//======================================================================= //=======================================================================
static Standard_Boolean ToricRotule(const BRepAdaptor_Surface& fac, static Standard_Boolean ToricRotule(const BRepAdaptor_Surface& fac,
@ -179,17 +179,17 @@ void ChFi3d_FilBuilder::PerformTwoCorner(const Standard_Integer Index)
// gp_Pnt P1,P2; // gp_Pnt P1,P2;
Standard_Integer nbsurf1,nbsurf2,deb1,fin1,deb2,fin2; Standard_Integer nbsurf1,nbsurf2,deb1,fin1,deb2,fin2;
Standard_Real parE1,parE2; Standard_Real parE1,parE2;
//On extrait les informations necessaires sur les conges //Necessary information on fillets is extracted
//------------------------------------------------------ //------------------------------------------------------
//le premier //the first
//---------- //----------
st1 = It.Value(); st1 = It.Value();
Isd1 = ChFi3d_IndexOfSurfData(Vtx,st1,Sens1); Isd1 = ChFi3d_IndexOfSurfData(Vtx,st1,Sens1);
//le deuxieme //the second
//---------- //----------
It.Next(); It.Next();
st2 = It.Value(); st2 = It.Value();
@ -199,7 +199,7 @@ void ChFi3d_FilBuilder::PerformTwoCorner(const Standard_Integer Index)
} }
else{ Isd2 = ChFi3d_IndexOfSurfData(Vtx,st2,Sens2); } else{ Isd2 = ChFi3d_IndexOfSurfData(Vtx,st2,Sens2); }
// Si les deux aretes a arrondir sont tangentes on appelle GeomPlate // If two edges to rounded are tangent GeomPlate is called
if (Sens1==1) E1= st1->Spine()->Edges(1); if (Sens1==1) E1= st1->Spine()->Edges(1);
else E1= st1->Spine()->Edges( st1->Spine()->NbEdges()); else E1= st1->Spine()->Edges( st1->Spine()->NbEdges());
@ -234,8 +234,8 @@ void ChFi3d_FilBuilder::PerformTwoCorner(const Standard_Integer Index)
if (!Okvisavis) { if (!Okvisavis) {
// on ne se limite plus aux premieres ou aux dernieres surfdata // one is not limited to the first or the last surfdata
// pour rechercher celles qui son en vis a vis // to find the opposing data
nbsurf1=st1->SetOfSurfData()->Length(); nbsurf1=st1->SetOfSurfData()->Length();
nbsurf2=st2->SetOfSurfData()->Length(); nbsurf2=st2->SetOfSurfData()->Length();
deb1=1; deb1=1;
@ -289,7 +289,7 @@ void ChFi3d_FilBuilder::PerformTwoCorner(const Standard_Integer Index)
Isd1=ChFi3d_IndexOfSurfData(Vtx,st1,Sens1); Isd1=ChFi3d_IndexOfSurfData(Vtx,st1,Sens1);
Isd2=ChFi3d_IndexOfSurfData(Vtx,st2,Sens2); Isd2=ChFi3d_IndexOfSurfData(Vtx,st2,Sens2);
} }
// StdFail_NotDone::Raise("TwoCorner : pas de face commune"); // StdFail_NotDone::Raise("TwoCorner : no common face");
Standard_Integer IFaArc1 = 3-IFaCo1, IFaArc2 = 3-IFaCo2; Standard_Integer IFaArc1 = 3-IFaCo1, IFaArc2 = 3-IFaCo2;
SeqFil1 = st1->ChangeSetOfSurfData()->ChangeSequence(); SeqFil1 = st1->ChangeSetOfSurfData()->ChangeSequence();
SeqFil2 = st2->ChangeSetOfSurfData()->ChangeSequence(); SeqFil2 = st2->ChangeSetOfSurfData()->ChangeSequence();
@ -298,8 +298,8 @@ void ChFi3d_FilBuilder::PerformTwoCorner(const Standard_Integer Index)
sd2 = SeqFil2.ChangeValue(Isd2); sd2 = SeqFil2.ChangeValue(Isd2);
surf2 = DStr.Surface(sd2->Surf()).Surface(); surf2 = DStr.Surface(sd2->Surf()).Surface();
TopAbs_Orientation OFaCo = FaCo.Orientation(); TopAbs_Orientation OFaCo = FaCo.Orientation();
// On analyse les concavites et on recherche la face en vis a vis // The concavities are analyzed and the opposite face and the
// et l intersection eventuelle des 2 pcurves sur cette face. // eventual intersection of 2 pcurves on this face are found.
ChFiDS_State Stat1,Stat2; ChFiDS_State Stat1,Stat2;
Standard_Boolean isfirst1 = (Sens1 == 1); Standard_Boolean isfirst1 = (Sens1 == 1);
@ -309,9 +309,8 @@ void ChFi3d_FilBuilder::PerformTwoCorner(const Standard_Integer Index)
Standard_Boolean c1biseau = (Stat1 == ChFiDS_AllSame); Standard_Boolean c1biseau = (Stat1 == ChFiDS_AllSame);
Standard_Boolean c1rotule = (Stat1 == ChFiDS_OnSame && Stat2 == ChFiDS_OnSame); Standard_Boolean c1rotule = (Stat1 == ChFiDS_OnSame && Stat2 == ChFiDS_OnSame);
// On verifie que les conges ont bien un commonpoint // It is checked if the fillets have a commonpoint on a common arc.
// sur un arc commun. // This edge is the pivot of the bevel or the knee.
// Cet edge est le pivot du biseau ou de la rotule.
ChFiDS_CommonPoint& CP1 = sd1->ChangeVertex(isfirst1,IFaArc1); ChFiDS_CommonPoint& CP1 = sd1->ChangeVertex(isfirst1,IFaArc1);
ChFiDS_CommonPoint& CP2 = sd2->ChangeVertex(isfirst2,IFaArc2); ChFiDS_CommonPoint& CP2 = sd2->ChangeVertex(isfirst2,IFaArc2);
@ -386,7 +385,6 @@ void ChFi3d_FilBuilder::PerformTwoCorner(const Standard_Integer Index)
} }
} }
if(!ok1 || !ok2){ if(!ok1 || !ok2){
//On est dans un contexte merdique
PerformMoreThreeCorner(Index,2); PerformMoreThreeCorner(Index,2);
done=1; done=1;
return; return;
@ -397,7 +395,7 @@ void ChFi3d_FilBuilder::PerformTwoCorner(const Standard_Integer Index)
ChFi3d_ResultChron(ch ,t_t2cornerinit);//result perf initialisation ChFi3d_ResultChron(ch ,t_t2cornerinit);//result perf initialisation
#endif #endif
//biseau //bevel
//------ //------
ChFiDS_CommonPoint cp11,cp12,cp21,cp22; ChFiDS_CommonPoint cp11,cp12,cp21,cp22;
ChFiDS_FaceInterference intf11,intf12,intf21,intf22; ChFiDS_FaceInterference intf11,intf12,intf21,intf22;
@ -419,7 +417,7 @@ void ChFi3d_FilBuilder::PerformTwoCorner(const Standard_Integer Index)
return; return;
} }
} }
else if(c1rotule){//on sauve. else if(c1rotule){//save.
cp11 = sd1->Vertex(isfirst1,1); cp11 = sd1->Vertex(isfirst1,1);
cp12 = sd1->Vertex(isfirst1,2); cp12 = sd1->Vertex(isfirst1,2);
cp21 = sd2->Vertex(isfirst2,1); cp21 = sd2->Vertex(isfirst2,1);
@ -438,7 +436,7 @@ void ChFi3d_FilBuilder::PerformTwoCorner(const Standard_Integer Index)
ChFi3d_ResultChron(ch , t_perf2cornerbyinter); // result perf PerformTwoCornerbyInter ChFi3d_ResultChron(ch , t_perf2cornerbyinter); // result perf PerformTwoCornerbyInter
#endif #endif
if (!done) { if (!done) {
//on restore // restore
sd1->ChangeVertex(isfirst1,1) = cp11; sd1->ChangeVertex(isfirst1,1) = cp11;
sd1->ChangeVertex(isfirst1,2) = cp12; sd1->ChangeVertex(isfirst1,2) = cp12;
sd2->ChangeVertex(isfirst2,1) = cp21; sd2->ChangeVertex(isfirst2,1) = cp21;
@ -452,7 +450,7 @@ void ChFi3d_FilBuilder::PerformTwoCorner(const Standard_Integer Index)
} }
if(!c1biseau && !done){ if(!c1biseau && !done){
//on cree une nouvelle cornerdata //new cornerdata is created
//------------------------------- //-------------------------------
Handle(ChFiDS_Stripe) corner = new ChFiDS_Stripe(); Handle(ChFiDS_Stripe) corner = new ChFiDS_Stripe();
Handle(ChFiDS_HData)& cornerset = corner->ChangeSetOfSurfData(); Handle(ChFiDS_HData)& cornerset = corner->ChangeSetOfSurfData();
@ -462,11 +460,9 @@ void ChFi3d_FilBuilder::PerformTwoCorner(const Standard_Integer Index)
if (SameSide) { if (SameSide) {
if(ToricRotule(BRFaCo,BRS1,BRS2,st1,st2)){ if(ToricRotule(BRFaCo,BRS1,BRS2,st1,st2)){
// Construction directe. // Direct construction.
// --------------------- // ---------------------
//un petit coup de NextSide, leger....
//------------------------------------
Standard_Integer bid; Standard_Integer bid;
TopAbs_Orientation ori = OFaCo; TopAbs_Orientation ori = OFaCo;
TopAbs_Orientation oriS = st1->Orientation(IFaCo1); TopAbs_Orientation oriS = st1->Orientation(IFaCo1);
@ -490,7 +486,7 @@ void ChFi3d_FilBuilder::PerformTwoCorner(const Standard_Integer Index)
#endif #endif
} }
else { else {
// Construction par remplissage // Construction by filling remplissage
// ---------------------------- // ----------------------------
Standard_Real uPCArc1, uPCArc2; Standard_Real uPCArc1, uPCArc2;
gp_Pnt2d p2da1,p2df1,p2da2,p2df2,p2dfac1,p2dfac2; gp_Pnt2d p2da1,p2df1,p2da2,p2df2,p2dfac1,p2dfac2;
@ -505,7 +501,7 @@ void ChFi3d_FilBuilder::PerformTwoCorner(const Standard_Integer Index)
p2df2 = sd2->Interference(IFaCo2).PCurveOnSurf()->Value(uPCArc2); p2df2 = sd2->Interference(IFaCo2).PCurveOnSurf()->Value(uPCArc2);
sd2->Interference(IFaCo2).PCurveOnFace()->D1(uPCArc2,p2dfac2,v2dfac2); sd2->Interference(IFaCo2).PCurveOnFace()->D1(uPCArc2,p2dfac2,v2dfac2);
#ifdef DEB #ifdef DEB
ChFi3d_InitChron(ch ); // init perf remplissage ChFi3d_InitChron(ch ); // init perf filling
#endif #endif
B1 = ChFi3d_mkbound(surf1,p2df1,p2da1,tolesp,2.e-4); B1 = ChFi3d_mkbound(surf1,p2df1,p2da1,tolesp,2.e-4);
B2 = ChFi3d_mkbound(surf2,p2df2,p2da2,tolesp,2.e-4); B2 = ChFi3d_mkbound(surf2,p2df2,p2da2,tolesp,2.e-4);
@ -577,14 +573,14 @@ void ChFi3d_FilBuilder::PerformTwoCorner(const Standard_Integer Index)
HFaPiv,PCurveOnPiv,OFaCo,1, HFaPiv,PCurveOnPiv,OFaCo,1,
0,0,0,0); 0,0,0,0);
#ifdef DEB #ifdef DEB
ChFi3d_ResultChron(ch , t_remplissage);// result perf remplissage ChFi3d_ResultChron(ch , t_remplissage);// result perf filling
#endif #endif
} }
#ifdef DEB #ifdef DEB
ChFi3d_InitChron(ch); // init perf mise a jour DS ChFi3d_InitChron(ch); // init perf update DS
#endif #endif
if (done){ if (done){
// Mise a jour des 3 CornerData et de la DS // Update 3 CornerData and the DS
// ---------------------------------------- // ----------------------------------------
if(resetcp1){ if(resetcp1){
gp_Pnt pjyl = CP1.Point(); gp_Pnt pjyl = CP1.Point();
@ -609,7 +605,7 @@ void ChFi3d_FilBuilder::PerformTwoCorner(const Standard_Integer Index)
Pf2 = CP1; Pf2 = CP1;
Pl2 = CP2; Pl2 = CP2;
// le coin pour commencer, // the corner to start,
// ----------------------- // -----------------------
ChFiDS_Regul regdeb, regfin; ChFiDS_Regul regdeb, regfin;
If1 = ChFi3d_IndexPointInDS(Pf1,DStr); If1 = ChFi3d_IndexPointInDS(Pf1,DStr);
@ -683,7 +679,7 @@ void ChFi3d_FilBuilder::PerformTwoCorner(const Standard_Integer Index)
} }
corner->SetSolidIndex(st1->SolidIndex()); corner->SetSolidIndex(st1->SolidIndex());
// puis la Stripe du debut, // then the starting Stripe,
// ------------------------ // ------------------------
st1->SetCurve(Icf,isfirst1); st1->SetCurve(Icf,isfirst1);
st1->SetIndexPoint(If1,isfirst1,IFaCo1); st1->SetIndexPoint(If1,isfirst1,IFaCo1);
@ -694,7 +690,7 @@ void ChFi3d_FilBuilder::PerformTwoCorner(const Standard_Integer Index)
sd1->ChangeInterference(IFaCo1).SetParameter(par1,isfirst1); sd1->ChangeInterference(IFaCo1).SetParameter(par1,isfirst1);
if (IFaCo1 == 2) st1->SetOrientation(TopAbs_REVERSED,isfirst1); if (IFaCo1 == 2) st1->SetOrientation(TopAbs_REVERSED,isfirst1);
// puis la Stripe de la fin, // then the end Stripe,
// ------------------------- // -------------------------
st2->SetCurve(Icl,isfirst2); st2->SetCurve(Icl,isfirst2);
st2->SetIndexPoint(Il1,isfirst2,IFaCo2); st2->SetIndexPoint(Il1,isfirst2,IFaCo2);
@ -706,13 +702,13 @@ void ChFi3d_FilBuilder::PerformTwoCorner(const Standard_Integer Index)
if (IFaCo2 == 2) st2->SetOrientation(TopAbs_REVERSED,isfirst2); if (IFaCo2 == 2) st2->SetOrientation(TopAbs_REVERSED,isfirst2);
} }
#ifdef DEB #ifdef DEB
ChFi3d_ResultChron(ch , t_t2cornerDS);// result perf mise a jour DS ChFi3d_ResultChron(ch , t_t2cornerDS);// result perf update DS
#endif #endif
} }
else { else {
//ici il faut distinguer celui ondiff //it is necessary to make difference with
if(!OkinterCC) { if(!OkinterCC) {
Standard_Failure::Raise("TwoCorner : Pas d intersetion pc pc"); Standard_Failure::Raise("TwoCorner : No intersection pc pc");
} }
Handle(ChFiDS_Stripe) stsam, stdif; Handle(ChFiDS_Stripe) stsam, stdif;
Handle(ChFiDS_SurfData) sdsam, sddif; Handle(ChFiDS_SurfData) sdsam, sddif;
@ -738,15 +734,15 @@ void ChFi3d_FilBuilder::PerformTwoCorner(const Standard_Integer Index)
ifacodif = IFaCo1; ifaopdif = IFaArc1; isfirstdif = isfirst1; ifacodif = IFaCo1; ifaopdif = IFaArc1; isfirstdif = isfirst1;
} }
else { else {
Standard_Failure::Raise("TwoCorner : Config inconnue"); Standard_Failure::Raise("TwoCorner : Config unknown");
} }
//On verifie que la surface ondiff a un point sur arc du cote oppose //It is checked if surface ondiff has a point on arc from the side opposed
//a la face commune et que cet arc est connexe a la face d appui //to the common face and if this arc is connected to the base face
//oppose a la face commune de la surface onsame. //opposed to common face of the surface onsame.
ChFiDS_CommonPoint& cpopdif = sddif->ChangeVertex(isfirstdif,ifaopdif); ChFiDS_CommonPoint& cpopdif = sddif->ChangeVertex(isfirstdif,ifaopdif);
if(!cpopdif.IsOnArc()) { if(!cpopdif.IsOnArc()) {
Standard_Failure::Raise Standard_Failure::Raise
("TwoCorner : Pas de point sur restriction sur la surface OnDiff"); ("TwoCorner : No point on restriction on surface OnDiff");
} }
const TopoDS_Edge& Arcopdif = cpopdif.Arc(); const TopoDS_Edge& Arcopdif = cpopdif.Arc();
const TopoDS_Face& Fopsam = TopoDS::Face(DStr.Shape(sdsam->Index(ifaopsam))); const TopoDS_Face& Fopsam = TopoDS::Face(DStr.Shape(sdsam->Index(ifaopsam)));
@ -757,11 +753,11 @@ void ChFi3d_FilBuilder::PerformTwoCorner(const Standard_Integer Index)
} }
else if(!ex.More()) { else if(!ex.More()) {
Standard_Failure::Raise Standard_Failure::Raise
("TwoCorner : Pas de face commune pour boucler le contour"); ("TwoCorner : No common face to loop the contour");
} }
} }
#ifdef DEB #ifdef DEB
ChFi3d_InitChron(ch ); // init perf remplissage ChFi3d_InitChron(ch ); // init perf filling
#endif #endif
Handle(GeomFill_Boundary) Bsam,Bdif,Bfac; Handle(GeomFill_Boundary) Bsam,Bdif,Bfac;
gp_Pnt2d ppopsam = gp_Pnt2d ppopsam =
@ -818,15 +814,15 @@ void ChFi3d_FilBuilder::PerformTwoCorner(const Standard_Integer Index)
HBRFopsam,pcnul,Osurfsam,1, HBRFopsam,pcnul,Osurfsam,1,
0,0,0,0); 0,0,0,0);
#ifdef DEB #ifdef DEB
ChFi3d_ResultChron(ch , t_remplissage);// result perf remplissage ChFi3d_ResultChron(ch , t_remplissage);// result perf filling
#endif #endif
if(!done) Standard_Failure::Raise("concavites inverses : echec"); if(!done) Standard_Failure::Raise("concavites inverted : fail");
#ifdef DEB #ifdef DEB
ChFi3d_InitChron(ch); // init perf mise a jour DS ChFi3d_InitChron(ch); // init perf update DS
#endif #endif
// Mise a jour des 3 CornerData et de la DS // Update 3 CornerData and the DS
// ---------------------------------------- // ----------------------------------------
// le coin pour commencer, // the corner to start,
// ----------------------- // -----------------------
Standard_Real P1deb,P2deb,P1fin,P2fin; Standard_Real P1deb,P2deb,P1fin,P2fin;
Standard_Integer If1,If2,Il1,Il2,Icf,Icl; Standard_Integer If1,If2,Il1,Il2,Icf,Icl;
@ -859,7 +855,7 @@ void ChFi3d_FilBuilder::PerformTwoCorner(const Standard_Integer Index)
tolreached = Max(tolreached,tolr1); tolreached = Max(tolreached,tolr1);
TopOpeBRepDS_Curve Tcurv1(C3d,tolreached); TopOpeBRepDS_Curve Tcurv1(C3d,tolreached);
Icf = DStr.AddCurve(Tcurv1); Icf = DStr.AddCurve(Tcurv1);
// ici petite veru pour mettre la pcurve on face dans la DS // place the pcurve on face in the DS
TopAbs_Orientation OpcFopsam = sdsam->Interference(ifaopsam).Transition(); TopAbs_Orientation OpcFopsam = sdsam->Interference(ifaopsam).Transition();
Standard_Integer IFopsam = sdsam->Index(ifaopsam); Standard_Integer IFopsam = sdsam->Index(ifaopsam);
if(isfirstsam) OpcFopsam = TopAbs::Reverse(OpcFopsam); if(isfirstsam) OpcFopsam = TopAbs::Reverse(OpcFopsam);
@ -904,11 +900,11 @@ void ChFi3d_FilBuilder::PerformTwoCorner(const Standard_Integer Index)
corner->SetSolidIndex(stsam->SolidIndex()); corner->SetSolidIndex(stsam->SolidIndex());
// puis la Stripe OnSame // then Stripe OnSame
// --------------------- // ---------------------
const ChFiDS_FaceInterference& intcoin1 = coin->InterferenceOnS1(); const ChFiDS_FaceInterference& intcoin1 = coin->InterferenceOnS1();
stsam->SetCurve(intcoin1.LineIndex(),isfirstsam); stsam->SetCurve(intcoin1.LineIndex(),isfirstsam);
stsam->InDS(isfirstsam); // filDS fait deja le boulot depuis le coin. stsam->InDS(isfirstsam); // filDS already works from the corner.
stsam->ChangePCurve(isfirstsam) = coin->InterferenceOnS1().PCurveOnFace(); stsam->ChangePCurve(isfirstsam) = coin->InterferenceOnS1().PCurveOnFace();
stsam->SetIndexPoint(If1,isfirstsam,ifaopsam); stsam->SetIndexPoint(If1,isfirstsam,ifaopsam);
stsam->SetIndexPoint(Il1,isfirstsam,ifacosam); stsam->SetIndexPoint(Il1,isfirstsam,ifacosam);
@ -921,7 +917,7 @@ void ChFi3d_FilBuilder::PerformTwoCorner(const Standard_Integer Index)
sdsam->ChangeInterferenceOnS2().SetParameter(uintpcsam,isfirstsam); sdsam->ChangeInterferenceOnS2().SetParameter(uintpcsam,isfirstsam);
if (ifaopsam == 2) stsam->SetOrientation(TopAbs_REVERSED,isfirstsam); if (ifaopsam == 2) stsam->SetOrientation(TopAbs_REVERSED,isfirstsam);
// puis la Stripe OnDiff // then Stripe OnDiff
// --------------------- // ---------------------
stdif->SetCurve(Icl,isfirstdif); stdif->SetCurve(Icl,isfirstdif);
stdif->ChangePCurve(isfirstdif) = pcsurfdif; stdif->ChangePCurve(isfirstdif) = pcsurfdif;
@ -933,7 +929,7 @@ void ChFi3d_FilBuilder::PerformTwoCorner(const Standard_Integer Index)
sddif->ChangeInterference(ifacodif).SetParameter(uintpcdif,isfirstdif); sddif->ChangeInterference(ifacodif).SetParameter(uintpcdif,isfirstdif);
if (ifaopdif == 1) stdif->SetOrientation(TopAbs_REVERSED,isfirstdif); if (ifaopdif == 1) stdif->SetOrientation(TopAbs_REVERSED,isfirstdif);
#ifdef DEB #ifdef DEB
ChFi3d_ResultChron(ch , t_t2cornerDS);// result perf mise a jour DS ChFi3d_ResultChron(ch , t_t2cornerDS);// result perf update DS
#endif #endif
} }
if(!myEVIMap.IsBound(Vtx)){ if(!myEVIMap.IsBound(Vtx)){

130
src/ChFi3d/ChFi3d_FilBuilder_C3.cxx
View File

@ -185,8 +185,8 @@ static Standard_Boolean SearchFD(TopOpeBRepDS_DataStructure& DStr,
//======================================================================= //=======================================================================
//function : ToricCorner //function : ToricCorner
//purpose : Teste si on est dans le cas pariculier d un coin torique //purpose : Test if this is a paricular cas of a torus corner
// (ou spherique limite par des isos). // (or spherical limited by isos).
//======================================================================= //=======================================================================
static Standard_Boolean ToricCorner(const TopoDS_Face& F, static Standard_Boolean ToricCorner(const TopoDS_Face& F,
@ -205,8 +205,8 @@ static Standard_Boolean ToricCorner(const TopoDS_Face& F,
//======================================================================= //=======================================================================
//function : PerformThreeCorner //function : PerformThreeCorner
//purpose : Calcul du conge sur un sommet avec trois aretes //purpose : Calculate fillet on a top with three edges
// incidentes portant chacune un conge. // incident carrying each edge.
//======================================================================= //=======================================================================
void ChFi3d_FilBuilder::PerformThreeCorner(const Standard_Integer Jndex) void ChFi3d_FilBuilder::PerformThreeCorner(const Standard_Integer Jndex)
@ -241,9 +241,9 @@ void ChFi3d_FilBuilder::PerformThreeCorner(const Standard_Integer Jndex)
Index[ii] = ChFi3d_IndexOfSurfData(Vtx,It.Value(),sens[ii]); Index[ii] = ChFi3d_IndexOfSurfData(Vtx,It.Value(),sens[ii]);
CD[ii] = It.Value(); CD[ii] = It.Value();
} }
// On verifie que l une des CD ne figure pas deux fois, au quel cas // It is checked if one of CD is not present twice in which
// il faut modifier le retour de IndexOfSurfData qui prend la // case it is necessary to modify the return of IndexOfSurfData
// premiere des solutions. // that takes the first solution.
if(CD[0] == CD[1]){ if(CD[0] == CD[1]){
Index[1] = CD[1]->SetOfSurfData()->Length(); Index[1] = CD[1]->SetOfSurfData()->Length();
sens[1] = -1; sens[1] = -1;
@ -266,9 +266,9 @@ void ChFi3d_FilBuilder::PerformThreeCorner(const Standard_Integer Jndex)
p[1][2],p[2][1],Index[1],Index[2],face[0],sameside[0], p[1][2],p[2][1],Index[1],Index[2],face[0],sameside[0],
jf[1][2],jf[2][1]); jf[1][2],jf[2][1]);
// //
// Analyse des concavites des 3 conges : // Analyze concavities of 3 fillets :
// - 2 concavites identiques et 1 inverse. // - 2 concavities identic and 1 inverted.
// - 3 concavites identiques // - 3 concavities identic
// //
if(oksea[2] && oksea[1] && !sameside[2] && !sameside[1]) if(oksea[2] && oksea[1] && !sameside[2] && !sameside[1])
{ pivot = 0; deb = 1; fin = 2;} { pivot = 0; deb = 1; fin = 2;}
@ -277,11 +277,11 @@ void ChFi3d_FilBuilder::PerformThreeCorner(const Standard_Integer Jndex)
else if(oksea[1] && oksea[0] && !sameside[1] && !sameside[0]) else if(oksea[1] && oksea[0] && !sameside[1] && !sameside[0])
{ pivot = 2; deb = 0; fin = 1;} { pivot = 2; deb = 0; fin = 1;}
else if(oksea[0] && oksea[1] && oksea[2]){ else if(oksea[0] && oksea[1] && oksea[2]){
// 3 concavites identiques. // 3 concavities identic.
pivot = SearchPivot(sens,p,tol2d); pivot = SearchPivot(sens,p,tol2d);
if(pivot < 0){ if(pivot < 0){
#ifdef DEB #ifdef DEB
cout<<"pivot non trouve, on appelle plate"<<endl; cout<<"pivot not found, plate is called"<<endl;
#endif #endif
PerformMoreThreeCorner(Jndex, 3); PerformMoreThreeCorner(Jndex, 3);
return; return;
@ -303,14 +303,14 @@ void ChFi3d_FilBuilder::PerformThreeCorner(const Standard_Integer Jndex)
ifacfin = CD[fin]->ChangeSetOfSurfData()->Value(i[fin][pivot])->Index(3-jf[fin][pivot]); ifacfin = CD[fin]->ChangeSetOfSurfData()->Value(i[fin][pivot])->Index(3-jf[fin][pivot]);
if(ifacfin != ifacdeb){ if(ifacfin != ifacdeb){
#ifdef DEB #ifdef DEB
cout<<"plusieurs faces d'appui, on appelle plate"<<endl; cout<<"several base faces, plate is called"<<endl;
#endif #endif
PerformMoreThreeCorner(Jndex, 3); PerformMoreThreeCorner(Jndex, 3);
return; return;
} }
if(i[pivot][deb] != i[pivot][fin]){ if(i[pivot][deb] != i[pivot][fin]){
#ifdef DEB #ifdef DEB
cout<<"changement de surfdata sur le pivot, on appelle plate"<<endl; cout<<"load surfdata on the pivot, plate is called"<<endl;
#endif #endif
PerformMoreThreeCorner(Jndex, 3); PerformMoreThreeCorner(Jndex, 3);
return; return;
@ -338,9 +338,9 @@ void ChFi3d_FilBuilder::PerformThreeCorner(const Standard_Integer Jndex)
if(!c1toric)c1spheric=(Abs(qr[0]-qr[1])<tolesp && Abs(qr[0]-qr[2])<tolesp); if(!c1toric)c1spheric=(Abs(qr[0]-qr[1])<tolesp && Abs(qr[0]-qr[2])<tolesp);
} }
// Autrefois pour eviter les bouclages on mettait toujours les // Previously to avoid loops the points were always located
// points a l interieur, ca pouvait gener la construction de la // inside, which could impede the construction of the
// ligne guide du coin qui aujourd hui est un cercle. // guideline of the corner which now is a circle.
// Standard_Integer jjjd = jf[deb][fin], jjjf = jf[fin][deb]; // Standard_Integer jjjd = jf[deb][fin], jjjf = jf[fin][deb];
// if (pivdif) jjjd = jf[deb][pivot], jjjf = jf[fin][pivot]; // if (pivdif) jjjd = jf[deb][pivot], jjjf = jf[fin][pivot];
Standard_Integer jjjd = jf[deb][pivot], jjjf = jf[fin][pivot]; Standard_Integer jjjd = jf[deb][pivot], jjjf = jf[fin][pivot];
@ -352,8 +352,8 @@ void ChFi3d_FilBuilder::PerformThreeCorner(const Standard_Integer Jndex)
0,sens[pivot],Pdp,Vdp,Rdp); 0,sens[pivot],Pdp,Vdp,Rdp);
ChFi3d_ExtrSpineCarac(DStr,CD[pivot],i[pivot][fin],p[pivot][fin], ChFi3d_ExtrSpineCarac(DStr,CD[pivot],i[pivot][fin],p[pivot][fin],
0,sens[pivot],Pfp,Vfp,Rfp); 0,sens[pivot],Pfp,Vfp,Rfp);
//dans le cas allsame on controle que les points sur la face ne //in cas of allsame it is checked that points on the face are not
//sont pas trop pres ce qui risque de faire foirer le cheminement. //too close, which can stop the work.
if(!pivdif) { if(!pivdif) {
gp_Pnt ptestdeb,ptestfin; gp_Vec bidvec; Standard_Real bidr; gp_Pnt ptestdeb,ptestfin; gp_Vec bidvec; Standard_Real bidr;
ChFi3d_ExtrSpineCarac(DStr,CD[deb],i[deb][pivot],p[deb][pivot], ChFi3d_ExtrSpineCarac(DStr,CD[deb],i[deb][pivot],p[deb][pivot],
@ -371,14 +371,14 @@ void ChFi3d_FilBuilder::PerformThreeCorner(const Standard_Integer Jndex)
if(Abs(p[pivot][deb] - p[pivot][fin]) <= tol2d) if(Abs(p[pivot][deb] - p[pivot][fin]) <= tol2d)
c1toric = ToricCorner(face[pivot],Rdeb,Rfin,Vdp); c1toric = ToricCorner(face[pivot],Rdeb,Rfin,Vdp);
} }
// on a le pivot, le CD deb et le CD fin (enfin on espere !?!) : // there is a pivot, the start and the end CD (finally !?!) :
// ------------------------------------------------------------- // -------------------------------------------------------------
// les criteres determinant si le coin est un tore ou une sphere // the criterions determining if the corner is a torus or a sphere
// sont uniquement fondes sur la configuration des sections en // are based only on the configuration of sections at end and the
// bout et la nature des faces, il faudra faire des tests pour // nature of faces, it is necessary to make tests to
// determiner si une analyse plus subtile des conges incidents // determine if a more detailed analysis of incident fillets
// n est pas necessaire pour assurer la tangence entre ceux-ci // is necessare to provide tangency between them and
// et le coin (en particulier dans les cas a rayon variable). // the corner (in particular in the case with variable radius).
@ -390,7 +390,7 @@ void ChFi3d_FilBuilder::PerformThreeCorner(const Standard_Integer Jndex)
fdpiv = CD[pivot]->ChangeSetOfSurfData()->ChangeValue(i[pivot][deb]); fdpiv = CD[pivot]->ChangeSetOfSurfData()->ChangeValue(i[pivot][deb]);
// On construit les HSurfaces et autres outils qui vont bien. // HSurfaces and other suitable tools are constructed.
// ---------------------------------------------------------- // ----------------------------------------------------------
TopAbs_Orientation OFac = face[pivot].Orientation(); TopAbs_Orientation OFac = face[pivot].Orientation();
@ -431,13 +431,13 @@ void ChFi3d_FilBuilder::PerformThreeCorner(const Standard_Integer Jndex)
Handle(GeomAdaptor_HSurface) Surf = new GeomAdaptor_HSurface(gasurf); Handle(GeomAdaptor_HSurface) Surf = new GeomAdaptor_HSurface(gasurf);
// Handle(BRepTopAdaptor_TopolTool) IFac = new BRepTopAdaptor_TopolTool(Fac); // Handle(BRepTopAdaptor_TopolTool) IFac = new BRepTopAdaptor_TopolTool(Fac);
// Essai de ne pas classifier sur la face pour les cas de conges rentrants // Try to not classify on the face for cases of reentering fillets which naturally depass
// qui debordent naturellement. // the border.
Handle(GeomAdaptor_HSurface) Handle(GeomAdaptor_HSurface)
bidsurf = new GeomAdaptor_HSurface(Fac->ChangeSurface().Surface()); bidsurf = new GeomAdaptor_HSurface(Fac->ChangeSurface().Surface());
Handle(Adaptor3d_TopolTool) Handle(Adaptor3d_TopolTool)
IFac = new Adaptor3d_TopolTool(bidsurf); IFac = new Adaptor3d_TopolTool(bidsurf);
// fin de l essai. // end of the attempt.
Handle(Adaptor3d_TopolTool) ISurf = new Adaptor3d_TopolTool(Surf); Handle(Adaptor3d_TopolTool) ISurf = new Adaptor3d_TopolTool(Surf);
Handle(ChFiDS_Stripe) corner = new ChFiDS_Stripe(); Handle(ChFiDS_Stripe) corner = new ChFiDS_Stripe();
Handle(ChFiDS_HData)& cornerset = corner->ChangeSetOfSurfData(); Handle(ChFiDS_HData)& cornerset = corner->ChangeSetOfSurfData();
@ -489,30 +489,30 @@ void ChFi3d_FilBuilder::PerformThreeCorner(const Standard_Integer Jndex)
if (c1toric){ if (c1toric){
#ifdef DEB #ifdef DEB
ChFi3d_InitChron(ch); // init perf cas torique ChFi3d_InitChron(ch); // init perf case torus
#endif #endif
// Construction directe. // Direct Construction.
// --------------------- // ---------------------
done = ChFiKPart_ComputeData::ComputeCorner done = ChFiKPart_ComputeData::ComputeCorner
(DStr,coin,Fac,Surf,oo1,oo2,o1,o2,Rdeb,Rdp,pfac1,pfac2,psurf1,psurf2); (DStr,coin,Fac,Surf,oo1,oo2,o1,o2,Rdeb,Rdp,pfac1,pfac2,psurf1,psurf2);
#ifdef DEB #ifdef DEB
ChFi3d_ResultChron(ch , t_torique); // result perf cas torique ChFi3d_ResultChron(ch , t_torique); // result perf case torus
#endif #endif
} }
else if(c1spheric){ else if(c1spheric){
#ifdef DEB #ifdef DEB
ChFi3d_InitChron(ch); //init perf cas spherique ChFi3d_InitChron(ch); //init perf case sphere
#endif #endif
done = ChFiKPart_ComputeData::ComputeCorner done = ChFiKPart_ComputeData::ComputeCorner
(DStr,coin,Fac,Surf,oo1,oo2,o1,o2,Rdp,pfac1,psurf1,psurf2); (DStr,coin,Fac,Surf,oo1,oo2,o1,o2,Rdp,pfac1,psurf1,psurf2);
#ifdef DEB #ifdef DEB
ChFi3d_ResultChron(ch , t_spherique);// result perf cas spherique ChFi3d_ResultChron(ch , t_spherique);// result perf cas sphere
#endif #endif
} }
@ -526,14 +526,14 @@ void ChFi3d_FilBuilder::PerformThreeCorner(const Standard_Integer Jndex)
ChFi3d_InitChron(ch);// init perf not filling ChFi3d_InitChron(ch);// init perf not filling
#endif #endif
//on se calcule une ligne guide, //Calculate a guideline,
//------------------------------ //------------------------------
//Problemes nombreux de bouclages et demi-tours lies //Numerous problems with loops and half-turns connected to
//a la courbure de la ligne guide !!!!!! //the curvature of the guideline !!!!!!
//POUR L INSTANT CERCLE. //FOR CIRCLE.
//Si un jour on change de nature de ligne guide il faudra //If the nature of guideline is changed it is necessary to
//remettre les points Pdeb et Pfin a l interieur (voir le //reset points Pdeb and Pfin at the inside (see the
//commentaire a ce sujet a la ligne du calcul de Pdeb et Pfin). //comments about it in the calculation of Pdeb and Pfin).
Standard_Real radpondere = (Rdp+Rfp)/2.; Standard_Real radpondere = (Rdp+Rfp)/2.;
Standard_Real locfleche = fleche; Standard_Real locfleche = fleche;
@ -543,8 +543,8 @@ void ChFi3d_FilBuilder::PerformThreeCorner(const Standard_Integer Jndex)
Pdeb,Vdeb, Pdeb,Vdeb,
Pfin,Vfin,radpondere); Pfin,Vfin,radpondere);
if(spinecoin.IsNull()){ if(spinecoin.IsNull()){
// On est dans un cas pourri ou l intersection des plans // This is a bad case when the intersection of
// de section se fait en dehors du secteur. // section planes is done out of the sector.
spinecoin = ChFi3d_Spine(Pdeb,Vdeb, spinecoin = ChFi3d_Spine(Pdeb,Vdeb,
Pfin,Vfin,radpondere); Pfin,Vfin,radpondere);
WFirst = 0.; WLast = 1.; WFirst = 0.; WLast = 1.;
@ -555,11 +555,11 @@ void ChFi3d_FilBuilder::PerformThreeCorner(const Standard_Integer Jndex)
cornerspine->ChangeCurve().SetCurve(spinecoin); cornerspine->ChangeCurve().SetCurve(spinecoin);
cornerspine->ChangeCurve().FirstParameter(WFirst - pasmax); cornerspine->ChangeCurve().FirstParameter(WFirst - pasmax);
cornerspine->ChangeCurve().LastParameter(WLast + pasmax); cornerspine->ChangeCurve().LastParameter(WLast + pasmax);
// Juste pour leurrer le Compute data qui ne doit pas // Just to confuse Compute that should not require this
// en avoir besoin dans ce cas precis ... // in this exact case ...
Handle(ChFiDS_Spine) NullSpine; Handle(ChFiDS_Spine) NullSpine;
// On calcule le conge : - de deb vers fin // The fillet is calculated - from beginning to end
// - de la face vers la surface // - from the face to the surface
// //
math_Vector Soldep(1,4); math_Vector Soldep(1,4);
Soldep(1) = pfac1.X(); Soldep(1) = pfac1.X();
@ -628,9 +628,9 @@ void ChFi3d_FilBuilder::PerformThreeCorner(const Standard_Integer Jndex)
ChFi3d_InitChron(ch); // init perf filling ChFi3d_InitChron(ch); // init perf filling
#endif #endif
// le contour a remplir est constitue de droites uv sur deb et fin // the contour to be fillet consists of straight lines uv in beginning and end
// de deux pcurves (une seule si c1pointu) calculees comme on peut // of two pcurves (only one if c1pointu) calculted as possible
// sur piv et la face opposee. // on piv and the opposite face.
Handle(GeomFill_Boundary) Bdeb,Bfin,Bpiv,Bfac; Handle(GeomFill_Boundary) Bdeb,Bfin,Bpiv,Bfac;
Handle(Geom2d_Curve) PCurveOnFace; Handle(Geom2d_Curve) PCurveOnFace;
if(!c1pointu) if(!c1pointu)
@ -678,7 +678,7 @@ void ChFi3d_FilBuilder::PerformThreeCorner(const Standard_Integer Jndex)
else fil.Init(Bpiv,Bfin,Bfac,Bdeb,1); else fil.Init(Bpiv,Bfin,Bfac,Bdeb,1);
Handle(Geom_Surface) Surfcoin = fil.Surface(); Handle(Geom_Surface) Surfcoin = fil.Surface();
Surfcoin->VReverse(); // on se ramene au sens face surf; Surfcoin->VReverse(); // revert to direction face surface;
done = CompleteData(coin,Surfcoin, done = CompleteData(coin,Surfcoin,
Fac,PCurveOnFace, Fac,PCurveOnFace,
Surf,PCurveOnPiv,fdpiv->Orientation(),0, Surf,PCurveOnPiv,fdpiv->Orientation(),0,
@ -697,11 +697,11 @@ void ChFi3d_FilBuilder::PerformThreeCorner(const Standard_Integer Jndex)
} }
if (done){ if (done){
// Mise a jour des 4 Stripes et de la DS // Update of 4 Stripes and the DS
// ------------------------------------- // -------------------------------------
#ifdef DEB #ifdef DEB
ChFi3d_InitChron(ch);// init perf mise a jour DS ChFi3d_InitChron(ch);// init perf update DS
#endif #endif
gp_Pnt2d pp1,pp2; gp_Pnt2d pp1,pp2;
@ -719,7 +719,7 @@ void ChFi3d_FilBuilder::PerformThreeCorner(const Standard_Integer Jndex)
pbf1->Add(Pf1.Point());pbf2->Add(Pf2.Point()); pbf1->Add(Pf1.Point());pbf2->Add(Pf2.Point());
pbl1->Add(Pl1.Point());pbl2->Add(Pl2.Point()); pbl1->Add(Pl1.Point());pbl2->Add(Pl2.Point());
// le coin pour commencer, // the start corner,
// ----------------------- // -----------------------
ChFiDS_Regul regdeb, regfin; ChFiDS_Regul regdeb, regfin;
If1 = ChFi3d_IndexPointInDS(Pf1,DStr); If1 = ChFi3d_IndexPointInDS(Pf1,DStr);
@ -773,8 +773,8 @@ void ChFi3d_FilBuilder::PerformThreeCorner(const Standard_Integer Jndex)
corner->ChangeIndexLastPointOnS2(Il2); corner->ChangeIndexLastPointOnS2(Il2);
ChFi3d_EnlargeBox(DStr,corner,coin,*pbl1,*pbl2,0); ChFi3d_EnlargeBox(DStr,corner,coin,*pbl1,*pbl2,0);
// puis la CornerData du debut, // then CornerData of the beginning,
// ---------------------------- // --------------------------------
Standard_Boolean isfirst = (sens[deb] == 1), rev = (jf[deb][fin] == 2); Standard_Boolean isfirst = (sens[deb] == 1), rev = (jf[deb][fin] == 2);
Standard_Integer isurf1 = 1, isurf2 = 2; Standard_Integer isurf1 = 1, isurf2 = 2;
parpp1 = p[deb][fin]; parpp2 = p[deb][pivot]; parpp1 = p[deb][fin]; parpp2 = p[deb][pivot];
@ -803,8 +803,8 @@ void ChFi3d_FilBuilder::PerformThreeCorner(const Standard_Integer Jndex)
if(rev) ChFi3d_EnlargeBox(DStr,CD[deb],fddeb,*pbf2,*pbf1,isfirst); if(rev) ChFi3d_EnlargeBox(DStr,CD[deb],fddeb,*pbf2,*pbf1,isfirst);
else ChFi3d_EnlargeBox(DStr,CD[deb],fddeb,*pbf1,*pbf2,isfirst); else ChFi3d_EnlargeBox(DStr,CD[deb],fddeb,*pbf1,*pbf2,isfirst);
// puis la CornerData de la fin, // then the end CornerData,
// ----------------------------- // ------------------------
isfirst = (sens[fin] == 1); rev = (jf[fin][deb] == 2); isfirst = (sens[fin] == 1); rev = (jf[fin][deb] == 2);
isurf1 = 1; isurf2 = 2; isurf1 = 1; isurf2 = 2;
parpp1 = p[fin][deb]; parpp2 = p[fin][pivot]; parpp1 = p[fin][deb]; parpp2 = p[fin][pivot];
@ -833,7 +833,7 @@ void ChFi3d_FilBuilder::PerformThreeCorner(const Standard_Integer Jndex)
if(rev) ChFi3d_EnlargeBox(DStr,CD[fin],fdfin,*pbl2,*pbl1,isfirst); if(rev) ChFi3d_EnlargeBox(DStr,CD[fin],fdfin,*pbl2,*pbl1,isfirst);
else ChFi3d_EnlargeBox(DStr,CD[fin],fdfin,*pbl1,*pbl2,isfirst); else ChFi3d_EnlargeBox(DStr,CD[fin],fdfin,*pbl1,*pbl2,isfirst);
// et enfin le pivot. // anf finally the pivot.
// ------------------ // ------------------
ChFiDS_FaceInterference& fi = coin->ChangeInterferenceOnS2(); ChFiDS_FaceInterference& fi = coin->ChangeInterferenceOnS2();
isfirst = (sens[pivot] == 1); rev = (jf[pivot][deb] == 2); isfirst = (sens[pivot] == 1); rev = (jf[pivot][deb] == 2);
@ -861,18 +861,18 @@ void ChFi3d_FilBuilder::PerformThreeCorner(const Standard_Integer Jndex)
fdpiv->ChangeVertex(isfirst,isurf2) = Pl2; fdpiv->ChangeVertex(isfirst,isurf2) = Pl2;
fdpiv->ChangeInterference(isurf1).SetParameter(p[pivot][deb],isfirst); fdpiv->ChangeInterference(isurf1).SetParameter(p[pivot][deb],isfirst);
fdpiv->ChangeInterference(isurf2).SetParameter(p[pivot][fin],isfirst); fdpiv->ChangeInterference(isurf2).SetParameter(p[pivot][fin],isfirst);
CD[pivot]->InDS(isfirst); // filDS fait deja le boulot depuis le coin. CD[pivot]->InDS(isfirst); // filDS already does it from the corner.
if(rev) ChFi3d_EnlargeBox(DStr,CD[pivot],fdpiv,*pbl2,*pbf2,isfirst); if(rev) ChFi3d_EnlargeBox(DStr,CD[pivot],fdpiv,*pbl2,*pbf2,isfirst);
else ChFi3d_EnlargeBox(DStr,CD[pivot],fdpiv,*pbf2,*pbl2,isfirst); else ChFi3d_EnlargeBox(DStr,CD[pivot],fdpiv,*pbf2,*pbl2,isfirst);
//Pour finir on recale les tolerances des points. //To end the tolerances of points are rescaled.
ChFi3d_SetPointTolerance(DStr,*pbf1,If1); ChFi3d_SetPointTolerance(DStr,*pbf1,If1);
ChFi3d_SetPointTolerance(DStr,*pbf2,If2); ChFi3d_SetPointTolerance(DStr,*pbf2,If2);
ChFi3d_SetPointTolerance(DStr,*pbl1,Il1); ChFi3d_SetPointTolerance(DStr,*pbl1,Il1);
ChFi3d_SetPointTolerance(DStr,*pbl2,Il2); ChFi3d_SetPointTolerance(DStr,*pbl2,Il2);
} }
//On tronque les corners data et met a jour les index. //The data corners are truncated and index is updated.
//---------------------------------------------------- //----------------------------------------------------
if(i[deb][pivot] < Index[deb]){ if(i[deb][pivot] < Index[deb]){
@ -891,7 +891,7 @@ void ChFi3d_FilBuilder::PerformThreeCorner(const Standard_Integer Jndex)
CD[fin]->ChangeSetOfSurfData()->Remove(Index[fin],i[fin][pivot]-1); CD[fin]->ChangeSetOfSurfData()->Remove(Index[fin],i[fin][pivot]-1);
i[fin][pivot] = Index[fin]; i[fin][pivot] = Index[fin];
} }
// il faudra ici tenir compte des coins mutants. // it is necessary to take into account mutant corners.
if(i[pivot][deb] < Index[pivot]) { if(i[pivot][deb] < Index[pivot]) {
CD[pivot]->ChangeSetOfSurfData()->Remove(i[pivot][deb]+1,Index[pivot]); CD[pivot]->ChangeSetOfSurfData()->Remove(i[pivot][deb]+1,Index[pivot]);
Index[pivot] = i[pivot][deb]; Index[pivot] = i[pivot][deb];
@ -909,6 +909,6 @@ void ChFi3d_FilBuilder::PerformThreeCorner(const Standard_Integer Jndex)
myListStripe.Append(corner); myListStripe.Append(corner);
#ifdef DEB #ifdef DEB
ChFi3d_ResultChron(ch , t_t3cornerDS);// result perf mise a jour DS ChFi3d_ResultChron(ch , t_t3cornerDS);// result perf update DS
#endif #endif
} }

69
src/ChFiDS/ChFiDS_FilSpine.cxx
View File

@ -317,7 +317,7 @@ Standard_Real ChFiDS_FilSpine::Radius(const Standard_Integer IE)const
par = parandrad(i).X(); par = parandrad(i).X();
rad = parandrad(i).Y(); rad = parandrad(i).Y();
if (Abs( rad-StartRad ) > Precision::Confusion()) if (Abs( rad-StartRad ) > Precision::Confusion())
Standard_DomainError::Raise("Arete non constante"); Standard_DomainError::Raise("Edge is not constant");
if (Abs( Ul-par ) <= gp::Resolution()) if (Abs( Ul-par ) <= gp::Resolution())
return StartRad; return StartRad;
if (par > Ul) if (par > Ul)
@ -333,7 +333,7 @@ Standard_Real ChFiDS_FilSpine::Radius(const Standard_Integer IE)const
Standard_Real ChFiDS_FilSpine::Radius()const Standard_Real ChFiDS_FilSpine::Radius()const
{ {
if (!IsConstant()) Standard_DomainError::Raise("Spine non constante"); if (!IsConstant()) Standard_DomainError::Raise("Spine is not constant");
return parandrad(1).Y(); return parandrad(1).Y();
} }
@ -401,7 +401,7 @@ static void mklaw(Law_Laws& res,
if(npr.IsEmpty()){ if(npr.IsEmpty()){
if( Rdeb < 0. && Rfin <0. ) if( Rdeb < 0. && Rfin <0. )
Standard_DomainError::Raise("construction de la loi impossible"); Standard_DomainError::Raise("Impossible to create the law");
else if(Rdeb < 0. || Rfin <0.){ else if(Rdeb < 0. || Rfin <0.){
Standard_Real r = (Rfin<0.)? Rdeb : Rfin; Standard_Real r = (Rfin<0.)? Rdeb : Rfin;
Handle(Law_Constant) loi = new Law_Constant(); Handle(Law_Constant) loi = new Law_Constant();
@ -415,7 +415,6 @@ static void mklaw(Law_Laws& res,
} }
} }
else{ else{
//tri bourrin!!
if(!yaunpointsurledeb && Rdeb >= 0.) npr.Append(gp_XY(curdeb,Rdeb)); if(!yaunpointsurledeb && Rdeb >= 0.) npr.Append(gp_XY(curdeb,Rdeb));
if(!yaunpointsurlefin && Rfin >= 0.) npr.Append(gp_XY(curfin,Rfin)); if(!yaunpointsurlefin && Rfin >= 0.) npr.Append(gp_XY(curfin,Rfin));
Standard_Integer nbp = npr.Length(); Standard_Integer nbp = npr.Length();
@ -430,7 +429,7 @@ static void mklaw(Law_Laws& res,
} }
} }
} }
//On vire les doublons. //Duplicates are removed.
Standard_Boolean fini = (nbp <= 1); Standard_Boolean fini = (nbp <= 1);
i = 1; i = 1;
while (!fini) { while (!fini) {
@ -479,7 +478,7 @@ Handle(Law_Composite) ChFiDS_FilSpine::ComputeLaw
Standard_Integer ideb = Index(deb,Standard_True); Standard_Integer ideb = Index(deb,Standard_True);
Standard_Integer ifin = Index(fin,Standard_False); Standard_Integer ifin = Index(fin,Standard_False);
Standard_Integer len = NbEdges(); Standard_Integer len = NbEdges();
// si la spine est periodique attention aux index et aux parametres!!! // if the spine is periodic, attention to the index and parameters
Standard_Real spinedeb = FirstParameter(); Standard_Real spinedeb = FirstParameter();
Standard_Real spinefin = LastParameter(); Standard_Real spinefin = LastParameter();
@ -511,15 +510,15 @@ Handle(Law_Composite) ChFiDS_FilSpine::ComputeLaw
} }
if(Els->IsPeriodic()){ if(Els->IsPeriodic()){
//On cree une composite periodique de range eventuellement // A pereodic composite is created at range, which is eventually
//decale par rapport a l elspine, pour ne pas faire de l // offset relatively to the elspine, to avoid a single point at
//origine un point singulier. // origin.
loi->SetPeriodic(); loi->SetPeriodic();
//Y a t il une arete constante? //Is there a constant edge?
// for(Standard_Integer k = 1; k <= len; k++){ // for(Standard_Integer k = 1; k <= len; k++){
Standard_Integer k; Standard_Integer k;
for( k = 1; k <= len; k++){ for( k = 1; k <= len; k++){
if (IsConstant(k)){ // oui ! if (IsConstant(k)){ // yes !
spinedeb = deb = curdeb = FirstParameter(k); spinedeb = deb = curdeb = FirstParameter(k);
spinefin = fin = deb + Period(); spinefin = fin = deb + Period();
for(Standard_Integer l = 1; l <= len; l++){ for(Standard_Integer l = 1; l <= len; l++){
@ -527,7 +526,7 @@ Handle(Law_Composite) ChFiDS_FilSpine::ComputeLaw
} }
Rdeb = Rfin = Radius(k); Rdeb = Rfin = Radius(k);
icur++; icur++;
if(len == 1) curfin = LastParameter(k);//car le InPeriod va rendre 0.!!! if(len == 1) curfin = LastParameter(k);//because InPeriod will make 0.!!!
else curfin = ElCLib::InPeriod(LastParameter(k),spinedeb,spinefin); else curfin = ElCLib::InPeriod(LastParameter(k),spinedeb,spinefin);
Handle(Law_Constant) curloi = new Law_Constant(); Handle(Law_Constant) curloi = new Law_Constant();
curloi->Set(Rdeb,curdeb,curfin); curloi->Set(Rdeb,curdeb,curfin);
@ -536,9 +535,9 @@ Handle(Law_Composite) ChFiDS_FilSpine::ComputeLaw
break; break;
} }
} }
if(k > len){ // non ! if(k > len){ // no !
if(parandrad.IsEmpty()) if(parandrad.IsEmpty())
Standard_DomainError::Raise("Rayon non defini"); Standard_DomainError::Raise("Radius not defined");
Standard_Integer nbp = parandrad.Length(); Standard_Integer nbp = parandrad.Length();
if(nbp > 1){ if(nbp > 1){
deb = parandrad.First().X(); deb = parandrad.First().X();
@ -558,7 +557,7 @@ Handle(Law_Composite) ChFiDS_FilSpine::ComputeLaw
} }
} }
else if(IsPeriodic()){ else if(IsPeriodic()){
// le rayon au debut. // start radius.
if (IsConstant(ind(1))) { if (IsConstant(ind(1))) {
Rdeb = Radius(ind(1)); Rdeb = Radius(ind(1));
curfin = LastParameter(ind(1)); curfin = LastParameter(ind(1));
@ -571,29 +570,29 @@ Handle(Law_Composite) ChFiDS_FilSpine::ComputeLaw
icur++; icur++;
} }
else{ else{
// Il y a forcement un kpart juste avant! // There is inevitably kpart right before!
Standard_Integer iprec = (ind(1) - 1); Standard_Integer iprec = (ind(1) - 1);
if(iprec == 0) iprec = len; if(iprec == 0) iprec = len;
if (IsConstant(iprec)){ if (IsConstant(iprec)){
Rdeb = Radius(iprec); Rdeb = Radius(iprec);
} }
else Standard_DomainError::Raise("AppendLaw : pas de precedant constant bizarre!!"); else Standard_DomainError::Raise("AppendLaw : previous constant is missing!");
lawencours = Standard_True; lawencours = Standard_True;
} }
// le rayon a la fin. // the raduis at end.
if (IsConstant(ind(nbed))) Rfin = Radius(ind(nbed)); if (IsConstant(ind(nbed))) Rfin = Radius(ind(nbed));
else{ else{
// Il y a forcement un kpart juste apres! // There is inevitably kpart right after!
Standard_Integer isuiv = (ind(nbed) + 1); Standard_Integer isuiv = (ind(nbed) + 1);
if(isuiv == len + 1) isuiv = 1; if(isuiv == len + 1) isuiv = 1;
if (IsConstant(isuiv)) { if (IsConstant(isuiv)) {
Rfin = Radius(isuiv); Rfin = Radius(isuiv);
} }
else Standard_DomainError::Raise("AppendLaw : pas de suivant constant bizarre!!"); else Standard_DomainError::Raise("AppendLaw : next constant is missing!");
} }
} }
else{ else{
// le rayon au debut. // the radius at start.
if (IsConstant(ind(1))) { if (IsConstant(ind(1))) {
Rdeb = Radius(ind(1)); Rdeb = Radius(ind(1));
curfin = Min(fin,LastParameter(ind(1))); curfin = Min(fin,LastParameter(ind(1)));
@ -608,30 +607,30 @@ Handle(Law_Composite) ChFiDS_FilSpine::ComputeLaw
if (IsConstant(ind(1) - 1)){ if (IsConstant(ind(1) - 1)){
Rdeb = Radius(ind(1) - 1); Rdeb = Radius(ind(1) - 1);
} }
else Standard_DomainError::Raise("AppendLaw : pas de precedant constant"); else Standard_DomainError::Raise("AppendLaw : previous constant is missing");
} }
else if(parandrad.IsEmpty()){ else if(parandrad.IsEmpty()){
Standard_DomainError::Raise("AppendLaw : pas rayon sur vertex"); Standard_DomainError::Raise("AppendLaw : no radius on vertex");
} }
else Rdeb = -1.; else Rdeb = -1.;
lawencours = Standard_True; lawencours = Standard_True;
} }
// le rayon a la fin. // the radius at end.
if (IsConstant(ind(nbed))) Rfin = Radius(ind(nbed)); if (IsConstant(ind(nbed))) Rfin = Radius(ind(nbed));
else{ else{
if(ind(nbed) < len){ if(ind(nbed) < len){
if (IsConstant(ind(nbed) + 1)) Rfin = Radius(ind(nbed) + 1); if (IsConstant(ind(nbed) + 1)) Rfin = Radius(ind(nbed) + 1);
else Standard_DomainError::Raise("AppendLaw : pas de suivant constant"); else Standard_DomainError::Raise("AppendLaw : next constant is missing");
} }
else if(parandrad.IsEmpty()){ else if(parandrad.IsEmpty()){
Standard_DomainError::Raise("AppendLaw : pas rayon sur vertex"); Standard_DomainError::Raise("AppendLaw : no radius on vertex");
} }
else Rfin = -1.; else Rfin = -1.;
} }
} }
// On a les infos sur les extremites de l elspine, // There are infos on the extremities of the elspine,
// on parcourt toutes les aretes // all edges are parsed
for(; icur <= nbed; icur++){ for(; icur <= nbed; icur++){
if (IsConstant(ind(icur))) { if (IsConstant(ind(icur))) {
Rcur = Radius(ind(icur)); Rcur = Radius(ind(icur));
@ -647,8 +646,8 @@ Handle(Law_Composite) ChFiDS_FilSpine::ComputeLaw
if(IsPeriodic()){ if(IsPeriodic()){
curfin = ElCLib::InPeriod(curfin,spinedeb + tol3d, spinefin + tol3d); curfin = ElCLib::InPeriod(curfin,spinedeb + tol3d, spinefin + tol3d);
if(ind(icur) == ind(nbed)){ if(ind(icur) == ind(nbed)){
// Attention le curfin peut etre faut si le dernier edge passe par // Attention the curfin can be wrong if the last edge passes
// dessus l origine de la spine periodique. // above the origin periodic spline.
Standard_Real biddeb = FirstParameter(ind(icur)); Standard_Real biddeb = FirstParameter(ind(icur));
biddeb = ElCLib::InPeriod(biddeb,spinedeb + tol3d, spinefin + tol3d); biddeb = ElCLib::InPeriod(biddeb,spinedeb + tol3d, spinefin + tol3d);
if(biddeb >= curfin) curfin = fin; if(biddeb >= curfin) curfin = fin;
@ -671,8 +670,8 @@ Handle(Law_Composite) ChFiDS_FilSpine::ComputeLaw
curfin = Min(fin,curfin); curfin = Min(fin,curfin);
lawencours = Standard_True; lawencours = Standard_True;
if(ind(icur) == ind(nbed)){ if(ind(icur) == ind(nbed)){
// Attention le curfin peut etre faut si le dernier edge passe par // Attention the curfin can be wrong if the last edge passes
// dessus l origine de la spine periodique. // above the origin periodic spline.
if(IsPeriodic()) { if(IsPeriodic()) {
Standard_Real biddeb = FirstParameter(ind(icur)); Standard_Real biddeb = FirstParameter(ind(icur));
curfin = LastParameter(ind(icur)); curfin = LastParameter(ind(icur));
@ -681,7 +680,7 @@ Handle(Law_Composite) ChFiDS_FilSpine::ComputeLaw
if(biddeb >= curfin) curfin = fin; if(biddeb >= curfin) curfin = fin;
else curfin = Min(fin,curfin); else curfin = Min(fin,curfin);
} }
// ou si on est en fin de spine avec prolongement. // or if it is the end of spine with extension.
else if(ind(icur) == len) curfin = fin; else if(ind(icur) == len) curfin = fin;
Law_Laws temp; Law_Laws temp;
mklaw(temp,parandrad,curdeb,curfin,Rdeb,Rfin, mklaw(temp,parandrad,curdeb,curfin,Rdeb,Rfin,
@ -719,11 +718,11 @@ Handle(Law_Composite) ChFiDS_FilSpine::Law(const Handle(ChFiDS_HElSpine)& Els) c
Handle(Law_Function)& ChFiDS_FilSpine::ChangeLaw(const TopoDS_Edge& E) Handle(Law_Function)& ChFiDS_FilSpine::ChangeLaw(const TopoDS_Edge& E)
{ {
if(!SplitDone()) { if(!SplitDone()) {
Standard_DomainError::Raise("ChFiDS_FilSpine::ChangeLaw : les bornes ne sont pas a jour"); Standard_DomainError::Raise("ChFiDS_FilSpine::ChangeLaw : the limits are not up-to-date");
} }
Standard_Integer IE = Index(E); Standard_Integer IE = Index(E);
if (IsConstant(IE)) { if (IsConstant(IE)) {
Standard_DomainError::Raise("ChFiDS_FilSpine::ChangeLaw : pas de loi sur les aretes constantes"); Standard_DomainError::Raise("ChFiDS_FilSpine::ChangeLaw : no law on constant edges");
} }
Handle(ChFiDS_HElSpine) hsp = ElSpine(IE); Handle(ChFiDS_HElSpine) hsp = ElSpine(IE);
Standard_Real w = 0.5*(FirstParameter(IE) + LastParameter(IE)); Standard_Real w = 0.5*(FirstParameter(IE) + LastParameter(IE));

72
src/ChFiDS/ChFiDS_Spine.cdl
View File

@ -9,31 +9,30 @@
class Spine from ChFiDS inherits TShared from MMgt class Spine from ChFiDS inherits TShared from MMgt
---Purpose: Contient les informations necessaires a la ---Purpose: Contains information necessary for construction of
-- construction d un conge volumique : -- a 3D fillet :
-- --
-- --
-- - ligne guide composee d'edges du solide, tangents -- - guideline composed of edges of the solid, tangents
-- entre eux, et bordes par des faces tangentes entre -- between them, and borders by faces tangents
-- elles. -- between them.
-- --
-- Les outils de construction du Sp -- Tools for construction of the Sp
-- par propagation a partir d un edge du solide sont -- by propagation from an edge of solid
-- fournis dans le Builder de Fil3d. -- are provided in the Builder of Fil3d.
-- --
-- Le Spine contient par aileurs des -- The Spine contains among others the
-- informations concernant la nature des extremites -- information about the nature of extremities
-- du conge ( sur bord libre, sur cassure ou ferme ). -- of the fillet ( on free border , on section or closed ).
-- --
-- REMARQUE IMPORTANTE : la ligne guide ainsi -- IMPORTANT NOTE : the guideline
-- representee n est pas C2, alors que le cheminement -- represented in this way is not C2, although the path
-- le reclame. Un certain nombre d amenagements -- claims it. Several palliative workarounds
-- paliatifs (voir les methodes en fin) sont prevus, -- (see the methods at the end) are planned,
-- s ils sont insuffisants il faudra changer notre -- but they are not enough. It is necessary to change
-- fusil d epaule et doubler le Spine d -- the approach and double the Spine of line C2 with
-- une ligne C2 avec les consequences que l on sait -- the known consequences for management of
-- pour gerer les va et vient entre KPart Blend dans -- interactions between KPart Blend in Fil3d.
-- Fil3d.
@ -66,11 +65,11 @@ is
Create(Tol : Real from Standard) returns mutable Spine from ChFiDS; Create(Tol : Real from Standard) returns mutable Spine from ChFiDS;
SetEdges(me : mutable; E : Edge from TopoDS) is static; SetEdges(me : mutable; E : Edge from TopoDS) is static;
---Purpose: stocker les edges qui vont composer la ligne guide ---Purpose: store edges composing the guideline
---C++: inline ---C++: inline
PutInFirst(me : mutable; E : Edge from TopoDS) is static; PutInFirst(me : mutable; E : Edge from TopoDS) is static;
---Purpose:stocker l edge en premiere position avant tous les autres ---Purpose: store the edge at the first position before all others
---C++: inline ---C++: inline
NbEdges(me) returns Integer is static; NbEdges(me) returns Integer is static;
@ -83,14 +82,14 @@ is
SetFirstStatus(me : mutable; S : State from ChFiDS) is static; SetFirstStatus(me : mutable; S : State from ChFiDS) is static;
---Purpose: stocker si le debut de l ensemble des edges demarre ---Purpose: stores if the start of a set of edges starts on a
-- sur une cassure un bord libre ou forme un contour ferme -- section of free border or forms a closed contour
---C++: inline ---C++: inline
SetLastStatus(me : mutable; S : State from ChFiDS) is static; SetLastStatus(me : mutable; S : State from ChFiDS) is static;
---Purpose: stocker si la fin de l ensemble des edges demarre ---Purpose: stores if the end of a set of edges starts on a
-- sur une cassure un bord libre ou forme un contour ferme -- section of free border or forms a closed contour
---C++: inline ---C++: inline
AppendElSpine(me : mutable; Els : HElSpine from ChFiDS) AppendElSpine(me : mutable; Els : HElSpine from ChFiDS)
@ -124,11 +123,12 @@ is
---------------------- ----------------------
Load(me : mutable) is static; Load(me : mutable) is static;
---Purpose: preparer la ligne guide en fonction des edges qui ---Purpose: prepare the guideline depending on the edges that
-- sont des arcs elementaires (prendre un parametrage -- are elementary arks (take parameters from
-- unique abscisse curviligne );pour pouvoir appeller -- a single curvilinear abscissa); to be able to call
-- les methodes sur la geometrie (first,last,value,d1,d2) -- methods on the geometry (first,last,value,d1,d2)
-- il faut d abord preparer sinon une exception sera levee -- it is necessary to start with preparation otherwise an
-- exception will be raised
Resolution(me; R3d : Real) returns Real Resolution(me; R3d : Real) returns Real
is static; is static;
@ -149,17 +149,17 @@ is
is static; is static;
FirstParameter(me; IndexSpine : Integer ) returns Real FirstParameter(me; IndexSpine : Integer ) returns Real
---Purpose: donne la longueur cumulee de tous les arcs avant le ---Purpose: gives the total length of all arcs before the
-- numero IndexSp -- number IndexSp
is static; is static;
LastParameter(me; IndexSpine : Integer ) returns Real LastParameter(me; IndexSpine : Integer ) returns Real
---Purpose: donne la longueur cumulee jusqu a l arc de numero ---Purpose: gives the total length till the ark with number
-- IndexSpine (inclus) -- IndexSpine (inclus)
is static; is static;
Length(me;IndexSpine : Integer ) returns Real Length(me;IndexSpine : Integer ) returns Real
---Purpose: donne la longueur de l arc de numero IndexSp ---Purpose: gives the length of ark with number IndexSp
is static; is static;
IsPeriodic(me) returns Boolean IsPeriodic(me) returns Boolean
@ -210,7 +210,7 @@ is
is static; is static;
CurrentElementarySpine (me : mutable; Index : Integer ) CurrentElementarySpine (me : mutable; Index : Integer )
---Purpose: set la courbe courante et la renvoie ---Purpose: sets the current curve and returns it
returns Curve from BRepAdaptor is static; returns Curve from BRepAdaptor is static;
---C++: return const & ---C++: return const &

32
src/ChFiDS/ChFiDS_Spine.cxx
View File

@ -164,9 +164,9 @@ void ChFiDS_Spine::SetFirstParameter(const Standard_Real Par)
{ {
#ifdef DEB #ifdef DEB
if(Par >= Precision::Confusion()) if(Par >= Precision::Confusion())
cout<<"Prolongement interieur en debut de ligne guide"<<endl; cout<<"Interior extension at the start of guideline"<<endl;
if(IsPeriodic()) if(IsPeriodic())
cout<<"WARNING!!! Prolongement sur ligne guide periodique."<<endl; cout<<"WARNING!!! Extension on periodic guideline."<<endl;
#endif #endif
firstprolon = Standard_True; firstprolon = Standard_True;
firstparam = Par; firstparam = Par;
@ -183,9 +183,9 @@ void ChFiDS_Spine::SetLastParameter(const Standard_Real Par)
#ifdef DEB #ifdef DEB
Standard_Real lll = abscissa->Value(abscissa->Upper()); Standard_Real lll = abscissa->Value(abscissa->Upper());
if((Par - lll) <= -Precision::Confusion()) if((Par - lll) <= -Precision::Confusion())
cout<<"Prolongement interieur en fin de ligne guide"<<endl; cout<<"Interior extension at the end of guideline"<<endl;
if(IsPeriodic()) if(IsPeriodic())
cout<<"WARNING!!! Prolongement sur ligne guide periodique."<<endl; cout<<"WARNING!!! Extension on periodic guideline."<<endl;
#endif #endif
lastprolon = Standard_True; lastprolon = Standard_True;
lastparam = Par; lastparam = Par;
@ -310,7 +310,7 @@ Standard_Real ChFiDS_Spine::Absc(const TopoDS_Vertex& V) const
Standard_Real ChFiDS_Spine::Period() const Standard_Real ChFiDS_Spine::Period() const
{ {
if(!IsPeriodic()) Standard_Failure::Raise("Spine non periodique"); if(!IsPeriodic()) Standard_Failure::Raise("Non-periodic Spine");
return abscissa->Value(abscissa->Upper()); return abscissa->Value(abscissa->Upper());
} }
@ -334,16 +334,16 @@ Standard_Real ChFiDS_Spine::Resolution(const Standard_Real R3d) const
void ChFiDS_Spine::SetFirstTgt(const Standard_Real W) void ChFiDS_Spine::SetFirstTgt(const Standard_Real W)
{ {
if(IsPeriodic()) Standard_Failure::Raise if(IsPeriodic()) Standard_Failure::Raise
("Pas de prolongement par tangente sur les contours periodiques"); ("No extension by tangent on periodic contours");
#ifdef DEB #ifdef DEB
if(W >= Precision::Confusion()) if(W >= Precision::Confusion())
cout<<"Prolongement interieur en debut de ligne guide"<<endl; cout<<"Interior extension at start of the guideline"<<endl;
#endif #endif
//On vire le flag au cas ou il serait deja positionne pour //The flag is suspended if is already positioned to avoid
//ne pas planter le d1 //stopping d1
hasfirsttgt = Standard_False; hasfirsttgt = Standard_False;
D1(W,firstori,firsttgt); D1(W,firstori,firsttgt);
//et on le remet. //and it is reset.
hasfirsttgt = Standard_True; hasfirsttgt = Standard_True;
firsttgtpar = W; firsttgtpar = W;
} }
@ -357,18 +357,18 @@ void ChFiDS_Spine::SetFirstTgt(const Standard_Real W)
void ChFiDS_Spine::SetLastTgt(const Standard_Real W) void ChFiDS_Spine::SetLastTgt(const Standard_Real W)
{ {
if(IsPeriodic()) Standard_Failure::Raise if(IsPeriodic()) Standard_Failure::Raise
("Pas de prologement par tangente sur les contours periodiques"); ("No extension by tangent periodic contours");
#ifdef DEB #ifdef DEB
Standard_Real L = W - abscissa->Value(abscissa->Upper()); Standard_Real L = W - abscissa->Value(abscissa->Upper());
if(L <= -Precision::Confusion()) if(L <= -Precision::Confusion())
cout<<"Prolongement interieur en fin de ligne guide"<<endl; cout<<"Interior extension at the end of guideline"<<endl;
#endif #endif
//On vire le flag au cas ou il serait deja positionne pour //The flag is suspended if is already positioned to avoid
//ne pas planter le d1 //stopping d1
haslasttgt = Standard_False; haslasttgt = Standard_False;
D1(W,lastori,lasttgt); D1(W,lastori,lasttgt);
//et on le remet. //and it is reset.
haslasttgt = Standard_True; haslasttgt = Standard_True;
lasttgtpar = W; lasttgtpar = W;
} }
@ -480,7 +480,7 @@ void ChFiDS_Spine::Load()
{ {
if(!abscissa.IsNull()){ if(!abscissa.IsNull()){
#ifdef DEB #ifdef DEB
cout<<"nouveau load du CE"<<endl; cout<<"new load of CE"<<endl;
#endif #endif
} }
Standard_Integer len = spine.Length(); Standard_Integer len = spine.Length();

18
src/ChFiKPart/ChFiKPart_ComputeData.cxx
View File

@ -96,7 +96,7 @@ static Standard_Real ComputeAbscissa(const BRepAdaptor_Curve& C,
break; break;
#endif #endif
} }
Standard_NotImplemented::Raise("calcul abscisse non traite "); Standard_NotImplemented::Raise("calcul abscisse not processed");
return 0.; return 0.;
} }
#endif #endif
@ -133,7 +133,7 @@ static Standard_Real ComputeAbscissa(const BRepAdaptor_Curve& C,
else else
ctyp = CSpine->CurrentElementarySpine(Iedge).GetType(); ctyp = CSpine->CurrentElementarySpine(Iedge).GetType();
// Recuperation des orientations. // Return orientations.
TopAbs_Orientation OrFace1 = TopAbs_FORWARD, OrFace2 = TopAbs_FORWARD; TopAbs_Orientation OrFace1 = TopAbs_FORWARD, OrFace2 = TopAbs_FORWARD;
Handle(BRepAdaptor_HSurface) HS = Handle(BRepAdaptor_HSurface)::DownCast(S1); Handle(BRepAdaptor_HSurface) HS = Handle(BRepAdaptor_HSurface)::DownCast(S1);
if (!HS.IsNull()) OrFace1 = HS->ChangeSurface().Face().Orientation(); if (!HS.IsNull()) OrFace1 = HS->ChangeSurface().Face().Orientation();
@ -184,7 +184,7 @@ static Standard_Real ComputeAbscissa(const BRepAdaptor_Curve& C,
Wref,OrFace2,Standard_False); Wref,OrFace2,Standard_False);
} }
else{ else{
Standard_NotImplemented::Raise("cas particulier non ecrit"); Standard_NotImplemented::Raise("particular case not written");
} }
} }
else if(!CSpine.IsNull()){ else if(!CSpine.IsNull()){
@ -233,7 +233,7 @@ static Standard_Real ComputeAbscissa(const BRepAdaptor_Curve& C,
Wref,OrFace2,Standard_False); Wref,OrFace2,Standard_False);
} }
else{ else{
Standard_NotImplemented::Raise("cas particulier non ecrit"); Standard_NotImplemented::Raise("particular case not written");
} }
} }
else if (CSpine->IsChamfer() == ChFiDS_TwoDist) { else if (CSpine->IsChamfer() == ChFiDS_TwoDist) {
@ -281,7 +281,7 @@ static Standard_Real ComputeAbscissa(const BRepAdaptor_Curve& C,
Wref,OrFace2,Standard_False); Wref,OrFace2,Standard_False);
} }
else{ else{
Standard_NotImplemented::Raise("cas particulier non ecrit"); Standard_NotImplemented::Raise("particular case not written");
} }
} }
else { else {
@ -330,7 +330,7 @@ static Standard_Real ComputeAbscissa(const BRepAdaptor_Curve& C,
Wref,OrFace2,Standard_False, DisOnP); Wref,OrFace2,Standard_False, DisOnP);
} }
else{ else{
Standard_NotImplemented::Raise("cas particulier non ecrit"); Standard_NotImplemented::Raise("particular case not written");
} }
} }
} }
@ -365,8 +365,8 @@ Standard_Boolean ChFiKPart_ComputeData::ComputeCorner
Standard_ConstructionError::Raise Standard_ConstructionError::Raise
("la face du conge torique doit etre plane"); ("la face du conge torique doit etre plane");
} }
// On calcule comme ligne guide le cercle correspondant // The guideline is the circle corresponding
// a la section de S2, et divers elements de construction. // to the section of S2, and other construction elements.
gp_Cylinder cyl; gp_Cylinder cyl;
gp_Circ circ; gp_Circ circ;
@ -449,7 +449,7 @@ Standard_Boolean ChFiKPart_ComputeData::ComputeCorner
typ1 != GeomAbs_Plane || typ1 != GeomAbs_Plane ||
typ2 != GeomAbs_Plane){ typ2 != GeomAbs_Plane){
Standard_ConstructionError::Raise Standard_ConstructionError::Raise
("rotule torique seulement entre des plans"); ("torus joint only between the planes");
} }
return ChFiKPart_MakeRotule(DStr,Data,S->Plane(),S1->Plane(), return ChFiKPart_MakeRotule(DStr,Data,S->Plane(),S1->Plane(),
S2->Plane(),OS,OS1,OS2,Radius,OfS); S2->Plane(),OS,OS1,OS2,Radius,OfS);

8
src/ChFiKPart/ChFiKPart_ComputeData_ChAsymPlnCon.cxx
View File

@ -124,7 +124,7 @@ Standard_Boolean ChFiKPart_MakeChAsym(TopOpeBRepDS_DataStructure& DStr,
if ( Abs(ChamfRad) < Precision::Confusion() ) pointu = Standard_True; if ( Abs(ChamfRad) < Precision::Confusion() ) pointu = Standard_True;
if( ChamfRad < 0 ) { if( ChamfRad < 0 ) {
#ifdef DEB #ifdef DEB
cout<<"le chanfrein ne passe pas"<<endl; cout<<"the chamfer can't pass"<<endl;
#endif #endif
return Standard_False; return Standard_False;
} }
@ -137,7 +137,7 @@ Standard_Boolean ChFiKPart_MakeChAsym(TopOpeBRepDS_DataStructure& DStr,
if (ouvert) { if (ouvert) {
if (Abs(angCon) - Abs(SemiAngl) > -Precision::Confusion() ) { if (Abs(angCon) - Abs(SemiAngl) > -Precision::Confusion() ) {
cout<<"mauvais choix d'angle pour le chanfrein"<<endl; cout<<"wrong choice of angle for the chamfer"<<endl;
return Standard_False; return Standard_False;
} }
} }
@ -149,7 +149,7 @@ Standard_Boolean ChFiKPart_MakeChAsym(TopOpeBRepDS_DataStructure& DStr,
SemiAngl = Abs(angCon) + Angle; SemiAngl = Abs(angCon) + Angle;
if ( (PI / 2. - SemiAngl) < Precision::Confusion() ) { if ( (PI / 2. - SemiAngl) < Precision::Confusion() ) {
cout <<"mauvais choix d'angle pour le chanfrein"<<endl; cout <<"wrong choice of angle for the chamfer"<<endl;
return Standard_False; return Standard_False;
} }
Dis1 = move * Tan(SemiAngl) - Dis * Abs(Sin(angCon)); Dis1 = move * Tan(SemiAngl) - Dis * Abs(Sin(angCon));
@ -182,7 +182,7 @@ Standard_Boolean ChFiKPart_MakeChAsym(TopOpeBRepDS_DataStructure& DStr,
if ( Abs(ChamfRad) < Precision::Confusion() ) pointu = Standard_True; if ( Abs(ChamfRad) < Precision::Confusion() ) pointu = Standard_True;
if( ChamfRad < 0 ) { if( ChamfRad < 0 ) {
#ifdef DEB #ifdef DEB
cout<<"le chanfrein ne passe pas"<<endl; cout<<"the chamfer can't pass"<<endl;
#endif #endif
return Standard_False; return Standard_False;
} }

40
src/ChFiKPart/ChFiKPart_ComputeData_ChAsymPlnCyl.cxx
View File

@ -107,7 +107,7 @@ Standard_Boolean ChFiKPart_MakeChAsym(TopOpeBRepDS_DataStructure& DStr,
Standard_Boolean pointu = Standard_False; Standard_Boolean pointu = Standard_False;
Standard_Real ConRad, Rad, SemiAngl; Standard_Real ConRad, Rad, SemiAngl;
//Calcul des distance //Calculation of distance
Standard_Real dis1, dis2, cosNPCyl, sinNPCyl; Standard_Real dis1, dis2, cosNPCyl, sinNPCyl;
if ( (plandab && DisOnP) || (!plandab && !DisOnP) ) { if ( (plandab && DisOnP) || (!plandab && !DisOnP) ) {
@ -139,7 +139,7 @@ Standard_Boolean ChFiKPart_MakeChAsym(TopOpeBRepDS_DataStructure& DStr,
Rad = Cyl.Radius() - dis1; Rad = Cyl.Radius() - dis1;
if ( Abs(Rad) <= Precision::Confusion() ) pointu = Standard_True; if ( Abs(Rad) <= Precision::Confusion() ) pointu = Standard_True;
if(Rad < 0 ) { if(Rad < 0 ) {
cout<<"le chanfrein ne passe pas"<<endl; cout<<"the chamfer can't pass"<<endl;
return Standard_False; return Standard_False;
} }
} }
@ -313,7 +313,7 @@ Standard_Boolean ChFiKPart_MakeChAsym(TopOpeBRepDS_DataStructure& DStr,
//======================================================================= //=======================================================================
//function : MakeChAsym //function : MakeChAsym
//purpose : cas cylindre/plan ou plan/cylindre. //purpose : case cylinder/plane or plane/cylinder.
//======================================================================= //=======================================================================
Standard_Boolean ChFiKPart_MakeChAsym(TopOpeBRepDS_DataStructure& DStr, Standard_Boolean ChFiKPart_MakeChAsym(TopOpeBRepDS_DataStructure& DStr,
@ -332,11 +332,11 @@ Standard_Boolean ChFiKPart_MakeChAsym(TopOpeBRepDS_DataStructure& DStr,
const Standard_Boolean plandab, const Standard_Boolean plandab,
const Standard_Boolean DisOnP) const Standard_Boolean DisOnP)
{ {
// calcul du conge plan. // calculation of the fillet plane.
// or1 et or2 permettent de determiner dans lequel des 4 cotes crees par // or1 and or2 permit to determine in which of four sides created by
// l'intersection des 2 surfaces_on est // intersection of 2 surfaces we are
// _|_ et Ofpl qui est l'orientation de la face du plan permettant // _|_ Ofpl is orientation of the plane face allowing
// |4 de determiner le cote de la matiere // |4 to determine the side of the material
gp_Pnt OrSpine = ElCLib::Value(First, Spine); gp_Pnt OrSpine = ElCLib::Value(First, Spine);
gp_Pnt POnCyl, POnPln, OrCyl; gp_Pnt POnCyl, POnPln, OrCyl;
@ -349,15 +349,15 @@ Standard_Boolean ChFiKPart_MakeChAsym(TopOpeBRepDS_DataStructure& DStr,
{NorF.Reverse();} {NorF.Reverse();}
gp_Ax3 AxCyl = Cyl.Position(); gp_Ax3 AxCyl = Cyl.Position();
// OrCyl est le point sur l'axe du cylindre dans le plan normal a l'axe // OrCyl is the point on axis of cylinder in the plane normal to the
// contenant OrSpine // axis containing OrSpine
gp_Pnt Loc = AxCyl.Location(); gp_Pnt Loc = AxCyl.Location();
gp_Vec LocSp(Loc, OrSpine); gp_Vec LocSp(Loc, OrSpine);
gp_XYZ temp = AxCyl.Direction().XYZ(); gp_XYZ temp = AxCyl.Direction().XYZ();
temp = temp.Multiplied(LocSp.XYZ().Multiplied(temp) ); temp = temp.Multiplied(LocSp.XYZ().Multiplied(temp) );
OrCyl.SetXYZ( (Loc.XYZ()).Added(temp) ); OrCyl.SetXYZ( (Loc.XYZ()).Added(temp) );
//construction de POnPln //construction of POnPln
gp_Vec VecTranslPln,tmp; gp_Vec VecTranslPln,tmp;
tmp = gp_Vec(OrSpine,OrCyl); tmp = gp_Vec(OrSpine,OrCyl);
@ -372,7 +372,7 @@ Standard_Boolean ChFiKPart_MakeChAsym(TopOpeBRepDS_DataStructure& DStr,
gp_Vec VecTranslCyl; gp_Vec VecTranslCyl;
VecTranslCyl = gp_Vec(OrSpine,OrCyl); VecTranslCyl = gp_Vec(OrSpine,OrCyl);
// Calcul des distances dis1 et dis2, en fonction de Dis et Angle // Calculation of distances dis1 and dis2, depending on Dis and Angle
gp_Vec DirSOrC = VecTranslCyl.Normalized(); gp_Vec DirSOrC = VecTranslCyl.Normalized();
Standard_Real cosA1 = DirSOrC.Dot(VecTranslPln.Normalized()); Standard_Real cosA1 = DirSOrC.Dot(VecTranslPln.Normalized());
Standard_Real sinA1 = Sqrt(1. - cosA1 * cosA1); Standard_Real sinA1 = Sqrt(1. - cosA1 * cosA1);
@ -397,7 +397,7 @@ Standard_Boolean ChFiKPart_MakeChAsym(TopOpeBRepDS_DataStructure& DStr,
dis2 = temp2 + temp1 * (cosAhOC - temp1); dis2 = temp2 + temp1 * (cosAhOC - temp1);
if (dis2 < -1.E-09) { if (dis2 < -1.E-09) {
cout<<"angle du chanfrein trop grand"<<endl; cout<<"too great angle of chamfer"<<endl;
return Standard_False; return Standard_False;
} }
else if (dis2 < 1.E-09) { else if (dis2 < 1.E-09) {
@ -411,7 +411,7 @@ Standard_Boolean ChFiKPart_MakeChAsym(TopOpeBRepDS_DataStructure& DStr,
dis2 = Dis; dis2 = Dis;
} }
//construction de POnCyl //construction of POnCyl
Standard_Real alpha = ( 2*ASin(dis2*0.5/ray) ); Standard_Real alpha = ( 2*ASin(dis2*0.5/ray) );
gp_Vec VecTemp = VecTranslCyl.Reversed(); gp_Vec VecTemp = VecTranslCyl.Reversed();
@ -428,7 +428,7 @@ Standard_Boolean ChFiKPart_MakeChAsym(TopOpeBRepDS_DataStructure& DStr,
ElSLib::CylinderD1(UOnCyl, VOnCyl, AxCyl, Cyl.Radius(), ElSLib::CylinderD1(UOnCyl, VOnCyl, AxCyl, Cyl.Radius(),
POnCyl, DUOnCyl, DVOnCyl); POnCyl, DUOnCyl, DVOnCyl);
// Construction du point sur le plan // Construction of the point on the plane
if (!IsDisOnP) { if (!IsDisOnP) {
gp_Vec Corde(POnCyl, OrSpine); gp_Vec Corde(POnCyl, OrSpine);
gp_Vec TCyl = DUOnCyl.Crossed(DVOnCyl); gp_Vec TCyl = DUOnCyl.Crossed(DVOnCyl);
@ -455,11 +455,11 @@ Standard_Boolean ChFiKPart_MakeChAsym(TopOpeBRepDS_DataStructure& DStr,
POnPln.SetXYZ( (OrSpine.XYZ()).Added(VecTranslPln.XYZ()) ); POnPln.SetXYZ( (OrSpine.XYZ()).Added(VecTranslPln.XYZ()) );
//construction du chanfrein //construction of the chamfer
ElSLib::Parameters(Pln,POnPln,UOnPln,VOnPln); ElSLib::Parameters(Pln,POnPln,UOnPln,VOnPln);
POnPln = ElSLib::PlaneValue(UOnPln,VOnPln,AxPln); POnPln = ElSLib::PlaneValue(UOnPln,VOnPln,AxPln);
//construction de YDir pour aller de face1 vers face2. //construction of YDir to go from face1 to face2.
gp_Vec YDir(POnPln,POnCyl); gp_Vec YDir(POnPln,POnCyl);
if (!plandab){ if (!plandab){
YDir.Reverse(); YDir.Reverse();
@ -469,7 +469,7 @@ Standard_Boolean ChFiKPart_MakeChAsym(TopOpeBRepDS_DataStructure& DStr,
Handle(Geom_Plane) Chamfer = new Geom_Plane(AxCh); Handle(Geom_Plane) Chamfer = new Geom_Plane(AxCh);
Data->ChangeSurf(ChFiKPart_IndexSurfaceInDS(Chamfer,DStr)); Data->ChangeSurf(ChFiKPart_IndexSurfaceInDS(Chamfer,DStr));
// On charge les FaceInterferences avec les pcurves et courbes 3d. // FaceInterferences are loaded with pcurves and curves 3d.
//----------- edge plan-Chamfer //----------- edge plan-Chamfer
gp_Pnt2d PPln2d(UOnPln,VOnPln); gp_Pnt2d PPln2d(UOnPln,VOnPln);
gp_Dir2d VPln2d(XDir.Dot(AxPln.XDirection()), gp_Dir2d VPln2d(XDir.Dot(AxPln.XDirection()),
@ -495,7 +495,7 @@ Standard_Boolean ChFiKPart_MakeChAsym(TopOpeBRepDS_DataStructure& DStr,
if ( !IsDisOnP && PosChamfPln ) if ( !IsDisOnP && PosChamfPln )
toreverse = !toreverse; toreverse = !toreverse;
// On regarde si l orientation du Chamfer est la meme que celle du plan // It is checked if the orientation of the Chamfer is the same as of the plane
if (toreverse) if (toreverse)
{Data->ChangeOrientation() = TopAbs::Reverse(Ofpl);} {Data->ChangeOrientation() = TopAbs::Reverse(Ofpl);}
else else
@ -505,7 +505,7 @@ Standard_Boolean ChFiKPart_MakeChAsym(TopOpeBRepDS_DataStructure& DStr,
if ((!plandab && toreverse) || (plandab && !toreverse)) if ((!plandab && toreverse) || (plandab && !toreverse))
{trans=TopAbs_REVERSED;} {trans=TopAbs_REVERSED;}
//trans permet de determiner le cote "matiere" sur S1(2) delimite par L3d //trans allows to determine the "material" side on S1(2) limited by L3d
if (plandab) if (plandab)
{Data->ChangeInterferenceOnS1(). {Data->ChangeInterferenceOnS1().
SetInterference(ChFiKPart_IndexCurveInDS(L3d,DStr),trans,LFac,LFil);} SetInterference(ChFiKPart_IndexCurveInDS(L3d,DStr),trans,LFac,LFil);}

37
src/ChFiKPart/ChFiKPart_ComputeData_ChPlnCyl.cxx
View File

@ -121,7 +121,7 @@ Standard_Boolean ChFiKPart_MakeChamfer(TopOpeBRepDS_DataStructure& DStr,
Rad = Cyl.Radius()- Dis1; Rad = Cyl.Radius()- Dis1;
if ( Abs(Rad) <= Precision::Confusion() ) pointu = Standard_True; if ( Abs(Rad) <= Precision::Confusion() ) pointu = Standard_True;
if(Rad < 0 ) { if(Rad < 0 ) {
cout<<"le chanfrein ne passe pas"<<endl; cout<<"the chamfer can't pass"<<endl;
return Standard_False; return Standard_False;
} }
} }
@ -305,7 +305,7 @@ Standard_Boolean ChFiKPart_MakeChamfer(TopOpeBRepDS_DataStructure& DStr,
//======================================================================= //=======================================================================
//function : MakeChamfer //function : MakeChamfer
//purpose : cas cylindre/plan ou plan/cylindre. //purpose : case cylinder/plane or plane/cylinder.
//======================================================================= //=======================================================================
Standard_Boolean ChFiKPart_MakeChamfer(TopOpeBRepDS_DataStructure& DStr, Standard_Boolean ChFiKPart_MakeChamfer(TopOpeBRepDS_DataStructure& DStr,
@ -323,11 +323,12 @@ Standard_Boolean ChFiKPart_MakeChamfer(TopOpeBRepDS_DataStructure& DStr,
const TopAbs_Orientation Ofpl, const TopAbs_Orientation Ofpl,
const Standard_Boolean plandab) const Standard_Boolean plandab)
{ {
//calcul du conge plan. // calculation of the fillet plane.
//or1 et or2 permettent de determiner dans lequel des 4 cotes crees par // or1 and or2 permit to determine in which of four sides created by
//l'intersection des 2 surfaces_ on est // intersection of 2 surfaces we are
// _|_ et Ofpl qui est l'orientation de la face du plan permettant // _|_ Ofpl is orientation of the plane face allowing
// |4 de determiner le cote de la matiere // |4 to determine the side of the material
Standard_Real dis1=Dis1, dis2=Dis2; Standard_Real dis1=Dis1, dis2=Dis2;
if (!plandab){ if (!plandab){
@ -345,8 +346,8 @@ Standard_Boolean ChFiKPart_MakeChamfer(TopOpeBRepDS_DataStructure& DStr,
{NorF.Reverse();} {NorF.Reverse();}
gp_Ax3 AxCyl = Cyl.Position(); gp_Ax3 AxCyl = Cyl.Position();
// OrCyl est le point sur l'axe du cylindre dans le plan normal a l'axe // OrCyl is the point on axis of cylinder in the plane normal to the
// contenant OrSpine // axis containing OrSpine
gp_Pnt Loc = AxCyl.Location(); gp_Pnt Loc = AxCyl.Location();
gp_Vec LocSp(Loc, OrSpine); gp_Vec LocSp(Loc, OrSpine);
gp_XYZ temp = AxCyl.Direction().XYZ(); gp_XYZ temp = AxCyl.Direction().XYZ();
@ -357,7 +358,7 @@ Standard_Boolean ChFiKPart_MakeChamfer(TopOpeBRepDS_DataStructure& DStr,
// OrCyl.SetXYZ( (AxCyl.Location().XYZ()).Added(temp) ); // OrCyl.SetXYZ( (AxCyl.Location().XYZ()).Added(temp) );
//construction de POnPln //construction of POnPln
gp_Vec VecTranslPln,tmp; gp_Vec VecTranslPln,tmp;
tmp = gp_Vec(OrSpine,OrCyl); tmp = gp_Vec(OrSpine,OrCyl);
@ -372,7 +373,7 @@ Standard_Boolean ChFiKPart_MakeChamfer(TopOpeBRepDS_DataStructure& DStr,
POnPln.SetXYZ( (OrSpine.XYZ()).Added(VecTranslPln.XYZ()) ); POnPln.SetXYZ( (OrSpine.XYZ()).Added(VecTranslPln.XYZ()) );
//construction de POnCyl //construction of POnCyl
Standard_Real alpha = ( 2*ASin(dis2*0.5/Cyl.Radius()) ); Standard_Real alpha = ( 2*ASin(dis2*0.5/Cyl.Radius()) );
// gp_Vec VecTranslCyl; // gp_Vec VecTranslCyl;
// VecTranslCyl = gp_Vec(OrSpine,OrCyl); // VecTranslCyl = gp_Vec(OrSpine,OrCyl);
@ -394,14 +395,14 @@ Standard_Boolean ChFiKPart_MakeChamfer(TopOpeBRepDS_DataStructure& DStr,
POnCyl.SetXYZ( OrCyl.XYZ().Added(VecCylTransl.XYZ()) ); POnCyl.SetXYZ( OrCyl.XYZ().Added(VecCylTransl.XYZ()) );
//construction du chanfrein //construction of chamfer
Standard_Real UOnCyl,VOnCyl,UOnPln,VOnPln; Standard_Real UOnCyl,VOnCyl,UOnPln,VOnPln;
ElSLib::Parameters(Cyl,POnCyl,UOnCyl,VOnCyl); ElSLib::Parameters(Cyl,POnCyl,UOnCyl,VOnCyl);
POnCyl = ElSLib::CylinderValue(UOnCyl,VOnCyl,AxCyl,Cyl.Radius()); POnCyl = ElSLib::CylinderValue(UOnCyl,VOnCyl,AxCyl,Cyl.Radius());
ElSLib::Parameters(Pln,POnPln,UOnPln,VOnPln); ElSLib::Parameters(Pln,POnPln,UOnPln,VOnPln);
POnPln = ElSLib::PlaneValue(UOnPln,VOnPln,AxPln); POnPln = ElSLib::PlaneValue(UOnPln,VOnPln,AxPln);
//construction de YDir pour aller de face1 vers face2. //construction of YDir to go to face1 from face2.
gp_Vec YDir(POnPln,POnCyl); gp_Vec YDir(POnPln,POnCyl);
if (!plandab){ if (!plandab){
YDir.Reverse(); YDir.Reverse();
@ -411,8 +412,8 @@ Standard_Boolean ChFiKPart_MakeChamfer(TopOpeBRepDS_DataStructure& DStr,
Handle(Geom_Plane) Chamfer = new Geom_Plane(AxCh); Handle(Geom_Plane) Chamfer = new Geom_Plane(AxCh);
Data->ChangeSurf(ChFiKPart_IndexSurfaceInDS(Chamfer,DStr)); Data->ChangeSurf(ChFiKPart_IndexSurfaceInDS(Chamfer,DStr));
// On charge les FaceInterferences avec les pcurves et courbes 3d. // FaceInterferences are loaded with pcurves and curves 3d.
//----------- edge plan-Chamfer //----------- edge plane-Chamfer
gp_Pnt2d PPln2d(UOnPln,VOnPln); gp_Pnt2d PPln2d(UOnPln,VOnPln);
gp_Dir2d VPln2d(XDir.Dot(AxPln.XDirection()), gp_Dir2d VPln2d(XDir.Dot(AxPln.XDirection()),
XDir.Dot(AxPln.YDirection())); XDir.Dot(AxPln.YDirection()));
@ -438,7 +439,7 @@ Standard_Boolean ChFiKPart_MakeChamfer(TopOpeBRepDS_DataStructure& DStr,
if (PosChamfPln ) if (PosChamfPln )
toreverse = !toreverse; toreverse = !toreverse;
// On regarde si l orientation du Chamfer est la meme que celle du plan // It is checked if the orientation of the Chamfer is the same as of the plane
if (toreverse) if (toreverse)
{Data->ChangeOrientation() = TopAbs::Reverse(Ofpl);} {Data->ChangeOrientation() = TopAbs::Reverse(Ofpl);}
else else
@ -448,7 +449,7 @@ Standard_Boolean ChFiKPart_MakeChamfer(TopOpeBRepDS_DataStructure& DStr,
if ((!plandab && toreverse) || (plandab && !toreverse)) if ((!plandab && toreverse) || (plandab && !toreverse))
{trans=TopAbs_REVERSED;} {trans=TopAbs_REVERSED;}
//trans permet de determiner le cote "matiere" sur S1(2) delimite par L3d //trans permits to determine the "material" side on S1(2) limited by L3d
if (plandab) if (plandab)
{Data->ChangeInterferenceOnS1(). {Data->ChangeInterferenceOnS1().
SetInterference(ChFiKPart_IndexCurveInDS(L3d,DStr),trans,LFac,LFil);} SetInterference(ChFiKPart_IndexCurveInDS(L3d,DStr),trans,LFac,LFil);}
@ -456,7 +457,7 @@ Standard_Boolean ChFiKPart_MakeChamfer(TopOpeBRepDS_DataStructure& DStr,
{Data->ChangeInterferenceOnS2(). {Data->ChangeInterferenceOnS2().
SetInterference(ChFiKPart_IndexCurveInDS(L3d,DStr),trans,LFac,LFil);} SetInterference(ChFiKPart_IndexCurveInDS(L3d,DStr),trans,LFac,LFil);}
//------------edge cylindre-Chamfer //------------edge cylinder-Chamfer
gp_Pnt2d PCyl2d(UOnCyl,VOnCyl); gp_Pnt2d PCyl2d(UOnCyl,VOnCyl);
gp_Dir2d VCyl2d=gp::DY2d(); gp_Dir2d VCyl2d=gp::DY2d();
if ( XDir.Dot(AxCyl.Direction())<0 ) if ( XDir.Dot(AxCyl.Direction())<0 )

16
src/ChFiKPart/ChFiKPart_ComputeData_Fcts.cxx
View File

@ -45,8 +45,8 @@ Standard_Real ChFiKPart_InPeriod(const Standard_Real U,
//======================================================================= //=======================================================================
//function : PCurve //function : PCurve
//purpose : Calcule une droite sous forme de BSpline pour garantir //purpose : Calculate a straight line in form of BSpline to guarantee
// les parametres. // the parameters.
//======================================================================= //=======================================================================
Handle(Geom2d_BSplineCurve) ChFiKPart_PCurve(const gp_Pnt2d& UV1, Handle(Geom2d_BSplineCurve) ChFiKPart_PCurve(const gp_Pnt2d& UV1,
@ -69,8 +69,8 @@ Handle(Geom2d_BSplineCurve) ChFiKPart_PCurve(const gp_Pnt2d& UV1,
//======================================================================= //=======================================================================
//function : ProjPC //function : ProjPC
//purpose : Pour les coins spheriques dont les contours ne sont //purpose : For spherical corners the contours which of are not
// pas des isos on projette le cercle. // isos the circle is projected.
//======================================================================= //=======================================================================
void ChFiKPart_ProjPC(const GeomAdaptor_Curve& Cg, void ChFiKPart_ProjPC(const GeomAdaptor_Curve& Cg,
@ -156,17 +156,17 @@ void ChFiKPart_ProjPC(const GeomAdaptor_Curve& Cg,
break; break;
#endif #endif
default : default :
Standard_NotImplemented::Raise("echec approximation de la pcurve "); Standard_NotImplemented::Raise("failed approximation of the pcurve ");
} }
} }
else { else {
Standard_NotImplemented::Raise("approx pcurve sur une surface gauche"); Standard_NotImplemented::Raise("approximate pcurve on the left surface");
} }
} }
//======================================================================= //=======================================================================
//function : IndexCurveInDS //function : IndexCurveInDS
//purpose : Met une Curve dans la DS et renvoie son index. //purpose : Place a Curve in the DS and return its index.
//======================================================================= //=======================================================================
Standard_Integer ChFiKPart_IndexCurveInDS(const Handle(Geom_Curve)& C, Standard_Integer ChFiKPart_IndexCurveInDS(const Handle(Geom_Curve)& C,
@ -178,7 +178,7 @@ Standard_Integer ChFiKPart_IndexCurveInDS(const Handle(Geom_Curve)& C,
//======================================================================= //=======================================================================
//function : IndexSurfaceInDS //function : IndexSurfaceInDS
//purpose : Met une Surface dans la DS et renvoie son index. //purpose : Place a Surface in the DS and return its index.
//======================================================================= //=======================================================================
Standard_Integer ChFiKPart_IndexSurfaceInDS(const Handle(Geom_Surface)& S, Standard_Integer ChFiKPart_IndexSurfaceInDS(const Handle(Geom_Surface)& S,

20
src/ChFiKPart/ChFiKPart_ComputeData_FilPlnCon.cxx
View File

@ -35,7 +35,7 @@
//======================================================================= //=======================================================================
//function : MakeFillet //function : MakeFillet
//purpose : cas cone/plan ou plan/cone. //purpose : case cone/plane or plane/cone.
//======================================================================= //=======================================================================
Standard_Boolean ChFiKPart_MakeFillet(TopOpeBRepDS_DataStructure& DStr, Standard_Boolean ChFiKPart_MakeFillet(TopOpeBRepDS_DataStructure& DStr,
@ -52,7 +52,7 @@ Standard_Boolean ChFiKPart_MakeFillet(TopOpeBRepDS_DataStructure& DStr,
const TopAbs_Orientation Ofpl, const TopAbs_Orientation Ofpl,
const Standard_Boolean plandab) const Standard_Boolean plandab)
{ {
//calcul du conge (tore ou sphere). //calculate the fillet (torus or sphere).
Standard_Boolean c1sphere = Standard_False; Standard_Boolean c1sphere = Standard_False;
gp_Ax3 PosPl = Pln.Position(); gp_Ax3 PosPl = Pln.Position();
gp_Dir Dpnat = PosPl.XDirection().Crossed(PosPl.YDirection()); gp_Dir Dpnat = PosPl.XDirection().Crossed(PosPl.YDirection());
@ -78,8 +78,8 @@ Standard_Boolean ChFiKPart_MakeFillet(TopOpeBRepDS_DataStructure& DStr,
Precision::Confusion()); Precision::Confusion());
gp_Pnt Pv; gp_Pnt Pv;
if (CInt.IsDone()) { if (CInt.IsDone()) {
//On met l origine du conge au point de depart fourni sur la //The origin of the fillet is set at the start point on the
//ligne guide. //guideline.
Pv = ElCLib::Value(ElCLib::Parameter(CInt.Circle(1),PtSp), Pv = ElCLib::Value(ElCLib::Parameter(CInt.Circle(1),PtSp),
CInt.Circle(1)); CInt.Circle(1));
} }
@ -113,7 +113,7 @@ Standard_Boolean ChFiKPart_MakeFillet(TopOpeBRepDS_DataStructure& DStr,
Rad = Maxrad - Rabio; Rad = Maxrad - Rabio;
if(Abs(Rad) <= Precision::Confusion()){ c1sphere = Standard_True; } if(Abs(Rad) <= Precision::Confusion()){ c1sphere = Standard_True; }
else if(Rad < 0){ else if(Rad < 0){
cout<<"le conge ne passe pas"<<endl; cout<<"the fillet does not pass"<<endl;
return Standard_False; return Standard_False;
} }
} }
@ -135,8 +135,8 @@ Standard_Boolean ChFiKPart_MakeFillet(TopOpeBRepDS_DataStructure& DStr,
Data->ChangeSurf(ChFiKPart_IndexSurfaceInDS(gtor,DStr)); Data->ChangeSurf(ChFiKPart_IndexSurfaceInDS(gtor,DStr));
} }
// On regarde si l orientation du conge est la meme que celle // It is checked if the orientation of the fillet is the same
// des faces. // as of the faces.
gp_Pnt P,PP; gp_Pnt P,PP;
gp_Vec deru,derv; gp_Vec deru,derv;
P.SetCoord(cPln.X()+Rad*Dx.X(), P.SetCoord(cPln.X()+Rad*Dx.X(),
@ -157,10 +157,10 @@ Standard_Boolean ChFiKPart_MakeFillet(TopOpeBRepDS_DataStructure& DStr,
if (toreverse) { Data->ChangeOrientation() = TopAbs_REVERSED; } if (toreverse) { Data->ChangeOrientation() = TopAbs_REVERSED; }
else { Data->ChangeOrientation() = TopAbs_FORWARD; } else { Data->ChangeOrientation() = TopAbs_FORWARD; }
// On charge les FaceInterferences avec les pcurves et courbes 3d. // FaceInterferences are loaded with pcurves and curves 3d.
// --------------------------------------------------------------- // ---------------------------------------------------------------
// La face plane. // The plane face.
// -------------- // --------------
Handle(Geom2d_Circle) GCirc2dPln; Handle(Geom2d_Circle) GCirc2dPln;
@ -198,7 +198,7 @@ Standard_Boolean ChFiKPart_MakeFillet(TopOpeBRepDS_DataStructure& DStr,
trans,GCirc2dPln,GLin2dFil1); trans,GCirc2dPln,GLin2dFil1);
} }
// La face conique. // The conic face.
// ---------------- // ----------------
P.SetCoord(Pv.X()+Rabio*ddc.X(), P.SetCoord(Pv.X()+Rabio*ddc.X(),

44
src/ChFiKPart/ChFiKPart_ComputeData_FilPlnCyl.cxx
View File

@ -36,7 +36,7 @@
//======================================================================= //=======================================================================
//function : MakeFillet //function : MakeFillet
//purpose : cas cylindre/plan ou plan/cylindre. //purpose : case cylinder/plane or plane/cylinder.
//======================================================================= //=======================================================================
Standard_Boolean ChFiKPart_MakeFillet(TopOpeBRepDS_DataStructure& DStr, Standard_Boolean ChFiKPart_MakeFillet(TopOpeBRepDS_DataStructure& DStr,
@ -53,9 +53,9 @@ Standard_Boolean ChFiKPart_MakeFillet(TopOpeBRepDS_DataStructure& DStr,
const TopAbs_Orientation Ofpl, const TopAbs_Orientation Ofpl,
const Standard_Boolean plandab) const Standard_Boolean plandab)
{ {
//calcul du conge cylindre. //calculate the cylinder fillet.
//plan deporte de radius //plane deviated from radius
gp_Ax3 AxPln = Pln.Position(); gp_Ax3 AxPln = Pln.Position();
gp_Dir NorPln = AxPln.XDirection().Crossed(AxPln.YDirection()); gp_Dir NorPln = AxPln.XDirection().Crossed(AxPln.YDirection());
gp_Dir NorF(NorPln); gp_Dir NorF(NorPln);
@ -64,7 +64,7 @@ Standard_Boolean ChFiKPart_MakeFillet(TopOpeBRepDS_DataStructure& DStr,
if (Or1 == TopAbs_REVERSED) { NorF.Reverse(); } if (Or1 == TopAbs_REVERSED) { NorF.Reverse(); }
gp_Pln PlanOffset = Pln.Translated(Radius*gp_Vec(NorF)); gp_Pln PlanOffset = Pln.Translated(Radius*gp_Vec(NorF));
// Cylindre parallele // Parallel cylinder
Standard_Real ROff = Cyl.Radius(); Standard_Real ROff = Cyl.Radius();
Standard_Boolean dedans = Standard_False; Standard_Boolean dedans = Standard_False;
@ -76,11 +76,11 @@ Standard_Boolean ChFiKPart_MakeFillet(TopOpeBRepDS_DataStructure& DStr,
} }
else { else {
#ifdef DEB #ifdef DEB
cout<<"le conge ne passe pas"<<endl; cout<<"the fillet does not pass"<<endl;
#endif #endif
return Standard_False; return Standard_False;
} }
// intersection du plan parallele et du cylindre parallele. // intersection of the parallel plane and of the parallel cylinder.
gp_Cylinder CylOffset(Cyl.Position(),ROff); gp_Cylinder CylOffset(Cyl.Position(),ROff);
IntAna_QuadQuadGeo LInt(PlanOffset,CylOffset, IntAna_QuadQuadGeo LInt(PlanOffset,CylOffset,
Precision::Angular(),Precision::Confusion()); Precision::Angular(),Precision::Confusion());
@ -103,7 +103,7 @@ Standard_Boolean ChFiKPart_MakeFillet(TopOpeBRepDS_DataStructure& DStr,
} }
else {return Standard_False;} else {return Standard_False;}
// Construction conge // Construction fillet
if (DirFillet.Dot(Spine.Direction()) < 0.) {DirFillet.Reverse();} if (DirFillet.Dot(Spine.Direction()) < 0.) {DirFillet.Reverse();}
Standard_Real UOnCyl,VOnCyl,UOnPln,VOnPln; Standard_Real UOnCyl,VOnCyl,UOnPln,VOnPln;
@ -123,7 +123,7 @@ Standard_Boolean ChFiKPart_MakeFillet(TopOpeBRepDS_DataStructure& DStr,
OtherDir = tmp; OtherDir = tmp;
} }
gp_Ax3 AxFil (OrFillet,DirFillet,XDir); gp_Ax3 AxFil (OrFillet,DirFillet,XDir);
// construction YDir pour aller de face1 vers face2. // construction YDir to go from face1 to face2.
if ((XDir^OtherDir).Dot(DirFillet) < 0.) if ((XDir^OtherDir).Dot(DirFillet) < 0.)
AxFil.YReverse(); AxFil.YReverse();
@ -131,8 +131,8 @@ Standard_Boolean ChFiKPart_MakeFillet(TopOpeBRepDS_DataStructure& DStr,
Fillet = new Geom_CylindricalSurface(AxFil,Radius); Fillet = new Geom_CylindricalSurface(AxFil,Radius);
Data->ChangeSurf(ChFiKPart_IndexSurfaceInDS(Fillet,DStr)); Data->ChangeSurf(ChFiKPart_IndexSurfaceInDS(Fillet,DStr));
// On charge les FaceInterferences avec les pcurves et courbes 3d. // FaceInterferences are loaded with pcurves and curves 3D.
// edge plan-Fillet // edge plane-Fillet
gp_Pnt2d PPln2d(UOnPln,VOnPln); gp_Pnt2d PPln2d(UOnPln,VOnPln);
gp_Dir2d VPln2d(DirFillet.Dot(AxPln.XDirection()), gp_Dir2d VPln2d(DirFillet.Dot(AxPln.XDirection()),
DirFillet.Dot(AxPln.YDirection())); DirFillet.Dot(AxPln.YDirection()));
@ -151,8 +151,7 @@ Standard_Boolean ChFiKPart_MakeFillet(TopOpeBRepDS_DataStructure& DStr,
ElSLib::CylinderD1(UOnFillet,V,AxFil,Radius,P,deru,derv); ElSLib::CylinderD1(UOnFillet,V,AxFil,Radius,P,deru,derv);
gp_Dir NorFil(deru.Crossed(derv)); gp_Dir NorFil(deru.Crossed(derv));
Standard_Boolean toreverse = ( NorFil.Dot(NorPln) <= 0. ); Standard_Boolean toreverse = ( NorFil.Dot(NorPln) <= 0. );
// On regarde si l orientation du cylindre est la meme que celle // It is checked if the orientation of the cylinder is the same as of the plane.
// du plan.
if (toreverse) {Data->ChangeOrientation() = TopAbs::Reverse(Ofpl);} if (toreverse) {Data->ChangeOrientation() = TopAbs::Reverse(Ofpl);}
else {Data->ChangeOrientation() = Ofpl;} else {Data->ChangeOrientation() = Ofpl;}
@ -172,7 +171,7 @@ Standard_Boolean ChFiKPart_MakeFillet(TopOpeBRepDS_DataStructure& DStr,
SetInterference(ChFiKPart_IndexCurveInDS(L3d,DStr), SetInterference(ChFiKPart_IndexCurveInDS(L3d,DStr),
trans,LFac,LFil); trans,LFac,LFil);
// edge cylindre-Fillet. // edge cylinder-Fillet.
gp_Pnt2d PCyl2d(UOnCyl,VOnCyl); gp_Pnt2d PCyl2d(UOnCyl,VOnCyl);
gp_Dir2d DPC = gp::DY2d(); gp_Dir2d DPC = gp::DY2d();
if (DirFillet.Dot(AxCyl.Direction()) < 0.) DPC.Reverse(); if (DirFillet.Dot(AxCyl.Direction()) < 0.) DPC.Reverse();
@ -211,7 +210,7 @@ Standard_Boolean ChFiKPart_MakeFillet(TopOpeBRepDS_DataStructure& DStr,
//======================================================================= //=======================================================================
//function : MakeFillet //function : MakeFillet
//purpose : cas cylindre/plan ou plan/cylindre. //purpose : case cylinder/plane or plane/cylinder.
//======================================================================= //=======================================================================
Standard_Boolean ChFiKPart_MakeFillet(TopOpeBRepDS_DataStructure& DStr, Standard_Boolean ChFiKPart_MakeFillet(TopOpeBRepDS_DataStructure& DStr,
@ -229,7 +228,7 @@ Standard_Boolean ChFiKPart_MakeFillet(TopOpeBRepDS_DataStructure& DStr,
const Standard_Boolean plandab) const Standard_Boolean plandab)
{ {
//calcul du conge (tore ou sphere). //calculation of the fillet (torus or sphere).
Standard_Boolean c1sphere = Standard_False; Standard_Boolean c1sphere = Standard_False;
gp_Ax3 PosPl = Pln.Position(); gp_Ax3 PosPl = Pln.Position();
gp_Dir Dpnat = PosPl.XDirection().Crossed(PosPl.YDirection()); gp_Dir Dpnat = PosPl.XDirection().Crossed(PosPl.YDirection());
@ -249,7 +248,7 @@ Standard_Boolean ChFiKPart_MakeFillet(TopOpeBRepDS_DataStructure& DStr,
Or.Z()+Radius*Dp.Z()); Or.Z()+Radius*Dp.Z());
gp_Pnt PtSp; gp_Pnt PtSp;
gp_Vec DSp; gp_Vec DSp;
// Modification pour les PtSp trouves du mauvais cote de l'arete de couture. // Modification for the PtSp found at the wrong side of the sewing edge.
gp_Pnt PtSp2; gp_Pnt PtSp2;
gp_Vec DSp2; gp_Vec DSp2;
Standard_Real acote = 1e-7; Standard_Real acote = 1e-7;
@ -267,7 +266,7 @@ Standard_Boolean ChFiKPart_MakeFillet(TopOpeBRepDS_DataStructure& DStr,
ElCLib::D1(PR,Spine,PtSp2,DSp); ElCLib::D1(PR,Spine,PtSp2,DSp);
} }
} }
// fin de modif // end of modif
gp_Dir Dx(gp_Vec(Or,PtSp)); gp_Dir Dx(gp_Vec(Or,PtSp));
Dx = Dp.Crossed(Dx.Crossed(Dp)); Dx = Dp.Crossed(Dx.Crossed(Dp));
gp_Dir Dy(DSp); gp_Dir Dy(DSp);
@ -285,7 +284,7 @@ Standard_Boolean ChFiKPart_MakeFillet(TopOpeBRepDS_DataStructure& DStr,
if(Abs(Rad) <= Precision::Confusion()){ c1sphere = Standard_True; } if(Abs(Rad) <= Precision::Confusion()){ c1sphere = Standard_True; }
else if(Rad < 0){ else if(Rad < 0){
#ifdef DEB #ifdef DEB
cout<<"le conge ne passe pas"<<endl; cout<<"the fillet can't pass"<<endl;
#endif #endif
return Standard_False; return Standard_False;
} }
@ -308,8 +307,7 @@ Standard_Boolean ChFiKPart_MakeFillet(TopOpeBRepDS_DataStructure& DStr,
Data->ChangeSurf(ChFiKPart_IndexSurfaceInDS(gtor,DStr)); Data->ChangeSurf(ChFiKPart_IndexSurfaceInDS(gtor,DStr));
} }
// On regarde si l orientation du conge est la meme que celle // It is checked if the orientation of the fillet is the same as of faces.
// des faces.
gp_Pnt P,PP; gp_Pnt P,PP;
gp_Vec deru,derv; gp_Vec deru,derv;
P.SetCoord(cPln.X()+Rad*Dx.X(), P.SetCoord(cPln.X()+Rad*Dx.X(),
@ -336,9 +334,9 @@ Standard_Boolean ChFiKPart_MakeFillet(TopOpeBRepDS_DataStructure& DStr,
if (toreverse) { Data->ChangeOrientation() = TopAbs_REVERSED; } if (toreverse) { Data->ChangeOrientation() = TopAbs_REVERSED; }
else { Data->ChangeOrientation() = TopAbs_FORWARD; } else { Data->ChangeOrientation() = TopAbs_FORWARD; }
// On charge les FaceInterferences avec les pcurves et courbes 3d. // FaceInterferences are loaded with pcurves and curves 3d.
// La face plane. // The plane face.
Handle(Geom2d_Circle) GCirc2dPln; Handle(Geom2d_Circle) GCirc2dPln;
Handle(Geom_Circle) GCircPln; Handle(Geom_Circle) GCircPln;
gp_Ax2 circAx2 = FilAx3.Ax2(); gp_Ax2 circAx2 = FilAx3.Ax2();
@ -384,7 +382,7 @@ Standard_Boolean ChFiKPart_MakeFillet(TopOpeBRepDS_DataStructure& DStr,
trans,GCirc2dPln,GLin2dFil1); trans,GCirc2dPln,GLin2dFil1);
} }
// La face cylindrique. // The cylindrical face.
P.SetCoord(Or.X()+cylrad*Dx.X(), P.SetCoord(Or.X()+cylrad*Dx.X(),
Or.Y()+cylrad*Dx.Y(), Or.Y()+cylrad*Dx.Y(),
Or.Z()+cylrad*Dx.Z()); Or.Z()+cylrad*Dx.Z());

28
src/ChFiKPart/ChFiKPart_ComputeData_Sphere.cxx
View File

@ -26,8 +26,8 @@
//======================================================================= //=======================================================================
//function : ChFiKPart_Sphere //function : ChFiKPart_Sphere
//purpose : Construction d un conge spherique dont les contours ne sont //purpose : Construction of a spherical fillet the contours which of
// pas tous des isos, a partir de ses trois sommets. // are not all isos, from three tops.
//======================================================================= //=======================================================================
Standard_Boolean ChFiKPart_Sphere(TopOpeBRepDS_DataStructure& DStr, Standard_Boolean ChFiKPart_Sphere(TopOpeBRepDS_DataStructure& DStr,
@ -43,10 +43,10 @@ Standard_Boolean ChFiKPart_Sphere(TopOpeBRepDS_DataStructure& DStr,
const gp_Pnt2d& P1S2, const gp_Pnt2d& P1S2,
const gp_Pnt2d& P2S2) const gp_Pnt2d& P2S2)
{ {
// Construction de la sphere : // Construction of the sphere :
// - pole sud sur PS1 // - pole south on PS1
// - origine des u donnee par P1S2 // - origine of u given by P1S2
// - u+ vers P2S2 // - u+ to P2S2
Standard_Real ptol = Precision::Confusion(); Standard_Real ptol = Precision::Confusion();
gp_Pnt p1,p2,p3; gp_Pnt p1,p2,p3;
@ -75,7 +75,7 @@ Standard_Boolean ChFiKPart_Sphere(TopOpeBRepDS_DataStructure& DStr,
dz = gp_Dir(gp_Vec(p1,cen)); dz = gp_Dir(gp_Vec(p1,cen));
if(Abs(ds1.Dot(dz)-1.)>ptol){ if(Abs(ds1.Dot(dz)-1.)>ptol){
#ifdef DEB #ifdef DEB
cout<<"centre du coin spherique non trouve"<<endl; cout<<"center of the spherical corner not found"<<endl;
#endif #endif
return Standard_False; return Standard_False;
} }
@ -95,22 +95,22 @@ Standard_Boolean ChFiKPart_Sphere(TopOpeBRepDS_DataStructure& DStr,
gsph = new Geom_SphericalSurface(FilAx3,Rad); gsph = new Geom_SphericalSurface(FilAx3,Rad);
Data->ChangeSurf(ChFiKPart_IndexSurfaceInDS(gsph,DStr)); Data->ChangeSurf(ChFiKPart_IndexSurfaceInDS(gsph,DStr));
// on compare la normale de la sphere a celle de la face // the normal of the sphere is compared to the normal of the face
// orientee pour determiner l orientation finale du conge. // oriented to determine the final orientation of the fillet.
Standard_Boolean toreverse = ( ddz.Dot(df1) <= 0. ); Standard_Boolean toreverse = ( ddz.Dot(df1) <= 0. );
if (toreverse) { Data->ChangeOrientation() = TopAbs_REVERSED; } if (toreverse) { Data->ChangeOrientation() = TopAbs_REVERSED; }
else { Data->ChangeOrientation() = TopAbs_FORWARD; } else { Data->ChangeOrientation() = TopAbs_FORWARD; }
// On calcule les parametres de p2 et p3 sur la Sphere pour avoir // Parameters of p2 and p3 are calculated on the Sphere to have
// les ranges des courbes. // ranges of curves.
Standard_Real uu1,vv1,uu2,vv2; Standard_Real uu1,vv1,uu2,vv2;
ElSLib::SphereParameters(FilAx3,Rad,p2,uu1,vv1); ElSLib::SphereParameters(FilAx3,Rad,p2,uu1,vv1);
uu1 = 0.; uu1 = 0.;
ElSLib::SphereParameters(FilAx3,Rad,p3,uu2,vv2); ElSLib::SphereParameters(FilAx3,Rad,p3,uu2,vv2);
// On charge les FaceInterferences avec les pcurves et courbes 3d. // FaceInterferences are loaded with pcurves and curves 3d.
// Le cote pointu. // Pointed side.
Handle(Geom_Curve) C; Handle(Geom_Curve) C;
Handle(Geom2d_Curve) C2d; Handle(Geom2d_Curve) C2d;
@ -124,7 +124,7 @@ Standard_Boolean ChFiKPart_Sphere(TopOpeBRepDS_DataStructure& DStr,
SetInterference(ChFiKPart_IndexCurveInDS(C,DStr), SetInterference(ChFiKPart_IndexCurveInDS(C,DStr),
trans,C2d,C2dFil); trans,C2d,C2dFil);
// L autre cote. // The other side.
Standard_Real ang = ddx.Angle(ddy); Standard_Real ang = ddx.Angle(ddy);
gp_Dir dci = ddx.Crossed(ddy); gp_Dir dci = ddx.Crossed(ddy);

25
src/DsgPrs/DsgPrs_AnglePresentation.cxx
View File

@ -294,7 +294,7 @@ void DsgPrs_AnglePresentation::Add (const Handle(Prs3d_Presentation)& aPresentat
if (uco > ufin) { if (uco > ufin) {
if (Abs(theval)<PI) { if (Abs(theval)<PI) {
// test si uco est dans le secteur oppose // test if uco is in the opposite sector
if (uco > udeb+PI && uco < ufin+PI){ if (uco > udeb+PI && uco < ufin+PI){
udeb = udeb + PI; udeb = udeb + PI;
ufin = ufin + PI; ufin = ufin + PI;
@ -331,7 +331,7 @@ void DsgPrs_AnglePresentation::Add (const Handle(Prs3d_Presentation)& aPresentat
ElCLib::D1(uc1,cer,ptarr,vecarr); ElCLib::D1(uc1,cer,ptarr,vecarr);
gp_Ax1 ax1(ptarr, axisdir); gp_Ax1 ax1(ptarr, axisdir);
gp_Dir dirarr(-vecarr); gp_Dir dirarr(-vecarr);
//calcul de l'angle de rotation //calculate angle of rotation
Standard_Real beta(0.); Standard_Real beta(0.);
Standard_Real length = LA->ArrowAspect()->Length(); Standard_Real length = LA->ArrowAspect()->Length();
if (length < Precision::Confusion()) length = 1.e-04; if (length < Precision::Confusion()) length = 1.e-04;
@ -482,7 +482,7 @@ void DsgPrs_AnglePresentation::Add( const Handle(Prs3d_Presentation)& aPresentat
} }
else else
{ {
// Creating the arc from AttachmentPoint2 to its "projection" // Creating the arc from AttachmentPoint2 to its projection
Standard_Real Alpha = Abs( LastParAttachCirc - FirstParAttachCirc ); Standard_Real Alpha = Abs( LastParAttachCirc - FirstParAttachCirc );
Standard_Integer NodeNumber = Max (4 , Standard_Integer (50. * Alpha / PI)); Standard_Integer NodeNumber = Max (4 , Standard_Integer (50. * Alpha / PI));
Graphic3d_Array1OfVertex ApproxArc( 0, NodeNumber-1 ); Graphic3d_Array1OfVertex ApproxArc( 0, NodeNumber-1 );
@ -559,7 +559,7 @@ void DsgPrs_AnglePresentation::Add (const Handle(Prs3d_Presentation)& aPresentat
if (uco > ufin) { if (uco > ufin) {
if (Abs(theval)<PI) { if (Abs(theval)<PI) {
// test si uco est dans le secteur oppose // test if uco is in the opposite sector
if (uco > udeb+PI && uco < ufin+PI){ if (uco > udeb+PI && uco < ufin+PI){
udeb = udeb + PI; udeb = udeb + PI;
ufin = ufin + PI; ufin = ufin + PI;
@ -596,7 +596,7 @@ void DsgPrs_AnglePresentation::Add (const Handle(Prs3d_Presentation)& aPresentat
ElCLib::D1(uc1,cer,ptarr,vecarr); ElCLib::D1(uc1,cer,ptarr,vecarr);
gp_Ax1 ax1(ptarr, Norm); gp_Ax1 ax1(ptarr, Norm);
gp_Dir dirarr(-vecarr); gp_Dir dirarr(-vecarr);
//calcul de l'angle de rotation //calculate the angle of rotation
Standard_Real beta; Standard_Real beta;
Standard_Real length = LA->ArrowAspect()->Length(); Standard_Real length = LA->ArrowAspect()->Length();
if (length < Precision::Confusion()) length = 1.e-04; if (length < Precision::Confusion()) length = 1.e-04;
@ -638,8 +638,7 @@ void DsgPrs_AnglePresentation::Add (const Handle(Prs3d_Presentation)& aPresentat
//========================================================================== //==========================================================================
// function : DsgPrs_AnglePresentation::Add // function : DsgPrs_AnglePresentation::Add
// purpose : ODL 4-fevrier-97 // purpose : It is possible to choose the symbol of extremities of the face (arrow, point...)
// on peut choisir le symbol des extremites de la cote (fleche, point ...)
//========================================================================== //==========================================================================
void DsgPrs_AnglePresentation::Add (const Handle(Prs3d_Presentation)& aPresentation, void DsgPrs_AnglePresentation::Add (const Handle(Prs3d_Presentation)& aPresentation,
@ -684,7 +683,7 @@ void DsgPrs_AnglePresentation::Add (const Handle(Prs3d_Presentation)& aPresentat
if (uco > ufin) { if (uco > ufin) {
if (Abs(theval)<PI) { if (Abs(theval)<PI) {
// test si uco est dans le secteur oppose // test if uco is in the opposite sector
if (uco > udeb+PI && uco < ufin+PI){ if (uco > udeb+PI && uco < ufin+PI){
udeb = udeb + PI; udeb = udeb + PI;
ufin = ufin + PI; ufin = ufin + PI;
@ -716,13 +715,13 @@ void DsgPrs_AnglePresentation::Add (const Handle(Prs3d_Presentation)& aPresentat
Prs3d_Text::Draw(aPresentation,LA->TextAspect(),aText,OffsetPoint); Prs3d_Text::Draw(aPresentation,LA->TextAspect(),aText,OffsetPoint);
// Lignes de rappel // Lines of recall
gp_Vec vecarr; gp_Vec vecarr;
gp_Pnt ptarr; gp_Pnt ptarr;
ElCLib::D1(uc1,cer,ptarr,vecarr); ElCLib::D1(uc1,cer,ptarr,vecarr);
gp_Ax1 ax1(ptarr, Norm); gp_Ax1 ax1(ptarr, Norm);
gp_Dir dirarr(-vecarr); gp_Dir dirarr(-vecarr);
//calcul de l'angle de rotation //calculate angle of rotation
Standard_Real beta(0.); Standard_Real beta(0.);
Standard_Real length = LA->ArrowAspect()->Length(); Standard_Real length = LA->ArrowAspect()->Length();
if (length < Precision::Confusion()) length = 1.e-04; if (length < Precision::Confusion()) length = 1.e-04;
@ -756,7 +755,7 @@ void DsgPrs_AnglePresentation::Add (const Handle(Prs3d_Presentation)& aPresentat
Prs3d_Root::CurrentGroup(aPresentation)->Polyline(Vrap); Prs3d_Root::CurrentGroup(aPresentation)->Polyline(Vrap);
// On trace les fleches // One traces the arrows
DsgPrs::ComputeSymbol(aPresentation,LA,ptarr,ptarr1,dirarr,dirarr2,ArrowPrs); DsgPrs::ComputeSymbol(aPresentation,LA,ptarr,ptarr1,dirarr,dirarr2,ArrowPrs);
} }
@ -812,7 +811,7 @@ void DsgPrs_AnglePresentation::Add (const Handle(Prs3d_Presentation)& aPresentat
if (uco > ufin) { if (uco > ufin) {
if (Abs(theval)<PI) { if (Abs(theval)<PI) {
// test si uco est dans le secteur oppose // test if uco is in the opposite sector
if (uco > udeb+PI && uco < ufin+PI){ if (uco > udeb+PI && uco < ufin+PI){
udeb = udeb + PI; udeb = udeb + PI;
ufin = ufin + PI; ufin = ufin + PI;
@ -849,7 +848,7 @@ void DsgPrs_AnglePresentation::Add (const Handle(Prs3d_Presentation)& aPresentat
ElCLib::D1(uc1,cer,ptarr,vecarr); ElCLib::D1(uc1,cer,ptarr,vecarr);
gp_Ax1 ax1(ptarr, Norm); gp_Ax1 ax1(ptarr, Norm);
gp_Dir dirarr(-vecarr); gp_Dir dirarr(-vecarr);
//calcul de l'angle de rotation //calculate the angle of rotation
Standard_Real beta; Standard_Real beta;
Standard_Real length = LA->ArrowAspect()->Length(); Standard_Real length = LA->ArrowAspect()->Length();
if (length < Precision::Confusion()) length = 1.e-04; if (length < Precision::Confusion()) length = 1.e-04;

3
src/DsgPrs/DsgPrs_Chamf2dPresentation.cxx
View File

@ -52,8 +52,7 @@ void DsgPrs_Chamf2dPresentation::Add(
//========================================================================== //==========================================================================
// function : DsgPrs_Chamf2dPresentation::Add // function : DsgPrs_Chamf2dPresentation::Add
// purpose : ODL 4-fevrier-97 // purpose : it is possible to choose the symbol of extremities of the face (arrow, point ...)
// on peut choisir le symbol des extremites de la cote (fleche, point ...)
//========================================================================== //==========================================================================
void DsgPrs_Chamf2dPresentation::Add( void DsgPrs_Chamf2dPresentation::Add(

7
src/DsgPrs/DsgPrs_DiameterPresentation.cxx
View File

@ -36,8 +36,7 @@
//========================================================================== //==========================================================================
// function : DsgPrs_DiameterPresentation::Add // function : DsgPrs_DiameterPresentation::Add
// purpose : ODL 4-fevrier-97 // purpose : it is possible to choose the symbol of extremities of the face (arrow, point ...)
// on peut choisir le symbol des extremites de la cote (fleche, point ...)
//========================================================================== //==========================================================================
void DsgPrs_DiameterPresentation::Add (const Handle(Prs3d_Presentation)& aPresentation, void DsgPrs_DiameterPresentation::Add (const Handle(Prs3d_Presentation)& aPresentation,
const Handle(Prs3d_Drawer)& aDrawer, const Handle(Prs3d_Drawer)& aDrawer,
@ -55,7 +54,7 @@ void DsgPrs_DiameterPresentation::Add (const Handle(Prs3d_Presentation)& aPresen
Standard_Real parat = ElCLib::Parameter(aCircle, AttachmentPoint); Standard_Real parat = ElCLib::Parameter(aCircle, AttachmentPoint);
gp_Pnt ptoncirc = ElCLib::Value (parat, aCircle); gp_Pnt ptoncirc = ElCLib::Value (parat, aCircle);
// ligne de cote // sideline
gp_Pnt center = aCircle.Location(); gp_Pnt center = aCircle.Location();
gp_Vec vecrap (ptoncirc,center); gp_Vec vecrap (ptoncirc,center);
@ -160,7 +159,7 @@ void DsgPrs_DiameterPresentation::Add (const Handle(Prs3d_Presentation)& aPresen
// AspectText3d from Graphic3d // AspectText3d from Graphic3d
Standard_Real parEndOfArrow = ElCLib::Parameter(aCircle,AttachmentPoint); // Standard_Real parEndOfArrow = ElCLib::Parameter(aCircle,AttachmentPoint); //
gp_Pnt EndOfArrow; gp_Pnt EndOfArrow;
gp_Pnt DrawPosition = AttachmentPoint;// attachment point gp_Pnt DrawPosition = AttachmentPoint;// point of attachment
Standard_Boolean otherside = Standard_False; Standard_Boolean otherside = Standard_False;
gp_Pnt Center = aCircle.Location(); gp_Pnt Center = aCircle.Location();

22
src/DsgPrs/DsgPrs_LengthPresentation.cxx
View File

@ -78,7 +78,7 @@ void DsgPrs_LengthPresentation::Add (const Handle(Prs3d_Presentation)& aPresenta
PointMax.Coord(X,Y,Z); PointMax.Coord(X,Y,Z);
V(2).SetCoord(X,Y,Z); V(2).SetCoord(X,Y,Z);
// trait de cote : 1er groupe // face processing : 1st group
Prs3d_Root::CurrentGroup(aPresentation)->Polyline(V); Prs3d_Root::CurrentGroup(aPresentation)->Polyline(V);
Prs3d_Root::NewGroup(aPresentation); Prs3d_Root::NewGroup(aPresentation);
@ -92,7 +92,7 @@ void DsgPrs_LengthPresentation::Add (const Handle(Prs3d_Presentation)& aPresenta
if (outside) { if (outside) {
arrdir.Reverse(); arrdir.Reverse();
} }
// fleche 1 : 2eme groupe // arrow 1 : 2nd group
Prs3d_Arrow::Draw(aPresentation,Proj1,arrdir, Prs3d_Arrow::Draw(aPresentation,Proj1,arrdir,
LA->Arrow1Aspect()->Angle(), LA->Arrow1Aspect()->Angle(),
LA->Arrow1Aspect()->Length()); LA->Arrow1Aspect()->Length());
@ -100,14 +100,14 @@ void DsgPrs_LengthPresentation::Add (const Handle(Prs3d_Presentation)& aPresenta
Prs3d_Root::NewGroup(aPresentation); Prs3d_Root::NewGroup(aPresentation);
Prs3d_Root::CurrentGroup(aPresentation)->SetPrimitivesAspect(LA->LineAspect()->Aspect()); Prs3d_Root::CurrentGroup(aPresentation)->SetPrimitivesAspect(LA->LineAspect()->Aspect());
// fleche 2 : 3eme groupe // arrow 2 : 3rd group
Prs3d_Arrow::Draw(aPresentation,Proj2,arrdir.Reversed(), Prs3d_Arrow::Draw(aPresentation,Proj2,arrdir.Reversed(),
LA->Arrow2Aspect()->Angle(), LA->Arrow2Aspect()->Angle(),
LA->Arrow2Aspect()->Length()); LA->Arrow2Aspect()->Length());
Prs3d_Root::NewGroup(aPresentation); Prs3d_Root::NewGroup(aPresentation);
// texte : 4eme groupe // text : 4th group
Prs3d_Text::Draw(aPresentation,LA->TextAspect(),aText,offp); Prs3d_Text::Draw(aPresentation,LA->TextAspect(),aText,offp);
AttachmentPoint1.Coord(X,Y,Z); AttachmentPoint1.Coord(X,Y,Z);
@ -117,7 +117,7 @@ void DsgPrs_LengthPresentation::Add (const Handle(Prs3d_Presentation)& aPresenta
Prs3d_Root::NewGroup(aPresentation); Prs3d_Root::NewGroup(aPresentation);
Prs3d_Root::CurrentGroup(aPresentation)->SetPrimitivesAspect(LA->LineAspect()->Aspect()); Prs3d_Root::CurrentGroup(aPresentation)->SetPrimitivesAspect(LA->LineAspect()->Aspect());
// trait de rappel 1 : 5eme groupe // processing of call 1 : 5th group
Prs3d_Root::CurrentGroup(aPresentation)->Polyline(V); Prs3d_Root::CurrentGroup(aPresentation)->Polyline(V);
AttachmentPoint2.Coord(X,Y,Z); AttachmentPoint2.Coord(X,Y,Z);
@ -127,7 +127,7 @@ void DsgPrs_LengthPresentation::Add (const Handle(Prs3d_Presentation)& aPresenta
Prs3d_Root::NewGroup(aPresentation); Prs3d_Root::NewGroup(aPresentation);
Prs3d_Root::CurrentGroup(aPresentation)->SetPrimitivesAspect(LA->LineAspect()->Aspect()); Prs3d_Root::CurrentGroup(aPresentation)->SetPrimitivesAspect(LA->LineAspect()->Aspect());
// trait de rappel 2 : 6eme groupe // processing of call 2 : 6th group
Prs3d_Root::CurrentGroup(aPresentation)->Polyline(V); Prs3d_Root::CurrentGroup(aPresentation)->Polyline(V);
} }
@ -271,7 +271,7 @@ void DsgPrs_LengthPresentation::Add (const Handle(Prs3d_Presentation)& aPresenta
PointMax.Coord(X,Y,Z); PointMax.Coord(X,Y,Z);
V(2).SetCoord(X,Y,Z); V(2).SetCoord(X,Y,Z);
// trait de cote // processing of face
Prs3d_Root::CurrentGroup(aPresentation)->Polyline(V); Prs3d_Root::CurrentGroup(aPresentation)->Polyline(V);
@ -290,7 +290,7 @@ void DsgPrs_LengthPresentation::Add (const Handle(Prs3d_Presentation)& aPresenta
Proj1.Coord(X,Y,Z); Proj1.Coord(X,Y,Z);
V(2).SetCoord(X,Y,Z); V(2).SetCoord(X,Y,Z);
// trait de rappel 1 // processing of call 1
Prs3d_Root::CurrentGroup(aPresentation)->Polyline(V); Prs3d_Root::CurrentGroup(aPresentation)->Polyline(V);
AttachmentPoint2.Coord(X,Y,Z); AttachmentPoint2.Coord(X,Y,Z);
@ -298,14 +298,14 @@ void DsgPrs_LengthPresentation::Add (const Handle(Prs3d_Presentation)& aPresenta
Proj2.Coord(X,Y,Z); Proj2.Coord(X,Y,Z);
V(2).SetCoord(X,Y,Z); V(2).SetCoord(X,Y,Z);
// trait de rappel 2 // processing of call 2
Prs3d_Root::CurrentGroup(aPresentation)->Polyline(V); Prs3d_Root::CurrentGroup(aPresentation)->Polyline(V);
// texte // text
Prs3d_Text::Draw(aPresentation,LA->TextAspect(),aText,offp); Prs3d_Text::Draw(aPresentation,LA->TextAspect(),aText,offp);
// symbols aux extremites de la cote // symbols at the extremities of the face
DsgPrs::ComputeSymbol(aPresentation,LA,Proj1,Proj2,arrdir,arrdir.Reversed(),ArrowPrs); DsgPrs::ComputeSymbol(aPresentation,LA,Proj1,Proj2,arrdir,arrdir.Reversed(),ArrowPrs);
} }

25
src/DsgPrs/DsgPrs_ParalPresentation.cxx
View File

@ -68,7 +68,7 @@ void DsgPrs_ParalPresentation::Add (const Handle(Prs3d_Presentation)& aPresentat
PointMax.Coord(X,Y,Z); PointMax.Coord(X,Y,Z);
V(2).SetCoord(X,Y,Z); V(2).SetCoord(X,Y,Z);
// trait de cote : 1er groupe // processing of side : 1st group
Prs3d_Root::CurrentGroup(aPresentation)->Polyline(V); Prs3d_Root::CurrentGroup(aPresentation)->Polyline(V);
Prs3d_Root::NewGroup(aPresentation); Prs3d_Root::NewGroup(aPresentation);
@ -82,7 +82,7 @@ void DsgPrs_ParalPresentation::Add (const Handle(Prs3d_Presentation)& aPresentat
if (outside) { if (outside) {
arrdir.Reverse(); arrdir.Reverse();
} }
// fleche 1 : 2eme groupe // arrow 1 : 2nd group
Prs3d_Arrow::Draw(aPresentation,Proj1,arrdir, Prs3d_Arrow::Draw(aPresentation,Proj1,arrdir,
LA->Arrow1Aspect()->Angle(), LA->Arrow1Aspect()->Angle(),
LA->Arrow1Aspect()->Length()); LA->Arrow1Aspect()->Length());
@ -90,14 +90,14 @@ void DsgPrs_ParalPresentation::Add (const Handle(Prs3d_Presentation)& aPresentat
Prs3d_Root::NewGroup(aPresentation); Prs3d_Root::NewGroup(aPresentation);
Prs3d_Root::CurrentGroup(aPresentation)->SetPrimitivesAspect(LA->LineAspect()->Aspect()); Prs3d_Root::CurrentGroup(aPresentation)->SetPrimitivesAspect(LA->LineAspect()->Aspect());
// fleche 2 : 3eme groupe // arrow 2 : 3rd group
Prs3d_Arrow::Draw(aPresentation,Proj2,arrdir.Reversed(), Prs3d_Arrow::Draw(aPresentation,Proj2,arrdir.Reversed(),
LA->Arrow2Aspect()->Angle(), LA->Arrow2Aspect()->Angle(),
LA->Arrow2Aspect()->Length()); LA->Arrow2Aspect()->Length());
Prs3d_Root::NewGroup(aPresentation); Prs3d_Root::NewGroup(aPresentation);
// texte : 4eme groupe // text : 4th group
Prs3d_Text::Draw(aPresentation,LA->TextAspect(),aText,offp); Prs3d_Text::Draw(aPresentation,LA->TextAspect(),aText,offp);
AttachmentPoint1.Coord(X,Y,Z); AttachmentPoint1.Coord(X,Y,Z);
@ -107,7 +107,7 @@ void DsgPrs_ParalPresentation::Add (const Handle(Prs3d_Presentation)& aPresentat
Prs3d_Root::NewGroup(aPresentation); Prs3d_Root::NewGroup(aPresentation);
Prs3d_Root::CurrentGroup(aPresentation)->SetPrimitivesAspect(LA->LineAspect()->Aspect()); Prs3d_Root::CurrentGroup(aPresentation)->SetPrimitivesAspect(LA->LineAspect()->Aspect());
// trait de rappel 1 : 5eme groupe // processing of call 1 : 5th group
Prs3d_Root::CurrentGroup(aPresentation)->Polyline(V); Prs3d_Root::CurrentGroup(aPresentation)->Polyline(V);
AttachmentPoint2.Coord(X,Y,Z); AttachmentPoint2.Coord(X,Y,Z);
@ -117,7 +117,7 @@ void DsgPrs_ParalPresentation::Add (const Handle(Prs3d_Presentation)& aPresentat
Prs3d_Root::NewGroup(aPresentation); Prs3d_Root::NewGroup(aPresentation);
Prs3d_Root::CurrentGroup(aPresentation)->SetPrimitivesAspect(LA->LineAspect()->Aspect()); Prs3d_Root::CurrentGroup(aPresentation)->SetPrimitivesAspect(LA->LineAspect()->Aspect());
// trait de rappel 2 : 6eme groupe // processing of call 2 : 6th group
Prs3d_Root::CurrentGroup(aPresentation)->Polyline(V); Prs3d_Root::CurrentGroup(aPresentation)->Polyline(V);
} }
@ -125,8 +125,7 @@ void DsgPrs_ParalPresentation::Add (const Handle(Prs3d_Presentation)& aPresentat
//========================================================================== //==========================================================================
// function : DsgPrs_ParalPresentation::Add // function : DsgPrs_ParalPresentation::Add
// purpose : ODL 4-fevrier-97 // purpose : it is possible to choose the symbol of extremities of the face (arrow, point...)
// on peut choisir le symbol des extremites de la cote (fleche, point ...)
//========================================================================== //==========================================================================
void DsgPrs_ParalPresentation::Add (const Handle(Prs3d_Presentation)& aPresentation, void DsgPrs_ParalPresentation::Add (const Handle(Prs3d_Presentation)& aPresentation,
const Handle(Prs3d_Drawer)& aDrawer, const Handle(Prs3d_Drawer)& aDrawer,
@ -179,7 +178,7 @@ void DsgPrs_ParalPresentation::Add (const Handle(Prs3d_Presentation)& aPresentat
PointMax.Coord(X,Y,Z); PointMax.Coord(X,Y,Z);
V(2).SetCoord(X,Y,Z); V(2).SetCoord(X,Y,Z);
// trait de cote // processing of face
Prs3d_Root::CurrentGroup(aPresentation)->Polyline(V); Prs3d_Root::CurrentGroup(aPresentation)->Polyline(V);
if (dist < (LA->Arrow1Aspect()->Length()+LA->Arrow2Aspect()->Length())) { if (dist < (LA->Arrow1Aspect()->Length()+LA->Arrow2Aspect()->Length())) {
@ -197,7 +196,7 @@ void DsgPrs_ParalPresentation::Add (const Handle(Prs3d_Presentation)& aPresentat
Proj1.Coord(X,Y,Z); Proj1.Coord(X,Y,Z);
V(2).SetCoord(X,Y,Z); V(2).SetCoord(X,Y,Z);
// trait de rappel 1 // processing of call 1
Prs3d_Root::CurrentGroup(aPresentation)->Polyline(V); Prs3d_Root::CurrentGroup(aPresentation)->Polyline(V);
AttachmentPoint2.Coord(X,Y,Z); AttachmentPoint2.Coord(X,Y,Z);
@ -205,14 +204,14 @@ void DsgPrs_ParalPresentation::Add (const Handle(Prs3d_Presentation)& aPresentat
Proj2.Coord(X,Y,Z); Proj2.Coord(X,Y,Z);
V(2).SetCoord(X,Y,Z); V(2).SetCoord(X,Y,Z);
// trait de rappel 2 // processing of call 2
Prs3d_Root::CurrentGroup(aPresentation)->Polyline(V); Prs3d_Root::CurrentGroup(aPresentation)->Polyline(V);
// texte // text
Prs3d_Text::Draw(aPresentation,LA->TextAspect(),aText,offp); Prs3d_Text::Draw(aPresentation,LA->TextAspect(),aText,offp);
//fleches //arrows
DsgPrs::ComputeSymbol(aPresentation,LA,Proj1,Proj2,arrdir,arrdir.Reversed(),ArrowPrs); DsgPrs::ComputeSymbol(aPresentation,LA,Proj1,Proj2,arrdir,arrdir.Reversed(),ArrowPrs);

166
src/DsgPrs/DsgPrs_SymmetricPresentation.cxx
View File

@ -75,7 +75,7 @@ void DsgPrs_SymmetricPresentation::Add (const Handle(Prs3d_Presentation)& aPrese
gp_Pnt P1,P2; gp_Pnt P1,P2;
//=================================== //===================================
// SYMETRIE D'EDGE PERPEND. A L'AXE // SYMETRY OF EDGE PERPEND. TO THE AXIS
// ____ : ____ // ____ : ____
// edge2 | : -=- | edge 1 // edge2 | : -=- | edge 1
// |<------:------>| // |<------:------>|
@ -129,15 +129,15 @@ void DsgPrs_SymmetricPresentation::Add (const Handle(Prs3d_Presentation)& aPrese
/*//======================================================= /*//=======================================================
// POUR EVITER LES CROISSEMENTS // TO AVOID CROSSING
// P1 -=- P2 P2 -=- P1 // P1 -=- P2 P2 -=- P1
// \<-->/ |<-->| // \<-->/ |<-->|
// \ / | | // \ / | |
// \/ | | // \/ | |
// /\ | | // /\ | |
// / \ | | // / \ | |
// Pattach2 /____\ Pattach1 Pattach2 /______\ Pattach1 // Pattach2 /____\ Pattach1 Pattach2 /______\ Pattach1
// / NON \ / OUI \ // / NO \ / YES \
//======================================================= //=======================================================
*/ */
@ -152,7 +152,7 @@ void DsgPrs_SymmetricPresentation::Add (const Handle(Prs3d_Presentation)& aPrese
P2 = PntTempo; P2 = PntTempo;
} }
/* //=================================== /* //===================================
// CASSURES DES TRAITS DE RAPPEL // FRACTURES OF TRAITS OF CALL
// / \ // / \
// / \ // / \
// | -=- | // | -=- |
@ -165,7 +165,7 @@ void DsgPrs_SymmetricPresentation::Add (const Handle(Prs3d_Presentation)& aPrese
if(aAxis.Distance(P1) > D1*(1 + coeff) && !Cross){ if(aAxis.Distance(P1) > D1*(1 + coeff) && !Cross){
//==== TRAIT DE COTE =========== //==== PROCESSING OF FACE ===========
Prs3d_Root::NewGroup(aPresentation); Prs3d_Root::NewGroup(aPresentation);
Prs3d_Root::CurrentGroup(aPresentation)->SetPrimitivesAspect(LA->LineAspect()->Aspect()); Prs3d_Root::CurrentGroup(aPresentation)->SetPrimitivesAspect(LA->LineAspect()->Aspect());
Pj_P1 = ElCLib::Value(ElCLib::Parameter(aAxis,P1),aAxis); Pj_P1 = ElCLib::Value(ElCLib::Parameter(aAxis,P1),aAxis);
@ -177,7 +177,7 @@ void DsgPrs_SymmetricPresentation::Add (const Handle(Prs3d_Presentation)& aPrese
P2.SetCoord(X,Y,Z); P2.SetCoord(X,Y,Z);
//================================= //=================================
// COTATION A L'EXTERIEUR // LISTING AT THE EXTERIOR
// -=- // -=-
// ->|----------|<------ // ->|----------|<------
// | | // | |
@ -210,7 +210,7 @@ void DsgPrs_SymmetricPresentation::Add (const Handle(Prs3d_Presentation)& aPrese
V(2).SetCoord(X,Y,Z); V(2).SetCoord(X,Y,Z);
Prs3d_Root::CurrentGroup(aPresentation)->Polyline(V); Prs3d_Root::CurrentGroup(aPresentation)->Polyline(V);
//==== TRAIT DE RAPPEL 1 ===== //==== PROCESSING OF CALL 1 =====
Prs3d_Root::NewGroup(aPresentation); Prs3d_Root::NewGroup(aPresentation);
Prs3d_Root::CurrentGroup(aPresentation)->SetPrimitivesAspect(LA->LineAspect()->Aspect()); Prs3d_Root::CurrentGroup(aPresentation)->SetPrimitivesAspect(LA->LineAspect()->Aspect());
AttachmentPoint1.Coord(X,Y,Z); AttachmentPoint1.Coord(X,Y,Z);
@ -228,7 +228,7 @@ void DsgPrs_SymmetricPresentation::Add (const Handle(Prs3d_Presentation)& aPrese
Vc(3).SetCoord(X,Y,Z); Vc(3).SetCoord(X,Y,Z);
Prs3d_Root::CurrentGroup(aPresentation)->Polyline(Vc); Prs3d_Root::CurrentGroup(aPresentation)->Polyline(Vc);
//==== TRAIT DE RAPPEL 2 ===== //==== PROCESSING OF CALL 2 =====
Prs3d_Root::NewGroup(aPresentation); Prs3d_Root::NewGroup(aPresentation);
Prs3d_Root::CurrentGroup(aPresentation)->SetPrimitivesAspect(LA->LineAspect()->Aspect()); Prs3d_Root::CurrentGroup(aPresentation)->SetPrimitivesAspect(LA->LineAspect()->Aspect());
AttachmentPoint2.Coord(X,Y,Z); AttachmentPoint2.Coord(X,Y,Z);
@ -247,7 +247,7 @@ void DsgPrs_SymmetricPresentation::Add (const Handle(Prs3d_Presentation)& aPrese
} }
/*//=================================== /*//===================================
// CASSURES DES TRAITS DE RAPPEL // FRACTURES OF PROCESSING OF CALL
// -=- // -=-
// |<--------->| // |<--------->|
// | | // | |
@ -257,7 +257,7 @@ void DsgPrs_SymmetricPresentation::Add (const Handle(Prs3d_Presentation)& aPrese
*/ */
else if (aAxis.Distance(P1) < D1*(1 - coeff) || Cross) { else if (aAxis.Distance(P1) < D1*(1 - coeff) || Cross) {
//------ TRAIT DE COTE ------------ //------ PROCESSING OF FACE ------------
Prs3d_Root::NewGroup(aPresentation); Prs3d_Root::NewGroup(aPresentation);
Prs3d_Root::CurrentGroup(aPresentation)->SetPrimitivesAspect(LA->LineAspect()->Aspect()); Prs3d_Root::CurrentGroup(aPresentation)->SetPrimitivesAspect(LA->LineAspect()->Aspect());
Pj_P1 = ElCLib::Value(ElCLib::Parameter(aAxis,P1),aAxis); Pj_P1 = ElCLib::Value(ElCLib::Parameter(aAxis,P1),aAxis);
@ -269,7 +269,7 @@ void DsgPrs_SymmetricPresentation::Add (const Handle(Prs3d_Presentation)& aPrese
P2.SetCoord(X,Y,Z); P2.SetCoord(X,Y,Z);
//================================= //=================================
// COTATION A L'EXTERIEUR // LISTING AT THE EXTERIOR
// -=- // -=-
// ->|----------|<------ // ->|----------|<------
// | | // | |
@ -301,7 +301,7 @@ void DsgPrs_SymmetricPresentation::Add (const Handle(Prs3d_Presentation)& aPrese
V(2).SetCoord(X,Y,Z); V(2).SetCoord(X,Y,Z);
Prs3d_Root::CurrentGroup(aPresentation)->Polyline(V); Prs3d_Root::CurrentGroup(aPresentation)->Polyline(V);
//==== TRAIT DE RAPPEL 1 ===== //==== PROCESSING OF CALL 1 =====
Prs3d_Root::NewGroup(aPresentation); Prs3d_Root::NewGroup(aPresentation);
Prs3d_Root::CurrentGroup(aPresentation)->SetPrimitivesAspect(LA->LineAspect()->Aspect()); Prs3d_Root::CurrentGroup(aPresentation)->SetPrimitivesAspect(LA->LineAspect()->Aspect());
AttachmentPoint1.Coord(X,Y,Z); AttachmentPoint1.Coord(X,Y,Z);
@ -319,7 +319,7 @@ void DsgPrs_SymmetricPresentation::Add (const Handle(Prs3d_Presentation)& aPrese
Vc(3).SetCoord(X,Y,Z); Vc(3).SetCoord(X,Y,Z);
Prs3d_Root::CurrentGroup(aPresentation)->Polyline(Vc); Prs3d_Root::CurrentGroup(aPresentation)->Polyline(Vc);
//==== TRAIT DE RAPPEL 2 ===== //==== PROCESSING OF CALL 2 =====
Prs3d_Root::NewGroup(aPresentation); Prs3d_Root::NewGroup(aPresentation);
Prs3d_Root::CurrentGroup(aPresentation)->SetPrimitivesAspect(LA->LineAspect()->Aspect()); Prs3d_Root::CurrentGroup(aPresentation)->SetPrimitivesAspect(LA->LineAspect()->Aspect());
AttachmentPoint2.Coord(X,Y,Z); AttachmentPoint2.Coord(X,Y,Z);
@ -338,7 +338,7 @@ void DsgPrs_SymmetricPresentation::Add (const Handle(Prs3d_Presentation)& aPrese
} }
else { else {
//==== TRAIT DE COTE =========== //==== PROCESSING OF FACE ===========
Prs3d_Root::NewGroup(aPresentation); Prs3d_Root::NewGroup(aPresentation);
Prs3d_Root::CurrentGroup(aPresentation)->SetPrimitivesAspect(LA->LineAspect()->Aspect()); Prs3d_Root::CurrentGroup(aPresentation)->SetPrimitivesAspect(LA->LineAspect()->Aspect());
PointMin.Coord(X,Y,Z); PointMin.Coord(X,Y,Z);
@ -347,7 +347,7 @@ void DsgPrs_SymmetricPresentation::Add (const Handle(Prs3d_Presentation)& aPrese
V(2).SetCoord(X,Y,Z); V(2).SetCoord(X,Y,Z);
Prs3d_Root::CurrentGroup(aPresentation)->Polyline(V); Prs3d_Root::CurrentGroup(aPresentation)->Polyline(V);
//==== TRAIT DE RAPPEL 1 ===== //==== PROCESSING OF CALL 1 =====
Prs3d_Root::NewGroup(aPresentation); Prs3d_Root::NewGroup(aPresentation);
Prs3d_Root::CurrentGroup(aPresentation)->SetPrimitivesAspect(LA->LineAspect()->Aspect()); Prs3d_Root::CurrentGroup(aPresentation)->SetPrimitivesAspect(LA->LineAspect()->Aspect());
AttachmentPoint1.Coord(X,Y,Z); AttachmentPoint1.Coord(X,Y,Z);
@ -356,7 +356,7 @@ void DsgPrs_SymmetricPresentation::Add (const Handle(Prs3d_Presentation)& aPrese
V(2).SetCoord(X,Y,Z); V(2).SetCoord(X,Y,Z);
Prs3d_Root::CurrentGroup(aPresentation)->Polyline(V); Prs3d_Root::CurrentGroup(aPresentation)->Polyline(V);
//==== TRAIT DE RAPPEL 2 ===== //==== PROCESSING OF CALL 2 =====
Prs3d_Root::NewGroup(aPresentation); Prs3d_Root::NewGroup(aPresentation);
Prs3d_Root::CurrentGroup(aPresentation)->SetPrimitivesAspect(LA->LineAspect()->Aspect()); Prs3d_Root::CurrentGroup(aPresentation)->SetPrimitivesAspect(LA->LineAspect()->Aspect());
AttachmentPoint2.Coord(X,Y,Z); AttachmentPoint2.Coord(X,Y,Z);
@ -366,30 +366,30 @@ void DsgPrs_SymmetricPresentation::Add (const Handle(Prs3d_Presentation)& aPrese
Prs3d_Root::CurrentGroup(aPresentation)->Polyline(V); Prs3d_Root::CurrentGroup(aPresentation)->Polyline(V);
} }
//==== FLECHES ================ //==== ARROWS ================
Prs3d_Root::NewGroup(aPresentation); Prs3d_Root::NewGroup(aPresentation);
Prs3d_Root::CurrentGroup(aPresentation)->SetPrimitivesAspect(LA->LineAspect()->Aspect()); Prs3d_Root::CurrentGroup(aPresentation)->SetPrimitivesAspect(LA->LineAspect()->Aspect());
if (dist < (LA->Arrow1Aspect()->Length()+LA->Arrow2Aspect()->Length())) outside = Standard_True; if (dist < (LA->Arrow1Aspect()->Length()+LA->Arrow2Aspect()->Length())) outside = Standard_True;
gp_Dir arrdir = L3.Direction().Reversed(); gp_Dir arrdir = L3.Direction().Reversed();
if (outside) arrdir.Reverse(); if (outside) arrdir.Reverse();
// fleche 1 ---- // arrow 1 ----
Prs3d_Arrow::Draw(aPresentation,P1,arrdir, Prs3d_Arrow::Draw(aPresentation,P1,arrdir,
LA->Arrow1Aspect()->Angle(), LA->Arrow1Aspect()->Angle(),
LA->Arrow1Aspect()->Length()); LA->Arrow1Aspect()->Length());
// fleche 2 ---- // arrow 2 ----
Prs3d_Arrow::Draw(aPresentation,P2,arrdir.Reversed(), Prs3d_Arrow::Draw(aPresentation,P2,arrdir.Reversed(),
LA->Arrow2Aspect()->Angle(), LA->Arrow2Aspect()->Angle(),
LA->Arrow2Aspect()->Length()); LA->Arrow2Aspect()->Length());
//-------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------
//| SYMBOLE DE SYMETRIE | //| SYMBOL OF SYMMETRY |
//-------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------
// ------- : Segment superieur // ------- : Superior Segment
// ----------- : Axe // ----------- : Axis
// ------- : Segment inferieur // ------- : Inferior Segment
gp_Vec Vvar(P1,P2); gp_Vec Vvar(P1,P2);
gp_Vec vec; gp_Vec vec;
@ -414,7 +414,7 @@ void DsgPrs_SymmetricPresentation::Add (const Handle(Prs3d_Presentation)& aPrese
//pm = P1.Translated(Vvar.Multiplied(.5)); //pm = P1.Translated(Vvar.Multiplied(.5));
pOff = OffsetPoint.Translated(vecB); pOff = OffsetPoint.Translated(vecB);
//Calcul des points extremes de l'axe du symbole //Calculate the extremities of the symbol axis
gp_Vec vecAxe = vecA.Multiplied(.7); gp_Vec vecAxe = vecA.Multiplied(.7);
pOff.Translated(vecAxe).Coord(X,Y,Z); pOff.Translated(vecAxe).Coord(X,Y,Z);
V(1).SetCoord(X,Y,Z); V(1).SetCoord(X,Y,Z);
@ -424,7 +424,7 @@ void DsgPrs_SymmetricPresentation::Add (const Handle(Prs3d_Presentation)& aPrese
Prs3d_Root::CurrentGroup(aPresentation)->SetPrimitivesAspect(LA->LineAspect()->Aspect()); Prs3d_Root::CurrentGroup(aPresentation)->SetPrimitivesAspect(LA->LineAspect()->Aspect());
Prs3d_Root::CurrentGroup(aPresentation)->Polyline(V); Prs3d_Root::CurrentGroup(aPresentation)->Polyline(V);
//Calcul des points extremes du segment sup du symbole //Calculate the extremities of the superior segment of the symbol
gp_Vec vec1 = vecAxe.Multiplied(.6); gp_Vec vec1 = vecAxe.Multiplied(.6);
vecAxe = Vaxe.Multiplied(vecAxe.Magnitude()); vecAxe = Vaxe.Multiplied(vecAxe.Magnitude());
gp_Vec vec2 = vecAxe.Multiplied(.4); gp_Vec vec2 = vecAxe.Multiplied(.4);
@ -437,7 +437,7 @@ void DsgPrs_SymmetricPresentation::Add (const Handle(Prs3d_Presentation)& aPrese
Prs3d_Root::CurrentGroup(aPresentation)->SetPrimitivesAspect(LA->LineAspect()->Aspect()); Prs3d_Root::CurrentGroup(aPresentation)->SetPrimitivesAspect(LA->LineAspect()->Aspect());
Prs3d_Root::CurrentGroup(aPresentation)->Polyline(V); Prs3d_Root::CurrentGroup(aPresentation)->Polyline(V);
//Calcul des points extremes du segment inf du symbole //Calculate the extremities of the inferior segment of the symbol
pOff.Translated(vec1.Added(vec2.Reversed())).Coord(X,Y,Z); pOff.Translated(vec1.Added(vec2.Reversed())).Coord(X,Y,Z);
V(1).SetCoord(X,Y,Z); V(1).SetCoord(X,Y,Z);
pOff.Translated(vec1.Reversed().Added(vec2.Reversed())).Coord(X,Y,Z); pOff.Translated(vec1.Reversed().Added(vec2.Reversed())).Coord(X,Y,Z);
@ -447,10 +447,10 @@ void DsgPrs_SymmetricPresentation::Add (const Handle(Prs3d_Presentation)& aPrese
Prs3d_Root::CurrentGroup(aPresentation)->Polyline(V); Prs3d_Root::CurrentGroup(aPresentation)->Polyline(V);
/*//-------------------------------------------------------------------------------------- /*//--------------------------------------------------------------------------------------
//| REPERAGE DE L'AXE DE SYMETRIE | //| MARKING OF THE SYMMETRY AXIS |
//-------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------
// ____ // ____
// \ / :Curseur // \ / :Cursor
// \/ // \/
// /\ // /\
// /__\ // /__\
@ -556,7 +556,7 @@ void DsgPrs_SymmetricPresentation::Add (const Handle(Prs3d_Presentation)& aPrese
Graphic3d_Array1OfVertex V(1,2); Graphic3d_Array1OfVertex V(1,2);
Quantity_Length X,Y,Z; Quantity_Length X,Y,Z;
//==== TRAIT DE COTE =========== //==== PROCESSING OF FACE ===========
Prs3d_Root::NewGroup(aPresentation); Prs3d_Root::NewGroup(aPresentation);
Prs3d_Root::CurrentGroup(aPresentation)->SetPrimitivesAspect(LA->LineAspect()->Aspect()); Prs3d_Root::CurrentGroup(aPresentation)->SetPrimitivesAspect(LA->LineAspect()->Aspect());
PointMin.Coord(X,Y,Z); PointMin.Coord(X,Y,Z);
@ -565,7 +565,7 @@ void DsgPrs_SymmetricPresentation::Add (const Handle(Prs3d_Presentation)& aPrese
V(2).SetCoord(X,Y,Z); V(2).SetCoord(X,Y,Z);
Prs3d_Root::CurrentGroup(aPresentation)->Polyline(V); Prs3d_Root::CurrentGroup(aPresentation)->Polyline(V);
//==== TRAIT DE RAPPEL 1 ===== //==== PROCESSING OF CALL 1 =====
Standard_Integer nbp = 10; Standard_Integer nbp = 10;
Prs3d_Root::NewGroup(aPresentation); Prs3d_Root::NewGroup(aPresentation);
Prs3d_Root::CurrentGroup(aPresentation)->SetPrimitivesAspect(LA->LineAspect()->Aspect()); Prs3d_Root::CurrentGroup(aPresentation)->SetPrimitivesAspect(LA->LineAspect()->Aspect());
@ -614,7 +614,7 @@ void DsgPrs_SymmetricPresentation::Add (const Handle(Prs3d_Presentation)& aPrese
} }
Prs3d_Root::CurrentGroup(aPresentation)->Polyline(Vc1); Prs3d_Root::CurrentGroup(aPresentation)->Polyline(Vc1);
//==== TRAIT DE RAPPEL 2 ===== //==== PROCESSING OF CALL 2 =====
Prs3d_Root::NewGroup(aPresentation); Prs3d_Root::NewGroup(aPresentation);
Prs3d_Root::CurrentGroup(aPresentation)->SetPrimitivesAspect(LA->LineAspect()->Aspect()); Prs3d_Root::CurrentGroup(aPresentation)->SetPrimitivesAspect(LA->LineAspect()->Aspect());
gp_Pnt Center2 = ProjCenter1.Translated(Vp.Reversed()); gp_Pnt Center2 = ProjCenter1.Translated(Vp.Reversed());
@ -664,30 +664,30 @@ void DsgPrs_SymmetricPresentation::Add (const Handle(Prs3d_Presentation)& aPrese
} }
Prs3d_Root::CurrentGroup(aPresentation)->Polyline(Vc2); Prs3d_Root::CurrentGroup(aPresentation)->Polyline(Vc2);
//==== FLECHES ================ //==== ARROWS ================
Prs3d_Root::NewGroup(aPresentation); Prs3d_Root::NewGroup(aPresentation);
Prs3d_Root::CurrentGroup(aPresentation)->SetPrimitivesAspect(LA->LineAspect()->Aspect()); Prs3d_Root::CurrentGroup(aPresentation)->SetPrimitivesAspect(LA->LineAspect()->Aspect());
if (dist < (LA->Arrow1Aspect()->Length()+LA->Arrow2Aspect()->Length())) outside = Standard_True; if (dist < (LA->Arrow1Aspect()->Length()+LA->Arrow2Aspect()->Length())) outside = Standard_True;
gp_Dir arrdir = L3.Direction().Reversed(); gp_Dir arrdir = L3.Direction().Reversed();
if (outside) arrdir.Reverse(); if (outside) arrdir.Reverse();
// fleche 1 ---- // arrow 1 ----
Prs3d_Arrow::Draw(aPresentation,P1,arrdir, Prs3d_Arrow::Draw(aPresentation,P1,arrdir,
LA->Arrow1Aspect()->Angle(), LA->Arrow1Aspect()->Angle(),
LA->Arrow1Aspect()->Length()); LA->Arrow1Aspect()->Length());
// fleche 2 ---- // arrow 2 ----
Prs3d_Arrow::Draw(aPresentation,P2,arrdir.Reversed(), Prs3d_Arrow::Draw(aPresentation,P2,arrdir.Reversed(),
LA->Arrow2Aspect()->Angle(), LA->Arrow2Aspect()->Angle(),
LA->Arrow2Aspect()->Length()); LA->Arrow2Aspect()->Length());
//-------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------
//| SYMBOLE DE SYMETRIE | //| SYMBOL OF SYMMETRY |
//-------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------
// ------- : Segment superieur // ------- : Superior Segment
// ----------- : Axe // ----------- : Axis
// ------- : Segment inferieur // ------- : Inferior Segment
gp_Vec Vvar(P1,P2); gp_Vec Vvar(P1,P2);
gp_Vec vec; gp_Vec vec;
@ -706,7 +706,7 @@ void DsgPrs_SymmetricPresentation::Add (const Handle(Prs3d_Presentation)& aPrese
pm = P1.Translated(Vvar.Multiplied(.5)); pm = P1.Translated(Vvar.Multiplied(.5));
pOff = OffsetPnt.Translated(vecB); pOff = OffsetPnt.Translated(vecB);
//Calcul des points extremes de l'axe du symbole //Calculation of extremas of the axis of the symbol
gp_Vec vecAxe = vecA.Multiplied(.7); gp_Vec vecAxe = vecA.Multiplied(.7);
pOff.Translated(vecAxe).Coord(X,Y,Z); pOff.Translated(vecAxe).Coord(X,Y,Z);
V(1).SetCoord(X,Y,Z); V(1).SetCoord(X,Y,Z);
@ -716,7 +716,7 @@ void DsgPrs_SymmetricPresentation::Add (const Handle(Prs3d_Presentation)& aPrese
Prs3d_Root::CurrentGroup(aPresentation)->SetPrimitivesAspect(LA->LineAspect()->Aspect()); Prs3d_Root::CurrentGroup(aPresentation)->SetPrimitivesAspect(LA->LineAspect()->Aspect());
Prs3d_Root::CurrentGroup(aPresentation)->Polyline(V); Prs3d_Root::CurrentGroup(aPresentation)->Polyline(V);
//Calcul des points extremes du segment sup du symbole //Calculation of extremas of the superior segment of the symbol
gp_Vec vec1 = vecAxe.Multiplied(.6); gp_Vec vec1 = vecAxe.Multiplied(.6);
vecAxe = Vaxe.Multiplied(vecAxe.Magnitude()); vecAxe = Vaxe.Multiplied(vecAxe.Magnitude());
@ -732,7 +732,7 @@ void DsgPrs_SymmetricPresentation::Add (const Handle(Prs3d_Presentation)& aPrese
Prs3d_Root::CurrentGroup(aPresentation)->SetPrimitivesAspect(LA->LineAspect()->Aspect()); Prs3d_Root::CurrentGroup(aPresentation)->SetPrimitivesAspect(LA->LineAspect()->Aspect());
Prs3d_Root::CurrentGroup(aPresentation)->Polyline(V); Prs3d_Root::CurrentGroup(aPresentation)->Polyline(V);
//Calcul des points extremes du segment inf du symbole //Calculation of extremas of the inferior segment of the symbol
pOff.Translated(vec1.Added(vec2.Reversed())).Coord(X,Y,Z); pOff.Translated(vec1.Added(vec2.Reversed())).Coord(X,Y,Z);
V(1).SetCoord(X,Y,Z); V(1).SetCoord(X,Y,Z);
pOff.Translated(vec1.Reversed().Added(vec2.Reversed())).Coord(X,Y,Z); pOff.Translated(vec1.Reversed().Added(vec2.Reversed())).Coord(X,Y,Z);
@ -742,10 +742,10 @@ void DsgPrs_SymmetricPresentation::Add (const Handle(Prs3d_Presentation)& aPrese
Prs3d_Root::CurrentGroup(aPresentation)->Polyline(V); Prs3d_Root::CurrentGroup(aPresentation)->Polyline(V);
/*//-------------------------------------------------------------------------------------- /*//--------------------------------------------------------------------------------------
//| REPERAGE DE L'AXE DE SYMETRIE | //| MARKING OF THE AXIS OF SYMMETRY |
//-------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------
// ____ // ____
// \ / :Curseur // \ / :Cursor
// \/ // \/
// /\ // /\
// /__\ // /__\
@ -803,9 +803,9 @@ void DsgPrs_SymmetricPresentation::Add (const Handle(Prs3d_Presentation)& aPrese
if (AttachmentPoint1.IsEqual(AttachmentPoint2,Precision::Confusion())){ if (AttachmentPoint1.IsEqual(AttachmentPoint2,Precision::Confusion())){
//============================================================== //==============================================================
// CAS DE SYMETRIE OU LE POINT REFERENCE EST SUR L'AXE DE SYM.: // SYMMETRY WHEN THE REFERENCE POINT IS ON THE AXIS OF SYM.:
//============================================================== //==============================================================
//Marker de localisation de la cote //Marker of localisation of the face
Handle(Graphic3d_AspectMarker3d) MarkerAsp = new Graphic3d_AspectMarker3d(); Handle(Graphic3d_AspectMarker3d) MarkerAsp = new Graphic3d_AspectMarker3d();
MarkerAsp->SetType(Aspect_TOM_BALL); MarkerAsp->SetType(Aspect_TOM_BALL);
MarkerAsp->SetScale(0.8); MarkerAsp->SetScale(0.8);
@ -820,7 +820,7 @@ void DsgPrs_SymmetricPresentation::Add (const Handle(Prs3d_Presentation)& aPrese
AttachmentPoint1.Z()); AttachmentPoint1.Z());
Prs3d_Root::CurrentGroup(aPresentation)->Marker(V3d); Prs3d_Root::CurrentGroup(aPresentation)->Marker(V3d);
//Trace du segment de raccordement //Trace of the linking segment
Prs3d_Root::NewGroup(aPresentation); Prs3d_Root::NewGroup(aPresentation);
Prs3d_Root::CurrentGroup(aPresentation)->SetPrimitivesAspect(LA->LineAspect()->Aspect()); Prs3d_Root::CurrentGroup(aPresentation)->SetPrimitivesAspect(LA->LineAspect()->Aspect());
Graphic3d_Array1OfVertex Vrac(1,2); Graphic3d_Array1OfVertex Vrac(1,2);
@ -833,13 +833,13 @@ void DsgPrs_SymmetricPresentation::Add (const Handle(Prs3d_Presentation)& aPrese
Prs3d_Root::CurrentGroup(aPresentation)->Polyline(Vrac); Prs3d_Root::CurrentGroup(aPresentation)->Polyline(Vrac);
//-------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------
//| SYMBOLE DE SYMETRIE | //| SYMBOL OF SYMMETRY |
//-------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------
// ------- : Segment superieur // ------- : Superior Segment
// ----------- : Axe // ----------- : Axis
// ------- : Segment inferieur // ------- : Inferior Segment
//Calcul des points extremes de l'axe du symbole //Calculate extremas of the axis of the symbol
gp_Vec VAO (AttachmentPoint1,OffsetPoint); gp_Vec VAO (AttachmentPoint1,OffsetPoint);
gp_Vec uVAO = VAO.Divided(VAO.Magnitude()); gp_Vec uVAO = VAO.Divided(VAO.Magnitude());
gp_Pnt pDaxe = OffsetPoint.Translated(uVAO.Multiplied(3.)); gp_Pnt pDaxe = OffsetPoint.Translated(uVAO.Multiplied(3.));
@ -850,7 +850,7 @@ void DsgPrs_SymmetricPresentation::Add (const Handle(Prs3d_Presentation)& aPrese
Prs3d_Root::CurrentGroup(aPresentation)->SetPrimitivesAspect(LA->LineAspect()->Aspect()); Prs3d_Root::CurrentGroup(aPresentation)->SetPrimitivesAspect(LA->LineAspect()->Aspect());
Prs3d_Root::CurrentGroup(aPresentation)->Polyline(Vrac); Prs3d_Root::CurrentGroup(aPresentation)->Polyline(Vrac);
//Calcul des points extremes du segment sup du symbole //Calculate extremas of the superior segment of the symbol
gp_Vec nVAO (-uVAO.Y(),uVAO.X(),uVAO.Z()); gp_Vec nVAO (-uVAO.Y(),uVAO.X(),uVAO.Z());
gp_Pnt sgP11 = pDaxe.Translated(uVAO.Multiplied(2.).Added(nVAO.Multiplied(2.))); gp_Pnt sgP11 = pDaxe.Translated(uVAO.Multiplied(2.).Added(nVAO.Multiplied(2.)));
gp_Pnt sgP12 = sgP11.Translated(uVAO.Multiplied(8.)); gp_Pnt sgP12 = sgP11.Translated(uVAO.Multiplied(8.));
@ -860,7 +860,7 @@ void DsgPrs_SymmetricPresentation::Add (const Handle(Prs3d_Presentation)& aPrese
Prs3d_Root::CurrentGroup(aPresentation)->SetPrimitivesAspect(LA->LineAspect()->Aspect()); Prs3d_Root::CurrentGroup(aPresentation)->SetPrimitivesAspect(LA->LineAspect()->Aspect());
Prs3d_Root::CurrentGroup(aPresentation)->Polyline(Vrac); Prs3d_Root::CurrentGroup(aPresentation)->Polyline(Vrac);
//Calcul des points extremes du segment inf du symbole //Calculate extremas of the inferior segment of the symbol
gp_Vec nVAOr = nVAO.Reversed(); gp_Vec nVAOr = nVAO.Reversed();
gp_Pnt sgP21 = pDaxe.Translated(uVAO.Multiplied(2.).Added(nVAOr.Multiplied(2.))); gp_Pnt sgP21 = pDaxe.Translated(uVAO.Multiplied(2.).Added(nVAOr.Multiplied(2.)));
gp_Pnt sgP22 = sgP21.Translated(uVAO.Multiplied(8.)); gp_Pnt sgP22 = sgP21.Translated(uVAO.Multiplied(8.));
@ -871,7 +871,7 @@ void DsgPrs_SymmetricPresentation::Add (const Handle(Prs3d_Presentation)& aPrese
Prs3d_Root::CurrentGroup(aPresentation)->Polyline(Vrac); Prs3d_Root::CurrentGroup(aPresentation)->Polyline(Vrac);
} }
//============================================================== //==============================================================
// AUTRES CAS : // OTHER CASES :
//============================================================== //==============================================================
else{ else{
@ -909,7 +909,7 @@ void DsgPrs_SymmetricPresentation::Add (const Handle(Prs3d_Presentation)& aPrese
Graphic3d_Array1OfVertex V(1,2); Graphic3d_Array1OfVertex V(1,2);
Quantity_Length X,Y,Z; Quantity_Length X,Y,Z;
//==== TRAIT DE COTE =========== //==== PROCESSING OF FACE ===========
Prs3d_Root::NewGroup(aPresentation); Prs3d_Root::NewGroup(aPresentation);
Prs3d_Root::CurrentGroup(aPresentation)->SetPrimitivesAspect(LA->LineAspect()->Aspect()); Prs3d_Root::CurrentGroup(aPresentation)->SetPrimitivesAspect(LA->LineAspect()->Aspect());
PointMin.Coord(X,Y,Z); PointMin.Coord(X,Y,Z);
@ -918,7 +918,7 @@ void DsgPrs_SymmetricPresentation::Add (const Handle(Prs3d_Presentation)& aPrese
V(2).SetCoord(X,Y,Z); V(2).SetCoord(X,Y,Z);
Prs3d_Root::CurrentGroup(aPresentation)->Polyline(V); Prs3d_Root::CurrentGroup(aPresentation)->Polyline(V);
//==== TRAIT DE RAPPEL 1 ===== //==== PROCESSING OF CALL 1 =====
Prs3d_Root::NewGroup(aPresentation); Prs3d_Root::NewGroup(aPresentation);
Prs3d_Root::CurrentGroup(aPresentation)->SetPrimitivesAspect(LA->LineAspect()->Aspect()); Prs3d_Root::CurrentGroup(aPresentation)->SetPrimitivesAspect(LA->LineAspect()->Aspect());
AttachmentPoint1.Coord(X,Y,Z); AttachmentPoint1.Coord(X,Y,Z);
@ -927,7 +927,7 @@ void DsgPrs_SymmetricPresentation::Add (const Handle(Prs3d_Presentation)& aPrese
V(2).SetCoord(X,Y,Z); V(2).SetCoord(X,Y,Z);
Prs3d_Root::CurrentGroup(aPresentation)->Polyline(V); Prs3d_Root::CurrentGroup(aPresentation)->Polyline(V);
//==== TRAIT DE RAPPEL 2 ===== //==== PROCESSING OF CALL 2 =====
Prs3d_Root::NewGroup(aPresentation); Prs3d_Root::NewGroup(aPresentation);
Prs3d_Root::CurrentGroup(aPresentation)->SetPrimitivesAspect(LA->LineAspect()->Aspect()); Prs3d_Root::CurrentGroup(aPresentation)->SetPrimitivesAspect(LA->LineAspect()->Aspect());
AttachmentPoint2.Coord(X,Y,Z); AttachmentPoint2.Coord(X,Y,Z);
@ -936,25 +936,25 @@ void DsgPrs_SymmetricPresentation::Add (const Handle(Prs3d_Presentation)& aPrese
V(2).SetCoord(X,Y,Z); V(2).SetCoord(X,Y,Z);
Prs3d_Root::CurrentGroup(aPresentation)->Polyline(V); Prs3d_Root::CurrentGroup(aPresentation)->Polyline(V);
//==== FLECHES ================ //==== ARROWS ================
Prs3d_Root::NewGroup(aPresentation); Prs3d_Root::NewGroup(aPresentation);
Prs3d_Root::CurrentGroup(aPresentation)->SetPrimitivesAspect(LA->LineAspect()->Aspect()); Prs3d_Root::CurrentGroup(aPresentation)->SetPrimitivesAspect(LA->LineAspect()->Aspect());
if (dist < (LA->Arrow1Aspect()->Length()+LA->Arrow2Aspect()->Length())) outside = Standard_True; if (dist < (LA->Arrow1Aspect()->Length()+LA->Arrow2Aspect()->Length())) outside = Standard_True;
gp_Dir arrdir = L3.Direction().Reversed(); gp_Dir arrdir = L3.Direction().Reversed();
if (outside) arrdir.Reverse(); if (outside) arrdir.Reverse();
// fleche 1 ---- // arrow 1 ----
Prs3d_Arrow::Draw(aPresentation,P1,arrdir, Prs3d_Arrow::Draw(aPresentation,P1,arrdir,
LA->Arrow1Aspect()->Angle(), LA->Arrow1Aspect()->Angle(),
LA->Arrow1Aspect()->Length()); LA->Arrow1Aspect()->Length());
// fleche 2 ---- // arrow 2 ----
Prs3d_Arrow::Draw(aPresentation,P2,arrdir.Reversed(), Prs3d_Arrow::Draw(aPresentation,P2,arrdir.Reversed(),
LA->Arrow2Aspect()->Angle(), LA->Arrow2Aspect()->Angle(),
LA->Arrow2Aspect()->Length()); LA->Arrow2Aspect()->Length());
//==== POINTS ================ //==== POINTS ================
//Marker de localisation des points d'attachement: //Marker of localization of attachment points:
Prs3d_Root::NewGroup(aPresentation); Prs3d_Root::NewGroup(aPresentation);
Prs3d_Root::CurrentGroup(aPresentation)->SetPrimitivesAspect(LA->LineAspect()->Aspect()); Prs3d_Root::CurrentGroup(aPresentation)->SetPrimitivesAspect(LA->LineAspect()->Aspect());
Handle(Graphic3d_AspectMarker3d) MarkerAspAtt = new Graphic3d_AspectMarker3d(); Handle(Graphic3d_AspectMarker3d) MarkerAspAtt = new Graphic3d_AspectMarker3d();
@ -979,13 +979,13 @@ void DsgPrs_SymmetricPresentation::Add (const Handle(Prs3d_Presentation)& aPrese
AttachmentPoint2.Z()); AttachmentPoint2.Z());
Prs3d_Root::CurrentGroup(aPresentation)->Marker(Vatt2); Prs3d_Root::CurrentGroup(aPresentation)->Marker(Vatt2);
//-------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------
//| SYMBOLE DE SYMETRIE | //| SYMBOL OF SYMMETRY |
//-------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------
// ------- : Segment superieur // ------- : Superior Segment
// ----------- : Axe // ----------- : Axis
// ------- : Segment inferieur // ------- : Inferior Segment
gp_Vec vec(P1,P2); gp_Vec vec(P1,P2);
gp_Vec vecA = vec.Multiplied(.1); gp_Vec vecA = vec.Multiplied(.1);
@ -1002,7 +1002,7 @@ void DsgPrs_SymmetricPresentation::Add (const Handle(Prs3d_Presentation)& aPrese
pm = P1.Translated(vec.Multiplied(.5)); pm = P1.Translated(vec.Multiplied(.5));
pOff = OffsetPoint.Translated(vecB); pOff = OffsetPoint.Translated(vecB);
//Calcul des points extremes de l'axe du symbole //Calculate the extremas of the axis of the symbol
gp_Vec vecAxe = vecA.Multiplied(.7); gp_Vec vecAxe = vecA.Multiplied(.7);
pOff.Translated(vecAxe).Coord(X,Y,Z); pOff.Translated(vecAxe).Coord(X,Y,Z);
V(1).SetCoord(X,Y,Z); V(1).SetCoord(X,Y,Z);
@ -1012,7 +1012,7 @@ void DsgPrs_SymmetricPresentation::Add (const Handle(Prs3d_Presentation)& aPrese
Prs3d_Root::CurrentGroup(aPresentation)->SetPrimitivesAspect(LA->LineAspect()->Aspect()); Prs3d_Root::CurrentGroup(aPresentation)->SetPrimitivesAspect(LA->LineAspect()->Aspect());
Prs3d_Root::CurrentGroup(aPresentation)->Polyline(V); Prs3d_Root::CurrentGroup(aPresentation)->Polyline(V);
//Calcul des points extremes du segment sup du symbole //Calculate the extremas of the superior segment of the symbol
gp_Vec vec1 = vecAxe.Multiplied(.6); gp_Vec vec1 = vecAxe.Multiplied(.6);
vecAxe = Vaxe.Multiplied(vecAxe.Magnitude()); vecAxe = Vaxe.Multiplied(vecAxe.Magnitude());
@ -1028,7 +1028,7 @@ void DsgPrs_SymmetricPresentation::Add (const Handle(Prs3d_Presentation)& aPrese
Prs3d_Root::CurrentGroup(aPresentation)->SetPrimitivesAspect(LA->LineAspect()->Aspect()); Prs3d_Root::CurrentGroup(aPresentation)->SetPrimitivesAspect(LA->LineAspect()->Aspect());
Prs3d_Root::CurrentGroup(aPresentation)->Polyline(V); Prs3d_Root::CurrentGroup(aPresentation)->Polyline(V);
//Calcul des points extremes du segment inf du symbole //Calculate the extremas of the inferior segment of the symbol
pOff.Translated(vec1.Added(vec2.Reversed())).Coord(X,Y,Z); pOff.Translated(vec1.Added(vec2.Reversed())).Coord(X,Y,Z);
V(1).SetCoord(X,Y,Z); V(1).SetCoord(X,Y,Z);
pOff.Translated(vec1.Reversed().Added(vec2.Reversed())).Coord(X,Y,Z); pOff.Translated(vec1.Reversed().Added(vec2.Reversed())).Coord(X,Y,Z);
@ -1038,10 +1038,10 @@ void DsgPrs_SymmetricPresentation::Add (const Handle(Prs3d_Presentation)& aPrese
Prs3d_Root::CurrentGroup(aPresentation)->Polyline(V); Prs3d_Root::CurrentGroup(aPresentation)->Polyline(V);
/* //-------------------------------------------------------------------------------------- /* //--------------------------------------------------------------------------------------
//| REPERAGE DE L'AXE DE SYMETRIE | //| MARKING OF THE AXIS OF SYMMETRY |
//-------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------
// ____ // ____
// \ / :Curseur // \ / :Cursor
// \/ // \/
// /\ // /\
// /__\ // /__\

6
src/Dynamic/Dynamic_FuzzyDefinitionsDictionary.cxx
View File

@ -2,8 +2,8 @@
// Created: Wed Jun 24 12:49:59 1992 // Created: Wed Jun 24 12:49:59 1992
// Author: Gilles DEBARBOUILLE // Author: Gilles DEBARBOUILLE
// <gde@phobox> // <gde@phobox>
// Historique : // History :
// CRD : 03/07/97 : Portage Windows NT. // CRD : 03/07/97 : Porting Windows NT.
#include <Standard_Stream.hxx> #include <Standard_Stream.hxx>
@ -199,7 +199,7 @@ Handle(Dynamic_Parameter) Dynamic_FuzzyDefinitionsDictionary::Switch(
const Standard_CString avalue) const const Standard_CString avalue) const
{ {
Handle(Dynamic_ObjectParameter) objectparameter; Handle(Dynamic_ObjectParameter) objectparameter;
cout<<"Le parametre "<<aname<<" du type "<<atype<<" avec "<<avalue<<" n'existe pas."<<endl; cout<<"Parameter "<<aname<<" of type "<<atype<<" with "<<avalue<<" does not exist."<<endl;
return objectparameter; return objectparameter;
} }

8
src/Dynamic/Dynamic_MethodDefinitionsDictionary.cxx
View File

@ -3,8 +3,8 @@
// Author: Gilles DEBARBOUILLE // Author: Gilles DEBARBOUILLE
// <gde@phobox> // <gde@phobox>
// Historique : // Historique :
// CRD : 15/04/97 : Passage WOK++ : Remplacement de TYPE par STANDARD_TYPE // CRD : 15/04/97 : Passage WOK++ : Replace TYPE by STANDARD_TYPE
// CRD : 03/07/97 : Portage Windows NT. // CRD : 03/07/97 : Porting Windows NT.
#include <Standard_Stream.hxx> #include <Standard_Stream.hxx>
@ -191,7 +191,7 @@ Standard_Boolean Dynamic_MethodDefinitionsDictionary::Definition(const Handle(Dy
} }
else else
{ {
cout<<"la definition n'est pas une method definition"<<endl; cout<<"the definition is not a method definition"<<endl;
return Standard_False; return Standard_False;
} }
} }
@ -230,7 +230,7 @@ Handle(Dynamic_Parameter) Dynamic_MethodDefinitionsDictionary::Switch(
const Standard_CString avalue) const const Standard_CString avalue) const
{ {
Handle(Dynamic_ObjectParameter) objectparameter; Handle(Dynamic_ObjectParameter) objectparameter;
cout<<"Le parametre "<<aname<<" du type "<<atype<<" avec "<<avalue<<" n'existe pas."<<endl; cout<<"Parameter "<<aname<<" of type "<<atype<<" with "<<avalue<<" does not exist."<<endl;
return objectparameter; return objectparameter;
} }

34
src/FilletSurf/FilletSurf_InternalBuilder.cxx
View File

@ -99,7 +99,7 @@ static Standard_Boolean IntPlanEdge(Handle(BRepAdaptor_HCurve)& Ed,
gp_Pnt pdeb = Ed->Value(f); gp_Pnt pdeb = Ed->Value(f);
gp_Pnt pfin = Ed->Value(l); gp_Pnt pfin = Ed->Value(l);
Standard_Real u,v; Standard_Real u,v;
//on regarde si les extremites ne sont pas solution //check if the extremities are not solution
ElSLib::Parameters(P,pdeb,u,v); ElSLib::Parameters(P,pdeb,u,v);
gp_Pnt projdeb = ElSLib::Value(u,v,P); gp_Pnt projdeb = ElSLib::Value(u,v,P);
Standard_Real dprojdeb = pdeb.Distance(projdeb); Standard_Real dprojdeb = pdeb.Distance(projdeb);
@ -159,14 +159,14 @@ FilletSurf_InternalBuilder::FilletSurf_InternalBuilder
//======================================================================= //=======================================================================
//function : Add //function : Add
//purpose : creation d une spine sur un paquet d'aretes //purpose : creation of spine on a set of edges
// //
// 0 : pas de probleme // 0 : no problem
// 1 : liste vide // 1 : empty list
// 2 : aretes non g1 // 2 : non g1 edges
// 3 : faces adjacentes non G1 // 3 : non G1 adjacent faces
// 4 : l'arete n'est pas sur le shape // 4 : edge is not on the shape
// 5 : l'arete n'est pas vive // 5 : edge is not alive
//======================================================================= //=======================================================================
Standard_Integer FilletSurf_InternalBuilder::Add(const TopTools_ListOfShape& E, Standard_Integer FilletSurf_InternalBuilder::Add(const TopTools_ListOfShape& E,
@ -178,7 +178,7 @@ Standard_Integer FilletSurf_InternalBuilder::Add(const TopTools_ListOfShape& E,
TopoDS_Edge cured = TopoDS::Edge(It.Value()); TopoDS_Edge cured = TopoDS::Edge(It.Value());
if(cured.IsNull()) return 4; if(cured.IsNull()) return 4;
if(!myEFMap.Contains(cured)) return 4; if(!myEFMap.Contains(cured)) return 4;
//on controle que l arete est bien une arete de cassure //check if the edge is a fracture edge
TopoDS_Face ff1,ff2; TopoDS_Face ff1,ff2;
for(It.Initialize(myEFMap(cured));It.More();It.Next()){ for(It.Initialize(myEFMap(cured));It.More();It.Next()){
if (ff1.IsNull()) { if (ff1.IsNull()) {
@ -202,9 +202,9 @@ Standard_Integer FilletSurf_InternalBuilder::Add(const TopTools_ListOfShape& E,
Handle(ChFiDS_Spine)& sp = st->ChangeSpine(); Handle(ChFiDS_Spine)& sp = st->ChangeSpine();
Standard_Boolean periodic = sp->IsPeriodic(); Standard_Boolean periodic = sp->IsPeriodic();
//On controle que les aretes de la liste E sont bien dans le contour, //It is checked if edges of list E are in the contour,
//on retire les aretes du contour qui ne sont pas dans la liste, //the edges that arenot in the list are removed from the contour,
//on controle que le residu est bien monobloc. //it is checked that the remainder is monoblock.
for(It.Initialize(E); It.More(); It.Next()){ for(It.Initialize(E); It.More(); It.Next()){
TopoDS_Edge cured = TopoDS::Edge(It.Value()); TopoDS_Edge cured = TopoDS::Edge(It.Value());
@ -247,7 +247,7 @@ Standard_Integer FilletSurf_InternalBuilder::Add(const TopTools_ListOfShape& E,
sp = newsp; sp = newsp;
} }
//On construit l ElSpine dans la foulee //ElSpine is immediately constructed
Handle(ChFiDS_HElSpine) hels = new ChFiDS_HElSpine(); Handle(ChFiDS_HElSpine) hels = new ChFiDS_HElSpine();
gp_Vec TFirst,TLast; gp_Vec TFirst,TLast;
gp_Pnt PFirst,PLast; gp_Pnt PFirst,PLast;
@ -270,7 +270,7 @@ Standard_Integer FilletSurf_InternalBuilder::Add(const TopTools_ListOfShape& E,
void FilletSurf_InternalBuilder::Perform() void FilletSurf_InternalBuilder::Perform()
{ {
//On se contente d un PerformSetOfSurfOnElSpine. //PerformSetOfSurfOnElSpine is enough.
Handle(ChFiDS_Stripe) Stripe = myListStripe.First(); Handle(ChFiDS_Stripe) Stripe = myListStripe.First();
Handle(ChFiDS_HData)& HData = Stripe->ChangeSetOfSurfData(); Handle(ChFiDS_HData)& HData = Stripe->ChangeSetOfSurfData();
@ -316,11 +316,11 @@ Standard_Boolean
Handle(ChFiDS_SurfData) Data = SeqData(1); Handle(ChFiDS_SurfData) Data = SeqData(1);
Handle(ChFiDS_FilSpine) fsp = Handle(ChFiDS_FilSpine)::DownCast(Spine); Handle(ChFiDS_FilSpine) fsp = Handle(ChFiDS_FilSpine)::DownCast(Spine);
if(fsp.IsNull()) Standard_ConstructionError::Raise if(fsp.IsNull()) Standard_ConstructionError::Raise
("PerformSurf : la spine n est pas celle d un conge"); ("PerformSurf : this is not the spine of a fillet");
Handle(BRepBlend_Line) lin; Handle(BRepBlend_Line) lin;
TopAbs_Orientation Or = S1->ChangeSurface().Face().Orientation(); TopAbs_Orientation Or = S1->ChangeSurface().Face().Orientation();
if(!fsp->IsConstant()) Standard_ConstructionError::Raise if(!fsp->IsConstant()) Standard_ConstructionError::Raise
("PerformSurf : pas de rayons variables"); ("PerformSurf : no variable radiuses");
// Standard_Boolean maybesingular; //pour scinder les Surfdata singulieres // Standard_Boolean maybesingular; //pour scinder les Surfdata singulieres
BRepBlend_ConstRad Func(S1,S2,Guide); BRepBlend_ConstRad Func(S1,S2,Guide);
@ -360,7 +360,7 @@ Standard_Boolean
Standard_False, Data->ChangeVertexLastOnS2(), tolesp); Standard_False, Data->ChangeVertexLastOnS2(), tolesp);
} }
done = CompleteData(Data,Func,lin,S1,S2,Or,0,0,0,0); done = CompleteData(Data,Func,lin,S1,S2,Or,0,0,0,0);
if(!done) Standard_Failure::Raise("PerformSurf : Echec approximation!"); if(!done) Standard_Failure::Raise("PerformSurf : Failed approximation!");
// maybesingular = (Func.GetMinimalDistance()<=100*tolapp3d); // maybesingular = (Func.GetMinimalDistance()<=100*tolapp3d);
Standard_Boolean ok = 0; Standard_Boolean ok = 0;
if(!Forward){ if(!Forward){

25
src/Graphic2d/Graphic2d_Buffer.cxx
View File

@ -1,5 +1,4 @@
#define PERF //GG_270298 #define PERF //GG_270298
// Eviter d'appeler IsKind() qui est couteux.
#ifdef WNT #ifdef WNT
@ -68,7 +67,7 @@ Standard_Integer i,j ;
if( i <= myObjects.Length() ) { if( i <= myObjects.Length() ) {
myObjects.Remove(i) ; myObjects.Remove(i) ;
// pas tres astucieux mais qui va utiliser Remove (anObject) ? // not very clever, but who will use Remove (anObject) ?
for( j=1 ; j<=anObject->Length() ; j++ ) { for( j=1 ; j<=anObject->Length() ; j++ ) {
Remove(anObject->Primitive(j)) ; Remove(anObject->Primitive(j)) ;
} }
@ -314,16 +313,16 @@ printf(" Graphic2d_Buffer::ReLoad(%d)\n",ResetPosition);
myBufferId = this->HashCode(IntegerLast()); myBufferId = this->HashCode(IntegerLast());
// On a demande l'epaisseur maximum des primitives lignes // Maximum depth of primitive lines
// contenues dans le buffer // contained in the buffer is required
if (theWidthIndex < 0) { if (theWidthIndex < 0) {
Standard_Real theWidthMax; Standard_Real theWidthMax;
// Il n'y a pas de primitives lignes => epaisseur par defaut // There are no primitive lines => thickness by default
if (! MaxWidth (theWidthMax, theWidthIndex)) if (! MaxWidth (theWidthMax, theWidthIndex))
theWidthIndex = 0; theWidthIndex = 0;
} }
// On demande la font de la 1ere primitive text du buffer // The font of the 1st primitive text from the buffer is required
if( theFontIndex < 0) { if( theFontIndex < 0) {
Standard_Integer i; Standard_Integer i;
Handle(Graphic2d_Primitive) agp; Handle(Graphic2d_Primitive) agp;
@ -343,7 +342,7 @@ printf(" Graphic2d_Buffer::ReLoad(%d)\n",ResetPosition);
if( theFontIndex < 0 ) theFontIndex = 0; if( theFontIndex < 0 ) theFontIndex = 0;
} }
// On demande la couleur de la 1ere primitive du buffer // The color of the 1st primitive from the buffer is required
if( theColorIndex < 0) { if( theColorIndex < 0) {
Standard_Integer i; Standard_Integer i;
for (i=1; i<=myPrimitives.Length(); i++) { for (i=1; i<=myPrimitives.Length(); i++) {
@ -406,18 +405,18 @@ Standard_Boolean Result = Standard_False;
#else #else
if (agp->IsKind (STANDARD_TYPE (Graphic2d_Line))) { if (agp->IsKind (STANDARD_TYPE (Graphic2d_Line))) {
#endif #endif
// Il y a des lignes dans le Buffer // There are lines in the Buffer
// et non pas de la friture sur la ligne // and not by fracture on the line
Result = Standard_True; Result = Standard_True;
IndexCur = IndexCur =
(*(Handle(Graphic2d_Line) *) &agp)->WidthIndex (); (*(Handle(Graphic2d_Line) *) &agp)->WidthIndex ();
if ((IndexCur <= 0) || (IndexCur > size)) { if ((IndexCur <= 0) || (IndexCur > size)) {
// Cas des epaisseurs non precisees, IndexCur == 0 // Case when thicknesses are not precised, IndexCur == 0
// ou alors il y a vraiment un gros probleme ! // or there is a really huge problem !
} }
else { else {
// +1 car dans la table il y a en 1 une entry par defaut // +1 because in the table there is 1 default entry
// qui definit une epaisseur par defaut // which defines default thickness
WidthCur = (theWidthMap->Entry (IndexCur+1)).Width (); WidthCur = (theWidthMap->Entry (IndexCur+1)).Width ();
if (theWidth < WidthCur) { if (theWidth < WidthCur) {
theWidth = WidthCur; theWidth = WidthCur;

10
src/Graphic2d/Graphic2d_Circle.cxx
View File

@ -178,11 +178,11 @@ void Graphic2d_Circle::Draw (const Handle(Graphic2d_Drawer)& aDrawer) {
aTrsf.Transforms (A, B); aTrsf.Transforms (A, B);
a = Standard_ShortReal (A); b = Standard_ShortReal (B); a = Standard_ShortReal (A); b = Standard_ShortReal (B);
if( Abs(f-e) < Standard_ShortReal(2.*Standard_PI) ) { if( Abs(f-e) < Standard_ShortReal(2.*Standard_PI) ) {
// Pour calculer les nouveaux angles d'ouverture // To calculate new aperture angles
// le calcul est fait sur le cercle trigonometrique // the calculation is done on the trigonometric circle
// et l'on tient pas compte dans ce cas de la translation // and in this case the translation is not taken into account
// sauf pour les transformation de type Mirror // except for transformations of type Mirror
// dont le determinant est negatif. // with negative determinant.
#ifndef BUC50076 #ifndef BUC50076
aTrsf.SetValue (1, 3, 0.0); aTrsf.SetValue (1, 3, 0.0);
aTrsf.SetValue (2, 3, 0.0); aTrsf.SetValue (2, 3, 0.0);

14
src/Graphic2d/Graphic2d_Drawer.cxx
View File

@ -7,15 +7,15 @@
// Modified 23/02/98 : FMN ; Remplacement PI par Standard_PI // Modified 23/02/98 : FMN ; Remplacement PI par Standard_PI
// Modified 16/03/98 GG // Modified 16/03/98 GG
// OPTIMISATION // OPTIMISATION
// Ajouter un champs myWDriver et myPDriver initialise correctement // Add fields myWDriver and myPDriver initializing correctly
// lorsque le driver est du type "WindowDriver" ou "plotterdriver". // when the driver is "WindowDriver" or "plotterdriver".
// Eviter l'appel des contructeurs vides. // Avoid call of empty contructors.
#define CTS17857//GG_200897 #define CTS17857//GG_200897
// Permettre d'inhiber le clipping sur les primitives. // Allow suppressing clipping on primitives.
#define CSR_PRO12324 //SYL_030798 #define CSR_PRO12324 //SYL_030798
// le Plot d'un objet en echo doit se faire en normal // the Plot of an objet should be a normal
#define DCB_220798 // DCB #define DCB_220798 // DCB
// Using pointers to drivers instead of handles // Using pointers to drivers instead of handles
@ -1085,12 +1085,12 @@ void Graphic2d_Drawer::DrawInfiniteLine (
Standard_Boolean status = Standard_True; Standard_Boolean status = Standard_True;
if ( dx == 0. ) { if ( dx == 0. ) {
// Bug de rejection des lignes infinies // Bug with rejection of infinite lines
// if ( my >= 0. && my <= mySpaceHeight ) // if ( my >= 0. && my <= mySpaceHeight )
x1 = mx; y1 = 0.; x2 = mx; y2 = mySpaceHeight; x1 = mx; y1 = 0.; x2 = mx; y2 = mySpaceHeight;
} }
else if ( dy == 0.) { else if ( dy == 0.) {
// Bug de rejection des lignes infinies // Bug with rejection of infinite lines
// if ( mx >= 0. && mx <= mySpaceWidth ) // if ( mx >= 0. && mx <= mySpaceWidth )
x1 = 0.; y1 = my; x2 = mySpaceWidth; y2 = my; x1 = 0.; y1 = my; x2 = mySpaceWidth; y2 = my;
} }

25
src/Graphic2d/Graphic2d_Ellips.cxx
View File

@ -1,23 +1,22 @@
/*===================================================================== /*=====================================================================
FONCTION : FUNCTION :
---------- ----------
Classe Graphic2d_Ellips Class Graphic2d_Ellips
TEST : TEST :
------ ------
Voir TestG2D/TestG21 Voir TestG2D/TestG21
REMARQUES: NOTES:
---------- ----------
HISTORIQUE DES MODIFICATIONS : HISTORY OF MODIFICATIONS :
-------------------------------- --------------------------------
27-01-98 : GG ; OPTIMISATION LOADER 27-01-98 : GG ; OPTIMISATION LOADER
Transformer les variables static globales en static Transform global static variables into static locals.
locales.
=====================================================================*/ =====================================================================*/
#define G002 //Add new DrawElement(), DrawVertex() methods #define G002 //Add new DrawElement(), DrawVertex() methods
@ -52,7 +51,7 @@ Graphic2d_Ellips::Graphic2d_Ellips
myAngle =Standard_ShortReal(anAngle); myAngle =Standard_ShortReal(anAngle);
// Cas de l'ellipse horizontale // Case of horizontal ellipse
if (Abs (anAngle) <= RealEpsilon ()) { if (Abs (anAngle) <= RealEpsilon ()) {
myMinX = myX - myMajorRadius; myMinX = myX - myMajorRadius;
myMaxX = myX + myMajorRadius; myMaxX = myX + myMajorRadius;
@ -317,15 +316,15 @@ Standard_Boolean Graphic2d_Ellips::Pick (const Standard_ShortReal X,
} }
} }
} }
Standard_ShortReal xf1,yf1,xf2,yf2; //Les foyers. Standard_ShortReal xf1,yf1,xf2,yf2; //Sources.
Standard_ShortReal q = Standard_ShortReal q =
Standard_ShortReal(Sqrt( Abs( myMajorRadius*myMajorRadius - myMinorRadius*myMinorRadius) )); Standard_ShortReal(Sqrt( Abs( myMajorRadius*myMajorRadius - myMinorRadius*myMinorRadius) ));
Standard_ShortReal cos = Standard_ShortReal(Cos(myAngle)); Standard_ShortReal cos = Standard_ShortReal(Cos(myAngle));
Standard_ShortReal sin = Standard_ShortReal(Sin(myAngle)); Standard_ShortReal sin = Standard_ShortReal(Sin(myAngle));
//Focus 1 et 2 calcules pour l' ellipse dont le centre // Focus 1 and 2 calculated for the ellipse with centre
// est ramene a l' origine du repere(0,0) // at the origin of mark(0,0)
xf1 = q*cos; xf1 = q*cos;
yf1 = q*sin; yf1 = q*sin;
xf2 = -q*cos; xf2 = -q*cos;
@ -344,7 +343,7 @@ Standard_Boolean Graphic2d_Ellips::Pick (const Standard_ShortReal X,
SetPickedIndex( 0 ); SetPickedIndex( 0 );
} }
#else #else
Standard_ShortReal xf1,yf1,xf2,yf2; //Les foyers. Standard_ShortReal xf1,yf1,xf2,yf2; //Sourses.
Standard_ShortReal Xp, Yp; Standard_ShortReal Xp, Yp;
Standard_ShortReal q = Standard_ShortReal q =
Sqrt( Abs( myMajorRadius*myMajorRadius - myMinorRadius*myMinorRadius) ); Sqrt( Abs( myMajorRadius*myMajorRadius - myMinorRadius*myMinorRadius) );
@ -352,8 +351,8 @@ Standard_Boolean Graphic2d_Ellips::Pick (const Standard_ShortReal X,
Standard_ShortReal cos = Cos (myAngle); Standard_ShortReal cos = Cos (myAngle);
Standard_ShortReal sin = Sin (myAngle); Standard_ShortReal sin = Sin (myAngle);
//Focus 1 et 2 calcules pour l' ellipse dont le centre // Focus 1 and 2 calculated for the ellipse with centre
// est ramene a l' origine du repere(0,0) // at the origin of mark(0,0)
xf1 = q*cos; xf1 = q*cos;
yf1 = q*sin; yf1 = q*sin;
xf2 = -q*cos; xf2 = -q*cos;

2
src/Graphic2d/Graphic2d_EllipsMarker.cxx
View File

@ -173,7 +173,7 @@ Standard_Boolean Graphic2d_EllipsMarker::Pick (const Standard_ShortReal X,
Standard_ShortReal cos = Standard_ShortReal( Cos(myAngle) ); Standard_ShortReal cos = Standard_ShortReal( Cos(myAngle) );
Standard_ShortReal sin = Standard_ShortReal( Sin(myAngle) ); Standard_ShortReal sin = Standard_ShortReal( Sin(myAngle) );
//Focus 1 et 2 calcules pour l' ellipse dont le centre //Focus 1 and 2 calcules pour l' ellipse dont le centre
// est ramene a l' origine du repere(0,0) // est ramene a l' origine du repere(0,0)
xf1 = Standard_ShortReal( q * cos ); xf1 = Standard_ShortReal( q * cos );
yf1 = Standard_ShortReal( q * sin ); yf1 = Standard_ShortReal( q * sin );

18
src/Graphic2d/Graphic2d_FramedText.cxx
View File

@ -1,13 +1,11 @@
// S3824 10/06/98 : GG ; // S3824 10/06/98 : GG ;
// 1) La methode "Fit" comporte un argum optionnel supplementaire // 1) Method "Fit" includes optional argument
// "Expand" permettant de ne pas ajuster la largeur du texte // "Expand" allowing to avoid adjusting text width
// lorsque celle ci est < a la taille du FIT. // when it is less then size of FIT.
// 2) La methode "Trunc" permet de tronquer le texte a la // 2) Method "Trunc" allows trunkating the text to the
// taille precisee. // exact size.
#define PRO14304 //GG_160698 #define PRO14304 //GG_160698
// Corrige une erreur de calcul sur les MINMAX provoquant
// la disparition du text
#define PERF //GG_200898 #define PERF //GG_200898
// The MinMax are now computed at the right time and no more // The MinMax are now computed at the right time and no more
@ -111,9 +109,9 @@ Standard_ShortReal oy = aDrawer->ConvertMapToFrom(myDeltay);
cosa -= A; sina -= B; cosa -= A; sina -= B;
if( aTrsf.IsNegative() ) hscale = - hscale; if( aTrsf.IsNegative() ) hscale = - hscale;
#else #else
// Pour calculer les nouveaux angles d'ouverture // To calculate new aperture angles
// le calcul est fait sur le cercle trigonometrique // the calculation is done on the trigonometric circle
// et l'on tient pas compte dans ce cas de la translation. // and taken into account in case of translation.
aTrsf.SetValue (1, 3, 0.0); aTrsf.SetValue (1, 3, 0.0);
aTrsf.SetValue (2, 3, 0.0); aTrsf.SetValue (2, 3, 0.0);
aTrsf.Transforms (cosa, sina); aTrsf.Transforms (cosa, sina);

42
src/Graphic2d/Graphic2d_GraphicObject.cxx
View File

@ -1,10 +1,8 @@
// //
// S3593 //GG_270298 // S3593 //GG_270298
// Eviter d'appeler IsKind() qui est couteux. // Avoid calling IsKind() which is expensive.
// Ajouter un champs myIsUpToDate permettant de savoir // Add field myIsUpToDate informing if the object is updated.
// si l'objet est a jour. // Add field myIsTransformed informing if the object is transformed.
// Ajouter un champs myIsTransformed permettant de savoir
// si l'objet est transforme.
// //
#define G002 //GG_140400 #define G002 //GG_140400
@ -417,11 +415,11 @@ void Graphic2d_GraphicObject::RemovePrimitive (const Handle(Graphic2d_Primitive)
#ifdef OK #ifdef OK
// //
// Pour retracer ce qui est necessaire // To retrace whatever is necessary
// On parcourt les primitives de 1 jusqu'a Index // Parse the primitives from 1 to Index
// et on recupere l'Index de la premiere primitive // and return l'Index of the first primitive
// dont le rectangle englobant intersecte celui // with bounding box intersecting the bounding
// de la primitive retiree. // box of the removed primitive.
// //
Standard_Boolean stop = Standard_False; Standard_Boolean stop = Standard_False;
Standard_ShortReal sMinx, sMiny, sMaxx, sMaxy; Standard_ShortReal sMinx, sMiny, sMaxx, sMaxy;
@ -433,17 +431,17 @@ Standard_ShortReal RL = ShortRealLast ();
for (Standard_Integer i=1; i<Index && ! stop; i++) { for (Standard_Integer i=1; i<Index && ! stop; i++) {
(Primitive (i))->MinMax (x, X, y, Y); (Primitive (i))->MinMax (x, X, y, Y);
// //
// Les lignes infinies // Infinite lines
// //
if ((x == RF) || (X == RL) || (y == RF) || (Y == RL)) { if ((x == RF) || (X == RL) || (y == RF) || (Y == RL)) {
// infinie horizontale // infinite horizontal
if (y == Y) stop = (sMiny <= y) && (y <= sMaxy); if (y == Y) stop = (sMiny <= y) && (y <= sMaxy);
// infinie verticale // infinite vertical
if (x == X) stop = (sMinx <= x) && (x <= sMaxx); if (x == X) stop = (sMinx <= x) && (x <= sMaxx);
// infinie oblique // infinite diagonal
if ((y != Y) && (x != X)) { if ((y != Y) && (x != X)) {
// Pb pas d'interrogation possible // no interrogation possible
// sur le contenu de la primitive. // about the content of the primitive.
stop = Standard_True; stop = Standard_True;
} }
} }
@ -754,7 +752,7 @@ Standard_Boolean Graphic2d_GraphicObject::MinMax (Quantity_Length & Minx, Quanti
(thePrimitive->Family() == Graphic2d_TOP_MARKER); (thePrimitive->Family() == Graphic2d_TOP_MARKER);
if (! TheFlag) { if (! TheFlag) {
if( thePrimitive->MinMax (x, X, y, Y) ) { if( thePrimitive->MinMax (x, X, y, Y) ) {
// Tests pour cause de lignes infinies // Tests for cause of infinite lines
if (x != RF) sMinx = (sMinx < x ? sMinx : x); if (x != RF) sMinx = (sMinx < x ? sMinx : x);
if (X != RL) sMaxx = (sMaxx > X ? sMaxx : X); if (X != RL) sMaxx = (sMaxx > X ? sMaxx : X);
if (y != RF) sMiny = (sMiny < y ? sMiny : y); if (y != RF) sMiny = (sMiny < y ? sMiny : y);
@ -764,8 +762,8 @@ Standard_Boolean Graphic2d_GraphicObject::MinMax (Quantity_Length & Minx, Quanti
} }
} }
// Attention, il se peut que : // Attention, it is possible that :
// sMinx = sMiny = ShortRealLast (); et // sMinx = sMiny = ShortRealLast (); and
// sMaxx = sMaxy = ShortRealFirst(); // sMaxx = sMaxy = ShortRealFirst();
if (sMinx > sMaxx) { if (sMinx > sMaxx) {
status = Standard_False; status = Standard_False;
@ -805,7 +803,7 @@ Standard_Boolean Graphic2d_GraphicObject::MarkerMinMax (Quantity_Length & Minx,
(thePrimitive->Family() == Graphic2d_TOP_MARKER); (thePrimitive->Family() == Graphic2d_TOP_MARKER);
if (TheFlag) { if (TheFlag) {
if( thePrimitive->MinMax (x, X, y, Y) ) { if( thePrimitive->MinMax (x, X, y, Y) ) {
// Tests pour cause de lignes infinies // Tests for cause of infinite lines
if (x != RF) sMinx = (sMinx < x ? sMinx : x); if (x != RF) sMinx = (sMinx < x ? sMinx : x);
if (X != RL) sMaxx = (sMaxx > X ? sMaxx : X); if (X != RL) sMaxx = (sMaxx > X ? sMaxx : X);
if (y != RF) sMiny = (sMiny < y ? sMiny : y); if (y != RF) sMiny = (sMiny < y ? sMiny : y);
@ -815,8 +813,8 @@ Standard_Boolean Graphic2d_GraphicObject::MarkerMinMax (Quantity_Length & Minx,
} }
} }
// Attention, il se peut que : // Attention, it is possible that :
// sMinx = sMiny = ShortRealLast (); et // sMinx = sMiny = ShortRealLast (); and
// sMaxx = sMaxy = ShortRealFirst(); // sMaxx = sMaxy = ShortRealFirst();
if (sMinx > sMaxx) { if (sMinx > sMaxx) {
status = Standard_False; status = Standard_False;

20
src/Graphic2d/Graphic2d_HidingText.cxx
View File

@ -1,15 +1,15 @@
#define PRO6894 //GG_150197 #define PRO6894 //GG_150197
// Completer les cas de justification des textes // Complete cases of text justification
// S3824 10/06/98 : GG ; // S3824 10/06/98 : GG ;
// 1) La methode "Fit" comporte un argum optionnel supplementaire // 1) Method "Fit" includes optional argument
// "Expand" permettant de ne pas ajuster la largeur du texte // "Expand" allowing to not adjust the text width
// lorsque celle ci est < a la taille du FIT. // lorsque celle ci est < a la taille du FIT.
// 2) La methode "Trunc" permet de tronquer le texte a la // 2) Method "Trunc" allows truncating the text to the
// taille precisee. // indicated size.
#define PRO14304 //GG_160698 #define PRO14304 //GG_160698
// Corrige une erreur de calcul sur les MINMAX provoquant // Correct calculation error on MINMAX causing
// la disparition du text // the text to disappear
#define PERF //GG_200898 #define PERF //GG_200898
// The MinMax are now computed at the right time and no more // The MinMax are now computed at the right time and no more
@ -121,9 +121,9 @@ Standard_ShortReal oy = aDrawer->ConvertMapToFrom(myDeltay);
cosa -= A; sina -= B; cosa -= A; sina -= B;
if( aTrsf.IsNegative() ) hscale = - hscale; if( aTrsf.IsNegative() ) hscale = - hscale;
#else #else
// Pour calculer les nouveaux angles d'ouverture // To calculate new aperture angles
// le calcul est fait sur le cercle trigonometrique // calculation is done on the trigonometric circle
// et l'on tient pas compte dans ce cas de la translation. // and in this case translation is taken into account.
aTrsf.SetValue (1, 3, 0.0); aTrsf.SetValue (1, 3, 0.0);
aTrsf.SetValue (2, 3, 0.0); aTrsf.SetValue (2, 3, 0.0);
aTrsf.Transforms (cosa, sina); aTrsf.Transforms (cosa, sina);

18
src/Graphic2d/Graphic2d_Image.cxx
View File

@ -1,8 +1,6 @@
#define WTO0001 //GG_140596 #define WTO0001 //GG_140596
// Calcul des min-max faux apres transformation.
#define PRO5663 //GG_291196 #define PRO5663 //GG_291196
// Renseigner les MinMax de l'image !.
#include <Graphic2d_Image.ixx> #include <Graphic2d_Image.ixx>
#include <Graphic2d_Image.pxx> #include <Graphic2d_Image.pxx>
@ -95,15 +93,15 @@ Standard_Real A, B;
else else
FillAndDraw (aDrawer); FillAndDraw (aDrawer);
// Dans le cas d'un GraphicObject Highlighted // In case of GraphicObject Highlighted
// on trace le rectangle englobant de l'image // bounding box of the image is traced
if (myGOPtr->IsHighlighted ()) { if (myGOPtr->IsHighlighted ()) {
Standard_Integer Width = myImage->Width (); Standard_Integer Width = myImage->Width ();
Standard_Integer Height = myImage->Height (); Standard_Integer Height = myImage->Height ();
// //
// - 2 sur Width et Height pour eviter que // - 2 on Width and Height to avoid
// le bord soit en dehors de l'image. // border outside of the image.
// //
if (Width > 2) Width -= 2; if (Width > 2) Width -= 2;
if (Height > 2) Height -= 2; if (Height > 2) Height -= 2;
@ -226,12 +224,12 @@ Standard_Real R, G, B;
UpperY = myImage->UpperY (); UpperY = myImage->UpperY ();
if (Height*Width <= Graphic2d_Image::SmallSize ()) { if (Height*Width <= Graphic2d_Image::SmallSize ()) {
// Les petites images sont remplies d'un coup // Small images are filled at once
pixels = new Aspect_RGBPixel [Height*Width]; pixels = new Aspect_RGBPixel [Height*Width];
Quantity_Array1OfColor Array (0, Width-1); Quantity_Array1OfColor Array (0, Width-1);
// Parcours de l'image Lignes-Colonnes (Height-Width) // Parsing of the image Lines-Columns (Height-Width)
for (i=0, ii=LowerY; ii<=UpperY; i++, ii++) { for (i=0, ii=LowerY; ii<=UpperY; i++, ii++) {
myImage->RowColor (ii, Array); myImage->RowColor (ii, Array);
for (j=0; j<Width; j++) { for (j=0; j<Width; j++) {
@ -250,12 +248,12 @@ Standard_Real R, G, B;
delete [] pixels; delete [] pixels;
} }
else { else {
// Les grandes images sont remplies ligne a ligne // Great images are filled line by line
pixels = new Aspect_RGBPixel [Width]; pixels = new Aspect_RGBPixel [Width];
Quantity_Array1OfColor Array (0, Width-1); Quantity_Array1OfColor Array (0, Width-1);
// Parcours de l'image Lignes-Colonnes (Height-Width) // Parsing of image Lines-Columns (Height-Width)
for (i=0, ii=LowerY; ii<=UpperY; i++, ii++) { for (i=0, ii=LowerY; ii<=UpperY; i++, ii++) {
myImage->RowColor (ii, Array); myImage->RowColor (ii, Array);
for (j=0; j<Width; j++) { for (j=0; j<Width; j++) {

32
src/Graphic2d/Graphic2d_ImageFile.cxx
View File

@ -1,38 +1,18 @@
/*===================================================================== /*=====================================================================
FONCTION : FUNCTION :
---------- ----------
Classe Graphic2d_ImageFile Class Graphic2d_ImageFile
TEST : TEST :
------ ------
Voir TestG2D/TestG21 See TestG2D/TestG21
REMARQUES:
----------
HISTORIQUE DES MODIFICATIONS :
--------------------------------
27-01-98 : GG ; OPTIMISATION LOADER
Transformer les variables static globales en static
locales.
05-11-97 : GG : JAP60017
Nouvelle methode SetScale(...) pour pouvoir
changer le facteur d'echelle de l'image dynamiquement
11-07-97 : GG ; BUC50015
Tenir compte de l'attribut Zoomable de l'image
pour en determiner les MIN-MAX.
=====================================================================*/ =====================================================================*/
#define S3593 //GG_100398 #define S3593 //GG_100398
// Optimisation concernant le chargement des images,
// eviter de recharger des images deja chargees!
// Utiliser les methodes du driver qui sont optimisees.
#define xTRACE #define xTRACE
@ -159,8 +139,8 @@ static TShort_Array1OfShortReal TheY (1, 5);
Standard_ShortReal scale = (myIsZoomable) ? Standard_ShortReal(aDrawer->Scale()) : Standard_ShortReal(1.); Standard_ShortReal scale = (myIsZoomable) ? Standard_ShortReal(aDrawer->Scale()) : Standard_ShortReal(1.);
aDrawer->DrawImageFile (myFileName.ToCString(), Xc, Yc, scale*myScale); aDrawer->DrawImageFile (myFileName.ToCString(), Xc, Yc, scale*myScale);
// Dans le cas d'un GraphicObject Highlighted // In case of GraphicObject Highlighted
// on trace le rectangle englobant de l'image // the bounding box of the image is traced
if (myGOPtr->IsHighlighted ()) { if (myGOPtr->IsHighlighted ()) {
#ifdef TRACE #ifdef TRACE
@ -375,7 +355,7 @@ Standard_Boolean Result = Standard_False;
Standard_Boolean Reopen = Standard_False; Standard_Boolean Reopen = Standard_False;
aWidth = aHeight = aDepth = 0; aWidth = aHeight = aDepth = 0;
if (aFile.IsOpen () && aFile.IsLocked()) { if (aFile.IsOpen () && aFile.IsLocked()) {
cout << "Can't analyse an locked file.\n" << flush; cout << "Can't analyse a locked file.\n" << flush;
return Result; return Result;
} }

36
src/Graphic2d/Graphic2d_Paragraph.cxx
View File

@ -9,37 +9,25 @@
Voir TestG2D/TestG21 Voir TestG2D/TestG21
REMARQUES:
----------
HISTORIQUE DES MODIFICATIONS :
--------------------------------
27-01-98 : GG ; OPTIMISATION LOADER
Transformer les variables static globales en static
locales.
23/02/98 : FMN ; Remplacement PI par Standard_PI
=====================================================================*/ =====================================================================*/
#define PRO12982 //GG_230498 #define PRO12982 //GG_230498
// Prendre en compte le soulignement dans le calcul de la taille // Take into account the underlining in calculation of
// du paragraphe. // paragraph size.
#define PRO11004 //GG_051197 #define PRO11004 //GG_051197
// Le pourtour du paragraphe n'est pas un rectangle // The contour of the paragraph is not rectangle
#define PRO11005 //GG_131197 #define PRO11005 //GG_131197
// La couleur de fond du paragraphe n'est pas respectee // Text can't be seen in mode Highlight.
// En mode Highlight,on ne voit plus les textes.
#define PRO11041 //GG_201197 #define PRO11041 //GG_201197
// Modification de SetCurrentFont(...,aHScale,aWScale) // Modification of SetCurrentFont(...,aHScale,aWScale)
// de maniere a pouvoir parametrer la taille du texte. // to parameterize the size of the text.
#define PRO12320//GG_120297 #define PRO12320//GG_120297
// Espacer les textes en fonction de la hauteur capitalisee de la // Compose texts depending on the summary height of the
// chaine de caracteres. // chain of characters.
#define PERF //GG_200898 #define PERF //GG_200898
// The MinMax are now computed at the right time and no more // The MinMax are now computed at the right time and no more
@ -457,9 +445,9 @@ static TShort_Array1OfShortReal theYarray(1,5) ;
aTrsf.Transforms (A, B); aTrsf.Transforms (A, B);
// Pour calculer les nouveaux angles d'ouverture // To calculate new aperture angles
// le calcul est fait sur le cercle trigonometrique // the calculation is done on trigonometric circle
// et l'on tient pas compte dans ce cas de la translation. // and in this case translation is not taken into account.
aTrsf.SetValue (1, 3, 0.0); aTrsf.SetValue (1, 3, 0.0);
aTrsf.SetValue (2, 3, 0.0); aTrsf.SetValue (2, 3, 0.0);
aTrsf.Transforms (cosa, sina); aTrsf.Transforms (cosa, sina);
@ -739,7 +727,7 @@ Standard_Boolean status = Standard_False;
Standard_ShortReal twidth = 0.,theight = 0.,txoffset = 0.,tyoffset = 0.; Standard_ShortReal twidth = 0.,theight = 0.,txoffset = 0.,tyoffset = 0.;
Standard_ShortReal lwidth = 0.,lheight = 0.,loffset = 0.; Standard_ShortReal lwidth = 0.,lheight = 0.,loffset = 0.;
myWidth = myHeight = 0. ; myWidth = myHeight = 0. ;
for( i=1,j=lrow=0 ; i<=length ; i++ ) { // Passe 1,gets texts minmax for( i=1,j=lrow=0 ; i<=length ; i++ ) { // Passe 1, gets texts minmax
descriptor = myTextDescriptorList.Value(i) ; descriptor = myTextDescriptorList.Value(i) ;
atext = myTextStringList.Value(i) ; atext = myTextStringList.Value(i) ;
hscale = scale*myTextHScaleList.Value(i) ; hscale = scale*myTextHScaleList.Value(i) ;

24
src/Graphic2d/Graphic2d_SetOfPolylines.cxx
View File

@ -9,26 +9,12 @@
Voir TestG2D/TestG21 Voir TestG2D/TestG21
REMARQUES:
----------
HISTORIQUE DES MODIFICATIONS :
--------------------------------
27-01-98 : GG ; OPTIMISATION LOADER
Transformer les variables static globales en static
locales.
10-12-97 : GG ; Envoyer plutot des polylines que des segments lorsque
le type de trait n'est pas SOLID de maniere a assurer
la continuite.
=====================================================================*/ =====================================================================*/
// PRO13369 //GG_280498 // PRO13369 //GG_280498
// Attention sous WNT // MapPolylineFromTo() should be called with exact number of points
// MapPolylineFromTo() doit etre appele avec le
// nombre exacte de points
#define G002 //GG_140400 Use SetPickedIndex method #define G002 //GG_140400 Use SetPickedIndex method
@ -102,7 +88,7 @@ void Graphic2d_SetOfPolylines::Add( const Standard_Real X1,
if( V1.IsEqual(P->Value(lv)) ) { if( V1.IsEqual(P->Value(lv)) ) {
//first vertex of segment is the same that the last vertex of the //first vertex of segment is the same that the last vertex of the
//ref line //ref line
if( ip > 1 ) { //Try to concatenates ref line with others if( ip > 1 ) { //Try to concatenate ref line with others
for( ipp=1 ; ipp<ip ; ipp++ ) { for( ipp=1 ; ipp<ip ; ipp++ ) {
PP = myPolylines.Value(ipp); //other polyline PP = myPolylines.Value(ipp); //other polyline
if( V2.IsEqual(PP->Value(1)) ) { if( V2.IsEqual(PP->Value(1)) ) {
@ -124,7 +110,7 @@ void Graphic2d_SetOfPolylines::Add( const Standard_Real X1,
} else if( V2.IsEqual(P->Value(lv)) ) { } else if( V2.IsEqual(P->Value(lv)) ) {
//second vertex of segment is the same that the last vertex of the //second vertex of segment is the same that the last vertex of the
//ref line //ref line
if( ip > 1 ) { //Try to concatenates ref line with others if( ip > 1 ) { //Try to concatenate ref line with others
for( ipp=1 ; ipp<ip ; ipp++ ) { for( ipp=1 ; ipp<ip ; ipp++ ) {
PP = myPolylines.Value(ipp); //other polyline PP = myPolylines.Value(ipp); //other polyline
if( V1.IsEqual(PP->Value(1)) ) { if( V1.IsEqual(PP->Value(1)) ) {
@ -146,7 +132,7 @@ void Graphic2d_SetOfPolylines::Add( const Standard_Real X1,
} else if( V1.IsEqual(P->Value(1)) ) { } else if( V1.IsEqual(P->Value(1)) ) {
//first vertex of segment is the same that the first vertex of the //first vertex of segment is the same that the first vertex of the
//ref line //ref line
if( ip > 1 ) { //Try to concatenates ref line with others if( ip > 1 ) { //Try to concatenate ref line with others
for( ipp=1 ; ipp<ip ; ipp++ ) { for( ipp=1 ; ipp<ip ; ipp++ ) {
PP = myPolylines.Value(ipp); //other polyline PP = myPolylines.Value(ipp); //other polyline
if( V2.IsEqual(PP->Value(PP->Length())) ) { if( V2.IsEqual(PP->Value(PP->Length())) ) {
@ -168,7 +154,7 @@ void Graphic2d_SetOfPolylines::Add( const Standard_Real X1,
} else if( V2.IsEqual(P->Value(1)) ) { } else if( V2.IsEqual(P->Value(1)) ) {
//second vertex of segment is the same that the first vertex of the //second vertex of segment is the same that the first vertex of the
//ref line //ref line
if( ip > 1 ) { //Try to concatenates ref line with others if( ip > 1 ) { //Try to concatenate ref line with others
for( ipp=1 ; ipp<ip ; ipp++ ) { for( ipp=1 ; ipp<ip ; ipp++ ) {
PP = myPolylines.Value(ipp); //other polyline PP = myPolylines.Value(ipp); //other polyline
if( V1.IsEqual(PP->Value(PP->Length())) ) { if( V1.IsEqual(PP->Value(PP->Length())) ) {

13
src/Graphic2d/Graphic2d_Text.cxx
View File

@ -1,10 +1,3 @@
// Modified 23/02/98 : FMN ; Remplacement PI par Standard_PI
// S3824 10/06/98 : GG ;
// 1) La methode "Fit" comporte un argum optionnel supplementaire
// "Expand" permettant de ne pas ajuster la largeur du texte
// lorsque celle ci est < a la taille du FIT.
// 2) La methode "Trunc" permet de tronquer le texte a la
// taille precisee.
#define PERF //GG_200898 #define PERF //GG_200898
// The MinMax are now computed at the right time and no more // The MinMax are now computed at the right time and no more
@ -209,9 +202,9 @@ Standard_ShortReal oy = aDrawer->ConvertMapToFrom(myDeltay);
cosa -= A; sina -= B; cosa -= A; sina -= B;
if( aTrsf.IsNegative() ) hscale = - hscale; if( aTrsf.IsNegative() ) hscale = - hscale;
#else #else
// Pour calculer les nouveaux angles d'ouverture // To calculate new aperture angles
// le calcul est fait sur le cercle trigonometrique // calculation is done on the trigonometric circle
// et l'on tient pas compte dans ce cas de la translation. // and in this case translation is not taken into account.
aTrsf.SetValue (1, 3, 0.0); aTrsf.SetValue (1, 3, 0.0);
aTrsf.SetValue (2, 3, 0.0); aTrsf.SetValue (2, 3, 0.0);
aTrsf.Transforms (cosa, sina); aTrsf.Transforms (cosa, sina);

32
src/Graphic2d/Graphic2d_View.cxx
View File

@ -8,7 +8,7 @@
#define xTRACE #define xTRACE
#define CSR_PRO12324 //SYL_030798 #define CSR_PRO12324 //SYL_030798
// Pas de plot si objet non plottable // No plot if object not plottable
// //
// Modified 17/12/1998 SYL pour S3604 // Modified 17/12/1998 SYL pour S3604
// Aspect_PlotterDriver devient PlotMgt_PlotterDriver // Aspect_PlotterDriver devient PlotMgt_PlotterDriver
@ -398,15 +398,15 @@ Standard_Real RL, RF;
for (i=1; i<=Length; i++) { for (i=1; i<=Length; i++) {
myGraphicObjects.Value (i)->MinMax (x, X, y, Y); myGraphicObjects.Value (i)->MinMax (x, X, y, Y);
// Le GraphicObject peut etre vide // GraphicObject can be empty
if (x > RF) Minx = (Minx < x ? Minx : x); if (x > RF) Minx = (Minx < x ? Minx : x);
if (X < RL) Maxx = (Maxx > X ? Maxx : X); if (X < RL) Maxx = (Maxx > X ? Maxx : X);
if (y > RF) Miny = (Miny < y ? Miny : y); if (y > RF) Miny = (Miny < y ? Miny : y);
if (Y < RL) Maxy = (Maxy > Y ? Maxy : Y); if (Y < RL) Maxy = (Maxy > Y ? Maxy : Y);
} }
// Attention, il se peut que : // Attention, it is possible that :
// Minx = Miny = ShortRealLast (); et // Minx = Miny = ShortRealLast (); and
// Maxx = Maxy = ShortRealFirst(); // Maxx = Maxy = ShortRealFirst();
if (Minx > Maxx) { Minx = RealFirst (); Maxx = RealLast (); } if (Minx > Maxx) { Minx = RealFirst (); Maxx = RealLast (); }
if (Miny > Maxy) { Miny = RealFirst (); Maxy = RealLast (); } if (Miny > Maxy) { Miny = RealFirst (); Maxy = RealLast (); }
@ -424,7 +424,7 @@ Standard_Real RL, RF;
for (i=1; i<=Length; i++) { for (i=1; i<=Length; i++) {
if (IsIn (aList->Value(i))) { if (IsIn (aList->Value(i))) {
(aList->Value(i))->MinMax (x, X, y, Y); (aList->Value(i))->MinMax (x, X, y, Y);
// Le GraphicObject peut etre vide // GraphicObject can be empty
if (x > RF) Minx = (Minx < x ? Minx : x); if (x > RF) Minx = (Minx < x ? Minx : x);
if (X < RL) Maxx = (Maxx > X ? Maxx : X); if (X < RL) Maxx = (Maxx > X ? Maxx : X);
if (y > RF) Miny = (Miny < y ? Miny : y); if (y > RF) Miny = (Miny < y ? Miny : y);
@ -432,8 +432,8 @@ Standard_Real RL, RF;
} }
} }
// Attention, il se peut que : // Attention, it is possible that :
// Minx = Miny = ShortRealLast (); et // Minx = Miny = ShortRealLast (); and
// Maxx = Maxy = ShortRealFirst(); // Maxx = Maxy = ShortRealFirst();
if (Minx > Maxx) { Minx = RealFirst (); Maxx = RealLast (); } if (Minx > Maxx) { Minx = RealFirst (); Maxx = RealLast (); }
if (Miny > Maxy) { Miny = RealFirst (); Maxy = RealLast (); } if (Miny > Maxy) { Miny = RealFirst (); Maxy = RealLast (); }
@ -450,15 +450,15 @@ Standard_Real RL, RF;
for (i=1; i<=Length; i++) { for (i=1; i<=Length; i++) {
myGraphicObjects.Value (i)->MarkerMinMax (x, X, y, Y); myGraphicObjects.Value (i)->MarkerMinMax (x, X, y, Y);
// Le GraphicObject peut etre vide // GraphicObject can be empty
if (x > RF) Minx = (Minx < x ? Minx : x); if (x > RF) Minx = (Minx < x ? Minx : x);
if (X < RL) Maxx = (Maxx > X ? Maxx : X); if (X < RL) Maxx = (Maxx > X ? Maxx : X);
if (y > RF) Miny = (Miny < y ? Miny : y); if (y > RF) Miny = (Miny < y ? Miny : y);
if (Y < RL) Maxy = (Maxy > Y ? Maxy : Y); if (Y < RL) Maxy = (Maxy > Y ? Maxy : Y);
} }
// Attention, il se peut que : // Attention, it is possible that :
// Minx = Miny = ShortRealLast (); et // Minx = Miny = ShortRealLast (); and
// Maxx = Maxy = ShortRealFirst(); // Maxx = Maxy = ShortRealFirst();
if (Minx > Maxx) { Minx = RealFirst (); Maxx = RealLast (); } if (Minx > Maxx) { Minx = RealFirst (); Maxx = RealLast (); }
if (Miny > Maxy) { Miny = RealFirst (); Maxy = RealLast (); } if (Miny > Maxy) { Miny = RealFirst (); Maxy = RealLast (); }
@ -476,7 +476,7 @@ Standard_Real RL, RF;
for (i=1; i<=Length; i++) { for (i=1; i<=Length; i++) {
if (IsIn (aList->Value(i))) { if (IsIn (aList->Value(i))) {
(aList->Value(i))->MarkerMinMax (x, X, y, Y); (aList->Value(i))->MarkerMinMax (x, X, y, Y);
// Le GraphicObject peut etre vide // GraphicObject can be empty
if (x > RF) Minx = (Minx < x ? Minx : x); if (x > RF) Minx = (Minx < x ? Minx : x);
if (X < RL) Maxx = (Maxx > X ? Maxx : X); if (X < RL) Maxx = (Maxx > X ? Maxx : X);
if (y > RF) Miny = (Miny < y ? Miny : y); if (y > RF) Miny = (Miny < y ? Miny : y);
@ -484,8 +484,8 @@ Standard_Real RL, RF;
} }
} }
// Attention, il se peut que : // Attention, it is possible that :
// Minx = Miny = ShortRealLast (); et // Minx = Miny = ShortRealLast (); and
// Maxx = Maxy = ShortRealFirst(); // Maxx = Maxy = ShortRealFirst();
if (Minx > Maxx) { Minx = RealFirst (); Maxx = RealLast (); } if (Minx > Maxx) { Minx = RealFirst (); Maxx = RealLast (); }
if (Miny > Maxy) { Miny = RealFirst (); Maxy = RealLast (); } if (Miny > Maxy) { Miny = RealFirst (); Maxy = RealLast (); }
@ -641,9 +641,9 @@ Standard_Integer Index;
for (Index=1; Index<=Length; Index++) for (Index=1; Index<=Length; Index++)
//myGraphicObjects.Value(Index)->Erase (); //myGraphicObjects.Value(Index)->Erase ();
// CAL le 17/11/97. // CAL le 17/11/97.
// On met 1 car il faut effacer N fois le premier de la liste // 1 is set as it is required to remove N times the first from the list
// En effet cette liste est mise a jour par la methode ci dessous // Acytually this list is updated by method below
// qui est appelee par Graphic2d_GraphicObject::Erase. // called by Graphic2d_GraphicObject::Erase.
#ifdef OCC154 #ifdef OCC154
myGraphicObjects.Value(Index)->Erase(); myGraphicObjects.Value(Index)->Erase();
#else #else

26
src/Graphic3d/Graphic3d_AspectFillArea3d.cxx
View File

@ -13,16 +13,16 @@
//-Version //-Version
//-Design Declaration des variables specifiques au contexte //-Design Declaration of variables specific to the context
// de trace des facettes 3d // of tracing of facets 3D
//-Warning Un contexte de trace de facette 3d herite du contexte //-Warning Ccontext of tracing of facets 3d inherits the context
// defini par : // defined by :
// - le style de l'interieur de la facette // - the style of the interior of the facet
// - le style du bord de la facette // - the style of the facet border
// - la couleur // - the color
// Il possede en plus d'une definition de matiere // Additionally, it has more than one definition of material
// pour les faces internes et externes. // for internal and external faces.
//-References //-References
@ -77,10 +77,10 @@ DistinguishModeActive (Standard_False), EdgeModeActive (Standard_False), BackFac
// OCC4895 SAN 22/03/04 High-level interface for controlling polygon offsets // OCC4895 SAN 22/03/04 High-level interface for controlling polygon offsets
} }
// le :(InteriorStyle, InteriorColor, EdgeColor, EdgeLineType, EdgeLineWidth) // (InteriorStyle, InteriorColor, EdgeColor, EdgeLineType, EdgeLineWidth)
// car AspectFillArea3d herite de AspectFillArea et il faut appeler // because AspectFillArea3d inherits AspectFillArea and it is necessary to call
// l'initialisation de AspectFillArea avec InteriorStyle, InteriorColor, // initialisation of AspectFillArea with InteriorStyle, InteriorColor,
// EdgeColor, EdgeLineType et EdgeLineWidth. // EdgeColor, EdgeLineType and EdgeLineWidth.
Graphic3d_AspectFillArea3d::Graphic3d_AspectFillArea3d (const Aspect_InteriorStyle InteriorStyle, const Quantity_Color& InteriorColor, const Quantity_Color& EdgeColor, const Aspect_TypeOfLine EdgeLineType, const Standard_Real EdgeLineWidth, const Graphic3d_MaterialAspect& FrontMaterial, const Graphic3d_MaterialAspect& BackMaterial): Graphic3d_AspectFillArea3d::Graphic3d_AspectFillArea3d (const Aspect_InteriorStyle InteriorStyle, const Quantity_Color& InteriorColor, const Quantity_Color& EdgeColor, const Aspect_TypeOfLine EdgeLineType, const Standard_Real EdgeLineWidth, const Graphic3d_MaterialAspect& FrontMaterial, const Graphic3d_MaterialAspect& BackMaterial):
Aspect_AspectFillArea (InteriorStyle, InteriorColor, EdgeColor, EdgeLineType, EdgeLineWidth), DistinguishModeActive (Standard_False), EdgeModeActive (Standard_False), BackFaceRemovalActive (Standard_False), MyTextureMap(), MyTextureMapState(Standard_False), MyFrontMaterial (FrontMaterial), MyBackMaterial (BackMaterial) { Aspect_AspectFillArea (InteriorStyle, InteriorColor, EdgeColor, EdgeLineType, EdgeLineWidth), DistinguishModeActive (Standard_False), EdgeModeActive (Standard_False), BackFaceRemovalActive (Standard_False), MyTextureMap(), MyTextureMapState(Standard_False), MyFrontMaterial (FrontMaterial), MyBackMaterial (BackMaterial) {

20
src/Graphic3d/Graphic3d_AspectLine3d.cxx
View File

@ -7,14 +7,14 @@
//-Version //-Version
//-Design Declaration des variables specifiques au contexte //-Design Declaration of variables specific to the context
// de trace des lignes 3d // of tracing of lines 3d
//-Warning Un contexte de trace de lignes 3d herite du contexte //-Warning Context of tracing of lines 3d inherits the context
// defini par : // defined by :
// - la couleur // - the color
// - le type de trait // - the type of trait
// - l'epaisseur // - the thickness
//-References //-References
@ -38,8 +38,8 @@
Graphic3d_AspectLine3d::Graphic3d_AspectLine3d () { Graphic3d_AspectLine3d::Graphic3d_AspectLine3d () {
} }
// le :(AColor, AType, AWidth) // (AColor, AType, AWidth)
// car AspectLine3d herite de AspectLine et il faut appeler // because AspectLine3d inherits AspectLine and it is necessary to call
// l'initialisation de AspectLine avec AColor, AType, AWidth. // initialisation of AspectLine with AColor, AType, AWidth.
Graphic3d_AspectLine3d::Graphic3d_AspectLine3d (const Quantity_Color& AColor, const Aspect_TypeOfLine AType, const Standard_Real AWidth):Aspect_AspectLine (AColor, AType, AWidth) {} Graphic3d_AspectLine3d::Graphic3d_AspectLine3d (const Quantity_Color& AColor, const Aspect_TypeOfLine AType, const Standard_Real AWidth):Aspect_AspectLine (AColor, AType, AWidth) {}

14
src/Graphic3d/Graphic3d_AspectMarker3d.cxx
View File

@ -7,14 +7,14 @@
//-Version //-Version
//-Design Declaration des variables specifiques au contexte //-Design Declaration of variables specific to the context
// de trace des markers 3d // of trace of markers 3d
// Rappels Un contexte de trace de markers 3d herite du contexte // Rappels Context of trace of markers 3d inherits the context
// defini par : // defined by :
// - la couleur // - the color
// - le type de marker // - the type of marker
// - l'echelle // - the scale
//-Warning //-Warning

14
src/Graphic3d/Graphic3d_AspectText3d.cxx
View File

@ -8,14 +8,14 @@
//-Version //-Version
//-Design Declaration des variables specifiques au contexte //-Design Declaration of variables specific to the context
// de trace des textes 3d // of trace of texts 3d
//-Warning Un contexte de trace de texte est defini par : //-Warning A context of trace of text is defined by :
// - la font utilisee // - the font used
// - la couleur // - the color
// - l'echelle // - the scale
// - l'espace entre caracteres // - the space between characters
//-References //-References

20
src/Graphic3d/Graphic3d_GraphicDevice.cxx
View File

@ -69,15 +69,7 @@ Standard_Boolean status ;
} }
this->InitMaps (connexion,Xw_TOM_READONLY,Ncolors,UseDefault); this->InitMaps (connexion,Xw_TOM_READONLY,Ncolors,UseDefault);
// 24/07/97
// avant : this->InitMaps (connexion,Mapping,Ncolors,UseDefault);
// uniquement pour HPUX
// info GG :
// L'action doit etre generalisee puisque l'on trouve le meme pb
//sur HP et SIL lie au fait que la root est PseudoColor.
// Ceci est donc compatible avec SUN et DEC ou la root est TrueColor.
// De toute facon seul le driver Xdps a besoin d'un ColorCube et
//il le cree tout seul s'il n'existe pas deja .
} }
@ -152,7 +144,7 @@ Standard_Boolean Result = TheSharedLibrary.DlOpen (OSD_RTLD_LAZY);
(TheSharedLibrary.DlError ()); (TheSharedLibrary.DlError ());
} }
else { else {
// Gestion des traces // Management of traces
char *tracevalue = NULL; char *tracevalue = NULL;
tracevalue = (char *)(getenv ("CSF_GraphicTrace")); tracevalue = (char *)(getenv ("CSF_GraphicTrace"));
if (tracevalue) if (tracevalue)
@ -168,10 +160,10 @@ OSD_Function new_GLGraphicDriver =
(TheSharedLibrary.DlError ()); (TheSharedLibrary.DlError ());
} }
else { else {
// Sequence artistique : // Sequence :
// new_GLGraphicDriver est une OSD_Function : // new_GLGraphicDriver is OSD_Function :
// typedef int (* OSD_Function)(...); // typedef int (* OSD_Function)(...);
// d'ou le magnifique cast en GraphicDriver. // that is why good cast in GraphicDriver.
Handle(Graphic3d_GraphicDriver) Handle(Graphic3d_GraphicDriver)
(*fp) (Standard_CString) = NULL; (*fp) (Standard_CString) = NULL;
fp = (Handle(Graphic3d_GraphicDriver) fp = (Handle(Graphic3d_GraphicDriver)
@ -182,7 +174,7 @@ OSD_Function new_GLGraphicDriver =
// MyGraphicDriver = (*fp) (TheSharedLibrary.Name ()); // MyGraphicDriver = (*fp) (TheSharedLibrary.Name ());
// Gestion des traces // Management of traces
if (tracevalue) if (tracevalue)
MyGraphicDriver->SetTrace MyGraphicDriver->SetTrace
((Standard_Integer) atoi (tracevalue)); ((Standard_Integer) atoi (tracevalue));

4
src/Graphic3d/Graphic3d_Group.cdl
View File

@ -2,7 +2,7 @@
-- File: Graphic3d_Group.cdl -- File: Graphic3d_Group.cdl
-- Created: Vendredi 6 Septembre 1991 -- Created: Vendredi 6 Septembre 1991
-- Author: NW,JPB,CAL -- Author: NW,JPB,CAL
-- 27/09/97 ; PCT : ajout du controle manuel des textures -- 27/09/97 ; PCT : add manual control of textures
-- 11/97 ; CAL : ajout polyline par 2 points -- 11/97 ; CAL : ajout polyline par 2 points
-- 16/06/2000 : ATS: Study G005 - Group store presentations of it's objects in field -- 16/06/2000 : ATS: Study G005 - Group store presentations of it's objects in field
-- MyListOfPArray to avoid deletion of handle-manipulating -- MyListOfPArray to avoid deletion of handle-manipulating
@ -383,7 +383,7 @@
---Level: Public ---Level: Public
---Purpose: Links up points to create a face drawn ---Purpose: Links up points to create a face drawn
-- using the current fill attributes (AspectFillArea3d)) -- using the current fill attributes (AspectFillArea3d))
-- The first and last points are not duplicates. -- The first and last points are not duplicated.
-- The normal is defined and normalised for each vertex. -- The normal is defined and normalised for each vertex.
-- The texture coordinate is defined for each vertex. -- The texture coordinate is defined for each vertex.
---Category: Methods to create Polygon ---Category: Methods to create Polygon

22
src/Graphic3d/Graphic3d_Group.cxx
View File

@ -8,11 +8,11 @@
//-Version //-Version
//-Design Declaration des variables specifiques aux groupes //-Design Declaration of variables specific to groups
// de primitives // of primitives
//-Warning Un groupe est defini dans une structure //-Warning A group is definedv in a structure
// Il s'agit de la plus petite entite editable // This is the smallest editable entity
//-References //-References
@ -51,15 +51,15 @@ MyListOfPArray()
MyBounds.ZMax = ShortRealFirst (); MyBounds.ZMax = ShortRealFirst ();
// //
// Un petit commentaire sur l'utilisation du This ! // A small commentary on the usage of This !
// //
// Un Graphic3d_Group est cree dans une structure. Graphic3d_Structure est // Graphic3d_Group is created in a structure. Graphic3d_Structure is a
// donc un manager de Graphic3d_Group. Dans le constructeur de Graphic3d_Group // manager of Graphic3d_Group. In the constructor of Graphic3d_Group
// est appele une methode de Graphic3d_Structure, Add, qui permet d'ajouter // a method Add of Graphic3d_Structure is called. It allows adding
// l'instance du Graphic3d_Group dans son manager. Il y a donc 2 references // the instance of Graphic3d_Group in its manager. So there are 2 references
// a <me> et tout va bien. // to <me> and everything works well.
// //
// This () est l'instance de la classe, c-a-d le groupe courant // This () is the instance of the class, the current groupe
//Handle(Graphic3d_Group) me = Handle(Graphic3d_Group)::DownCast (This ()); //Handle(Graphic3d_Group) me = Handle(Graphic3d_Group)::DownCast (This ());
Standard_Integer TheLabelBegin, TheLabelEnd; Standard_Integer TheLabelBegin, TheLabelEnd;

14
src/Graphic3d/Graphic3d_Group_2.cxx
View File

@ -7,11 +7,11 @@
//-Version //-Version
//-Design Declaration des variables specifiques aux groupes //-Design Declaration of variables specific to groups
// de primitives // of primitives
//-Warning Un groupe est defini dans une structure //-Warning A group is defined in a structure
// Il s'agit de la plus petite entite editable // This is the smallest editable entity
//-References //-References
@ -25,8 +25,8 @@
#include <Graphic3d_StructureManager.hxx> #include <Graphic3d_StructureManager.hxx>
// Structures c necessaires a l'interfacage avec les routines c // Structures are necessairy for interfacing with routines c
// Routines C a declarer en extern // Routines C should be declared externally
//-Methods, in order //-Methods, in order
Standard_Boolean Graphic3d_Group::IsDeleted () const { Standard_Boolean Graphic3d_Group::IsDeleted () const {
@ -87,7 +87,7 @@ Handle(Graphic3d_Structure) Graphic3d_Group::Structure () const {
void Graphic3d_Group::MinMaxCoord (Standard_Real& XMin, Standard_Real& YMin, Standard_Real& ZMin, Standard_Real& XMax, Standard_Real& YMax, Standard_Real& ZMax) const { void Graphic3d_Group::MinMaxCoord (Standard_Real& XMin, Standard_Real& YMin, Standard_Real& ZMin, Standard_Real& XMax, Standard_Real& YMax, Standard_Real& ZMax) const {
if (IsEmpty ()) { if (IsEmpty ()) {
// Groupe vide // Empty Group
XMin = YMin = ZMin = ShortRealFirst (); XMin = YMin = ZMin = ShortRealFirst ();
XMax = YMax = ZMax = ShortRealLast (); XMax = YMax = ZMax = ShortRealLast ();
} }

218
src/Graphic3d/Graphic3d_MaterialAspect.cxx
View File

@ -1,15 +1,5 @@
// File Graphic3d_MaterialAspect.cxx // File Graphic3d_MaterialAspect.cxx
// Created Fevrier 1992 // Created Fevrier 1992
// Author NW,JPB,CAL
// modified 1/07/97 ; PCT : ajout texture mapping
// 8/04/98 ; FGU : Ajout Emission
// 9/07/98 ; CAL : Ajout de l'initialisation de l'EmissiveCoef
// 26/03/99 ; FMN : Ajout methodes SetColor() et Color()
// 26/03/99 : FMN ; Compatibilite ascendante: Ajout des anciens noms de materiaux.
// 09/04/99 : GG ; Compatibilite ascendante: NameOfPhysicalMaterial disparait
// 07/07/99 : GG ; MyEmissiveActivity MUST be initialized in the
// constructor of the class.
// 23/11/99 : GG ; BUC60488 : Add Name() & Reset() methods
#define BUC60565 //GG_19/10/99 ; Don't change the color components when the corresponding #define BUC60565 //GG_19/10/99 ; Don't change the color components when the corresponding
// coefficient is modified because the resulting color is computed in // coefficient is modified because the resulting color is computed in
@ -28,31 +18,31 @@
//-Version //-Version
//-Design Declaration des variables specifiques aux definition //-Design Declaration of variables specific to the definition
// des matieres // of materials
//-Warning Une matiere est definie par : //-Warning A material is defined by :
// - Un coefficient de transparence // - coefficient of transparence
// - Un coefficient de reflection diffuse // - coefficient of disperse reflection
// - Un coefficient de reflection ambiante // - coefficient of ambiant reflection
// - Un coefficient de reflection speculaire // - coefficient of specular reflection
// - Un coefficient d emission // - coefficient of emission
// 2 proprietes permettent de definir une matiere : // 2 properties permiting to define a material :
// - sa transparence // - transparence
// - sa reflection c-a-d ses proprietes d'absorbtion // - reflection, i.e. absorbtion properties
// et de diffusion de la lumiere // and light diffusion
// La reflection diffuse est percue comme une composante // Disperse reflection is considered a component
// La reflection speculaire est percue comme une composante // The specular reflection is considered a component
// de la couleur de la source lumineuse // of the color of the light source
// Pour determiner les 3 couleurs de reflection il faut : // To determine 3 colors of reflection it is necessary :
// - Un coefficient de reflection diffuse // - coefficient of disperse reflection
// - Un coefficient de reflection ambiante // - coefficient of ambiant reflection
// - Un coefficient de reflection speculaire // - coefficient of specular reflection
// ( Sous GL, on determine 3 couleurs ) // ( Under GL, 3 colors are determined)
//-References Getting started with DEC PHIGS, annexe C //-References Getting started with DEC PHIGS, annexe C
// Iris Advanced Graphics, unite D // Iris Advanced Graphics, unite D
@ -147,7 +137,7 @@ void Graphic3d_MaterialAspect::Init(const Graphic3d_NameOfMaterial AName) {
switch (AName) { switch (AName) {
case Graphic3d_NOM_PLASTIC : /* Blue plastic */ case Graphic3d_NOM_PLASTIC : /* Blue plastic */
/* Coefficient d eclairage */ /* Lighting Coefficient */
MyShininess = Standard_ShortReal (0.0078125); MyShininess = Standard_ShortReal (0.0078125);
MyAmbientCoef = Standard_ShortReal (0.5); MyAmbientCoef = Standard_ShortReal (0.5);
MyDiffuseCoef = Standard_ShortReal (0.24); MyDiffuseCoef = Standard_ShortReal (0.24);
@ -155,7 +145,7 @@ void Graphic3d_MaterialAspect::Init(const Graphic3d_NameOfMaterial AName) {
break; break;
case Graphic3d_NOM_SHINY_PLASTIC : /* black plastic */ case Graphic3d_NOM_SHINY_PLASTIC : /* black plastic */
/* Coef d eclairage */ /* Lighting Coefficient */
MyShininess = Standard_ShortReal (1.0); MyShininess = Standard_ShortReal (1.0);
MyAmbientCoef = Standard_ShortReal (0.44); MyAmbientCoef = Standard_ShortReal (0.44);
MyDiffuseCoef = Standard_ShortReal (0.5); MyDiffuseCoef = Standard_ShortReal (0.5);
@ -170,7 +160,7 @@ void Graphic3d_MaterialAspect::Init(const Graphic3d_NameOfMaterial AName) {
break; break;
case Graphic3d_NOM_NEON_GNC: case Graphic3d_NOM_NEON_GNC:
/* Coef d eclairage */ /* Lighting Coefficient */
MyShininess = Standard_ShortReal (0.05); MyShininess = Standard_ShortReal (0.05);
MyAmbientCoef = Standard_ShortReal (1.0); MyAmbientCoef = Standard_ShortReal (1.0);
MyDiffuseCoef = Standard_ShortReal (1.0); MyDiffuseCoef = Standard_ShortReal (1.0);
@ -181,123 +171,123 @@ void Graphic3d_MaterialAspect::Init(const Graphic3d_NameOfMaterial AName) {
break; break;
case Graphic3d_NOM_METALIZED : case Graphic3d_NOM_METALIZED :
/* Coef d eclairage */ /* Lighting Coefficient */
MyShininess = Standard_ShortReal (0.13); MyShininess = Standard_ShortReal (0.13);
MyAmbientCoef = Standard_ShortReal (0.9); MyAmbientCoef = Standard_ShortReal (0.9);
MyDiffuseCoef = Standard_ShortReal (0.47); MyDiffuseCoef = Standard_ShortReal (0.47);
MySpecularCoef = Standard_ShortReal (0.45); MySpecularCoef = Standard_ShortReal (0.45);
MyAmbientActivity = Standard_False; MyAmbientActivity = Standard_False;
/* Couleur issue du diffus */ /* Color resulting from dispersed */
//MyDiffuseColor.SetValues (0.87, 0.96, 1.0, Quantity_TOC_RGB); //MyDiffuseColor.SetValues (0.87, 0.96, 1.0, Quantity_TOC_RGB);
/* Couleur issue du speculaire */ /* Color resulting from specular */
//MySpecularColor.SetValues (0.93, 0.95, 0.78, Quantity_TOC_RGB); //MySpecularColor.SetValues (0.93, 0.95, 0.78, Quantity_TOC_RGB);
break; break;
// Compatibilite ascendante materiaux physiques. On prend la meme definition // Ascending Compatibility physical materials. The same definition is taken
// que dans le createur suivant. // as in the next constructor.
case Graphic3d_NOM_BRASS : case Graphic3d_NOM_BRASS :
MyMaterialType = Graphic3d_MATERIAL_PHYSIC; MyMaterialType = Graphic3d_MATERIAL_PHYSIC;
/* Initialisation des coefficients et couleur d eclairage : brass */ /* Initialisation of coefficients and lighting color : brass */
MyShininess = Standard_ShortReal (0.21794844); MyShininess = Standard_ShortReal (0.21794844);
MyAmbientCoef = Standard_ShortReal (1.0); MyAmbientCoef = Standard_ShortReal (1.0);
MyDiffuseCoef = Standard_ShortReal (1.0); MyDiffuseCoef = Standard_ShortReal (1.0);
MySpecularCoef = Standard_ShortReal (1.0); MySpecularCoef = Standard_ShortReal (1.0);
/* Couleur issue de l ambient */ /* Color resulting from ambient */
MyAmbientColor.SetValues (0.329412, 0.223529, 0.027451, Quantity_TOC_RGB); MyAmbientColor.SetValues (0.329412, 0.223529, 0.027451, Quantity_TOC_RGB);
/* Couleur issue du diffus */ /* Color resulting from dispersed */
MyDiffuseColor.SetValues (0.780392, 0.568627, 0.113725, Quantity_TOC_RGB); MyDiffuseColor.SetValues (0.780392, 0.568627, 0.113725, Quantity_TOC_RGB);
/* Couleur issue du speculaire */ /* Color resulting from specular */
MySpecularColor.SetValues (0.992157, 0.941176, 0.807843, Quantity_TOC_RGB); MySpecularColor.SetValues (0.992157, 0.941176, 0.807843, Quantity_TOC_RGB);
break; break;
case Graphic3d_NOM_BRONZE : case Graphic3d_NOM_BRONZE :
MyMaterialType = Graphic3d_MATERIAL_PHYSIC; MyMaterialType = Graphic3d_MATERIAL_PHYSIC;
/* Coef d eclairage */ /* Lighting Coefficient */
MyShininess = Standard_ShortReal (0.2); MyShininess = Standard_ShortReal (0.2);
MyAmbientCoef = Standard_ShortReal (1.0); MyAmbientCoef = Standard_ShortReal (1.0);
MyDiffuseCoef = Standard_ShortReal (1.0); MyDiffuseCoef = Standard_ShortReal (1.0);
MySpecularCoef = Standard_ShortReal (1.0); MySpecularCoef = Standard_ShortReal (1.0);
/* Couleur issue de l ambient */ /* Color resulting from ambient */
MyAmbientColor.SetValues (0.2125, 0.1275, 0.054, Quantity_TOC_RGB); MyAmbientColor.SetValues (0.2125, 0.1275, 0.054, Quantity_TOC_RGB);
/* Couleur issue du diffus */ /* Color resulting from dispersed */
MyDiffuseColor.SetValues (0.714, 0.4284, 0.18144, Quantity_TOC_RGB); MyDiffuseColor.SetValues (0.714, 0.4284, 0.18144, Quantity_TOC_RGB);
/* Couleur issue du speculaire */ /* Color resulting from specular */
MySpecularColor.SetValues (0.393548, 0.271906, 0.166721, Quantity_TOC_RGB); MySpecularColor.SetValues (0.393548, 0.271906, 0.166721, Quantity_TOC_RGB);
break; break;
case Graphic3d_NOM_COPPER : case Graphic3d_NOM_COPPER :
MyMaterialType = Graphic3d_MATERIAL_PHYSIC; MyMaterialType = Graphic3d_MATERIAL_PHYSIC;
/* Coefficient d eclairage */ /* Lighting Coefficient */
MyShininess = Standard_ShortReal (0.93); MyShininess = Standard_ShortReal (0.93);
MyAmbientCoef = Standard_ShortReal (1.0); MyAmbientCoef = Standard_ShortReal (1.0);
MyDiffuseCoef = Standard_ShortReal (1.0); MyDiffuseCoef = Standard_ShortReal (1.0);
MySpecularCoef = Standard_ShortReal (1.0); MySpecularCoef = Standard_ShortReal (1.0);
/* Couleur issue de l ambient */ /* Color resulting from ambient */
MyAmbientColor.SetValues (0.33, 0.26, 0.23, Quantity_TOC_RGB); MyAmbientColor.SetValues (0.33, 0.26, 0.23, Quantity_TOC_RGB);
/* Couleur issue du diffus */ /* Color resulting from dispersed */
MyDiffuseColor.SetValues (0.50, 0.11, 0.0, Quantity_TOC_RGB); MyDiffuseColor.SetValues (0.50, 0.11, 0.0, Quantity_TOC_RGB);
/* Couleur issue du speculaire */ /* Color resulting from specular */
MySpecularColor.SetValues (0.95, 0.73, 0.0, Quantity_TOC_RGB); MySpecularColor.SetValues (0.95, 0.73, 0.0, Quantity_TOC_RGB);
break; break;
case Graphic3d_NOM_GOLD : case Graphic3d_NOM_GOLD :
MyMaterialType = Graphic3d_MATERIAL_PHYSIC; MyMaterialType = Graphic3d_MATERIAL_PHYSIC;
/* Coefficient d eclairage */ /* Lighting Coefficient */
MyShininess = Standard_ShortReal (0.0625); MyShininess = Standard_ShortReal (0.0625);
MyAmbientCoef = Standard_ShortReal (0.3); MyAmbientCoef = Standard_ShortReal (0.3);
MyDiffuseCoef = Standard_ShortReal (0.4); MyDiffuseCoef = Standard_ShortReal (0.4);
MySpecularCoef = Standard_ShortReal (0.9); MySpecularCoef = Standard_ShortReal (0.9);
/* Couleur issue de l ambient */ /* Color resulting from ambient */
MyAmbientColor.SetValues (1.0, 0.76862745, 0.31764706, Quantity_TOC_RGB); MyAmbientColor.SetValues (1.0, 0.76862745, 0.31764706, Quantity_TOC_RGB);
/* Couleur issue du diffus */ /* Color resulting from dispersed */
MyDiffuseColor.SetValues (1.0, 0.69, 0.0, Quantity_TOC_RGB); MyDiffuseColor.SetValues (1.0, 0.69, 0.0, Quantity_TOC_RGB);
/* Couleur issue du speculaire */ /* Color resulting from specular */
MySpecularColor.SetValues (1.0, 0.98, 0.78, Quantity_TOC_RGB); MySpecularColor.SetValues (1.0, 0.98, 0.78, Quantity_TOC_RGB);
break; break;
case Graphic3d_NOM_PEWTER : case Graphic3d_NOM_PEWTER :
MyMaterialType = Graphic3d_MATERIAL_PHYSIC; MyMaterialType = Graphic3d_MATERIAL_PHYSIC;
/* Coefficient d eclairage */ /* Lighting Coefficient */
MyShininess = Standard_ShortReal (0.076923047); MyShininess = Standard_ShortReal (0.076923047);
MyAmbientCoef = Standard_ShortReal (1.0); MyAmbientCoef = Standard_ShortReal (1.0);
MyDiffuseCoef = Standard_ShortReal (1.0); MyDiffuseCoef = Standard_ShortReal (1.0);
MySpecularCoef = Standard_ShortReal (1.0); MySpecularCoef = Standard_ShortReal (1.0);
/* Couleur issue de l ambient */ /* Color resulting from ambient */
MyAmbientColor.SetValues (0.105882, 0.058824, 0.113725, Quantity_TOC_RGB); MyAmbientColor.SetValues (0.105882, 0.058824, 0.113725, Quantity_TOC_RGB);
/* Couleur issue du diffus */ /* Color resulting from dispersed */
MyDiffuseColor.SetValues (0.427451, 0.470588, 0.541176, Quantity_TOC_RGB); MyDiffuseColor.SetValues (0.427451, 0.470588, 0.541176, Quantity_TOC_RGB);
/* Couleur issue du speculaire */ /* Color resulting from specular */
MySpecularColor.SetValues (0.333333, 0.333333, 0.521569, Quantity_TOC_RGB); MySpecularColor.SetValues (0.333333, 0.333333, 0.521569, Quantity_TOC_RGB);
break; break;
case Graphic3d_NOM_PLASTER : case Graphic3d_NOM_PLASTER :
#ifdef BUG // The plaster material must be considered as Generic. #ifdef BUG // The plaster material must be considered as Generic.
MyMaterialType = Graphic3d_MATERIAL_PHYSIC; MyMaterialType = Graphic3d_MATERIAL_PHYSIC;
/* Coefficient d eclairage */ /* Lighting Coefficient */
MyShininess = Standard_ShortReal (0.2); MyShininess = Standard_ShortReal (0.2);
MyAmbientCoef = Standard_ShortReal (1.0); MyAmbientCoef = Standard_ShortReal (1.0);
MyDiffuseCoef = Standard_ShortReal (1.0); MyDiffuseCoef = Standard_ShortReal (1.0);
MySpecularCoef = Standard_ShortReal (1.0); MySpecularCoef = Standard_ShortReal (1.0);
#else #else
/* Coefficient d eclairage */ /* Lighting Coefficient */
MyShininess = Standard_ShortReal (0.0078125) MyShininess = Standard_ShortReal (0.0078125)
; ;
MyAmbientCoef = Standard_ShortReal (0.26); MyAmbientCoef = Standard_ShortReal (0.26);
@ -305,88 +295,88 @@ void Graphic3d_MaterialAspect::Init(const Graphic3d_NameOfMaterial AName) {
MySpecularCoef = Standard_ShortReal (0.06); MySpecularCoef = Standard_ShortReal (0.06);
#endif #endif
/* Couleur issue de l ambient */ /* Color resulting from ambient */
MyAmbientColor.SetValues (0.19225, 0.19225, 0.19225, Quantity_TOC_RGB); MyAmbientColor.SetValues (0.19225, 0.19225, 0.19225, Quantity_TOC_RGB);
/* Couleur issue du diffus */ /* Color resulting from dispersed */
MyDiffuseColor.SetValues (0.50754, 0.50754, 0.50754, Quantity_TOC_RGB); MyDiffuseColor.SetValues (0.50754, 0.50754, 0.50754, Quantity_TOC_RGB);
/* Couleur issue du speculaire */ /* Color resulting from specular */
MySpecularColor.SetValues (0.508273, 0.508273, 0.508273, Quantity_TOC_RGB); MySpecularColor.SetValues (0.508273, 0.508273, 0.508273, Quantity_TOC_RGB);
break; break;
case Graphic3d_NOM_SILVER : case Graphic3d_NOM_SILVER :
MyMaterialType = Graphic3d_MATERIAL_PHYSIC; MyMaterialType = Graphic3d_MATERIAL_PHYSIC;
/* Coefficient d eclairage */ /* Lighting Coefficient */
MyShininess = Standard_ShortReal (0.2); MyShininess = Standard_ShortReal (0.2);
MyAmbientCoef = Standard_ShortReal (1.0); MyAmbientCoef = Standard_ShortReal (1.0);
MyDiffuseCoef = Standard_ShortReal (1.0); MyDiffuseCoef = Standard_ShortReal (1.0);
MySpecularCoef = Standard_ShortReal (1.0); MySpecularCoef = Standard_ShortReal (1.0);
/* Couleur issue de l ambient */ /* Color resulting from ambient */
MyAmbientColor.SetValues (0.19225, 0.19225, 0.19225, Quantity_TOC_RGB); MyAmbientColor.SetValues (0.19225, 0.19225, 0.19225, Quantity_TOC_RGB);
/* Couleur issue du diffus */ /* Color resulting from dispersed */
MyDiffuseColor.SetValues (0.50754, 0.50754, 0.50754, Quantity_TOC_RGB); MyDiffuseColor.SetValues (0.50754, 0.50754, 0.50754, Quantity_TOC_RGB);
/* Couleur issue du speculaire */ /* Color resulting from specular */
MySpecularColor.SetValues (0.508273, 0.508273, 0.508273, Quantity_TOC_RGB); MySpecularColor.SetValues (0.508273, 0.508273, 0.508273, Quantity_TOC_RGB);
break; break;
case Graphic3d_NOM_STEEL : case Graphic3d_NOM_STEEL :
MyMaterialType = Graphic3d_MATERIAL_PHYSIC; MyMaterialType = Graphic3d_MATERIAL_PHYSIC;
/* Coefficient d eclairage */ /* Lighting Coefficient */
MyShininess = Standard_ShortReal (0.06); MyShininess = Standard_ShortReal (0.06);
MyAmbientCoef = Standard_ShortReal (0.01); MyAmbientCoef = Standard_ShortReal (0.01);
MyDiffuseCoef = Standard_ShortReal (0.03); MyDiffuseCoef = Standard_ShortReal (0.03);
MySpecularCoef = Standard_ShortReal (0.98); MySpecularCoef = Standard_ShortReal (0.98);
/* Couleur issue du speculaire */ /* Color resulting from specular */
MySpecularColor.SetValues (1.0, 1.0, 1.0, Quantity_TOC_RGB); MySpecularColor.SetValues (1.0, 1.0, 1.0, Quantity_TOC_RGB);
break; break;
case Graphic3d_NOM_STONE : case Graphic3d_NOM_STONE :
MyMaterialType = Graphic3d_MATERIAL_PHYSIC; MyMaterialType = Graphic3d_MATERIAL_PHYSIC;
/* Coefficient d eclairage */ /* Lighting Coefficient */
MyShininess = Standard_ShortReal (0.17); MyShininess = Standard_ShortReal (0.17);
MyAmbientCoef = Standard_ShortReal (0.19); MyAmbientCoef = Standard_ShortReal (0.19);
MyDiffuseCoef = Standard_ShortReal (0.75); MyDiffuseCoef = Standard_ShortReal (0.75);
MySpecularCoef = Standard_ShortReal (0.08); MySpecularCoef = Standard_ShortReal (0.08);
/* Couleur issue de l ambient */ /* Color resulting from ambient */
MyAmbientColor.SetValues (1.0, 0.8, 0.62, Quantity_TOC_RGB); MyAmbientColor.SetValues (1.0, 0.8, 0.62, Quantity_TOC_RGB);
/* Couleur issue du diffus */ /* Color resulting from dispersed */
MyDiffuseColor.SetValues (1.0, 0.8, 0.62, Quantity_TOC_RGB); MyDiffuseColor.SetValues (1.0, 0.8, 0.62, Quantity_TOC_RGB);
/* Couleur issue du speculaire */ /* Color resulting from specular */
MySpecularColor.SetValues (0.98, 1.0, 0.60, Quantity_TOC_RGB); MySpecularColor.SetValues (0.98, 1.0, 0.60, Quantity_TOC_RGB);
break; break;
// Compatibilite ascendante materiaux physiques. On prend la meme definition // Ascending Compatibility of physical materials. Takes the same definition
// que dans le createur suivant. Nouveaux materials // as in the next constructor. New materials
case Graphic3d_NOM_CHROME : case Graphic3d_NOM_CHROME :
MyMaterialType = Graphic3d_MATERIAL_PHYSIC; MyMaterialType = Graphic3d_MATERIAL_PHYSIC;
/* Coef d eclairage */ /* Lighting Coefficient */
MyShininess = Standard_ShortReal (0.1); MyShininess = Standard_ShortReal (0.1);
MyAmbientCoef = Standard_ShortReal (1.0); MyAmbientCoef = Standard_ShortReal (1.0);
MyDiffuseCoef = Standard_ShortReal (1.0); MyDiffuseCoef = Standard_ShortReal (1.0);
MySpecularCoef = Standard_ShortReal (1.0); MySpecularCoef = Standard_ShortReal (1.0);
/* Couleur issue de l ambient */ /* Color resulting from ambient */
MyAmbientColor.SetValues (0.35, 0.35, 0.35, Quantity_TOC_RGB); MyAmbientColor.SetValues (0.35, 0.35, 0.35, Quantity_TOC_RGB);
/* Couleur issue du diffus */ /* Color resulting from dispersed */
MyDiffuseColor.SetValues (0.4, 0.4, 0.4, Quantity_TOC_RGB); MyDiffuseColor.SetValues (0.4, 0.4, 0.4, Quantity_TOC_RGB);
/* Couleur issue du speculaire */ /* Color resulting from specular */
MySpecularColor.SetValues (0.974597, 0.974597, 0.974597, Quantity_TOC_RGB); MySpecularColor.SetValues (0.974597, 0.974597, 0.974597, Quantity_TOC_RGB);
break; break;
case Graphic3d_NOM_NEON_PHC: case Graphic3d_NOM_NEON_PHC:
MyMaterialType = Graphic3d_MATERIAL_PHYSIC; MyMaterialType = Graphic3d_MATERIAL_PHYSIC;
/* Coef d eclairage */ /* Lighting Coefficient */
MyShininess = Standard_ShortReal (0.05); MyShininess = Standard_ShortReal (0.05);
MyAmbientCoef = Standard_ShortReal (1.0); MyAmbientCoef = Standard_ShortReal (1.0);
MyDiffuseCoef = Standard_ShortReal (1.0); MyDiffuseCoef = Standard_ShortReal (1.0);
@ -396,70 +386,70 @@ void Graphic3d_MaterialAspect::Init(const Graphic3d_NameOfMaterial AName) {
MyAmbientActivity = Standard_False; MyAmbientActivity = Standard_False;
MyDiffuseActivity = Standard_False; MyDiffuseActivity = Standard_False;
/* Couleur issue de l ambient */ /* Color resulting from ambient */
MyAmbientColor.SetValues (1.0, 1.0, 1.0, Quantity_TOC_RGB); MyAmbientColor.SetValues (1.0, 1.0, 1.0, Quantity_TOC_RGB);
/* Couleur issue du diffus */ /* Color resulting from dispersed */
MyDiffuseColor.SetValues (1.0, 1.0, 1.0, Quantity_TOC_RGB); MyDiffuseColor.SetValues (1.0, 1.0, 1.0, Quantity_TOC_RGB);
/* Couleur issue du speculaire */ /* Color resulting from specular */
MySpecularColor.SetValues (1.0, 1.0, 1.0, Quantity_TOC_RGB); MySpecularColor.SetValues (1.0, 1.0, 1.0, Quantity_TOC_RGB);
/* Couleur issue du speculaire */ /* Color resulting from specular */
MyEmissiveColor.SetValues (0.0, 1.0, 0.46, Quantity_TOC_RGB); MyEmissiveColor.SetValues (0.0, 1.0, 0.46, Quantity_TOC_RGB);
break; break;
case Graphic3d_NOM_ALUMINIUM : case Graphic3d_NOM_ALUMINIUM :
MyMaterialType = Graphic3d_MATERIAL_PHYSIC; MyMaterialType = Graphic3d_MATERIAL_PHYSIC;
/* Coef d eclairage */ /* Lighting Coefficient */
MyShininess = Standard_ShortReal (0.09); MyShininess = Standard_ShortReal (0.09);
MyAmbientCoef = Standard_ShortReal (1.0); MyAmbientCoef = Standard_ShortReal (1.0);
MyDiffuseCoef = Standard_ShortReal (1.0); MyDiffuseCoef = Standard_ShortReal (1.0);
MySpecularCoef = Standard_ShortReal (1.0); MySpecularCoef = Standard_ShortReal (1.0);
/* Couleur issue de l ambient */ /* Color resulting from ambient */
MyAmbientColor.SetValues (0.30, 0.30, 0.30, Quantity_TOC_RGB); MyAmbientColor.SetValues (0.30, 0.30, 0.30, Quantity_TOC_RGB);
/* Couleur issue du diffus */ /* Color resulting from dispersed */
MyDiffuseColor.SetValues (0.30, 0.30, 0.30, Quantity_TOC_RGB); MyDiffuseColor.SetValues (0.30, 0.30, 0.30, Quantity_TOC_RGB);
/* Couleur issue du speculaire */ /* Color resulting from specular */
MySpecularColor.SetValues (0.70, 0.70, 0.80, Quantity_TOC_RGB); MySpecularColor.SetValues (0.70, 0.70, 0.80, Quantity_TOC_RGB);
break; break;
case Graphic3d_NOM_OBSIDIAN : case Graphic3d_NOM_OBSIDIAN :
MyMaterialType = Graphic3d_MATERIAL_PHYSIC; MyMaterialType = Graphic3d_MATERIAL_PHYSIC;
/* Coef d eclairage */ /* Lighting Coefficient */
MyShininess = Standard_ShortReal (0.3); MyShininess = Standard_ShortReal (0.3);
MyAmbientCoef = Standard_ShortReal (1.0); MyAmbientCoef = Standard_ShortReal (1.0);
MyDiffuseCoef = Standard_ShortReal (1.0); MyDiffuseCoef = Standard_ShortReal (1.0);
MySpecularCoef = Standard_ShortReal (1.0); MySpecularCoef = Standard_ShortReal (1.0);
/* Couleur issue de l ambient */ /* Color resulting from ambient */
MyAmbientColor.SetValues (0.05375, 0.05, 0.06625, Quantity_TOC_RGB); MyAmbientColor.SetValues (0.05375, 0.05, 0.06625, Quantity_TOC_RGB);
/* Couleur issue du diffus */ /* Color resulting from dispersed */
MyDiffuseColor.SetValues (0.18275, 0.17, 0.22525, Quantity_TOC_RGB); MyDiffuseColor.SetValues (0.18275, 0.17, 0.22525, Quantity_TOC_RGB);
/* Couleur issue du speculaire */ /* Color resulting from specular */
MySpecularColor.SetValues (0.332741, 0.328634, 0.346435, Quantity_TOC_RGB); MySpecularColor.SetValues (0.332741, 0.328634, 0.346435, Quantity_TOC_RGB);
break; break;
case Graphic3d_NOM_JADE : case Graphic3d_NOM_JADE :
MyMaterialType = Graphic3d_MATERIAL_PHYSIC; MyMaterialType = Graphic3d_MATERIAL_PHYSIC;
/* Coef d eclairage */ /* Lighting Coefficient */
MyShininess = Standard_ShortReal (0.1); MyShininess = Standard_ShortReal (0.1);
MyAmbientCoef = Standard_ShortReal (1.0); MyAmbientCoef = Standard_ShortReal (1.0);
MyDiffuseCoef = Standard_ShortReal (1.0); MyDiffuseCoef = Standard_ShortReal (1.0);
MySpecularCoef = Standard_ShortReal (1.0); MySpecularCoef = Standard_ShortReal (1.0);
/* Couleur issue de l ambient */ /* Color resulting from ambient */
MyAmbientColor.SetValues (0.135, 0.2225, 0.1575, Quantity_TOC_RGB); MyAmbientColor.SetValues (0.135, 0.2225, 0.1575, Quantity_TOC_RGB);
/* Couleur issue du diffus */ /* Color resulting from dispersed */
MyDiffuseColor.SetValues (0.54, 0.89, 0.63, Quantity_TOC_RGB); MyDiffuseColor.SetValues (0.54, 0.89, 0.63, Quantity_TOC_RGB);
/* Couleur issue du speculaire */ /* Color resulting from specular */
MySpecularColor.SetValues (0.316228, 0.316228, 0.316228, Quantity_TOC_RGB); MySpecularColor.SetValues (0.316228, 0.316228, 0.316228, Quantity_TOC_RGB);
break; break;
default: default:
@ -485,7 +475,7 @@ Standard_ShortReal OldShine;
} }
} }
/* Affectation type du materiel */ /* Attribution of the type of material */
void Graphic3d_MaterialAspect::SetMaterialType( const Graphic3d_TypeOfMaterial AType ) { void Graphic3d_MaterialAspect::SetMaterialType( const Graphic3d_TypeOfMaterial AType ) {
MyMaterialType = AType ; MyMaterialType = AType ;
#ifdef IMP171201 #ifdef IMP171201
@ -526,7 +516,7 @@ void Graphic3d_MaterialAspect::SetColor (const Quantity_Color& AColor) {
#endif #endif
} }
/* Affectation couleur eclairage ambient */ /* Attribution of color ambient lighting */
void Graphic3d_MaterialAspect::SetAmbientColor (const Quantity_Color& AColor) { void Graphic3d_MaterialAspect::SetAmbientColor (const Quantity_Color& AColor) {
MyAmbientColor = AColor; MyAmbientColor = AColor;
@ -537,7 +527,7 @@ void Graphic3d_MaterialAspect::SetAmbientColor (const Quantity_Color& AColor) {
#endif #endif
} }
/* Affectation couleur eclairage diffus */ /* Attribution of color dispersed lighting */
void Graphic3d_MaterialAspect::SetDiffuseColor (const Quantity_Color& AColor) { void Graphic3d_MaterialAspect::SetDiffuseColor (const Quantity_Color& AColor) {
MyDiffuseColor = AColor; MyDiffuseColor = AColor;
@ -548,7 +538,7 @@ void Graphic3d_MaterialAspect::SetDiffuseColor (const Quantity_Color& AColor) {
#endif #endif
} }
/* Affectation couleur eclairage speculaire */ /* Attribution of color specular lighting */
void Graphic3d_MaterialAspect::SetSpecularColor (const Quantity_Color& AColor) { void Graphic3d_MaterialAspect::SetSpecularColor (const Quantity_Color& AColor) {
MySpecularColor = AColor; MySpecularColor = AColor;
@ -591,7 +581,7 @@ void Graphic3d_MaterialAspect::SetDiffuse (const Standard_Real AValue) {
#endif #endif
} }
/* Affectation du coefficient d emission */ /* Attribution of coefficient of emission */
void Graphic3d_MaterialAspect::SetEmissive (const Standard_Real AValue) { void Graphic3d_MaterialAspect::SetEmissive (const Standard_Real AValue) {
if ((AValue < 0.0) || (AValue > 1.0)) if ((AValue < 0.0) || (AValue > 1.0))
@ -694,31 +684,31 @@ Quantity_Color Graphic3d_MaterialAspect::Color () const {
return (MyAmbientColor); return (MyAmbientColor);
} }
/* Acces a la couleur de l eclairage ambient */ /* Access to the color of the ambient lighting */
Quantity_Color Graphic3d_MaterialAspect::AmbientColor () const { Quantity_Color Graphic3d_MaterialAspect::AmbientColor () const {
return (MyAmbientColor); return (MyAmbientColor);
} }
/* Acces a la couleur de l eclairage diffus */ /* Access to the color of the dispersed lighting */
Quantity_Color Graphic3d_MaterialAspect::DiffuseColor () const { Quantity_Color Graphic3d_MaterialAspect::DiffuseColor () const {
return (MyDiffuseColor); return (MyDiffuseColor);
} }
/* Acces a la couleur de l eclairage speculaire */ /* Access to the color of the specular lighting */
Quantity_Color Graphic3d_MaterialAspect::SpecularColor () const { Quantity_Color Graphic3d_MaterialAspect::SpecularColor () const {
return (MySpecularColor); return (MySpecularColor);
} }
/* Acces a la couleur d emission */ /* Access to the color of emission */
Quantity_Color Graphic3d_MaterialAspect::EmissiveColor () const { Quantity_Color Graphic3d_MaterialAspect::EmissiveColor () const {
return (MyEmissiveColor); return (MyEmissiveColor);
} }
/* Acces type du materiel */ /* Access to the type of material */
Standard_Boolean Graphic3d_MaterialAspect::MaterialType( const Graphic3d_TypeOfMaterial AType ) const { Standard_Boolean Graphic3d_MaterialAspect::MaterialType( const Graphic3d_TypeOfMaterial AType ) const {
return ( MyMaterialType == AType ) ; return ( MyMaterialType == AType ) ;
} }
@ -751,49 +741,49 @@ Standard_Boolean Result;
} }
/* Acces a la couleur de l eclairage ambient */ /* Access to the color of the ambient lighting */
Standard_Real Graphic3d_MaterialAspect::Ambient () const { Standard_Real Graphic3d_MaterialAspect::Ambient () const {
return (Standard_Real (MyAmbientCoef)); return (Standard_Real (MyAmbientCoef));
} }
/* Acces a la couleur de l eclairage diffus */ /* Access to the color of the dispersed lighting */
Standard_Real Graphic3d_MaterialAspect::Diffuse () const { Standard_Real Graphic3d_MaterialAspect::Diffuse () const {
return (Standard_Real (MyDiffuseCoef)); return (Standard_Real (MyDiffuseCoef));
} }
/* Valeur du coefficient d emission */ /* Value of the coefficient of emission */
Standard_Real Graphic3d_MaterialAspect::Emissive () const { Standard_Real Graphic3d_MaterialAspect::Emissive () const {
return (Standard_Real (MyEmissiveCoef)); return (Standard_Real (MyEmissiveCoef));
} }
/* Acces a la couleur de l eclairage speculaire */ /* Access to the color of the specular lighting */
Standard_Real Graphic3d_MaterialAspect::Specular () const { Standard_Real Graphic3d_MaterialAspect::Specular () const {
return (Standard_Real (MySpecularCoef)); return (Standard_Real (MySpecularCoef));
} }
/* Acces au coefficient de transparence */ /* Access to the coefficient of transparency */
Standard_Real Graphic3d_MaterialAspect::Transparency () const { Standard_Real Graphic3d_MaterialAspect::Transparency () const {
return (Standard_Real (MyTransparencyCoef)); return (Standard_Real (MyTransparencyCoef));
} }
/* Acces au coefficient de brillance */ /* Access to the coefficient of shineness */
Standard_Real Graphic3d_MaterialAspect::Shininess () const { Standard_Real Graphic3d_MaterialAspect::Shininess () const {
return (Standard_Real (MyShininess)); return (Standard_Real (MyShininess));
} }
/* Affectation du coefficient de brillance */ /* Attribution of the coefficient of shineness */
void Graphic3d_MaterialAspect::SetShininess (const Standard_Real AValue) { void Graphic3d_MaterialAspect::SetShininess (const Standard_Real AValue) {
if ((AValue < 0.0) || (AValue > 1.0)) if ((AValue < 0.0) || (AValue > 1.0))
@ -889,7 +879,7 @@ static Material theMaterials[] = {
Standard_Integer Graphic3d_MaterialAspect::NumberOfMaterials() { Standard_Integer Graphic3d_MaterialAspect::NumberOfMaterials() {
Standard_Integer n =sizeof(theMaterials)/sizeof(Material); Standard_Integer n =sizeof(theMaterials)/sizeof(Material);
if( n > Graphic3d_NOM_DEFAULT ) { if( n > Graphic3d_NOM_DEFAULT ) {
cout << " *** Graphic3d_MaterialAspect::NumberOfMaterials() may returns a badvalue due to incoherente size between material name array and enum" << endl; cout << " *** Graphic3d_MaterialAspect::NumberOfMaterials() may return a badvalue due to incoherente size between material name array and enum" << endl;
} }
return Graphic3d_NOM_DEFAULT; return Graphic3d_NOM_DEFAULT;
} }

171
src/Graphic3d/Graphic3d_Structure.cxx
View File

@ -57,11 +57,10 @@
//-Version //-Version
//-Design Declaration des variables specifiques aux structures //-Design Declaration of variables specific to graphic structures
// graphiques
//-Warning Une structure est definie dans un manager //-Warning A structure is defined in a manager
// Il s'agit d'une sequence de groupes de primitives // This is a sequence of groups of primitives
//-References //-References
@ -124,7 +123,7 @@ MyHighlightColor (Quantity_NOC_WHITE)
Handle(Graphic3d_AspectFillArea3d) aAspectFillArea3d = Handle(Graphic3d_AspectFillArea3d) aAspectFillArea3d =
new Graphic3d_AspectFillArea3d (); new Graphic3d_AspectFillArea3d ();
// Recuperation des valeurs par defaut // Return default values
AManager->PrimitivesAspect (aAspectLine3d, aAspectText3d, AManager->PrimitivesAspect (aAspectLine3d, aAspectText3d,
aAspectMarker3d, aAspectFillArea3d); aAspectMarker3d, aAspectFillArea3d);
@ -133,7 +132,7 @@ MyHighlightColor (Quantity_NOC_WHITE)
aAspectFillArea3d->SetPolygonOffsets( Aspect_POM_Fill, 1., 0. ); aAspectFillArea3d->SetPolygonOffsets( Aspect_POM_Fill, 1., 0. );
// OCC4895 SAN 22/03/04 High-level interface for controlling polygon offsets // OCC4895 SAN 22/03/04 High-level interface for controlling polygon offsets
// Mise a jour de la CStructure associee // Update the associated CStructure
UpdateStructure (aAspectLine3d, aAspectText3d, UpdateStructure (aAspectLine3d, aAspectText3d,
aAspectMarker3d, aAspectFillArea3d); aAspectMarker3d, aAspectFillArea3d);
@ -253,10 +252,10 @@ void Graphic3d_Structure::Remove () {
Standard_Integer i, Length; Standard_Integer i, Length;
// Standard_Address APtr = (void *) This ().operator->(); // Standard_Address APtr = (void *) This ().operator->();
Standard_Address APtr = (void *) this; Standard_Address APtr = (void *) this;
// Il faut enlever le pointeur possible sur cette structure // It is necessary to remove the eventual pointer on the structure
// que l'on est en train de detruire, dans la liste des descendants // that can be destroyed, in the list of descendants
// des ancetres de cette structure et dans la liste des ancetres // of ancesters of this structure and in the list of ancesters
// des descendants de cette meme structure. // of descendants of the same structure.
Length = MyDescendants.Length (); Length = MyDescendants.Length ();
for (i=1; i<=Length; i++) for (i=1; i<=Length; i++)
@ -271,11 +270,11 @@ void Graphic3d_Structure::Remove () {
MyCStructure.ContainsFacet = 0; MyCStructure.ContainsFacet = 0;
MyCStructure.IsDeleted = 1; MyCStructure.IsDeleted = 1;
// Destruction de me dans la bibliotheque graphique // Destruction of me in the graphic library
MyGraphicDriver->RemoveStructure (MyCStructure); MyGraphicDriver->RemoveStructure (MyCStructure);
// Liberation de l'identification de la structure detruite // Liberation of the identification if the destroyed structure
// dans le premier manager qui a gere la creation de la structure. // in the first manager that performs creation of the structure.
if ( MyFirstPtrStructureManager ) if ( MyFirstPtrStructureManager )
MyFirstStructureManager->Remove (Standard_Integer (MyCStructure.Id)); MyFirstStructureManager->Remove (Standard_Integer (MyCStructure.Id));
@ -369,15 +368,15 @@ void Graphic3d_Structure::Highlight (const Aspect_TypeOfHighlightMethod AMethod)
if (IsDeleted ()) return; if (IsDeleted ()) return;
// Highlight sur une structure deja Highlighted. // Highlight on already Highlighted structure.
if (MyCStructure.highlight) { if (MyCStructure.highlight) {
Aspect_TypeOfUpdate UpdateMode = MyStructureManager->UpdateMode (); Aspect_TypeOfUpdate UpdateMode = MyStructureManager->UpdateMode ();
if (UpdateMode == Aspect_TOU_WAIT) if (UpdateMode == Aspect_TOU_WAIT)
UnHighlight (); UnHighlight ();
else { else {
// Pour eviter d'appeler la methode : Update () // To avoid call of method : Update ()
// Inutile et peut-etre couteux. // Not useful and can be costly.
MyStructureManager->SetUpdateMode (Aspect_TOU_WAIT); MyStructureManager->SetUpdateMode (Aspect_TOU_WAIT);
UnHighlight (); UnHighlight ();
MyStructureManager->SetUpdateMode (UpdateMode); MyStructureManager->SetUpdateMode (UpdateMode);
@ -404,14 +403,14 @@ void Graphic3d_Structure::SetHighlightColor (const Quantity_Color& AColor) {
if (! MyCStructure.highlight) if (! MyCStructure.highlight)
MyHighlightColor = AColor; MyHighlightColor = AColor;
else { else {
// Changement de highlight color sur une structure deja Highlighted. // Change highlight color on already Highlighted structure.
Aspect_TypeOfUpdate UpdateMode = MyStructureManager->UpdateMode (); Aspect_TypeOfUpdate UpdateMode = MyStructureManager->UpdateMode ();
if (UpdateMode == Aspect_TOU_WAIT) if (UpdateMode == Aspect_TOU_WAIT)
UnHighlight (); UnHighlight ();
else { else {
// Pour eviter d'appeler la methode : Update () // To avoid call of method : Update ()
// Inutile et peut-etre couteux. // Not useful and can be costly.
MyStructureManager->SetUpdateMode (Aspect_TOU_WAIT); MyStructureManager->SetUpdateMode (Aspect_TOU_WAIT);
UnHighlight (); UnHighlight ();
MyStructureManager->SetUpdateMode (UpdateMode); MyStructureManager->SetUpdateMode (UpdateMode);
@ -529,7 +528,7 @@ Standard_Boolean Graphic3d_Structure::IsVisible () const {
Standard_Boolean Graphic3d_Structure::IsRotated () const { Standard_Boolean Graphic3d_Structure::IsRotated () const {
// Test un peu leger ! // A somewhat light test !
return ( MyCStructure.Transformation[0][1] != 0. return ( MyCStructure.Transformation[0][1] != 0.
|| MyCStructure.Transformation[0][2] != 0. || MyCStructure.Transformation[0][2] != 0.
|| MyCStructure.Transformation[1][0] != 0. || MyCStructure.Transformation[1][0] != 0.
@ -552,11 +551,11 @@ Standard_Boolean Graphic3d_Structure::IsTransformed () const {
Result = MyCStructure.Transformation[i][j] != 0.; Result = MyCStructure.Transformation[i][j] != 0.;
#ifdef TRACE_ISTRSF #ifdef TRACE_ISTRSF
cout << "La structure " << Identification (); cout << "Structure " << Identification ();
if (Result) if (Result)
cout << " est transformee\n" << flush; cout << " is transformed\n" << flush;
else else
cout << " n'est pas transformee\n" << flush; cout << " is not transformed\n" << flush;
#endif #endif
return Result; return Result;
@ -567,8 +566,8 @@ Standard_Boolean Graphic3d_Structure::ContainsFacet () const {
if (IsDeleted ()) return (Standard_False); if (IsDeleted ()) return (Standard_False);
// Une structure contient au moins une facette : // A structure contains at least one facet :
// si l'un de ses groupes est contient au moins une facette. // if one of these groups contains at least one facet.
Standard_Boolean Result1 = Standard_False; Standard_Boolean Result1 = Standard_False;
Standard_Boolean Result2 = Standard_False; Standard_Boolean Result2 = Standard_False;
@ -576,13 +575,12 @@ Standard_Boolean Graphic3d_Structure::ContainsFacet () const {
Result1 = (MyCStructure.ContainsFacet > 0); Result1 = (MyCStructure.ContainsFacet > 0);
// Si un des groupes contient au moins une facette alors // If one of groups contains at least one facet, the structure contains it too.
// la structure aussi.
if (Result1) return (Result1); if (Result1) return (Result1);
Length = MyDescendants.Length (); Length = MyDescendants.Length ();
// Je m'arrete au premier descendant qui contient au moins une facette. // Stop at the first descendant containing at least one facet.
for (i=1; i<=Length && ! Result2; i++) for (i=1; i<=Length && ! Result2; i++)
Result2 = ((Graphic3d_Structure *) Result2 = ((Graphic3d_Structure *)
(MyDescendants.Value (i)))->ContainsFacet (); (MyDescendants.Value (i)))->ContainsFacet ();
@ -595,26 +593,26 @@ Standard_Boolean Graphic3d_Structure::IsEmpty () const {
if (IsDeleted ()) return (Standard_True); if (IsDeleted ()) return (Standard_True);
// Une structure est vide : // A structure is empty :
// si l'ensemble de ses groupes est vide ou tous ses // if all these groups are empty or if all
// groupes sont vides et si l'ensemble de ses descendants // groups are empty and all their descendants
// est vide ou tous ses descendants sont vides. // are empty or if all its descendants are empty.
Standard_Boolean Result1 = Standard_True; Standard_Boolean Result1 = Standard_True;
Standard_Integer i, Length = MyGroups.Length (); Standard_Integer i, Length = MyGroups.Length ();
// Je m'arrete au premier groupe non vide // Stop at the first non-empty group
for (i=1; i<=Length && Result1; i++) for (i=1; i<=Length && Result1; i++)
Result1 = (MyGroups.Value (i))->IsEmpty (); Result1 = (MyGroups.Value (i))->IsEmpty ();
// Si un des groupes est non vide alors la structure l'est aussi. // If a group is non-empty the structure is also non-empty.
if (! Result1) return (Standard_False); if (! Result1) return (Standard_False);
Standard_Boolean Result2 = Standard_True; Standard_Boolean Result2 = Standard_True;
Length = MyDescendants.Length (); Length = MyDescendants.Length ();
// Je m'arrete au premier descendant non vide // Stop at the first non-empty descendant
for (i=1; i<=Length && Result2; i++) for (i=1; i<=Length && Result2; i++)
Result2 = ((Graphic3d_Structure *) Result2 = ((Graphic3d_Structure *)
(MyDescendants.Value (i)))->IsEmpty (); (MyDescendants.Value (i)))->IsEmpty ();
@ -1044,8 +1042,8 @@ void Graphic3d_Structure::SetPrimitivesAspect (const Handle(Graphic3d_AspectLine
MyGraphicDriver->ContextStructure (MyCStructure); MyGraphicDriver->ContextStructure (MyCStructure);
// CAL 14/04/95 // CAL 14/04/95
// Les attributs sont "IsSet" lors de la premiere mise a jour // attributes are "IsSet" during the first update
// d'un contexte (line, marker...) // of a context (line, marker...)
MyCStructure.ContextLine.IsSet = 1; MyCStructure.ContextLine.IsSet = 1;
MyCStructure.ContextFillArea.IsSet = 1; MyCStructure.ContextFillArea.IsSet = 1;
MyCStructure.ContextMarker.IsSet = 1; MyCStructure.ContextMarker.IsSet = 1;
@ -1261,8 +1259,8 @@ void Graphic3d_Structure::SetPrimitivesAspect (const Handle(Graphic3d_AspectFill
#endif #endif
// CAL 14/04/95 // CAL 14/04/95
// Les attributs sont "IsSet" lors de la premiere mise a jour // Attributes are "IsSet" during the first update
// d'un contexte (line, marker...) // of context (line, marker...)
MyCStructure.ContextLine.IsSet = 1; MyCStructure.ContextLine.IsSet = 1;
MyCStructure.ContextFillArea.IsSet = 1; MyCStructure.ContextFillArea.IsSet = 1;
MyCStructure.ContextMarker.IsSet = 1; MyCStructure.ContextMarker.IsSet = 1;
@ -1313,8 +1311,7 @@ void Graphic3d_Structure::SetPrimitivesAspect (const Handle(Graphic3d_AspectText
MyGraphicDriver->ContextStructure (MyCStructure); MyGraphicDriver->ContextStructure (MyCStructure);
// CAL 14/04/95 // CAL 14/04/95
// Les attributs sont "IsSet" lors de la premiere mise a jour // Attributes are "IsSet" during the first update of a context (line, marker...)
// d'un contexte (line, marker...)
MyCStructure.ContextLine.IsSet = 1; MyCStructure.ContextLine.IsSet = 1;
MyCStructure.ContextFillArea.IsSet = 1; MyCStructure.ContextFillArea.IsSet = 1;
MyCStructure.ContextMarker.IsSet = 1; MyCStructure.ContextMarker.IsSet = 1;
@ -1345,9 +1342,7 @@ void Graphic3d_Structure::SetPrimitivesAspect (const Handle(Graphic3d_AspectMark
MyGraphicDriver->ContextStructure (MyCStructure); MyGraphicDriver->ContextStructure (MyCStructure);
// CAL 14/04/95 // Attributes are "IsSet" during the first update of a context (line, marker...)
// Les attributs sont "IsSet" lors de la premiere mise a jour
// d'un contexte (line, marker...)
MyCStructure.ContextLine.IsSet = 1; MyCStructure.ContextLine.IsSet = 1;
MyCStructure.ContextFillArea.IsSet = 1; MyCStructure.ContextFillArea.IsSet = 1;
MyCStructure.ContextMarker.IsSet = 1; MyCStructure.ContextMarker.IsSet = 1;
@ -1376,8 +1371,8 @@ void Graphic3d_Structure::SetVisual (const Graphic3d_TypeOfStructure AVisual) {
Display (); Display ();
} }
else { else {
// Pour eviter d'appeler la methode : Update () // To avoid calling method : Update ()
// Inutile et peut-etre couteux. // Not useful and can be costly.
MyStructureManager->SetUpdateMode (Aspect_TOU_WAIT); MyStructureManager->SetUpdateMode (Aspect_TOU_WAIT);
Erase (); Erase ();
MyVisual = AVisual; MyVisual = AVisual;
@ -1500,8 +1495,8 @@ void Graphic3d_Structure::Connect (const Handle(Graphic3d_Structure)& AStructure
MyAncestors.Append ((void *) AStructure.operator->()); MyAncestors.Append ((void *) AStructure.operator->());
AStructure->Connect (this, Graphic3d_TOC_DESCENDANT); AStructure->Connect (this, Graphic3d_TOC_DESCENDANT);
// MyGraphicDriver->Connect est appele dans le cas // MyGraphicDriver->Connect is called in case
// d'un connect entre mere et fille // if connection between parent and child
} }
} }
break; break;
@ -1521,7 +1516,7 @@ void Graphic3d_Structure::Disconnect (const Handle(Graphic3d_Structure)& AStruct
if ((void *) (MyDescendants.Value (i)) == if ((void *) (MyDescendants.Value (i)) ==
(void *) (AStructure.operator->())) indexD = i; (void *) (AStructure.operator->())) indexD = i;
// On cherche dans les Descendants // Search in the Descendants
if (indexD != 0) { if (indexD != 0) {
MyDescendants.Remove (indexD); MyDescendants.Remove (indexD);
AStructure->Disconnect (this); AStructure->Disconnect (this);
@ -1538,13 +1533,13 @@ void Graphic3d_Structure::Disconnect (const Handle(Graphic3d_Structure)& AStruct
if ((void *) (MyAncestors.Value (i)) == if ((void *) (MyAncestors.Value (i)) ==
(void *) (AStructure.operator->())) indexA = i; (void *) (AStructure.operator->())) indexA = i;
// On cherche dans les Ancestors // Search in the Ancestors
if (indexA != 0) { if (indexA != 0) {
MyAncestors.Remove (indexA); MyAncestors.Remove (indexA);
AStructure->Disconnect (this); AStructure->Disconnect (this);
// Pas de call a MyGraphicDriver->Disconnect // No call of MyGraphicDriver->Disconnect
// dans le cas d'un ancetre // in case of an ancestor
} }
} }
@ -1562,20 +1557,20 @@ void Graphic3d_Structure::DisconnectAll (const Graphic3d_TypeOfConnection AType)
case Graphic3d_TOC_DESCENDANT : case Graphic3d_TOC_DESCENDANT :
Length = MyDescendants.Length (); Length = MyDescendants.Length ();
for (i=1; i<=Length; i++) for (i=1; i<=Length; i++)
// Value (1) et non Value (i) car MyDescendants // Value (1) instead of Value (i) as MyDescendants
// est modifiee par : // is modified by :
// Graphic3d_Structure::Disconnect (AStructure) // Graphic3d_Structure::Disconnect (AStructure)
// qui enleve AStructure de MyDescendants // that takes AStructure from MyDescendants
((Graphic3d_Structure *) ((Graphic3d_Structure *)
(MyDescendants.Value (1)))->Disconnect (this); (MyDescendants.Value (1)))->Disconnect (this);
break; break;
case Graphic3d_TOC_ANCESTOR : case Graphic3d_TOC_ANCESTOR :
Length = MyAncestors.Length (); Length = MyAncestors.Length ();
for (i=1; i<=Length; i++) for (i=1; i<=Length; i++)
// Value (1) et non Value (i) car MyAncestors // Value (1) instead of Value (i) as MyAncestors
// est modifiee par : // is modified by :
// Graphic3d_Structure::Disconnect (AStructure) // Graphic3d_Structure::Disconnect (AStructure)
// qui enleve AStructure de MyAncestors // that takes AStructure from MyAncestors
((Graphic3d_Structure *) ((Graphic3d_Structure *)
(MyAncestors.Value (1)))->Disconnect (this); (MyAncestors.Value (1)))->Disconnect (this);
break; break;
@ -1606,7 +1601,7 @@ void Graphic3d_Structure::SetTransform (const TColStd_Array2OfReal& AMatrix, con
TColStd_Array2OfReal AMatrix44 (0, 3, 0, 3); TColStd_Array2OfReal AMatrix44 (0, 3, 0, 3);
// Assign the new transformation in an array [0..3][0..3] // Assign the new transformation in an array [0..3][0..3]
// Evite des problemes si le user a defini sa matrice [1..4][1..4] // Avoid problemes if the user has defined matrice [1..4][1..4]
// ou [3..6][-1..2] !! // ou [3..6][-1..2] !!
lr = AMatrix.LowerRow (); lr = AMatrix.LowerRow ();
ur = AMatrix.UpperRow (); ur = AMatrix.UpperRow ();
@ -1619,7 +1614,7 @@ void Graphic3d_Structure::SetTransform (const TColStd_Array2OfReal& AMatrix, con
if (AType == Graphic3d_TOC_REPLACE) { if (AType == Graphic3d_TOC_REPLACE) {
MyCStructure.Composition = 0; MyCStructure.Composition = 0;
// La mise a jour de la CStructure // Update of CStructure
for (i=0; i<=3; i++) for (i=0; i<=3; i++)
for (j=0; j<=3; j++) { for (j=0; j<=3; j++) {
MyCStructure.Transformation[i][j] = MyCStructure.Transformation[i][j] =
@ -1630,11 +1625,11 @@ void Graphic3d_Structure::SetTransform (const TColStd_Array2OfReal& AMatrix, con
if (AType == Graphic3d_TOC_POSTCONCATENATE) { if (AType == Graphic3d_TOC_POSTCONCATENATE) {
MyCStructure.Composition = 1; MyCStructure.Composition = 1;
// Pour simplifier la gestion des indices // To simplify management of indices
for (i=0; i<=3; i++) for (i=0; i<=3; i++)
for (j=0; j<=3; j++) for (j=0; j<=3; j++)
AMatrix44 (i, j) = AMatrix (lr + i, lc + j); AMatrix44 (i, j) = AMatrix (lr + i, lc + j);
// Le calcul de produit de matrices // Calculation of the product of matrices
for (i=0; i<=3; i++) for (i=0; i<=3; i++)
for (j=0; j<=3; j++) { for (j=0; j<=3; j++) {
NewTrsf (i, j) = 0.0; NewTrsf (i, j) = 0.0;
@ -1646,13 +1641,13 @@ void Graphic3d_Structure::SetTransform (const TColStd_Array2OfReal& AMatrix, con
NewTrsf (i, j) = valuenewtrsf; NewTrsf (i, j) = valuenewtrsf;
} }
} }
// La mise a jour de la CStructure // Update of CStructure
for (i=0; i<=3; i++) for (i=0; i<=3; i++)
for (j=0; j<=3; j++) for (j=0; j<=3; j++)
MyCStructure.Transformation[i][j] = float (NewTrsf (i, j)); MyCStructure.Transformation[i][j] = float (NewTrsf (i, j));
} }
// Si transformation, non validation des parties cachees deja calculees. // If transformation, no validation of hidden already calculated parts.
if (IsRotated ()) if (IsRotated ())
ReCompute (); ReCompute ();
@ -1691,8 +1686,8 @@ void Graphic3d_Structure::MinMaxValues (Standard_Real& XMin, Standard_Real& YMin
if ((XTMin == RF) && (YTMin == RF) && if ((XTMin == RF) && (YTMin == RF) &&
(ZTMin == RF) && (XTMax == RL) && (ZTMin == RF) && (XTMax == RL) &&
(YTMax == RL) && (ZTMax == RL)) { (YTMax == RL) && (ZTMax == RL)) {
// Cas impossible car cela voudrait dire // Case impossible as it would mean that
// que la structure est vide // the structure is empty
XMin = RF; XMin = RF;
YMin = RF; YMin = RF;
ZMin = RF; ZMin = RF;
@ -1799,9 +1794,9 @@ gp_Pnt Graphic3d_Structure::TransformPersistencePoint() const
void Graphic3d_Structure::Add (const Handle(Graphic3d_Group)& AGroup) { void Graphic3d_Structure::Add (const Handle(Graphic3d_Group)& AGroup) {
// Methode appelee que par le constructeur de Graphic3d_Group // Method called only by the constructor of Graphic3d_Group
// Ce n'est pas la peine de tester l'existence de <AGroup> // It is easy to check presence of <AGroup>
// dans la sequence MyGroups. // in sequence MyGroups.
MyGroups.Append (AGroup); MyGroups.Append (AGroup);
} }
@ -1850,7 +1845,7 @@ void Graphic3d_Structure::Remove (const Handle(Graphic3d_Group)& AGroup) {
for (Standard_Integer i=1; i<=Length && index==0; i++) for (Standard_Integer i=1; i<=Length && index==0; i++)
if (MyGroups.Value (i) == AGroup) index = i; if (MyGroups.Value (i) == AGroup) index = i;
// On cherche dans les Groups // Search in Groups
if (index != 0) { if (index != 0) {
Standard_Integer GroupLabelBegin, GroupLabelEnd; Standard_Integer GroupLabelBegin, GroupLabelEnd;
AGroup->Labels (GroupLabelBegin, GroupLabelEnd); AGroup->Labels (GroupLabelBegin, GroupLabelEnd);
@ -1980,8 +1975,8 @@ void Graphic3d_Structure::MinMaxCoord (Standard_Real& XMin, Standard_Real& YMin,
if ((XMin == RL) && (YMin == RL) && if ((XMin == RL) && (YMin == RL) &&
(ZMin == RL) && (XMax == RF) && (ZMin == RL) && (XMax == RF) &&
(YMax == RF) && (ZMax == RF)) { (YMax == RF) && (ZMax == RF)) {
// Cas impossible car cela voudrait dire // Case impossible as it would mean
// que la structure est vide // that the structure is empty
XMin = RF; XMin = RF;
YMin = RF; YMin = RF;
ZMin = RF; ZMin = RF;
@ -2075,8 +2070,7 @@ void Graphic3d_Structure::Network (const Handle(Graphic3d_Structure)& AStructure
while (IteratorD.More ()) { while (IteratorD.More ()) {
Graphic3d_Structure::Network Graphic3d_Structure::Network
(IteratorD.Key (), AType, ASet); (IteratorD.Key (), AType, ASet);
// IteratorD.Next () se positionne // IteratorD.Next () is located on the next structure
// sur la prochaine structure
IteratorD.Next (); IteratorD.Next ();
} }
break; break;
@ -2085,9 +2079,8 @@ void Graphic3d_Structure::Network (const Handle(Graphic3d_Structure)& AStructure
while (IteratorA.More ()) { while (IteratorA.More ()) {
Graphic3d_Structure::Network Graphic3d_Structure::Network
(IteratorA.Key (), AType, ASet); (IteratorA.Key (), AType, ASet);
// IteratorA.Next () se positionne // IteratorD.Next () is located on the next structure
// sur la prochaine structure IteratorA.Next ();
IteratorA.Next ();
} }
break; break;
} }
@ -2394,7 +2387,7 @@ void Graphic3d_Structure::GraphicHighlight (const Aspect_TypeOfHighlightMethod A
break; break;
case Aspect_TOHM_BOUNDBOX : case Aspect_TOHM_BOUNDBOX :
if (IsEmpty () || IsInfinite ()) { if (IsEmpty () || IsInfinite ()) {
// Structure vide ou infinie // Empty or infinite structure
XMin = YMin = ZMin = 0.; XMin = YMin = ZMin = 0.;
XMax = YMax = ZMax = 0.; XMax = YMax = ZMax = 0.;
} }
@ -2462,11 +2455,11 @@ Graphic3d_TypeOfStructure Graphic3d_Structure::ComputeVisual () const {
void Graphic3d_Structure::SetComputeVisual (const Graphic3d_TypeOfStructure AVisual) { void Graphic3d_Structure::SetComputeVisual (const Graphic3d_TypeOfStructure AVisual) {
// On ne memorise le ComputeVisual que lorsque la structure est // The ComputeVisual is saved only if the structure is
// declaree TOS_ALL, TOS_WIREFRAME ou TOS_SHADING. // declared TOS_ALL, TOS_WIREFRAME or TOS_SHADING.
// C'est cette declaration qui va nous permettre de calculer // This declaration permits to calculate
// la bonne representation de la structure calculee par Compute // proper representation of the structure calculated by Compute
// et non pas le passage en TOS_COMPUTED. // instead of passage to TOS_COMPUTED.
if (AVisual != Graphic3d_TOS_COMPUTED) if (AVisual != Graphic3d_TOS_COMPUTED)
MyComputeVisual = AVisual; MyComputeVisual = AVisual;
@ -2478,7 +2471,7 @@ void Graphic3d_Structure::Plot (const Handle(Graphic3d_Plotter)& ) {
void Graphic3d_Structure::SetManager (const Handle(Graphic3d_StructureManager)& AManager, const Standard_Boolean WithPropagation) { void Graphic3d_Structure::SetManager (const Handle(Graphic3d_StructureManager)& AManager, const Standard_Boolean WithPropagation) {
// Toutes les structures connectees doivent suivre ? // All connected structures should follow ?
#ifdef IMPLEMENTED #ifdef IMPLEMENTED
if (WithPropagation) { if (WithPropagation) {
Standard_Integer i, Length; Standard_Integer i, Length;
@ -2494,7 +2487,7 @@ void Graphic3d_Structure::SetManager (const Handle(Graphic3d_StructureManager)&
} }
#endif #endif
// changement d'identification ? // change of identification ?
// MyStructureManager->Remove (Standard_Integer (MyCStructure.Id)); // MyStructureManager->Remove (Standard_Integer (MyCStructure.Id));
// AManager->NewIdentification (); // AManager->NewIdentification ();
// MyCStructure.Id = int (AManager->NewIdentification ()); // MyCStructure.Id = int (AManager->NewIdentification ());
@ -2525,7 +2518,7 @@ void Graphic3d_Structure::SetManager (const Handle(Graphic3d_StructureManager)&
MyStructureManager->SetUpdateMode (UpdateMode); MyStructureManager->SetUpdateMode (UpdateMode);
AManager->SetUpdateMode (NewUpdateMode); AManager->SetUpdateMode (NewUpdateMode);
// Nouveau manager // New manager
MyPtrStructureManager = (void *) AManager.operator->(); MyPtrStructureManager = (void *) AManager.operator->();
} }
@ -2538,9 +2531,9 @@ void Graphic3d_Structure::SetHLRValidation (const Standard_Boolean AFlag) {
Standard_Boolean Graphic3d_Structure::HLRValidation () const { Standard_Boolean Graphic3d_Structure::HLRValidation () const {
// Les parties cachees stockees dans <me> sont valides si : // Hidden parts stored in <me> are valid if :
// 1/ le proprietaire est defini. // 1/ the owner is defined.
// 2/ elles n'ont pas ete invalidees. // 2/ they are not invalid.
Standard_Boolean Result = MyOwner != NULL && MyCStructure.HLRValidation != 0; Standard_Boolean Result = MyOwner != NULL && MyCStructure.HLRValidation != 0;

8
src/Graphic3d/Graphic3d_StructureManager.cxx
View File

@ -9,9 +9,9 @@
//-Version //-Version
//-Design Declaration des variables specifiques aux managers //-Design Declaration of variables specific to managers
//-Warning Un manager manipule un ensemble de structures //-Warning Manager manages a set of structures
//-References //-References
@ -77,7 +77,7 @@ Standard_Integer Limit = Graphic3d_StructureManager::Limit ();
if (Initialisation) { if (Initialisation) {
Initialisation = Standard_False; Initialisation = Standard_False;
/* tableau pour gerer les identificateurs de StructureManager */ /* table to manage IDs of StructureManager */
for (i=1; i<=Limit; i++) StructureManager_ArrayId[i] = 0; for (i=1; i<=Limit; i++) StructureManager_ArrayId[i] = 0;
StructureManager_CurrentId = 1; StructureManager_CurrentId = 1;
@ -307,7 +307,7 @@ Standard_Real Xm, Ym, Zm, XM, YM, ZM, RL, RF;
} }
} }
// Si toutes les structures sont vides ou infinies // If all structures are empty or infinite
if (Flag) { if (Flag) {
XMin = YMin = ZMin = RF; XMin = YMin = ZMin = RF;
XMax = YMax = ZMax = RL; XMax = YMax = ZMax = RL;

7
src/Graphic3d/Graphic3d_TextureRoot.cxx
View File

@ -113,7 +113,7 @@ Handle(AlienImage_AlienImage) Graphic3d_TextureRoot::LoadTexture() const
OSD_File File(MyPath); OSD_File File(MyPath);
File.Open(OSD_ReadOnly, Protection); File.Open(OSD_ReadOnly, Protection);
// ouverture du fichier ok ? // open file ok ?
if ( File.IsOpen() == Standard_False ) { if ( File.IsOpen() == Standard_False ) {
TCollection_AsciiString sysname; TCollection_AsciiString sysname;
MyPath.SystemName(sysname); MyPath.SystemName(sysname);
@ -123,7 +123,7 @@ Handle(AlienImage_AlienImage) Graphic3d_TextureRoot::LoadTexture() const
//////////////////////// ////////////////////////
// lecture du fichier // // file reading //
//////////////////////// ////////////////////////
@ -174,7 +174,6 @@ Handle(AlienImage_AlienImage) Graphic3d_TextureRoot::LoadTexture() const
// Euclid ? // Euclid ?
/////////// ///////////
// plantouille royalement
Handle(AlienImage_EuclidAlienImage) EuclidAlienImage = new AlienImage_EuclidAlienImage() ; Handle(AlienImage_EuclidAlienImage) EuclidAlienImage = new AlienImage_EuclidAlienImage() ;
if (EuclidAlienImage->Read( File )) { if (EuclidAlienImage->Read( File )) {
@ -193,7 +192,7 @@ Handle(AlienImage_AlienImage) Graphic3d_TextureRoot::LoadTexture() const
} }
// lever exception: type de fichier inconnu // raise exception: file type unknown
return TheAlienImage; return TheAlienImage;
} }

16
src/Graphic3d/Graphic3d_VertexC.cxx
View File

@ -7,9 +7,9 @@
//-Version //-Version
//-Design Declaration des variables specifiques aux points //-Design Declaration of variables specific to points
//-Warning Un point est defini par ses coordonnees et sa couleur //-Warning A point is defined by its coordinates and color
//-References //-References
@ -24,7 +24,7 @@
//-Global data definitions //-Global data definitions
// -- la couleur du point // -- point color
// MyColor : Color; // MyColor : Color;
//-Constructors //-Constructors
@ -36,18 +36,16 @@
Graphic3d_VertexC::Graphic3d_VertexC () { Graphic3d_VertexC::Graphic3d_VertexC () {
} }
// le :(AX, AY, AZ) car VertexC herite de Vertex et il faut appeler le // :(AX, AY, AZ) as VertexC inherits Vertex and it is necessary to call
// constructeur de Vertex avec AX, AY et AZ pour mettre a jour // constructor of Vertex with AX, AY and AZ to update fields MyX, MyY, MyZ.
// les fields MyX, MyY, MyZ.
Graphic3d_VertexC::Graphic3d_VertexC (const Standard_Real AX, const Standard_Real AY, const Standard_Real AZ, const Quantity_Color& AColor): Graphic3d_VertexC::Graphic3d_VertexC (const Standard_Real AX, const Standard_Real AY, const Standard_Real AZ, const Quantity_Color& AColor):
Graphic3d_Vertex (AX, AY, AZ), Graphic3d_Vertex (AX, AY, AZ),
MyColor (AColor) { MyColor (AColor) {
} }
// le :(APoint) car VertexC herite de Vertex et il faut appeler le // :(APoint) as VertexC inherits Vertex and it is necessary to call
// constructeur de Vertex avec APoint pour mettre a jour // constructor of Vertex with APoint to update fields MyX, MyY, MyZ.
// les fields MyX, MyY, MyZ.
Graphic3d_VertexC::Graphic3d_VertexC (const Graphic3d_Vertex& APoint, const Quantity_Color& AColor): Graphic3d_VertexC::Graphic3d_VertexC (const Graphic3d_Vertex& APoint, const Quantity_Color& AColor):
Graphic3d_Vertex (APoint), Graphic3d_Vertex (APoint),

Some files were not shown because too many files have changed in this diff Show More