#include "HYDROData_Document.h"
#include "HYDROData_PolylineXY.h"
#include "HYDROData_Profile.h"
-
-#include <BRep_Builder.hxx>
-#include <BRepBuilderAPI_MakeEdge.hxx>
-#include <BRepBuilderAPI_MakeWire.hxx>
-#include <BRepBuilderAPI_MakeFace.hxx>
+#include "HYDROData_ShapesGroup.h"
+#include "HYDROData_ShapesTool.h"
+#include "HYDROData_IAltitudeObject.h"
#include <TDataStd_RealArray.hxx>
+#include <Precision.hxx>
+
+#include <NCollection_DataMap.hxx>
+
+#include <TColStd_Array1OfReal.hxx>
+#include <TColStd_ListOfReal.hxx>
+#include <TColStd_ListIteratorOfListOfReal.hxx>
+#include <TCollection_CompareOfReal.hxx>
+#include <TColgp_Array1OfPnt.hxx>
+#include <TColgp_HArray1OfPnt.hxx>
+
#include <TopoDS.hxx>
#include <TopoDS_Wire.hxx>
#include <TopoDS_Shell.hxx>
#include <TopoDS_Vertex.hxx>
#include <TopExp.hxx>
#include <TopExp_Explorer.hxx>
+
+#include <Bnd_Box.hxx>
+
+#include <BRep_Builder.hxx>
+#include <BRepBuilderAPI_MakeEdge.hxx>
+#include <BRepBuilderAPI_MakeWire.hxx>
+#include <BRepBuilderAPI_MakeFace.hxx>
+
+#include <BRepBndLib.hxx>
#include <BRepProj_Projection.hxx>
#include <BRepExtrema_ExtCC.hxx>
+#include <BRepCheck_Analyzer.hxx>
+
+#include <gp.hxx>
#include <gp_Ax1.hxx>
#include <gp_Ax2.hxx>
#include <gp_Ax3.hxx>
#include <gp_Vec.hxx>
#include <gp_Pnt.hxx>
#include <gp_Pln.hxx>
-#include <gp.hxx>
-#include <Bnd_Box.hxx>
-#include <BRepBndLib.hxx>
-#include <TColStd_Array1OfReal.hxx>
-#include <Precision.hxx>
-#include <QStringList>
-#include <NCollection_DataMap.hxx>
-typedef NCollection_DataMap<Standard_Real, Handle(HYDROData_Profile)> HYDROData_DataMapOfRealOfHDProfile;
-//typedef HYDROData_DataMapOfRealOfHDProfile::Iterator HYDROData_DataMapIteratorOfDataMapOfRealOfHDProfile;
-#include <TColStd_ListOfReal.hxx>
-#include <TColStd_ListIteratorOfListOfReal.hxx>
-#include <TCollection_CompareOfReal.hxx>
-#include <SortTools_QuickSortOfReal.hxx>
-#include <TColgp_Array1OfPnt.hxx>
-#include <TColgp_HArray1OfPnt.hxx>
#include <GeomAPI_Interpolate.hxx>
#include <Geom_BSplineCurve.hxx>
+
#include <TopTools_Array1OfShape.hxx>
+
+#include <SortTools_QuickSortOfReal.hxx>
+
+#include <QColor>
+#include <QStringList>
+
+//#define DEB_STREAM 1
+#ifdef DEB_STREAM
//#define DEB_HASINT 1
-#ifdef DEB_HASINT
+//#define DEB_UPDATE 1
#include <BRepTools.hxx>
#include <TCollection_AsciiString.hxx>
-#include <BRep_Builder.hxx>
#endif
-#define PYTHON_STREAM_ID "KIND_STREAM"
+typedef NCollection_DataMap<Standard_Real, Handle(HYDROData_Profile)> HYDROData_DataMapOfRealOfHDProfile;
IMPLEMENT_STANDARD_HANDLE(HYDROData_Stream,HYDROData_NaturalObject)
IMPLEMENT_STANDARD_RTTIEXT(HYDROData_Stream,HYDROData_NaturalObject)
QStringList HYDROData_Stream::DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const
{
- QStringList aResList;
-
- Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( myLab );
- if ( aDocument.IsNull() )
- return aResList;
-
- QString aDocName = aDocument->GetDocPyName();
- QString aStreamName = GetName();
-
- 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( "" );
+ QStringList aResList = dumpObjectCreation( theTreatedObjects );
// TODO
{
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()
+{
+ updateProfilesOrder();
+ UpdatePrs();
+}
+
+void HYDROData_Stream::UpdatePrs()
{
HYDROData_NaturalObject::Update();
Handle(HYDROData_PolylineXY) aHydAxis = GetHydraulicAxis();
HYDROData_SequenceOfObjects aRefProfiles = GetProfiles();
- if ( aHydAxis.IsNull() || aRefProfiles.IsEmpty() )
+ if ( aHydAxis.IsNull() || aRefProfiles.Length() < 2 )
return;
-
- TopoDS_Shell a2dShell;
- BRep_Builder a2dShellBuilder;
- a2dShellBuilder.MakeShell( a2dShell );
-
+
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());
+ 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
+ TopTools_Array1OfShape anArrOf2DProfiles(1, aRefProfiles.Length());
+
+ // Pre-processing
HYDROData_SequenceOfObjects::Iterator anIter( aRefProfiles );
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 ) || !aProfile->GetRightPoint( aPnt2 ) )
continue;
- anArrOfProfiles.SetValue(i,aProfile->GetShape3D());
+ 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);
- if ( anIsFirst )
- {
- aPrevFirstPoint = aCurFirstPoint;
- aPrevLastPoint = aCurLastPoint;
- anIsFirst = 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() );
- }
-
- aPrevFirstPoint = aCurFirstPoint;
- aPrevLastPoint = aCurLastPoint;
+ 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;
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;
+ aBSpline.Nullify();
+ aBSpline = buildInterpolationCurve (anArrayOfLPnt);
if(aBSpline.IsNull())
return;
aMakeEdge.Init(aBSpline);
if(aMakeEdge.IsDone())
- anEdgRight = aMakeEdge.Edge();
+ anEdgRight = aMakeEdge.Edge();
+ if(anEdgRight.IsNull())
+ return;
BRep_Builder aBB;
TopoDS_Compound aCmp;
aBB.MakeCompound(aCmp);
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())
+ SetShape3D(aCmp);
+#ifdef DEB_UPDATE
+ else {
+ BRepTools::Write(aCmp, "str3d.brep");
+ SetShape3D(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;
+ 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();
+
+ // Make wire for 2D presentation with updating of corresponding edges
+ BRepBuilderAPI_MakeWire aMakeWire;
+
+ aMakeWire.Add( aBotEdge );
+ aBotEdge = aMakeWire.Edge();
+
+ aMakeWire.Add( anEdgLeft );
+ anEdgLeft = aMakeWire.Edge();
+
+ aMakeWire.Add( aTopEdge );
+ aTopEdge = aMakeWire.Edge();
+
+ aMakeWire.Add( anEdgRight );
+ anEdgRight = 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())
+ SetTopShape(aCmp);
+#ifdef DEB_UPDATE
+ else {
+ BRepTools::Write(aCmp, "str2d.brep");
+ SetTopShape(aCmp);
+ }
+#endif
+
+ // Create the stream groups
+ QString aLeftGroupName = GetName() + "_Left_Bank";
+
+ Handle(HYDROData_ShapesGroup) aLeftGroup = createGroupObject();
+ aLeftGroup->SetName( aLeftGroupName );
+ aLeftGroup->AddShape( anEdgLeft );
+
+ QString aRightGroupName = GetName() + "_Right_Bank";
+
+ Handle(HYDROData_ShapesGroup) aRightGroup = createGroupObject();
+ aRightGroup->SetName( aRightGroupName );
+ aRightGroup->AddShape( anEdgRight );
+
+ QString anInGroupName = GetName() + "_Inlet";
+
+ Handle(HYDROData_ShapesGroup) anInGroup = createGroupObject();
+ anInGroup->SetName( anInGroupName );
+ anInGroup->AddShape( aBotEdge );
+
+ QString anOutGroupName = GetName() + "_Outlet";
+
+ Handle(HYDROData_ShapesGroup) anOutGroup = createGroupObject();
+ anOutGroup->SetName( anOutGroupName );
+ anOutGroup->AddShape( aTopEdge );
+
+ // This peace of code is for testing of functionality of altitude,
+ // will be removed by adv when testing will be finished
+ Handle(HYDROData_IAltitudeObject) anAltObj = GetAltitudeObject();
+ gp_XY aTestPnt( 5, 0 );
+ anAltObj->GetAltitudeForPoint( aTestPnt );
+ // End of test code
+
}
-bool HYDROData_Stream::SetHydraulicAxis( const Handle(HYDROData_PolylineXY)& theAxis )
+QColor HYDROData_Stream::DefaultFillingColor()
{
- Handle(HYDROData_PolylineXY) aPrevAxis = GetHydraulicAxis();
+ return QColor( Qt::green );
+}
- if ( theAxis.IsNull() )
- {
- RemoveHydraulicAxis();
- return !aPrevAxis.IsNull();
- }
+QColor HYDROData_Stream::DefaultBorderColor()
+{
+ return QColor( Qt::transparent );
+}
- if ( IsEqual( aPrevAxis, theAxis ) )
+bool HYDROData_Stream::IsValidAsAxis( const Handle(HYDROData_PolylineXY)& theHydAxis )
+{
+ if ( theHydAxis.IsNull() )
return false;
- TopoDS_Wire aHydraulicWire = TopoDS::Wire( theAxis->GetShape() );
- if ( aHydraulicWire.IsNull() )
- return false; // The polyline must be a single wire
+ 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;
+
+ Handle(HYDROData_PolylineXY) aPrevAxis = GetHydraulicAxis();
+ if ( IsEqual( aPrevAxis, theAxis ) )
+ return true;
SetReferenceObject( theAxis, DataTag_HydraulicAxis );
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_PolylineXY)& theHydAxis,
+ const Handle(HYDROData_Profile)& theProfile,
+ const TopoDS_Face& thePlane,
+ Standard_Real& outPar)
{
- Handle(HYDROData_PolylineXY) aHydAxis = GetHydraulicAxis();
- if ( theProfile.IsNull() || aHydAxis.IsNull() )
+ 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;
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);
outPar = 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 {
+ outPar += BRep_Tool::Pnt(aV1).Distance(aPnt);
+ } else {
Standard_Real aPar = aCC.ParameterOnE1(anIndx);
- outPar = aPar;
- }
- hasInt = true;
- break;
- } else {
- // no ints-n
+ outPar = 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));
- }
+ 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));
+ }
}
if(hasInt)
return true;
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 )
{
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 ) const
{
- 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);
#endif
if ( aProfile.IsNull() || !HasIntersection( aProfile, aPlane, aPar ) )
continue;
-
+
aDM.Bind( aPar, aProfile );
- aList.Append( aPar );
+ aList.Append( aPar );
}
if ( aList.IsEmpty() )
#endif
}
+ObjectKind HYDROData_Stream::getAltitudeObjectType() const
+{
+ return KIND_STREAM_ALTITUDE;
+}
+
void HYDROData_Stream::setParametersArray( const TColStd_Array1OfReal& theArray )
{
if ( theArray.Length() == 0 )
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 )
