X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_Stream.cxx;h=b4d48d61f9cdd1cd29c8d74c2cbd4fb7cf10a62f;hb=7810759dad7d7f4552ad1008af73112509256813;hp=c1ecbdf4ac8e550900b656d184c156456a88f14f;hpb=f603a9ac6b8db5ef3966bcb2dea2de26ed471de6;p=modules%2Fhydro.git diff --git a/src/HYDROData/HYDROData_Stream.cxx b/src/HYDROData/HYDROData_Stream.cxx index c1ecbdf4..b4d48d61 100644 --- a/src/HYDROData/HYDROData_Stream.cxx +++ b/src/HYDROData/HYDROData_Stream.cxx @@ -4,14 +4,23 @@ #include "HYDROData_Document.h" #include "HYDROData_PolylineXY.h" #include "HYDROData_Profile.h" - -#include -#include -#include -#include +#include "HYDROData_ShapesGroup.h" +#include "HYDROData_ShapesTool.h" +#include "HYDROData_IAltitudeObject.h" #include +#include + +#include + +#include +#include +#include +#include +#include +#include + #include #include #include @@ -20,41 +29,46 @@ #include #include #include + +#include + +#include +#include +#include +#include + +#include #include #include +#include + +#include #include #include #include #include #include #include -#include -#include -#include -#include -#include -#include -#include -typedef NCollection_DataMap HYDROData_DataMapOfRealOfHDProfile; -//typedef HYDROData_DataMapOfRealOfHDProfile::Iterator HYDROData_DataMapIteratorOfDataMapOfRealOfHDProfile; -#include -#include -#include -#include -#include -#include #include #include + #include + +#include + +#include +#include + +//#define DEB_STREAM 1 +#ifdef DEB_STREAM //#define DEB_HASINT 1 -#ifdef DEB_HASINT +//#define DEB_UPDATE 1 #include #include -#include #endif -#define PYTHON_STREAM_ID "KIND_STREAM" +typedef NCollection_DataMap HYDROData_DataMapOfRealOfHDProfile; IMPLEMENT_STANDARD_HANDLE(HYDROData_Stream,HYDROData_NaturalObject) IMPLEMENT_STANDARD_RTTIEXT(HYDROData_Stream,HYDROData_NaturalObject) @@ -71,22 +85,22 @@ HYDROData_Stream::~HYDROData_Stream() QStringList HYDROData_Stream::DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const { - QStringList aResList; + QStringList aResList = dumpObjectCreation( theTreatedObjects ); + QString aName = GetObjPyName(); - Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( myLab ); - if ( aDocument.IsNull() ) - return aResList; + Handle(HYDROData_PolylineXY) aHydAxis = GetHydraulicAxis(); + setPythonReferenceObject( theTreatedObjects, aResList, aHydAxis, "SetHydraulicAxis" ); - QString aDocName = aDocument->GetDocPyName(); - QString aStreamName = GetName(); + HYDROData_SequenceOfObjects aSeqOfProfiles = GetProfiles(); + for ( int i = 1, aNb = aSeqOfProfiles.Size(); i <= aNb; ++i ) + { + const Handle(HYDROData_Entity) aProfile = aSeqOfProfiles.Value( i ); + setPythonReferenceObject( theTreatedObjects, aResList, aProfile, "AddProfile" ); + } - aResList << QString( "%1 = %2.CreateObject( %3 );" ) - .arg( aStreamName ).arg( aDocName ).arg( PYTHON_STREAM_ID ); - aResList << QString( "%1.SetName( \"%2\" );" ) - .arg( aStreamName ).arg( aStreamName ); aResList << QString( "" ); - - // TODO + aResList << QString( "%1.Update();" ).arg( aName ); + aResList << QString( "" ); return aResList; } @@ -109,143 +123,337 @@ TopoDS_Shape HYDROData_Stream::GetTopShape() const { return getTopShape(); } + TopoDS_Shape HYDROData_Stream::GetShape3D() const { return getShape3D(); } +Handle(Geom_BSplineCurve) HYDROData_Stream::buildInterpolationCurve( + const Handle(TColgp_HArray1OfPnt)& theArrayOfPnt ) +{ + Handle(Geom_BSplineCurve) aBSpline; + GeomAPI_Interpolate anInterpolator (theArrayOfPnt, Standard_False, 1.0e-5); + anInterpolator.Perform() ; + if (anInterpolator.IsDone()) + aBSpline = anInterpolator.Curve(); + return aBSpline; +} + void HYDROData_Stream::Update() { - HYDROData_NaturalObject::Update(); + updateProfilesOrder(); + UpdatePrs(); +} - Handle(HYDROData_PolylineXY) aHydAxis = GetHydraulicAxis(); - HYDROData_SequenceOfObjects aRefProfiles = GetProfiles(); - if ( aHydAxis.IsNull() || aRefProfiles.IsEmpty() ) - return; +bool HYDROData_Stream::IsHas2dPrs() const +{ + return true; +} - TopoDS_Shell a2dShell; - BRep_Builder a2dShellBuilder; - a2dShellBuilder.MakeShell( a2dShell ); +bool HYDROData_Stream::CreatePresentations( const Handle(HYDROData_PolylineXY)& theHydAxis, + const HYDROData_SequenceOfObjects& theProfiles, + PrsDefinition& thePrs ) +{ + if ( theHydAxis.IsNull() || theProfiles.Length() < 2 ) + return false; - bool anIsFirst = true; gp_Pnt aPrevFirstPoint, aPrevLastPoint; - Handle(TColgp_HArray1OfPnt) anArrayOfFPnt = new TColgp_HArray1OfPnt(1, aRefProfiles.Length()); - Handle(TColgp_HArray1OfPnt) anArrayOfLPnt = new TColgp_HArray1OfPnt(1, aRefProfiles.Length()); - TopTools_Array1OfShape anArrOfProfiles(1, aRefProfiles.Length()); - // Construct the top presentation - HYDROData_SequenceOfObjects::Iterator anIter( aRefProfiles ); + Handle(TColgp_HArray1OfPnt) anArrayOfFPnt = new TColgp_HArray1OfPnt(1, theProfiles.Length()); + Handle(TColgp_HArray1OfPnt) anArrayOfLPnt = new TColgp_HArray1OfPnt(1, theProfiles.Length()); + TopTools_Array1OfShape anArrOfProfiles(1, theProfiles.Length()); + TopTools_Array1OfShape anArrOf2DProfiles(1, theProfiles.Length()); + + // Pre-processing + HYDROData_SequenceOfObjects::Iterator anIter( theProfiles ); for (int i=1 ; anIter.More(); anIter.Next(),i++ ) { Handle(HYDROData_Profile) aProfile = Handle(HYDROData_Profile)::DownCast( anIter.Value() ); if ( aProfile.IsNull() ) - continue; - const TopoDS_Shape& aProf3d = aProfile->GetShape3D(); - gp_XY aPnt1, aPnt2; - if ( !aProfile->GetFirstPoint( aPnt1 ) || !aProfile->GetLastPoint( aPnt2 ) ) continue; - anArrOfProfiles.SetValue(i,aProfile->GetShape3D()); - gp_Pnt aCurFirstPoint( aPnt1.X(), aPnt1.Y(), 0 ), aCurFP; - gp_Pnt aCurLastPoint( aPnt2.X(), aPnt2.Y(), 0 ), aCurLP; - TopoDS_Vertex aV1, aV2; - TopExp::Vertices(TopoDS::Wire(aProf3d), aV1, aV2); - gp_Pnt aP1 = BRep_Tool::Pnt(aV1); - if(aP1.X() == aPnt1.X() && aP1.Y() == aPnt1.Y()) - aCurFP = aP1; - else - aCurLP = aP1; - aP1 = BRep_Tool::Pnt(aV2); - if(aP1.X() == aPnt2.X() && aP1.Y() == aPnt2.Y()) - aCurLP = aP1; - else - aCurFP = aP1; - anArrayOfFPnt->SetValue(i,aCurFP); - anArrayOfLPnt->SetValue(i,aCurLP); - if ( anIsFirst ) - { - aPrevFirstPoint = aCurFirstPoint; - aPrevLastPoint = aCurLastPoint; - anIsFirst = false; + const TopoDS_Shape& aProf3d = aProfile->GetShape3D(); + gp_XY aPnt1, aPnt2; + if ( !aProfile->GetLeftPoint( aPnt1, false ) || !aProfile->GetRightPoint( aPnt2, false ) ) continue; - } - BRepBuilderAPI_MakeEdge aFirstEdge( aPrevFirstPoint, aPrevLastPoint ); - BRepBuilderAPI_MakeEdge aSecondEdge( aPrevLastPoint, aCurLastPoint ); - BRepBuilderAPI_MakeEdge aThirdEdge( aCurLastPoint, aCurFirstPoint ); - BRepBuilderAPI_MakeEdge aFourthEdge( aCurFirstPoint, aPrevFirstPoint ); - - BRepBuilderAPI_MakeWire aMakeWire( aFirstEdge.Edge(), aSecondEdge.Edge(), - aThirdEdge.Edge(), aFourthEdge.Edge() ); - - TopoDS_Wire aSectProfileWire = aMakeWire.Wire(); - - BRepBuilderAPI_MakeFace aMakeFace( aSectProfileWire, Standard_True ); - aMakeFace.Build(); - if( aMakeFace.IsDone() ) - { - a2dShellBuilder.Add( a2dShell, aMakeFace.Face() ); - } + anArrOfProfiles.SetValue(i,aProfile->GetShape3D());//aProfile->GetTopShape(); + anArrOf2DProfiles.SetValue(i,aProfile->GetTopShape()); - aPrevFirstPoint = aCurFirstPoint; - aPrevLastPoint = aCurLastPoint; + gp_Pnt aCurFirstPoint( aPnt1.X(), aPnt1.Y(), 0 ), aCurFP; + gp_Pnt aCurLastPoint( aPnt2.X(), aPnt2.Y(), 0 ), aCurLP; + TopoDS_Vertex aV1, aV2; + TopExp::Vertices(TopoDS::Wire(aProf3d), aV1, aV2); + gp_Pnt aP1 = BRep_Tool::Pnt(aV1); + if(aP1.X() == aPnt1.X() && aP1.Y() == aPnt1.Y()) + aCurFP = aP1; + else + aCurLP = aP1; + aP1 = BRep_Tool::Pnt(aV2); + if(aP1.X() == aPnt2.X() && aP1.Y() == aPnt2.Y()) + aCurLP = aP1; + else + aCurFP = aP1; + anArrayOfFPnt->SetValue(i,aCurFP); + anArrayOfLPnt->SetValue(i,aCurLP); } - SetTopShape( a2dShell ); - - // Construct the 3D presentation - Handle(Geom_BSplineCurve) aBSpline; - GeomAPI_Interpolate anInterpolator (anArrayOfFPnt, Standard_False, 1.0e-5); - anInterpolator.Perform() ; - if (anInterpolator.IsDone()) - aBSpline = anInterpolator.Curve(); - else - return; + // Construct of the 3D presentation + Handle(Geom_BSplineCurve) aBSpline = buildInterpolationCurve (anArrayOfFPnt); if(aBSpline.IsNull()) - return; + return false; + TopoDS_Edge anEdgLeft, anEdgRight; + BRepBuilderAPI_MakeEdge aMakeEdge(aBSpline); if(aMakeEdge.IsDone()) - anEdgLeft = aMakeEdge.Edge(); - GeomAPI_Interpolate anInterpolator2 (anArrayOfLPnt, Standard_False, 1.0e-5); - anInterpolator2.Perform() ; - if (anInterpolator2.IsDone()) - aBSpline = anInterpolator2.Curve(); - else - return; + anEdgLeft = aMakeEdge.Edge(); + + if(anEdgLeft.IsNull()) + return false; + + aBSpline.Nullify(); + aBSpline = buildInterpolationCurve (anArrayOfLPnt); if(aBSpline.IsNull()) - return; + return false; + aMakeEdge.Init(aBSpline); if(aMakeEdge.IsDone()) - anEdgRight = aMakeEdge.Edge(); + anEdgRight = aMakeEdge.Edge(); + + if(anEdgRight.IsNull()) + return false; + BRep_Builder aBB; TopoDS_Compound aCmp; aBB.MakeCompound(aCmp); - anIter.Init( aRefProfiles ); + anIter.Init( theProfiles ); for (int i=1 ; i < anArrOfProfiles.Length() +1; i++ ) aBB.Add(aCmp, anArrOfProfiles.Value(i)); + aBB.Add(aCmp,anEdgLeft); aBB.Add(aCmp,anEdgRight); - SetShape3D(aCmp); - //BRepTools::Write(aCmp, "str3d.brep"); + BRepCheck_Analyzer aCh(aCmp); + if(aCh.IsValid()) + thePrs.myPrs3D = aCmp; +#ifdef DEB_UPDATE + else { + BRepTools::Write(aCmp, "str3d.brep"); + thePrs.myPrs3D = aCmp; + } +#endif + + // Construct the top presentation + for(int i=1;i<= anArrayOfLPnt->Length();i++) { + gp_Pnt aPnt = anArrayOfFPnt->Value(i); + aPnt.SetZ(.0); // make 2d + anArrayOfFPnt->SetValue(i, aPnt); + aPnt = anArrayOfLPnt->Value(i); + aPnt.SetZ(.0); + anArrayOfLPnt->SetValue(i, aPnt); + } + + aBSpline.Nullify(); + aBSpline = buildInterpolationCurve (anArrayOfFPnt); + if(aBSpline.IsNull()) + return false; + + aMakeEdge.Init(aBSpline); + if(aMakeEdge.IsDone()) + anEdgLeft = aMakeEdge.Edge(); + + aBSpline.Nullify(); + aBSpline = buildInterpolationCurve (anArrayOfLPnt); + if(aBSpline.IsNull()) + return false; + + aMakeEdge.Init(aBSpline); + if(aMakeEdge.IsDone()) + anEdgRight = aMakeEdge.Edge(); + if(anEdgRight.IsNull()) + return false; + + BRepBuilderAPI_MakeEdge aMakeEdge2(anArrayOfFPnt->Value(1),anArrayOfLPnt->Value(1)); + TopoDS_Edge aBotEdge, aTopEdge; + if(aMakeEdge2.IsDone()) + aBotEdge = aMakeEdge2.Edge(); + + BRepBuilderAPI_MakeEdge aMakeEdge3(anArrayOfFPnt->Value(anArrayOfFPnt->Length()),anArrayOfLPnt->Value(anArrayOfLPnt->Length())); + if(aMakeEdge3.IsDone()) + aTopEdge = aMakeEdge3.Edge(); + + // Make wire for 2D presentation with updating of corresponding edges + BRepBuilderAPI_MakeWire aMakeWire; + + aMakeWire.Add( aBotEdge ); + thePrs.myInlet = aMakeWire.Edge(); + + aMakeWire.Add( anEdgLeft ); + thePrs.myLeftBank = aMakeWire.Edge(); + + aMakeWire.Add( aTopEdge ); + thePrs.myOutlet = aMakeWire.Edge(); + + aMakeWire.Add( anEdgRight ); + thePrs.myRightBank = aMakeWire.Edge(); + + TopoDS_Wire aSectProfileWire; + if(aMakeWire.IsDone()) + aSectProfileWire = aMakeWire.Wire(); + + BRepBuilderAPI_MakeFace aMakeFace( aSectProfileWire, Standard_True ); + TopoDS_Face aFace; + aMakeFace.Build(); + if( aMakeFace.IsDone() ) + aFace = aMakeFace.Face(); + + aCmp.Nullify(); + aBB.MakeCompound(aCmp); + aBB.Add(aCmp,aFace); + for(int i=1;i <= anArrOf2DProfiles.Length(); i++) + aBB.Add(aCmp,anArrOf2DProfiles.Value(i)); + + aCh.Init(aCmp); + if(aCh.IsValid()) + thePrs.myPrs2D = aCmp; +#ifdef DEB_UPDATE + else { + BRepTools::Write(aCmp, "str2d.brep"); + thePrs.myPrs2D = aCmp; + } +#endif + + return true; } -bool HYDROData_Stream::SetHydraulicAxis( const Handle(HYDROData_PolylineXY)& theAxis ) +void HYDROData_Stream::UpdatePrs() { - Handle(HYDROData_PolylineXY) aPrevAxis = GetHydraulicAxis(); + HYDROData_NaturalObject::Update(); - if ( theAxis.IsNull() ) - { - RemoveHydraulicAxis(); - return !aPrevAxis.IsNull(); - } + Handle(HYDROData_PolylineXY) aHydAxis = GetHydraulicAxis(); + HYDROData_SequenceOfObjects aRefProfiles = GetProfiles(); - if ( IsEqual( aPrevAxis, theAxis ) ) + PrsDefinition aResultPrs; + if ( !CreatePresentations( aHydAxis, aRefProfiles, aResultPrs ) ) + return; + + SetShape3D( aResultPrs.myPrs3D ); + SetTopShape( aResultPrs.myPrs2D ); + + // Create the stream groups + QString aLeftGroupName = GetName() + "_Left_Bank"; + + Handle(HYDROData_ShapesGroup) aLeftGroup = createGroupObject(); + aLeftGroup->SetName( aLeftGroupName ); + aLeftGroup->AddShape( aResultPrs.myLeftBank ); + + QString aRightGroupName = GetName() + "_Right_Bank"; + + Handle(HYDROData_ShapesGroup) aRightGroup = createGroupObject(); + aRightGroup->SetName( aRightGroupName ); + aRightGroup->AddShape( aResultPrs.myRightBank ); + + QString anInGroupName = GetName() + "_Inlet"; + + Handle(HYDROData_ShapesGroup) anInGroup = createGroupObject(); + anInGroup->SetName( anInGroupName ); + anInGroup->AddShape( aResultPrs.myInlet ); + + QString anOutGroupName = GetName() + "_Outlet"; + + Handle(HYDROData_ShapesGroup) anOutGroup = createGroupObject(); + anOutGroup->SetName( anOutGroupName ); + anOutGroup->AddShape( aResultPrs.myOutlet ); +} + +QColor HYDROData_Stream::DefaultFillingColor() +{ + return QColor( Qt::green ); +} + +QColor HYDROData_Stream::DefaultBorderColor() +{ + return QColor( Qt::transparent ); +} + +bool HYDROData_Stream::IsValidAsAxis( const Handle(HYDROData_PolylineXY)& theHydAxis ) +{ + if ( theHydAxis.IsNull() ) + return false; + + TopoDS_Shape aHydraulicShape = theHydAxis->GetShape(); + if ( aHydraulicShape.IsNull() || + aHydraulicShape.ShapeType() != TopAbs_WIRE || + BRep_Tool::IsClosed( aHydraulicShape ) ) + return false; // The polyline must be a single not closed wire + + return true; +} + +TopoDS_Shape getShapeFromGroup( const HYDROData_SequenceOfObjects& theGroups, + const int theGroupId ) +{ + TopoDS_Shape aResShape; + if ( theGroups.Length() != 4 ) + return aResShape; + + Handle(HYDROData_ShapesGroup) aGroup = + Handle(HYDROData_ShapesGroup)::DownCast( theGroups.Value( theGroupId ) ); + if ( aGroup.IsNull() ) + return aResShape; + + TopTools_SequenceOfShape aGroupShapes; + aGroup->GetShapes( aGroupShapes ); + + if ( !aGroupShapes.IsEmpty() ) + aResShape = aGroupShapes.First(); + + return aResShape; +} + +TopoDS_Shape HYDROData_Stream::GetLeftShape() const +{ + HYDROData_SequenceOfObjects aGroups = GetGroups(); + return getShapeFromGroup( aGroups, 1 ); +} + +TopoDS_Shape HYDROData_Stream::GetRightShape() const +{ + HYDROData_SequenceOfObjects aGroups = GetGroups(); + return getShapeFromGroup( aGroups, 2 ); +} + +TopoDS_Shape HYDROData_Stream::GetInletShape() const +{ + HYDROData_SequenceOfObjects aGroups = GetGroups(); + return getShapeFromGroup( aGroups, 3 ); +} + +TopoDS_Shape HYDROData_Stream::GetOutletShape() const +{ + HYDROData_SequenceOfObjects aGroups = GetGroups(); + return getShapeFromGroup( aGroups, 4 ); +} + +QColor HYDROData_Stream::getDefaultFillingColor() const +{ + return DefaultFillingColor(); +} + +QColor HYDROData_Stream::getDefaultBorderColor() const +{ + return DefaultBorderColor(); +} + +bool HYDROData_Stream::SetHydraulicAxis( const Handle(HYDROData_PolylineXY)& theAxis ) +{ + if ( !IsValidAsAxis( theAxis ) ) return false; - TopoDS_Wire aHydraulicWire = TopoDS::Wire( theAxis->GetShape() ); - if ( aHydraulicWire.IsNull() ) - return false; // The polyline must be a single wire + Handle(HYDROData_PolylineXY) aPrevAxis = GetHydraulicAxis(); + if ( IsEqual( aPrevAxis, theAxis ) ) + return true; SetReferenceObject( theAxis, DataTag_HydraulicAxis ); @@ -279,14 +487,23 @@ void HYDROData_Stream::RemoveHydraulicAxis() SetToUpdate( true ); } -bool HYDROData_Stream::HasIntersection( const Handle(HYDROData_Profile)& theProfile, const TopoDS_Face& thePlane, - Standard_Real& outPar ) const +bool HYDROData_Stream::HasIntersection( const Handle(HYDROData_Profile)& theProfile, + const TopoDS_Face& thePlane, + Standard_Real& theOutPar ) const { Handle(HYDROData_PolylineXY) aHydAxis = GetHydraulicAxis(); - if ( theProfile.IsNull() || aHydAxis.IsNull() ) + return HasIntersection( aHydAxis, theProfile, thePlane, theOutPar ); +} + +bool HYDROData_Stream::HasIntersection( const Handle(HYDROData_PolylineXY)& theHydAxis, + const Handle(HYDROData_Profile)& theProfile, + const TopoDS_Face& thePlane, + Standard_Real& theOutPar ) +{ + if ( theProfile.IsNull() || !IsValidAsAxis( theHydAxis ) ) return false; - TopoDS_Wire aHydraulicWire = TopoDS::Wire( aHydAxis->GetShape() ); //guide line + TopoDS_Wire aHydraulicWire = TopoDS::Wire( theHydAxis->GetShape() ); //guide line TopoDS_Wire aProfileWire = TopoDS::Wire( theProfile->GetTopShape() ); if ( aHydraulicWire.IsNull() || aProfileWire.IsNull() ) return false; @@ -299,22 +516,22 @@ bool HYDROData_Stream::HasIntersection( const Handle(HYDROData_Profile)& theProf return false; TopoDS_Vertex aV1, aV2; if(aPrjProfile.ShapeType() == TopAbs_EDGE) - TopExp::Vertices(TopoDS::Edge(aPrjProfile), aV1, aV2); + TopExp::Vertices(TopoDS::Edge(aPrjProfile), aV1, aV2); else if(aPrjProfile.ShapeType() == TopAbs_WIRE) - TopExp::Vertices(TopoDS::Wire(aPrjProfile), aV1, aV2); + TopExp::Vertices(TopoDS::Wire(aPrjProfile), aV1, aV2); else if(aPrjProfile.ShapeType() == TopAbs_COMPOUND){ TopExp_Explorer anExp(aPrjProfile, TopAbs_WIRE); - if(anExp.More()) { - TopExp::Vertices(TopoDS::Wire(anExp.Current()), aV1, aV2); - } else { - anExp.Init(aPrjProfile, TopAbs_EDGE); - if(anExp.More()) { - TopExp::Vertices(TopoDS::Edge(anExp.Current()), aV1, aV2); - } - } + if(anExp.More()) { + TopExp::Vertices(TopoDS::Wire(anExp.Current()), aV1, aV2); + } else { + anExp.Init(aPrjProfile, TopAbs_EDGE); + if(anExp.More()) { + TopExp::Vertices(TopoDS::Edge(anExp.Current()), aV1, aV2); + } + } } if(aV1.IsNull() || aV2.IsNull()) - return false; + return false; gp_Pnt aPnt1 = BRep_Tool::Pnt(aV1); gp_Pnt aPnt2 = BRep_Tool::Pnt(aV2); aPnt1.SetZ(0.0); @@ -334,53 +551,52 @@ bool HYDROData_Stream::HasIntersection( const Handle(HYDROData_Profile)& theProf Standard_Integer anIndx(0); BRepExtrema_ExtCC aCC; aCC.Initialize(anEdg2); - outPar = 0.0; + theOutPar = 0.0; anExplo.Init(aHydraulicWire, TopAbs_EDGE); for(Standard_Integer j=1;anExplo.More();anExplo.Next(),j++) { - const TopoDS_Edge& anEdg1 = TopoDS::Edge(anExplo.Current()); - if(anEdg1.IsNull()) - continue; - Standard_Boolean hasSol(false); - aCC.Perform(anEdg1); + const TopoDS_Edge& anEdg1 = TopoDS::Edge(anExplo.Current()); + if(anEdg1.IsNull()) + continue; + Standard_Boolean hasSol(false); + aCC.Perform(anEdg1); if(aCC.IsDone()) { - // find minimal dist + // find minimal dist for(Standard_Integer i=1; i<= aCC.NbExt();i++) if(aCC.SquareDistance(i) < aSqDist) { aSqDist = aCC.SquareDistance(i); anIndx = i; - hasSol = true; - } - } - if(hasSol) { - if(aSqDist <= SquareTolerance) { // hasInt + hasSol = true; + } + } + if(hasSol) { + if(aSqDist <= SquareTolerance) { // hasInt const gp_Pnt& aPnt = aCC.PointOnE1(anIndx); if(aNum > 1) { TopExp::Vertices(anEdg1, aV1, aV2, Standard_True); - outPar += BRep_Tool::Pnt(aV1).Distance(aPnt); - } else { + theOutPar += BRep_Tool::Pnt(aV1).Distance(aPnt); + } else { Standard_Real aPar = aCC.ParameterOnE1(anIndx); - outPar = aPar; - } - hasInt = true; - break; - } else { - // no ints-n + theOutPar = aPar; + } + hasInt = true; + break; + } else { + // no ints-n if(aNum > 1) { TopExp::Vertices(anEdg1, aV1, aV2); - outPar += BRep_Tool::Pnt(aV1).Distance(BRep_Tool::Pnt(aV2)); - } - } - } else if(aNum > 1) { - TopExp::Vertices(anEdg1, aV1, aV2); - outPar += BRep_Tool::Pnt(aV1).Distance(BRep_Tool::Pnt(aV2)); - } + theOutPar += BRep_Tool::Pnt(aV1).Distance(BRep_Tool::Pnt(aV2)); + } + } + } else if(aNum > 1) { + TopExp::Vertices(anEdg1, aV1, aV2); + theOutPar += BRep_Tool::Pnt(aV1).Distance(BRep_Tool::Pnt(aV2)); + } } if(hasInt) return true; return false; } - bool HYDROData_Stream::AddProfile( const Handle(HYDROData_Profile)& theProfile ) { if ( theProfile.IsNull() ) @@ -407,6 +623,52 @@ bool HYDROData_Stream::AddProfile( const Handle(HYDROData_Profile)& theProfile ) return true; } +bool HYDROData_Stream::SetProfiles( const HYDROData_SequenceOfObjects& theProfiles, + const bool& theIsToOrder ) +{ + if ( theIsToOrder ) + { + for ( int i = 1; i <= theProfiles.Length(); ++i ) + { + Handle(HYDROData_Profile) aProfile = + Handle(HYDROData_Profile)::DownCast( theProfiles.Value( i ) ); + if ( aProfile.IsNull() ) + continue; + + if ( !AddProfile( aProfile ) ) + return false; + } + } + else // Just store the sequence of objects as is + { + bool anIsToUpdate = true; + + HYDROData_SequenceOfObjects anOldProfiles = GetProfiles(); + if ( anOldProfiles.Length() == theProfiles.Length() ) + { + anIsToUpdate = false; + + for ( int i = 1; i <= theProfiles.Length(); ++i ) + { + Handle(HYDROData_Entity) anOldProfile = anOldProfiles.Value( i ); + Handle(HYDROData_Entity) aNewProfile = theProfiles.Value( i ); + if ( !IsEqual( anOldProfile, aNewProfile ) ) + { + anIsToUpdate = true; + break; + } + } + } + + SetReferenceObjects( theProfiles, DataTag_Profile ); + + if ( anIsToUpdate ) + SetToUpdate( true ); + } + + return true; +} + HYDROData_SequenceOfObjects HYDROData_Stream::GetProfiles() const { return GetReferenceObjects( DataTag_Profile ); @@ -480,11 +742,14 @@ void HYDROData_Stream::insertProfileInToOrder( const Handle(HYDROData_Profile)& InsertReferenceObject( theProfile, DataTag_Profile, theBeforeIndex ); } -bool HYDROData_Stream::BuildFace( const Handle(HYDROData_PolylineXY)& theHydAxis, TopoDS_Face& thePlane) const +bool HYDROData_Stream::BuildFace( const Handle(HYDROData_PolylineXY)& theHydAxis, + TopoDS_Face& thePlane ) { - if ( theHydAxis.IsNull() ) return false; + if ( !IsValidAsAxis( theHydAxis ) ) + return false; + TopoDS_Wire aHydraulicWire = TopoDS::Wire( theHydAxis->GetShape() ); - if(aHydraulicWire.IsNull()) return false; + gp_Ax2 aX2(gp::XOY()); gp_Ax3 aX3(aX2); gp_Pln aPln(aX3); @@ -536,9 +801,9 @@ void HYDROData_Stream::updateProfilesOrder() #endif if ( aProfile.IsNull() || !HasIntersection( aProfile, aPlane, aPar ) ) continue; - + aDM.Bind( aPar, aProfile ); - aList.Append( aPar ); + aList.Append( aPar ); } if ( aList.IsEmpty() ) @@ -576,6 +841,11 @@ void HYDROData_Stream::updateProfilesOrder() #endif } +ObjectKind HYDROData_Stream::getAltitudeObjectType() const +{ + return KIND_STREAM_ALTITUDE; +} + void HYDROData_Stream::setParametersArray( const TColStd_Array1OfReal& theArray ) { if ( theArray.Length() == 0 ) @@ -686,6 +956,12 @@ void HYDROData_Stream::removeParameter( const int& theIndex ) if ( !aLabel.FindAttribute( TDataStd_RealArray::GetID(), aParamsArray ) ) return; + if ( aParamsArray->Length() == 1 ) + { + removeParametersArray(); + return; + } + TColStd_Array1OfReal aNewArr( aParamsArray->Lower(), aParamsArray->Upper() - 1 ); for ( int i = aParamsArray->Lower(), j = i, k = 0, n = aParamsArray->Upper(); i <= n; ++i, ++k )