X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_Stream.cxx;h=4b8e639a92708cc482e6eb376fe1e6ee6e29f3ae;hb=41550a623dca7d2de1b388c9832fe3642d2b8753;hp=d4a04ef4b5ed4140aea4d6b99b1fc8a72ce6feb2;hpb=3627a8d6abf2c69fa15adc51056578fb41100841;p=modules%2Fhydro.git diff --git a/src/HYDROData/HYDROData_Stream.cxx b/src/HYDROData/HYDROData_Stream.cxx index d4a04ef4..4b8e639a 100644 --- a/src/HYDROData/HYDROData_Stream.cxx +++ b/src/HYDROData/HYDROData_Stream.cxx @@ -39,7 +39,6 @@ #include #include #include -#include #include #include @@ -77,11 +76,13 @@ #include #include - -#include +#include +#include +#include #include #include +#include //#define DEB_STREAM 1 #ifdef DEB_STREAM @@ -91,9 +92,13 @@ #include #endif +#define _DEVDEBUG_ +#include "HYDRO_trace.hxx" + +#include + typedef NCollection_DataMap HYDROData_DataMapOfRealOfHDProfile; -IMPLEMENT_STANDARD_HANDLE(HYDROData_Stream,HYDROData_NaturalObject) IMPLEMENT_STANDARD_RTTIEXT(HYDROData_Stream,HYDROData_NaturalObject) @@ -182,9 +187,11 @@ void HYDROData_Stream::Update() } } - Handle_HYDROData_DTM dtm = DTM(); + Handle(HYDROData_DTM) dtm = DTM(); dtm->Update(); UpdatePrs( dtm ); + + HYDROData_NaturalObject::Update(); } bool HYDROData_Stream::IsHas2dPrs() const @@ -192,7 +199,7 @@ bool HYDROData_Stream::IsHas2dPrs() const return true; } -bool HYDROData_Stream::CreatePresentations( const Handle_HYDROData_DTM& theDTM, +bool HYDROData_Stream::CreatePresentations( const Handle(HYDROData_DTM)& theDTM, PrsDefinition& thePrs ) { if ( theDTM.IsNull() ) @@ -211,10 +218,10 @@ bool HYDROData_Stream::CreatePresentations( const Handle_HYDROData_DTM& theDTM, 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.myInlet = OutInlet; + thePrs.myOutlet = OutOutlet; + thePrs.myLeftBank = OutLeftB; + thePrs.myRightBank = OutRightB; thePrs.myPrs2D = Out2dPres; thePrs.myPrs3D = Out3dPres; /*std::vector profiles3d; @@ -238,7 +245,7 @@ bool HYDROData_Stream::CreatePresentations( const Handle_HYDROData_DTM& theDTM, return true; } -void HYDROData_Stream::UpdatePrs( const Handle_HYDROData_DTM& theDTM ) +void HYDROData_Stream::UpdatePrs( const Handle(HYDROData_DTM)& theDTM ) { HYDROData_NaturalObject::Update(); @@ -323,7 +330,7 @@ TopoDS_Shape HYDROData_Stream::GetOutletShape() const return HYDROData_Tool::getFirstShapeFromGroup( aGroups, 4); } -Handle_HYDROData_DTM HYDROData_Stream::DTM() const +Handle(HYDROData_DTM) HYDROData_Stream::DTM() const { const_cast( this )->checkAndSetAltitudeObject(); return Handle(HYDROData_DTM)::DownCast( GetAltitudeObject() ); @@ -337,6 +344,7 @@ double HYDROData_Stream::GetDDZ() const void HYDROData_Stream::SetDDZ( double theDDZ ) { DTM()->SetDDZ( theDDZ ); + Changed( Geom_3d ); } double HYDROData_Stream::GetSpatialStep() const @@ -347,6 +355,7 @@ 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 ) @@ -414,7 +423,10 @@ bool HYDROData_Stream::HasIntersection( const Handle(HYDROData_PolylineXY)& theH TopoDS_Wire aHydraulicWire = TopoDS::Wire( theHydAxis->GetShape() ); //guide line TopoDS_Wire aProfileWire = TopoDS::Wire( theProfile->GetTopShape() ); if ( aProfileWire.IsNull() ) - return false; + { + DEBTRACE("aProfileWire.IsNull"); + return false; + } //BRepProj_Projection aProjector (aProfileWire, thePlane, gp::OZ().Direction()); BRepAlgo_NormalProjection nproj(thePlane); @@ -422,10 +434,16 @@ bool HYDROData_Stream::HasIntersection( const Handle(HYDROData_PolylineXY)& theH nproj.SetDefaultParams(); nproj.Build(); if(!nproj.IsDone()) - return false; + { + DEBTRACE("!nproj.IsDone"); + return false; + } TopoDS_Shape aPrjProfile = nproj.Projection(); if(aPrjProfile.IsNull()) - return false; + { + DEBTRACE("aPrjProfile.IsNull"); + return false; + } TopoDS_Vertex aV1, aV2; if(aPrjProfile.ShapeType() == TopAbs_EDGE) TopExp::Vertices(TopoDS::Edge(aPrjProfile), aV1, aV2); @@ -443,14 +461,20 @@ bool HYDROData_Stream::HasIntersection( const Handle(HYDROData_PolylineXY)& theH } } if(aV1.IsNull() || aV2.IsNull()) - return false; + { + DEBTRACE("aV1.IsNull() || aV2.IsNull()"); + return false; + } gp_Pnt aPnt1 = BRep_Tool::Pnt(aV1); gp_Pnt aPnt2 = BRep_Tool::Pnt(aV2); aPnt1.SetZ(0.0); aPnt2.SetZ(0.0); BRepBuilderAPI_MakeEdge aMk(aPnt1, aPnt2); if(!aMk.IsDone()) - return false; + { + DEBTRACE("!aMk.IsDone()"); + return false; + } const TopoDS_Edge& anEdg2 = aMk.Edge();//Section edge Standard_Integer aNum(0); @@ -506,6 +530,7 @@ bool HYDROData_Stream::HasIntersection( const Handle(HYDROData_PolylineXY)& theH } if(hasInt) return true; + DEBTRACE("!hasInt " << aPnt1.X() << " " << aPnt1.Y() << " " << aPnt2.X() << " " << aPnt2.Y() << " --- " << aSqDist); return false; } @@ -524,9 +549,11 @@ bool HYDROData_Stream::AddProfile( const Handle(HYDROData_Profile)& theProfile ) Standard_Real aPar(.0); if ( HasReference( theProfile, DataTag_Profile ) || !HasIntersection( theProfile, aPlane, aPar ) ) return false; // Object is already in reference list or it has no intersection - + //DEBTRACE("AddProfile - insertParameter " << aPar); int aProfileIndex = insertParameter( aPar ); insertProfileInToOrder( theProfile, aProfileIndex ); + + DTM()->SetProfiles( GetProfiles() ); // Indicate model of the need to update the stream presentation Changed( Geom_3d ); @@ -537,6 +564,7 @@ bool HYDROData_Stream::AddProfile( const Handle(HYDROData_Profile)& theProfile ) bool HYDROData_Stream::SetProfiles( const HYDROData_SequenceOfObjects& theProfiles, const bool& theIsToOrder ) { + DEBTRACE(" --- SetProfiles " < anArr( aList.Extent() ); TColStd_ListIteratorOfListOfReal it( aList ); for ( int j = 1; it.More(); it.Next(), j++ ) - anArr( j ) = it.Value(); + anArr[j-1] = it.Value(); // sorting if ( aList.Extent() > 1 ) { - TCollection_CompareOfReal Compar; - SortTools_QuickSortOfReal::Sort( anArr, Compar ); + //TCollection_CompareOfReal Compar; + //SortTools_QuickSortOfReal::Sort( anArr, Compar ); + std::sort( anArr.begin(), anArr.end() ); - for (int j = 1; j <= anArr.Length(); j++) { - const Standard_Real aKey = anArr(j); + for (int j = 1; j <= anArr.size(); j++) { + const Standard_Real aKey = anArr[j-1]; const Handle(HYDROData_Profile)& aProfile = aDM.Find(aKey); insertProfileInToOrder( aProfile ); } @@ -742,9 +771,9 @@ ObjectKind HYDROData_Stream::getAltitudeObjectType() const return KIND_DTM; } -void HYDROData_Stream::setParametersArray( const TColStd_Array1OfReal& theArray ) +void HYDROData_Stream::setParametersArray( const QVector& theArray ) { - if ( theArray.Length() == 0 ) + if ( theArray.size() == 0 ) { removeParametersArray(); return; @@ -752,13 +781,14 @@ void HYDROData_Stream::setParametersArray( const TColStd_Array1OfReal& theArray TDF_Label aLabel = myLab.FindChild( DataTag_ParamsArray ); + int n = theArray.size(); Handle(TDataStd_RealArray) aParamsArray = - TDataStd_RealArray::Set( aLabel, theArray.Lower(), theArray.Upper() ); - - for ( int i = theArray.Lower(), n = theArray.Upper(); i <= n; ++i ) + TDataStd_RealArray::Set( aLabel, 1, n ); + aParamsArray->SetID(TDataStd_RealArray::GetID()); + for ( int i = 0; i < n; ++i ) { - const Standard_Real& aParam = theArray( i ); - aParamsArray->SetValue( i, aParam ); + const Standard_Real& aParam = theArray[i]; + aParamsArray->SetValue( i+1, aParam ); } } @@ -800,8 +830,7 @@ int HYDROData_Stream::insertParameter( const Standard_Real& theParam ) { aResIndex = 0; - TColStd_Array1OfReal aNewArr( anArr->Lower(), anArr->Upper() + 1 ); - + QVector aNewArr( anArr->Upper() +1 ); bool isInserted = false; for ( int i = anArr->Lower(), j = i, n = anArr->Upper(); i <= n; ++i, ++j ) { @@ -814,19 +843,20 @@ int HYDROData_Stream::insertParameter( const Standard_Real& theParam ) } else { - aNewArr( j ) = theParam; + if (j<=n+1) + aNewArr[j-1] = theParam; isInserted = true; ++j; } } - - aNewArr( j ) = aStoredParam; + if (j<=n+1) + aNewArr[j-1] = aStoredParam; } if ( !isInserted ) { aResIndex = -1; - aNewArr( aNewArr.Upper() ) = theParam; + aNewArr[aNewArr.size()-1] = theParam; } setParametersArray( aNewArr ); @@ -834,8 +864,8 @@ int HYDROData_Stream::insertParameter( const Standard_Real& theParam ) } else { - TColStd_Array1OfReal aNewArr( 1, 1 ); - aNewArr.SetValue( 1, theParam ); + QVector aNewArr( 1 ); + aNewArr[0] = theParam; setParametersArray( aNewArr ); } @@ -858,7 +888,7 @@ void HYDROData_Stream::removeParameter( const int& theIndex ) return; } - TColStd_Array1OfReal aNewArr( aParamsArray->Lower(), aParamsArray->Upper() - 1 ); + QVector aNewArr( aParamsArray->Upper() - 2 ); for ( int i = aParamsArray->Lower(), j = i, k = 0, n = aParamsArray->Upper(); i <= n; ++i, ++k ) { @@ -866,7 +896,7 @@ void HYDROData_Stream::removeParameter( const int& theIndex ) if ( k == theIndex ) continue; - aNewArr.SetValue( j, aStoredParam ); + aNewArr[j-1] = aStoredParam; ++j; } @@ -1041,7 +1071,6 @@ void HYDROData_Stream::CopyTo( const Handle(HYDROData_Entity)& theDestination, } } } - void HYDROData_Stream::CreatePresentations( const Handle(TColgp_HArray1OfPnt) theArrayOfFPnt, const Handle(TColgp_HArray1OfPnt) theArrayOfLPnt, const Handle(TopTools_HArray1OfShape) theArrOfProfiles, @@ -1067,26 +1096,58 @@ void HYDROData_Stream::CreatePresentations( const Handle(TColgp_HArray1OfPnt) std::vector dummy; TopTools_IndexedMapOfOrientedShape ll = HYDROData_DTM::Create3DShape(left, right, dummy); + TopoDS_Shape LB, RB, IL, OL; + if (!ll.IsEmpty()) { - thePrs.myLeftBank = TopoDS::Wire(ll(1)); - thePrs.myRightBank = TopoDS::Wire(ll(2)); + TopAbs_ShapeEnum ll1_sht = ll(1).ShapeType(); + TopAbs_ShapeEnum ll2_sht = ll(2).ShapeType(); + if ((ll1_sht == TopAbs_WIRE || ll1_sht == TopAbs_EDGE) && + (ll2_sht == TopAbs_WIRE || ll2_sht == TopAbs_EDGE)) + { + LB = ll(1); + RB = ll(2); + } } - thePrs.myInlet = TopoDS::Wire(theArrOfProfiles->Value(theArrOfProfiles->Lower())); //TODO check that - thePrs.myOutlet = TopoDS::Wire(theArrOfProfiles->Value(theArrOfProfiles->Upper())); + 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; - HYDROData_DTM::Get2dFaceFrom3dPres( newCmp, TopoDS::Face(thePrs.myPrs2D) ); + TopTools_SequenceOfShape LS; + //HYDROData_DTM::Get2dFaceFrom3dPres( newCmp, TopoDS::Face(thePrs.myPrs2D), &LS, ind ); + + HYDROData_DTM::GetPlanarFaceFromBanks(TopoDS::Edge(LB), TopoDS::Edge(RB), TopoDS::Face(thePrs.myPrs2D), &LS); -} \ No newline at end of file +#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 + + thePrs.myLeftBank = LS(1); + thePrs.myInlet = LS(2); + thePrs.myOutlet = LS(3); + thePrs.myRightBank = LS(4); + +}