X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_Bathymetry.cxx;h=f7d31037c98ff71954ad8b203b6e975a10ba5736;hb=a95289fabbb6fbf6f32c06207422c65aafd5bd65;hp=22b007881fef20d4642d656a9e322d08d02f42aa;hpb=abdcba0f2ee048bf3c1f6073ef7fea4f0b200dcb;p=modules%2Fhydro.git diff --git a/src/HYDROData/HYDROData_Bathymetry.cxx b/src/HYDROData/HYDROData_Bathymetry.cxx index 22b00788..f7d31037 100644 --- a/src/HYDROData/HYDROData_Bathymetry.cxx +++ b/src/HYDROData/HYDROData_Bathymetry.cxx @@ -28,6 +28,7 @@ #include #include #include +#include #include #include @@ -35,6 +36,7 @@ #include #include #include +#include #ifndef LIGHT_MODE #include @@ -56,6 +58,8 @@ #define _DEVDEBUG_ #include "HYDRO_trace.hxx" +const int BLOCK_SIZE = 1000; + IMPLEMENT_STANDARD_HANDLE(HYDROData_Bathymetry, HYDROData_IAltitudeObject) IMPLEMENT_STANDARD_RTTIEXT(HYDROData_Bathymetry, HYDROData_IAltitudeObject) @@ -97,25 +101,25 @@ QStringList HYDROData_Bathymetry::DumpToPython( const QString& thePyScriptPath, return aResList; } -void HYDROData_Bathymetry::SetAltitudePoints( const AltitudePoints& thePoints ) +void HYDROData_Bathymetry::SetAltitudePoints( const HYDROData_Bathymetry::AltitudePoints& thePoints ) { RemoveAltitudePoints(); - if ( thePoints.IsEmpty() ) + if ( thePoints.empty() ) return; // Save coordinates Handle(TDataStd_RealArray) aCoordsArray = - TDataStd_RealArray::Set( myLab.FindChild( DataTag_AltitudePoints ), 0, thePoints.Length() * 3 - 1 ); + TDataStd_RealArray::Set( myLab.FindChild( DataTag_AltitudePoints ), 0, thePoints.size() * 3 - 1 ); - AltitudePoints::Iterator anIter( thePoints ); - for ( int i = 0 ; anIter.More(); ++i, anIter.Next() ) + HYDROData_Bathymetry::AltitudePoints::const_iterator anIter = thePoints.begin(), aLast = thePoints.end(); + for ( int i = 0 ; anIter!=aLast; ++i, ++anIter ) { - const AltitudePoint& aPoint = anIter.Value(); + const HYDROData_Bathymetry::AltitudePoint& aPoint = *anIter; - aCoordsArray->SetValue( i * 3, aPoint.X() ); - aCoordsArray->SetValue( i * 3 + 1, aPoint.Y() ); - aCoordsArray->SetValue( i * 3 + 2, aPoint.Z() ); + aCoordsArray->SetValue( i * 3, aPoint.X ); + aCoordsArray->SetValue( i * 3 + 1, aPoint.Y ); + aCoordsArray->SetValue( i * 3 + 2, aPoint.Z ); } Changed( Geom_Z ); @@ -123,7 +127,7 @@ void HYDROData_Bathymetry::SetAltitudePoints( const AltitudePoints& thePoints ) HYDROData_Bathymetry::AltitudePoints HYDROData_Bathymetry::GetAltitudePoints(bool IsConvertToGlobal) const { - AltitudePoints aPoints; + HYDROData_Bathymetry::AltitudePoints aPoints; TDF_Label aLabel = myLab.FindChild( DataTag_AltitudePoints, false ); if ( aLabel.IsNull() ) @@ -134,19 +138,21 @@ HYDROData_Bathymetry::AltitudePoints HYDROData_Bathymetry::GetAltitudePoints(boo return aPoints; Handle(HYDROData_Document) aDoc = HYDROData_Document::Document( myLab ); + int q = ( aCoordsArray->Upper() - aCoordsArray->Lower() + 1 ) / 3; + aPoints.reserve( q ); for ( int i = aCoordsArray->Lower(), n = aCoordsArray->Upper(); i <= n; ) { if ( i + 3 > n + 1 ) break; - AltitudePoint aPoint; - aPoint.SetX( aCoordsArray->Value( i++ ) ); - aPoint.SetY( aCoordsArray->Value( i++ ) ); - aPoint.SetZ( aCoordsArray->Value( i++ ) ); + HYDROData_Bathymetry::AltitudePoint aPoint; + aPoint.X = aCoordsArray->Value( i++ ); + aPoint.Y = aCoordsArray->Value( i++ ); + aPoint.Z = aCoordsArray->Value( i++ ); if( IsConvertToGlobal ) - aDoc->Transform( aPoint, false ); - aPoints.Append( aPoint ); + aDoc->Transform( aPoint.X, aPoint.Y, aPoint.Z, false ); + aPoints.push_back( aPoint ); } return aPoints; @@ -256,57 +262,57 @@ void HYDROData_Bathymetry::RemoveAltitudePoints() } } -void interpolateAltitudeForPoints( const gp_XY& thePoint, +void interpolateAltitudeForPoints( const gp_XY& thePoint, const HYDROData_Bathymetry::AltitudePoint& theFirstPoint, const HYDROData_Bathymetry::AltitudePoint& theSecPoint, HYDROData_Bathymetry::AltitudePoint& theResPoint, - const bool& theIsVertical ) + const bool& theIsVertical ) { double aCoordX = thePoint.X(); double aCoordY = thePoint.Y(); if ( theIsVertical ) { - aCoordX = theFirstPoint.X(); + aCoordX = theFirstPoint.X; - if ( !ValuesEquals( theFirstPoint.X(), theSecPoint.X() ) ) + if ( !ValuesEquals( theFirstPoint.X, theSecPoint.X ) ) { // Recalculate X coordinate by equation of line from two points - aCoordX = ( ( ( thePoint.Y() - theFirstPoint.Y() ) * ( theSecPoint.X() - theFirstPoint.X() ) ) / - ( theSecPoint.Y() - theFirstPoint.Y() ) ) + theFirstPoint.X(); + aCoordX = ( ( ( thePoint.Y() - theFirstPoint.Y ) * ( theSecPoint.X - theFirstPoint.X ) ) / + ( theSecPoint.Y - theFirstPoint.Y ) ) + theFirstPoint.X; } } else { - aCoordY = theFirstPoint.Y(); + aCoordY = theFirstPoint.Y; - if ( !ValuesEquals( theFirstPoint.Y(), theSecPoint.Y() ) ) + if ( !ValuesEquals( theFirstPoint.Y, theSecPoint.Y ) ) { // Recalculate y by equation of line from two points - aCoordY = ( ( ( thePoint.X() - theFirstPoint.X() ) * ( theSecPoint.Y() - theFirstPoint.Y() ) ) / - ( theSecPoint.X() - theFirstPoint.X() ) ) + theFirstPoint.Y(); + aCoordY = ( ( ( thePoint.X() - theFirstPoint.X ) * ( theSecPoint.Y - theFirstPoint.Y ) ) / + ( theSecPoint.X - theFirstPoint.X ) ) + theFirstPoint.Y; } } - theResPoint.SetX( aCoordX ); - theResPoint.SetY( aCoordY ); + theResPoint.X = aCoordX; + theResPoint.Y = aCoordY; // Calculate coefficient for interpolation - double aLength = Sqrt( Pow( theSecPoint.Y() - theFirstPoint.Y(), 2 ) + - Pow( theSecPoint.X() - theFirstPoint.X(), 2 ) ); + double aLength = Sqrt( Pow( theSecPoint.Y - theFirstPoint.Y, 2 ) + + Pow( theSecPoint.X - theFirstPoint.X, 2 ) ); double aInterCoeff = 0; if ( aLength != 0 ) - aInterCoeff = ( theSecPoint.Z() - theFirstPoint.Z() ) / aLength; + aInterCoeff = ( theSecPoint.Z - theFirstPoint.Z ) / aLength; - double aNewLength = Sqrt( Pow( theResPoint.Y() - theFirstPoint.Y(), 2 ) + - Pow( theResPoint.X() - theFirstPoint.X(), 2 ) ); + double aNewLength = Sqrt( Pow( theResPoint.Y - theFirstPoint.Y, 2 ) + + Pow( theResPoint.X - theFirstPoint.X, 2 ) ); // Calculate interpolated value - double aResVal = theFirstPoint.Z() + aInterCoeff * aNewLength; + double aResVal = theFirstPoint.Z + aInterCoeff * aNewLength; - theResPoint.SetZ( aResVal ); + theResPoint.Z = aResVal; } #ifndef LIGHT_MODE bool interpolZtriangle(const gp_XY& point, vtkPolyData* delaunay2D, vtkIdList* triangle, double& z) @@ -432,6 +438,19 @@ void HYDROData_Bathymetry::SetFilePath( const TCollection_AsciiString& theFilePa TDataStd_AsciiString::Set( myLab.FindChild( DataTag_FilePath ), theFilePath ); } +void HYDROData_Bathymetry::SetFilePaths( const QStringList& theFilePaths ) +{ + int i = 1; + Handle_TDataStd_ExtStringArray TExtStrArr = TDataStd_ExtStringArray::Set( myLab.FindChild( DataTag_FilePaths ), 1, theFilePaths.size() ); + foreach (QString filepath, theFilePaths) + { + std::string sstr = filepath.toStdString(); + const char* Val = sstr.c_str(); + TExtStrArr->SetValue(i, TCollection_ExtendedString(Val)); + i++; + } +} + TCollection_AsciiString HYDROData_Bathymetry::GetFilePath() const { TCollection_AsciiString aRes; @@ -443,10 +462,52 @@ TCollection_AsciiString HYDROData_Bathymetry::GetFilePath() const if ( aLabel.FindAttribute( TDataStd_AsciiString::GetID(), anAsciiStr ) ) aRes = anAsciiStr->Get(); } + else + { + aLabel = myLab.FindChild( DataTag_FilePaths, false ); + if ( !aLabel.IsNull() ) + { + Handle(TDataStd_ExtStringArray) anExtStrArr; + if ( aLabel.FindAttribute( TDataStd_ExtStringArray::GetID(), anExtStrArr ) ) + aRes = anExtStrArr->Value(1); //try take the first; convert extstring to asciistring + } + } return aRes; } +QStringList HYDROData_Bathymetry::GetFilePaths() const +{ + QStringList aResL; + + TDF_Label aLabel = myLab.FindChild( DataTag_FilePaths, false ); + if ( !aLabel.IsNull() ) + { + Handle(TDataStd_ExtStringArray) anExtStrArr; + if ( aLabel.FindAttribute( TDataStd_ExtStringArray::GetID(), anExtStrArr ) ) + { + for (int i = anExtStrArr->Lower(); i <= anExtStrArr->Upper(); i++ ) + { + Standard_ExtString str = anExtStrArr->Value(i).ToExtString(); + TCollection_AsciiString aText (str); + aResL << QString(aText.ToCString()); + } + } + } + else //backward compatibility + { + TDF_Label anOldLabel = myLab.FindChild( DataTag_FilePath, false ); + if ( !anOldLabel.IsNull() ) + { + Handle(TDataStd_AsciiString) anAsciiStr; + if ( anOldLabel.FindAttribute( TDataStd_AsciiString::GetID(), anAsciiStr ) ) + aResL << QString(anAsciiStr->Get().ToCString()); + } + } + + return aResL; +} + void HYDROData_Bathymetry::SetAltitudesInverted( const bool theIsInverted, const bool theIsUpdate ) { @@ -462,15 +523,15 @@ void HYDROData_Bathymetry::SetAltitudesInverted( const bool theIsInverted, return; // Update altitude points - AltitudePoints anAltitudePoints = GetAltitudePoints(); - if ( anAltitudePoints.IsEmpty() ) + HYDROData_Bathymetry::AltitudePoints anAltitudePoints = GetAltitudePoints(); + if ( anAltitudePoints.empty() ) return; - AltitudePoints::Iterator anIter( anAltitudePoints ); - for ( ; anIter.More(); anIter.Next() ) + HYDROData_Bathymetry::AltitudePoints::iterator anIter = anAltitudePoints.begin(), aLast = anAltitudePoints.end(); + for ( ; anIter!=aLast; ++anIter ) { - AltitudePoint& aPoint = anIter.ChangeValue(); - aPoint.SetZ( aPoint.Z() * -1 ); + HYDROData_Bathymetry::AltitudePoint& aPoint = *anIter; + aPoint.Z *= -1; } SetAltitudePoints( anAltitudePoints ); @@ -491,50 +552,63 @@ bool HYDROData_Bathymetry::IsAltitudesInverted() const return aRes; } -bool HYDROData_Bathymetry::ImportFromFile( const TCollection_AsciiString& theFileName ) +bool HYDROData_Bathymetry::ImportFromFile( const QString& theFileName ) { - // Try to open the file - QFile aFile( theFileName.ToCString() ); - if ( !aFile.exists() || !aFile.open( QIODevice::ReadOnly ) ) - return false; + return ImportFromFiles(QStringList(theFileName)); +} - bool aRes = false; +bool HYDROData_Bathymetry::ImportFromFiles( const QStringList& theFileNames ) +{ + AltitudePoints AllPoints; + bool Stat = false; - QString aFileSuf = QFileInfo( aFile ).suffix().toLower(); + foreach (QString theFileName, theFileNames) + { + // Try to open the file + QFile aFile( theFileName ); + if ( !aFile.exists() || !aFile.open( QIODevice::ReadOnly ) ) + continue; - AltitudePoints aPoints; + QString aFileSuf = QFileInfo( aFile ).suffix().toLower(); - // Try to import the file - if ( aFileSuf == "xyz" ) - aRes = importFromXYZFile( aFile, aPoints ); - else if ( aFileSuf == "asc" ) - aRes = importFromASCFile( aFile, aPoints ); + HYDROData_Bathymetry::AltitudePoints aPoints; - // Close the file - aFile.close(); - + // Try to import the file + if ( aFileSuf == "xyz" ) + Stat = importFromXYZFile( aFile, aPoints ); + else if ( aFileSuf == "asc" ) + Stat = importFromASCFile( aFile, aPoints ); + + if (!Stat) + continue; //ignore this points + + // Close the file + aFile.close(); + + AllPoints.insert(AllPoints.end(), aPoints.begin(), aPoints.end()); + } // Convert from global to local CS Handle_HYDROData_Document aDoc = HYDROData_Document::Document( myLab ); - AltitudePoints::Iterator anIter( aPoints ); - for ( ; anIter.More(); anIter.Next() ) + HYDROData_Bathymetry::AltitudePoints::iterator anIter = AllPoints.begin(), aLast = AllPoints.end(); + for ( ; anIter!=aLast; ++anIter ) { - AltitudePoint& aPoint = anIter.ChangeValue(); - aDoc->Transform( aPoint, true ); + HYDROData_Bathymetry::AltitudePoint& aPoint = *anIter; + aDoc->Transform( aPoint.X, aPoint.Y, aPoint.Z, true ); } - if ( aRes ) + if ( Stat ) { // Update file path and altitude points of this Bathymetry - SetFilePath( theFileName ); - SetAltitudePoints( aPoints ); + SetFilePaths (theFileNames ); + SetAltitudePoints( AllPoints ); } - return aRes && !aPoints.IsEmpty(); + return Stat && !AllPoints.empty(); } bool HYDROData_Bathymetry::importFromXYZFile( QFile& theFile, - AltitudePoints& thePoints ) const + HYDROData_Bathymetry::AltitudePoints& thePoints ) const { if ( !theFile.isOpen() ) return false; @@ -560,7 +634,7 @@ bool HYDROData_Bathymetry::importFromXYZFile( QFile& theFile, if ( aValues.length() < 3 ) return false; - AltitudePoint aPoint; + HYDROData_Bathymetry::AltitudePoint aPoint; QString anX = aValues.value( 0 ); QString anY = aValues.value( 1 ); @@ -568,23 +642,26 @@ bool HYDROData_Bathymetry::importFromXYZFile( QFile& theFile, bool isXOk = false, isYOk = false, isZOk = false; - aPoint.SetX( anX.toDouble( &isXOk ) ); - aPoint.SetY( anY.toDouble( &isYOk ) ); - aPoint.SetZ( aZ.toDouble( &isZOk ) ); + aPoint.X = anX.toDouble( &isXOk ); + aPoint.Y = anY.toDouble( &isYOk ); + aPoint.Z = aZ.toDouble( &isZOk ); 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() ) ) + 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() ); + aPoint.Z = -aPoint.Z; + + if( thePoints.size()>=thePoints.capacity() ) + thePoints.reserve( thePoints.size()+BLOCK_SIZE ); - thePoints.Append( aPoint ); + thePoints.push_back( aPoint ); } #ifdef _TIMER @@ -597,7 +674,7 @@ bool HYDROData_Bathymetry::importFromXYZFile( QFile& theFile, } bool HYDROData_Bathymetry::importFromASCFile( QFile& theFile, - AltitudePoints& thePoints ) const + HYDROData_Bathymetry::AltitudePoints& thePoints ) const { if ( !theFile.isOpen() ) return false; @@ -668,23 +745,23 @@ bool HYDROData_Bathymetry::importFromASCFile( QFile& theFile, { 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()); + HYDROData_Bathymetry::AltitudePoint aPoint; + aPoint.X = anXllCorner + aCellSize*(j + 0.5); + aPoint.Y = anYllCorner + aCellSize*(aNRows - i + 0.5); + aPoint.Z = aStrList[j].toDouble(); if ( anIsAltitudesInverted ) - aPoint.SetZ( -aPoint.Z() ); + aPoint.Z = -aPoint.Z; - thePoints.Append(aPoint); + if( thePoints.size()>=thePoints.capacity() ) + thePoints.reserve( thePoints.size()+BLOCK_SIZE ); + thePoints.push_back(aPoint); } } i++; - } return true; - } @@ -704,14 +781,14 @@ Handle_HYDROData_PolylineXY HYDROData_Bathymetry::CreateBoundaryPolyline() const double Xmin = 0.0, Xmax = 0.0, Ymin = 0.0, Ymax = 0.0; bool isFirst = true; - AltitudePoints aPoints = GetAltitudePoints(); + HYDROData_Bathymetry::AltitudePoints aPoints = GetAltitudePoints(); - AltitudePoints::Iterator anIter( aPoints ); - for ( ; anIter.More(); anIter.Next() ) + HYDROData_Bathymetry::AltitudePoints::const_iterator anIter = aPoints.begin(), aLast = aPoints.end(); + for ( ; anIter!=aLast; ++anIter ) { - const AltitudePoint& aPoint = anIter.Value(); + const HYDROData_Bathymetry::AltitudePoint& aPoint = *anIter; - double x = aPoint.X(), y = aPoint.Y(); + double x = aPoint.X, y = aPoint.Y; if( isFirst || xXmax ) @@ -739,12 +816,14 @@ Handle_HYDROData_PolylineXY HYDROData_Bathymetry::CreateBoundaryPolyline() const 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() ) + HYDROData_Bathymetry::AltitudePoints aPoints = GetAltitudePoints(); + HYDROData_Bathymetry::AltitudePoints::iterator anIter = aPoints.begin(), aLast = aPoints.end(); + for ( int i = 0; anIter!=aLast; ++i, ++anIter ) { - AltitudePoint& aPoint = anIter.ChangeValue(); - aPoint += aDelta; + HYDROData_Bathymetry::AltitudePoint& aPoint = *anIter; + aPoint.X += aDelta.X(); + aPoint.Y += aDelta.Y(); + aPoint.Z += aDelta.Z(); } SetAltitudePoints( aPoints ); }