#include "HYDROData_IProfilesInterpolator.h"
#include "HYDROData_Tool.h"
#include "HYDROData_DTM.h"
+#include "HYDROData_LISM.h"
+
+#include <HYDROData_Bathymetry.h>
#include <TDataStd_RealArray.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 <Geom_BSplineCurve.hxx>
#include <TopTools_HArray1OfShape.hxx>
-
-#include <SortTools_QuickSortOfReal.hxx>
+#include <TopTools_IndexedMapOfOrientedShape.hxx>
+#include <TopTools_ListIteratorOfListOfShape.hxx>
+#include <TopTools_SequenceOfShape.hxx>
+#include <TopTools_IndexedMapOfShape.hxx>
#include <QColor>
#include <QStringList>
+#include <QVector>
//#define DEB_STREAM 1
#ifdef DEB_STREAM
#include <TCollection_AsciiString.hxx>
#endif
+#define _DEVDEBUG_
+#include "HYDRO_trace.hxx"
+
+#include <assert.h>
+
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 aResList = dumpObjectCreation( theTreatedObjects );
QString aName = GetObjPyName();
+ int interpMethod = GetInterpolationMethod();
+ QString anInterpMethod = QString::number( interpMethod );
+ aResList << QString( "%1.SetInterpolationMethod( %2 )" ).arg( aName ).arg( anInterpMethod );
+
Handle(HYDROData_PolylineXY) aHydAxis = GetHydraulicAxis();
setPythonReferenceObject( thePyScriptPath, theTreatedObjects, aResList, aHydAxis, "SetHydraulicAxis" );
setPythonReferenceObject( thePyScriptPath, theTreatedObjects, aResList, aBottomPolyline, "SetBottomPolyline" );
}
- QString aDDZs = QString::number( GetDDZ(), 'f', 3 );
- QString aSSteps = QString::number( GetSpatialStep(), 'f', 3 );
- aResList << QString( "%1.SetDDZ( %2 )" ).arg( aName ).arg( aDDZs );
- aResList << QString( "%1.SetSpatialStep( %2 )" ).arg( aName ).arg( aSSteps );
+ if (interpMethod==0)
+ {
+ QString aDDZs = QString::number( GetDDZ(), 'f', 3 );
+ QString aSSteps = QString::number( GetSpatialStep(), 'f', 3 );
+ aResList << QString( "%1.SetDDZ( %2 )" ).arg( aName ).arg( aDDZs );
+ aResList << QString( "%1.SetSpatialStep( %2 )" ).arg( aName ).arg( aSSteps );
+ }
+ else if (interpMethod==1)
+ {
+ Handle(HYDROData_PolylineXY) aLeftBank = GetLeftBank();
+ setPythonReferenceObject( thePyScriptPath, theTreatedObjects, aResList, aLeftBank, "SetLeftBank" );
+ Handle(HYDROData_PolylineXY) aRightBank = GetRightBank();
+ setPythonReferenceObject( thePyScriptPath, theTreatedObjects, aResList, aRightBank, "SetRightBank" );
+
+ QString aHaxStep = QString::number( GetHaxStep(), 'f', 3 );
+ QString aNbProfilePoints = QString::number( GetNbProfilePoints() );
+ aResList << QString( "%1.SetHaxStep( %2 )" ).arg( aName ).arg( aHaxStep );
+ aResList << QString( "%1.SetNbProfilePoints( %2 )" ).arg( aName ).arg( aNbProfilePoints );
+ }
aResList << QString( "" );
aResList << QString( "%1.Update()" ).arg( aName );
return aBSpline;
}
-void HYDROData_Stream::Update()
+void HYDROData_Stream::GetWarnings(NCollection_DataMap<Handle(HYDROData_Profile), QSet<QString>>& warnings)
{
- updateProfilesOrder();
+ warnings = myWarnings;
+}
- // Update bottom polyline if exists
- const Handle(HYDROData_Polyline3D) aBottomPolyline = GetBottomPolyline();
- if ( !aBottomPolyline.IsNull() ) {
- if ( GenerateBottomPolyline() ) {
- Handle(HYDROData_PolylineXY) aPolylineXY = aBottomPolyline->GetPolylineXY();
- if ( !aPolylineXY.IsNull() ) {
- aPolylineXY->Update();
+void HYDROData_Stream::Update()
+{
+ if (GetInterpolationMethod() == 0)
+ {
+ if (!GetHydraulicAxis().IsNull())
+ updateProfilesOrder();
+
+ // Update bottom polyline if exists
+ const Handle(HYDROData_Polyline3D) aBottomPolyline = GetBottomPolyline();
+ if ( !aBottomPolyline.IsNull() ) {
+ if ( GenerateBottomPolyline() ) {
+ Handle(HYDROData_PolylineXY) aPolylineXY = aBottomPolyline->GetPolylineXY();
+ if ( !aPolylineXY.IsNull() ) {
+ aPolylineXY->Update();
+ }
+ aBottomPolyline->Update();
}
- aBottomPolyline->Update();
}
+
+ Handle(HYDROData_DTM) dtm = DTM();
+ dtm->Update();
+ UpdatePrs( dtm );
+
+ myWarnings.Clear();
+ dtm->GetWarnings(myWarnings);
}
+ else
+ {
+ Handle(HYDROData_LISM) lism = LISM();
+ lism->Update();
+ UpdatePrs( lism );
- Handle_HYDROData_DTM dtm = DTM();
- dtm->Update();
- UpdatePrs( dtm );
+ myWarnings.Clear();
+ //lism->GetWarnings(myWarnings);
+ //TODO warnings
+ }
+
+ HYDROData_NaturalObject::Update();
}
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() )
if( profiles.Length() < 2 )
return false;
- std::vector<TopoDS_Wire> profiles3d;
+ 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 = OutInlet;
+ thePrs.myOutlet = OutOutlet;
+ thePrs.myLeftBank = OutLeftB;
+ thePrs.myRightBank = OutRightB;
+ thePrs.myPrs2D = Out2dPres;
+ thePrs.myPrs3D = Out3dPres;
+ /*std::vector<TopoDS_Wire> profiles3d;
profiles3d.reserve(profiles.Length());
// Pre-processing
const TopoDS_Shape& aProfileShape = aProfile->GetShape3D();
//TopExp_Explorer exp(aProfileShape, TopAbs_EDGE);
profiles3d.push_back( TopoDS::Wire(aProfileShape) );
- }
+ }*/
- TopoDS_Edge aLeftBank, aRightBank;
- //TODO: theDTM->CreateBankShapes( aLeftBank, aRightBank );
- return CreatePresentations( aLeftBank, aRightBank, profiles3d, thePrs );
+ return true;
}
-void HYDROData_Stream::UpdatePrs( const Handle_HYDROData_DTM& theDTM )
+void HYDROData_Stream::internalUpdatePrs( const PrsDefinition& aResultPrs )
{
- HYDROData_NaturalObject::Update();
-
- PrsDefinition aResultPrs;
- if ( !CreatePresentations( theDTM, aResultPrs ) )
- return;
-
SetShape3D( aResultPrs.myPrs3D );
SetTopShape( aResultPrs.myPrs2D );
anOutGroup->AddShape( aResultPrs.myOutlet );
}
+
+void HYDROData_Stream::UpdatePrs( const Handle(HYDROData_DTM)& theDTM )
+{
+ HYDROData_NaturalObject::Update();
+
+ PrsDefinition aResultPrs;
+ if ( !CreatePresentations( theDTM, aResultPrs ) )
+ return;
+
+ internalUpdatePrs(aResultPrs);
+}
+
+void HYDROData_Stream::UpdatePrs( const Handle(HYDROData_LISM)& theLISM )
+{
+ HYDROData_NaturalObject::Update();
+ PrsDefinition prsDef;
+ theLISM->GetShapePresentations(prsDef);
+
+ internalUpdatePrs(prsDef);
+}
+
QColor HYDROData_Stream::DefaultFillingColor() const
{
return QColor( Qt::green );
bool HYDROData_Stream::IsValidAsAxis( const Handle(HYDROData_PolylineXY)& theHydAxis )
{
if ( theHydAxis.IsNull() )
- return false;
+ return true;
TopoDS_Shape aHydraulicShape = theHydAxis->GetShape();
if ( aHydraulicShape.IsNull() ||
return HYDROData_Tool::getFirstShapeFromGroup( aGroups, 4);
}
-Handle_HYDROData_DTM HYDROData_Stream::DTM() const
+Handle(HYDROData_DTM) HYDROData_Stream::DTM() const
{
const_cast<HYDROData_Stream*>( this )->checkAndSetAltitudeObject();
return Handle(HYDROData_DTM)::DownCast( GetAltitudeObject() );
}
+Handle(HYDROData_LISM) HYDROData_Stream::LISM() const
+{
+ const_cast<HYDROData_Stream*>( this )->checkAndSetAltitudeObject();
+ return Handle(HYDROData_LISM)::DownCast( GetAltitudeObject() );
+}
+
double HYDROData_Stream::GetDDZ() const
{
return DTM()->GetDDZ();
void HYDROData_Stream::SetDDZ( double theDDZ )
{
DTM()->SetDDZ( theDDZ );
+ Changed( Geom_3d );
+}
+
+Handle(HYDROData_PolylineXY) HYDROData_Stream::GetLeftBank() const
+{
+ return LISM()->GetLeftBank();
+}
+
+void HYDROData_Stream::SetLeftBank( const Handle(HYDROData_PolylineXY)& theBank )
+{
+ LISM()->SetLeftBank( theBank );
+ Changed( Geom_3d );
+}
+
+Handle(HYDROData_PolylineXY) HYDROData_Stream::GetRightBank() const
+{
+ return LISM()->GetRightBank();
+}
+
+void HYDROData_Stream::SetRightBank( const Handle(HYDROData_PolylineXY)& theBank )
+{
+ LISM()->SetRightBank( theBank );
+ Changed( Geom_3d );
+}
+
+
+double HYDROData_Stream::GetHaxStep() const
+{
+ return LISM()->GetHaxStep();
+}
+
+void HYDROData_Stream::SetHaxStep( double theHaxStep )
+{
+ LISM()->SetHaxStep( theHaxStep );
+ Changed( Geom_3d );
+}
+
+int HYDROData_Stream::GetNbProfilePoints() const
+{
+ return LISM()->GetNbProfilePoints();
+}
+
+void HYDROData_Stream::SetNbProfilePoints( int theNbPoints )
+{
+ LISM()->SetNbProfilePoints( theNbPoints );
+ Changed( Geom_3d );
}
double HYDROData_Stream::GetSpatialStep() const
{
- return DTM()->GetSpatialStep();
+ if (GetInterpolationMethod() == 0)
+ return DTM()->GetSpatialStep();
+ else
+ return LISM()->GetHaxStep();
}
void HYDROData_Stream::SetSpatialStep( double theSpatialStep )
{
- DTM()->SetSpatialStep( theSpatialStep );
+ if (GetInterpolationMethod() == 0 )
+ DTM()->SetSpatialStep( theSpatialStep );
+ else
+ LISM()->SetHaxStep( theSpatialStep );
+ Changed( Geom_3d );
}
bool HYDROData_Stream::SetHydraulicAxis( const Handle(HYDROData_PolylineXY)& theAxis )
{
- if ( !IsValidAsAxis( theAxis ) )
- return false;
+ if (GetInterpolationMethod() == 0)
+ {
+ if ( !IsValidAsAxis( theAxis ) )
+ return false;
- Handle(HYDROData_PolylineXY) aPrevAxis = GetHydraulicAxis();
- if ( IsEqual( aPrevAxis, theAxis ) )
- return true;
+ Handle(HYDROData_PolylineXY) aPrevAxis = GetHydraulicAxis();
+ if ( IsEqual( aPrevAxis, theAxis ) )
+ return true;
- SetReferenceObject( theAxis, DataTag_HydraulicAxis );
+ SetReferenceObject( theAxis, DataTag_HydraulicAxis );
- // Update the order of profiles
- updateProfilesOrder();
+ // Update the order of profiles
+ updateProfilesOrder();
- // Indicate model of the need to update the stream presentation
- Changed( Geom_3d );
+ // Indicate model of the need to update the stream presentation
+ Changed( Geom_3d );
+ }
+ else
+ {
+ LISM()->SetHydraulicAxis( theAxis );
+ Changed( Geom_3d );
+ }
return true;
}
Handle(HYDROData_PolylineXY) HYDROData_Stream::GetHydraulicAxis() const
{
- return Handle(HYDROData_PolylineXY)::DownCast(
- GetReferenceObject( DataTag_HydraulicAxis ) );
+ if (GetInterpolationMethod() == 0)
+ return Handle(HYDROData_PolylineXY)::DownCast( GetReferenceObject( DataTag_HydraulicAxis ) );
+ else
+ return LISM()->GetHydraulicAxis();
}
void HYDROData_Stream::RemoveHydraulicAxis()
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() )
- return false;
+ if ( aProfileWire.IsNull() )
+ {
+ DEBTRACE("aProfileWire.IsNull");
+ return false;
+ }
- BRepProj_Projection aProjector (aProfileWire, thePlane, gp::OZ().Direction());
- if(!aProjector.IsDone())
- return false;
- TopoDS_Shape aPrjProfile = aProjector.Shape();
+ //BRepProj_Projection aProjector (aProfileWire, thePlane, gp::OZ().Direction());
+ BRepAlgo_NormalProjection nproj(thePlane);
+ nproj.Add(aProfileWire);
+ nproj.SetDefaultParams();
+ nproj.Build();
+ if(!nproj.IsDone())
+ {
+ 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);
}
}
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);
}
if(hasInt)
return true;
+ DEBTRACE("!hasInt " << aPnt1.X() << " " << aPnt1.Y() << " " << aPnt2.X() << " " << aPnt2.Y() << " --- " << aSqDist);
return false;
}
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 ) )
return false; // Object is already in reference list or it has no intersection
-
+ //DEBTRACE("AddProfile - insertParameter " << aPar);
int aProfileIndex = insertParameter( aPar );
insertProfileInToOrder( theProfile, aProfileIndex );
+
+ if (GetInterpolationMethod()==0)
+ DTM()->SetProfiles( GetProfiles() );
+ else
+ LISM()->SetProfiles( GetProfiles() );
// Indicate model of the need to update the stream presentation
Changed( Geom_3d );
bool HYDROData_Stream::SetProfiles( const HYDROData_SequenceOfObjects& theProfiles,
const bool& theIsToOrder )
{
+ DEBTRACE(" --- SetProfiles " <<theIsToOrder );
if ( theIsToOrder )
{
for ( int i = 1; i <= theProfiles.Length(); ++i )
Changed( Geom_3d );
}
- DTM()->SetProfiles( GetProfiles() );
+ if (GetInterpolationMethod()==0)
+ DTM()->SetProfiles( GetProfiles() );
+ else
+ LISM()->SetProfiles( GetProfiles() );
return true;
}
Changed( Geom_3d );
}
+
+int HYDROData_Stream::GetInterpolationMethod() const
+{
+ return GetInteger( DataTag_InterpMethod );
+}
+
+void HYDROData_Stream::SetInterpolationMethod( int theMethod ) //if DTM => 0 ; if LISM => 1
+{
+ SetInteger( DataTag_InterpMethod, theMethod );
+ Changed( Geom_3d );
+}
+
+
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 );
if ( aList.IsEmpty() )
return;
- TColStd_Array1OfReal anArr( 1, aList.Extent() );
+ QVector<double> 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 );
}
ObjectKind HYDROData_Stream::getAltitudeObjectType() const
{
- return KIND_DTM;
+ int InterpMethod = GetInterpolationMethod();
+ if (InterpMethod == 1)
+ return KIND_LISM;
+ else
+ return KIND_DTM;
}
-void HYDROData_Stream::setParametersArray( const TColStd_Array1OfReal& theArray )
+void HYDROData_Stream::setParametersArray( const QVector<double>& theArray )
{
- if ( theArray.Length() == 0 )
+ if ( theArray.size() == 0 )
{
removeParametersArray();
return;
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 );
}
}
{
aResIndex = 0;
- TColStd_Array1OfReal aNewArr( anArr->Lower(), anArr->Upper() + 1 );
-
+ QVector<double> aNewArr( anArr->Upper() +1 );
bool isInserted = false;
for ( int i = anArr->Lower(), j = i, n = anArr->Upper(); i <= n; ++i, ++j )
{
}
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 );
}
else
{
- TColStd_Array1OfReal aNewArr( 1, 1 );
- aNewArr.SetValue( 1, theParam );
+ QVector<double> aNewArr( 1 );
+ aNewArr[0] = theParam;
setParametersArray( aNewArr );
}
return;
}
- TColStd_Array1OfReal aNewArr( aParamsArray->Lower(), aParamsArray->Upper() - 1 );
+ QVector<double> aNewArr( aParamsArray->Upper() - 2 );
for ( int i = aParamsArray->Lower(), j = i, k = 0, n = aParamsArray->Upper(); i <= n; ++i, ++k )
{
if ( k == theIndex )
continue;
- aNewArr.SetValue( j, aStoredParam );
+ aNewArr[j-1] = aStoredParam;
++j;
}
bool HYDROData_Stream::GenerateBottomPolyline()
{
// Get the document
- Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( myLab );
+ Handle(HYDROData_Document) aDocument = HYDROData_Document::Document();
if ( aDocument.IsNull() ) {
return false;
}
aProfileUZ->RemoveSection( 0 );
- aProfileUZ->CalculateAndAddPoints(aBottomPoints, aPolylineXY);
+ aProfileUZ->CalculateAndAddPoints(aBottomPoints, aPolylineXY, true);
return true;
}
bool HYDROData_Stream::Interpolate( HYDROData_IProfilesInterpolator* theInterpolator )
{
// Get the document
- Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( myLab );
+ Handle(HYDROData_Document) aDocument = HYDROData_Document::Document();
if ( aDocument.IsNull() ) {
return false;
}
bool isGenerateNewName ) const
{
// Get the document
- Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( myLab );
+ Handle(HYDROData_Document) aDocument = HYDROData_Document::Document();
if ( aDocument.IsNull() ) {
return;
}
}
}
}
-#include <GeomProjLib.hxx>
-#include <Geom_TrimmedCurve.hxx>
-#include <Geom_Plane.hxx>
-#include <BRepTools.hxx>
-#include <BRepTools_WireExplorer.hxx>
-static void ProjEdgeOnPlane(const TopoDS_Wire& inpWire, const Handle_Geom_Plane& RefPlane, TopoDS_Wire& outWire, TopoDS_Vertex V1, TopoDS_Vertex V2)
-{
- BRepTools_WireExplorer ex(inpWire);
- 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();
- //if (V1.IsNull() || V2.IsNull())
- // outSh = BRepLib_MakeEdge(ProjectedCurve); //create new vertices
- //else
- // outSh = BRepLib_MakeEdge(ProjectedCurve, V1, V2);
-}
-
-
-bool HYDROData_Stream::CreatePresentations( const TopoDS_Edge& theLeftBank,
- const TopoDS_Edge& theRightBank,
- const std::vector<TopoDS_Wire>& theProfiles3d,
- PrsDefinition& thePrs )
+void HYDROData_Stream::CreatePresentations( const Handle(TColgp_HArray1OfPnt) theArrayOfFPnt,
+ const Handle(TColgp_HArray1OfPnt) theArrayOfLPnt,
+ const Handle(TopTools_HArray1OfShape) theArrOfProfiles,
+ PrsDefinition& thePrs )
{
- thePrs.myLeftBank = theLeftBank;
- thePrs.myRightBank = theRightBank;
-
- BRep_Builder aBB;
- TopoDS_Compound aCmp;
- aBB.MakeCompound(aCmp);
- for (size_t i = 0; i < theProfiles3d.size(); i++ )
- aBB.Add(aCmp, theProfiles3d[i]);
- aBB.Add(aCmp, theLeftBank);
- aBB.Add(aCmp, theRightBank);
-
- thePrs.myPrs3D = aCmp; //3d pres
-
- /*Handle_Geom_Plane RefPlane = new Geom_Plane(gp_Pnt(0,0,0), gp_Dir(0,0,1));
- TopoDS_Vertex V1, V2;
- TopoDS_Wire W;
- ProjEdgeOnPlane(theProfiles3d[0], RefPlane, W, V1, V2);*/
-
- /* Handle_Geom_Plane RefPlane = new Geom_Plane(gp_Pnt(0,0,0), gp_Dir(0,0,1));
- std::vector<TopoDS_Edge> internProf;
- internProf.reserve(theProfiles3d.size() - 2);
-
- //project internal edges/profiles
- for (size_t i = 1; i < theProfiles3d.size() - 1; i++ )
+ HYDROData_Bathymetry::AltitudePoints left;
+ for (int i = theArrayOfLPnt->Lower(); i <= theArrayOfLPnt->Upper(); i++)
{
- TopoDS_Edge ProjEdge;
- ProjEdgeOnPlane(theProfiles3d[i], RefPlane, ProjEdge, TopoDS_Vertex(), TopoDS_Vertex());
- internProf.push_back (TopoDS::Edge(ProjEdge.Oriented(TopAbs_INTERNAL)));
+ left.push_back(HYDROData_Bathymetry::AltitudePoint(theArrayOfLPnt->Value(i).X(),
+ theArrayOfLPnt->Value(i).Y(),
+ theArrayOfLPnt->Value(i).Z()));
}
-
- TopoDS_Edge ProjEdgeIn, ProjEdgeOut;
- TopoDS_Vertex V1In, V2In, V1Out, V2Out;
-
- ProjEdgeOnPlane(theProfiles3d.front(), RefPlane, ProjEdgeIn, TopoDS_Vertex(), TopoDS_Vertex());
- TopExp::Vertices(ProjEdgeIn, V1In, V2In);
-
- ProjEdgeOnPlane(theProfiles3d.back(), RefPlane, ProjEdgeOut, TopoDS_Vertex(), TopoDS_Vertex());
- TopExp::Vertices(ProjEdgeOut, V1Out, V2Out);
-
- TopoDS_Edge ProjEdgeLeftB, ProjEdgeRightB;
- ProjEdgeOnPlane(theLeftBank, RefPlane, ProjEdgeLeftB, V1In, V1Out);
- ProjEdgeOnPlane(theRightBank, RefPlane, ProjEdgeRightB, V2In, V2Out);
-
- BRepLib_MakeWire WM(ProjEdgeIn, ProjEdgeOut, ProjEdgeLeftB, ProjEdgeRightB);
- for (size_t i = 0; i < internProf.size(); i++ )
- WM.Add(internProf[i]);
- TopoDS_Face outF = BRepLib_MakeFace(RefPlane, WM.Wire()).Face();
- thePrs.myPrs2D = outF;*/
-
- return true;
- /*if ( theArrayOfFPnt.IsNull() || theArrayOfLPnt.IsNull() || theArrOfProfiles.IsNull() ) {
- return false;
- }
-
- if ( theArrayOfFPnt->Length() != theArrayOfLPnt->Length() ) {
- return false;
+ HYDROData_Bathymetry::AltitudePoints right;
+ for (int i = theArrayOfFPnt->Lower(); i <= theArrayOfFPnt->Upper(); i++)
+ {
+ right.push_back(HYDROData_Bathymetry::AltitudePoint(theArrayOfFPnt->Value(i).X(),
+ theArrayOfFPnt->Value(i).Y(),
+ theArrayOfFPnt->Value(i).Z()));
}
-
- // 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();
+ std::vector<HYDROData_Bathymetry::AltitudePoints> dummy;
+ TopTools_IndexedMapOfOrientedShape ll = HYDROData_DTM::Create3DShape(left, right, dummy);
- 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
+ TopoDS_Shape LB, RB, IL, OL;
- // 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);
+ if (!ll.IsEmpty())
+ {
+ 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);
+ }
}
- 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;
+ IL = TopoDS::Wire(theArrOfProfiles->Value(theArrOfProfiles->Lower())); //TODO check that
+ OL = TopoDS::Wire(theArrOfProfiles->Value(theArrOfProfiles->Upper()));
- BRepBuilderAPI_MakeEdge aMakeEdge2(anArrayOfFPnt->Value(1),anArrayOfLPnt->Value(1));
- TopoDS_Edge aBotEdge, aTopEdge;
- if(aMakeEdge2.IsDone())
- aBotEdge = aMakeEdge2.Edge();
+ //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, LB);
+ BB.Add(newCmp, IL);
+ BB.Add(newCmp, OL);
+ BB.Add(newCmp, RB);
- BRepBuilderAPI_MakeEdge aMakeEdge3(anArrayOfFPnt->Value(anArrayOfFPnt->Length()),anArrayOfLPnt->Value(anArrayOfLPnt->Length()));
- if(aMakeEdge3.IsDone())
- aTopEdge = aMakeEdge3.Edge();
+ thePrs.myPrs3D = newCmp;
- // Make wire for 2D presentation with updating of corresponding edges
- BRepBuilderAPI_MakeWire aMakeWire;
+ TopTools_SequenceOfShape LS;
+ //HYDROData_DTM::Get2dFaceFrom3dPres( newCmp, TopoDS::Face(thePrs.myPrs2D), &LS, ind );
- aMakeWire.Add( aBotEdge );
- thePrs.myInlet = aMakeWire.Edge();
+ HYDROData_DTM::GetPlanarFaceFromBanks(TopoDS::Edge(LB), TopoDS::Edge(RB), TopoDS::Face(thePrs.myPrs2D), &LS);
- 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;
+#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
- return true;*/
-}
\ No newline at end of file
+ thePrs.myLeftBank = LS(1);
+ thePrs.myInlet = LS(2);
+ thePrs.myOutlet = LS(3);
+ thePrs.myRightBank = LS(4);
+
+}
