From: isn <isn@opencascade.com>
Date: Wed, 31 Aug 2016 10:52:20 +0000 (+0300)
Subject: trying to run test, adding of LIGHTMODE
X-Git-Tag: v1.6~83
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=e017604fa17d991c5018dadaa6e02eeba8c3983b;p=modules%2Fhydro.git

trying to run test, adding of LIGHTMODE
---

diff --git a/src/HYDROData/HYDROData_Bathymetry.cxx b/src/HYDROData/HYDROData_Bathymetry.cxx
index c62352ef..0a7e90ea 100644
--- a/src/HYDROData/HYDROData_Bathymetry.cxx
+++ b/src/HYDROData/HYDROData_Bathymetry.cxx
@@ -35,11 +35,13 @@
 #include <QPolygonF>
 #include <QStringList>
 
+#ifndef LIGHT_MODE
 #include <vtkPoints.h>
 #include <vtkDelaunay2D.h>
 #include <vtkPolyData.h>
 #include <vtkSmartPointer.h>
 #include <vtkIdList.h>
+#endif
 
 #include <iostream>
 
@@ -57,8 +59,10 @@ IMPLEMENT_STANDARD_HANDLE(HYDROData_Bathymetry, HYDROData_IAltitudeObject)
 IMPLEMENT_STANDARD_RTTIEXT(HYDROData_Bathymetry, HYDROData_IAltitudeObject)
 
 //HYDROData_QuadtreeNode* HYDROData_Bathymetry::myQuadtree = 0;
+#ifndef LIGHT_MODE
 std::map<int, HYDROData_QuadtreeNode*> HYDROData_Bathymetry::myQuadtrees;
 std::map<int, vtkPolyData*> HYDROData_Bathymetry::myDelaunay2D;
+#endif
 
 
 HYDROData_Bathymetry::HYDROData_Bathymetry()
@@ -144,7 +148,7 @@ HYDROData_Bathymetry::AltitudePoints HYDROData_Bathymetry::GetAltitudePoints(boo
 
   return aPoints;
 }
-
+#ifndef LIGHT_MODE
 HYDROData_QuadtreeNode* HYDROData_Bathymetry::GetQuadtreeNodes() const
 {
   TDF_Label aLabel = myLab.FindChild(DataTag_AltitudePoints, false);
@@ -237,7 +241,7 @@ vtkPolyData* HYDROData_Bathymetry::GetVtkDelaunay2D() const
     return myDelaunay2D[labkey];
 
 }
-
+#endif
 void HYDROData_Bathymetry::RemoveAltitudePoints()
 {
   TDF_Label aLabel = myLab.FindChild( DataTag_AltitudePoints, false );
@@ -300,7 +304,7 @@ void interpolateAltitudeForPoints( const gp_XY&                               th
 
   theResPoint.SetZ( aResVal );
 }
-
+#ifndef LIGHT_MODE
 bool interpolZtriangle(const gp_XY& point, vtkPolyData* delaunay2D, vtkIdList* triangle, double& z)
 {
 
@@ -414,7 +418,7 @@ double HYDROData_Bathymetry::GetAltitudeForPoint(const gp_XY& thePoint, int theM
     }
   return aResAltitude;
 }
-
+#endif
 void HYDROData_Bathymetry::SetFilePath( const TCollection_AsciiString& theFilePath )
 {
   TDataStd_AsciiString::Set( myLab.FindChild( DataTag_FilePath ), theFilePath );
diff --git a/src/HYDROData/HYDROData_Bathymetry.h b/src/HYDROData/HYDROData_Bathymetry.h
index 6a555afd..1fed12a2 100644
--- a/src/HYDROData/HYDROData_Bathymetry.h
+++ b/src/HYDROData/HYDROData_Bathymetry.h
@@ -21,8 +21,11 @@
 
 #include "HYDROData_IAltitudeObject.h"
 #include "HYDROData_QuadtreeNode.hxx"
+
+#ifndef LIGHT_MODE
 #include <vtkPolyData.h>
 #include <vtkIdList.h>
+#endif
 
 class QFile;
 class gp_XYZ;
@@ -90,8 +93,10 @@ public:
   HYDRODATA_EXPORT virtual AltitudePoints   GetAltitudePoints(bool IsConvertToGlobal = false) const;
   HYDRODATA_EXPORT virtual HYDROData_QuadtreeNode* GetQuadtreeNodes() const;
 
+#ifndef LIGHT_MODE
   HYDRODATA_EXPORT virtual vtkPolyData* GetVtkDelaunay2D() const;
   //HYDRODATA_EXPORT bool interpolZtriangle(const gp_XY& point, vtkIdList* triangle, double* z);
+#endif
 
   /**
    * Remove all altitude points.
@@ -153,8 +158,9 @@ private:
   bool                                      importFromXYZFile( QFile&          theFile,
                                                                AltitudePoints& thePoints ) const;
   static std::map<int, HYDROData_QuadtreeNode*> myQuadtrees;
+#ifndef LIGHT_MODE
   static std::map<int, vtkPolyData*> myDelaunay2D;
-
+#endif
   bool                                      importFromASCFile( QFile&          theFile,
                                                                AltitudePoints& thePoints ) const;
 
diff --git a/src/HYDROData/HYDROData_CalculationCase.cxx b/src/HYDROData/HYDROData_CalculationCase.cxx
index c3d4961d..8c275240 100644
--- a/src/HYDROData/HYDROData_CalculationCase.cxx
+++ b/src/HYDROData/HYDROData_CalculationCase.cxx
@@ -77,8 +77,10 @@
 
 #define EXPORT_NAME "HYDRO_" + GetName()
 
+#ifndef LIGHT_MODE
 #include <SALOME_NamingService.hxx>
 #include <SALOME_LifeCycleCORBA.hxx>
+#endif
 
 #define _DEVDEBUG_
 #include "HYDRO_trace.hxx"