UpdatePrs();
}
-void HYDROData_Stream::UpdatePrs()
+bool HYDROData_Stream::IsHas2dPrs() const
{
- HYDROData_NaturalObject::Update();
+ 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(HYDROData_PolylineXY) aHydAxis = GetHydraulicAxis();
- HYDROData_SequenceOfObjects aRefProfiles = GetProfiles();
- if ( aHydAxis.IsNull() || aRefProfiles.Length() < 2 )
- 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());
+ 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( 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;
+ continue;
+
const TopoDS_Shape& aProf3d = aProfile->GetShape3D();
gp_XY aPnt1, aPnt2;
- if ( !aProfile->GetLeftPoint( aPnt1 ) || !aProfile->GetRightPoint( aPnt2 ) )
+ if ( !aProfile->GetLeftPoint( aPnt1, false ) || !aProfile->GetRightPoint( aPnt2, false ) )
continue;
+
anArrOfProfiles.SetValue(i,aProfile->GetShape3D());//aProfile->GetTopShape();
anArrOf2DProfiles.SetValue(i,aProfile->GetTopShape());
// 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();
+
if(anEdgLeft.IsNull())
- return;
+ return false;
+
aBSpline.Nullify();
aBSpline = buildInterpolationCurve (anArrayOfLPnt);
if(aBSpline.IsNull())
- return;
+ return false;
+
aMakeEdge.Init(aBSpline);
if(aMakeEdge.IsDone())
anEdgRight = aMakeEdge.Edge();
+
if(anEdgRight.IsNull())
- return;
+ 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);
BRepCheck_Analyzer aCh(aCmp);
if(aCh.IsValid())
- SetShape3D(aCmp);
+ thePrs.myPrs3D = aCmp;
#ifdef DEB_UPDATE
else {
BRepTools::Write(aCmp, "str3d.brep");
- SetShape3D(aCmp);
+ thePrs.myPrs3D = aCmp;
}
#endif
aPnt.SetZ(.0);
anArrayOfLPnt->SetValue(i, aPnt);
}
+
aBSpline.Nullify();
aBSpline = buildInterpolationCurve (anArrayOfFPnt);
if(aBSpline.IsNull())
- return;
+ return false;
+
aMakeEdge.Init(aBSpline);
if(aMakeEdge.IsDone())
anEdgLeft = aMakeEdge.Edge();
+
aBSpline.Nullify();
aBSpline = buildInterpolationCurve (anArrayOfLPnt);
if(aBSpline.IsNull())
- return;
+ return false;
+
aMakeEdge.Init(aBSpline);
if(aMakeEdge.IsDone())
anEdgRight = aMakeEdge.Edge();
if(anEdgRight.IsNull())
- return;
+ 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();
BRepBuilderAPI_MakeWire aMakeWire;
aMakeWire.Add( aBotEdge );
- aBotEdge = aMakeWire.Edge();
+ thePrs.myInlet = aMakeWire.Edge();
aMakeWire.Add( anEdgLeft );
- anEdgLeft = aMakeWire.Edge();
+ thePrs.myLeftBank = aMakeWire.Edge();
aMakeWire.Add( aTopEdge );
- aTopEdge = aMakeWire.Edge();
+ thePrs.myOutlet = aMakeWire.Edge();
aMakeWire.Add( anEdgRight );
- anEdgRight = aMakeWire.Edge();
+ thePrs.myRightBank = aMakeWire.Edge();
TopoDS_Wire aSectProfileWire;
if(aMakeWire.IsDone())
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);
+ thePrs.myPrs2D = aCmp;
#ifdef DEB_UPDATE
else {
BRepTools::Write(aCmp, "str2d.brep");
- SetTopShape(aCmp);
+ thePrs.myPrs2D = aCmp;
}
-#endif
+#endif
+
+ return true;
+}
+
+void HYDROData_Stream::UpdatePrs()
+{
+ HYDROData_NaturalObject::Update();
+
+ Handle(HYDROData_PolylineXY) aHydAxis = GetHydraulicAxis();
+ HYDROData_SequenceOfObjects aRefProfiles = GetProfiles();
+
+ 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( anEdgLeft );
+ aLeftGroup->AddShape( aResultPrs.myLeftBank );
QString aRightGroupName = GetName() + "_Right_Bank";
Handle(HYDROData_ShapesGroup) aRightGroup = createGroupObject();
aRightGroup->SetName( aRightGroupName );
- aRightGroup->AddShape( anEdgRight );
+ aRightGroup->AddShape( aResultPrs.myRightBank );
QString anInGroupName = GetName() + "_Inlet";
Handle(HYDROData_ShapesGroup) anInGroup = createGroupObject();
anInGroup->SetName( anInGroupName );
- anInGroup->AddShape( aBotEdge );
+ anInGroup->AddShape( aResultPrs.myInlet );
QString anOutGroupName = GetName() + "_Outlet";
Handle(HYDROData_ShapesGroup) anOutGroup = createGroupObject();
anOutGroup->SetName( anOutGroupName );
- anOutGroup->AddShape( aTopEdge );
+ anOutGroup->AddShape( aResultPrs.myOutlet );
}
QColor HYDROData_Stream::DefaultFillingColor()
SetToUpdate( true );
}
+bool HYDROData_Stream::HasIntersection( const Handle(HYDROData_Profile)& theProfile,
+ const TopoDS_Face& thePlane,
+ Standard_Real& theOutPar ) const
+{
+ Handle(HYDROData_PolylineXY) aHydAxis = GetHydraulicAxis();
+ 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& outPar)
+ const Handle(HYDROData_Profile)& theProfile,
+ const TopoDS_Face& thePlane,
+ Standard_Real& theOutPar )
{
if ( theProfile.IsNull() || !IsValidAsAxis( theHydAxis ) )
return false;
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());
const gp_Pnt& aPnt = aCC.PointOnE1(anIndx);
if(aNum > 1) {
TopExp::Vertices(anEdg1, aV1, aV2, Standard_True);
- outPar += BRep_Tool::Pnt(aV1).Distance(aPnt);
+ theOutPar += BRep_Tool::Pnt(aV1).Distance(aPnt);
} else {
Standard_Real aPar = aCC.ParameterOnE1(anIndx);
- outPar = aPar;
+ theOutPar = aPar;
}
hasInt = true;
break;
// no ints-n
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);
- outPar += BRep_Tool::Pnt(aV1).Distance(BRep_Tool::Pnt(aV2));
+ theOutPar += BRep_Tool::Pnt(aV1).Distance(BRep_Tool::Pnt(aV2));
}
}
if(hasInt)
return false;
}
-bool HYDROData_Stream::HasIntersection( const Handle(HYDROData_Profile)& theProfile, const TopoDS_Face& thePlane,
- Standard_Real& outPar ) const
-{
- Handle(HYDROData_PolylineXY) aHydAxis = GetHydraulicAxis();
-
- return HasIntersection( aHydAxis, theProfile, thePlane, outPar );
-}
-
-
bool HYDROData_Stream::AddProfile( const Handle(HYDROData_Profile)& theProfile )
{
if ( theProfile.IsNull() )
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 );
}
bool HYDROData_Stream::BuildFace( const Handle(HYDROData_PolylineXY)& theHydAxis,
- TopoDS_Face& thePlane ) const
+ TopoDS_Face& thePlane )
{
if ( !IsValidAsAxis( theHydAxis ) )
return false;
continue;
aDM.Bind( aPar, aProfile );
- aList.Append( aPar );
+ aList.Append( aPar );
}
if ( aList.IsEmpty() )
