X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_Bathymetry.cxx;h=58d3a11cfd7c2103011225dbf3914bc45d9e6f9d;hb=191c33b8fd827caa9af8886728e9df22ae55451e;hp=95c0affdc188d0ca97b917e6d41ead08819fb8fd;hpb=dadcea132a8b5df65f63168ecdc59b245c374b8b;p=modules%2Fhydro.git diff --git a/src/HYDROData/HYDROData_Bathymetry.cxx b/src/HYDROData/HYDROData_Bathymetry.cxx index 95c0affd..58d3a11c 100644 --- a/src/HYDROData/HYDROData_Bathymetry.cxx +++ b/src/HYDROData/HYDROData_Bathymetry.cxx @@ -2,12 +2,16 @@ #include "HYDROData_Bathymetry.h" #include "HYDROData_Document.h" #include "HYDROData_Tool.h" +#include "HYDROData_PolylineXY.h" + +#include #include #include #include #include +#include #include #include @@ -15,8 +19,12 @@ #include #include -#define PYTHON_BATHYMETRY_ID "KIND_BATHYMETRY" +#include +// #define _TIMER +#ifdef _TIMER +#include +#endif IMPLEMENT_STANDARD_HANDLE(HYDROData_Bathymetry, HYDROData_IAltitudeObject) IMPLEMENT_STANDARD_RTTIEXT(HYDROData_Bathymetry, HYDROData_IAltitudeObject) @@ -32,30 +40,19 @@ HYDROData_Bathymetry::~HYDROData_Bathymetry() QStringList HYDROData_Bathymetry::DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const { - QStringList aResList; + QStringList aResList = dumpObjectCreation( theTreatedObjects ); + QString aBathymetryName = GetObjPyName(); - 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 ); - - QString aFilePath = GetFilePath(); - if ( !aFilePath.isEmpty() ) - { - aResList << QString( "%1.ImportFromFile( \"%2\" );" ) - .arg( aBathymetryName ).arg( aFilePath ); - } - else - { - // TODO : bathymetry is composed from other bathymetry(ies) - } + aResList << QString( "%1.SetAltitudesInverted( %2 );" ) + .arg( aBathymetryName ).arg( IsAltitudesInverted() ); + + TCollection_AsciiString aFilePath = GetFilePath(); + aResList << QString( "%1.ImportFromFile( \"%2\" );" ) + .arg( aBathymetryName ).arg( aFilePath.ToCString() ); + + aResList << QString( "" ); + aResList << QString( "%1.Update();" ).arg( aBathymetryName ); + aResList << QString( "" ); return aResList; } @@ -64,31 +61,36 @@ void HYDROData_Bathymetry::SetAltitudePoints( const AltitudePoints& thePoints ) { RemoveAltitudePoints(); - if ( thePoints.isEmpty() ) + if ( thePoints.IsEmpty() ) return; // Save coordinates Handle(TDataStd_RealArray) aCoordsArray = - TDataStd_RealArray::Set( myLab.FindChild( DataTag_AltitudePoints ), 0, thePoints.size() * 3 - 1 ); + TDataStd_RealArray::Set( myLab.FindChild( DataTag_AltitudePoints ), 0, thePoints.Length() * 3 - 1 ); - AltitudePoints::const_iterator aListItBeg = thePoints.constBegin(); - AltitudePoints::const_iterator aListItEnd = thePoints.constEnd(); - for ( int i = 0 ; aListItBeg != aListItEnd; ++i, ++aListItBeg ) + AltitudePoints::Iterator anIter( thePoints ); + for ( int i = 0 ; anIter.More(); ++i, anIter.Next() ) { - const AltitudePoint& aPoint = *aListItBeg; + const AltitudePoint& aPoint = anIter.Value(); aCoordsArray->SetValue( i * 3, aPoint.X() ); 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; for ( int i = aCoordsArray->Lower(), n = aCoordsArray->Upper(); i <= n; ) @@ -101,7 +103,7 @@ HYDROData_Bathymetry::AltitudePoints HYDROData_Bathymetry::GetAltitudePoints() c aPoint.SetY( aCoordsArray->Value( i++ ) ); aPoint.SetZ( aCoordsArray->Value( i++ ) ); - aPoints << aPoint; + aPoints.Append( aPoint ); } return aPoints; @@ -109,8 +111,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, @@ -168,10 +174,11 @@ void interpolateAltitudeForPoints( const gp_XY& th double HYDROData_Bathymetry::GetAltitudeForPoint( const gp_XY& thePoint ) const { - double aResAltitude = GetInvalidAltitude(); + double anInvalidAltitude = GetInvalidAltitude(); + double aResAltitude = anInvalidAltitude; AltitudePoints anAltitudePoints = GetAltitudePoints(); - if ( anAltitudePoints.isEmpty() ) + if ( anAltitudePoints.IsEmpty() ) return aResAltitude; QPolygonF aBoundingRect; @@ -180,16 +187,15 @@ 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, GetInvalidAltitude() ), - AltitudePoint( DBL_MAX, -DBL_MAX, GetInvalidAltitude() ), - AltitudePoint( -DBL_MAX, DBL_MAX, GetInvalidAltitude() ), - AltitudePoint( DBL_MAX, DBL_MAX, GetInvalidAltitude() ) }; - - AltitudePoints::const_iterator aListItBeg = anAltitudePoints.constBegin(); - AltitudePoints::const_iterator aListItEnd = anAltitudePoints.constEnd(); - for ( ; aListItBeg != aListItEnd; ++aListItBeg ) + 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::Iterator anIter( anAltitudePoints ); + for ( ; anIter.More(); anIter.Next() ) { - const AltitudePoint& aPoint = *aListItBeg; + const AltitudePoint& aPoint = anIter.Value(); double aDeltaX = Abs( aPoint.X() ) - Abs( thePoint.X() ); double aDeltaY = Abs( aPoint.Y() ) - Abs( thePoint.Y() ); @@ -269,6 +275,14 @@ 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 aResAltitude; @@ -294,27 +308,74 @@ double HYDROData_Bathymetry::GetAltitudeForPoint( const gp_XY& thePoint ) const return aResAltitude; } -void HYDROData_Bathymetry::SetFilePath(const QString& theFilePath) +void HYDROData_Bathymetry::SetFilePath( const TCollection_AsciiString& theFilePath ) { - TCollection_AsciiString anAsciiStr( theFilePath.toStdString().c_str() ); - TDataStd_AsciiString::Set( myLab.FindChild( DataTag_FilePath ), anAsciiStr ); + TDataStd_AsciiString::Set( myLab.FindChild( DataTag_FilePath ), theFilePath ); } -QString HYDROData_Bathymetry::GetFilePath() const +TCollection_AsciiString HYDROData_Bathymetry::GetFilePath() const { - QString aRes; + TCollection_AsciiString aRes; - Handle(TDataStd_AsciiString) anAsciiStr; - if ( myLab.FindChild( DataTag_FilePath ).FindAttribute( TDataStd_AsciiString::GetID(), anAsciiStr ) ) - aRes = QString( anAsciiStr->Get().ToCString() ); + TDF_Label aLabel = myLab.FindChild( DataTag_FilePath, false ); + if ( !aLabel.IsNull() ) + { + Handle(TDataStd_AsciiString) anAsciiStr; + if ( aLabel.FindAttribute( TDataStd_AsciiString::GetID(), anAsciiStr ) ) + aRes = anAsciiStr->Get(); + } return aRes; } -bool HYDROData_Bathymetry::ImportFromFile( const QString& theFileName ) +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 anIter( anAltitudePoints ); + for ( ; anIter.More(); anIter.Next() ) + { + AltitudePoint& aPoint = anIter.ChangeValue(); + 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 TCollection_AsciiString& theFileName ) { // Try to open the file - QFile aFile( theFileName ); + QFile aFile( theFileName.ToCString() ); if ( !aFile.exists() || !aFile.open( QIODevice::ReadOnly ) ) return false; @@ -327,9 +388,19 @@ bool HYDROData_Bathymetry::ImportFromFile( const QString& theFileName ) // Try to import the file if ( aFileSuf == "xyz" ) aRes = importFromXYZFile( aFile, aPoints ); - + // Close the file aFile.close(); + + + // Convert from global to local CS + Handle_HYDROData_Document aDoc = HYDROData_Document::Document( myLab ); + AltitudePoints::Iterator anIter( aPoints ); + for ( ; anIter.More(); anIter.Next() ) + { + AltitudePoint& aPoint = anIter.ChangeValue(); + aDoc->Transform( aPoint, true ); + } if ( aRes ) { @@ -338,11 +409,11 @@ bool HYDROData_Bathymetry::ImportFromFile( const QString& theFileName ) SetAltitudePoints( aPoints ); } - return aRes && !aPoints.isEmpty(); + return aRes && !aPoints.IsEmpty(); } bool HYDROData_Bathymetry::importFromXYZFile( QFile& theFile, - AltitudePoints& thePoints ) + AltitudePoints& thePoints ) const { if ( !theFile.isOpen() ) return false; @@ -352,13 +423,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; @@ -372,17 +449,88 @@ 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; - thePoints << aPoint; + if ( boost::math::isnan( aPoint.X() ) || boost::math::isinf( aPoint.X() ) || + boost::math::isnan( aPoint.Y() ) || boost::math::isinf( aPoint.Y() ) || + boost::math::isnan( aPoint.Z() ) || boost::math::isinf( aPoint.Z() ) ) + return false; + + // Invert the z value if requested + if ( anIsAltitudesInverted ) + aPoint.SetZ( -aPoint.Z() ); + + thePoints.Append( aPoint ); } +#ifdef _TIMER + aTimer.Stop(); + std::ofstream stream( "W:/HYDRO/WORK/log.txt", std::ofstream::out ); + aTimer.Show( stream ); +#endif + return true; } +Handle_HYDROData_PolylineXY HYDROData_Bathymetry::CreateBoundaryPolyline() const +{ + Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( myLab ); + Handle_HYDROData_PolylineXY aResult = + Handle_HYDROData_PolylineXY::DownCast( aDocument->CreateObject( KIND_POLYLINEXY ) ); + + if( aResult.IsNull() ) + return aResult; + //search free name + QString aPolylinePref = GetName() + "_Boundary"; + QString aPolylineName = HYDROData_Tool::GenerateObjectName( aDocument, aPolylinePref ); + aResult->SetName( aPolylineName ); + + double Xmin = 0.0, Xmax = 0.0, Ymin = 0.0, Ymax = 0.0; + bool isFirst = true; + AltitudePoints aPoints = GetAltitudePoints(); + + AltitudePoints::Iterator anIter( aPoints ); + for ( ; anIter.More(); anIter.Next() ) + { + const AltitudePoint& aPoint = anIter.Value(); + + double x = aPoint.X(), y = aPoint.Y(); + if( isFirst || xXmax ) + Xmax = x; + if( isFirst || yYmax ) + Ymax = y; + isFirst = false; + } + + aResult->AddSection( "bound", HYDROData_IPolyline::SECTION_POLYLINE, true ); + aResult->AddPoint( 0, HYDROData_IPolyline::Point( Xmin, Ymin ) ); + aResult->AddPoint( 0, HYDROData_IPolyline::Point( Xmin, Ymax ) ); + aResult->AddPoint( 0, HYDROData_IPolyline::Point( Xmax, Ymax ) ); + aResult->AddPoint( 0, HYDROData_IPolyline::Point( Xmax, Ymin ) ); + aResult->Update(); + + return aResult; +} + +void HYDROData_Bathymetry::UpdateLocalCS( double theDx, double theDy ) +{ + gp_XYZ aDelta( theDx, theDy, 0 ); + AltitudePoints aPoints = GetAltitudePoints(); + AltitudePoints::Iterator anIter( aPoints ); + for ( int i = 0 ; anIter.More(); ++i, anIter.Next() ) + { + AltitudePoint& aPoint = anIter.ChangeValue(); + aPoint += aDelta; + } + SetAltitudePoints( aPoints ); +}