porting on linux

[modules/hydro.git] / src / HYDROData / HYDROData_Object.h

diff --git a/src/HYDROData/HYDROData_Object.h b/src/HYDROData/HYDROData_Object.h
index cd4cf20a4012983936c5f66f986bb384bfa46007..0c217f274a6464e8e44d93c5271e4c7de578453b 100644 (file)
--- a/src/HYDROData/HYDROData_Object.h
+++ b/src/HYDROData/HYDROData_Object.h
@@ -50,7 +50,6 @@ protected:
     DataTag_EdgesGroup,          ///< child group objects
     DataTag_ChildAltitudeObject, ///< child altitude object
     DataTag_IsSubmersible,       ///< the attribute "is submersible"
-    DataTag_MiddleZ,             ///< middle Z value of Shape3D
   };
 
 public:
@@ -77,7 +76,7 @@ public:
    * Sets the "MustBeUpdated" flag: if object is depended on updated features.
    * Reimplemented to update the state of child 3D object.
    */
-  HYDRODATA_EXPORT virtual void SetToUpdate( bool theFlag );
+  HYDRODATA_EXPORT virtual void Changed( Geometry );
 
 
   /**
@@ -88,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.
@@ -98,17 +97,7 @@ public:
   /**
    * Returns the 3d shape of the object.
    */
-  HYDRODATA_EXPORT virtual TopoDS_Shape GetShape3D() const = 0;
-
-  /**
-   * Returns the middle z value of 3D object representation or -9999 if no value.
-   */
-  HYDRODATA_EXPORT virtual Standard_Boolean GetMiddleZ( Standard_Real& theMiddleZ ) const;
-
-  /**
-   * Set the middle z value of 3D object representation.
-   */
-  HYDRODATA_EXPORT virtual void SetMiddleZ( const Standard_Real& theMiddleZ );
+  HYDRODATA_EXPORT virtual TopoDS_Shape GetShape3D() const;
 
   /**
    * Returns reference object which represent the 3D shape of object.
@@ -171,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:
 
@@ -189,7 +169,7 @@ protected:
    * Creates new object in the internal data structure. Use higher level objects 
    * to create objects with real content.
    */
-  HYDRODATA_EXPORT HYDROData_Object();
+  HYDRODATA_EXPORT HYDROData_Object( Geometry );
 
   /**
    * Destructs properties of the object and object itself, removes it from the document.
@@ -197,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.
@@ -241,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