tests 1 to 7 OK, 8 and above failed

[modules/hydro.git] / src / HYDROData / HYDROData_DTM.h

diff --git a/src/HYDROData/HYDROData_DTM.h b/src/HYDROData/HYDROData_DTM.h
index fec5fe05e3855d5b418ba49a780b146fb98ed4c7..4835cef14578d30dc088a1b6ebe8acdbfca3a4d6 100644 (file)
--- a/src/HYDROData/HYDROData_DTM.h
+++ b/src/HYDROData/HYDROData_DTM.h
@@ -21,6 +21,7 @@
 
 #include "HYDROData_Bathymetry.h"
 #include <vector>
+#include <set>
 #include <gp_Pnt2d.hxx>
 
 class Handle_HYDROData_Profile;
@@ -123,6 +124,7 @@ protected:
                                      double theXCurv, double theMinZ, double theMaxZ, double theDDZ,
                                      CurveUZ& theMidPointCurve,
                                      CurveUZ& theWidthCurve,
+                                     int& intersection_nb,
                                      double theTolerance = 1E-6 );
 
   static void CurveTo3D( const Handle_Geom2d_BSplineCurve& theHydraulicAxis,
@@ -139,13 +141,15 @@ protected:
       double theXCurvA,
       const Handle_HYDROData_Profile& theProfileB,
       double theXCurvB,
-      double theDDZ, int theNbSteps, bool isAddSecond );
+      double theDDZ, int theNbSteps, bool isAddSecond,
+      int& inter_nb_1, int& inter_nb_2 );
 
   static AltitudePoints Interpolate( const std::vector<Handle_HYDROData_Profile>& theProfiles,
                                      double theDDZ, double theSpatialStep,
                                      AltitudePoints& theLeft,
                                      AltitudePoints& theRight,
-                                     std::vector<AltitudePoints>& theMainProfiles );
+                                     std::vector<AltitudePoints>& theMainProfiles,
+                                     std::set<int>& invalInd );
 
   static void PointToWire(const AltitudePoints& pnts, TopoDS_Wire& W );
 
@@ -169,7 +173,8 @@ protected:
                              TopoDS_Shape& OutInlet,
                              TopoDS_Shape& OutOutlet,
                              bool Create3dPres,
-                             bool Create2dPres );
+                             bool Create2dPres,
+                             std::set<int>& InvInd );
 
   static void Get2dFaceFrom3dPres(const TopoDS_Compound& cmp, TopoDS_Face& outF );
     
@@ -182,17 +187,18 @@ protected:
 public:
 
   HYDRODATA_EXPORT static void CreateProfilesFromDTM ( const HYDROData_SequenceOfObjects& InpProfiles,
-                                      double ddz,
-                                      double step, 
-                                      AltitudePoints& points,
-                                      TopoDS_Shape& Out3dPres,
-                                      TopoDS_Shape& Out2dPres,
-                                      TopoDS_Shape& OutLeftB,
-                                      TopoDS_Shape& OutRightB,
-                                      TopoDS_Shape& OutInlet,
-                                      TopoDS_Shape& OutOutlet,
-                                      bool Create3dPres,
-                                      bool Create2dPres );
+                                                       double ddz,
+                                                       double step, 
+                                                       AltitudePoints& points,
+                                                       TopoDS_Shape& Out3dPres,
+                                                       TopoDS_Shape& Out2dPres,
+                                                       TopoDS_Shape& OutLeftB,
+                                                       TopoDS_Shape& OutRightB,
+                                                       TopoDS_Shape& OutInlet,
+                                                       TopoDS_Shape& OutOutlet,
+                                                       bool Create3dPres,
+                                                       bool Create2dPres,
+                                                       std::set<int>& InvInd );
 };