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

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

diff --git a/src/HYDROGUI/HYDROGUI_PolylineOp.h b/src/HYDROGUI/HYDROGUI_PolylineOp.h
index c7fbe6582b5fb85a72146f3a77ab8425692cae9d..6a35535d10eae06e261279e17cc9da3b6274169d 100755 (executable)
--- a/src/HYDROGUI/HYDROGUI_PolylineOp.h
+++ b/src/HYDROGUI/HYDROGUI_PolylineOp.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+// 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
@@ -6,7 +6,7 @@
 // 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
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -25,11 +25,9 @@
 
 #include "HYDROGUI_Operation.h"
 
-#include <HYDROData_Polyline.h>
+#include <HYDROData_PolylineXY.h>
 
-class OCCViewer_ViewManager;
 class CurveCreator_Curve;
-class CurveCreator_Displayer;
 
 class HYDROGUI_PolylineOp : public HYDROGUI_Operation
 {
@@ -42,6 +40,8 @@ public:
   void                       deleteSelected();
   bool                       deleteEnabled();
 
+  virtual void               updatePreviewZLayer( int theLayer );
+
 protected:
   virtual void               startOperation();
   virtual void               abortOperation();
@@ -49,7 +49,8 @@ protected:
 
   virtual HYDROGUI_InputPanel* createInputPanel() const;
 
-  virtual bool               processApply( int& theUpdateFlags, QString& theErrorMsg );
+  virtual bool               processApply( int& theUpdateFlags, QString& theErrorMsg,
+                                           QStringList& theBrowseObjectsEntries );
 
 protected slots:
   void                       onEditorSelectionChanged();
@@ -59,12 +60,9 @@ private:
   void                       erasePreview();
 
 private:
-  OCCViewer_ViewManager*     myViewManager;
-
-  bool                       myIsEdit;
-  Handle(HYDROData_Polyline) myEditedObject;
-  CurveCreator_Curve*        myCurve;
-  CurveCreator_Displayer*     myCurveDisplayer;
+  bool                         myIsEdit;
+  Handle(HYDROData_PolylineXY) myEditedObject;
+  CurveCreator_Curve*          myCurve;
 };
 
 #endif