X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_Bathymetry.cxx;h=15401f0ab37de92ae857dbd226f9c49cfd67242d;hb=4d4d74dd554819c30f1c8ded5520cc6c25aba56b;hp=8d679bd2173caa35788541263c04e8a1b7d88461;hpb=eb541c8d4b20adb368ea87f5c7f516c49f5df58a;p=modules%2Fhydro.git diff --git a/src/HYDROData/HYDROData_Bathymetry.cxx b/src/HYDROData/HYDROData_Bathymetry.cxx index 8d679bd2..15401f0a 100644 --- a/src/HYDROData/HYDROData_Bathymetry.cxx +++ b/src/HYDROData/HYDROData_Bathymetry.cxx @@ -1,3 +1,20 @@ +// Copyright (C) 2014-2015 EDF-R&D +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #include "HYDROData_Bathymetry.h" #include "HYDROData_Document.h" @@ -11,6 +28,7 @@ #include #include +#include #include #include #include @@ -19,14 +37,11 @@ #include -#define _TIMER +// #define _TIMER #ifdef _TIMER #include #endif -#define PYTHON_BATHYMETRY_ID "KIND_BATHYMETRY" - - IMPLEMENT_STANDARD_HANDLE(HYDROData_Bathymetry, HYDROData_IAltitudeObject) IMPLEMENT_STANDARD_RTTIEXT(HYDROData_Bathymetry, HYDROData_IAltitudeObject) @@ -39,35 +54,22 @@ HYDROData_Bathymetry::~HYDROData_Bathymetry() { } -QStringList HYDROData_Bathymetry::DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const +QStringList HYDROData_Bathymetry::DumpToPython( const QString& thePyScriptPath, + 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 ); - - aResList << QString( "%1.SetAltitudesInverted( %2 );" ) + 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) - } + 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; } @@ -76,28 +78,27 @@ 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 ); + Changed( Geom_Z ); } -HYDROData_Bathymetry::AltitudePoints HYDROData_Bathymetry::GetAltitudePoints() const +HYDROData_Bathymetry::AltitudePoints HYDROData_Bathymetry::GetAltitudePoints(bool IsConvertToGlobal) const { AltitudePoints aPoints; @@ -109,6 +110,7 @@ HYDROData_Bathymetry::AltitudePoints HYDROData_Bathymetry::GetAltitudePoints() c if ( !aLabel.FindAttribute( TDataStd_RealArray::GetID(), aCoordsArray ) ) return aPoints; + Handle(HYDROData_Document) aDoc = HYDROData_Document::Document( myLab ); for ( int i = aCoordsArray->Lower(), n = aCoordsArray->Upper(); i <= n; ) { if ( i + 3 > n + 1 ) @@ -119,7 +121,9 @@ HYDROData_Bathymetry::AltitudePoints HYDROData_Bathymetry::GetAltitudePoints() c aPoint.SetY( aCoordsArray->Value( i++ ) ); aPoint.SetZ( aCoordsArray->Value( i++ ) ); - aPoints << aPoint; + if( IsConvertToGlobal ) + aDoc->Transform( aPoint, false ); + aPoints.Append( aPoint ); } return aPoints; @@ -131,7 +135,7 @@ void HYDROData_Bathymetry::RemoveAltitudePoints() if ( !aLabel.IsNull() ) { aLabel.ForgetAllAttributes(); - SetToUpdate( true ); + Changed( Geom_Z ); } } @@ -194,7 +198,7 @@ double HYDROData_Bathymetry::GetAltitudeForPoint( const gp_XY& thePoint ) const double aResAltitude = anInvalidAltitude; AltitudePoints anAltitudePoints = GetAltitudePoints(); - if ( anAltitudePoints.isEmpty() ) + if ( anAltitudePoints.IsEmpty() ) return aResAltitude; QPolygonF aBoundingRect; @@ -208,11 +212,10 @@ double HYDROData_Bathymetry::GetAltitudeForPoint( const gp_XY& thePoint ) const AltitudePoint( -DBL_MAX, DBL_MAX, anInvalidAltitude ), AltitudePoint( DBL_MAX, DBL_MAX, anInvalidAltitude ) }; - AltitudePoints::const_iterator aListItBeg = anAltitudePoints.constBegin(); - AltitudePoints::const_iterator aListItEnd = anAltitudePoints.constEnd(); - for ( ; aListItBeg != aListItEnd; ++aListItBeg ) + 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() ); @@ -325,22 +328,21 @@ 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; 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() ); + aRes = anAsciiStr->Get(); } return aRes; @@ -355,21 +357,20 @@ void HYDROData_Bathymetry::SetAltitudesInverted( const bool theIsInverted, TDataStd_Integer::Set( myLab.FindChild( DataTag_AltitudesInverted ), (Standard_Integer)theIsInverted ); - SetToUpdate( true ); + Changed( Geom_Z ); if ( !theIsUpdate ) return; // Update altitude points AltitudePoints anAltitudePoints = GetAltitudePoints(); - if ( anAltitudePoints.isEmpty() ) + if ( anAltitudePoints.IsEmpty() ) return; - AltitudePoints::iterator aListItBeg = anAltitudePoints.begin(); - AltitudePoints::iterator aListItEnd = anAltitudePoints.end(); - for ( ; aListItBeg != aListItEnd; ++aListItBeg ) + AltitudePoints::Iterator anIter( anAltitudePoints ); + for ( ; anIter.More(); anIter.Next() ) { - AltitudePoint& aPoint = *aListItBeg; + AltitudePoint& aPoint = anIter.ChangeValue(); aPoint.SetZ( aPoint.Z() * -1 ); } @@ -391,10 +392,10 @@ bool HYDROData_Bathymetry::IsAltitudesInverted() const return aRes; } -bool HYDROData_Bathymetry::ImportFromFile( const QString& theFileName ) +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; @@ -407,9 +408,21 @@ bool HYDROData_Bathymetry::ImportFromFile( const QString& theFileName ) // Try to import the file if ( aFileSuf == "xyz" ) aRes = importFromXYZFile( aFile, aPoints ); - + else if ( aFileSuf == "asc" ) + aRes = importFromASCFile( 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 ) { @@ -418,7 +431,7 @@ bool HYDROData_Bathymetry::ImportFromFile( const QString& theFileName ) SetAltitudePoints( aPoints ); } - return aRes && !aPoints.isEmpty(); + return aRes && !aPoints.IsEmpty(); } bool HYDROData_Bathymetry::importFromXYZFile( QFile& theFile, @@ -463,11 +476,16 @@ bool HYDROData_Bathymetry::importFromXYZFile( QFile& theFile, if ( !isXOk || !isYOk || !isZOk ) return false; + if ( HYDROData_Tool::IsNan( aPoint.X() ) || HYDROData_Tool::IsInf( aPoint.X() ) || + HYDROData_Tool::IsNan( aPoint.Y() ) || HYDROData_Tool::IsInf( aPoint.Y() ) || + HYDROData_Tool::IsNan( aPoint.Z() ) || HYDROData_Tool::IsInf( aPoint.Z() ) ) + return false; + // Invert the z value if requested if ( anIsAltitudesInverted ) aPoint.SetZ( -aPoint.Z() ); - thePoints << aPoint; + thePoints.Append( aPoint ); } #ifdef _TIMER @@ -479,15 +497,106 @@ bool HYDROData_Bathymetry::importFromXYZFile( QFile& theFile, return true; } +bool HYDROData_Bathymetry::importFromASCFile( QFile& theFile, + AltitudePoints& thePoints ) const +{ + if ( !theFile.isOpen() ) + return false; + + QString aLine; + QStringList aStrList; + + int aNCols; + int aNRows; + double anXllCorner; + double anYllCorner; + double aCellSize; + double aNoDataValue; + + aLine = theFile.readLine().simplified(); + aStrList = aLine.split( ' ', QString::SkipEmptyParts ); + if ( aStrList.length() != 2 && aStrList[0].toLower() != "ncols" ) + return false; + aNCols = aStrList[1].toInt(); + + aLine = theFile.readLine().simplified(); + aStrList = aLine.split( ' ', QString::SkipEmptyParts ); + if ( aStrList.length() != 2 && aStrList[0].toLower() != "nrows" ) + return false; + aNRows = aStrList[1].toInt(); + + aLine = theFile.readLine().simplified(); + aStrList = aLine.split( ' ', QString::SkipEmptyParts ); + if ( aStrList.length() != 2 && aStrList[0].toLower() != "xllcorner" ) + return false; + anXllCorner = aStrList[1].toDouble(); -bool HYDROData_Bathymetry::CreateBoundaryPolyline() const + aLine = theFile.readLine().simplified(); + aStrList = aLine.split( ' ', QString::SkipEmptyParts ); + if ( aStrList.length() != 2 && aStrList[0].toLower() != "yllcorner" ) + return false; + anYllCorner = aStrList[1].toDouble(); + + aLine = theFile.readLine().simplified(); + aStrList = aLine.split( ' ', QString::SkipEmptyParts ); + if ( aStrList.length() != 2 && aStrList[0].toLower() != "cellsize" ) + return false; + aCellSize = aStrList[1].toDouble(); + + aLine = theFile.readLine().simplified(); + aStrList = aLine.split( ' ', QString::SkipEmptyParts ); + if ( aStrList.length() != 2 && aStrList[0].toLower() != "nodata_value" ) + return false; + aNoDataValue = aStrList[1].toDouble(); + + bool anIsAltitudesInverted = IsAltitudesInverted(); + + int i = 0; + int aStrLength = 0; + while ( !theFile.atEnd() ) + { + aLine = theFile.readLine().simplified(); + aStrList = aLine.split( ' ', QString::SkipEmptyParts ); + + aStrLength = aStrList.length(); + if ( aStrLength == 0 ) + continue; + + if ( aStrLength != aNRows ) + return false; + + for (int j = 0; j < aNCols; j++) + { + if (aStrList[j].toDouble() != aNoDataValue) + { + AltitudePoint aPoint; + aPoint.SetX(anXllCorner + aCellSize*(j + 0.5)); + aPoint.SetY(anYllCorner + aCellSize*(aNRows - i + 0.5)); + aPoint.SetZ(aStrList[j].toDouble()); + + if ( anIsAltitudesInverted ) + aPoint.SetZ( -aPoint.Z() ); + + thePoints.Append(aPoint); + } + } + i++; + + } + + 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 false; + return aResult; //search free name QString aPolylinePref = GetName() + "_Boundary"; @@ -497,9 +606,13 @@ bool HYDROData_Bathymetry::CreateBoundaryPolyline() const double Xmin = 0.0, Xmax = 0.0, Ymin = 0.0, Ymax = 0.0; bool isFirst = true; AltitudePoints aPoints = GetAltitudePoints(); - foreach( AltitudePoint aPnt, aPoints ) + + AltitudePoints::Iterator anIter( aPoints ); + for ( ; anIter.More(); anIter.Next() ) { - double x = aPnt.X(), y = aPnt.Y(); + const AltitudePoint& aPoint = anIter.Value(); + + double x = aPoint.X(), y = aPoint.Y(); if( isFirst || xXmax ) @@ -516,7 +629,24 @@ bool HYDROData_Bathymetry::CreateBoundaryPolyline() const 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->SetWireColor( HYDROData_PolylineXY::DefaultWireColor() ); + aResult->Update(); - return true; + 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 ); } +