#include <TopTools_IndexedMapOfShape.hxx>
#include <BRepBuilderAPI_MakeFace.hxx>
#include <TopExp.hxx>
++<<<<<<< HEAD
++=======
+ #include <TopTools_IndexedMapOfOrientedShape.hxx>
+ #include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
++>>>>>>> origin/BR_HYDRO_IMPS_2016
#include <BRepLib_MakeEdge.hxx>
#include <BRepLib_MakeWire.hxx>
#include <ShapeUpgrade_UnifySameDomain.hxx>
#include <BRepBuilderAPI_MakePolygon.hxx>
#include <BOPAlgo_Builder.hxx>
-
+ #include <BRepAdaptor_Curve.hxx>
+ #include <GeomProjLib.hxx>
+ #include <gp_Pln.hxx>
#include <TopTools_IndexedDataMapOfShapeShape.hxx>
#include <TopTools_ListIteratorOfListOfShape.hxx>
+ #include <TopTools_SequenceOfShape.hxx>
+ #include <assert.h>
-IMPLEMENT_STANDARD_HANDLE( HYDROData_DTM, HYDROData_Bathymetry )
IMPLEMENT_STANDARD_RTTIEXT( HYDROData_DTM, HYDROData_Bathymetry )
HYDROData_DTM::CurveUZ::CurveUZ( double theXCurv, const gp_Vec2d& theProfileDir, double theDeltaZ )
Out3dPres, Out2dPres, OutLeftB, OutRightB, OutInlet, OutOutlet, Create3dPres, Create2dPres, InvInd, WireIntersections );
}
- void HYDROData_DTM::ProjWireOnPlane(const TopoDS_Shape& inpWire, const Handle(Geom_Plane)& RefPlane,
- TopTools_DataMapOfShapeListOfShape* E2PE)
+ bool HYDROData_DTM::GetPlanarFaceFromBanks( const TopoDS_Edge& LB, const TopoDS_Edge& RB, TopoDS_Face& outF,
+ TopTools_SequenceOfShape* Boundr)
{
BRep_Builder BB;
-
- //project shape (edges) on planar face
TopoDS_Face F;
- BB.MakeFace(F, RefPlane, Precision::Confusion());
- BRepAlgo_NormalProjection nproj(F);
- nproj.Add(inpWire);
- nproj.SetDefaultParams();
- nproj.Build();
- if(!nproj.IsDone())
- return;
+ Handle_Geom_Plane refpl = new Geom_Plane(gp_Pnt(0,0,0), gp_Dir(0,0,1));
- TopoDS_Shape projRes = nproj.Projection();
+ TopoDS_Vertex VFI, VLI, VFO, VLO;
+ TopoDS_Edge prLB;
+ TopoDS_Edge prRB;
- // unite all vertexes/edges from projected result
- BOPAlgo_Builder anAlgo;
- TopExp_Explorer exp(projRes, TopAbs_EDGE);
- for (;exp.More(); exp.Next())
- {
- const TopoDS_Edge& E = TopoDS::Edge(exp.Current());
- if (E.Orientation() != TopAbs_INTERNAL)
- anAlgo.AddArgument(E);
- }
- anAlgo.Perform();
- int stat = anAlgo.ErrorStatus();
- TopoDS_Shape projResConn = anAlgo.Shape();
-
- // make wire => vertexes and edges should be untouched after this operation!
- exp.Init(projResConn, TopAbs_EDGE);
- //TopTools_ListOfShape llE;
- //TopoDS_Wire RW;
- //BRepLib_MakeWire WM;
-
- //for (;exp.More();exp.Next())
- // llE.Append(exp.Current());
- //
- //WM.Add(llE);
- //outWire = WM.Wire();
-
- //outWire.Orientation(inpWire.Orientation()); //take from the original wire
-
- //history mode: edge to projected edges
- if (E2PE)
- {
- TopExp_Explorer ex(inpWire, TopAbs_EDGE);
- for (;ex.More();ex.Next())
- {
- const TopoDS_Edge& CE = TopoDS::Edge(ex.Current());
- TopTools_ListOfShape NEL;
- const TopTools_ListOfShape& LS = nproj.Generated(CE);
- TopTools_ListIteratorOfListOfShape it(LS);
- for (;it.More();it.Next())
- {
- const TopoDS_Shape& PCE = it.Value();
- TopTools_ListOfShape PLS = anAlgo.Modified(PCE);
- if (PLS.IsEmpty())
- PLS.Append(PCE);
- TopTools_ListIteratorOfListOfShape itp(PLS);
- for (;itp.More();itp.Next())
- NEL.Append(itp.Value());
- }
-
- E2PE->Bind(CE, NEL);
- }
- }
- }
- #include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
- bool HYDROData_DTM::Get2dFaceFrom3dPres(const TopoDS_Compound& cmp, TopoDS_Face& outF,
- TopTools_SequenceOfShape* Boundr, std::set<int> ind )
- {
- //ind : set of indices (starts with 0). index == number of boundary (inlet, outlet, etc..)
- //in compound cmp.
- //if Boundr is not null => this method will return sequence of boundary wires (inlet, outlet...)
-
- Handle(Geom_Plane) refpl = new Geom_Plane(gp_Pnt(0,0,0), gp_Dir(0,0,1));
- TopTools_DataMapOfShapeListOfShape E2PE;
- ProjWireOnPlane(cmp, refpl, &E2PE);
- TopTools_ListOfShape ELL;
-
- TopoDS_Iterator it(cmp);
- int i = 0;
- for (;it.More(); it.Next())
- {
- const TopoDS_Wire& W = TopoDS::Wire(it.Value());
- if (W.Orientation() != TopAbs_INTERNAL)
- {
- TopoDS_Wire PW;
- TopExp_Explorer ex(W, TopAbs_EDGE);
- TopTools_ListOfShape LEpW;
- TopTools_ListOfShape LEpWDummy;
- for (;ex.More();ex.Next())
- {
- const TopoDS_Edge& CE = TopoDS::Edge(ex.Current());
- TopTools_ListOfShape LS = E2PE.Find(CE);
- LEpW.Append(LS);
- }
-
- if (ind.count(i) != 0)
- {
- BRepLib_MakeWire WM;
- WM.Add(LEpW);
- const TopoDS_Wire& WMW = WM.Wire();
- //assume that wire is a straight line,
- //take first and last vertex and make simple edge (RE)
- TopoDS_Vertex VF, VL;
- TopExp::Vertices(WMW, VF, VL);
- TopoDS_Edge RE = BRepLib_MakeEdge(VF, VL).Edge();
- if (RE.IsNull())
- {
- LEpWDummy = LEpW; //LEpW will be nullified after appending to ELL
- ELL.Append(LEpW);
- }
- else
- {
- LEpWDummy.Append(RE);
- ELL.Append(RE);
- }
- //TODO: in the new version of OCCT, USD can process separate wires
- //ShapeUpgrade_UnifySameDomain USD(WMW, 1U, 0U, 1U); //concat bsplines
- //USD.Build();
- //const TopoDS_Shape& RSU = USD.Shape();
- //TopExp_Explorer exp(RSU, TopAbs_EDGE);
- //TopTools_ListOfShape DummyL;
- //for (;it.More();it.Next())
- // DummyL.Append(it.Value());
- //if (DummyL.Extent() == 1)
- // ELL.Append(DummyL.First()); //if one edge => accept this result
- //else
- // ELL.Append(LEpW); //else put 'as is'
- }
- else
- {
- LEpWDummy = LEpW;
- ELL.Append(LEpW);
- }
-
- if (Boundr)
- {
- //make inlet, outlet, left/tight banks [wires]
- //shouldn't change topology of the edges
- BRepLib_MakeWire IWM;
- IWM.Add(LEpWDummy);
- Boundr->Append(IWM.Wire());
- }
- }
- i++;
- }
- //make primary wire
- BRepLib_MakeWire WME;
- WME.Add(ELL);
+ BRepAdaptor_Curve LBAD(LB);
+ Handle_Geom_Curve LBPC = GeomProjLib::ProjectOnPlane(LBAD.Curve().Curve(), refpl, gp_Dir(0, 0, -1), 1 );
+ prLB = BRepLib_MakeEdge(LBPC).Edge();
- const TopoDS_Wire& resW = WME.Wire();
- BRepBuilderAPI_MakeFace mf(refpl, resW, true); //check inside is true by def
- outF = mf.Face();
+ BRepAdaptor_Curve RBAD(RB);
+ Handle_Geom_Curve RBPC = GeomProjLib::ProjectOnPlane(RBAD.Curve().Curve(), refpl, gp_Dir(0, 0, -1), 1 );
+ prRB = BRepLib_MakeEdge(RBPC).Edge();
- ShapeAnalysis_Wire WA(resW, outF, Precision::Confusion());
- bool res = WA.CheckSelfIntersection(); //TODO check that this return false if OK
- return res;
+ TopExp::Vertices(prLB, VFI, VFO, 1);
+ TopExp::Vertices(prRB, VLI, VLO, 1);
+ TopoDS_Edge prIL = BRepLib_MakeEdge(VFI, VLI).Edge();
+ TopoDS_Edge prOL = BRepLib_MakeEdge(VFO, VLO).Edge();
+ TopoDS_Wire prW = BRepLib_MakeWire(prLB, prIL, prOL, prRB).Wire();
+ outF = BRepBuilderAPI_MakeFace(refpl->Pln(), prW, 1).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++)
+ if (Boundr)
{
- TopoDS_Wire outIW;
- const TopoDS_Wire& W = TopoDS::Wire(IntW(i));
- ProjWireOnPlane(W, refpl, outIW);
- BB.Add(outF, outIW);
- }*/
+ Boundr->Append(prLB);
+ Boundr->Append(prIL);
+ Boundr->Append(prOL);
+ Boundr->Append(prRB);
+ }
+
+ ShapeAnalysis_Wire WA(prW, outF, Precision::Confusion());
+ bool res = WA.CheckSelfIntersection();
+ return !res;
}
-void HYDROData_DTM::CreateProfiles(const std::vector<Handle_HYDROData_Profile>& theProfiles,
+void HYDROData_DTM::CreateProfiles(const std::vector<Handle(HYDROData_Profile)>& theProfiles,
double theDDZ,
double theSpatialStep,
AltitudePoints& theOutLeft,
