Child tag has ben removed from data model.

diff --git a/src/HYDROData/HYDROData_CalculationCase.cxx b/src/HYDROData/HYDROData_CalculationCase.cxx
index b62bcb5c7366691c159074d3f6224899cd975c9c..af132d34c4fc6c8469451f726f33791b7d8d9a69 100644 (file)
--- a/src/HYDROData/HYDROData_CalculationCase.cxx
+++ b/src/HYDROData/HYDROData_CalculationCase.cxx
@@ -225,12 +225,12 @@ void HYDROData_CalculationCase::RemoveRegion( const Handle(HYDROData_Region)& th
 void HYDROData_CalculationCase::RemoveRegions()
 {
   ClearReferenceObjects( DataTag_Region );
-  myLab.FindChild( ChildTag_Region ).ForgetAllAttributes( true );
+  myLab.FindChild( DataTag_ChildRegion ).ForgetAllAttributes( true );
 }
 
 Handle(HYDROData_Region) HYDROData_CalculationCase::addNewRegion()
 {
-  TDF_Label aNewLab = myLab.FindChild( ChildTag_Region ).NewChild();
+  TDF_Label aNewLab = myLab.FindChild( DataTag_ChildRegion ).NewChild();
 
   Handle(HYDROData_Region) aNewRegion =
     Handle(HYDROData_Region)::DownCast( HYDROData_Iterator::CreateObject( aNewLab, KIND_REGION ) );

diff --git a/src/HYDROData/HYDROData_CalculationCase.h b/src/HYDROData/HYDROData_CalculationCase.h
index 916057bef31dd583ecf72e245c565dadd1d1795e..79d3aae3921929a349964c9c6e8971b3ae50155d 100644 (file)
--- a/src/HYDROData/HYDROData_CalculationCase.h
+++ b/src/HYDROData/HYDROData_CalculationCase.h
@@ -28,18 +28,10 @@ protected:
   {
     DataTag_First = HYDROData_Entity::DataTag_First + 100, ///< first tag, to reserve
     DataTag_GeometryObject,   ///< reference geometry objects
+    DataTag_ChildRegion,      ///< child regions
     DataTag_Region            ///< reference regions
   };
 
-  /**
-   * Enumeration of tags corresponding to the child sub-objects of object.
-   */
-  enum ChildTag
-  {
-    ChildTag_First = HYDROData_Entity::ChildTag_First + 100, ///< first tag, to reserve
-    ChildTag_Region      ///< child regions
-  };
-
 public:
 
   DEFINE_STANDARD_RTTI(HYDROData_CalculationCase);

diff --git a/src/HYDROData/HYDROData_Entity.h b/src/HYDROData/HYDROData_Entity.h
index 9f2633a28673d09931f3f3826a31f4e2409ded79..84a82778013ec8464eef81f4b5102e0f8bea04d7 100644 (file)
--- a/src/HYDROData/HYDROData_Entity.h
+++ b/src/HYDROData/HYDROData_Entity.h
@@ -69,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);
 

diff --git a/src/HYDROData/HYDROData_Object.h b/src/HYDROData/HYDROData_Object.h
index 59ccfedb14dfb8172025c2b9e91a9ecd0cc1688a..fec76b16f32e5f07167fd5d39ecafb818e619f8b 100644 (file)
--- a/src/HYDROData/HYDROData_Object.h
+++ b/src/HYDROData/HYDROData_Object.h
@@ -28,14 +28,6 @@ protected:
     DataTag_Bathymetry,   ///< reference bathymetry
   };
 
-  /**
-   * Enumeration of tags corresponding to the child sub-objects of object.
-   */
-  enum ChildTag
-  {
-    ChildTag_First = HYDROData_Entity::ChildTag_First + 100, ///< first tag, to reserve
-  };
-
 public:
   DEFINE_STANDARD_RTTI(HYDROData_Object);
 

diff --git a/src/HYDROData/HYDROData_Region.cxx b/src/HYDROData/HYDROData_Region.cxx
index a9b9923f4171dba6a6bf2e79e827958331ccd031..40d193b575b7cedd1e4050fa1d31caed30764211 100644 (file)
--- a/src/HYDROData/HYDROData_Region.cxx
+++ b/src/HYDROData/HYDROData_Region.cxx
@@ -105,12 +105,12 @@ void HYDROData_Region::RemoveZone( const Handle(HYDROData_Zone)& theZone )
 void HYDROData_Region::RemoveZones()
 {
   ClearReferenceObjects( DataTag_Zone );
-  myLab.FindChild( ChildTag_Zone ).ForgetAllAttributes( true );
+  myLab.FindChild( DataTag_ChildZone ).ForgetAllAttributes( true );
 }
 
 Handle(HYDROData_Zone) HYDROData_Region::addNewZone()
 {
-  TDF_Label aNewLab = myLab.FindChild( ChildTag_Zone ).NewChild();
+  TDF_Label aNewLab = myLab.FindChild( DataTag_ChildZone ).NewChild();
 
   Handle(HYDROData_Zone) aNewZone =
     Handle(HYDROData_Zone)::DownCast( HYDROData_Iterator::CreateObject( aNewLab, KIND_ZONE ) );

diff --git a/src/HYDROData/HYDROData_Region.h b/src/HYDROData/HYDROData_Region.h
index 09c69de61d6d87dd0b8d82c83b9884a1f5898cd4..5ba5bf969527ec0575ce4fc0342c605d3b56aeb7 100644 (file)
--- a/src/HYDROData/HYDROData_Region.h
+++ b/src/HYDROData/HYDROData_Region.h
@@ -23,18 +23,10 @@ protected:
   enum DataTag
   {
     DataTag_First = HYDROData_Entity::DataTag_First + 100, ///< first tag, to reserve
+    DataTag_ChildZone,    ///< child zones
     DataTag_Zone,         ///< reference zones
   };
 
-  /**
-   * Enumeration of tags corresponding to the child sub-objects of object.
-   */
-  enum ChildTag
-  {
-    ChildTag_First = HYDROData_Entity::ChildTag_First + 100, ///< first tag, to reserve
-    ChildTag_Zone      ///< child zones
-  };
-
 public:
   DEFINE_STANDARD_RTTI(HYDROData_Region);