Merge branch 'BR_LAND_COVER_MAP' of ssh://git.salome-platform.org/modules/hydro into...

[modules/hydro.git] / src / HYDROData / HYDROData_ShapeFile.cxx

diff --git a/src/HYDROData/HYDROData_ShapeFile.cxx b/src/HYDROData/HYDROData_ShapeFile.cxx
index 7db8a1442ffcd10709168a4a5c102e4bf4a1ee31..357ceedd567be540bd9e3d841d982ea8bab8f91f 100644 (file)
--- a/src/HYDROData/HYDROData_ShapeFile.cxx
+++ b/src/HYDROData/HYDROData_ShapeFile.cxx
@@ -24,7 +24,6 @@
 #include <HYDROData_PolylineXY.h>
 #include <HYDROData_Polyline3D.h>
 #include <HYDROData_Bathymetry.h>
-#include <HYDROData_LandCover.h>
 #include <HYDROData_Profile.h>
 #include <HYDROData_Iterator.h>
 
@@ -52,6 +51,10 @@
 #include <QColor>
 #include <BRepTopAdaptor_FClass2d.hxx>
 
+#ifdef WIN32
+  #pragma warning( disable: 4996 )
+#endif
+
 HYDROData_ShapeFile::HYDROData_ShapeFile() : myHSHP(NULL)
 { 
 }
@@ -64,9 +67,10 @@ HYDROData_ShapeFile::~HYDROData_ShapeFile()
 void HYDROData_ShapeFile::Export(const QString& aFileName, 
   NCollection_Sequence<Handle_HYDROData_PolylineXY> aPolyXYSeq,
   NCollection_Sequence<Handle_HYDROData_Polyline3D> aPoly3DSeq,
-  NCollection_Sequence<Handle_HYDROData_LandCover> aLCSeq,
+  const Handle_HYDROData_LandCoverMap& aLCSeq,
   QStringList& aNonExpList)
 {
+  /*TODO
   SHPHandle hSHPHandle;
   if (!aPolyXYSeq.IsEmpty() && aPoly3DSeq.IsEmpty())
   {
@@ -98,7 +102,7 @@ void HYDROData_ShapeFile::Export(const QString& aFileName,
     QString aFN = aFileName.simplified();
     remove (aFN.toStdString().c_str());
     remove (aFN.replace( ".shp", ".shx", Qt::CaseInsensitive).toStdString().c_str());
-  }
+  }*/
 }
 
 int HYDROData_ShapeFile::WriteObjectPolyXY(SHPHandle theShpHandle, Handle_HYDROData_PolylineXY thePoly )
@@ -168,7 +172,7 @@ int HYDROData_ShapeFile::WriteObjectPoly3D(SHPHandle theShpHandle, Handle_HYDROD
   return 1;
 }
 
-int HYDROData_ShapeFile::WriteObjectLC(SHPHandle theShpHandle, Handle_HYDROData_LandCover theLC )
+/*TODO:int HYDROData_ShapeFile::WriteObjectLC(SHPHandle theShpHandle, Handle_HYDROData_LandCover theLC )
 {
   TopoDS_Shape aSh = theLC->GetShape();
   if (aSh.IsNull())
@@ -215,7 +219,7 @@ int HYDROData_ShapeFile::WriteObjectLC(SHPHandle theShpHandle, Handle_HYDROData_
   return 1;
  
 }
-
+*/
 void HYDROData_ShapeFile::ProcessFace(TopoDS_Face theFace, SHPHandle theShpHandle)
 {
   SHPObject    *aSHPObj;