X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_Bathymetry.cxx;h=2cacf6f0d96a5e8dd7a398fb5101ed1f4c8e3e0a;hb=424f8230c9003d00fb27499b2441c4b3a2a28292;hp=14e6a24af744e33d274ce3c545a5ac1a777d4a53;hpb=389e43ab82f20b133ebcc1a98aee9f460176c4e1;p=modules%2Fhydro.git

diff --git a/src/HYDROData/HYDROData_Bathymetry.cxx b/src/HYDROData/HYDROData_Bathymetry.cxx
index 14e6a24a..2cacf6f0 100644
--- a/src/HYDROData/HYDROData_Bathymetry.cxx
+++ b/src/HYDROData/HYDROData_Bathymetry.cxx
@@ -1,5 +1,6 @@
 
 #include "HYDROData_Bathymetry.h"
+#include "HYDROData_Document.h"
 #include "HYDROData_Tool.h"
 
 #include <gp_XY.hxx>
@@ -14,13 +15,19 @@
 #include <QPolygonF>
 #include <QStringList>
 
-#define INVALID_ALTITUDE_VALUE -9999.0
+#define _TIMER
+#ifdef _TIMER
+#include <OSD_Timer.hxx>
+#endif
 
+#define PYTHON_BATHYMETRY_ID "KIND_BATHYMETRY"
 
-IMPLEMENT_STANDARD_HANDLE(HYDROData_Bathymetry, HYDROData_Object)
-IMPLEMENT_STANDARD_RTTIEXT(HYDROData_Bathymetry, HYDROData_Object)
+
+IMPLEMENT_STANDARD_HANDLE(HYDROData_Bathymetry, HYDROData_IAltitudeObject)
+IMPLEMENT_STANDARD_RTTIEXT(HYDROData_Bathymetry, HYDROData_IAltitudeObject)
 
 HYDROData_Bathymetry::HYDROData_Bathymetry()
+: HYDROData_IAltitudeObject()
 {
 }
 
@@ -28,9 +35,34 @@ HYDROData_Bathymetry::~HYDROData_Bathymetry()
 {
 }
 
-double HYDROData_Bathymetry::GetInvalidAltitude()
+QStringList HYDROData_Bathymetry::DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const
 {
-  return INVALID_ALTITUDE_VALUE;
+  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 );
+
+  QString aFilePath = GetFilePath();
+  if ( !aFilePath.isEmpty() )
+  {
+    aResList << QString( "%1.ImportFromFile( \"%2\" );" )
+                .arg( aBathymetryName ).arg( aFilePath );
+  }
+  else
+  {
+    // TODO : bathymetry is composed from other bathymetry(ies)
+  }
+
+  return aResList;
 }
 
 void HYDROData_Bathymetry::SetAltitudePoints( const AltitudePoints& thePoints )
@@ -54,21 +86,25 @@ void HYDROData_Bathymetry::SetAltitudePoints( const AltitudePoints& thePoints )
     aCoordsArray->SetValue( i * 3 + 1, aPoint.Y() );
     aCoordsArray->SetValue( i * 3 + 2, aPoint.Z() );
   }
