X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_ShapeFile.h;h=88e3f3afaa81a3db11093f8eebcedff52d09e66b;hb=545854182f0363f61284d5abe34c3627d4f3b088;hp=1dc0922bd71975cb5b65d214fdac7a277b66f75a;hpb=1b1584e859342a3e5759a77575f099369d54fd95;p=modules%2Fhydro.git

diff --git a/src/HYDROData/HYDROData_ShapeFile.h b/src/HYDROData/HYDROData_ShapeFile.h
index 1dc0922b..88e3f3af 100644
--- a/src/HYDROData/HYDROData_ShapeFile.h
+++ b/src/HYDROData/HYDROData_ShapeFile.h
@@ -1,8 +1,4 @@
-// Copyright (C) 2007-2015  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
+// 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
@@ -35,47 +31,98 @@
 class gp_XYZ;
 class Handle_HYDROData_PolylineXY;
 class Handle_HYDROData_Polyline3D;
-class Handle_HYDROData_LandCover;
 class Handle(HYDROData_Document);
 class TopTools_SequenceOfShape;
 class TopoDS_Face;
 class Handle_HYDROData_Entity;
+class Handle_HYDROData_LandCoverMap;
 
 class HYDROData_ShapeFile 
 {
 
+public:
+
+enum ShapeType
+{
+  ShapeType_Polyline,
+  ShapeType_Polygon
+};
+
+enum DBF_FieldType
+{
+  DBF_FieldType_None,
+  DBF_FieldType_String,
+  DBF_FieldType_Integer, 
+  DBF_FieldType_Double,
+  DBF_FieldType_Invalid
+};
+
+
+struct DBF_AttrValue
+{
+  DBF_AttrValue() 
+  {
+    myIntVal = -1;
+    myDoubleVal = -1.0;
+    myIsNull = true;
+    myFieldType = DBF_FieldType_None;
+  }
+  QString myStrVal;
+  int myIntVal;
+  double myDoubleVal;
+  std::string myRawValue;
+  DBF_FieldType myFieldType;
+  bool myIsNull;
+};
+
 public:
   HYDRODATA_EXPORT HYDROData_ShapeFile(  );
   virtual HYDRODATA_EXPORT ~HYDROData_ShapeFile();
 
-public:
   //Export operation
   HYDRODATA_EXPORT void 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);
   int WriteObjectPolyXY(SHPHandle theShpHandle, Handle_HYDROData_PolylineXY thePoly );
   int WriteObjectPoly3D(SHPHandle theShpHandle, Handle_HYDROData_Polyline3D thePoly );
-  int WriteObjectLC(SHPHandle theShpHandle, Handle_HYDROData_LandCover theLC );
+  //TODO:int WriteObjectLC(SHPHandle theShpHandle, Handle_HYDROData_LandCover theLC );
+  //Import
+  bool Parse(SHPHandle theHandle, ShapeType theType, int& theShapeTypeOfFile);
   //Import Landcover
-  void Parse1(SHPHandle theHandle);
-  void ProcessSHP(SHPObject* anObj, int i, TopoDS_Face& F);
-  HYDRODATA_EXPORT bool ImportLandCovers(const QString theFileName, QStringList& thePolygonsList, TopTools_SequenceOfShape& theFaces);
+  void ReadSHPPolygon(SHPObject* anObj, int i, TopoDS_Face& F);
+  HYDRODATA_EXPORT int ImportLandCovers(const QString theFileName, QStringList& thePolygonsList, TopTools_SequenceOfShape& theFaces, int& theShapeTypeOfFile);
   HYDRODATA_EXPORT void Free();
   //Import Polyline
-  void Parse2( SHPHandle theHandle);
-  void ProcessSHPPolyXY(Handle(HYDROData_Document) theDocument, SHPObject* anObj, QString theFileName, 
+  void ReadSHPPolyXY(Handle(HYDROData_Document) theDocument, SHPObject* anObj, QString theFileName, 
                         int theInd, NCollection_Sequence<Handle_HYDROData_Entity>& theEntities);
-  void ProcessSHPPoly3D(Handle(HYDROData_Document) theDocument, SHPObject* anObj, QString theFileName, 
+  void ReadSHPPoly3D(Handle(HYDROData_Document) theDocument, SHPObject* anObj, QString theFileName, 
                         int theInd, NCollection_Sequence<Handle_HYDROData_Entity>& theEntities);
-  HYDRODATA_EXPORT bool ImportPolylines(Handle(HYDROData_Document) theDocument, const QString& theFileName, 
-                       NCollection_Sequence<Handle_HYDROData_Entity>& theEntities);
+  HYDRODATA_EXPORT int ImportPolylines(Handle(HYDROData_Document) theDocument, const QString& theFileName, 
+                       NCollection_Sequence<Handle_HYDROData_Entity>& theEntities, int& theShapeTypeOfFile);
+  HYDRODATA_EXPORT QString GetShapeTypeName(int theType);
+
+  //DBF I/O Methods
+  bool CheckDBFFileExisting(const QString& theSHPFilePath, QString& thePathToDBFFile);
+  bool DBF_OpenDBF(const QString& thePathToDBFFile);
+  int DBF_GetNbFields();
+  QStringList DBF_GetFieldList();
+  void DBF_GetFieldTypeList(std::vector<DBF_FieldType>& FTVect);
+  int DBF_GetNbRecords();
+  void DBF_CloseDBF();
+  void DBF_GetAttributeList(int theIndexOfField, std::vector<DBF_AttrValue>& theAttrV);
+  bool DBF_WriteFieldAndValues(const QString& theFileName, const QString& theFieldName, DBF_FieldType theType, const std::vector<DBF_AttrValue>& theAttrV, bool bUseStrValue);
+
 private:
   void ProcessFace(TopoDS_Face theFace, SHPHandle theShpHandle);
+  int TryOpenShapeFile(QString theFileName);
 private:
   std::vector<SHPObject*> mySHPObjects;
   SHPHandle myHSHP;
+  DBFHandle	myHDBF;
+
+  friend class test_HYDROData_ShapeFile;
 };
 
 #endif