+// 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"
#include "HYDROData_Tool.h"
#include "HYDROData_PolylineXY.h"
-#include <boost/math/special_functions/fpclassify.hpp>
-
#include <gp_XY.hxx>
#include <gp_XYZ.hxx>
#include <TDataStd_AsciiString.hxx>
#include <TDataStd_Integer.hxx>
+#include <QColor>
#include <QFile>
#include <QFileInfo>
#include <QPointF>
#include <OSD_Timer.hxx>
#endif
-#define PYTHON_BATHYMETRY_ID "KIND_BATHYMETRY"
-
+#define _DEVDEBUG_
+#include "HYDRO_trace.hxx"
IMPLEMENT_STANDARD_HANDLE(HYDROData_Bathymetry, HYDROData_IAltitudeObject)
IMPLEMENT_STANDARD_RTTIEXT(HYDROData_Bathymetry, HYDROData_IAltitudeObject)
+//HYDROData_QuadtreeNode* HYDROData_Bathymetry::myQuadtree = 0;
+std::map<int, HYDROData_QuadtreeNode*> HYDROData_Bathymetry::myQuadtrees;
+
HYDROData_Bathymetry::HYDROData_Bathymetry()
: HYDROData_IAltitudeObject()
{
+ //DEBTRACE("HYDROData_Bathymetry constructor start " << this);
+// if (! myQuadtree)
+// myQuadtree = new HYDROData_QuadtreeNode(0, 30, 5, 0.);
+ //DEBTRACE("HYDROData_Bathymetry constructor end " << this);
}
HYDROData_Bathymetry::~HYDROData_Bathymetry()
{
+ //DEBTRACE("HYDROData_Bathymetry destructor start " << this);
+// if (myQuadtree)
+// delete myQuadtree;
+// Nodes_3D::iterator it = myListOfNodes.begin();
+// for( ; it != myListOfNodes.end(); ++it)
+// delete *it;
+// myListOfNodes.clear();
}
-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;
}
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;
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 )
aPoint.SetY( aCoordsArray->Value( i++ ) );
aPoint.SetZ( aCoordsArray->Value( i++ ) );
+ if( IsConvertToGlobal )
+ aDoc->Transform( aPoint, false );
aPoints.Append( aPoint );
}
return aPoints;
}
+HYDROData_QuadtreeNode* HYDROData_Bathymetry::GetQuadtreeNodes() const
+{
+ TDF_Label aLabel = myLab.FindChild(DataTag_AltitudePoints, false);
+ if (aLabel.IsNull())
+ return 0;
+ int labkey = myLab.Tag();
+ int altkey = aLabel.Tag();
+ //DEBTRACE("GetQuadtreeNodes this labkey altkey "<<this<<" "<<labkey<<" "<<altkey);
+// if (myQuadtree->isEmpty() )
+ if (myQuadtrees.find(labkey) == myQuadtrees.end())
+ {
+ DEBTRACE("GetQuadtreeNodes init " << this << " " << labkey);
+ HYDROData_QuadtreeNode* aQuadtree = new HYDROData_QuadtreeNode(0, 30, 5, 0.);
+ myQuadtrees[labkey] = aQuadtree;
+ TDF_Label aLabel = myLab.FindChild(DataTag_AltitudePoints, false);
+ if (aLabel.IsNull())
+ return 0;
+
+ Handle(TDataStd_RealArray) aCoordsArray;
+ if (!aLabel.FindAttribute(TDataStd_RealArray::GetID(), aCoordsArray))
+ return 0;
+
+ Nodes_3D* aListOfNodes = new Nodes_3D();
+
+ for (int i = aCoordsArray->Lower(), n = aCoordsArray->Upper(); i <= n;)
+ {
+ if (i + 3 > n + 1)
+ break;
+
+ double x = aCoordsArray->Value(i++);
+ double y = aCoordsArray->Value(i++);
+ double z = aCoordsArray->Value(i++);
+ gp_XYZ* aPoint = new gp_XYZ(x, y, z);
+ aListOfNodes->push_back(aPoint);
+ }
+ DEBTRACE(" GetQuadtreeNodes call setNodesAndCompute");
+ aQuadtree->setNodesAndCompute(aListOfNodes);
+ return aQuadtree;
+ }
+ else
+ return myQuadtrees[labkey];
+}
+
void HYDROData_Bathymetry::RemoveAltitudePoints()
{
TDF_Label aLabel = myLab.FindChild( DataTag_AltitudePoints, false );
if ( !aLabel.IsNull() )
{
aLabel.ForgetAllAttributes();
- SetToUpdate( true );
+ Changed( Geom_Z );
}
}
theResPoint.SetZ( aResVal );
}
-double HYDROData_Bathymetry::GetAltitudeForPoint( const gp_XY& thePoint ) const
+double HYDROData_Bathymetry::GetAltitudeForPoint(const gp_XY& thePoint) const
{
+ DEBTRACE("GetAltitudeForPoint p(" << thePoint.X() << ", " << thePoint.Y() << ")");
double anInvalidAltitude = GetInvalidAltitude();
double aResAltitude = anInvalidAltitude;
-
- AltitudePoints anAltitudePoints = GetAltitudePoints();
- if ( anAltitudePoints.IsEmpty() )
- return aResAltitude;
-
- QPolygonF aBoundingRect;
- // Boundary plane
- // [ 0 (top-left) ] [ 1 (top-right) ]
- // thePoint
- // [ 2 (bot-left) ] [ 3 (bot-right) ]
- 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 = anIter.Value();
-
- double aDeltaX = Abs( aPoint.X() ) - Abs( thePoint.X() );
- double aDeltaY = Abs( aPoint.Y() ) - Abs( thePoint.Y() );
+ HYDROData_QuadtreeNode* aQuadtree = GetQuadtreeNodes();
+ if (!aQuadtree)
+ {
+ DEBTRACE(" no Quadtree");
+ return aResAltitude;
+ }
- if ( ValuesEquals( aDeltaX, 0.0 ) ) // Both left and right sides
+ std::map<double, const gp_XYZ*> dist2nodes;
+ aQuadtree->NodesAround(thePoint, dist2nodes, aQuadtree->getPrecision());
+ while (dist2nodes.size() == 0)
{
- if ( ValuesEquals( aDeltaY, 0.0 ) ) // Both top and bottom sides
- {
- aResAltitude = aPoint.Z();
- return aResAltitude;
- }
- else if ( aDeltaY < 0 ) // top side
- {
- // top border
- if ( ValuesMoreEquals( aPoint.X(), aBounds[ 0 ].X() ) && ValuesMoreEquals( aPoint.Y(), aBounds[ 0 ].Y() ) )
- aBounds[ 0 ] = aPoint;
- if ( ValuesLessEquals( aPoint.X(), aBounds[ 1 ].X() ) && ValuesMoreEquals( aPoint.Y(), aBounds[ 1 ].Y() ) )
- aBounds[ 1 ] = aPoint;
- }
- else
- {
- // bottom border
- if ( ValuesMoreEquals( aPoint.X(), aBounds[ 2 ].X() ) && ValuesLessEquals( aPoint.Y(), aBounds[ 2 ].Y() ) )
- aBounds[ 2 ] = aPoint;
- if ( ValuesLessEquals( aPoint.X(), aBounds[ 3 ].X() ) && ValuesLessEquals( aPoint.Y(), aBounds[ 3 ].Y() ) )
- aBounds[ 3 ] = aPoint;
- }
+ aQuadtree->setPrecision(aQuadtree->getPrecision() *2);
+ DEBTRACE("adjust precision to: " << aQuadtree->getPrecision());
+ aQuadtree->NodesAround(thePoint, dist2nodes, aQuadtree->getPrecision());
}
- else if ( aDeltaX < 0 ) // left side
+ aQuadtree->NodesAround(thePoint, dist2nodes, 5.0);
+ if (dist2nodes.size())
{
- if ( ValuesEquals( aDeltaY, 0.0 ) )
- {
- // Left border
- if ( ValuesMoreEquals( aPoint.X(), aBounds[ 0 ].X() ) && ValuesMoreEquals( aPoint.Y(), aBounds[ 0 ].Y() ) )
- aBounds[ 0 ] = aPoint;
- if ( ValuesMoreEquals( aPoint.X(), aBounds[ 2 ].X() ) && ValuesLessEquals( aPoint.Y(), aBounds[ 2 ].Y() ) )
- aBounds[ 2 ] = aPoint;
- }
- else if ( aDeltaY < 0 )
- {
- // top left corner
- if ( ValuesMoreEquals( aPoint.X(), aBounds[ 0 ].X() ) && ValuesMoreEquals( aPoint.Y(), aBounds[ 0 ].Y() ) )
- aBounds[ 0 ] = aPoint;
- }
- else
- {
- // bottom left corner
- if ( ValuesMoreEquals( aPoint.X(), aBounds[ 2 ].X() ) && ValuesLessEquals( aPoint.Y(), aBounds[ 2 ].Y() ) )
- aBounds[ 2 ] = aPoint;
- }
+ std::map<double, const gp_XYZ*>::const_iterator it = dist2nodes.begin();
+ aResAltitude = it->second->Z();
+ DEBTRACE(" number of points found: " << dist2nodes.size() << " nearest z: " << aResAltitude);
}
- else // right side
+ else
{
- if ( ValuesEquals( aDeltaY, 0.0 ) )
- {
- // Right border
- if ( ValuesLessEquals( aPoint.X(), aBounds[ 1 ].X() ) && ValuesMoreEquals( aPoint.Y(), aBounds[ 1 ].Y() ) )
- aBounds[ 1 ] = aPoint;
- if ( ValuesLessEquals( aPoint.X(), aBounds[ 3 ].X() ) && ValuesLessEquals( aPoint.Y(), aBounds[ 3 ].Y() ) )
- aBounds[ 3 ] = aPoint;
- }
- else if ( aDeltaY < 0 )
- {
- // top right corner
- if ( ValuesLessEquals( aPoint.X(), aBounds[ 1 ].X() ) && ValuesMoreEquals( aPoint.Y(), aBounds[ 1 ].Y() ) )
- aBounds[ 1 ] = aPoint;
- }
- else
- {
- // bottom right corner
- if ( ValuesLessEquals( aPoint.X(), aBounds[ 3 ].X() ) && ValuesLessEquals( aPoint.Y(), aBounds[ 3 ].Y() ) )
- aBounds[ 3 ] = aPoint;
- }
+ DEBTRACE(" number of points found: 0");
}
- // Update bounding rectangle of our global grid
- 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;
-
- // Calculate result altitude for point
- AltitudePoint aFirstPoint( aBounds[ 0 ] ), aSecPoint( aBounds[ 1 ] );
-
- // At first we merge top and bottom borders
- if ( aBounds[ 0 ].Y() != aBounds[ 2 ].Y() || aBounds[ 0 ].X() != aBounds[ 2 ].X() )
- interpolateAltitudeForPoints( thePoint, aBounds[ 0 ], aBounds[ 2 ], aFirstPoint, true );
-
- if ( aBounds[ 1 ].Y() != aBounds[ 3 ].Y() || aBounds[ 1 ].X() != aBounds[ 3 ].X() )
- interpolateAltitudeForPoints( thePoint, aBounds[ 1 ], aBounds[ 3 ], aSecPoint, true );
-
- AltitudePoint aResPoint( aFirstPoint );
-
- // At last we merge left and right borders
- if ( aFirstPoint.Y() != aSecPoint.Y() || aFirstPoint.X() != aSecPoint.X() )
- interpolateAltitudeForPoints( thePoint, aFirstPoint, aSecPoint, aResPoint, false );
-
- aResAltitude = aResPoint.Z();
-
return aResAltitude;
+
+
+// AltitudePoints anAltitudePoints = GetAltitudePoints();
+// if ( anAltitudePoints.IsEmpty() )
+// return aResAltitude;
+//
+// QPolygonF aBoundingRect;
+//
+// // Boundary plane
+// // [ 0 (top-left) ] [ 1 (top-right) ]
+// // thePoint
+// // [ 2 (bot-left) ] [ 3 (bot-right) ]
+// 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 = anIter.Value();
+//
+// double aDeltaX = Abs( aPoint.X() ) - Abs( thePoint.X() );
+// double aDeltaY = Abs( aPoint.Y() ) - Abs( thePoint.Y() );
+//
+// if ( ValuesEquals( aDeltaX, 0.0 ) ) // Both left and right sides
+// {
+// if ( ValuesEquals( aDeltaY, 0.0 ) ) // Both top and bottom sides
+// {
+// aResAltitude = aPoint.Z();
+// return aResAltitude;
+// }
+// else if ( aDeltaY < 0 ) // top side
+// {
+// // top border
+// if ( ValuesMoreEquals( aPoint.X(), aBounds[ 0 ].X() ) && ValuesMoreEquals( aPoint.Y(), aBounds[ 0 ].Y() ) )
+// aBounds[ 0 ] = aPoint;
+// if ( ValuesLessEquals( aPoint.X(), aBounds[ 1 ].X() ) && ValuesMoreEquals( aPoint.Y(), aBounds[ 1 ].Y() ) )
+// aBounds[ 1 ] = aPoint;
+// }
+// else
+// {
+// // bottom border
+// if ( ValuesMoreEquals( aPoint.X(), aBounds[ 2 ].X() ) && ValuesLessEquals( aPoint.Y(), aBounds[ 2 ].Y() ) )
+// aBounds[ 2 ] = aPoint;
+// if ( ValuesLessEquals( aPoint.X(), aBounds[ 3 ].X() ) && ValuesLessEquals( aPoint.Y(), aBounds[ 3 ].Y() ) )
+// aBounds[ 3 ] = aPoint;
+// }
+// }
+// else if ( aDeltaX < 0 ) // left side
+// {
+// if ( ValuesEquals( aDeltaY, 0.0 ) )
+// {
+// // Left border
+// if ( ValuesMoreEquals( aPoint.X(), aBounds[ 0 ].X() ) && ValuesMoreEquals( aPoint.Y(), aBounds[ 0 ].Y() ) )
+// aBounds[ 0 ] = aPoint;
+// if ( ValuesMoreEquals( aPoint.X(), aBounds[ 2 ].X() ) && ValuesLessEquals( aPoint.Y(), aBounds[ 2 ].Y() ) )
+// aBounds[ 2 ] = aPoint;
+// }
+// else if ( aDeltaY < 0 )
+// {
+// // top left corner
+// if ( ValuesMoreEquals( aPoint.X(), aBounds[ 0 ].X() ) && ValuesMoreEquals( aPoint.Y(), aBounds[ 0 ].Y() ) )
+// aBounds[ 0 ] = aPoint;
+// }
+// else
+// {
+// // bottom left corner
+// if ( ValuesMoreEquals( aPoint.X(), aBounds[ 2 ].X() ) && ValuesLessEquals( aPoint.Y(), aBounds[ 2 ].Y() ) )
+// aBounds[ 2 ] = aPoint;
+// }
+// }
+// else // right side
+// {
+// if ( ValuesEquals( aDeltaY, 0.0 ) )
+// {
+// // Right border
+// if ( ValuesLessEquals( aPoint.X(), aBounds[ 1 ].X() ) && ValuesMoreEquals( aPoint.Y(), aBounds[ 1 ].Y() ) )
+// aBounds[ 1 ] = aPoint;
+// if ( ValuesLessEquals( aPoint.X(), aBounds[ 3 ].X() ) && ValuesLessEquals( aPoint.Y(), aBounds[ 3 ].Y() ) )
+// aBounds[ 3 ] = aPoint;
+// }
+// else if ( aDeltaY < 0 )
+// {
+// // top right corner
+// if ( ValuesLessEquals( aPoint.X(), aBounds[ 1 ].X() ) && ValuesMoreEquals( aPoint.Y(), aBounds[ 1 ].Y() ) )
+// aBounds[ 1 ] = aPoint;
+// }
+// else
+// {
+// // bottom right corner
+// if ( ValuesLessEquals( aPoint.X(), aBounds[ 3 ].X() ) && ValuesLessEquals( aPoint.Y(), aBounds[ 3 ].Y() ) )
+// aBounds[ 3 ] = aPoint;
+// }
+// }
+//
+// // Update bounding rectangle of our global grid
+// 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;
+//
+// // Calculate result altitude for point
+// AltitudePoint aFirstPoint( aBounds[ 0 ] ), aSecPoint( aBounds[ 1 ] );
+//
+// // At first we merge top and bottom borders
+// if ( aBounds[ 0 ].Y() != aBounds[ 2 ].Y() || aBounds[ 0 ].X() != aBounds[ 2 ].X() )
+// interpolateAltitudeForPoints( thePoint, aBounds[ 0 ], aBounds[ 2 ], aFirstPoint, true );
+//
+// if ( aBounds[ 1 ].Y() != aBounds[ 3 ].Y() || aBounds[ 1 ].X() != aBounds[ 3 ].X() )
+// interpolateAltitudeForPoints( thePoint, aBounds[ 1 ], aBounds[ 3 ], aSecPoint, true );
+//
+// AltitudePoint aResPoint( aFirstPoint );
+//
+// // At last we merge left and right borders
+// if ( aFirstPoint.Y() != aSecPoint.Y() || aFirstPoint.X() != aSecPoint.X() )
+// interpolateAltitudeForPoints( thePoint, aFirstPoint, aSecPoint, aResPoint, false );
+//
+// aResAltitude = aResPoint.Z();
+//
+// 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;
TDataStd_Integer::Set( myLab.FindChild( DataTag_AltitudesInverted ), (Standard_Integer)theIsInverted );
- SetToUpdate( true );
+ Changed( Geom_Z );
if ( !theIsUpdate )
return;
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;
// 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 )
{
if ( !isXOk || !isYOk || !isZOk )
return false;
- 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() ) )
+ 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
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();
+
+ 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;
+
+}
+
-bool HYDROData_Bathymetry::CreateBoundaryPolyline() const
+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";
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 );
+}
+
