X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_Bathymetry.cxx;h=58d3a11cfd7c2103011225dbf3914bc45d9e6f9d;hb=2f217128f8d34b2082de78d2af90bf243bf9e8b1;hp=8d679bd2173caa35788541263c04e8a1b7d88461;hpb=eb541c8d4b20adb368ea87f5c7f516c49f5df58a;p=modules%2Fhydro.git

diff --git a/src/HYDROData/HYDROData_Bathymetry.cxx b/src/HYDROData/HYDROData_Bathymetry.cxx
index 8d679bd2..58d3a11c 100644
--- a/src/HYDROData/HYDROData_Bathymetry.cxx
+++ b/src/HYDROData/HYDROData_Bathymetry.cxx
@@ -4,6 +4,8 @@
 #include "HYDROData_Tool.h"
 #include "HYDROData_PolylineXY.h"
 
+#include <boost/math/special_functions/fpclassify.hpp>
+
 #include <gp_XY.hxx>
 #include <gp_XYZ.hxx>
 
@@ -19,14 +21,11 @@
 
 #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)
 
@@ -41,33 +40,19 @@ HYDROData_Bathymetry::~HYDROData_Bathymetry()
 
 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;
 }
@@ -76,18 +61,17 @@ 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() );
@@ -119,7 +103,7 @@ HYDROData_Bathymetry::AltitudePoints HYDROData_Bathymetry::GetAltitudePoints() c
     aPoint.SetY( aCoordsArray->Value( i++ ) );
     aPoint.SetZ( aCoordsArray->Value( i++ ) );
 
-    aPoints << aPoint;
+    aPoints.Append( aPoint );
   }
 
   return aPoints;
@@ -194,7 +178,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 +192,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 +308,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;
@@ -362,14 +344,13 @@ void HYDROData_Bathymetry::SetAltitudesInverted( const bool theIsInverted,
 
   // 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 +372,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 +388,19 @@ bool HYDROData_Bathymetry::ImportFromFile( const QString& theFileName )
   // 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 )
   {
@@ -418,7 +409,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 +454,16 @@ 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
@@ -480,14 +476,14 @@ bool HYDROData_Bathymetry::importFromXYZFile( QFile&          theFile,
 }
 
 
-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";
@@ -497,9 +493,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 || x<Xmin )
       Xmin = x;
     if( isFirst || x>Xmax )
@@ -518,5 +518,19 @@ bool HYDROData_Bathymetry::CreateBoundaryPolyline() const
   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 );
+}
+