X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_ShapeFile.h;h=41f2200f7a4a2530089576407349d80f0c8e19f2;hb=58bb6b7459bebeeb089c9ed486c4683a8bae7288;hp=10dec11092d4dc99574e166b8190e9d60170d016;hpb=a0f46af000e5038df100106897aa04901ad59e49;p=modules%2Fhydro.git

diff --git a/src/HYDROData/HYDROData_ShapeFile.h b/src/HYDROData/HYDROData_ShapeFile.h
index 10dec110..41f2200f 100644
--- 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;