X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_Channel.h;h=86ed56b0c5b150559a9e5d5f274ce2022ad50475;hb=545854182f0363f61284d5abe34c3627d4f3b088;hp=f497f36efc489673f1cbd9c9b6a5eee3f360d024;hpb=ffb8db1342d5e9eaed69dc15dd51eacfd77da0bd;p=modules%2Fhydro.git

diff --git a/src/HYDROData/HYDROData_Channel.h b/src/HYDROData/HYDROData_Channel.h
index f497f36e..86ed56b0 100644
--- a/src/HYDROData/HYDROData_Channel.h
+++ b/src/HYDROData/HYDROData_Channel.h
@@ -1,3 +1,20 @@
+// 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, 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
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #ifndef HYDROData_Channel_HeaderFile
 #define HYDROData_Channel_HeaderFile
@@ -50,11 +67,11 @@ public:
 public:
 
   /**
-   * Creates the presentation by given guide line and profile.
+   * Creates the presentations(2D and 3D) by given guide line and profile.
    */
-  HYDRODATA_EXPORT static bool CreatePresentaions( const Handle(HYDROData_Polyline3D)& theGuideLine,
-                                                   const Handle(HYDROData_Profile)&    theProfile,
-                                                   PrsDefinition&                      thePrs );
+  HYDRODATA_EXPORT static bool CreatePresentations( const Handle(HYDROData_Polyline3D)& theGuideLine,
+                                                    const Handle(HYDROData_Profile)&    theProfile,
+                                                    PrsDefinition&                      thePrs );
 
 public:
 
@@ -74,14 +91,14 @@ public:
   HYDRODATA_EXPORT virtual HYDROData_SequenceOfObjects GetAllReferenceObjects() const;
 
   /**
-   * Returns the top shape of the object.
+   * Returns the left edge of the channel.
    */
-  HYDRODATA_EXPORT virtual TopoDS_Shape GetTopShape() const;
+  HYDRODATA_EXPORT virtual TopoDS_Shape GetLeftShape() const;
 
   /**
-   * Returns the 3d shape of the object.
+   * Returns the right edge of the channel.
    */
-  HYDRODATA_EXPORT virtual TopoDS_Shape GetShape3D() const;
+  HYDRODATA_EXPORT virtual TopoDS_Shape GetRightShape() const;
 
   /**
    * Update the shape presentations of stream.
@@ -97,12 +114,12 @@ public:
   /**
    * Returns default filling color for new channel.
    */
-  HYDRODATA_EXPORT static QColor DefaultFillingColor();
+  HYDRODATA_EXPORT virtual QColor DefaultFillingColor() const;
 
   /**
    * Returns default border color for new channel.
    */
-  HYDRODATA_EXPORT static QColor DefaultBorderColor();
+  HYDRODATA_EXPORT virtual QColor DefaultBorderColor() const;
 
 
 public:      
@@ -141,17 +158,6 @@ public:
 
 
 protected:
-
-  /**
-   * Returns default filling color for new object.
-   */
-  HYDRODATA_EXPORT virtual QColor getDefaultFillingColor() const;
-
-  /**
-   * Returns default border color for new object.
-   */
-  HYDRODATA_EXPORT virtual QColor getDefaultBorderColor() const;
-
   /**
    * Returns the type of child altitude object.
    * Reimplemented to create chanel altitude object.