+// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// 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 <math.h>
-#define _TIMER
+// #define _TIMER
#ifdef _TIMER
#include <OSD_Timer.hxx>
#endif
-#define PYTHON_BATHYMETRY_ID "KIND_BATHYMETRY"
-
-
IMPLEMENT_STANDARD_HANDLE(HYDROData_Bathymetry, HYDROData_IAltitudeObject)
IMPLEMENT_STANDARD_RTTIEXT(HYDROData_Bathymetry, HYDROData_IAltitudeObject)
QStringList HYDROData_Bathymetry::DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const
{
- QStringList aResList;
-
- 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 );
+ QStringList aResList = dumpObjectCreation( theTreatedObjects );
+ QString aBathymetryName = GetObjPyName();
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;
}
{
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() );
aPoint.SetY( aCoordsArray->Value( i++ ) );
aPoint.SetZ( aCoordsArray->Value( i++ ) );
- aPoints << aPoint;
+ aPoints.Append( aPoint );
}
return aPoints;
double aResAltitude = anInvalidAltitude;
AltitudePoints anAltitudePoints = GetAltitudePoints();
- if ( anAltitudePoints.isEmpty() )
+ if ( anAltitudePoints.IsEmpty() )
return aResAltitude;
QPolygonF aBoundingRect;
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() );
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;
// 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 );
}
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 );
-
+
// 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 )
{
SetAltitudePoints( aPoints );
}
- return aRes && !aPoints.isEmpty();
+ return aRes && !aPoints.IsEmpty();
}
bool HYDROData_Bathymetry::importFromXYZFile( QFile& theFile,
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() ) )
+ return false;
+
// Invert the z value if requested
if ( anIsAltitudesInverted )
aPoint.SetZ( -aPoint.Z() );
- thePoints << aPoint;
+ thePoints.Append( aPoint );
}
#ifdef _TIMER
}
-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";
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 || x<Xmin )
Xmin = x;
if( isFirst || x>Xmax )
aResult->AddPoint( 0, HYDROData_IPolyline::Point( Xmax, Ymin ) );
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 );
+}
+
