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

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

diff --git a/src/HYDROGUI/HYDROGUI_ChannelOp.h b/src/HYDROGUI/HYDROGUI_ChannelOp.h
index eb15b4e861515b35970a17934079f49412935369..d7925f9a78836aeb787eea6ada3af2c84991d308 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_ChannelOp.h
+++ b/src/HYDROGUI/HYDROGUI_ChannelOp.h
@@ -1,12 +1,8 @@
-// Copyright (C) 2007-2013  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
-// 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
@@ -20,6 +16,7 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
+
 #ifndef HYDROGUI_ChannelOp_H
 #define HYDROGUI_ChannelOp_H
 
@@ -46,17 +43,18 @@ protected:
 
   virtual HYDROGUI_InputPanel* createInputPanel() const;
 
-  virtual bool               processApply( int& theUpdateFlags, QString& theErrorMsg );
+  virtual bool               processApply( int& theUpdateFlags, QString& theErrorMsg,
+                                           QStringList& theBrowseObjectsEntries );
 
 protected slots:
-  virtual void               onCreatePreview( const bool theIsInit = false );
+  virtual void               onCreatePreview();
 
 protected:
   virtual void               erasePreview();
 
-  virtual Handle(HYDROData_Channel) getObjectToEdit() const;
+  virtual Handle(HYDROData_Channel) createNewObject() const;
 
-  virtual HYDROGUI_Shape*   getPreviewShape() const { return myPreviewPrs; };
+  virtual HYDROGUI_Shape*    getPreviewShape() const { return myPreviewPrs; };
 
 protected:
   bool                       myIsEdit;