X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_Object.h;h=0c217f274a6464e8e44d93c5271e4c7de578453b;hb=a95289fabbb6fbf6f32c06207422c65aafd5bd65;hp=e97144aacd8096868ece46c8e599a27b851fac50;hpb=d6a8c59ee076938a924fcfd1e3f83ef1395b7336;p=modules%2Fhydro.git

diff --git a/src/HYDROData/HYDROData_Object.h b/src/HYDROData/HYDROData_Object.h
index e97144aa..0c217f27 100644
--- a/src/HYDROData/HYDROData_Object.h
+++ b/src/HYDROData/HYDROData_Object.h
@@ -87,7 +87,7 @@ public:
   /**
    * Returns the top shape of the object.
    */
-  HYDRODATA_EXPORT virtual TopoDS_Shape GetTopShape() const = 0;
+  HYDRODATA_EXPORT virtual TopoDS_Shape GetTopShape() const;
 
   /**
    * Sets the 3d shape of the object.
@@ -97,7 +97,7 @@ public:
   /**
    * Returns the 3d shape of the object.
    */
-  HYDRODATA_EXPORT virtual TopoDS_Shape GetShape3D() const = 0;
+  HYDRODATA_EXPORT virtual TopoDS_Shape GetShape3D() const;
 
   /**
    * Returns reference object which represent the 3D shape of object.
@@ -160,17 +160,8 @@ public:
   HYDRODATA_EXPORT bool IsSubmersible() const;
   HYDRODATA_EXPORT void SetIsSubmersible( bool ) const;
 
-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 virtual void GetBoundaries( QList<TopoDS_Shape>& theBoundShapes,
+                                               QStringList& theBoundNames ) const;
 
 protected:
 
@@ -186,6 +177,8 @@ protected:
   virtual HYDRODATA_EXPORT ~HYDROData_Object();
 
 protected:
+  HYDRODATA_EXPORT virtual QColor DefaultFillingColor() const;
+  HYDRODATA_EXPORT virtual QColor DefaultBorderColor() const;
 
   /**
    * Dump the initial object creation to a Python script.
@@ -230,29 +223,17 @@ protected:
   /**
    * Remove all child group objects.
    */
-  HYDRODATA_EXPORT virtual void removeGroupObjects();
-
-
-  /**
-   * Retrieve the top shape of the object from data label.
-   */
-  HYDRODATA_EXPORT TopoDS_Shape getTopShape() const;
+  HYDRODATA_EXPORT virtual void RemoveGroupObjects();
 
   /**
    * Removes the top shape from data label of the object.
    */
-  HYDRODATA_EXPORT void removeTopShape();
-
-
-  /**
-   * Retrieve the 3d shape of the object from data label.
-   */
-  HYDRODATA_EXPORT TopoDS_Shape getShape3D() const;
+  HYDRODATA_EXPORT void RemoveTopShape();
 
   /**
    * Removes the 3d shape from data label of the object.
    */
-  HYDRODATA_EXPORT void removeShape3D();
+  HYDRODATA_EXPORT void RemoveShape3D();
 };
 
 #endif