X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_Object.h;h=805b593f34368136435b3052cbd4189787fa1b18;hb=0d9decc8762a829f1bdc69048fab08122e441ec0;hp=852c06795d82bbd3ba6b34e9c974ceceda661f4f;hpb=2728f2367cc657e6a4c900ca221263ee9add26fd;p=modules%2Fhydro.git

diff --git a/src/HYDROData/HYDROData_Object.h b/src/HYDROData/HYDROData_Object.h
index 852c0679..805b593f 100644
--- a/src/HYDROData/HYDROData_Object.h
+++ b/src/HYDROData/HYDROData_Object.h
@@ -1,73 +1,64 @@
+
 #ifndef HYDROData_Object_HeaderFile
 #define HYDROData_Object_HeaderFile
 
-#include <HYDROData.h>
+#include <HYDROData_Entity.h>
 
-#include <TDF_Label.hxx>
-#include <QString>
+class TopoDS_Shape;
 
-///! Kind of an object in a document
-typedef int ObjectKind;
-///! Unrecognized object
-const ObjectKind KIND_UNKNOWN = 0;
-const ObjectKind KIND_IMAGE = 1;
+DEFINE_STANDARD_HANDLE(HYDROData_Object, HYDROData_Entity)
 
-DEFINE_STANDARD_HANDLE(HYDROData_Object, MMgt_TShared)
 
 /**\class HYDROData_Object
- * \brief Generic class of any object in the data model.
+ * \brief The base class for all geometrical objects in the HYDRO module.
  *
- * Interface for getting access to the object that belong to the data model.
- * Managed by Document. Provides access to the common properties: 
- * kind of an object, name.
  */
-class HYDROData_Object : public MMgt_TShared
+class HYDROData_Object : public HYDROData_Entity
 {
-public:
-  DEFINE_STANDARD_RTTI(HYDROData_Object);
-
+protected:
   /**
-   * Returns the kind of this object. Must be redefined in all objects of known type.
+   * Enumeration of tags corresponding to the persistent object parameters.
    */
-  HYDRODATA_EXPORT virtual const ObjectKind GetKind() const {return KIND_UNKNOWN;}
+  enum DataTag
+  {
+    DataTag_First = HYDROData_Entity::DataTag_First + 100, ///< first tag, to reserve
+    DataTag_TopShape,
+    DataTag_Shape3D,
+  };
 
   /**
-   * Returns the name of this object.
+   * Enumeration of tags corresponding to the child sub-objects of object.
    */
-  HYDRODATA_EXPORT QString GetName() const;
+  enum ChildTag
+  {
+    ChildTag_First = HYDROData_Entity::ChildTag_First + 100, ///< first tag, to reserve
+  };
 
-  /**
-   * Updates the name of this object.
-   */
-  HYDRODATA_EXPORT void SetName(const QString& theName);
+public:
+  DEFINE_STANDARD_RTTI(HYDROData_Object);
 
   /**
-   * Checks is object exists in the data structure.
-   * \returns true is object is not exists in the data model
+   * Sets the top(2d projection) shape of the object.
    */
-  HYDRODATA_EXPORT bool IsRemoved() const;
+  HYDRODATA_EXPORT virtual void SetTopShape( const TopoDS_Shape& theShape );
 
   /**
-   * Removes object from the data structure.
+   * Returns the top shape of the object.
    */
-  HYDRODATA_EXPORT void Remove();
+  HYDRODATA_EXPORT virtual TopoDS_Shape GetTopShape() const = 0;
 
   /**
-   * Returns unique integer identifier of the object (may be used for ordering of objects)
+   * Sets the 3d shape of the object.
    */
-  HYDRODATA_EXPORT inline int ID() const {return myLab.Tag();}
+  HYDRODATA_EXPORT virtual void SetShape3D( const TopoDS_Shape& theShape );
 
   /**
-   * Copies all properties of this to the destinated object.
-   * Objects must be the same type.
-   * \param theDestination initialized object (from any document) - target of copying
+   * Returns the 3d shape of the object.
    */
-  HYDRODATA_EXPORT void CopyTo(Handle_HYDROData_Object theDestination) const;
+  HYDRODATA_EXPORT virtual TopoDS_Shape GetShape3D() const = 0;
 
 protected:
 
-  friend class HYDROData_Iterator;
-
   /**
    * Creates new object in the internal data structure. Use higher level objects 
    * to create objects with real content.
@@ -79,23 +70,18 @@ protected:
    */
   virtual HYDRODATA_EXPORT ~HYDROData_Object();
 
+protected:
+
   /**
-   * Put the object to the label of the document.
-   * \param theLabel new label of the object
+   * Retrieve the top shape of the object from data label.
    */
-  HYDRODATA_EXPORT virtual void SetLabel(TDF_Label theLabel);
+  HYDRODATA_EXPORT TopoDS_Shape getTopShape() const;
 
   /**
-   * Returns the label of this object.
+   * Retrieve the 3d shape of the object from data label.
    */
-  TDF_Label& Label() {return myLab;}
+  HYDRODATA_EXPORT TopoDS_Shape getShape3D() const;
 
-protected:
-  /// Array of pointers to the properties of this object; index in this array is returned by \a AddProperty.
-  TDF_Label myLab; ///< label of this object
 };
 
-///! Is Equal for HYDROData_Object mapping
-HYDRODATA_EXPORT bool IsEqual(const Handle_HYDROData_Object& theObj1, const Handle_HYDROData_Object& theObj2);
-
 #endif