X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FHYDROData%2FHYDROData_PolylineXY.cxx;h=8c7db492153042803f8bfd6114e1d84bceb0ba83;hb=58bb6b7459bebeeb089c9ed486c4683a8bae7288;hp=6013e6538a56a8bb7e1e0850bbb239ed1c24e010;hpb=5274ccf8e361fe33d5917cd3bbc1bd0b4fe151ac;p=modules%2Fhydro.git diff --git a/src/HYDROData/HYDROData_PolylineXY.cxx b/src/HYDROData/HYDROData_PolylineXY.cxx index 6013e653..8c7db492 100644 --- a/src/HYDROData/HYDROData_PolylineXY.cxx +++ b/src/HYDROData/HYDROData_PolylineXY.cxx @@ -126,7 +126,6 @@ TCollection_AsciiString getUniqueSectionName( const Handle(TDataStd_ExtStringLis return getUniqueSectionName( aNamesSeq ); } -IMPLEMENT_STANDARD_HANDLE(HYDROData_PolylineXY, HYDROData_IPolyline) IMPLEMENT_STANDARD_RTTIEXT(HYDROData_PolylineXY, HYDROData_IPolyline) HYDROData_PolylineXY::HYDROData_PolylineXY() @@ -346,14 +345,14 @@ bool convertEdgesToSections( const TopoDS_Edge& double theDeflection, const Handle( HYDROData_PolylineXY )& theOldPolyline ) { - DEBTRACE("convertEdgesToSections") + //DEBTRACE("convertEdgesToSections") Standard_Real aFirst = 0.0, aLast = 0.0; Handle(Geom_Curve) anEdgeGeomCurve = BRep_Tool::Curve( theEdge, aFirst, aLast ); if ( anEdgeGeomCurve.IsNull() ) return false; bool isPrevious = (theSectTypes.Size() > 0); - DEBTRACE("nb sections: " << theSectTypes.Size()); + //DEBTRACE("nb sections: " << theSectTypes.Size()); HYDROData_PolylineXY::SectionType prevSectType = HYDROData_PolylineXY::SECTION_SPLINE;; HYDROData_PolylineXY::PointsList prevPointList; bool isPrevClosed = true; @@ -382,7 +381,7 @@ bool convertEdgesToSections( const TopoDS_Edge& } bool isNewSection = !isPrevious || isPrevClosed || anIsEdgeClosed || prevSectType != aSectionType; - DEBTRACE(isNewSection <<": " << !isPrevious << " " << isPrevClosed << " " << anIsEdgeClosed << " " << (prevSectType != aSectionType)); + //DEBTRACE(isNewSection <<": " << !isPrevious << " " << isPrevClosed << " " << anIsEdgeClosed << " " << (prevSectType != aSectionType)); HYDROData_PolylineXY::PointsList aPointsList; if (!isNewSection) @@ -392,7 +391,7 @@ bool convertEdgesToSections( const TopoDS_Edge& if( aSectionType == HYDROData_PolylineXY::SECTION_POLYLINE ) { - DEBTRACE("SECTION_POLYLINE"); + //DEBTRACE("SECTION_POLYLINE"); Handle(Geom_Line) aGeomLine = Handle(Geom_Line)::DownCast( anEdgeGeomCurve ); gp_Pnt aFirstPoint, aLastPoint; @@ -404,27 +403,27 @@ bool convertEdgesToSections( const TopoDS_Edge& { if (aSectFirstPoint == prevPointList.Last()) { - DEBTRACE("points shared: a");//aPointsList.Append( aSectFirstPoint ); + //DEBTRACE("points shared: a");//aPointsList.Append( aSectFirstPoint ); aPointsList.Append( aSectLastPoint ); } else if (aSectLastPoint == prevPointList.Last()) { - DEBTRACE("points shared: b");//aPointsList.Append( aSectLastPoint ); + //DEBTRACE("points shared: b");//aPointsList.Append( aSectLastPoint ); aPointsList.Append( aSectFirstPoint ); } else if (aSectFirstPoint == prevPointList.First()) { - DEBTRACE("points shared: c");//aPointsList.Prepend( aSectFirstPoint ); + //DEBTRACE("points shared: c");//aPointsList.Prepend( aSectFirstPoint ); aPointsList.Prepend( aSectLastPoint ); } else if (aSectLastPoint == prevPointList.First()) { - DEBTRACE("points shared: d");//aPointsList.Prepend( aSectLastPoint ); + //DEBTRACE("points shared: d");//aPointsList.Prepend( aSectLastPoint ); aPointsList.Prepend( aSectFirstPoint ); } else { - DEBTRACE("no point shared") + //DEBTRACE("no point shared") isNewSection = true; // no point shared, new section aPointsList.Clear(); aPointsList.Append( aSectFirstPoint ); @@ -433,14 +432,14 @@ bool convertEdgesToSections( const TopoDS_Edge& } else { - DEBTRACE("new section"); + //DEBTRACE("new section"); aPointsList.Append( aSectFirstPoint ); aPointsList.Append( aSectLastPoint ); } } else // aSectionType == HYDROData_PolylineXY::SECTION_SPLINE { - DEBTRACE("SECTION_SPLINE"); + //DEBTRACE("SECTION_SPLINE"); isNewSection = true; aPointsList.Clear(); @@ -465,8 +464,8 @@ bool convertEdgesToSections( const TopoDS_Edge& gp_Pnt endPts[] = {gp_Pnt(aPointsList.First().X(),aPointsList.First().Y(), 0), gp_Pnt(aPointsList.Last().X(),aPointsList.Last().Y(), 0) }; - DEBTRACE("curve start: "<< endPts[0].X() << " " << endPts[0].Y()); - DEBTRACE("curve end: "<< endPts[1].X() << " " << endPts[1].Y()); + //DEBTRACE("curve start: "<< endPts[0].X() << " " << endPts[0].Y()); + //DEBTRACE("curve end: "<< endPts[1].X() << " " << endPts[1].Y()); } else // --- split of a previous polyline: try to retrieve old sets of points and add intersection points { @@ -475,18 +474,18 @@ bool convertEdgesToSections( const TopoDS_Edge& double midPar = (anAdaptorCurve.LastParameter() + anAdaptorCurve.FirstParameter())/2; gp_Pnt midPnt; anAdaptorCurve.D0(midPar, midPnt); - DEBTRACE("curve first point: " << aEndPs[0].X() << " " << aEndPs[0].Y() << " " << aEndPs[0].Z()); - DEBTRACE("curve last point: " << aEndPs[1].X() << " " << aEndPs[1].Y() << " " << aEndPs[1].Z()); - DEBTRACE("curve mid point: " << midPnt.X() << " " << midPnt.Y() << " " << midPnt.Z()); + //DEBTRACE("curve first point: " << aEndPs[0].X() << " " << aEndPs[0].Y() << " " << aEndPs[0].Z()); + //DEBTRACE("curve last point: " << aEndPs[1].X() << " " << aEndPs[1].Y() << " " << aEndPs[1].Z()); + //DEBTRACE("curve mid point: " << midPnt.X() << " " << midPnt.Y() << " " << midPnt.Z()); std::vector aCurves; HYDROData_PolylineOperator::GetWires(theOldPolyline, aCurves); int nbSections = theOldPolyline->NbSections(); - DEBTRACE("nbSections: "<< nbSections << ", nbCurves: " << aCurves.size() ); + //DEBTRACE("nbSections: "<< nbSections << ", nbCurves: " << aCurves.size() ); for (int isec = 0; isec < nbSections; isec++) { - DEBTRACE("section: "<< isec); + //DEBTRACE("section: "<< isec); bool isOldSectionclosed = theOldPolyline->IsClosedSection(isec); TopoDS_Wire aWire = aCurves[isec]; // we suppose sections and wires are in the same order TopExp_Explorer anExp(aWire, TopAbs_EDGE); @@ -494,18 +493,18 @@ bool convertEdgesToSections( const TopoDS_Edge& BRepAdaptor_Curve adaptorOldCurve(anEdge); double pfirst = adaptorOldCurve.FirstParameter(); double plast = adaptorOldCurve.LastParameter(); - DEBTRACE("previous curve first last : "<< pfirst << " " << plast); + //DEBTRACE("previous curve first last : "<< pfirst << " " << plast); double p[3] = {-1, -1}; double d0= ProjectPointToCurve(aEndPs[0].XYZ(), adaptorOldCurve,p[0]); double d1= ProjectPointToCurve(aEndPs[1].XYZ(), adaptorOldCurve,p[1]); double d2= ProjectPointToCurve(midPnt.XYZ(), adaptorOldCurve, p[2]); - DEBTRACE("d0: "< pmax) @@ -542,7 +541,7 @@ bool convertEdgesToSections( const TopoDS_Edge& else if ((abs(pmax - pfirst) <1.e-3) && (p[2] > pmin)) // forward, replace pmax par plast pmax = plast; } - DEBTRACE("forward: "<< forward << " pmin " << pmin << " pmax " << pmax); + //DEBTRACE("forward: "<< forward << " pmin " << pmin << " pmax " << pmax); HYDROData_PolylineXY::Point aFirstPoint, aLastPoint; if (forward) { @@ -558,7 +557,7 @@ bool convertEdgesToSections( const TopoDS_Edge& HYDROData_PolylineXY::PointsList aSectPoints = theOldPolyline->GetPoints(isec, false); int nbPoints = aSectPoints.Length(); - DEBTRACE("nbPoints " << nbPoints); + //DEBTRACE("nbPoints " << nbPoints); if (forward) for (int i=1; i<=nbPoints; i++) { @@ -568,7 +567,7 @@ bool convertEdgesToSections( const TopoDS_Edge& double d = ProjectPointToCurve(p, adaptorOldCurve, param); if ((param > pmin) && (param < pmax)) { - DEBTRACE("param: " << param); + //DEBTRACE("param: " << param); aPointsList.Append(aPoint); } } @@ -581,7 +580,7 @@ bool convertEdgesToSections( const TopoDS_Edge& double d = ProjectPointToCurve(p, adaptorOldCurve, param); if ((param > pmin) && (param < pmax)) { - DEBTRACE("param: " << param); + //DEBTRACE("param: " << param); aPointsList.Append(aPoint); } } @@ -599,7 +598,7 @@ bool convertEdgesToSections( const TopoDS_Edge& TCollection_AsciiString aSectName = getUniqueSectionName( theSectNames ); if (isNewSection) { - DEBTRACE("isNewSection"); + //DEBTRACE("isNewSection"); theSectNames.Append( aSectName ); theSectTypes.Append( aSectionType ); theSectClosures.Append( anIsEdgeClosed ); @@ -607,7 +606,7 @@ bool convertEdgesToSections( const TopoDS_Edge& } else { - DEBTRACE("sameSection"); + //DEBTRACE("sameSection"); theSectPoints.SetValue(theSectPoints.Length(), aPointsList); } @@ -620,13 +619,13 @@ bool HYDROData_PolylineXY::ImportShape( const TopoDS_Shape& theShape, bool IsClosureAllowed, double theDeviation ) { - DEBTRACE("ImportShape"); + //DEBTRACE("ImportShape"); if ( theShape.IsNull() ) return false; - std::string brepName = this->GetName().toStdString(); - brepName += ".brep"; - BRepTools::Write( theShape, brepName.c_str() ); + //std::string brepName = this->GetName().toStdString(); + //brepName += ".brep"; + //BRepTools::Write( theShape, brepName.c_str() ); RemoveSections(); @@ -639,7 +638,7 @@ bool HYDROData_PolylineXY::ImportShape( const TopoDS_Shape& theShape, if ( theShape.ShapeType() == TopAbs_EDGE ) { - DEBTRACE("TopAbs_EDGE"); + //DEBTRACE("TopAbs_EDGE"); TopoDS_Edge anEdge = TopoDS::Edge( theShape ); // anIsCanBeImported = convertEdgeToSection( anEdge, aSectNames, aSectTypes, // aSectClosures, aSectPoints, true, IsInterpolationAllowed, theDeviation ); @@ -649,7 +648,7 @@ bool HYDROData_PolylineXY::ImportShape( const TopoDS_Shape& theShape, } else if ( theShape.ShapeType() == TopAbs_WIRE ) { - DEBTRACE("TopAbs_WIRE"); + //DEBTRACE("TopAbs_WIRE"); TopTools_SequenceOfShape anEdges; HYDROData_ShapesTool::ExploreShapeToShapes( theShape, TopAbs_EDGE, anEdges );