#include <BRepBuilderAPI_MakeFace.hxx>
#include <TopExp.hxx>
#include <TopTools_IndexedMapOfOrientedShape.hxx>
+#include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
#include <BRepLib_MakeEdge.hxx>
#include <BRepLib_MakeWire.hxx>
#include <ShapeUpgrade_UnifySameDomain.hxx>
#include <BRepBuilderAPI_MakePolygon.hxx>
#include <BOPAlgo_Builder.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 )
Changed( Geom_3d );
}
-void HYDROData_DTM::PointToWire(const AltitudePoints& pnts, TopoDS_Wire& W )
+void HYDROData_DTM::PointsToWire(const AltitudePoints& pnts, TopoDS_Wire& W )
{
- /*BRepLib_MakeWire WM;
- if (pnts.empty())
- return;
- for (int i = 0; i < pnts.size() - 1; i++)
- {
- gp_Pnt p1(pnts[i].X, pnts[i].Y, pnts[i].Z);
- gp_Pnt p2(pnts[i+1].X, pnts[i+1].Y, pnts[i+1].Z);
- WM.Add(BRepLib_MakeEdge(p1, p2).Edge());
- }
- if (WM.IsDone())*/
-
+
BRepBuilderAPI_MakePolygon PM;
for (int i = 0; i < pnts.size(); i++)
PM.Add(gp_Pnt(pnts[i].X, pnts[i].Y, pnts[i].Z));
W = PM.Wire();
}
+void HYDROData_DTM::PointsToEdge(const AltitudePoints& pnts, TopoDS_Edge& E )
+{
+ Handle(TColgp_HArray1OfPnt) gpPoints = new TColgp_HArray1OfPnt(1, (int)pnts.size());
+
+ for (int i = 0; i < pnts.size(); i++)
+ gpPoints->SetValue(i+1, gp_Pnt(pnts[i].X, pnts[i].Y, pnts[i].Z));
+
+ GeomAPI_Interpolate anInterpolator(gpPoints, Standard_False,1.0e-6);
+ anInterpolator.Perform() ;
+ if (anInterpolator.IsDone())
+ {
+ Handle(Geom_Curve) C = anInterpolator.Curve();
+ E = BRepBuilderAPI_MakeEdge(C).Edge();
+ }
+}
+
TopTools_IndexedMapOfOrientedShape HYDROData_DTM::Create3DShape(const AltitudePoints& left,
const AltitudePoints& right,
const std::vector<AltitudePoints>& main_profiles)
{
TopTools_IndexedMapOfOrientedShape ll;
- TopoDS_Wire LWire, RWire;
- PointToWire(left, LWire);
- PointToWire(right, RWire);
- if (!LWire.IsNull())
- ll.Add(LWire.Oriented(TopAbs_FORWARD));
+ //TopoDS_Wire LWire, RWire;
+ //PointsToWire(left, LWire);
+ //PointsToWire(right, RWire);
+ TopoDS_Edge LEdge, REdge;
+ PointsToEdge(left, LEdge);
+ PointsToEdge(right, REdge);
+ if (!LEdge.IsNull())
+ ll.Add(LEdge.Oriented(TopAbs_FORWARD));
for (int k = 0; k < main_profiles.size(); k++)
{
TopoDS_Wire W;
- PointToWire(main_profiles[k], W);
+ PointsToWire(main_profiles[k], W);
TopAbs_Orientation Ori = TopAbs_INTERNAL;
if (k == 0 || k == main_profiles.size() - 1)
Ori = TopAbs_FORWARD;
ll.Add(W.Oriented(Ori));
}
- if (!RWire.IsNull())
- ll.Add(RWire.Oriented(TopAbs_FORWARD));
+ if (!REdge.IsNull())
+ ll.Add(REdge.Oriented(TopAbs_FORWARD));
//yes, add subshapes in this order (left + profiles + right)
//otherwise the projected wire will be non-manifold
bool WireIntersections; //__TODO
CreateProfilesFromDTM( objs, ddz, step, points, Out3dPres, Out2dPres, OutLeftB, OutRightB, OutInlet, OutOutlet, true, true, InvInd, -1, WireIntersections );
SetAltitudePoints( points );
-
+
SetShape( DataTag_LeftBankShape, OutLeftB);
SetShape( DataTag_RightBankShape, OutRightB);
SetShape( DataTag_InletShape, OutInlet);
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());
+ Handle_Geom_Plane refpl = new Geom_Plane(gp_Pnt(0,0,0), gp_Dir(0,0,1));
+ BB.MakeFace(F, refpl, Precision::Confusion());
BRepAlgo_NormalProjection nproj(F);
- nproj.Add(inpWire);
+ nproj.Add(LB);
+ nproj.Add(RB);
nproj.SetDefaultParams();
nproj.Build();
if(!nproj.IsDone())
- return;
-
- TopoDS_Shape projRes = nproj.Projection();
-
- // 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;
+ return false;
- TopoDS_Iterator it(cmp);
- int i = 0;
- for (;it.More(); it.Next())
+ //TopoDS_Shape projBanks = nproj.Projection();
+ TopoDS_Vertex VFI, VLI, VFO, VLO;
+ TopoDS_Edge prLB = TopoDS::Edge(nproj.Generated(LB).First());
+ TopoDS_Edge prRB = TopoDS::Edge(nproj.Generated(RB).First());
+ 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();
+
+ if (Boundr)
{
- 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++;
+ Boundr->Append(prLB);
+ Boundr->Append(prIL);
+ Boundr->Append(prOL);
+ Boundr->Append(prRB);
}
- //make primary wire
- BRepLib_MakeWire WME;
- WME.Add(ELL);
-
- const TopoDS_Wire& resW = WME.Wire();
- BRepBuilderAPI_MakeFace mf(refpl, resW, true); //check inside is true by def
- outF = mf.Face();
-
- ShapeAnalysis_Wire WA(resW, outF, Precision::Confusion());
- bool res = WA.CheckSelfIntersection(); //TODO check that this return false if OK
- return res;
-
- ///!!! 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);
- }*/
+ ShapeAnalysis_Wire WA(prW, outF, Precision::Confusion());
+ bool res = WA.CheckSelfIntersection();
+ return !res;
}
void HYDROData_DTM::CreateProfiles(const std::vector<Handle_HYDROData_Profile>& theProfiles,
bool Create3dPres,
bool Create2dPres,
std::set<int>& InvInd,
- bool& WireIntersections)
+ bool& ProjStat)
{
if (theProfiles.empty())
return;
if (Create2dPres)
{
TopoDS_Face outF;
- WireIntersections = Get2dFaceFrom3dPres(cmp, outF); //__TODO
+ ProjStat = GetPlanarFaceFromBanks(TopoDS::Edge(OutLeftB), TopoDS::Edge(OutRightB), outF, NULL);
Out2dPres = outF;
};
}
