X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_Stream.cxx;h=c2def15f030fcaccf22861a997e6d5de74748f99;hb=545854182f0363f61284d5abe34c3627d4f3b088;hp=e49b2b795583bbe69d612a933165b53a64748f63;hpb=2d99821157e770385d7af917b2d22d6aa3cacb7e;p=modules%2Fhydro.git diff --git a/src/HYDROData/HYDROData_Stream.cxx b/src/HYDROData/HYDROData_Stream.cxx index e49b2b79..c2def15f 100644 --- a/src/HYDROData/HYDROData_Stream.cxx +++ b/src/HYDROData/HYDROData_Stream.cxx @@ -1,9 +1,32 @@ +// Copyright (C) 2014-2015 EDF-R&D +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #include "HYDROData_Stream.h" #include "HYDROData_Document.h" #include "HYDROData_PolylineXY.h" +#include "HYDROData_Polyline3D.h" #include "HYDROData_Profile.h" +#include "HYDROData_ShapesGroup.h" +#include "HYDROData_ShapesTool.h" +#include "HYDROData_IAltitudeObject.h" +#include "HYDROData_IProfilesInterpolator.h" +#include "HYDROData_Tool.h" #include @@ -50,7 +73,7 @@ #include #include -#include +#include #include @@ -65,8 +88,6 @@ #include #endif -#define PYTHON_STREAM_ID "KIND_STREAM" - typedef NCollection_DataMap HYDROData_DataMapOfRealOfHDProfile; IMPLEMENT_STANDARD_HANDLE(HYDROData_Stream,HYDROData_NaturalObject) @@ -74,7 +95,7 @@ IMPLEMENT_STANDARD_RTTIEXT(HYDROData_Stream,HYDROData_NaturalObject) HYDROData_Stream::HYDROData_Stream() -: HYDROData_NaturalObject() +: HYDROData_NaturalObject( Geom_3d ) { } @@ -84,22 +105,28 @@ 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( "" ); + // Set bottom polyline if exists + const Handle(HYDROData_Polyline3D) aBottomPolyline = GetBottomPolyline(); + if ( !aBottomPolyline.IsNull() ) { + setPythonReferenceObject( theTreatedObjects, aResList, aBottomPolyline, "SetBottomPolyline" ); + } - // TODO + aResList << QString( "" ); + aResList << QString( "%1.Update();" ).arg( aName ); + aResList << QString( "" ); return aResList; } @@ -118,16 +145,6 @@ HYDROData_SequenceOfObjects HYDROData_Stream::GetAllReferenceObjects() const return aResSeq; } -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 ) { @@ -135,192 +152,179 @@ Handle(Geom_BSplineCurve) HYDROData_Stream::buildInterpolationCurve( GeomAPI_Interpolate anInterpolator (theArrayOfPnt, Standard_False, 1.0e-5); anInterpolator.Perform() ; if (anInterpolator.IsDone()) - aBSpline = anInterpolator.Curve(); + aBSpline = anInterpolator.Curve(); return aBSpline; } void HYDROData_Stream::Update() { - HYDROData_NaturalObject::Update(); + updateProfilesOrder(); - Handle(HYDROData_PolylineXY) aHydAxis = GetHydraulicAxis(); - HYDROData_SequenceOfObjects aRefProfiles = GetProfiles(); - if ( aHydAxis.IsNull() || aRefProfiles.IsEmpty() ) - return; - - 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()); - TopTools_Array1OfShape anArrOf2DProfiles(1, aRefProfiles.Length()); + // Update bottom polyline if exists + const Handle(HYDROData_Polyline3D) aBottomPolyline = GetBottomPolyline(); + if ( !aBottomPolyline.IsNull() ) { + if ( GenerateBottomPolyline() ) { + Handle(HYDROData_PolylineXY) aPolylineXY = aBottomPolyline->GetPolylineXY(); + if ( !aPolylineXY.IsNull() ) { + aPolylineXY->Update(); + } + aBottomPolyline->Update(); + } + } + + UpdatePrs(); +} + +bool HYDROData_Stream::IsHas2dPrs() const +{ + return true; +} + +bool HYDROData_Stream::CreatePresentations( const Handle(HYDROData_PolylineXY)& theHydAxis, + const HYDROData_SequenceOfObjects& theProfiles, + PrsDefinition& thePrs ) +{ + if ( theHydAxis.IsNull() || theProfiles.Length() < 2 ) + return false; + + Handle(TColgp_HArray1OfPnt) anArrayOfFPnt = new TColgp_HArray1OfPnt(1, theProfiles.Length()); + Handle(TColgp_HArray1OfPnt) anArrayOfLPnt = new TColgp_HArray1OfPnt(1, theProfiles.Length()); + Handle(TopTools_HArray1OfShape) anArrOfProfiles = new TopTools_HArray1OfShape(1, theProfiles.Length()); + Handle(TopTools_HArray1OfShape) anArrOf2DProfiles = new TopTools_HArray1OfShape(1, theProfiles.Length()); // Pre-processing - HYDROData_SequenceOfObjects::Iterator anIter( aRefProfiles ); + 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(); + continue; + + const TopoDS_Shape& aProf3d = aProfile->GetShape3D(); gp_XY aPnt1, aPnt2; - if ( !aProfile->GetFirstPoint( aPnt1 ) || !aProfile->GetLastPoint( aPnt2 ) ) + if ( !aProfile->GetLeftPoint( aPnt1, false ) || !aProfile->GetRightPoint( aPnt2, false ) ) continue; - anArrOfProfiles.SetValue(i,aProfile->GetShape3D());//aProfile->GetTopShape(); - anArrOf2DProfiles.SetValue(i,aProfile->GetTopShape()); - - 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); + + anArrOfProfiles->SetValue(i,aProfile->GetShape3D());//aProfile->GetTopShape(); + anArrOf2DProfiles->SetValue(i,aProfile->GetTopShape()); + + gp_Pnt aCurFP, 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); } + return CreatePresentations( anArrayOfFPnt, anArrayOfLPnt, anArrOfProfiles, anArrOf2DProfiles, thePrs ); +} - // Construct of the 3D presentation - Handle(Geom_BSplineCurve) aBSpline = buildInterpolationCurve (anArrayOfFPnt); - if(aBSpline.IsNull()) - return; - TopoDS_Edge anEdgLeft, anEdgRight; - BRepBuilderAPI_MakeEdge aMakeEdge(aBSpline); - if(aMakeEdge.IsDone()) - anEdgLeft = aMakeEdge.Edge(); - if(anEdgLeft.IsNull()) - return; - aBSpline.Nullify(); - aBSpline = buildInterpolationCurve (anArrayOfLPnt); - if(aBSpline.IsNull()) - return; - aMakeEdge.Init(aBSpline); - if(aMakeEdge.IsDone()) - anEdgRight = aMakeEdge.Edge(); - if(anEdgRight.IsNull()) - return; - BRep_Builder aBB; - TopoDS_Compound aCmp; - aBB.MakeCompound(aCmp); - anIter.Init( aRefProfiles ); - for (int i=1 ; i < anArrOfProfiles.Length() +1; i++ ) - aBB.Add(aCmp, anArrOfProfiles.Value(i)); - aBB.Add(aCmp,anEdgLeft); - aBB.Add(aCmp,anEdgRight); - BRepCheck_Analyzer aCh(aCmp); - if(aCh.IsValid()) - SetShape3D(aCmp); -#ifdef DEB_UPDATE - else { - BRepTools::Write(aCmp, "str3d.brep"); - SetShape3D(aCmp); - } -#endif +void HYDROData_Stream::UpdatePrs() +{ + HYDROData_NaturalObject::Update(); - // 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; - aMakeEdge.Init(aBSpline); - if(aMakeEdge.IsDone()) - anEdgLeft = aMakeEdge.Edge(); - aBSpline.Nullify(); - aBSpline = buildInterpolationCurve (anArrayOfLPnt); - if(aBSpline.IsNull()) - return; - aMakeEdge.Init(aBSpline); - if(aMakeEdge.IsDone()) - anEdgRight = aMakeEdge.Edge(); - if(anEdgRight.IsNull()) - return; - 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(); + Handle(HYDROData_PolylineXY) aHydAxis = GetHydraulicAxis(); + HYDROData_SequenceOfObjects aRefProfiles = GetProfiles(); - BRepBuilderAPI_MakeWire aMakeWire( aBotEdge, anEdgLeft, aTopEdge,anEdgRight); - 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()) - SetTopShape(aCmp); -#ifdef DEB_UPDATE - else { - BRepTools::Write(aCmp, "str2d.brep"); - SetTopShape(aCmp); - } -#endif + 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() +QColor HYDROData_Stream::DefaultFillingColor() const { return QColor( Qt::green ); } -QColor HYDROData_Stream::DefaultBorderColor() +QColor HYDROData_Stream::DefaultBorderColor() const { return QColor( Qt::transparent ); } -QColor HYDROData_Stream::getDefaultFillingColor() const +bool HYDROData_Stream::IsValidAsAxis( const Handle(HYDROData_PolylineXY)& theHydAxis ) { - return DefaultFillingColor(); + 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; } -QColor HYDROData_Stream::getDefaultBorderColor() const +TopoDS_Shape HYDROData_Stream::GetLeftShape() const { - return DefaultBorderColor(); + HYDROData_SequenceOfObjects aGroups = GetGroups(); + return HYDROData_Tool::getFirstShapeFromGroup( aGroups, 1); } -bool HYDROData_Stream::SetHydraulicAxis( const Handle(HYDROData_PolylineXY)& theAxis ) +TopoDS_Shape HYDROData_Stream::GetRightShape() const { - Handle(HYDROData_PolylineXY) aPrevAxis = GetHydraulicAxis(); + HYDROData_SequenceOfObjects aGroups = GetGroups(); + return HYDROData_Tool::getFirstShapeFromGroup( aGroups, 2); +} - if ( theAxis.IsNull() ) - { - RemoveHydraulicAxis(); - return !aPrevAxis.IsNull(); - } +TopoDS_Shape HYDROData_Stream::GetInletShape() const +{ + HYDROData_SequenceOfObjects aGroups = GetGroups(); + return HYDROData_Tool::getFirstShapeFromGroup( aGroups, 3); +} - if ( IsEqual( aPrevAxis, theAxis ) ) +TopoDS_Shape HYDROData_Stream::GetOutletShape() const +{ + HYDROData_SequenceOfObjects aGroups = GetGroups(); + return HYDROData_Tool::getFirstShapeFromGroup( aGroups, 4); +} + +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 ); @@ -328,7 +332,7 @@ bool HYDROData_Stream::SetHydraulicAxis( const Handle(HYDROData_PolylineXY)& the updateProfilesOrder(); // Indicate model of the need to update the stream presentation - SetToUpdate( true ); + Changed( Geom_3d ); return true; } @@ -351,17 +355,26 @@ void HYDROData_Stream::RemoveHydraulicAxis() RemoveProfiles(); // Indicate model of the need to update the stream presentation - SetToUpdate( true ); + Changed( Geom_3d ); } -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; @@ -374,22 +387,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); @@ -409,53 +422,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() ) @@ -477,7 +489,53 @@ bool HYDROData_Stream::AddProfile( const Handle(HYDROData_Profile)& theProfile ) insertProfileInToOrder( theProfile, aProfileIndex ); // Indicate model of the need to update the stream presentation - SetToUpdate( true ); + Changed( Geom_3d ); + + 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 ) + Changed( Geom_3d ); + } return true; } @@ -519,22 +577,20 @@ bool HYDROData_Stream::RemoveProfile( const Handle(HYDROData_Profile)& theProfil removeParameter( aProfileIndex ); // Indicate model of the need to update the stream presentation - SetToUpdate( true ); + Changed( Geom_3d ); return true; } void HYDROData_Stream::RemoveProfiles() { - bool anIsToUpdate = IsMustBeUpdated() || NbReferenceObjects( DataTag_Profile ) > 0; - ClearReferenceObjects( DataTag_Profile ); // Remove the parameters array removeParametersArray(); // Indicate model of the need to update the stream presentation - SetToUpdate( anIsToUpdate ); + Changed( Geom_3d ); } void HYDROData_Stream::insertProfileInToOrder( const Handle(HYDROData_Profile)& theProfile, @@ -555,11 +611,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); @@ -611,9 +670,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() ) @@ -651,6 +710,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 ) @@ -761,6 +825,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 ) @@ -775,3 +845,324 @@ void HYDROData_Stream::removeParameter( const int& theIndex ) setParametersArray( aNewArr ); } + +bool HYDROData_Stream::GenerateBottomPolyline() +{ + // Get the document + Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( myLab ); + if ( aDocument.IsNull() ) { + return false; + } + + // Collect bottom points ( one bottom point from each profile of the stream ) + HYDROData_Profile::ProfilePoints aBottomPoints; + + HYDROData_SequenceOfObjects aSeqOfProfiles = GetProfiles(); + for ( int i = 1, aNb = aSeqOfProfiles.Size(); i <= aNb; i++ ) { + const Handle(HYDROData_Profile) aProfile = + Handle(HYDROData_Profile)::DownCast( aSeqOfProfiles.Value( i ) ); + if ( aProfile.IsNull() ) { + continue; + } + + aBottomPoints.Append( aProfile->GetBottomPoint() ); + } + + int aNbBottomPoints = aBottomPoints.Size(); + + if ( aNbBottomPoints < 2 ) { + return false; + } + + // Create bottom polyline object if the stream doesn't contain it yet + Handle(HYDROData_Polyline3D) aBottom = GetBottomPolyline(); + if ( aBottom.IsNull() ) { + aBottom = Handle(HYDROData_Polyline3D)::DownCast( aDocument->CreateObject( KIND_POLYLINE ) ); + QString aBaseName = GetName() + "_bottom"; + QString aName = HYDROData_Tool::GenerateObjectName( aDocument, aBaseName, QStringList(), true ); + aBottom->SetName( aName ); + + SetReferenceObject( aBottom, DataTag_BottomPolyline ); + } + + // Create 2D polyline if the bottom polyline doesn't contain it yet + Handle(HYDROData_PolylineXY) aPolylineXY = aBottom->GetPolylineXY(); + if ( aPolylineXY.IsNull() ) { + aPolylineXY = Handle(HYDROData_PolylineXY)::DownCast( aDocument->CreateObject( KIND_POLYLINEXY ) ); + QString aBaseName = GetName() + "_bottom_2d"; + QString aName = HYDROData_Tool::GenerateObjectName( aDocument, aBaseName, QStringList(), true ); + aPolylineXY->SetName( aName ); + aBottom->SetPolylineXY( aPolylineXY, false ); + } + + aPolylineXY->RemoveSections(); + aPolylineXY->AddSection( "", HYDROData_PolylineXY::SECTION_SPLINE, false ); + + // Create profile if the bottom polyline doesn't contain it yet + Handle(HYDROData_ProfileUZ) aProfileUZ = aBottom->GetProfileUZ(); + if ( aProfileUZ.IsNull() ) { + Handle(HYDROData_Profile) aProfile = + Handle(HYDROData_Profile)::DownCast( aDocument->CreateObject( KIND_PROFILE ) ); + QString aBaseName = GetName() + "_bottom_profile"; + QString aName = HYDROData_Tool::GenerateObjectName( aDocument, aBaseName, QStringList(), true ); + aProfile->SetName( aName ); + aProfileUZ = aProfile->GetProfileUZ( true ); + aBottom->SetProfileUZ( aProfileUZ ); + } + + aProfileUZ->RemoveSection( 0 ); + + aProfileUZ->CalculateAndAddPoints(aBottomPoints, aPolylineXY); + + return true; +} + +Handle(HYDROData_Polyline3D) HYDROData_Stream::GetBottomPolyline() const +{ + return Handle(HYDROData_Polyline3D)::DownCast( + GetReferenceObject( DataTag_BottomPolyline ) ); +} + +bool HYDROData_Stream::SetBottomPolyline( const Handle(HYDROData_Polyline3D)& theBottom ) +{ + if ( theBottom.IsNull() ) { + return false; + } + + SetReferenceObject( theBottom, DataTag_BottomPolyline ); + + return true; +} + +bool HYDROData_Stream::Interpolate( HYDROData_IProfilesInterpolator* theInterpolator ) +{ + // Get the document + Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( myLab ); + if ( aDocument.IsNull() ) { + return false; + } + + if ( theInterpolator->GetCalculatedProfilesNumber() < 1 ) { + theInterpolator->Calculate(); + } + + if ( theInterpolator->GetErrorCode() != OK ) { + return false; + } + + bool isOK = true; + + for ( int aProfileInd = 0; aProfileInd < theInterpolator->GetCalculatedProfilesNumber(); aProfileInd++ ) { + // Get calculated point coordinates + HYDROData_Profile::ProfilePoints aResultPoints = theInterpolator->GetResultProfilePoints( aProfileInd ); + if ( aResultPoints.IsEmpty() ) { + isOK = false; + continue; + } + + // Create profile object + Handle(HYDROData_Profile) aProfile = + Handle(HYDROData_Profile)::DownCast( aDocument->CreateObject( KIND_PROFILE ) ); + QString aBaseName = GetName() + "_interp_profile"; + QString aName = HYDROData_Tool::GenerateObjectName( aDocument, aBaseName ); + aProfile->SetName( aName ); + + // Fill the profile with points + aProfile->SetProfilePoints( aResultPoints ); + + // Add profile to the stream + bool isAdded = AddProfile( aProfile ); + if ( !isAdded ) { + aProfile->Remove(); + } + else + aProfile->Update(); + } + + if ( isOK ) + Update(); + + return isOK; +} + +void HYDROData_Stream::CopyTo( const Handle(HYDROData_Entity)& theDestination, + bool isGenerateNewName ) const +{ + // Get the document + Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( myLab ); + if ( aDocument.IsNull() ) { + return; + } + + // Call base method + HYDROData_Entity::CopyTo( theDestination, isGenerateNewName ); + + Handle(HYDROData_Stream) aStreamCopy = + Handle(HYDROData_Stream)::DownCast( theDestination ); + + // Copy bottom polyline if exists + if ( !aStreamCopy.IsNull() ) { + const Handle(HYDROData_Polyline3D) aBottom = GetBottomPolyline(); + if ( !aBottom.IsNull() ) { + aStreamCopy->ClearReferenceObjects( DataTag_BottomPolyline ); + aStreamCopy->GenerateBottomPolyline(); + const Handle(HYDROData_Polyline3D) aBottomCopy = aStreamCopy->GetBottomPolyline(); + if ( !aBottomCopy.IsNull() && !aBottomCopy->GetPolylineXY().IsNull() ) { + aBottomCopy->GetPolylineXY()->Update(); + aBottomCopy->Update(); + } + } + } +} + +bool HYDROData_Stream::CreatePresentations( const Handle(TColgp_HArray1OfPnt) theArrayOfFPnt, + const Handle(TColgp_HArray1OfPnt) theArrayOfLPnt, + const Handle(TopTools_HArray1OfShape) theArrOfProfiles, + const Handle(TopTools_HArray1OfShape) theArrOf2DProfiles, + PrsDefinition& thePrs ) +{ + if ( theArrayOfFPnt.IsNull() || theArrayOfLPnt.IsNull() || theArrOfProfiles.IsNull() ) { + return false; + } + + if ( theArrayOfFPnt->Length() != theArrayOfLPnt->Length() ) { + return false; + } + + // Construct of the 3D presentation + Handle(Geom_BSplineCurve) aBSpline = buildInterpolationCurve (theArrayOfFPnt); + if(aBSpline.IsNull()) + return false; + + TopoDS_Edge anEdgLeft, anEdgRight; + + BRepBuilderAPI_MakeEdge aMakeEdge(aBSpline); + if(aMakeEdge.IsDone()) + anEdgLeft = aMakeEdge.Edge(); + + if(anEdgLeft.IsNull()) + return false; + + aBSpline.Nullify(); + aBSpline = buildInterpolationCurve (theArrayOfLPnt); + if(aBSpline.IsNull()) + return false; + + aMakeEdge.Init(aBSpline); + if(aMakeEdge.IsDone()) + anEdgRight = aMakeEdge.Edge(); + + if(anEdgRight.IsNull()) + return false; + + BRep_Builder aBB; + TopoDS_Compound aCmp; + aBB.MakeCompound(aCmp); + for (int i=1 ; i < theArrOfProfiles->Length() +1; i++ ) + aBB.Add(aCmp, theArrOfProfiles->Value(i)); + + aBB.Add(aCmp,anEdgLeft); + aBB.Add(aCmp,anEdgRight); + 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 + int aNbPoints = theArrayOfFPnt->Length(); + Handle(TColgp_HArray1OfPnt) anArrayOfFPnt = new TColgp_HArray1OfPnt(1, aNbPoints); + Handle(TColgp_HArray1OfPnt) anArrayOfLPnt = new TColgp_HArray1OfPnt(1, aNbPoints); + for( int i=1; i <= aNbPoints; i++ ) { + gp_Pnt aPnt = theArrayOfFPnt->Value(i); + aPnt.SetZ(.0); // make 2d + anArrayOfFPnt->SetValue(i, aPnt); + aPnt = theArrayOfLPnt->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(); + + TopoDS_Shape aPrs2D; + + if ( !theArrOf2DProfiles.IsNull() ) { + aCmp.Nullify(); + aBB.MakeCompound(aCmp); + aBB.Add(aCmp,aFace); + for(int i=1;i <= theArrOf2DProfiles->Length(); i++) + aBB.Add(aCmp, theArrOf2DProfiles->Value(i)); + + aPrs2D = aCmp; + } else { + aPrs2D = aFace; + } + + aCh.Init(aPrs2D); + if(aCh.IsValid()) + thePrs.myPrs2D = aPrs2D; +#ifdef DEB_UPDATE + else { + BRepTools::Write(aPrs2D, "str2d.brep"); + thePrs.myPrs2D = aPrs2D; + } +#endif + + return true; +} \ No newline at end of file