#include "HYDROData_Document.h"
#include "HYDROData_Tool.h"
#include "HYDROData_PolylineXY.h"
+#include "HYDROData_QuadtreeNode.hxx"
#include <gp_XY.hxx>
#include <gp_XYZ.hxx>
#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)
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 );
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() )
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;
}
}
-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)
}
}
}
+ 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;
}
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 );
return aRes;
}
+bool HYDROData_Bathymetry::ImportFromFile( const QString& theFileName )
+{
+ return ImportFromFiles(QStringList(theFileName));
+}
+
bool HYDROData_Bathymetry::ImportFromFiles( const QStringList& theFileNames )
{
AltitudePoints AllPoints;
QString aFileSuf = QFileInfo( aFile ).suffix().toLower();
- AltitudePoints aPoints;
+ HYDROData_Bathymetry::AltitudePoints aPoints;
// Try to import the file
if ( aFileSuf == "xyz" )
- Stat = Stat || importFromXYZFile( aFile, aPoints );
+ Stat = importFromXYZFile( aFile, aPoints );
else if ( aFileSuf == "asc" )
- Stat = Stat || importFromASCFile( aFile, aPoints );
+ Stat = importFromASCFile( aFile, aPoints );
+
+ if (!Stat)
+ continue; //ignore this points
// Close the file
aFile.close();
- AllPoints.Append(aPoints);
+ 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( AllPoints );
- 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 ( Stat )
SetAltitudePoints( AllPoints );
}
- return Stat && !AllPoints.IsEmpty();
+ return Stat && !AllPoints.empty();
}
bool HYDROData_Bathymetry::importFromXYZFile( QFile& theFile,
- AltitudePoints& thePoints ) const
+ HYDROData_Bathymetry::AltitudePoints& thePoints ) const
{
if ( !theFile.isOpen() )
return false;
if ( aValues.length() < 3 )
return false;
- AltitudePoint aPoint;
+ HYDROData_Bathymetry::AltitudePoint aPoint;
QString anX = aValues.value( 0 );
QString anY = aValues.value( 1 );
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;
- thePoints.Append( aPoint );
+ if( thePoints.size()>=thePoints.capacity() )
+ thePoints.reserve( thePoints.size()+BLOCK_SIZE );
+
+ thePoints.push_back( aPoint );
}
#ifdef _TIMER
}
bool HYDROData_Bathymetry::importFromASCFile( QFile& theFile,
- AltitudePoints& thePoints ) const
+ HYDROData_Bathymetry::AltitudePoints& thePoints ) const
{
if ( !theFile.isOpen() )
return false;
{
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;
-
}
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 || x<Xmin )
Xmin = x;
if( isFirst || x>Xmax )
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 );
}
