X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_ImportPolylineOp.h;h=695bff4dc1ebaef00503925657d01fe4566f9027;hb=6ba63abdcb5832a1773cb33cf67d6b34aee4139d;hp=157336258bfcc613445b36763078cb780c4cf34d;hpb=786ceeeb7107f76992252451e58eef819ffec8ad;p=modules%2Fhydro.git

diff --git a/src/HYDROGUI/HYDROGUI_ImportPolylineOp.h b/src/HYDROGUI/HYDROGUI_ImportPolylineOp.h
index 15733625..695bff4d 100644
--- a/src/HYDROGUI/HYDROGUI_ImportPolylineOp.h
+++ b/src/HYDROGUI/HYDROGUI_ImportPolylineOp.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
@@ -26,11 +22,11 @@
 #include "HYDROGUI_Operation.h"
 #include <vector>
 
-//extern "C" {
-#include <shapelib/shapefil.h> 
-//};
+#include <NCollection_Sequence.hxx>
+#include <HYDROData_ShapeFile.h>
 
 class SUIT_FileDlg;
+class HYDROData_Entity;
 
 class HYDROGUI_ImportPolylineOp : public HYDROGUI_Operation
 {
@@ -38,17 +34,23 @@ class HYDROGUI_ImportPolylineOp : public HYDROGUI_Operation
 
 public:
   HYDROGUI_ImportPolylineOp( HYDROGUI_Module* theModule );
+
   virtual ~HYDROGUI_ImportPolylineOp();
 
+  static NCollection_Sequence<Handle(HYDROData_Entity)> ImportPolyOp(const QStringList& aFileNames, 
+                                                                     Handle(HYDROData_Document) theDocument,
+                                                                     HYDROGUI_Module* module, 
+                                                                     HYDROData_ShapeFile::ImportShapeType theShapeTypesToImport);
+
 protected:
+
   virtual void startOperation();
   virtual void onApply();
-  void Parse( SHPHandle theHandle);
-  void ProcessSHPPolyXY(SHPObject* anObj, QString theFileName, int theInd);
-  void ProcessSHPPoly3D(SHPObject* anObj, QString theFileName, int theInd);
+
+  static void UpdateView( HYDROGUI_Module* module, NCollection_Sequence<Handle(HYDROData_Entity)>& anEntities);
+
 private:
   SUIT_FileDlg* myFileDlg;
-  std::vector<SHPObject*> mySHPObjects;
 };
 
 #endif