mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-04-03 17:56:21 +03:00
Fix the case SENR-22-003 "HLR - Different result between 691 and 720"
This commit is contained in:
jgv
parent
4dd6fb9a80
commit
762fa70875
@ -42,7 +42,7 @@ class HLRAlgo_Coincidence
|
||||
public:
|
||||
DEFINE_STANDARD_ALLOC
|
||||
|
||||
Standard_EXPORT HLRAlgo_Coincidence() :
|
||||
HLRAlgo_Coincidence() :
|
||||
myFE(0),
|
||||
myParam(0.),
|
||||
myStBef(TopAbs_IN),
|
||||
|
||||
@ -382,8 +382,8 @@ void HLRAlgo_PolyData::hideByOneTriangle (const HLRAlgo_BiPoint::PointsT& thePoi
|
||||
}
|
||||
#ifdef OCCT_DEBUG
|
||||
else if (HLRAlgo_PolyData_ERROR) {
|
||||
cout << " error : HLRAlgo_PolyData::HideByOneTriangle " << endl;
|
||||
cout << " ( more than 2 points )." << endl;
|
||||
std::cout << " error : HLRAlgo_PolyData::HideByOneTriangle " << std::endl;
|
||||
std::cout << " ( more than 2 points )." << std::endl;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
@ -470,7 +470,7 @@ void HLRAlgo_PolyData::hideByOneTriangle (const HLRAlgo_BiPoint::PointsT& thePoi
|
||||
if (d2 < 0) ad2 = -d2;
|
||||
pp = ad1 / ( ad1 + ad2 );
|
||||
if (TrFlags & HLRAlgo_PolyMask_EMskGrALin2)
|
||||
pdp = (thePoints.PntP1.X() + (thePoints.Pnt2.X() - thePoints.PntP1.X()) * pp - theTriangle.V2.X()) / aD.X();
|
||||
pdp = (thePoints.PntP1.X() + (thePoints.PntP2.X() - thePoints.PntP1.X()) * pp - theTriangle.V2.X()) / aD.X();
|
||||
else
|
||||
pdp = (thePoints.PntP1.Y() + (thePoints.PntP2.Y() - thePoints.PntP1.Y()) * pp - theTriangle.V2.Y()) / aD.Y();
|
||||
Standard_Boolean OutSideP = Standard_False;
|
||||
@ -524,8 +524,8 @@ void HLRAlgo_PolyData::hideByOneTriangle (const HLRAlgo_BiPoint::PointsT& thePoi
|
||||
}
|
||||
#ifdef OCCT_DEBUG
|
||||
else if (HLRAlgo_PolyData_ERROR) {
|
||||
cout << " error : HLRAlgo_PolyData::HideByOneTriangle " << endl;
|
||||
cout << " ( more than 2 points )." << endl;
|
||||
std::cout << " error : HLRAlgo_PolyData::HideByOneTriangle " << std::endl;
|
||||
std::cout << " ( more than 2 points )." << std::endl;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
@ -666,8 +666,8 @@ void HLRAlgo_PolyData::hideByOneTriangle (const HLRAlgo_BiPoint::PointsT& thePoi
|
||||
}
|
||||
#ifdef OCCT_DEBUG
|
||||
else if (HLRAlgo_PolyData_ERROR) {
|
||||
cout << " error : HLRAlgo_PolyData::HideByOneTriangle " << endl;
|
||||
cout << " ( more than 2 points )." << endl;
|
||||
std::cout << " error : HLRAlgo_PolyData::HideByOneTriangle " << std::endl;
|
||||
std::cout << " ( more than 2 points )." << std::endl;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
@ -326,7 +326,7 @@ HLRAlgo_PolyInternalData::AddNode (
|
||||
Nod3RValues.Normal = gp_XYZ(1., 0., 0.);
|
||||
#ifdef OCCT_DEBUG
|
||||
if (HLRAlgo_PolyInternalData_ERROR)
|
||||
cout << "HLRAlgo_PolyInternalData::AddNode" << endl;
|
||||
std::cout << "HLRAlgo_PolyInternalData::AddNode" << std::endl;
|
||||
#endif
|
||||
}
|
||||
return ip3;
|
||||
@ -415,8 +415,8 @@ HLRAlgo_PolyInternalData::UpdateLinks (const Standard_Integer ip1,
|
||||
myNbPISeg--;
|
||||
#ifdef OCCT_DEBUG
|
||||
if (HLRAlgo_PolyInternalData_ERROR) {
|
||||
cout << "HLRAlgo_PolyInternalData::UpdateLinks : segment error";
|
||||
cout << endl;
|
||||
std::cout << "HLRAlgo_PolyInternalData::UpdateLinks : segment error";
|
||||
std::cout << std::endl;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
@ -520,8 +520,8 @@ HLRAlgo_PolyInternalData::UpdateLinks (const Standard_Integer ip1,
|
||||
}
|
||||
#ifdef OCCT_DEBUG
|
||||
else if (HLRAlgo_PolyInternalData_ERROR) {
|
||||
cout << "HLRAlgo_PolyInternalData::UpdateLinks : triangle error ";
|
||||
cout << endl;
|
||||
std::cout << "HLRAlgo_PolyInternalData::UpdateLinks : triangle error ";
|
||||
std::cout << std::endl;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
@ -640,33 +640,33 @@ void HLRAlgo_PolyInternalData::Dump () const
|
||||
const Handle(HLRAlgo_PolyInternalNode)* pi = &PINod->ChangeValue(i);
|
||||
HLRAlgo_PolyInternalNode::NodeIndices& aNodIndices1 = (*pi)->Indices();
|
||||
HLRAlgo_PolyInternalNode::NodeData& Nod1RValues = (*pi)->Data();
|
||||
cout << "Node " << setw(6) << i << " : ";
|
||||
cout << setw(6) << aNodIndices1.NdSg;
|
||||
cout << setw(20)<< Nod1RValues.Point.X();
|
||||
cout << setw(20)<< Nod1RValues.Point.Y();
|
||||
cout << setw(20)<< Nod1RValues.Point.Z();
|
||||
cout << endl;
|
||||
std::cout << "Node " << std::setw(6) << i << " : ";
|
||||
std::cout << std::setw(6) << aNodIndices1.NdSg;
|
||||
std::cout << std::setw(20)<< Nod1RValues.Point.X();
|
||||
std::cout << std::setw(20)<< Nod1RValues.Point.Y();
|
||||
std::cout << std::setw(20)<< Nod1RValues.Point.Z();
|
||||
std::cout << std::endl;
|
||||
}
|
||||
|
||||
for (i = 1; i <= myNbPISeg; i++) {
|
||||
HLRAlgo_PolyInternalSegment* aSegIndices = &PISeg->ChangeValue(i);
|
||||
cout << "Segment " << setw(6) << i << " : ";
|
||||
cout << setw(6) << aSegIndices->LstSg1;
|
||||
cout << setw(6) << aSegIndices->LstSg2;
|
||||
cout << setw(6) << aSegIndices->NxtSg1;
|
||||
cout << setw(6) << aSegIndices->NxtSg2;
|
||||
cout << setw(6) << aSegIndices->Conex1;
|
||||
cout << setw(6) << aSegIndices->Conex2;
|
||||
cout << endl;
|
||||
std::cout << "Segment " << std::setw(6) << i << " : ";
|
||||
std::cout << std::setw(6) << aSegIndices->LstSg1;
|
||||
std::cout << std::setw(6) << aSegIndices->LstSg2;
|
||||
std::cout << std::setw(6) << aSegIndices->NxtSg1;
|
||||
std::cout << std::setw(6) << aSegIndices->NxtSg2;
|
||||
std::cout << std::setw(6) << aSegIndices->Conex1;
|
||||
std::cout << std::setw(6) << aSegIndices->Conex2;
|
||||
std::cout << std::endl;
|
||||
}
|
||||
|
||||
for (i = 1; i <= myNbTData; i++) {
|
||||
HLRAlgo_TriangleData& aTriangle = TData->ChangeValue(i);
|
||||
cout << "Triangle " << setw(6) << i << " : ";
|
||||
cout << setw(6) << aTriangle.Node1;
|
||||
cout << setw(6) << aTriangle.Node2;
|
||||
cout << setw(6) << aTriangle.Node3;
|
||||
cout << endl;
|
||||
std::cout << "Triangle " << std::setw(6) << i << " : ";
|
||||
std::cout << std::setw(6) << aTriangle.Node1;
|
||||
std::cout << std::setw(6) << aTriangle.Node2;
|
||||
std::cout << std::setw(6) << aTriangle.Node3;
|
||||
std::cout << std::endl;
|
||||
}
|
||||
}
|
||||
|
||||
@ -681,7 +681,7 @@ void HLRAlgo_PolyInternalData::IncTData(
|
||||
if (myNbTData >= myMxTData) {
|
||||
#ifdef OCCT_DEBUG
|
||||
if (HLRAlgo_PolyInternalData_TRACE)
|
||||
cout << "HLRAlgo_PolyInternalData::IncTData : " << myMxTData << endl;
|
||||
std::cout << "HLRAlgo_PolyInternalData::IncTData : " << myMxTData << std::endl;
|
||||
#endif
|
||||
Standard_Integer i,j,k;
|
||||
j = myMxTData;
|
||||
@ -720,7 +720,7 @@ void HLRAlgo_PolyInternalData::IncPISeg(
|
||||
if (myNbPISeg >= myMxPISeg) {
|
||||
#ifdef OCCT_DEBUG
|
||||
if (HLRAlgo_PolyInternalData_TRACE)
|
||||
cout << "HLRAlgo_PolyInternalData::IncPISeg : " << myMxPISeg << endl;
|
||||
std::cout << "HLRAlgo_PolyInternalData::IncPISeg : " << myMxPISeg << std::endl;
|
||||
#endif
|
||||
Standard_Integer i,j,k;
|
||||
j = myMxPISeg;
|
||||
@ -758,7 +758,7 @@ void HLRAlgo_PolyInternalData::IncPINod(
|
||||
if (myNbPINod >= myMxPINod) {
|
||||
#ifdef OCCT_DEBUG
|
||||
if (HLRAlgo_PolyInternalData_TRACE)
|
||||
cout << "HLRAlgo_PolyInternalData::IncPINod : " << myMxPINod << endl;
|
||||
std::cout << "HLRAlgo_PolyInternalData::IncPINod : " << myMxPINod << std::endl;
|
||||
#endif
|
||||
Standard_Integer i,j,k;
|
||||
j = myMxPINod;
|
||||
|
||||
@ -86,7 +86,6 @@ HLRBRep_ShapeToHLR.cxx
|
||||
HLRBRep_ShapeToHLR.hxx
|
||||
HLRBRep_SLProps.hxx
|
||||
HLRBRep_SLProps_0.cxx
|
||||
HLRBRep_SLPropsATool.cxx
|
||||
HLRBRep_SLPropsATool.hxx
|
||||
HLRBRep_SLPropsATool.lxx
|
||||
HLRBRep_Surface.cxx
|
||||
|
||||
@ -283,7 +283,7 @@ inline Handle(Geom2d_BezierCurve)
|
||||
HLRBRep_CurveTool::Bezier (const Standard_Address /*C*/)
|
||||
{
|
||||
#ifdef OCCT_DEBUG
|
||||
cout<<" HLRBRep_CurveTool::Bezier : Not Implemented "<<endl;
|
||||
std::cout<<" HLRBRep_CurveTool::Bezier : Not Implemented "<<std::endl;
|
||||
#endif
|
||||
//-- return(((HLRBRep_Curve *)C)->Bezier());
|
||||
return(0);
|
||||
@ -298,7 +298,7 @@ inline Handle(Geom2d_BSplineCurve)
|
||||
HLRBRep_CurveTool::BSpline (const Standard_Address /*C*/)
|
||||
{
|
||||
#ifdef OCCT_DEBUG
|
||||
cout<<" HLRBRep_CurveTool::BSpline : Not Implemented "<<endl;
|
||||
std::cout<<" HLRBRep_CurveTool::BSpline : Not Implemented "<<std::endl;
|
||||
#endif
|
||||
//-- return(((HLRBRep_Curve *)C)->BSpline());
|
||||
return(0);
|
||||
|
||||
@ -105,7 +105,7 @@ public:
|
||||
//-- ============================================================
|
||||
void SetDim(const Standard_Integer n) {
|
||||
#ifdef OCCT_DEBUG
|
||||
cout<<"\n@#@#@#@#@# SetDim "<<n<<endl;
|
||||
std::cout<<"\n@#@#@#@#@# SetDim "<<n<<std::endl;
|
||||
#endif
|
||||
if(UV)
|
||||
Destroy();
|
||||
@ -132,7 +132,7 @@ public:
|
||||
}
|
||||
//-- ============================================================
|
||||
~TableauRejection() {
|
||||
//-- cout<<"\n Destructeur TableauRejection"<<endl;
|
||||
//-- std::cout<<"\n Destructeur TableauRejection"<<std::endl;
|
||||
Destroy();
|
||||
}
|
||||
//-- ============================================================
|
||||
@ -173,7 +173,7 @@ public:
|
||||
}
|
||||
#ifdef OCCT_DEBUG
|
||||
else
|
||||
cout<<" IndUV ~~~~~~~~~~~~~~~~~~~~~~~~~~~~"<<endl;
|
||||
std::cout<<" IndUV ~~~~~~~~~~~~~~~~~~~~~~~~~~~~"<<std::endl;
|
||||
#endif
|
||||
}
|
||||
for(i=0;i<N;i++) {
|
||||
@ -182,7 +182,7 @@ public:
|
||||
UV[i]=NULL;
|
||||
}
|
||||
#ifdef OCCT_DEBUG
|
||||
else { cout<<" UV ~~~~~~~~~~~~~~~~~~~~~~~~~~~~"<<endl; }
|
||||
else { std::cout<<" UV ~~~~~~~~~~~~~~~~~~~~~~~~~~~~"<<std::endl; }
|
||||
#endif
|
||||
}
|
||||
|
||||
@ -211,7 +211,7 @@ public:
|
||||
//-- declaration de la Nv ligne de taille : ancienne taille + SIZEUV
|
||||
//--
|
||||
|
||||
//-- cout<<" \n alloc nbUV["<<i0<<"]="<<nbUV[i0];
|
||||
//-- std::cout<<" \n alloc nbUV["<<i0<<"]="<<nbUV[i0];
|
||||
|
||||
Standard_Real *NvLigneUV = (Standard_Real *) malloc((nbUV[i0]+SIZEUV)*sizeof(Standard_Real));
|
||||
Standard_Integer *NvLigneInd = (Standard_Integer *)malloc((nbUV[i0]+SIZEUV)*sizeof(Standard_Integer));
|
||||
@ -280,7 +280,7 @@ public:
|
||||
}
|
||||
//-- ============================================================
|
||||
void ResetTabBit(const Standard_Integer nbedgs) {
|
||||
//-- cout<<"\n ResetTabBit"<<endl;
|
||||
//-- std::cout<<"\n ResetTabBit"<<std::endl;
|
||||
if(TabBit) {
|
||||
for(Standard_Integer i=0;i<nbedgs;i++) {
|
||||
if(TabBit[i]) {
|
||||
@ -295,7 +295,7 @@ public:
|
||||
}
|
||||
//-- ============================================================
|
||||
void InitTabBit(const Standard_Integer nbedgs) {
|
||||
//-- cout<<"\n InitTabBit"<<endl;
|
||||
//-- std::cout<<"\n InitTabBit"<<std::endl;
|
||||
if(TabBit && nTabBit) {
|
||||
ResetTabBit(nTabBit);
|
||||
}
|
||||
@ -312,7 +312,7 @@ public:
|
||||
}
|
||||
//-- ============================================================
|
||||
void SetNoIntersection(Standard_Integer i0,Standard_Integer i1) {
|
||||
// cout<<" SetNoIntersection : "<<i0<<" "<<i1<<endl;
|
||||
// std::cout<<" SetNoIntersection : "<<i0<<" "<<i1<<std::endl;
|
||||
i0--;
|
||||
i1--;
|
||||
if(i0>i1) {
|
||||
@ -324,7 +324,7 @@ public:
|
||||
}
|
||||
//-- ============================================================
|
||||
Standard_Boolean NoIntersection(Standard_Integer i0,Standard_Integer i1) {
|
||||
// cout<<" ??NoIntersection : "<<i0<<" "<<i1<<" ";
|
||||
// std::cout<<" ??NoIntersection : "<<i0<<" "<<i1<<" ";
|
||||
i0--;
|
||||
i1--;
|
||||
if(i0>i1) {
|
||||
@ -333,10 +333,10 @@ public:
|
||||
Standard_Integer c=i1>>5;
|
||||
Standard_Integer o=i1 & 31;
|
||||
if(TabBit[i0][c] & Mask32[o]) {
|
||||
//-- cout<<" TRUE "<<endl;
|
||||
//-- std::cout<<" TRUE "<<std::endl;
|
||||
return(Standard_True);
|
||||
}
|
||||
//-- cout<<" FALSE "<<endl;
|
||||
//-- std::cout<<" FALSE "<<std::endl;
|
||||
return(Standard_False);
|
||||
}
|
||||
//-- ============================================================
|
||||
@ -418,7 +418,7 @@ HLRBRep_Data::HLRBRep_Data (const Standard_Integer NV,
|
||||
}
|
||||
|
||||
void HLRBRep_Data::Destroy() {
|
||||
//-- cout<<"\n HLRBRep_Data::~HLRBRep_Data()"<<endl;
|
||||
//-- std::cout<<"\n HLRBRep_Data::~HLRBRep_Data()"<<std::endl;
|
||||
((TableauRejection *)myReject)->Destroy();
|
||||
delete ((TableauRejection *)myReject);
|
||||
}
|
||||
@ -1190,7 +1190,7 @@ void HLRBRep_Data::NextInterference ()
|
||||
GetSingleIntersection(myLE,myFE,su,sv);
|
||||
if(su!=RealLast()) {
|
||||
myIntersector.SimulateOnePoint(myLEData,su,myFEData,sv);
|
||||
//-- cout<<"p";
|
||||
//-- std::cout<<"p";
|
||||
}
|
||||
else {
|
||||
myIntersector.Perform
|
||||
@ -1224,13 +1224,13 @@ void HLRBRep_Data::NextInterference ()
|
||||
else {
|
||||
myNbPoints = myNbSegments = 0;
|
||||
#ifdef OCCT_DEBUG
|
||||
cout << "HLRBRep_Data::NextInterference : ";
|
||||
std::cout << "HLRBRep_Data::NextInterference : ";
|
||||
if (myLE == myFE)
|
||||
cout << "Edge " << myLE
|
||||
<< " : Intersection not done" << endl;
|
||||
std::cout << "Edge " << myLE
|
||||
<< " : Intersection not done" << std::endl;
|
||||
else
|
||||
cout << "Edges " << myLE << " , " << myFE
|
||||
<< " : Intersection not done" << endl;
|
||||
std::cout << "Edges " << myLE << " , " << myFE
|
||||
<< " : Intersection not done" << std::endl;
|
||||
#endif
|
||||
}
|
||||
}
|
||||
@ -1246,7 +1246,7 @@ void HLRBRep_Data::NextInterference ()
|
||||
}
|
||||
}
|
||||
else {
|
||||
//-- cout<<"+";
|
||||
//-- std::cout<<"+";
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1391,7 +1391,7 @@ void HLRBRep_Data::EdgeState (const Standard_Real p1,
|
||||
stbef = TopAbs_OUT;
|
||||
staft = TopAbs_OUT;
|
||||
#ifdef OCCT_DEBUG
|
||||
cout << "HLRBRep_Data::EdgeState : undefined" << endl;
|
||||
std::cout << "HLRBRep_Data::EdgeState : undefined" << std::endl;
|
||||
#endif
|
||||
}
|
||||
}
|
||||
@ -1399,7 +1399,7 @@ void HLRBRep_Data::EdgeState (const Standard_Real p1,
|
||||
stbef = TopAbs_OUT;
|
||||
staft = TopAbs_OUT;
|
||||
#ifdef OCCT_DEBUG
|
||||
cout << "HLRBRep_Data::EdgeState : undefined" << endl;
|
||||
std::cout << "HLRBRep_Data::EdgeState : undefined" << std::endl;
|
||||
#endif
|
||||
}
|
||||
}
|
||||
@ -1464,8 +1464,8 @@ HLRBRep_Data::HidingStartLevel (const Standard_Integer E,
|
||||
Loop = Standard_False;
|
||||
else {
|
||||
#ifdef OCCT_DEBUG
|
||||
cout << "HLRBRep_Data::HidingStartLevel : ";
|
||||
cout << "Bad Parameter." << endl;
|
||||
std::cout << "HLRBRep_Data::HidingStartLevel : ";
|
||||
std::cout << "Bad Parameter." << std::endl;
|
||||
#endif
|
||||
}
|
||||
It.Next();
|
||||
@ -1548,9 +1548,9 @@ Standard_Boolean HLRBRep_Data::OrientOutLine (const Standard_Integer I, HLRBRep_
|
||||
gp_Vec Nm = mySLProps.Normal();
|
||||
if (curv == 0) {
|
||||
#ifdef OCCT_DEBUG
|
||||
cout << "HLRBRep_Data::OrientOutLine " << I;
|
||||
cout << " Edge " << myFE << " : ";
|
||||
cout << "CurvatureValue == 0." << endl;
|
||||
std::cout << "HLRBRep_Data::OrientOutLine " << I;
|
||||
std::cout << " Edge " << myFE << " : ";
|
||||
std::cout << "CurvatureValue == 0." << std::endl;
|
||||
#endif
|
||||
}
|
||||
if (curv > 0)
|
||||
@ -1561,9 +1561,9 @@ Standard_Boolean HLRBRep_Data::OrientOutLine (const Standard_Integer I, HLRBRep_
|
||||
Nm.Cross(Tg);
|
||||
if (Tg.Magnitude() < gp::Resolution()) {
|
||||
#ifdef OCCT_DEBUG
|
||||
cout << "HLRBRep_Data::OrientOutLine " << I;
|
||||
cout << " Edge " << myFE << " : ";
|
||||
cout << "Tg.Magnitude() == 0." << endl;
|
||||
std::cout << "HLRBRep_Data::OrientOutLine " << I;
|
||||
std::cout << " Edge " << myFE << " : ";
|
||||
std::cout << "Tg.Magnitude() == 0." << std::endl;
|
||||
#endif
|
||||
}
|
||||
if (myProj.Perspective())
|
||||
@ -1583,9 +1583,9 @@ Standard_Boolean HLRBRep_Data::OrientOutLine (const Standard_Integer I, HLRBRep_
|
||||
}
|
||||
else {
|
||||
#ifdef OCCT_DEBUG
|
||||
cout << "HLRBRep_Data::OrientOutLine " << I;
|
||||
cout << " Edge " << myFE << " : ";
|
||||
cout << "UVPoint not found, OutLine not Oriented" << endl;
|
||||
std::cout << "HLRBRep_Data::OrientOutLine " << I;
|
||||
std::cout << " Edge " << myFE << " : ";
|
||||
std::cout << "UVPoint not found, OutLine not Oriented" << std::endl;
|
||||
#endif
|
||||
}
|
||||
ed1.Used(Standard_True);
|
||||
@ -1644,9 +1644,9 @@ void HLRBRep_Data::OrientOthEdge (const Standard_Integer I,
|
||||
}
|
||||
#ifdef OCCT_DEBUG
|
||||
else {
|
||||
cout << "HLRBRep_Data::OrientOthEdge " << I;
|
||||
cout << " Edge " << myFE << " : ";
|
||||
cout << "UVPoint not found, Edge not Oriented" << endl;
|
||||
std::cout << "HLRBRep_Data::OrientOthEdge " << I;
|
||||
std::cout << " Edge " << myFE << " : ";
|
||||
std::cout << "UVPoint not found, Edge not Oriented" << std::endl;
|
||||
}
|
||||
#else
|
||||
(void)I; // avoid compiler warning
|
||||
@ -1863,7 +1863,7 @@ HLRBRep_Data::Classify (const Standard_Integer E,
|
||||
q2 = (q& 0x0000FFFF);
|
||||
printf("\nmot: %3d q1 = %+10d q2=%+10d Mask : %d",qwe+8,(q1>32768)? (32768-q1) : q1,(q2>32768)? (32768-q2) : q2,q&0x80008000);
|
||||
}
|
||||
cout<<endl;
|
||||
std::cout<<std::endl;
|
||||
}
|
||||
#endif
|
||||
*/
|
||||
|
||||
@ -235,7 +235,7 @@ void HLRBRep_Hider::Hide(const Standard_Integer FI,
|
||||
ILOn.Remove(It); break;
|
||||
case TopAbs_UNKNOWN :
|
||||
#ifdef OCCT_DEBUG
|
||||
cout << "UNKNOWN state staft" << endl;
|
||||
std::cout << "UNKNOWN state staft" << std::endl;
|
||||
#endif
|
||||
case TopAbs_ON :
|
||||
It.Next(); break;
|
||||
@ -249,7 +249,7 @@ void HLRBRep_Hider::Hide(const Standard_Integer FI,
|
||||
ILOn.Remove(It); break;
|
||||
case TopAbs_UNKNOWN :
|
||||
#ifdef OCCT_DEBUG
|
||||
cout << "UNKNOWN state stbef" << endl;
|
||||
std::cout << "UNKNOWN state stbef" << std::endl;
|
||||
#endif
|
||||
case TopAbs_ON :
|
||||
It.Next(); break;
|
||||
@ -279,7 +279,7 @@ void HLRBRep_Hider::Hide(const Standard_Integer FI,
|
||||
ILOn.Remove(It); break;
|
||||
case TopAbs_UNKNOWN :
|
||||
#ifdef OCCT_DEBUG
|
||||
cout << "UNKNOWN state after" << endl;
|
||||
std::cout << "UNKNOWN state after" << std::endl;
|
||||
#endif
|
||||
It.Next(); break;
|
||||
} break;
|
||||
@ -299,7 +299,7 @@ void HLRBRep_Hider::Hide(const Standard_Integer FI,
|
||||
Int.Transition(TopAbs_REVERSED); break;
|
||||
case TopAbs_UNKNOWN :
|
||||
#ifdef OCCT_DEBUG
|
||||
cout << "UNKNOWN state after" << endl;
|
||||
std::cout << "UNKNOWN state after" << std::endl;
|
||||
#endif
|
||||
break;
|
||||
}
|
||||
@ -317,13 +317,13 @@ void HLRBRep_Hider::Hide(const Standard_Integer FI,
|
||||
ILOn.Remove(It); break;
|
||||
case TopAbs_UNKNOWN :
|
||||
#ifdef OCCT_DEBUG
|
||||
cout << "UNKNOWN state after" << endl;
|
||||
std::cout << "UNKNOWN state after" << std::endl;
|
||||
#endif
|
||||
It.Next(); break;
|
||||
} break;
|
||||
case TopAbs_UNKNOWN :
|
||||
#ifdef OCCT_DEBUG
|
||||
cout << "UNKNOWN state stbef" << endl;
|
||||
std::cout << "UNKNOWN state stbef" << std::endl;
|
||||
#endif
|
||||
break;
|
||||
}
|
||||
@ -370,14 +370,14 @@ void HLRBRep_Hider::Hide(const Standard_Integer FI,
|
||||
{
|
||||
ToRemove.Append(Int.Intersection().Parameter());
|
||||
#ifdef OCCT_DEBUG
|
||||
cout<<"Two adjacent interferences with transition FORWARD"<<endl;
|
||||
std::cout<<"Two adjacent interferences with transition FORWARD"<<std::endl;
|
||||
#endif
|
||||
}
|
||||
else if (aTrans == TopAbs_REVERSED)
|
||||
{
|
||||
ToRemove.Append(PrevParam);
|
||||
#ifdef OCCT_DEBUG
|
||||
cout<<"Two adjacent interferences with transition REVERSED"<<endl;
|
||||
std::cout<<"Two adjacent interferences with transition REVERSED"<<std::endl;
|
||||
#endif
|
||||
}
|
||||
}
|
||||
@ -698,9 +698,9 @@ void HLRBRep_Hider::Hide(const Standard_Integer FI,
|
||||
|
||||
catch(Standard_Failure const& anException) {
|
||||
#ifdef OCCT_DEBUG
|
||||
cout << "An exception was catched when hiding edge " << E;
|
||||
cout << " by the face " << FI << endl;
|
||||
cout << anException << endl;
|
||||
std::cout << "An exception was catched when hiding edge " << E;
|
||||
std::cout << " by the face " << FI << std::endl;
|
||||
std::cout << anException << std::endl;
|
||||
#endif
|
||||
(void)anException;
|
||||
}
|
||||
|
||||
@ -114,9 +114,9 @@ void HLRBRep_InternalAlgo::Update ()
|
||||
catch(Standard_Failure const& anException) {
|
||||
if (myDebug)
|
||||
{
|
||||
cout << "An exception was catched when preparing the Shape " << i;
|
||||
cout << " and computing its OutLines " << endl;
|
||||
cout << anException << endl;
|
||||
std::cout << "An exception was catched when preparing the Shape " << i;
|
||||
std::cout << " and computing its OutLines " << std::endl;
|
||||
std::cout << anException << std::endl;
|
||||
}
|
||||
DS[i-1] = new HLRBRep_Data(0,0,0);
|
||||
dv = 0;
|
||||
@ -165,7 +165,7 @@ void HLRBRep_InternalAlgo::Update ()
|
||||
SB.Bounds(v1,v2,e1,e2,f1,f2);
|
||||
|
||||
for (Standard_Integer e = e1; e <= e2; e++) {
|
||||
HLRBRep_EdgeData ed = aEDataArray.ChangeValue(e);
|
||||
HLRBRep_EdgeData& ed = aEDataArray.ChangeValue(e);
|
||||
HLRAlgo::DecodeMinMax(ed.MinMax(), TheMin, TheMax);
|
||||
if (FirstTime) {
|
||||
FirstTime = Standard_False;
|
||||
@ -307,7 +307,7 @@ void HLRBRep_InternalAlgo::InitEdgeStatus ()
|
||||
Standard_Integer nf = myDS->NbFaces();
|
||||
|
||||
for (Standard_Integer e = 1; e <= ne; e++) {
|
||||
HLRBRep_EdgeData ed = aEDataArray.ChangeValue(e);
|
||||
HLRBRep_EdgeData& ed = aEDataArray.ChangeValue(e);
|
||||
if (ed.Selected()) ed.Status().ShowAll();
|
||||
}
|
||||
// for (Standard_Integer f = 1; f <= nf; f++) {
|
||||
@ -368,7 +368,7 @@ void HLRBRep_InternalAlgo::Select ()
|
||||
Standard_Integer nf = myDS->NbFaces();
|
||||
|
||||
for (Standard_Integer e = 1; e <= ne; e++) {
|
||||
HLRBRep_EdgeData ed = aEDataArray.ChangeValue(e);
|
||||
HLRBRep_EdgeData& ed = aEDataArray.ChangeValue(e);
|
||||
ed.Selected(Standard_True);
|
||||
}
|
||||
|
||||
@ -556,7 +556,7 @@ void HLRBRep_InternalAlgo::PartialHide ()
|
||||
Standard_Integer i,n = myShapes.Length();
|
||||
|
||||
if (myDebug)
|
||||
cout << " Partial hiding" << endl << endl;
|
||||
std::cout << " Partial hiding" << std::endl << std::endl;
|
||||
|
||||
for (i = 1; i <= n; i++)
|
||||
Hide(i);
|
||||
@ -576,7 +576,7 @@ void HLRBRep_InternalAlgo::Hide ()
|
||||
Standard_Integer i,j,n = myShapes.Length();
|
||||
|
||||
if (myDebug)
|
||||
cout << " Total hiding" << endl;
|
||||
std::cout << " Total hiding" << std::endl;
|
||||
|
||||
for (i = 1; i <= n; i++)
|
||||
Hide(i);
|
||||
@ -602,7 +602,7 @@ void HLRBRep_InternalAlgo::Hide (const Standard_Integer I)
|
||||
"HLRBRep_InternalAlgo::Hide : unknown Shape");
|
||||
|
||||
if (myDebug)
|
||||
cout << " hiding the shape " << I << " by itself" << endl;
|
||||
std::cout << " hiding the shape " << I << " by itself" << std::endl;
|
||||
|
||||
Select(I);
|
||||
InitEdgeStatus();
|
||||
@ -643,8 +643,8 @@ void HLRBRep_InternalAlgo::Hide (const Standard_Integer I,
|
||||
((MinMaxShBJ->Max[6] - MinMaxShBI->Min[6]) & 0x80008000) == 0 &&
|
||||
((MinMaxShBJ->Max[7] - MinMaxShBI->Min[7]) & 0x80008000) == 0) {
|
||||
if (myDebug) {
|
||||
cout << " hiding the shape " << I;
|
||||
cout << " by the shape : " << J << endl;
|
||||
std::cout << " hiding the shape " << I;
|
||||
std::cout << " by the shape : " << J << std::endl;
|
||||
}
|
||||
SelectEdge(I);
|
||||
SelectFace(J);
|
||||
@ -717,17 +717,17 @@ void HLRBRep_InternalAlgo::HideSelected (const Standard_Integer I,
|
||||
|
||||
if (myDebug)
|
||||
{
|
||||
cout << endl;
|
||||
cout << "Vertices : " << setw(5) << myDS->NbVertices() << endl;
|
||||
cout << "Edges : " << setw(5) << myDS->NbEdges() << " , ";
|
||||
cout << "Selected : " << setw(5) << nbSelEdges << " , ";
|
||||
cout << "Visibles : " << setw(5) << nbVisEdges << endl;
|
||||
cout << "Faces : " << setw(5) << myDS->NbFaces() << " , ";
|
||||
cout << "Selected : " << setw(5) << nbSelFaces << " , ";
|
||||
cout << "Simple : " << setw(5) << nbFSimp << endl;
|
||||
std::cout << std::endl;
|
||||
std::cout << "Vertices : " << std::setw(5) << myDS->NbVertices() << std::endl;
|
||||
std::cout << "Edges : " << std::setw(5) << myDS->NbEdges() << " , ";
|
||||
std::cout << "Selected : " << std::setw(5) << nbSelEdges << " , ";
|
||||
std::cout << "Visibles : " << std::setw(5) << nbVisEdges << std::endl;
|
||||
std::cout << "Faces : " << std::setw(5) << myDS->NbFaces() << " , ";
|
||||
std::cout << "Selected : " << std::setw(5) << nbSelFaces << " , ";
|
||||
std::cout << "Simple : " << std::setw(5) << nbFSimp << std::endl;
|
||||
if (SideFace)
|
||||
cout << "Side : " << setw(5) << nbFSide << " , ";
|
||||
cout << "Cachantes : " << setw(5) << nbCache << endl << endl;
|
||||
std::cout << "Side : " << std::setw(5) << nbFSide << " , ";
|
||||
std::cout << "Cachantes : " << std::setw(5) << nbCache << std::endl << std::endl;
|
||||
}
|
||||
}
|
||||
|
||||
@ -748,13 +748,13 @@ void HLRBRep_InternalAlgo::HideSelected (const Standard_Integer I,
|
||||
if(++QWE>QWEQWE) {
|
||||
QWE=0;
|
||||
if (myDebug)
|
||||
cout<<"*";
|
||||
std::cout<<"*";
|
||||
}
|
||||
}
|
||||
else {
|
||||
if (myDebug && HLRBRep_InternalAlgo_TRACE) {
|
||||
j++;
|
||||
cout << " OwnHiding " << j << " of face : " << f << endl;
|
||||
std::cout << " OwnHiding " << j << " of face : " << f << std::endl;
|
||||
}
|
||||
}
|
||||
Cache.OwnHiding(f);
|
||||
@ -867,7 +867,7 @@ void HLRBRep_InternalAlgo::HideSelected (const Standard_Integer I,
|
||||
if(HLRBRep_InternalAlgo_TRACE10 && HLRBRep_InternalAlgo_TRACE==Standard_False) {
|
||||
if(++QWE>QWEQWE) {
|
||||
if (myDebug)
|
||||
cout<<".";
|
||||
std::cout<<".";
|
||||
QWE=0;
|
||||
}
|
||||
}
|
||||
@ -892,22 +892,22 @@ void HLRBRep_InternalAlgo::HideSelected (const Standard_Integer I,
|
||||
nbFSimp++;
|
||||
}
|
||||
|
||||
cout << "\n";
|
||||
cout << "Simple Faces : ";
|
||||
cout << nbFSimp << "\n";
|
||||
cout << "Intersections calculees : ";
|
||||
cout << nbCal2Intersection << "\n";
|
||||
cout << "Intersections Ok : ";
|
||||
cout << nbOkIntersection << "\n";
|
||||
cout << "Points : ";
|
||||
cout << nbPtIntersection << "\n";
|
||||
cout << "Segments : ";
|
||||
cout << nbSegIntersection << "\n";
|
||||
cout << "Classification : ";
|
||||
cout << nbClassification << "\n";
|
||||
cout << "Intersections curve-surface : ";
|
||||
cout << nbCal3Intersection << "\n";
|
||||
cout << endl << endl;
|
||||
std::cout << "\n";
|
||||
std::cout << "Simple Faces : ";
|
||||
std::cout << nbFSimp << "\n";
|
||||
std::cout << "Intersections calculees : ";
|
||||
std::cout << nbCal2Intersection << "\n";
|
||||
std::cout << "Intersections Ok : ";
|
||||
std::cout << nbOkIntersection << "\n";
|
||||
std::cout << "Points : ";
|
||||
std::cout << nbPtIntersection << "\n";
|
||||
std::cout << "Segments : ";
|
||||
std::cout << nbSegIntersection << "\n";
|
||||
std::cout << "Classification : ";
|
||||
std::cout << nbClassification << "\n";
|
||||
std::cout << "Intersections curve-surface : ";
|
||||
std::cout << nbCal3Intersection << "\n";
|
||||
std::cout << std::endl << std::endl;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
@ -159,7 +159,7 @@ public:
|
||||
|
||||
static Standard_Integer NbSamples (const gp_Lin& C, const Standard_Real U0, const Standard_Real U1);
|
||||
|
||||
Standard_EXPORT static void SamplePars (const gp_Lin& C, const Standard_Real U0, const Standard_Real U1, const Standard_Real Defl, const Standard_Integer NbMin, Handle(TColStd_HArray1OfReal)& Pars);
|
||||
static void SamplePars (const gp_Lin& C, const Standard_Real U0, const Standard_Real U1, const Standard_Real Defl, const Standard_Integer NbMin, Handle(TColStd_HArray1OfReal)& Pars);
|
||||
|
||||
|
||||
|
||||
|
||||
@ -438,13 +438,20 @@ void HLRBRep_PolyAlgo::StoreShell (const TopoDS_Shape& Shape,
|
||||
PD (f) = new HLRAlgo_PolyData();
|
||||
psd->PolyData().ChangeValue(iFace) = PD(f);
|
||||
PID(f) = new HLRAlgo_PolyInternalData(nbN,nbT);
|
||||
Handle(HLRAlgo_PolyInternalData)& pid =
|
||||
*(Handle(HLRAlgo_PolyInternalData)*)&(PID(f));
|
||||
Handle(Geom_Surface) S = BRep_Tool::Surface(F);
|
||||
if (S->DynamicType() == STANDARD_TYPE(Geom_RectangularTrimmedSurface))
|
||||
S = Handle(Geom_RectangularTrimmedSurface)::DownCast(S)->BasisSurface();
|
||||
GeomAdaptor_Surface AS(S);
|
||||
pid->Planar(AS.GetType() == GeomAbs_Plane);
|
||||
Handle(HLRAlgo_PolyInternalData)& pid = *(Handle(HLRAlgo_PolyInternalData)*)&(PID(f));
|
||||
if (Handle(Geom_Surface) S = BRep_Tool::Surface(F))
|
||||
{
|
||||
if (Handle(Geom_RectangularTrimmedSurface) aRectTrimSurf = Handle(Geom_RectangularTrimmedSurface)::DownCast(S))
|
||||
{
|
||||
S = aRectTrimSurf->BasisSurface();
|
||||
}
|
||||
GeomAdaptor_Surface AS(S);
|
||||
pid->Planar(AS.GetType() == GeomAbs_Plane);
|
||||
}
|
||||
else
|
||||
{
|
||||
pid->Planar (false);
|
||||
}
|
||||
HLRAlgo_Array1OfTData* TData = &pid->TData();
|
||||
HLRAlgo_Array1OfPISeg* PISeg = &pid->PISeg();
|
||||
HLRAlgo_Array1OfPINod* PINod = &pid->PINod();
|
||||
@ -501,8 +508,8 @@ void HLRBRep_PolyAlgo::StoreShell (const TopoDS_Shape& Shape,
|
||||
}
|
||||
#ifdef OCCT_DEBUG
|
||||
else if (DoError) {
|
||||
cout << " HLRBRep_PolyAlgo::StoreShell : Face ";
|
||||
cout << f << " non triangulated" << endl;
|
||||
std::cout << " HLRBRep_PolyAlgo::StoreShell : Face ";
|
||||
std::cout << f << " non triangulated" << std::endl;
|
||||
}
|
||||
#endif
|
||||
NT = &(((HLRAlgo_Array1OfTData*)TData)->ChangeValue(1));
|
||||
@ -527,8 +534,8 @@ void HLRBRep_PolyAlgo::StoreShell (const TopoDS_Shape& Shape,
|
||||
}
|
||||
#ifdef OCCT_DEBUG
|
||||
else if (DoError) {
|
||||
cout << "HLRBRep_PolyAlgo::StoreShell : Face ";
|
||||
cout << f << " deja stockee" << endl;
|
||||
std::cout << "HLRBRep_PolyAlgo::StoreShell : Face ";
|
||||
std::cout << f << " deja stockee" << std::endl;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
@ -656,8 +663,8 @@ Normal (const Standard_Integer iNode,
|
||||
Nod1RValues.Normal = gp_XYZ(1., 0., 0.);
|
||||
#ifdef OCCT_DEBUG
|
||||
if (DoError) {
|
||||
cout << "HLRBRep_PolyAlgo::Normal : AverageNormal error";
|
||||
cout << endl;
|
||||
std::cout << "HLRBRep_PolyAlgo::Normal : AverageNormal error";
|
||||
std::cout << std::endl;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
@ -733,8 +740,8 @@ HLRBRep_PolyAlgo::AverageNormal(const Standard_Integer iNode,
|
||||
OK = Standard_False;
|
||||
#ifdef OCCT_DEBUG
|
||||
if (DoError) {
|
||||
cout << "HLRAlgo_PolyInternalData:: inverted normals on ";
|
||||
cout << "node " << iNode << endl;
|
||||
std::cout << "HLRAlgo_PolyInternalData:: inverted normals on ";
|
||||
std::cout << "node " << iNode << std::endl;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
@ -875,8 +882,8 @@ InitBiPointsWithConnexity (const Standard_Integer e,
|
||||
else if (aNode12Indices->Edg2 == e) U2 = Nod12RValues->PCu2;
|
||||
#ifdef OCCT_DEBUG
|
||||
else {
|
||||
cout << " HLRBRep_PolyAlgo::InitBiPointsWithConnexity : ";
|
||||
cout << "Parameter error on Node " << i1p2 << endl;
|
||||
std::cout << " HLRBRep_PolyAlgo::InitBiPointsWithConnexity : ";
|
||||
std::cout << "Parameter error on Node " << i1p2 << std::endl;
|
||||
}
|
||||
#endif
|
||||
aNode12Indices->Flag |= NMsk_Edge;
|
||||
@ -906,10 +913,10 @@ InitBiPointsWithConnexity (const Standard_Integer e,
|
||||
if (Nod11RValues->Normal.X()*Nod12RValues->Normal.X() +
|
||||
Nod11RValues->Normal.Y()*Nod12RValues->Normal.Y() +
|
||||
Nod11RValues->Normal.Z()*Nod12RValues->Normal.Z() < 0) {
|
||||
cout << " HLRBRep_PolyAlgo::InitBiPointsWithConnexity : ";
|
||||
cout << "Too big angle between " << i1p1 << setw(6);
|
||||
cout << " and " << i1p2 << setw(6);
|
||||
cout << " in face " << i1 << endl;
|
||||
std::cout << " HLRBRep_PolyAlgo::InitBiPointsWithConnexity : ";
|
||||
std::cout << "Too big angle between " << i1p1 << std::setw(6);
|
||||
std::cout << " and " << i1p2 << std::setw(6);
|
||||
std::cout << " in face " << i1 << std::endl;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
@ -927,8 +934,8 @@ InitBiPointsWithConnexity (const Standard_Integer e,
|
||||
else if (aNode12Indices->Edg2 == e) U2 = Nod12RValues->PCu2;
|
||||
#ifdef OCCT_DEBUG
|
||||
else {
|
||||
cout << " HLRBRep_PolyAlgo::InitBiPointsWithConnexity : ";
|
||||
cout << "Parameter error on Node " << i1p2 << endl;
|
||||
std::cout << " HLRBRep_PolyAlgo::InitBiPointsWithConnexity : ";
|
||||
std::cout << "Parameter error on Node " << i1p2 << std::endl;
|
||||
}
|
||||
#endif
|
||||
aNode12Indices->Flag |= NMsk_Edge;
|
||||
@ -945,8 +952,8 @@ InitBiPointsWithConnexity (const Standard_Integer e,
|
||||
}
|
||||
#ifdef OCCT_DEBUG
|
||||
else if (DoError) {
|
||||
cout << "HLRBRep_PolyAlgo::InitBiPointsWithConnexity : Edge ";
|
||||
cout << e << " connex 1 sans PolygonOnTriangulation" << endl;
|
||||
std::cout << "HLRBRep_PolyAlgo::InitBiPointsWithConnexity : Edge ";
|
||||
std::cout << e << " connex 1 sans PolygonOnTriangulation" << std::endl;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
@ -1041,8 +1048,8 @@ InitBiPointsWithConnexity (const Standard_Integer e,
|
||||
else if (aNode12Indices->Edg2 == e) U2 = Nod12RValues->PCu2;
|
||||
#ifdef OCCT_DEBUG
|
||||
else {
|
||||
cout << " HLRBRep_PolyAlgo::InitBiPointsWithConnexity : ";
|
||||
cout << "Parameter error on Node " << i1p2 << endl;
|
||||
std::cout << " HLRBRep_PolyAlgo::InitBiPointsWithConnexity : ";
|
||||
std::cout << "Parameter error on Node " << i1p2 << std::endl;
|
||||
}
|
||||
#endif
|
||||
aNode12Indices->Flag |= NMsk_Edge;
|
||||
@ -1085,18 +1092,18 @@ InitBiPointsWithConnexity (const Standard_Integer e,
|
||||
if (Nod11RValues->Normal.X()*Nod12RValues->Normal.X() +
|
||||
Nod11RValues->Normal.Y()*Nod12RValues->Normal.Y() +
|
||||
Nod11RValues->Normal.Z()*Nod12RValues->Normal.Z() < 0) {
|
||||
cout << " HLRBRep_PolyAlgo::InitBiPointsWithConnexity : ";
|
||||
cout << "To big angle between " << i1p1 << setw(6);
|
||||
cout << " and " << i1p2 << setw(6);
|
||||
cout << " in face " << i1 << endl;
|
||||
std::cout << " HLRBRep_PolyAlgo::InitBiPointsWithConnexity : ";
|
||||
std::cout << "To big angle between " << i1p1 << std::setw(6);
|
||||
std::cout << " and " << i1p2 << std::setw(6);
|
||||
std::cout << " in face " << i1 << std::endl;
|
||||
}
|
||||
if (Nod21RValues->Normal.X()*Nod22RValues->Normal.X() +
|
||||
Nod21RValues->Normal.Y()*Nod22RValues->Normal.Y() +
|
||||
Nod21RValues->Normal.Z()*Nod22RValues->Normal.Z() < 0) {
|
||||
cout << " HLRBRep_PolyAlgo::InitBiPointsWithConnexity : ";
|
||||
cout << "To big angle between " << i2p1 << setw(6);
|
||||
cout << " and " << i2p2 << setw(6);
|
||||
cout<< " in face " << i2 << endl;
|
||||
std::cout << " HLRBRep_PolyAlgo::InitBiPointsWithConnexity : ";
|
||||
std::cout << "To big angle between " << i2p1 << std::setw(6);
|
||||
std::cout << " and " << i2p2 << std::setw(6);
|
||||
std::cout<< " in face " << i2 << std::endl;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
@ -1114,8 +1121,8 @@ InitBiPointsWithConnexity (const Standard_Integer e,
|
||||
else if (aNode12Indices->Edg2 == e) U2 = Nod12RValues->PCu2;
|
||||
#ifdef OCCT_DEBUG
|
||||
else {
|
||||
cout << " HLRBRep_PolyAlgo::InitBiPointsWithConnexity : ";
|
||||
cout << "Parameter error on Node " << i1p2 << endl;
|
||||
std::cout << " HLRBRep_PolyAlgo::InitBiPointsWithConnexity : ";
|
||||
std::cout << "Parameter error on Node " << i1p2 << std::endl;
|
||||
}
|
||||
#endif
|
||||
aNode12Indices->Flag |= NMsk_Edge;
|
||||
@ -1136,8 +1143,8 @@ InitBiPointsWithConnexity (const Standard_Integer e,
|
||||
}
|
||||
#ifdef OCCT_DEBUG
|
||||
else if (DoError) {
|
||||
cout << "HLRBRep_PolyAlgo::InitBiPointsWithConnexity : Edge ";
|
||||
cout << e << " connect 2 without PolygonOnTriangulation" << endl;
|
||||
std::cout << "HLRBRep_PolyAlgo::InitBiPointsWithConnexity : Edge ";
|
||||
std::cout << e << " connect 2 without PolygonOnTriangulation" << std::endl;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
@ -1198,8 +1205,8 @@ InitBiPointsWithConnexity (const Standard_Integer e,
|
||||
}
|
||||
#ifdef OCCT_DEBUG
|
||||
else if (DoError) {
|
||||
cout << "HLRBRep_PolyAlgo::InitBiPointsWithConnexity : Edge ";
|
||||
cout << e << " Isolated, without Polygone 3D" << endl;
|
||||
std::cout << "HLRBRep_PolyAlgo::InitBiPointsWithConnexity : Edge ";
|
||||
std::cout << e << " Isolated, without Polygone 3D" << std::endl;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
@ -1489,8 +1496,8 @@ MoveOrInsertPoint (HLRAlgo_ListOfBPoint& List,
|
||||
else if (Nod11Indices.Edg2 == e) Nod11RValues.PCu2 = U3;
|
||||
#ifdef OCCT_DEBUG
|
||||
else {
|
||||
cout << " HLRBRep_PolyAlgo::MoveOrInsertPoint : ";
|
||||
cout << "Parameter error on Node " << i1p1 << endl;
|
||||
std::cout << " HLRBRep_PolyAlgo::MoveOrInsertPoint : ";
|
||||
std::cout << "Parameter error on Node " << i1p1 << std::endl;
|
||||
}
|
||||
#endif
|
||||
Nod11RValues.Scal = 0;
|
||||
@ -1521,8 +1528,8 @@ MoveOrInsertPoint (HLRAlgo_ListOfBPoint& List,
|
||||
else if (Nod12Indices.Edg2 == e) Nod12RValues.PCu2 = U3;
|
||||
#ifdef OCCT_DEBUG
|
||||
else {
|
||||
cout << " HLRBRep_PolyAlgo::MoveOrInsertPoint : ";
|
||||
cout << "Parameter error on Node " << i1p2 << endl;
|
||||
std::cout << " HLRBRep_PolyAlgo::MoveOrInsertPoint : ";
|
||||
std::cout << "Parameter error on Node " << i1p2 << std::endl;
|
||||
}
|
||||
#endif
|
||||
Nod12RValues.Scal = 0;
|
||||
@ -1644,8 +1651,8 @@ MoveOrInsertPoint (HLRAlgo_ListOfBPoint& List,
|
||||
else if (Nod11Indices.Edg2 == e) Nod11RValues.PCu2 = U3;
|
||||
#ifdef OCCT_DEBUG
|
||||
else {
|
||||
cout << " HLRBRep_PolyAlgo::MoveOrInsertPoint : ";
|
||||
cout << "Parameter error on Node " << i1p1 << endl;
|
||||
std::cout << " HLRBRep_PolyAlgo::MoveOrInsertPoint : ";
|
||||
std::cout << "Parameter error on Node " << i1p1 << std::endl;
|
||||
}
|
||||
#endif
|
||||
Nod11RValues.Scal = 0;
|
||||
@ -1656,8 +1663,8 @@ MoveOrInsertPoint (HLRAlgo_ListOfBPoint& List,
|
||||
else if (Nod21Indices.Edg2 == e) Nod21RValues.PCu2 = U3;
|
||||
#ifdef OCCT_DEBUG
|
||||
else {
|
||||
cout << " HLRBRep_PolyAlgo::MoveOrInsertPoint : ";
|
||||
cout << "Parameter error on Node " << i2p1 << endl;
|
||||
std::cout << " HLRBRep_PolyAlgo::MoveOrInsertPoint : ";
|
||||
std::cout << "Parameter error on Node " << i2p1 << std::endl;
|
||||
}
|
||||
#endif
|
||||
Nod21RValues.Scal = 0;
|
||||
@ -1693,8 +1700,8 @@ MoveOrInsertPoint (HLRAlgo_ListOfBPoint& List,
|
||||
else if (Nod12Indices.Edg2 == e) Nod12RValues.PCu2 = U3;
|
||||
#ifdef OCCT_DEBUG
|
||||
else {
|
||||
cout << " HLRBRep_PolyAlgo::MoveOrInsertPoint : ";
|
||||
cout << "Parameter error on Node " << i1p2 << endl;
|
||||
std::cout << " HLRBRep_PolyAlgo::MoveOrInsertPoint : ";
|
||||
std::cout << "Parameter error on Node " << i1p2 << std::endl;
|
||||
}
|
||||
#endif
|
||||
Nod12RValues.Scal = 0;
|
||||
@ -1705,8 +1712,8 @@ MoveOrInsertPoint (HLRAlgo_ListOfBPoint& List,
|
||||
else if (Nod22Indices.Edg2 == e) Nod22RValues.PCu2 = U3;
|
||||
#ifdef OCCT_DEBUG
|
||||
else {
|
||||
cout << " HLRBRep_PolyAlgo::MoveOrInsertPoint : ";
|
||||
cout << "Parameter error on Node " << i2p2 << endl;
|
||||
std::cout << " HLRBRep_PolyAlgo::MoveOrInsertPoint : ";
|
||||
std::cout << "Parameter error on Node " << i2p2 << std::endl;
|
||||
}
|
||||
#endif
|
||||
Nod22RValues.Scal = 0;
|
||||
@ -1853,8 +1860,8 @@ MoveOrInsertPoint (HLRAlgo_ListOfBPoint& List,
|
||||
else if (Nod11Indices.Edg2 == e) Nod11RValues.PCu2 = U3;
|
||||
#ifdef OCCT_DEBUG
|
||||
else {
|
||||
cout << " HLRBRep_PolyAlgo::MoveOrInsertPoint : ";
|
||||
cout << "Parameter error on Node " << i1p1 << endl;
|
||||
std::cout << " HLRBRep_PolyAlgo::MoveOrInsertPoint : ";
|
||||
std::cout << "Parameter error on Node " << i1p1 << std::endl;
|
||||
}
|
||||
#endif
|
||||
Nod11RValues.Scal = 0;
|
||||
@ -1865,8 +1872,8 @@ MoveOrInsertPoint (HLRAlgo_ListOfBPoint& List,
|
||||
else if (Nod21Indices.Edg2 == e) Nod21RValues.PCu2 = U3;
|
||||
#ifdef OCCT_DEBUG
|
||||
else {
|
||||
cout << " HLRBRep_PolyAlgo::MoveOrInsertPoint : ";
|
||||
cout << "Parameter error on Node " << i2p1 << endl;
|
||||
std::cout << " HLRBRep_PolyAlgo::MoveOrInsertPoint : ";
|
||||
std::cout << "Parameter error on Node " << i2p1 << std::endl;
|
||||
}
|
||||
#endif
|
||||
Nod21RValues.Scal = 0;
|
||||
@ -1902,8 +1909,8 @@ MoveOrInsertPoint (HLRAlgo_ListOfBPoint& List,
|
||||
else if (Nod12Indices.Edg2 == e) Nod12RValues.PCu2 = U4;
|
||||
#ifdef OCCT_DEBUG
|
||||
else {
|
||||
cout << " HLRBRep_PolyAlgo::MoveOrInsertPoint : ";
|
||||
cout << "Parameter error on Node " << i1p2 << endl;
|
||||
std::cout << " HLRBRep_PolyAlgo::MoveOrInsertPoint : ";
|
||||
std::cout << "Parameter error on Node " << i1p2 << std::endl;
|
||||
}
|
||||
#endif
|
||||
Nod12RValues.Scal = 0;
|
||||
@ -1914,8 +1921,8 @@ MoveOrInsertPoint (HLRAlgo_ListOfBPoint& List,
|
||||
else if (Nod22Indices.Edg2 == e) Nod22RValues.PCu2 = U4;
|
||||
#ifdef OCCT_DEBUG
|
||||
else {
|
||||
cout << " HLRBRep_PolyAlgo::MoveOrInsertPoint : ";
|
||||
cout << "Parameter error on Node " << i2p2 << endl;
|
||||
std::cout << " HLRBRep_PolyAlgo::MoveOrInsertPoint : ";
|
||||
std::cout << "Parameter error on Node " << i2p2 << std::endl;
|
||||
}
|
||||
#endif
|
||||
Nod22RValues.Scal = 0;
|
||||
@ -2078,9 +2085,9 @@ HLRBRep_PolyAlgo::InsertOnOutLine (TColStd_Array1OfTransient& PID)
|
||||
|
||||
#ifdef OCCT_DEBUG
|
||||
if (DoTrace) {
|
||||
cout << " InsertOnOutLine : NbTData " << (*pid)->NbTData() << endl;
|
||||
cout << " InsertOnOutLine : NbPISeg " << (*pid)->NbPISeg() << endl;
|
||||
cout << " InsertOnOutLine : NbPINod " << (*pid)->NbPINod() << endl;
|
||||
std::cout << " InsertOnOutLine : NbTData " << (*pid)->NbTData() << std::endl;
|
||||
std::cout << " InsertOnOutLine : NbPISeg " << (*pid)->NbPISeg() << std::endl;
|
||||
std::cout << " InsertOnOutLine : NbPINod " << (*pid)->NbPINod() << std::endl;
|
||||
}
|
||||
#endif
|
||||
|
||||
@ -2162,9 +2169,9 @@ HLRBRep_PolyAlgo::InsertOnOutLine (TColStd_Array1OfTransient& PID)
|
||||
|
||||
#ifdef OCCT_DEBUG
|
||||
if (DoTrace) {
|
||||
cout << " InsertOnOutLine : NbTData " << (*pid)->NbTData() << endl;
|
||||
cout << " InsertOnOutLine : NbPISeg " << (*pid)->NbPISeg() << endl;
|
||||
cout << " InsertOnOutLine : NbPINod " << (*pid)->NbPINod() << endl;
|
||||
std::cout << " InsertOnOutLine : NbTData " << (*pid)->NbTData() << std::endl;
|
||||
std::cout << " InsertOnOutLine : NbPISeg " << (*pid)->NbPISeg() << std::endl;
|
||||
std::cout << " InsertOnOutLine : NbPINod " << (*pid)->NbPINod() << std::endl;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
@ -2241,7 +2248,7 @@ HLRBRep_PolyAlgo::CheckFrBackTriangles (HLRAlgo_ListOfBPoint& List,
|
||||
(tdata->Flags & HLRAlgo_PolyMask_FMskFrBack)) {
|
||||
#ifdef OCCT_DEBUG
|
||||
if (DoTrace)
|
||||
cout << " face : " << f << " , triangle " << i << endl;
|
||||
std::cout << " face : " << f << " , triangle " << i << std::endl;
|
||||
#endif
|
||||
Modif = Standard_True;
|
||||
const Handle(HLRAlgo_PolyInternalNode)* pi1p1 =
|
||||
@ -2310,8 +2317,8 @@ HLRBRep_PolyAlgo::CheckFrBackTriangles (HLRAlgo_ListOfBPoint& List,
|
||||
FrBackInList = Standard_True;
|
||||
#ifdef OCCT_DEBUG
|
||||
if (DoTrace) {
|
||||
cout << tdata->Node1 << " modifies : DX,DY ";
|
||||
cout << X1 << " , " << Y1 << endl;
|
||||
std::cout << tdata->Node1 << " modifies : DX,DY ";
|
||||
std::cout << X1 << " , " << Y1 << std::endl;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
@ -2323,8 +2330,8 @@ HLRBRep_PolyAlgo::CheckFrBackTriangles (HLRAlgo_ListOfBPoint& List,
|
||||
FrBackInList = Standard_True;
|
||||
#ifdef OCCT_DEBUG
|
||||
if (DoTrace) {
|
||||
cout << tdata->Node2 << " modifies : DX,DY ";
|
||||
cout << X2 << " , " << Y2 << endl;
|
||||
std::cout << tdata->Node2 << " modifies : DX,DY ";
|
||||
std::cout << X2 << " , " << Y2 << std::endl;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
@ -2336,14 +2343,14 @@ HLRBRep_PolyAlgo::CheckFrBackTriangles (HLRAlgo_ListOfBPoint& List,
|
||||
FrBackInList = Standard_True;
|
||||
#ifdef OCCT_DEBUG
|
||||
if (DoTrace) {
|
||||
cout << tdata->Node3 << " modifies : DX,DY ";
|
||||
cout << X3 << " , " << Y3 << endl;
|
||||
std::cout << tdata->Node3 << " modifies : DX,DY ";
|
||||
std::cout << X3 << " , " << Y3 << std::endl;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
#ifdef OCCT_DEBUG
|
||||
else if (DoTrace)
|
||||
cout << "modification error" << endl;
|
||||
std::cout << "modification error" << std::endl;
|
||||
#endif
|
||||
}
|
||||
tdata++;
|
||||
@ -2383,7 +2390,7 @@ HLRBRep_PolyAlgo::CheckFrBackTriangles (HLRAlgo_ListOfBPoint& List,
|
||||
if (Nod11Indices->Flag & NMsk_Move) {
|
||||
#ifdef OCCT_DEBUG
|
||||
if (DoTrace)
|
||||
cout << theIndices.Face1Pt1 << " modifies 11" << endl;
|
||||
std::cout << theIndices.Face1Pt1 << " modifies 11" << std::endl;
|
||||
#endif
|
||||
Nod11RValues = &PINod1->ChangeValue(theIndices.Face1Pt1)->Data();
|
||||
HLRAlgo_BiPoint::PointsT& aPoints = BP.Points();
|
||||
@ -2402,7 +2409,7 @@ HLRBRep_PolyAlgo::CheckFrBackTriangles (HLRAlgo_ListOfBPoint& List,
|
||||
if (Nod11Indices->Flag & NMsk_Move) {
|
||||
#ifdef OCCT_DEBUG
|
||||
if (DoTrace)
|
||||
cout << theIndices.Face1Pt2 << " modifies 12" << endl;
|
||||
std::cout << theIndices.Face1Pt2 << " modifies 12" << std::endl;
|
||||
#endif
|
||||
Nod11RValues = &PINod1->ChangeValue(theIndices.Face1Pt2)->Data();
|
||||
HLRAlgo_BiPoint::PointsT& aPoints = BP.Points();
|
||||
@ -2426,7 +2433,7 @@ HLRBRep_PolyAlgo::CheckFrBackTriangles (HLRAlgo_ListOfBPoint& List,
|
||||
if (Nod11Indices->Flag & NMsk_Move) {
|
||||
#ifdef OCCT_DEBUG
|
||||
if (DoTrace)
|
||||
cout << theIndices.Face2Pt1 << " modifies 21" << endl;
|
||||
std::cout << theIndices.Face2Pt1 << " modifies 21" << std::endl;
|
||||
#endif
|
||||
Nod11RValues = &PINod2->ChangeValue(theIndices.Face2Pt1)->Data();
|
||||
HLRAlgo_BiPoint::PointsT& aPoints = BP.Points();
|
||||
@ -2445,7 +2452,7 @@ HLRBRep_PolyAlgo::CheckFrBackTriangles (HLRAlgo_ListOfBPoint& List,
|
||||
if (Nod11Indices->Flag & NMsk_Move) {
|
||||
#ifdef OCCT_DEBUG
|
||||
if (DoTrace)
|
||||
cout << theIndices.Face2Pt2 << " modifies 22" << endl;
|
||||
std::cout << theIndices.Face2Pt2 << " modifies 22" << std::endl;
|
||||
#endif
|
||||
Nod11RValues = &PINod2->ChangeValue(theIndices.Face2Pt2)->Data();
|
||||
HLRAlgo_BiPoint::PointsT& aPoints = BP.Points();
|
||||
@ -2563,8 +2570,8 @@ void HLRBRep_PolyAlgo::ChangeNode (const Standard_Integer ip1,
|
||||
Nod1RValues.Normal = gp_XYZ(1., 0., 0.);
|
||||
#ifdef OCCT_DEBUG
|
||||
if (DoError) {
|
||||
cout << "HLRBRep_PolyAlgo::ChangeNode between " << ip1;
|
||||
cout << " and " << ip2 << endl;
|
||||
std::cout << "HLRBRep_PolyAlgo::ChangeNode between " << ip1;
|
||||
std::cout << " and " << ip2 << std::endl;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
@ -2583,8 +2590,8 @@ void HLRBRep_PolyAlgo::ChangeNode (const Standard_Integer ip1,
|
||||
Nod2RValues.Normal = gp_XYZ(1., 0., 0.);
|
||||
#ifdef OCCT_DEBUG
|
||||
if (DoError) {
|
||||
cout << "HLRBRep_PolyAlgo::ChangeNode between " << ip2;
|
||||
cout << " and " << ip1 << endl;
|
||||
std::cout << "HLRBRep_PolyAlgo::ChangeNode between " << ip2;
|
||||
std::cout << " and " << ip1 << std::endl;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
@ -2684,8 +2691,8 @@ HLRBRep_PolyAlgo::OrientTriangle(const Standard_Integer,
|
||||
theTriangle.Flags |= HLRAlgo_PolyMask_FMskOnOutL;
|
||||
#ifdef OCCT_DEBUG
|
||||
if (DoTrace) {
|
||||
cout << "HLRBRep_PolyAlgo::OrientTriangle : OnOutL";
|
||||
cout << " triangle " << iTri << endl;
|
||||
std::cout << "HLRBRep_PolyAlgo::OrientTriangle : OnOutL";
|
||||
std::cout << " triangle " << iTri << std::endl;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
@ -2717,8 +2724,8 @@ HLRBRep_PolyAlgo::OrientTriangle(const Standard_Integer,
|
||||
if (aD12Norm <= 1.e-10) {
|
||||
#ifdef OCCT_DEBUG
|
||||
if (DoTrace) {
|
||||
cout << "HLRBRep_PolyAlgo::OrientTriangle : Flat";
|
||||
cout << " triangle " << iTri << endl;
|
||||
std::cout << "HLRBRep_PolyAlgo::OrientTriangle : Flat";
|
||||
std::cout << " triangle " << iTri << std::endl;
|
||||
}
|
||||
#endif
|
||||
theTriangle.Flags |= HLRAlgo_PolyMask_FMskFlat;
|
||||
@ -2731,8 +2738,8 @@ HLRBRep_PolyAlgo::OrientTriangle(const Standard_Integer,
|
||||
if (aD23Norm < 1.e-10) {
|
||||
#ifdef OCCT_DEBUG
|
||||
if (DoTrace) {
|
||||
cout << "HLRBRep_PolyAlgo::OrientTriangle : Flat";
|
||||
cout << " triangle " << iTri << endl;
|
||||
std::cout << "HLRBRep_PolyAlgo::OrientTriangle : Flat";
|
||||
std::cout << " triangle " << iTri << std::endl;
|
||||
}
|
||||
#endif
|
||||
theTriangle.Flags |= HLRAlgo_PolyMask_FMskFlat;
|
||||
@ -2745,8 +2752,8 @@ HLRBRep_PolyAlgo::OrientTriangle(const Standard_Integer,
|
||||
if (aD31Norm < 1.e-10) {
|
||||
#ifdef OCCT_DEBUG
|
||||
if (DoTrace) {
|
||||
cout << "HLRBRep_PolyAlgo::OrientTriangle : Flat";
|
||||
cout << " triangle " << iTri << endl;
|
||||
std::cout << "HLRBRep_PolyAlgo::OrientTriangle : Flat";
|
||||
std::cout << " triangle " << iTri << std::endl;
|
||||
}
|
||||
#endif
|
||||
theTriangle.Flags |= HLRAlgo_PolyMask_FMskFlat;
|
||||
@ -2761,8 +2768,8 @@ HLRBRep_PolyAlgo::OrientTriangle(const Standard_Integer,
|
||||
if (aDNorm < 1.e-5) {
|
||||
#ifdef OCCT_DEBUG
|
||||
if (DoTrace) {
|
||||
cout << "HLRBRep_PolyAlgo::OrientTriangle : Flat";
|
||||
cout << " triangle " << iTri << endl;
|
||||
std::cout << "HLRBRep_PolyAlgo::OrientTriangle : Flat";
|
||||
std::cout << " triangle " << iTri << std::endl;
|
||||
}
|
||||
#endif
|
||||
theTriangle.Flags |= HLRAlgo_PolyMask_FMskFlat;
|
||||
@ -2838,8 +2845,8 @@ HLRBRep_PolyAlgo::Triangles(const Standard_Integer ip1,
|
||||
iTri2 = 0;
|
||||
#ifdef OCCT_DEBUG
|
||||
if (DoError) {
|
||||
cout << "HLRBRep_PolyAlgo::Triangles : error";
|
||||
cout << " between " << ip1 << " and " << ip2 << endl;
|
||||
std::cout << "HLRBRep_PolyAlgo::Triangles : error";
|
||||
std::cout << " between " << ip1 << " and " << ip2 << std::endl;
|
||||
}
|
||||
#endif
|
||||
return Standard_False;
|
||||
@ -2975,8 +2982,8 @@ HLRBRep_PolyAlgo::UpdateOutLines (HLRAlgo_ListOfBPoint& List,
|
||||
aTriangle.Flags |= HLRAlgo_PolyMask_EMskOutLin3;
|
||||
#ifdef OCCT_DEBUG
|
||||
else if (DoError) {
|
||||
cout << "HLRAlgo_PolyInternalData::UpdateOutLines";
|
||||
cout << " : segment not found" << endl;
|
||||
std::cout << "HLRAlgo_PolyInternalData::UpdateOutLines";
|
||||
std::cout << " : segment not found" << std::endl;
|
||||
}
|
||||
#endif
|
||||
tn1 = aTriangle2.Node1;
|
||||
@ -2995,8 +3002,8 @@ HLRBRep_PolyAlgo::UpdateOutLines (HLRAlgo_ListOfBPoint& List,
|
||||
aTriangle2.Flags |= HLRAlgo_PolyMask_EMskOutLin3;
|
||||
#ifdef OCCT_DEBUG
|
||||
else if (DoError) {
|
||||
cout << "HLRAlgo_PolyInternalData::UpdateOutLines";
|
||||
cout << " : segment not found" << endl;
|
||||
std::cout << "HLRAlgo_PolyInternalData::UpdateOutLines";
|
||||
std::cout << " : segment not found" << std::endl;
|
||||
}
|
||||
#endif
|
||||
HLRAlgo_PolyInternalNode::NodeData& Nod1RValues =
|
||||
@ -3081,9 +3088,9 @@ UpdateEdgesBiPoints (HLRAlgo_ListOfBPoint& List,
|
||||
}
|
||||
#ifdef OCCT_DEBUG
|
||||
else if (DoError) {
|
||||
cout << "HLRBRep_PolyAlgo::UpdateEdgesBiPoints : error ";
|
||||
cout << " between " << aIndices.FaceConex1 << setw(6);
|
||||
cout << " and " << aIndices.FaceConex2 << endl;
|
||||
std::cout << "HLRBRep_PolyAlgo::UpdateEdgesBiPoints : error ";
|
||||
std::cout << " between " << aIndices.FaceConex1 << std::setw(6);
|
||||
std::cout << " and " << aIndices.FaceConex2 << std::endl;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
@ -3133,9 +3140,9 @@ HLRBRep_PolyAlgo::UpdatePolyData (TColStd_Array1OfTransient& PD,
|
||||
if (!(OT->Flags & HLRAlgo_PolyMask_FMskSide)) {
|
||||
#ifdef OCCT_DEBUG
|
||||
if ((OT->Flags & HLRAlgo_PolyMask_FMskFrBack) && DoTrace) {
|
||||
cout << "HLRBRep_PolyAlgo::ReverseBackTriangle :";
|
||||
cout << " face " << f << setw(6);
|
||||
cout << " triangle " << i << endl;
|
||||
std::cout << "HLRBRep_PolyAlgo::ReverseBackTriangle :";
|
||||
std::cout << " face " << f << std::setw(6);
|
||||
std::cout << " triangle " << i << std::endl;
|
||||
}
|
||||
#endif
|
||||
if (OT->Flags & HLRAlgo_PolyMask_FMskOrBack) {
|
||||
|
||||
@ -1,20 +0,0 @@
|
||||
// Created on: 1992-08-18
|
||||
// Created by: Herve LEGRAND
|
||||
// Copyright (c) 1992-1999 Matra Datavision
|
||||
// Copyright (c) 1999-2014 OPEN CASCADE SAS
|
||||
//
|
||||
// This file is part of Open CASCADE Technology software library.
|
||||
//
|
||||
// This library is free software; you can redistribute it and/or modify it under
|
||||
// the terms of the GNU Lesser General Public License version 2.1 as published
|
||||
// by the Free Software Foundation, with special exception defined in the file
|
||||
// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
|
||||
// distribution for complete text of the license and disclaimer of any warranty.
|
||||
//
|
||||
// Alternatively, this file may be used under the terms of Open CASCADE
|
||||
// commercial license or contractual agreement.
|
||||
|
||||
|
||||
#include <gp_Pnt.hxx>
|
||||
#include <gp_Vec.hxx>
|
||||
#include <HLRBRep_SLPropsATool.hxx>
|
||||
@ -49,7 +49,7 @@ public:
|
||||
//! <V> on the Surface <A>.
|
||||
static void D2 (const Standard_Address A, const Standard_Real U, const Standard_Real V, gp_Pnt& P, gp_Vec& D1U, gp_Vec& D1V, gp_Vec& D2U, gp_Vec& D2V, gp_Vec& DUV);
|
||||
|
||||
Standard_EXPORT static gp_Vec DN (const Standard_Address A, const Standard_Real U, const Standard_Real V, const Standard_Integer Nu, const Standard_Integer Nv);
|
||||
static gp_Vec DN (const Standard_Address A, const Standard_Real U, const Standard_Real V, const Standard_Integer Nu, const Standard_Integer Nv);
|
||||
|
||||
//! returns the order of continuity of the Surface
|
||||
//! <A>. returns 1 : first derivative only is
|
||||
|
||||
@ -33,7 +33,6 @@
|
||||
#include <TopoDS.hxx>
|
||||
#include <TopoDS_Edge.hxx>
|
||||
#include <TopoDS_Face.hxx>
|
||||
#include <TopoDS_Iterator.hxx>
|
||||
#include <TopoDS_Vertex.hxx>
|
||||
#include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
|
||||
#include <TopTools_ListIteratorOfListOfShape.hxx>
|
||||
|
||||
@ -228,7 +228,7 @@ void HLRTopoBRep_DSFiller::InsertFace (const Standard_Integer /*FI*/,
|
||||
|
||||
if(ipL-ipF < 1) {
|
||||
InsuffisantNumberOfPoints=Standard_True;
|
||||
//cout<<"\n !! Pb ds HLRTopoBRep_DSFiller.cxx (Contour App Nbp <3)"<<endl;
|
||||
//std::cout<<"\n !! Pb ds HLRTopoBRep_DSFiller.cxx (Contour App Nbp <3)"<<std::endl;
|
||||
}
|
||||
/*
|
||||
else if(ipL-ipF < 6) {
|
||||
@ -390,7 +390,7 @@ void HLRTopoBRep_DSFiller::InsertFace (const Standard_Integer /*FI*/,
|
||||
TOL3d=TOL*Maxx; if(TOL3d<1e-12) TOL3d=1e-12; else if(TOL3d>0.1) TOL3d=0.1;
|
||||
TOL2d=TOL*Maxu; if(TOL2d<1e-12) TOL2d=1e-12; else if(TOL2d>0.1) TOL2d=0.1;
|
||||
|
||||
//-- cout<<"\nHLRTopoBRep_DSFiller : nbp="<<nbp<<" Tol3d="<<TOL3d<<" Tol2d="<<TOL2d<<endl;
|
||||
//-- std::cout<<"\nHLRTopoBRep_DSFiller : nbp="<<nbp<<" Tol3d="<<TOL3d<<" Tol2d="<<TOL2d<<std::endl;
|
||||
|
||||
Approx.SetParameters(TOL3d, TOL2d, dmin, dmax, niter, 30, tg);
|
||||
Approx.Perform(AppLine,Standard_True,Standard_True,Standard_False,1,nbp);
|
||||
|
||||
@ -197,23 +197,23 @@ void HLRTopoBRep_FaceIsoLiner::Perform (const Standard_Integer FI,
|
||||
Hatcher.ComputeDomains (IndH);
|
||||
if (!Hatcher.IsDone (IndH)) {
|
||||
#ifdef OCCT_DEBUG
|
||||
cout << "HLRTopoBRep::MakeIsoLines : Face " << FI << endl;
|
||||
cout << "U iso of parameter: " << UPrm;
|
||||
std::cout << "HLRTopoBRep::MakeIsoLines : Face " << FI << std::endl;
|
||||
std::cout << "U iso of parameter: " << UPrm;
|
||||
switch (Hatcher.Status (IndH)) {
|
||||
case HatchGen_NoProblem :
|
||||
cout << " No Problem" << endl;
|
||||
std::cout << " No Problem" << std::endl;
|
||||
break;
|
||||
case HatchGen_TrimFailure :
|
||||
cout << " Trim Failure" << endl;
|
||||
std::cout << " Trim Failure" << std::endl;
|
||||
break;
|
||||
case HatchGen_TransitionFailure :
|
||||
cout << " Transition Failure" << endl;
|
||||
std::cout << " Transition Failure" << std::endl;
|
||||
break;
|
||||
case HatchGen_IncoherentParity :
|
||||
cout << " Incoherent Parity" << endl;
|
||||
std::cout << " Incoherent Parity" << std::endl;
|
||||
break;
|
||||
case HatchGen_IncompatibleStates :
|
||||
cout << " Incompatible States" << endl;
|
||||
std::cout << " Incompatible States" << std::endl;
|
||||
break;
|
||||
}
|
||||
#endif
|
||||
@ -291,23 +291,23 @@ void HLRTopoBRep_FaceIsoLiner::Perform (const Standard_Integer FI,
|
||||
Hatcher.ComputeDomains (IndH);
|
||||
if (!Hatcher.IsDone (IndH)) {
|
||||
#ifdef OCCT_DEBUG
|
||||
cout << "HLRTopoBRep::MakeIsoLines : Face " << FI << endl;
|
||||
cout << "V iso of parameter: " << VPrm;
|
||||
std::cout << "HLRTopoBRep::MakeIsoLines : Face " << FI << std::endl;
|
||||
std::cout << "V iso of parameter: " << VPrm;
|
||||
switch (Hatcher.Status (IndH)) {
|
||||
case HatchGen_NoProblem :
|
||||
cout << " No Problem" << endl;
|
||||
std::cout << " No Problem" << std::endl;
|
||||
break;
|
||||
case HatchGen_TrimFailure :
|
||||
cout << " Trim Failure" << endl;
|
||||
std::cout << " Trim Failure" << std::endl;
|
||||
break;
|
||||
case HatchGen_TransitionFailure :
|
||||
cout << " Transition Failure" << endl;
|
||||
std::cout << " Transition Failure" << std::endl;
|
||||
break;
|
||||
case HatchGen_IncoherentParity :
|
||||
cout << " Incoherent Parity" << endl;
|
||||
std::cout << " Incoherent Parity" << std::endl;
|
||||
break;
|
||||
case HatchGen_IncompatibleStates :
|
||||
cout << " Incompatible States" << endl;
|
||||
std::cout << " Incompatible States" << std::endl;
|
||||
break;
|
||||
}
|
||||
#endif
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user