X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_ObstacleAltitude.cxx;h=4d0679aaf6c47cd8b1f9dbefdb9cf79966c30d90;hb=81c9f5cdf82909d0aebd2c491c50fa7516cc80b7;hp=1a9b428af0b23113b86bf60677e21fb1201e52d4;hpb=517590ff502b021ac3b88b59c9f063a1470cc8a9;p=modules%2Fhydro.git

diff --git a/src/HYDROData/HYDROData_ObstacleAltitude.cxx b/src/HYDROData/HYDROData_ObstacleAltitude.cxx
index 1a9b428a..4d0679aa 100644
--- a/src/HYDROData/HYDROData_ObstacleAltitude.cxx
+++ b/src/HYDROData/HYDROData_ObstacleAltitude.cxx
@@ -1,11 +1,13 @@
 
 #include "HYDROData_ObstacleAltitude.h"
-#include "HYDROData_Document.h"
 
-#include <QStringList>
+#include "HYDROData_Document.h"
+#include "HYDROData_Object.h"
+#include "HYDROData_Projection.h"
 
-#define PYTHON_OBSTACLE_ALTITUDE_ID "KIND_OBSTACLE_ALTITUDE"
+#include <Precision.hxx>
 
+#include <TopoDS_Shape.hxx>
 
 IMPLEMENT_STANDARD_HANDLE(HYDROData_ObstacleAltitude, HYDROData_IAltitudeObject)
 IMPLEMENT_STANDARD_RTTIEXT(HYDROData_ObstacleAltitude, HYDROData_IAltitudeObject)
@@ -19,30 +21,24 @@ HYDROData_ObstacleAltitude::~HYDROData_ObstacleAltitude()
 {
 }
 
-QStringList HYDROData_ObstacleAltitude::DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const
+double HYDROData_ObstacleAltitude::GetAltitudeForPoint( const gp_XY& thePoint ) const
 {
-  QStringList aResList;
+  double aResAltitude = GetInvalidAltitude();
 
-  Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( myLab );
-  if ( aDocument.IsNull() )
-    return aResList;
-                             
-  QString aDocName = aDocument->GetDocPyName();
-  QString anAltitudeName = GetName();
+  Handle(HYDROData_Object) anObject =
+    Handle(HYDROData_Object)::DownCast( GetFatherObject() );
+  if ( anObject.IsNull() )
+    return aResAltitude;
 
-  aResList << QString( "%1 = %2.CreateObject( %3 );" )
-              .arg( anAltitudeName ).arg( aDocName ).arg( PYTHON_OBSTACLE_ALTITUDE_ID );
-  aResList << QString( "%1.SetName( \"%2\" );" )
-              .arg( anAltitudeName ).arg( anAltitudeName );
+  TopoDS_Shape anObjectShape3D = anObject->GetShape3D();
+  if ( anObjectShape3D.IsNull() )
+    return aResAltitude;
 
-  // TODO
+  HYDROData_Make3dMesh aMesher3D( anObjectShape3D, Precision::Intersection() );
 
-  return aResList;
-}
-
-double HYDROData_ObstacleAltitude::GetAltitudeForPoint( const gp_XY& thePoint ) const
-{
-  double aResAltitude = GetInvalidAltitude();
+  gp_Pnt aHighestPoint;
+  if ( aMesher3D.GetHighestOriginal( thePoint.X(), thePoint.Y(), aHighestPoint ) )
+    aResAltitude = aHighestPoint.Z();
 
   return aResAltitude;
 }