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

diff --git a/src/HYDROData/HYDROData_ObstacleAltitude.cxx b/src/HYDROData/HYDROData_ObstacleAltitude.cxx
index 1a9b428a..7bc4ed00 100644
--- a/src/HYDROData/HYDROData_ObstacleAltitude.cxx
+++ b/src/HYDROData/HYDROData_ObstacleAltitude.cxx
@@ -1,13 +1,36 @@
+// Copyright (C) 2014-2015  EDF-R&D
+// 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_ObstacleAltitude.h"
+
 #include "HYDROData_Document.h"
+#include "HYDROData_Object.h"
+#include "HYDROData_Projection.h"
 
-#include <QStringList>
+#define _DEVDEBUG_
+#include "HYDRO_trace.hxx"
+#include <QString>
 
-#define PYTHON_OBSTACLE_ALTITUDE_ID "KIND_OBSTACLE_ALTITUDE"
+#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()
@@ -19,31 +42,39 @@ HYDROData_ObstacleAltitude::~HYDROData_ObstacleAltitude()
 {
 }
 
-QStringList HYDROData_ObstacleAltitude::DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const
-{
-  QStringList aResList;
-
-  Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( myLab );
-  if ( aDocument.IsNull() )
-    return aResList;
-                             
-  QString aDocName = aDocument->GetDocPyName();
-  QString anAltitudeName = GetName();
-
-  aResList << QString( "%1 = %2.CreateObject( %3 );" )
-              .arg( anAltitudeName ).arg( aDocName ).arg( PYTHON_OBSTACLE_ALTITUDE_ID );
-  aResList << QString( "%1.SetName( \"%2\" );" )
-              .arg( anAltitudeName ).arg( anAltitudeName );
-
-  // TODO
-
-  return aResList;
-}
-
-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;
 }