#include <BRepExtrema_ExtCC.hxx>
#include <BRepCheck_Analyzer.hxx>
-#include <BRepLib_MakeEdge.hxx>
-#include <BRepLib_MakeWire.hxx>
-#include <BRep_Builder.hxx>
-#include <GeomProjLib.hxx>
-#include <Geom_TrimmedCurve.hxx>
-#include <Geom_Plane.hxx>
-#include <BRepTools_WireExplorer.hxx>
-#include <TopTools_IndexedMapOfShape.hxx>
-#include <BRepBuilderAPI_MakeFace.hxx>
-
#include <gp.hxx>
#include <gp_Ax1.hxx>
#include <gp_Ax2.hxx>
#include <Geom_BSplineCurve.hxx>
#include <TopTools_HArray1OfShape.hxx>
+#include <TopTools_IndexedMapOfOrientedShape.hxx>
+#include <TopTools_ListIteratorOfListOfShape.hxx>
+#include <TopTools_SequenceOfShape.hxx>
+#include <TopTools_IndexedMapOfShape.hxx>
#include <SortTools_QuickSortOfReal.hxx>
#include <TCollection_AsciiString.hxx>
#endif
+#include <assert.h>
+
typedef NCollection_DataMap<Standard_Real, Handle(HYDROData_Profile)> HYDROData_DataMapOfRealOfHDProfile;
IMPLEMENT_STANDARD_HANDLE(HYDROData_Stream,HYDROData_NaturalObject)
void HYDROData_Stream::Update()
{
- updateProfilesOrder();
+ if (!GetHydraulicAxis().IsNull())
+ updateProfilesOrder();
// Update bottom polyline if exists
const Handle(HYDROData_Polyline3D) aBottomPolyline = GetBottomPolyline();
Handle_HYDROData_DTM dtm = DTM();
dtm->Update();
UpdatePrs( dtm );
+
+ HYDROData_NaturalObject::Update();
}
bool HYDROData_Stream::IsHas2dPrs() const
if( profiles.Length() < 2 )
return false;
+ TopoDS_Shape Out3dPres;
+ TopoDS_Shape Out2dPres;
+ TopoDS_Shape OutLeftB;
+ TopoDS_Shape OutRightB;
+ TopoDS_Shape OutInlet;
+ TopoDS_Shape OutOutlet;
+
+ theDTM->GetPresentationShapes(Out3dPres, Out2dPres, OutLeftB, OutRightB, OutInlet, OutOutlet);
+
+ thePrs.myInlet = TopoDS::Wire(OutInlet);
+ thePrs.myOutlet = TopoDS::Wire(OutOutlet);
+ thePrs.myLeftBank = TopoDS::Wire(OutLeftB);
+ thePrs.myRightBank = TopoDS::Wire(OutRightB);
+ thePrs.myPrs2D = Out2dPres;
+ thePrs.myPrs3D = Out3dPres;
/*std::vector<TopoDS_Wire> profiles3d;
profiles3d.reserve(profiles.Length());
profiles3d.push_back( TopoDS::Wire(aProfileShape) );
}*/
- CreatePresentationsIntern( theDTM, thePrs );
return true;
}
bool HYDROData_Stream::IsValidAsAxis( const Handle(HYDROData_PolylineXY)& theHydAxis )
{
if ( theHydAxis.IsNull() )
- return false;
+ return true;
TopoDS_Shape aHydraulicShape = theHydAxis->GetShape();
if ( aHydraulicShape.IsNull() ||
void HYDROData_Stream::SetDDZ( double theDDZ )
{
DTM()->SetDDZ( theDDZ );
+ Changed( Geom_3d );
}
double HYDROData_Stream::GetSpatialStep() const
void HYDROData_Stream::SetSpatialStep( double theSpatialStep )
{
DTM()->SetSpatialStep( theSpatialStep );
+ Changed( Geom_3d );
}
bool HYDROData_Stream::SetHydraulicAxis( const Handle(HYDROData_PolylineXY)& theAxis )
return HasIntersection( aHydAxis, theProfile, thePlane, theOutPar );
}
+#include <BRepAlgo_NormalProjection.hxx>
+
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 ) )
+ if ( theProfile.IsNull() /*|| !IsValidAsAxis( theHydAxis )*/ )
return false;
+ if (theHydAxis.IsNull())
+ return true; //empty h_axis; its's OK
+
TopoDS_Wire aHydraulicWire = TopoDS::Wire( theHydAxis->GetShape() ); //guide line
TopoDS_Wire aProfileWire = TopoDS::Wire( theProfile->GetTopShape() );
- if ( aHydraulicWire.IsNull() || aProfileWire.IsNull() )
+ if ( aProfileWire.IsNull() )
return false;
- BRepProj_Projection aProjector (aProfileWire, thePlane, gp::OZ().Direction());
- if(!aProjector.IsDone())
+ //BRepProj_Projection aProjector (aProfileWire, thePlane, gp::OZ().Direction());
+ BRepAlgo_NormalProjection nproj(thePlane);
+ nproj.Add(aProfileWire);
+ nproj.SetDefaultParams();
+ nproj.Build();
+ if(!nproj.IsDone())
return false;
- TopoDS_Shape aPrjProfile = aProjector.Shape();
+ TopoDS_Shape aPrjProfile = nproj.Projection();
if(aPrjProfile.IsNull())
return false;
TopoDS_Vertex aV1, aV2;
if ( theProfile.IsNull() )
return false;
- Handle(HYDROData_PolylineXY) aHydAxis = GetHydraulicAxis();
- if ( aHydAxis.IsNull() )
- return false;
+ // Handle(HYDROData_PolylineXY) aHydAxis = GetHydraulicAxis();
+ // if ( aHydAxis.IsNull() )
+ // return false;
TopoDS_Face aPlane;
- if(!BuildFace(aHydAxis, aPlane))
- return false;
+ BuildRefFace( aPlane );
Standard_Real aPar(.0);
if ( HasReference( theProfile, DataTag_Profile ) || !HasIntersection( theProfile, aPlane, aPar ) )
void HYDROData_Stream::insertProfileInToOrder( const Handle(HYDROData_Profile)& theProfile,
const int theBeforeIndex )
{
- Handle(HYDROData_PolylineXY) aHydAxis = GetHydraulicAxis();
- if ( theProfile.IsNull() || aHydAxis.IsNull() )
+ //Handle(HYDROData_PolylineXY) aHydAxis = GetHydraulicAxis();
+ if ( theProfile.IsNull() )
return;
- TopoDS_Wire aHydraulicWire = TopoDS::Wire( aHydAxis->GetShape() );
+ //TopoDS_Wire aHydraulicWire = TopoDS::Wire( aHydAxis->GetShape() );
TopoDS_Wire aProfileWire = TopoDS::Wire( theProfile->GetTopShape() );
- if ( aHydraulicWire.IsNull() || aProfileWire.IsNull() )
+ if ( aProfileWire.IsNull() )
return;
if ( theBeforeIndex == -1 )
InsertReferenceObject( theProfile, DataTag_Profile, theBeforeIndex );
}
-bool HYDROData_Stream::BuildFace( const Handle(HYDROData_PolylineXY)& theHydAxis,
- TopoDS_Face& thePlane )
+void HYDROData_Stream::BuildRefFace( TopoDS_Face& thePlane )
{
- if ( !IsValidAsAxis( theHydAxis ) )
- return false;
-
- TopoDS_Wire aHydraulicWire = TopoDS::Wire( theHydAxis->GetShape() );
-
- gp_Ax2 aX2(gp::XOY());
- gp_Ax3 aX3(aX2);
- gp_Pln aPln(aX3);
- Bnd_Box B;
- BRepBndLib::Add(aHydraulicWire,B);
- Standard_Real axmin,aymin,azmin,axmax,aymax,azmax;
- B.Get(axmin,aymin,azmin,axmax,aymax,azmax);
- BRepBuilderAPI_MakeFace aMkr(aPln, axmin-500., axmax+500., aymin-500., aymax+500.); // to be tuned later according max/ Profile deviation
- if(!aMkr.IsDone() || aMkr.Shape().IsNull()) return false;
- thePlane = TopoDS::Face(aMkr.Shape());
- return true;
+ thePlane = BRepBuilderAPI_MakeFace(gp_Pln(gp_Pnt(0,0,0),gp_Dir(0,0,1))).Face();
}
void HYDROData_Stream::updateProfilesOrder()
return;
TopoDS_Face aPlane;
- if ( !BuildFace( aHydAxis, aPlane ) )
- return;
+ BuildRefFace( aPlane );
Standard_Real aPar( .0 );
}
}
}
-
-static void ProjWireOnPlane(const TopoDS_Wire& inpWire, const Handle_Geom_Plane& RefPlane, TopoDS_Wire& outWire)
-{
- BRepTools_WireExplorer ex(TopoDS::Wire(inpWire.Oriented(TopAbs_FORWARD)));
- BRepLib_MakeWire WM;
- for (;ex.More();ex.Next())
- {
- const TopoDS_Edge& CE = ex.Current();
- double f, l;
- Handle(Geom_Curve) C3d = BRep_Tool::Curve(CE, f, l);
- Handle(Geom_Curve) ProjectedCurve = GeomProjLib::ProjectOnPlane(new Geom_TrimmedCurve(C3d, f, l), RefPlane, RefPlane->Position().Direction(), Standard_True);
- TopoDS_Edge ProjEdge = BRepLib_MakeEdge(ProjectedCurve);
- WM.Add(ProjEdge); //auto sharing between edges if vertex is coincident
- }
- outWire = WM.Wire();
- outWire.Orientation(inpWire.Orientation()); //take from the original wire
-}
-
-
-static void Get2dFaceFrom3dPres(const TopoDS_Compound& cmp, TopoDS_Face& outF )
-{
- Handle_Geom_Plane refpl = new Geom_Plane(gp_Pnt(0,0,0), gp_Dir(0,0,1));
- BRepLib_MakeWire WM;
- TopoDS_Iterator it(cmp);
- //TopTools_IndexedMapOfShape IntW;
- for (;it.More(); it.Next())
- {
- const TopoDS_Wire& W = TopoDS::Wire(it.Value());
- if (W.Orientation() != TopAbs_INTERNAL)
- {
- //use list of edges to protect againts non-manifold cases.
- //auto sharing between edges will be added automatically
- TopTools_IndexedMapOfShape ME;
- TopTools_ListOfShape LE;
- TopExp::MapShapes(W, TopAbs_EDGE, ME);
- for (int i = 1; i <= ME.Extent(); i++)
- LE.Append(ME(i));
- WM.Add(LE);
- }
- //else
- // IntW.Add(W);
- }
-
- TopoDS_Wire outW;
- ProjWireOnPlane(WM.Wire(), refpl, outW);
- BRepBuilderAPI_MakeFace mf(refpl, outW); //check inside is true by def
- outF = mf.Face();
-
- ///!!! the internal wires cant be added with 'internal' ori.
- // it's possible to do with brep builder yet the result will not be correct!
- // more proper way is to use BOP operation here.
- /*for (int i = 1; i <= IntW.Extent(); i++)
- {
- TopoDS_Wire outIW;
- const TopoDS_Wire& W = TopoDS::Wire(IntW(i));
- ProjWireOnPlane(W, refpl, outIW);
- BB.Add(outF, outIW);
- }*/
-}
-
-void HYDROData_Stream::CreatePresentationsIntern( const Handle_HYDROData_DTM& theDTM,
- PrsDefinition& thePrs )
-{
- TopoDS_Compound cmp = TopoDS::Compound(theDTM->GetShape(HYDROData_DTM::DataTag_DTM_Shape));
- thePrs.myPrs3D = cmp;
- NCollection_Sequence<TopoDS_Wire> WW;
- TopoDS_Iterator it(cmp);
- for (;it.More(); it.Next())
- WW.Append(TopoDS::Wire(it.Value()));
-
- //same order as in HYDROData_DTM::Update()
- thePrs.myLeftBank = WW.First();
- thePrs.myRightBank = WW.Last();
- thePrs.myInlet = WW(1); //TODO check this!!
- thePrs.myOutlet = WW(WW.Length() - 1);
-
- TopoDS_Face outF;
- Get2dFaceFrom3dPres(cmp, outF);
- thePrs.myPrs2D = outF;
-
- /*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;*/
-}
-
void HYDROData_Stream::CreatePresentations( const Handle(TColgp_HArray1OfPnt) theArrayOfFPnt,
const Handle(TColgp_HArray1OfPnt) theArrayOfLPnt,
const Handle(TopTools_HArray1OfShape) theArrOfProfiles,
}
std::vector<HYDROData_Bathymetry::AltitudePoints> dummy;
- TopoDS_Compound cmp = HYDROData_DTM::Create3DShape(left, right, dummy);
- TopoDS_Iterator it(cmp);
- thePrs.myLeftBank = TopoDS::Wire(it.Value());
- it.Next();
- thePrs.myRightBank = TopoDS::Wire(it.Value());
+ TopTools_IndexedMapOfOrientedShape ll = HYDROData_DTM::Create3DShape(left, right, dummy);
+
+ TopoDS_Shape LB, RB, IL, OL;
- thePrs.myInlet = TopoDS::Wire(theArrOfProfiles->Value(theArrOfProfiles->Lower())); //TODO check that
- thePrs.myOutlet = TopoDS::Wire(theArrOfProfiles->Value(theArrOfProfiles->Upper()));
+ if (!ll.IsEmpty())
+ {
+ LB = TopoDS::Wire(ll(1));
+ RB = TopoDS::Wire(ll(2));
+ }
+
+ IL = TopoDS::Wire(theArrOfProfiles->Value(theArrOfProfiles->Lower())); //TODO check that
+ OL = TopoDS::Wire(theArrOfProfiles->Value(theArrOfProfiles->Upper()));
//make new compound so it's shapes will be in known order to build correct projection
BRep_Builder BB;
TopoDS_Compound newCmp;
BB.MakeCompound(newCmp);
- BB.Add(newCmp, thePrs.myLeftBank);
- BB.Add(newCmp, thePrs.myInlet);
- BB.Add(newCmp, thePrs.myOutlet);
- BB.Add(newCmp, thePrs.myRightBank);
+ BB.Add(newCmp, LB);
+ BB.Add(newCmp, IL);
+ BB.Add(newCmp, OL);
+ BB.Add(newCmp, RB);
thePrs.myPrs3D = newCmp;
+ std::set<int> ind;
+ ind.insert(1); //inlet ind
+ ind.insert(2); //outlet ind
+
+ TopTools_SequenceOfShape LS;
+ HYDROData_DTM::Get2dFaceFrom3dPres( newCmp, TopoDS::Face(thePrs.myPrs2D), &LS, ind );
+
+#ifndef NDEBUG
+ TopTools_IndexedMapOfShape EE;
+ TopExp::MapShapes(thePrs.myPrs2D, TopAbs_EDGE, EE);
+ int noncontNb = 0;
+ for (int i = 1; i <= 4; i++)
+ {
+ TopoDS_Shape W = LS(i);
+ TopTools_IndexedMapOfShape EW;
+ TopExp::MapShapes(W, TopAbs_EDGE, EW);
+ for (int k = 1; k <= EW.Extent(); k++)
+ noncontNb += !EE.Contains(EW(k));
+ }
+ //noncontNb > 0 => some problem with edge history
+ assert(noncontNb == 0);
+#endif
- Get2dFaceFrom3dPres( newCmp, TopoDS::Face(thePrs.myPrs2D) );
+ thePrs.myLeftBank = TopoDS::Wire(LS(1));
+ thePrs.myInlet = TopoDS::Wire(LS(2));
+ thePrs.myOutlet = TopoDS::Wire(LS(3));
+ thePrs.myRightBank = TopoDS::Wire(LS(4));
}
\ No newline at end of file