return E1;
}
+#ifdef DRAW
//=======================================================================
//function : Bubble
//purpose : Sets in increasing order the sequence of vertices.
SV.Remove(1);
if ( V1.IsSame(V2)) {
- cout << "Vertex Confondus dans CutEdges" << endl;
+ std::cout << "Vertex Confondus dans CutEdges" << std::endl;
continue;
}
//-------------------------------------------
V1 = V2;
}
}
+#endif
+
//======================== END OF STATIC FUNCTIONS ============
#ifdef OCCT_DEBUG
ChFi3d_ResultChron(cl_total, t_total);
- cout<<endl;
- cout<<"Blend_PERFORM: temps total "<<t_total<<" s dont :"<<endl;
- cout<<"- ComputeCenters "<<t_center<<" s"<<endl;
- cout<<"- ComputeSurfaces "<<t_surface<<" s"<<endl;
- cout<<"----> MakeCurve "<<t_mkcurve<<" s"<<endl;
- if ( myBuildShape) cout<<"- ComputeShape "<<t_shape<<" s"<<endl;
+ std::cout<<std::endl;
+ std::cout<<"Blend_PERFORM: temps total "<<t_total<<" s dont :"<<std::endl;
+ std::cout<<"- ComputeCenters "<<t_center<<" s"<<std::endl;
+ std::cout<<"- ComputeSurfaces "<<t_surface<<" s"<<std::endl;
+ std::cout<<"----> MakeCurve "<<t_mkcurve<<" s"<<std::endl;
+ if ( myBuildShape) std::cout<<"- ComputeShape "<<t_shape<<" s"<<std::endl;
#endif
myDone = Standard_True;
}
BiTgte_ContactType Type = BiTgte_VertexVertex;
- switch (Type1) {
-
- case TopAbs_VERTEX:
- switch (Type2) {
- case TopAbs_VERTEX: Type = BiTgte_VertexVertex; break;
- case TopAbs_EDGE: Type = BiTgte_EdgeVertex; break;
- case TopAbs_FACE: Type = BiTgte_FaceVertex; break;
- default:
+ switch (Type1)
+ {
+ case TopAbs_VERTEX:
+ switch (Type2)
+ {
+ case TopAbs_VERTEX: Type = BiTgte_VertexVertex; break;
+ case TopAbs_EDGE: Type = BiTgte_EdgeVertex; break;
+ case TopAbs_FACE: Type = BiTgte_FaceVertex; break;
+ default:
+ break;
+ }
break;
- }
-
- case TopAbs_EDGE:
- switch (Type2) {
- case TopAbs_EDGE: Type = BiTgte_EdgeEdge; break;
- case TopAbs_FACE: Type = BiTgte_FaceEdge; break;
- default:
+
+ case TopAbs_EDGE:
+ switch (Type2)
+ {
+ case TopAbs_EDGE: Type = BiTgte_EdgeEdge; break;
+ case TopAbs_FACE: Type = BiTgte_FaceEdge; break;
+ default:
+ break;
+ }
break;
- }
-
- case TopAbs_FACE:
- switch (Type2) {
- case TopAbs_FACE: Type = BiTgte_FaceEdge; break;
+
+ case TopAbs_FACE:
+ switch (Type2)
+ {
+ case TopAbs_FACE: Type = BiTgte_FaceEdge; break;
+ default:
+ break;
+ }
+ break;
+
default:
break;
- }
- default:
- break;
}
-
+
return Type;
}
// ------------------------------------
TopTools_ListOfShape Let;
if ( AS.ShapeType() == TopAbs_FACE) {
- myAnalyse.Edges(TopoDS::Face(AS),BRepOffset_Tangent,Let);
+ myAnalyse.Edges(TopoDS::Face(AS),ChFiDS_Tangential,Let);
}
TopTools_ListIteratorOfListOfShape itlet(Let);
TopExp::Vertices (OTE,OV1,OV2);
TopTools_ListOfShape LE;
if (!EdgeTgt.IsBound(V1)) {
- myAnalyse.Edges(V1,BRepOffset_Tangent,LE);
+ myAnalyse.Edges(V1,ChFiDS_Tangential,LE);
const TopTools_ListOfShape& LA = myAnalyse.Ancestors(V1);
if (LE.Extent() == LA.Extent())
EdgeTgt.Bind(V1,OV1);
}
if (!EdgeTgt.IsBound(V2)) {
LE.Clear();
- myAnalyse.Edges(V2,BRepOffset_Tangent,LE);
+ myAnalyse.Edges(V2,ChFiDS_Tangential,LE);
const TopTools_ListOfShape& LA = myAnalyse.Ancestors(V2);
if (LE.Extent() == LA.Extent())
EdgeTgt.Bind(V2,OV2);
//--------------------------------------------------------
// Construction of tubes on edge.
//--------------------------------------------------------
- BRepOffset_Type OT = BRepOffset_Convex;
- if (myRadius < 0.) OT = BRepOffset_Concave;
+ ChFiDS_TypeOfConcavity OT = ChFiDS_Convex;
+ if (myRadius < 0.) OT = ChFiDS_Concave;
TopTools_IndexedDataMapOfShapeListOfShape Map;
TopExp::MapShapesAndAncestors(Co,TopAbs_EDGE,TopAbs_FACE,Map);
// Proceed with MakeLoops
TopTools_IndexedDataMapOfShapeListOfShape aDMVV;
- BRepOffset_Type OT = BRepOffset_Concave;
- if (myRadius < 0.) OT = BRepOffset_Convex;
+ ChFiDS_TypeOfConcavity OT = ChFiDS_Concave;
+ if (myRadius < 0.) OT = ChFiDS_Convex;
TopTools_ListOfShape LOF;
//it.Initialize(myFaces);
#ifdef OCCT_DEBUG
if ( myResult.IsNull()) {
- cout << " No Lines of Generated Centers" << endl;
+ std::cout << " No Lines of Generated Centers" << std::endl;
}
#ifdef DRAW
else {
BRep_Tool::CurveOnSurface(CurCutE,F2,f2,l2);
if ( PC1.IsNull() || PC2.IsNull()) {
#ifdef OCCT_DEBUG
- cout << "No PCurves on Intersections : No tubes constructed";
- cout << endl;
+ std::cout << "No PCurves on Intersections : No tubes constructed";
+ std::cout << std::endl;
#endif
continue;
}
if (MKE.IsDone())
E1 = MKE.Edge();
else {
- cout << "Edge Not Done" << endl;
+ std::cout << "Edge Not Done" << std::endl;
E1 = MKE.Edge();
}
if (MKE.IsDone())
E2 = MKE.Edge();
else {
- cout << "edge not Done" << endl;
+ std::cout << "edge not Done" << std::endl;
E2 = MKE.Edge();
}
KPartCurve3d(E2,PC2,GS2);
if (OF2isEdge) { // Update CutEdges.
exp.Next();
const TopoDS_Edge& EOnF2 = TopoDS::Edge(exp.Current());
- TopExp::Vertices(EOnF2,V1,V2);;
+ TopExp::Vertices(EOnF2,V1,V2);
gp_Pnt P1 = BRep_Tool::Pnt(V1);
Projector.Init(P1,GC2);
#endif
// end debug
- //
- // modify the tubes on edge for partition of edges.
- //
- Standard_Integer NbS = NbSurfaces();
- for (Standard_Integer i = 1; i <= NbS; i++) {
- const TopoDS_Shape& S1 = SupportShape1(i);
-
- if ( S1.ShapeType() == TopAbs_EDGE) {
- const TopoDS_Edge& E1 = TopoDS::Edge(S1);
- // it is required to replace in F the cut edges of E1, that
- // represent CutE
- const TopTools_ListOfShape& VonE = myCutEdges(E1);
- TopTools_ListOfShape NewE;
- CutEdge(E1,VonE,NewE);
-
- }
- }
-
-
TopTools_DataMapOfShapeShape Created;
TopTools_ListOfShape Empty;
#ifdef OCCT_DEBUG
if ( F1surBordLibre && F2surBordLibre) {
- cout << "Rejection : 2 tubes on free border are not intersected";
- cout << endl;
+ std::cout << "Rejection : 2 tubes on free border are not intersected";
+ std::cout << std::endl;
}
#endif
Standard_Boolean IsOnR2 = IsOnRestriction(V1,CurE,F2,E2);
#ifdef OCCT_DEBUG
if (IsOnR1 && IsOnR2) {
- cout << "Leave in the same tps on 2 faces, ";
- cout << "propagation only on free border";
- cout << endl;
+ std::cout << "Leave in the same tps on 2 faces, ";
+ std::cout << "propagation only on free border";
+ std::cout << std::endl;
}
#endif
if ( IsOnR1 ) {
// A priori, only facet is closed.
#ifdef OCCT_DEBUG
if (IsOnR1 && IsOnR2) {
- cout << "Leave with the same tps on 2 faces, ";
- cout << "propagate only if the border is free";
- cout << endl;
+ std::cout << "Leave with the same tps on 2 faces, ";
+ std::cout << "propagate only if the border is free";
+ std::cout << std::endl;
}
#endif
if ( IsOnR1) {