Initial merge of branch 'BR_HYDRO_IMPS_2016' into BR_PORTING_OCCT_7

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

diff --git a/src/HYDROData/HYDROData_ShapeFile.h b/src/HYDROData/HYDROData_ShapeFile.h
index 10dec11092d4dc99574e166b8190e9d60170d016..41f2200f7a4a2530089576407349d80f0c8e19f2 100644 (file)
--- a/src/HYDROData/HYDROData_ShapeFile.h
+++ b/src/HYDROData/HYDROData_ShapeFile.h
@@ -19,12 +19,17 @@
 #ifndef HYDRODATA_SHAPEFILE_H
 #define HYDRODATA_SHAPEFILE_H
 
-#include <vector>
-#include <NCollection_Sequence.hxx>
-#include <QStringList>
 #include "HYDROData.h"
+
+#include <NCollection_Sequence.hxx>
+
 #include <TopTools_SequenceOfShape.hxx>
 
+#include <QStringList>
+
+#include <vector>
+
+
 //extern "C" {
 #include <shapefil.h> 
 //};
@@ -118,7 +123,8 @@ public:
 
   //Import Polyline
   void ReadSHPPolyXY(Handle(HYDROData_Document) theDocument, SHPObject* anObj, QString theFileName, 
-                     int theInd, NCollection_Sequence<Handle(HYDROData_Entity)>& theEntities);
+                     int theInd, NCollection_Sequence<Handle(HYDROData_Entity)>& theEntities,
+                     bool bReadAsPolylin = false);
 
   void ReadSHPPoly3D(Handle(HYDROData_Document) theDocument, SHPObject* anObj, QString theFileName, 
                      int theInd, NCollection_Sequence<Handle(HYDROData_Entity)>& theEntities);
@@ -149,6 +155,9 @@ private:
 
   int TryOpenShapeFile(QString theFileName);
 
+  void GetFreeIndices(std::vector<int>& theAllowedIndexes, QString strName, size_t theObjsSize,
+                      QStringList theExistingNames, QString theBaseFileName);
+
 private:
   std::vector<SHPObject*> mySHPObjects;
   SHPHandle myHSHP;