X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_Bathymetry.cxx;h=60e2d9bf300fd069819fa1c8188df4803b4f14ac;hb=b669cf46c196c135f8f624ff26f490b3d67f7ec1;hp=7da61f7089c0795b2c0a557e2a9c150065cd6461;hpb=a9809a049bc84242310991d410fb8a43fd4bb116;p=modules%2Fhydro.git diff --git a/src/HYDROData/HYDROData_Bathymetry.cxx b/src/HYDROData/HYDROData_Bathymetry.cxx index 7da61f70..60e2d9bf 100644 --- a/src/HYDROData/HYDROData_Bathymetry.cxx +++ b/src/HYDROData/HYDROData_Bathymetry.cxx @@ -1,11 +1,14 @@ #include "HYDROData_Bathymetry.h" +#include "HYDROData_Document.h" #include "HYDROData_Tool.h" #include #include #include +#include +#include #include #include @@ -13,13 +16,21 @@ #include #include -#define INVALID_ALTITUDE_VALUE -9999.0 +#include +#define _TIMER +#ifdef _TIMER +#include +#endif -IMPLEMENT_STANDARD_HANDLE(HYDROData_Bathymetry, HYDROData_Object) -IMPLEMENT_STANDARD_RTTIEXT(HYDROData_Bathymetry, HYDROData_Object) +#define PYTHON_BATHYMETRY_ID "KIND_BATHYMETRY" + + +IMPLEMENT_STANDARD_HANDLE(HYDROData_Bathymetry, HYDROData_IAltitudeObject) +IMPLEMENT_STANDARD_RTTIEXT(HYDROData_Bathymetry, HYDROData_IAltitudeObject) HYDROData_Bathymetry::HYDROData_Bathymetry() +: HYDROData_IAltitudeObject() { } @@ -27,9 +38,37 @@ HYDROData_Bathymetry::~HYDROData_Bathymetry() { } -double HYDROData_Bathymetry::GetInvalidAltitude() +QStringList HYDROData_Bathymetry::DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const { - return INVALID_ALTITUDE_VALUE; + QStringList aResList; + + Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( myLab ); + if ( aDocument.IsNull() ) + return aResList; + + QString aDocName = aDocument->GetDocPyName(); + QString aBathymetryName = GetName(); + + aResList << QString( "%1 = %2.CreateObject( %3 );" ) + .arg( aBathymetryName ).arg( aDocName ).arg( PYTHON_BATHYMETRY_ID ); + aResList << QString( "%1.SetName( \"%2\" );" ) + .arg( aBathymetryName ).arg( aBathymetryName ); + + aResList << QString( "%1.SetAltitudesInverted( %2 );" ) + .arg( aBathymetryName ).arg( IsAltitudesInverted() ); + + QString aFilePath = GetFilePath(); + if ( !aFilePath.isEmpty() ) + { + aResList << QString( "%1.ImportFromFile( \"%2\" );" ) + .arg( aBathymetryName ).arg( aFilePath ); + } + else + { + // TODO : bathymetry is composed from other bathymetry(ies) + } + + return aResList; } void HYDROData_Bathymetry::SetAltitudePoints( const AltitudePoints& thePoints ) @@ -53,21 +92,25 @@ void HYDROData_Bathymetry::SetAltitudePoints( const AltitudePoints& thePoints ) aCoordsArray->SetValue( i * 3 + 1, aPoint.Y() ); aCoordsArray->SetValue( i * 3 + 2, aPoint.Z() ); } + + SetToUpdate( true ); } HYDROData_Bathymetry::AltitudePoints HYDROData_Bathymetry::GetAltitudePoints() const { AltitudePoints aPoints; + TDF_Label aLabel = myLab.FindChild( DataTag_AltitudePoints, false ); + if ( aLabel.IsNull() ) + return aPoints; + Handle(TDataStd_RealArray) aCoordsArray; - if ( !myLab.FindChild( DataTag_AltitudePoints ).FindAttribute( TDataStd_RealArray::GetID(), aCoordsArray ) ) + if ( !aLabel.FindAttribute( TDataStd_RealArray::GetID(), aCoordsArray ) ) return aPoints; - int aLowerIdx = aCoordsArray->Lower(); - int anUpperIdx = aCoordsArray->Upper(); for ( int i = aCoordsArray->Lower(), n = aCoordsArray->Upper(); i <= n; ) { - if ( i + 3 > n ) + if ( i + 3 > n + 1 ) break; AltitudePoint aPoint; @@ -83,8 +126,12 @@ HYDROData_Bathymetry::AltitudePoints HYDROData_Bathymetry::GetAltitudePoints() c void HYDROData_Bathymetry::RemoveAltitudePoints() { - TDF_Label aLab = myLab.FindChild( DataTag_AltitudePoints ); - aLab.ForgetAllAttributes(); + TDF_Label aLabel = myLab.FindChild( DataTag_AltitudePoints, false ); + if ( !aLabel.IsNull() ) + { + aLabel.ForgetAllAttributes(); + SetToUpdate( true ); + } } void interpolateAltitudeForPoints( const gp_XY& thePoint, @@ -140,15 +187,10 @@ void interpolateAltitudeForPoints( const gp_XY& th theResPoint.SetZ( aResVal ); } -double HYDROData_Bathymetry::GetAltitudeForPoint( const QPointF& thePoint ) const -{ - gp_XY aGpPoint( thePoint.x(), thePoint.y() ); - return GetAltitudeForPoint( aGpPoint ); -} - double HYDROData_Bathymetry::GetAltitudeForPoint( const gp_XY& thePoint ) const { - double aResAltitude = -9999.90; + double anInvalidAltitude = GetInvalidAltitude(); + double aResAltitude = anInvalidAltitude; AltitudePoints anAltitudePoints = GetAltitudePoints(); if ( anAltitudePoints.isEmpty() ) @@ -160,10 +202,10 @@ double HYDROData_Bathymetry::GetAltitudeForPoint( const gp_XY& thePoint ) const // [ 0 (top-left) ] [ 1 (top-right) ] // thePoint // [ 2 (bot-left) ] [ 3 (bot-right) ] - AltitudePoint aBounds[ 4 ] = { AltitudePoint( -DBL_MAX, -DBL_MAX, INVALID_ALTITUDE_VALUE ), - AltitudePoint( DBL_MAX, -DBL_MAX, INVALID_ALTITUDE_VALUE ), - AltitudePoint( -DBL_MAX, DBL_MAX, INVALID_ALTITUDE_VALUE ), - AltitudePoint( DBL_MAX, DBL_MAX, INVALID_ALTITUDE_VALUE ) }; + AltitudePoint aBounds[ 4 ] = { AltitudePoint( -DBL_MAX, -DBL_MAX, anInvalidAltitude ), + AltitudePoint( DBL_MAX, -DBL_MAX, anInvalidAltitude ), + AltitudePoint( -DBL_MAX, DBL_MAX, anInvalidAltitude ), + AltitudePoint( DBL_MAX, DBL_MAX, anInvalidAltitude ) }; AltitudePoints::const_iterator aListItBeg = anAltitudePoints.constBegin(); AltitudePoints::const_iterator aListItEnd = anAltitudePoints.constEnd(); @@ -249,9 +291,17 @@ double HYDROData_Bathymetry::GetAltitudeForPoint( const gp_XY& thePoint ) const aBoundingRect << QPointF( aPoint.X(), aPoint.Y() ); } + const double LIMIT = 1E300; + if( fabs( aBounds[ 0 ].X() ) > LIMIT || fabs( aBounds[ 0 ].Y() ) > LIMIT || + fabs( aBounds[ 1 ].X() ) > LIMIT || fabs( aBounds[ 1 ].Y() ) > LIMIT || + fabs( aBounds[ 2 ].X() ) > LIMIT || fabs( aBounds[ 2 ].Y() ) > LIMIT || + fabs( aBounds[ 3 ].X() ) > LIMIT || fabs( aBounds[ 3 ].Y() ) > LIMIT ) + return anInvalidAltitude; + + // Check if requested point is inside of our bounding rectangle if ( !aBoundingRect.boundingRect().contains( thePoint.X(), thePoint.Y() ) ) - return INVALID_ALTITUDE_VALUE; + return aResAltitude; // Calculate result altitude for point AltitudePoint aFirstPoint( aBounds[ 0 ] ), aSecPoint( aBounds[ 1 ] ); @@ -274,6 +324,72 @@ double HYDROData_Bathymetry::GetAltitudeForPoint( const gp_XY& thePoint ) const return aResAltitude; } +void HYDROData_Bathymetry::SetFilePath(const QString& theFilePath) +{ + TCollection_AsciiString anAsciiStr( theFilePath.toStdString().c_str() ); + TDataStd_AsciiString::Set( myLab.FindChild( DataTag_FilePath ), anAsciiStr ); +} + +QString HYDROData_Bathymetry::GetFilePath() const +{ + QString aRes; + + TDF_Label aLabel = myLab.FindChild( DataTag_FilePath, false ); + if ( !aLabel.IsNull() ) + { + Handle(TDataStd_AsciiString) anAsciiStr; + if ( aLabel.FindAttribute( TDataStd_AsciiString::GetID(), anAsciiStr ) ) + aRes = QString( anAsciiStr->Get().ToCString() ); + } + + return aRes; +} + +void HYDROData_Bathymetry::SetAltitudesInverted( const bool theIsInverted, + const bool theIsUpdate ) +{ + bool anIsAltitudesInverted = IsAltitudesInverted(); + if ( anIsAltitudesInverted == theIsInverted ) + return; + + TDataStd_Integer::Set( myLab.FindChild( DataTag_AltitudesInverted ), (Standard_Integer)theIsInverted ); + + SetToUpdate( true ); + + if ( !theIsUpdate ) + return; + + // Update altitude points + AltitudePoints anAltitudePoints = GetAltitudePoints(); + if ( anAltitudePoints.isEmpty() ) + return; + + AltitudePoints::iterator aListItBeg = anAltitudePoints.begin(); + AltitudePoints::iterator aListItEnd = anAltitudePoints.end(); + for ( ; aListItBeg != aListItEnd; ++aListItBeg ) + { + AltitudePoint& aPoint = *aListItBeg; + aPoint.SetZ( aPoint.Z() * -1 ); + } + + SetAltitudePoints( anAltitudePoints ); +} + +bool HYDROData_Bathymetry::IsAltitudesInverted() const +{ + bool aRes = false; + + TDF_Label aLabel = myLab.FindChild( DataTag_AltitudesInverted, false ); + if ( !aLabel.IsNull() ) + { + Handle(TDataStd_Integer) anIntVal; + if ( aLabel.FindAttribute( TDataStd_Integer::GetID(), anIntVal ) ) + aRes = (bool)anIntVal->Get(); + } + + return aRes; +} + bool HYDROData_Bathymetry::ImportFromFile( const QString& theFileName ) { // Try to open the file @@ -296,7 +412,8 @@ bool HYDROData_Bathymetry::ImportFromFile( const QString& theFileName ) if ( aRes ) { - // Update altitude points of this Bathymetry + // Update file path and altitude points of this Bathymetry + SetFilePath( theFileName ); SetAltitudePoints( aPoints ); } @@ -304,7 +421,7 @@ bool HYDROData_Bathymetry::ImportFromFile( const QString& theFileName ) } bool HYDROData_Bathymetry::importFromXYZFile( QFile& theFile, - AltitudePoints& thePoints ) + AltitudePoints& thePoints ) const { if ( !theFile.isOpen() ) return false; @@ -314,13 +431,19 @@ bool HYDROData_Bathymetry::importFromXYZFile( QFile& theFile, // 2. X(float) Y(float) Z(float) // ... +#ifdef _TIMER + OSD_Timer aTimer; + aTimer.Start(); +#endif + + bool anIsAltitudesInverted = IsAltitudesInverted(); while ( !theFile.atEnd() ) { QString aLine = theFile.readLine().simplified(); if ( aLine.isEmpty() ) continue; - QStringList aValues = aLine.split( QRegExp( "\\s+" ), QString::SkipEmptyParts ); + QStringList aValues = aLine.split( ' ', QString::SkipEmptyParts ); if ( aValues.length() < 3 ) return false; @@ -334,14 +457,24 @@ bool HYDROData_Bathymetry::importFromXYZFile( QFile& theFile, aPoint.SetX( anX.toDouble( &isXOk ) ); aPoint.SetY( anY.toDouble( &isYOk ) ); - aPoint.SetZ( aZ.toDouble( &isZOk ) ); + aPoint.SetZ( aZ.toDouble( &isZOk ) ); if ( !isXOk || !isYOk || !isZOk ) return false; + // Invert the z value if requested + if ( anIsAltitudesInverted ) + aPoint.SetZ( -aPoint.Z() ); + thePoints << aPoint; } +#ifdef _TIMER + aTimer.Stop(); + std::ofstream stream( "W:/HYDRO/WORK/log.txt", std::ofstream::out ); + aTimer.Show( stream ); +#endif + return true; }