X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_ImmersibleZone.h;h=0a9cf54240b4ec5f86139168c64d8796d1fa5075;hb=545854182f0363f61284d5abe34c3627d4f3b088;hp=6370cf45b3d5191bab2a369efdd94b05ae94289a;hpb=b31235b3a4bce11a88ed18e431c850ccd55362c8;p=modules%2Fhydro.git

diff --git a/src/HYDROData/HYDROData_ImmersibleZone.h b/src/HYDROData/HYDROData_ImmersibleZone.h
index 6370cf45..0a9cf542 100644
--- a/src/HYDROData/HYDROData_ImmersibleZone.h
+++ b/src/HYDROData/HYDROData_ImmersibleZone.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_ImmersibleZone_HeaderFile
 #define HYDROData_ImmersibleZone_HeaderFile
@@ -49,9 +66,9 @@ public:
   HYDRODATA_EXPORT virtual void Update();
 
   /**
-   * Returns the top shape of the object.
+   * Checks that object has 2D presentation. Reimlemented to retun true.
    */
-  HYDRODATA_EXPORT virtual TopoDS_Shape GetTopShape() const;
+  HYDRODATA_EXPORT virtual bool IsHas2dPrs() const;
 
   /**
    * Returns the 3d shape of the object.
@@ -61,12 +78,12 @@ public:
   /**
    * Returns default filling color for new zone.
    */
-  HYDRODATA_EXPORT static QColor DefaultFillingColor();
+  HYDRODATA_EXPORT virtual QColor DefaultFillingColor() const;
 
   /**
    * Returns default border color for new zone.
    */
-  HYDRODATA_EXPORT static QColor DefaultBorderColor();
+  HYDRODATA_EXPORT virtual QColor DefaultBorderColor() const;
 
   /**
    * Sets reference polyline object for zone.
@@ -83,29 +100,15 @@ public:
    */
   HYDRODATA_EXPORT virtual void RemovePolyline();
 
-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;
+  HYDRODATA_EXPORT TopoDS_Shape generateTopShape() const;
+  HYDRODATA_EXPORT static TopoDS_Shape generateTopShape( const Handle(HYDROData_PolylineXY)& );
 
 private:
 
-  /**
-   * Generate the zone face.
-   */
-  TopoDS_Shape generateTopShape() const;
-
   /**
    * Create all necessary child group objects.
    */
-  HYDRODATA_EXPORT virtual void createGroupObjects();
+  HYDRODATA_EXPORT void createGroupObjects();
 
 protected: