X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_Zone.cxx;h=6f247eddc32f07a68190252993d20c8f155effff;hb=a95289fabbb6fbf6f32c06207422c65aafd5bd65;hp=c25176912fb24c039206acfa0bc9434c38ae546f;hpb=254bc4b391a60c6a0c49435711d48071be58f761;p=modules%2Fhydro.git

diff --git a/src/HYDROData/HYDROData_Zone.cxx b/src/HYDROData/HYDROData_Zone.cxx
index c2517691..6f247edd 100644
--- a/src/HYDROData/HYDROData_Zone.cxx
+++ b/src/HYDROData/HYDROData_Zone.cxx
@@ -22,17 +22,19 @@
 #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>
 
+#define _DEVDEBUG_
+#include "HYDRO_trace.hxx"
+
 IMPLEMENT_STANDARD_HANDLE(HYDROData_Zone, HYDROData_Entity)
 IMPLEMENT_STANDARD_RTTIEXT(HYDROData_Zone, HYDROData_Entity)
 
 
 HYDROData_Zone::HYDROData_Zone()
-: HYDROData_Entity()
+: HYDROData_Entity( Geom_2d )
 {
   myInterpolator = NULL;
 }
@@ -104,30 +106,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,6 +141,7 @@ HYDROData_Zone::MergeType HYDROData_Zone::GetMergeType() const
 
 void HYDROData_Zone::SetMergeObject( const Handle(HYDROData_Entity)& theObject )
 {
+  //DEBTRACE("HYDROData_Zone::SetMergeObject");
   SetReferenceObject( theObject, DataTag_MergeObject );
 }
 
@@ -183,8 +162,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 ) )