Merge branch 'BR_quadtree' into V7_dev

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

diff --git a/src/HYDROData/HYDROData_ShapeFile.h b/src/HYDROData/HYDROData_ShapeFile.h
index 95a8b1752fa32dc7aac108a6beadc5c1a491af29..157ea9a438ef36159f598043b1e19ef4a654c768 100644 (file)
--- a/src/HYDROData/HYDROData_ShapeFile.h
+++ b/src/HYDROData/HYDROData_ShapeFile.h
@@ -89,6 +89,7 @@ public:
   HYDRODATA_EXPORT void Export(const QString& aFileName,
                                const Handle_HYDROData_LandCoverMap& aLCM,
                                QStringList& aNonExpList,
+                               bool bCheckLinear = true,
                                bool bUseDiscr = false, 
                                double theDefl = 0.1);
 
@@ -100,9 +101,10 @@ public:
   //Import
   bool Parse(SHPHandle theHandle, ShapeType theType, int& theShapeTypeOfFile);
   //Import Landcover
-  void ReadSHPPolygon(SHPObject* anObj, int i, TopoDS_Face& F);
+  void ReadSHPPolygon(Handle(HYDROData_Document) theDocument, SHPObject* anObj, int i, TopoDS_Face& F);
 
-  HYDRODATA_EXPORT int ImportPolygons(const QString theFileName, 
+  HYDRODATA_EXPORT int ImportPolygons(Handle(HYDROData_Document) theDocument,
+                                      const QString theFileName,
                                       QStringList& thePolygonsList, 
                                       TopTools_SequenceOfShape& theFaces, 
                                       int& theShapeTypeOfFile);