+
+  SetToUpdate( true );
 }
 
 HYDROData_Bathymetry::AltitudePoints HYDROData_Bathymetry::GetAltitudePoints() const
 {
   AltitudePoints aPoints;
 
+  TDF_Label aLabel = myLab.FindChild( DataTag_AltitudePoints, false );
+  if ( aLabel.IsNull() )
+    return aPoints;
+
   Handle(TDataStd_RealArray) aCoordsArray;
-  if ( !myLab.FindChild( DataTag_AltitudePoints ).FindAttribute( TDataStd_RealArray::GetID(), aCoordsArray ) )
+  if ( !aLabel.FindAttribute( TDataStd_RealArray::GetID(), aCoordsArray ) )
     return aPoints;
 
-  int aLowerIdx = aCoordsArray->Lower();
-  int anUpperIdx = aCoordsArray->Upper();
   for ( int i = aCoordsArray->Lower(), n = aCoordsArray->Upper(); i <= n; )
   {
-    if ( i + 3 > n )
+    if ( i + 3 > n + 1 )
       break;
 
     AltitudePoint aPoint;
@@ -84,8 +120,12 @@ HYDROData_Bathymetry::AltitudePoints HYDROData_Bathymetry::GetAltitudePoints() c
 
 void HYDROData_Bathymetry::RemoveAltitudePoints()
 {
-  TDF_Label aLab = myLab.FindChild( DataTag_AltitudePoints );
-  aLab.ForgetAllAttributes();
+  TDF_Label aLabel = myLab.FindChild( DataTag_AltitudePoints, false );
+  if ( !aLabel.IsNull() )
+  {
+    aLabel.ForgetAllAttributes();
+    SetToUpdate( true );
+  }
 }
 
 void interpolateAltitudeForPoints( const gp_XY&                               thePoint,
@@ -141,15 +181,9 @@ void interpolateAltitudeForPoints( const gp_XY&                               th
   theResPoint.SetZ( aResVal );
 }
 
-double HYDROData_Bathymetry::GetAltitudeForPoint( const QPointF& thePoint ) const
-{
-  gp_XY aGpPoint( thePoint.x(), thePoint.y() );
-  return GetAltitudeForPoint( aGpPoint );
-}
-
 double HYDROData_Bathymetry::GetAltitudeForPoint( const gp_XY& thePoint ) const
 {
-  double aResAltitude = -9999.90;
+  double aResAltitude = GetInvalidAltitude();
   
   AltitudePoints anAltitudePoints = GetAltitudePoints();
   if ( anAltitudePoints.isEmpty() )
@@ -161,10 +195,10 @@ double HYDROData_Bathymetry::GetAltitudeForPoint( const gp_XY& thePoint ) const
   // [ 0 (top-left) ]          [ 1 (top-right) ]
   //                  thePoint
   // [ 2 (bot-left) ]          [ 3 (bot-right) ] 
-  AltitudePoint aBounds[ 4 ] = { AltitudePoint( -DBL_MAX, -DBL_MAX, INVALID_ALTITUDE_VALUE ),
-                                 AltitudePoint(  DBL_MAX, -DBL_MAX, INVALID_ALTITUDE_VALUE ),
-                                 AltitudePoint( -DBL_MAX,  DBL_MAX, INVALID_ALTITUDE_VALUE ),
-                                 AltitudePoint(  DBL_MAX,  DBL_MAX, INVALID_ALTITUDE_VALUE ) }; 
+  AltitudePoint aBounds[ 4 ] = { AltitudePoint( -DBL_MAX, -DBL_MAX, GetInvalidAltitude() ),
+                                 AltitudePoint(  DBL_MAX, -DBL_MAX, GetInvalidAltitude() ),
+                                 AltitudePoint( -DBL_MAX,  DBL_MAX, GetInvalidAltitude() ),
+                                 AltitudePoint(  DBL_MAX,  DBL_MAX, GetInvalidAltitude() ) }; 
 
   AltitudePoints::const_iterator aListItBeg = anAltitudePoints.constBegin();
   AltitudePoints::const_iterator aListItEnd = anAltitudePoints.constEnd();
@@ -252,7 +286,7 @@ double HYDROData_Bathymetry::GetAltitudeForPoint( const gp_XY& thePoint ) const
 
   // Check if requested point is inside of our bounding rectangle
   if ( !aBoundingRect.boundingRect().contains( thePoint.X(), thePoint.Y() ) )
-    return INVALID_ALTITUDE_VALUE;
+    return aResAltitude;
 
   // Calculate result altitude for point
   AltitudePoint aFirstPoint( aBounds[ 0 ] ), aSecPoint( aBounds[ 1 ] );
@@ -333,13 +367,18 @@ bool HYDROData_Bathymetry::importFromXYZFile( QFile&          theFile,
   //  2. X(float) Y(float) Z(float)
   //  ...
 
+#ifdef _TIMER
+  OSD_Timer aTimer;
+  aTimer.Start();
+#endif
+
   while ( !theFile.atEnd() )
   {
     QString aLine = theFile.readLine().simplified();
     if ( aLine.isEmpty() )
       continue;
 
-    QStringList aValues = aLine.split( QRegExp( "\\s+" ), QString::SkipEmptyParts );
+    QStringList aValues = aLine.split( ' ', QString::SkipEmptyParts );
     if ( aValues.length() < 3 )
       return false;
 
@@ -351,9 +390,10 @@ bool HYDROData_Bathymetry::importFromXYZFile( QFile&          theFile,
 
     bool isXOk = false, isYOk = false, isZOk = false;
 
+    // We automaticaly convert the z value to a negative number
     aPoint.SetX( anX.toDouble( &isXOk ) );
     aPoint.SetY( anY.toDouble( &isYOk ) );
-    aPoint.SetZ(  aZ.toDouble( &isZOk ) );
+    aPoint.SetZ(  -aZ.toDouble( &isZOk ) );
 
     if ( !isXOk || !isYOk || !isZOk )
       return false;
@@ -361,6 +401,12 @@ bool HYDROData_Bathymetry::importFromXYZFile( QFile&          theFile,
     thePoints << aPoint;
   }
 
+#ifdef _TIMER
+  aTimer.Stop();
+  std::ofstream stream( "W:/HYDRO/WORK/log.txt", std::ofstream::out );
+  aTimer.Show( stream );
+#endif
+
   return true;
 }