#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 <TCollection_AsciiString.hxx>
#endif
+#define _DEVDEBUG_
+#include "HYDRO_trace.hxx"
+
#include <assert.h>
typedef NCollection_DataMap<Standard_Real, Handle(HYDROData_Profile)> HYDROData_DataMapOfRealOfHDProfile;
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)
{
- if (!GetHydraulicAxis().IsNull())
- 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();
}
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 );
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();
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()
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);
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);
}
}
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;
}
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() );
+ 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 )
{
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 QVector<double>& theArray )
int n = theArray.size();
Handle(TDataStd_RealArray) aParamsArray =
TDataStd_RealArray::Set( aLabel, 1, n );
+ aParamsArray->SetID(TDataStd_RealArray::GetID());
for ( int i = 0; i < n; ++i )
{
const Standard_Real& aParam = theArray[i];
{
aResIndex = 0;
- QVector<double> aNewArr( anArr->Upper() );
-
+ 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-1] = theParam;
+ if (j<=n+1)
+ aNewArr[j-1] = theParam;
isInserted = true;
++j;
}
}
-
- aNewArr[j-1] = aStoredParam;
+ if (j<=n+1)
+ aNewArr[j-1] = aStoredParam;
}
if ( !isInserted )
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;
}
