X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_ObstacleAltitude.cxx;h=7bc4ed00abad0325cbb0d38a1b02843733338ad0;hb=6bcda532ec67940d5c53e70df3b7912a09208c1c;hp=f8d56d9ffe2d41718d12ae1917b6a1c3f520dd34;hpb=439579ec24edd8b147cab07f688d446d59029a1e;p=modules%2Fhydro.git

diff --git a/src/HYDROData/HYDROData_ObstacleAltitude.cxx b/src/HYDROData/HYDROData_ObstacleAltitude.cxx
index f8d56d9f..7bc4ed00 100644
--- a/src/HYDROData/HYDROData_ObstacleAltitude.cxx
+++ b/src/HYDROData/HYDROData_ObstacleAltitude.cxx
@@ -22,11 +22,15 @@
 #include "HYDROData_Object.h"
 #include "HYDROData_Projection.h"
 
+#define _DEVDEBUG_
+#include "HYDRO_trace.hxx"
+#include <QString>
+
 #include <Precision.hxx>
 
 #include <TopoDS_Shape.hxx>
+#include <BRepTools.hxx>
 
-IMPLEMENT_STANDARD_HANDLE(HYDROData_ObstacleAltitude, HYDROData_IAltitudeObject)
 IMPLEMENT_STANDARD_RTTIEXT(HYDROData_ObstacleAltitude, HYDROData_IAltitudeObject)
 
 HYDROData_ObstacleAltitude::HYDROData_ObstacleAltitude()
@@ -38,25 +42,39 @@ HYDROData_ObstacleAltitude::~HYDROData_ObstacleAltitude()
 {
 }
 
-double HYDROData_ObstacleAltitude::GetAltitudeForPoint( const gp_XY& thePoint ) const
+double HYDROData_ObstacleAltitude::GetAltitudeForPoint( const gp_XY& thePoint,
+                                                        int theMethod) const
 {
+  DEBTRACE("HYDROData_ObstacleAltitude::GetAltitudeForPoint");
   double aResAltitude = GetInvalidAltitude();
 
   Handle(HYDROData_Object) anObject =
     Handle(HYDROData_Object)::DownCast( GetFatherObject() );
   if ( anObject.IsNull() )
+  {
+	DEBTRACE("anObject.IsNull()");
     return aResAltitude;
+  }
+//  DEBTRACE("object: " << anObject->GetName().toStdString());
 
   TopoDS_Shape anObjectShape3D = anObject->GetShape3D();
   if ( anObjectShape3D.IsNull() )
+  {
+	DEBTRACE("anObjectShape3D.IsNull()");
     return aResAltitude;
+  }
+//  else
+//  {
+//	DEBTRACE("anObjectShape3D type " << anObjectShape3D.ShapeType());
+//	BRepTools::Write(anObjectShape3D, "digue3D.brep");
+//  }
 
   HYDROData_Make3dMesh aMesher3D( anObjectShape3D, Precision::Intersection() );
 
   gp_Pnt aHighestPoint;
   if ( aMesher3D.GetHighestOriginal( thePoint.X(), thePoint.Y(), aHighestPoint ) )
     aResAltitude = aHighestPoint.Z();
-
+  DEBTRACE("aResAltitude=" << aResAltitude);
   return aResAltitude;
 }