X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_Entity.h;h=0df866a806222c258d2a104a617b9b506916cbea;hb=ad8562bab9992101430a6327aa7ca06c71f6d084;hp=0aa6a492b7615e1f2f775aa57bc4e6c1e48772f7;hpb=bdc5180a07545c7ec07641a41753add63d08ba36;p=modules%2Fhydro.git

diff --git a/src/HYDROData/HYDROData_Entity.h b/src/HYDROData/HYDROData_Entity.h
index 0aa6a492..0df866a8 100644
--- a/src/HYDROData/HYDROData_Entity.h
+++ b/src/HYDROData/HYDROData_Entity.h
@@ -26,12 +26,19 @@ const ObjectKind KIND_POLYLINE        = 2;
 const ObjectKind KIND_BATHYMETRY      = 3;
 const ObjectKind KIND_ALTITUDE        = 4;
 const ObjectKind KIND_IMMERSIBLE_ZONE = 5;
-const ObjectKind KIND_GUIDE_LINE      = 6;
-const ObjectKind KIND_PROFILE         = 7;
-const ObjectKind KIND_CALCULATION     = 8;
-const ObjectKind KIND_ZONE            = 9;
-const ObjectKind KIND_REGION          = 10;
-const ObjectKind KIND_VISUAL_STATE    = 11;
+const ObjectKind KIND_RIVER           = 6;
+const ObjectKind KIND_STREAM          = 7;
+const ObjectKind KIND_CONFLUENCE      = 8;
+const ObjectKind KIND_CHANNEL         = 9;
+const ObjectKind KIND_OBSTACLE        = 10;
+const ObjectKind KIND_DIGUE           = 11;
+const ObjectKind KIND_PROFILE         = 12;
+const ObjectKind KIND_PROFILEUZ       = 13;
+const ObjectKind KIND_POLYLINEXY      = 14;
+const ObjectKind KIND_CALCULATION     = 15;
+const ObjectKind KIND_ZONE            = 16;
+const ObjectKind KIND_REGION          = 17;
+const ObjectKind KIND_VISUAL_STATE    = 18;
 const ObjectKind KIND_LAST            = KIND_VISUAL_STATE;
 
 DEFINE_STANDARD_HANDLE(HYDROData_Entity, MMgt_TShared)
@@ -62,15 +69,6 @@ protected:
     // ...
   };
 
-  /**
-   * Enumeration of tags corresponding to the child sub-objects of object.
-   */
-  enum ChildTag
-  {
-    ChildTag_First = 0    ///< first tag, to reserve
-    // ...
-  };
-
 public:
   DEFINE_STANDARD_RTTI(HYDROData_Entity);
 
@@ -82,12 +80,12 @@ public:
   /**
    * Returns the name of this object.
    */
-  HYDRODATA_EXPORT QString GetName() const;
+  HYDRODATA_EXPORT virtual QString GetName() const;
 
   /**
    * Updates the name of this object.
    */
-  HYDRODATA_EXPORT void SetName(const QString& theName);
+  HYDRODATA_EXPORT virtual void SetName( const QString& theName );
 
   /**
    * Dump object to Python script representation.
@@ -98,11 +96,9 @@ public:
   HYDRODATA_EXPORT virtual QStringList DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const;
 
   /**
-   * Updates object state.
-   * Base implementation dose nothing.
-   * \param theIsForce force reupdating of data object
+   * Updates object state. Base implementation dose nothing.
    */
-  HYDRODATA_EXPORT virtual void Update( const bool theIsForce = true );
+  HYDRODATA_EXPORT virtual void Update();
 
   /**
    * Returns data of object wrapped to QVariant.
@@ -110,6 +106,18 @@ public:
    */
   HYDRODATA_EXPORT virtual QVariant GetDataVariant();
 
+  /**
+   * Sets the "MustBeUpdated" flag: if object is depended on updated features.
+   * \param theFlag is true for objects that must be updated, false for up-to-date
+   */
+  HYDRODATA_EXPORT void SetToUpdate( bool theFlag );
+
+  /**
+   * Returns the "MustBeUpdated" flag: is object data must be updated or not
+   * \returns false if object is up to date
+   */
+  HYDRODATA_EXPORT bool IsMustBeUpdated() const;
+
   /**
    * Checks is object exists in the data structure.
    * \returns true is object is not exists in the data model
@@ -124,19 +132,19 @@ public:
   /**
    * Returns unique integer identifier of the object (may be used for ordering of objects)
    */
-  HYDRODATA_EXPORT inline int ID() const {return myLab.Tag();}
+  HYDRODATA_EXPORT inline int ID() const { return myLab.Tag(); }
 
   /**
    * 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
    */
-  HYDRODATA_EXPORT void CopyTo(Handle_HYDROData_Entity theDestination) const;
+  HYDRODATA_EXPORT void CopyTo( Handle_HYDROData_Entity theDestination ) const;
 
   /**
    * Returns the label of this object.
    */
-  HYDRODATA_EXPORT TDF_Label& Label() {return myLab;}
+  HYDRODATA_EXPORT TDF_Label& Label() { return myLab; }
 
   /**
    * Returns father object. For object created under root document label