Update the names of Regions and Zones if case name changed (Bug #110).

[modules/hydro.git] / src / HYDROData / HYDROData_Zone.cxx

diff --git a/src/HYDROData/HYDROData_Zone.cxx b/src/HYDROData/HYDROData_Zone.cxx
index 29fd5bbe805e24c9bacf9ac9ff6d0cebc36e2231..fdbf91b082aad2b50bae545cf3cd9c9190f895c8 100644 (file)
--- a/src/HYDROData/HYDROData_Zone.cxx
+++ b/src/HYDROData/HYDROData_Zone.cxx
@@ -34,7 +34,7 @@ QStringList HYDROData_Zone::DumpToPython( MapOfTreatedObjects& theTreatedObjects
 {
   QStringList aResList;
 
-  Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( this );
+  Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( myLab );
   if ( aDocument.IsNull() )
     return aResList;
 
@@ -110,9 +110,14 @@ bool HYDROData_Zone::IsMergingNeed() const
 void HYDROData_Zone::SetMergeType( const MergeBathymetriesType& theType )
 {
   Handle(TDataStd_Integer) anInt;
-  if ( !myLab.FindChild( DataTag_MergeType ).FindAttribute( TDataStd_Integer::GetID(), anInt ) )
-    anInt = TDataStd_Integer::Set( myLab, 0 );
-  anInt->Set( (int)theType );
+  if ( myLab.FindChild( DataTag_MergeType ).FindAttribute( TDataStd_Integer::GetID(), anInt ) )
+  {
+    anInt->Set( (int)theType );
+  }
+  else
+  {
+    anInt = TDataStd_Integer::Set( myLab.FindChild( DataTag_MergeType ), (int)theType );
+  }
 }
 
 HYDROData_Zone::MergeBathymetriesType HYDROData_Zone::GetMergeType() const