Merge branch 'BR_v14_rc' of ssh://git.salome-platform.org/modules/hydro into BR_v14_rc

[modules/hydro.git] / src / HYDROGUI / HYDROGUI_ImportPolylineOp.h

diff --git a/src/HYDROGUI/HYDROGUI_ImportPolylineOp.h b/src/HYDROGUI/HYDROGUI_ImportPolylineOp.h
index 4e7a066e808a62d7edba884661740035f54798f4..157336258bfcc613445b36763078cb780c4cf34d 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_ImportPolylineOp.h
+++ b/src/HYDROGUI/HYDROGUI_ImportPolylineOp.h
@@ -26,18 +26,11 @@
 #include "HYDROGUI_Operation.h"
 #include <vector>
 
+//extern "C" {
+#include <shapelib/shapefil.h> 
+//};
+
 class SUIT_FileDlg;
-class QFile;
-class gp_XYZ;
-struct HYDROGUI_CurveBlock
-{
-  std::vector<gp_XYZ> myXYZPoints;
-  bool myType;
-  bool myIsConnected;
-  bool myIsClosed;
-  int myCurvePlane;
-  QString myName;
-};
 
 class HYDROGUI_ImportPolylineOp : public HYDROGUI_Operation
 {
@@ -50,11 +43,12 @@ public:
 protected:
   virtual void startOperation();
   virtual void onApply();
-  virtual void Process();
-  bool Parse( QFile&  theFile );
+  void Parse( SHPHandle theHandle);
+  void ProcessSHPPolyXY(SHPObject* anObj, QString theFileName, int theInd);
+  void ProcessSHPPoly3D(SHPObject* anObj, QString theFileName, int theInd);
 private:
   SUIT_FileDlg* myFileDlg;
-  std::vector<HYDROGUI_CurveBlock> myCurveBlocks;
+  std::vector<SHPObject*> mySHPObjects;
 };
 
 #endif