X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_Zone.cxx;h=3e45fb89074b0b16282d6aa17b23dbc463623c03;hb=3ad1721baafb8864b968fe6ef6ab68ecf49a669e;hp=4bceba9a7c69b895d35ea237643e06c6b2d69136;hpb=e744ba34fd38d6744d11b54cd15b6f86350695b2;p=modules%2Fhydro.git

diff --git a/src/HYDROData/HYDROData_Zone.cxx b/src/HYDROData/HYDROData_Zone.cxx
index 4bceba9a..3e45fb89 100644
--- a/src/HYDROData/HYDROData_Zone.cxx
+++ b/src/HYDROData/HYDROData_Zone.cxx
@@ -22,12 +22,13 @@
 #include "HYDROData_IAltitudeObject.h"
 #include "HYDROData_Document.h"
 #include "HYDROData_NaturalObject.h"
-#include "HYDROData_LandCover.h"
 #include <QStringList>
 #include <TDataStd_Integer.hxx>
 #include <TopoDS_Shape.hxx>
 
-IMPLEMENT_STANDARD_HANDLE(HYDROData_Zone, HYDROData_Entity)
+#define _DEVDEBUG_
+#include "HYDRO_trace.hxx"
+
 IMPLEMENT_STANDARD_RTTIEXT(HYDROData_Zone, HYDROData_Entity)
 
 
@@ -104,30 +105,6 @@ bool HYDROData_Zone::IsMergingNeed() const
       return true;
   }
 
-  // Zones based on land cover objects (compare Strickler types)
-  QString aRefStricklerType;
-
-  anObjsIter.Init( anObjects );
-  for ( ; anObjsIter.More(); anObjsIter.Next() )
-  {
-    Handle(HYDROData_LandCover) aRefLandCoverObj =
-      Handle(HYDROData_LandCover)::DownCast( anObjsIter.Value() );
-    if ( aRefLandCoverObj.IsNull() )
-      continue;
-
-    QString aStricklerType = aRefLandCoverObj->GetStricklerType();
-    
-    if ( aRefStricklerType.isNull() )
-    {
-      aRefStricklerType = aStricklerType;
-      continue;
-    }
-
-    if ( aRefStricklerType != aStricklerType )
-      return true;
-  }
-
-
   return false;
 }
 
@@ -163,13 +140,13 @@ HYDROData_Zone::MergeType HYDROData_Zone::GetMergeType() const
 
 void HYDROData_Zone::SetMergeObject( const Handle(HYDROData_Entity)& theObject )
 {
+  //DEBTRACE("HYDROData_Zone::SetMergeObject");
   SetReferenceObject( theObject, DataTag_MergeObject );
 }
 
 Handle(HYDROData_Entity) HYDROData_Zone::GetMergeObject() const
 {
-  return Handle(HYDROData_Entity)::DownCast( 
-           GetReferenceObject( DataTag_MergeObject ) );
+  return GetReferenceObject( DataTag_MergeObject );
 }
 
 void HYDROData_Zone::RemoveMergeObject()
@@ -183,8 +160,7 @@ bool HYDROData_Zone::AddObject( const Handle(HYDROData_Entity)& theObject )
     return false;
   
   if ( !theObject->IsKind( STANDARD_TYPE(HYDROData_ArtificialObject) ) &&
-       !theObject->IsKind( STANDARD_TYPE(HYDROData_NaturalObject) ) && 
-       !theObject->IsKind( STANDARD_TYPE(HYDROData_LandCover) ) )
+       !theObject->IsKind( STANDARD_TYPE(HYDROData_NaturalObject) ) )
     return false; // Wrong type of object
 
   if ( HasReference( theObject, DataTag_Object ) )