X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_CalculationCase.cxx;h=509c2c5fb0bb63ffbd4ca5dd173f9d7aa5d15aa0;hb=ea116c29ba9e987172ad9befad3c607ef6bfe968;hp=b84397216cb82ac1731074b6b31fc4c57593881a;hpb=b224bc7bf6b9a68e79dfaab0ded899bc72f9c2e3;p=modules%2Fhydro.git

diff --git a/src/HYDROData/HYDROData_CalculationCase.cxx b/src/HYDROData/HYDROData_CalculationCase.cxx
index b8439721..509c2c5f 100644
--- a/src/HYDROData/HYDROData_CalculationCase.cxx
+++ b/src/HYDROData/HYDROData_CalculationCase.cxx
@@ -2,30 +2,52 @@
 #include "HYDROData_CalculationCase.h"
 
 #include "HYDROData_ArtificialObject.h"
-#include "HYDROData_Bathymetry.h"
+#include "HYDROData_IAltitudeObject.h"
 #include "HYDROData_Document.h"
+#include "HYDROData_ShapesGroup.h"
 #include "HYDROData_Iterator.h"
 #include "HYDROData_NaturalObject.h"
 #include "HYDROData_PolylineXY.h"
 #include "HYDROData_SplitToZonesTool.h"
+#include "HYDROData_SplittedShapesGroup.h"
 #include "HYDROData_Region.h"
 #include "HYDROData_Tool.h"
 #include "HYDROData_Zone.h"
 
+#include <GEOMBase.h>
+
+#include <QSet>
+
 #include <TopoDS.hxx>
 #include <TopoDS_Shell.hxx>
+#include <TopoDS_Edge.hxx>
+
 #include <BRep_Builder.hxx>
 #include <BRepBuilderAPI_Sewing.hxx>
+#include <BRepTopAdaptor_FClass2d.hxx>
+
+#include <BRepTools.hxx>
+
+#include <TopAbs.hxx>
 #include <TopExp_Explorer.hxx>
 #include <TopExp.hxx>
 #include <TopTools_ListOfShape.hxx>
 #include <TopTools_ListIteratorOfListOfShape.hxx>
-#include <BRepTopAdaptor_FClass2d.hxx>
-#include <TopAbs.hxx>
+
+//#define  DEB_CALCULATION 1
+#ifdef DEB_CALCULATION
+#include <BRepTools.hxx>
+#include <TopLoc_Location.hxx>
+#endif 
 #define CALCULATION_REGIONS_PREF GetName() + "_Reg"
 #define CALCULATION_ZONES_PREF GetName() + "_Zone"
+#define CALCULATION_GROUPS_PREF GetName() + "_"
+//#define DEB_CLASS2D 1
+#ifdef DEB_CLASS2D
+#include <BRepBuilderAPI_MakeVertex.hxx>
+#endif
 
-#define PYTHON_CALCULATION_ID "KIND_CALCULATION"
+#define EXPORT_NAME "HYDRO_" + GetName()
 
 IMPLEMENT_STANDARD_HANDLE(HYDROData_CalculationCase, HYDROData_Entity)
 IMPLEMENT_STANDARD_RTTIEXT(HYDROData_CalculationCase, HYDROData_Entity)
@@ -54,12 +76,7 @@ void HYDROData_CalculationCase::SetName( const QString& theName )
       if ( aRegion.IsNull() )
         continue;
 
-      QString aRegionName = aRegion->GetName();
-      if ( aRegionName.startsWith( anOldCaseName ) )
-      {
-        aRegionName.replace( anOldCaseName, theName );
-        aRegion->SetName( aRegionName );
-      }
+      HYDROData_Tool::UpdateChildObjectName( anOldCaseName, theName, aRegion );
 
       HYDROData_SequenceOfObjects aZones = aRegion->GetZones();
       HYDROData_SequenceOfObjects::Iterator anIter( aZones );
@@ -70,14 +87,22 @@ void HYDROData_CalculationCase::SetName( const QString& theName )
         if ( aRegZone.IsNull() )
           continue;
 
-        QString aRegionZoneName = aRegZone->GetName();
-        if ( aRegionZoneName.startsWith( anOldCaseName ) )
-        {
-          aRegionZoneName.replace( anOldCaseName, theName );
-          aRegZone->SetName( aRegionZoneName );
-        }
+        HYDROData_Tool::UpdateChildObjectName( anOldCaseName, theName, aRegZone );
       }
     }
+
+    HYDROData_SequenceOfObjects aGroups = GetSplittedGroups();
+
+    anIter.Init( aGroups );
+    for ( ; anIter.More(); anIter.Next() )
+    {
+      Handle(HYDROData_SplittedShapesGroup) aGroup =
+        Handle(HYDROData_SplittedShapesGroup)::DownCast( anIter.Value() );
+      if ( aGroup.IsNull() )
+        continue;
+
+      HYDROData_Tool::UpdateChildObjectName( anOldCaseName, theName, aGroup );
+    }
   }
 
   HYDROData_Entity::SetName( theName );
@@ -85,20 +110,9 @@ void HYDROData_CalculationCase::SetName( const QString& theName )
 
 QStringList HYDROData_CalculationCase::DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const
 {
-  QStringList aResList;
+  QStringList aResList = dumpObjectCreation( theTreatedObjects );
 
-  Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( myLab );
-  if ( aDocument.IsNull() )
-    return aResList;
-                             
-  QString aDocName = aDocument->GetDocPyName();
-  QString aCalculName = GetName();
-
-  aResList << QString( "%1 = %2.CreateObject( %3 );" )
-              .arg( aCalculName ).arg( aDocName ).arg( PYTHON_CALCULATION_ID );
-  aResList << QString( "%1.SetName( \"%2\" );" )
-              .arg( aCalculName ).arg( aCalculName );
-  aResList << QString( "" );
+  QString aCalculName = GetObjPyName();
 
   HYDROData_SequenceOfObjects aGeomObjects = GetGeometryObjects();
   HYDROData_SequenceOfObjects::Iterator anIter( aGeomObjects );
@@ -106,12 +120,39 @@ QStringList HYDROData_CalculationCase::DumpToPython( MapOfTreatedObjects& theTre
   {
     Handle(HYDROData_Object) aRefGeomObj =
       Handle(HYDROData_Object)::DownCast( anIter.Value() );
-    if ( !aRefGeomObj.IsNull() )
-      setPythonReferenceObject( theTreatedObjects, aResList, aRefGeomObj, "AddGeometryObject" );
+    setPythonReferenceObject( theTreatedObjects, aResList, aRefGeomObj, "AddGeometryObject" );
+  }
+  aResList << QString( "" );
+
+  QString aGroupName = HYDROData_Tool::GenerateNameForPython( theTreatedObjects, "case_geom_group" );
+
+  HYDROData_SequenceOfObjects aGeomGroups = GetGeometryGroups();
+  anIter.Init( aGeomGroups );
+  for ( ; anIter.More(); anIter.Next() )
+  {
+    Handle(HYDROData_ShapesGroup) aGeomGroup =
+      Handle(HYDROData_ShapesGroup)::DownCast( anIter.Value() );
+    if ( aGeomGroup.IsNull() )
+      continue;
+
+    Handle(HYDROData_Object) aFatherGeom =
+      Handle(HYDROData_Object)::DownCast( aGeomGroup->GetFatherObject() );
+    if ( aFatherGeom.IsNull() )
+      continue;
+
+    int aGroupId = aFatherGeom->GetGroupId( aGeomGroup );
+    aResList << QString( "%1 = %2.GetGroup( %3 );" )
+              .arg( aGroupName ).arg( aFatherGeom->GetObjPyName() ).arg( aGroupId );
+
+    aResList << QString( "%1.AddGeometryGroup( %2 );" ).arg( aCalculName ).arg( aGroupName );
   }
   aResList << QString( "" );
 
-  aResList << QString( "%1.SplitGeometryObjects();" ).arg( aCalculName );
+  Handle(HYDROData_PolylineXY) aBoundaryPolyline = GetBoundaryPolyline();
+  setPythonReferenceObject( theTreatedObjects, aResList, aBoundaryPolyline, "SetBoundaryPolyline" );
+  aResList << QString( "" );
+
+  aResList << QString( "%1.Update();" ).arg( aCalculName );
   aResList << QString( "" );
 
   // Now we restore the regions and zones order
@@ -125,8 +166,20 @@ QStringList HYDROData_CalculationCase::DumpToPython( MapOfTreatedObjects& theTre
       continue;
 
     QString aRegionName = aRegion->GetName();
-    // TODO
+
+    HYDROData_SequenceOfObjects aZones = aRegion->GetZones();
+    HYDROData_SequenceOfObjects::Iterator aZonesIter( aZones );
+    for ( ; aZonesIter.More(); aZonesIter.Next() )
+    {
+      Handle(HYDROData_Zone) aRegZone =
+        Handle(HYDROData_Zone)::DownCast( aZonesIter.Value() );
+      if ( aRegZone.IsNull() )
+        continue;
+
+      // TODO
+    }
   }
+  aResList << QString( "" );
 
   return aResList;
 }
@@ -149,8 +202,9 @@ void HYDROData_CalculationCase::Update()
 {
   HYDROData_Entity::Update();
 
-  // At first we remove previously created regions
+  // At first we remove previously created objects
   RemoveRegions();
+  RemoveSplittedGroups();
 
   Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( myLab );
   if ( aDocument.IsNull() )
@@ -161,45 +215,85 @@ void HYDROData_CalculationCase::Update()
   if ( aGeomObjects.IsEmpty() )
     return;
 
-  HYDROData_SplitToZonesTool::SplitDataList aSplitedZones =
-    HYDROData_SplitToZonesTool::SplitToZones( aGeomObjects, aBoundaryPolyline );
-  if ( aSplitedZones.isEmpty() )
+  HYDROData_SequenceOfObjects aGeomGroups = GetGeometryGroups();
+
+  HYDROData_SplitToZonesTool::SplitDataList aSplitedObjects =
+    HYDROData_SplitToZonesTool::Split( aGeomObjects, aGeomGroups, aBoundaryPolyline );
+  if ( aSplitedObjects.isEmpty() )
     return;
 
   QString aRegsPref = CALCULATION_REGIONS_PREF;
   QString aZonesPref = CALCULATION_ZONES_PREF;
 
+  QMap<QString,Handle(HYDROData_SplittedShapesGroup)> aSplittedEdgesGroupsMap;
+
   // Create result regions for case, by default one zone for one region
-  HYDROData_SplitToZonesTool::SplitDataListIterator anIter( aSplitedZones );
+  HYDROData_SplitToZonesTool::SplitDataListIterator anIter( aSplitedObjects );
   while( anIter.hasNext() )
   {
     const HYDROData_SplitToZonesTool::SplitData& aSplitData = anIter.next();
 
-    // Create new region
-    Handle(HYDROData_Region) aRegion = addNewRegion();
+    if ( aSplitData.Type == HYDROData_SplitToZonesTool::SplitData::Data_Zone )
+    {
+      // Create new region
+      Handle(HYDROData_Region) aRegion = addNewRegion();
 
-    QString aRegionName = HYDROData_Tool::GenerateObjectName( aDocument, aRegsPref );
-    aRegion->SetName( aRegionName );
+      QString aRegionName = HYDROData_Tool::GenerateObjectName( aDocument, aRegsPref );
+      aRegion->SetName( aRegionName );
 
-    // Add the zone for region
-    Handle(HYDROData_Zone) aRegionZone = aRegion->addNewZone();
+      // Add the zone for region
+      Handle(HYDROData_Zone) aRegionZone = aRegion->addNewZone();
 
-    QString aZoneName = HYDROData_Tool::GenerateObjectName( aDocument, aZonesPref );
-    aRegionZone->SetName( aZoneName );
+      QString aZoneName = HYDROData_Tool::GenerateObjectName( aDocument, aZonesPref );
+      aRegionZone->SetName( aZoneName );
 
-    aRegionZone->SetShape( aSplitData.Face() );
+      aRegionZone->SetShape( aSplitData.Face() );
 
-    // Add the reference object for zone
-    for ( int i = 0, n = aSplitData.ObjectNames.length(); i < n; ++i )
+      // Add the reference object for zone
+      for ( int i = 0, n = aSplitData.ObjectNames.length(); i < n; ++i )
+      {
+        const QString& anObjName = aSplitData.ObjectNames.at( i );
+        
+        Handle(HYDROData_Object) aRefObject = 
+          Handle(HYDROData_Object)::DownCast( aDocument->FindObjectByName( anObjName ) );
+        if ( aRefObject.IsNull() )
+          continue;
+
+        aRegionZone->AddGeometryObject( aRefObject );
+      }
+    }
+    else if ( aSplitData.Type == HYDROData_SplitToZonesTool::SplitData::Data_Edge )
     {
-      const QString& anObjName = aSplitData.ObjectNames.at( i );
-      
-      Handle(HYDROData_Object) aRefObject = Handle(HYDROData_Object)::DownCast(
-        HYDROData_Tool::FindObjectByName( aDocument, anObjName ) );
-      if ( aRefObject.IsNull() )
+      // Create new edges group
+      if ( aSplitData.ObjectNames.isEmpty() || aSplitData.Shape.IsNull() )
+        continue;
+
+      QString anObjName = aSplitData.ObjectNames.first();
+      if ( anObjName.isEmpty() )
+        continue;
+#ifdef DEB_CALCULATION
+      QString aStr = aSplitData.ObjectNames.join(" "); 
+	  cout << " CCase: Names = "<<aStr.toStdString() << " size = " <<aSplitData.ObjectNames.size() <<endl; 
+#endif
+      Handle(HYDROData_SplittedShapesGroup) aSplittedGroup;
+      if ( !aSplittedEdgesGroupsMap.contains( anObjName ) )
+      {
+        aSplittedGroup = addNewSplittedGroup();
+
+        QString aCalcGroupName = CALCULATION_GROUPS_PREF + anObjName;
+        aSplittedGroup->SetName( aCalcGroupName );
+
+        aSplittedEdgesGroupsMap.insert( anObjName, aSplittedGroup );
+      }
+      else
+      {
+        aSplittedGroup = aSplittedEdgesGroupsMap[ anObjName ];
+      }
+
+      if ( aSplittedGroup.IsNull() )
         continue;
 
-      aRegionZone->AddGeometryObject( aRefObject );
+      aSplittedGroup->AddShape( aSplitData.Shape );
     }
   }
 }
@@ -214,7 +308,7 @@ bool HYDROData_CalculationCase::AddGeometryObject( const Handle(HYDROData_Object
 
   AddReferenceObject( theObject, DataTag_GeometryObject );
   
-  // Indicate model of the need to update zones splitting
+  // Indicate model of the need to update splitting
   SetToUpdate( true );
 
   return true;
@@ -232,7 +326,7 @@ void HYDROData_CalculationCase::RemoveGeometryObject( const Handle(HYDROData_Obj
 
   RemoveReferenceObject( theObject->Label(), DataTag_GeometryObject );
 
-  // Indicate model of the need to update zones splitting
+  // Indicate model of the need to update splitting
   SetToUpdate( true );
 }
 
@@ -240,7 +334,47 @@ void HYDROData_CalculationCase::RemoveGeometryObjects()
 {
   ClearReferenceObjects( DataTag_GeometryObject );
 
-  // Indicate model of the need to update zones splitting
+  // Indicate model of the need to update splitting
+  SetToUpdate( true );
+}
+
+bool HYDROData_CalculationCase::AddGeometryGroup( const Handle(HYDROData_ShapesGroup)& theGroup )
+{
+  if ( theGroup.IsNull() )
+    return false;
+
+  if ( HasReference( theGroup, DataTag_GeometryGroup ) )
+    return false; // Object is already in reference list
+
+  AddReferenceObject( theGroup, DataTag_GeometryGroup );
+  
+  // Indicate model of the need to update splitting
+  SetToUpdate( true );
+
+  return true;
+}
+
+HYDROData_SequenceOfObjects HYDROData_CalculationCase::GetGeometryGroups() const
+{
+  return GetReferenceObjects( DataTag_GeometryGroup );
+}
+
+void HYDROData_CalculationCase::RemoveGeometryGroup( const Handle(HYDROData_ShapesGroup)& theGroup )
+{
+  if ( theGroup.IsNull() )
+    return;
+
+  RemoveReferenceObject( theGroup->Label(), DataTag_GeometryGroup );
+
+  // Indicate model of the need to update splitting
+  SetToUpdate( true );
+}
+
+void HYDROData_CalculationCase::RemoveGeometryGroups()
+{
+  ClearReferenceObjects( DataTag_GeometryGroup );
+
+  // Indicate model of the need to update splitting
   SetToUpdate( true );
 }
 
@@ -374,162 +508,50 @@ void HYDROData_CalculationCase::RemoveRegion( const Handle(HYDROData_Region)& th
 
 void HYDROData_CalculationCase::RemoveRegions()
 {
-  ClearReferenceObjects( DataTag_Region );
-  myLab.FindChild( DataTag_ChildRegion ).ForgetAllAttributes( true );
+  myLab.FindChild( DataTag_ChildRegion ).ForgetAllAttributes();
 }
 
-Handle(HYDROData_Region) HYDROData_CalculationCase::addNewRegion()
+HYDROData_SequenceOfObjects HYDROData_CalculationCase::GetSplittedGroups() const
 {
-  TDF_Label aNewLab = myLab.FindChild( DataTag_ChildRegion ).NewChild();
-
-  Handle(HYDROData_Region) aNewRegion =
-    Handle(HYDROData_Region)::DownCast( HYDROData_Iterator::CreateObject( aNewLab, KIND_REGION ) );
-  AddRegion( aNewRegion );
-
-  return aNewRegion;
+  return GetReferenceObjects( DataTag_SplittedGroups );
 }
 
-TopoDS_Shell HYDROData_CalculationCase::GetShell()
+void HYDROData_CalculationCase::RemoveSplittedGroups()
 {
-  TopoDS_Shell aShell;
-
-  TopTools_ListOfShape aFacesList;
-
-  // Make shell containing all region shapes
-  BRepBuilderAPI_Sewing aSewing( Precision::Confusion()*10.0 );
+  myLab.FindChild( DataTag_SplittedGroups ).ForgetAllAttributes();
+}
 
-  HYDROData_SequenceOfObjects aCaseRegions = GetRegions();
-  HYDROData_SequenceOfObjects::Iterator aRegionIter( aCaseRegions );
-  for ( ; aRegionIter.More(); aRegionIter.Next() ) {
-    Handle(HYDROData_Region) aRegion =
-      Handle(HYDROData_Region)::DownCast( aRegionIter.Value() );
-    if( aRegion.IsNull() ) {
-      continue;
-    }
+double HYDROData_CalculationCase::GetAltitudeForPoint( const gp_XY& thePoint ) const
+{
+  Handle(HYDROData_Zone) aZone = GetZoneFromPoint( thePoint );
+  return GetAltitudeForPoint( thePoint, aZone );
+}
 
-    TopoDS_Shape aRegionShape = aRegion->GetShape();
-    if( !aRegionShape.IsNull() ) {
-      if ( aRegionShape.ShapeType() == TopAbs_FACE ) {
-        TopoDS_Face aFace = TopoDS::Face( aRegionShape );
-        if ( !aFace.IsNull() ) {
-          aFacesList.Append( aFace );
-          aSewing.Add( aFace );
-        }
-      } else {
-        TopExp_Explorer anExp( aRegionShape, TopAbs_FACE );
-        for ( ; anExp.More(); anExp.Next() ) {
-          TopoDS_Face aFace = TopoDS::Face( anExp.Current() );
-          if ( !aFace.IsNull() ) {
-            aFacesList.Append( aFace );
-            aSewing.Add( aFace );
-          }
-        }
-      }
-    }
-  } // regions iterator
-  
-  aSewing.Perform();
-  TopoDS_Shape aSewedShape = aSewing.SewedShape();
+double HYDROData_CalculationCase::GetAltitudeForPoint( const gp_XY&                    thePoint,
+                                                       const Handle(HYDROData_Region)& theRegion ) const
+{
+  double aResAltitude = HYDROData_IAltitudeObject::GetInvalidAltitude();
 
-  if ( !aSewedShape.IsNull() )
+  Handle(HYDROData_Zone) aZone = GetZoneFromPoint( thePoint );
+  if ( !aZone.IsNull() )
   {
-    if ( aSewedShape.ShapeType() == TopAbs_FACE && aCaseRegions.Length() ==1 ) {
-      // create shell from one face
-      BRep_Builder aBuilder;
-      aBuilder.MakeShell( aShell );
-      aBuilder.Add( aShell, aSewedShape);
-    } else {
-      TopExp_Explorer anExpShells( aSewedShape, TopAbs_SHELL );
-      Standard_Integer aNbOfShells = 0;
-      for ( ; anExpShells.More(); anExpShells.Next() ) {
-        aShell = TopoDS::Shell( anExpShells.Current() );
-        aNbOfShells++;
-      }
-
-      if ( aNbOfShells != 1 ) {
-        aShell.Nullify();
-        BRep_Builder aBuilder;
-        aBuilder.MakeShell( aShell );
-
-        TopExp_Explorer anExpFaces( aSewedShape, TopAbs_FACE );
-        for ( ; anExpFaces.More(); anExpFaces.Next() ) {
-          TopoDS_Face aFace = TopoDS::Face( anExpFaces.Current() );
-          if ( !aFace.IsNull() ) {
-            aBuilder.Add( aShell, aFace );
-          }
-        }
-      }
-    }
+    Handle(HYDROData_Region) aRefRegion = Handle(HYDROData_Region)::DownCast( aZone->GetFatherObject() );
+    if ( IsEqual( aRefRegion, theRegion ) )
+      aResAltitude = GetAltitudeForPoint( thePoint, aZone );
   }
 
-  if ( !aShell.IsNull() ) {
-    TopTools_IndexedMapOfShape aMapOfFaces;
-    TopExp::MapShapes( aShell, TopAbs_FACE, aMapOfFaces );
-    if ( aMapOfFaces.Extent() != aFacesList.Extent() ) {
-      aShell.Nullify();
-      BRep_Builder aBuilder;
-      aBuilder.MakeShell( aShell );
-
-      TopTools_ListIteratorOfListOfShape anIter( aFacesList );
-      for ( ; anIter.More(); anIter.Next() ) {
-        TopoDS_Face aFace = TopoDS::Face( anIter.Value() );
-        aBuilder.Add( aShell, aFace );
-      }
-    }
-  }
-
-/* TODO: old version
-  // Make shell
-  BRep_Builder aBuilder;
-  aBuilder.MakeShell( aShell );
-
-  // Make shell containing all region shapes
-  HYDROData_SequenceOfObjects aCaseRegions = GetRegions();
-  HYDROData_SequenceOfObjects::Iterator aRegionIter( aCaseRegions );
-  for ( ; aRegionIter.More(); aRegionIter.Next() ) {
-    Handle(HYDROData_Region) aRegion =
-      Handle(HYDROData_Region)::DownCast( aRegionIter.Value() );
-    if( aRegion.IsNull() ) {
-      continue;
-    }
-
-    TopoDS_Shape aRegionShape = aRegion->GetShape();
-
-    // Add shape (face or shell) corresponding to the region into the shell
-    if( !aRegionShape.IsNull() ) {
-      if ( aRegionShape.ShapeType() == TopAbs_FACE ) {
-        aBuilder.Add( aShell, aRegionShape );
-      } else {
-        TopExp_Explorer anExp( aRegionShape, TopAbs_FACE );
-        for( ; anExp.More(); anExp.Next() ) {
-          TopoDS_Face aFace = TopoDS::Face( anExp.Current() );
-          if( !aFace.IsNull() ) {
-            aBuilder.Add( aShell, aFace );
-          }
-        }
-      }
-    }
-  } // regions iterator
-*/
-
-  // Nullify shell if it is empty
-  if ( !aShell.IsNull() && !TopoDS_Iterator(aShell).More() ) {
-    aShell.Nullify();
-  }
-
-  return aShell;
+  return aResAltitude;
 }
 
-double HYDROData_CalculationCase::GetAltitudeForPoint( const gp_XY& thePoint ) const
+double HYDROData_CalculationCase::GetAltitudeForPoint( const gp_XY&                  thePoint,
+                                                       const Handle(HYDROData_Zone)& theZone ) const
 {
-  double aResAltitude = HYDROData_Bathymetry::GetInvalidAltitude();
-
-  Handle(HYDROData_Zone) aZone = GetZoneFromPoint( thePoint );
-  if ( aZone.IsNull() )
+  double aResAltitude = HYDROData_IAltitudeObject::GetInvalidAltitude();
+  if ( theZone.IsNull() )
     return aResAltitude;
 
-  HYDROData_Zone::MergeBathymetriesType aZoneMergeType = aZone->GetMergeType();
-  if ( !aZone->IsMergingNeed() )
+  HYDROData_Zone::MergeAltitudesType aZoneMergeType = theZone->GetMergeType();
+  if ( !theZone->IsMergingNeed() )
   {
     aZoneMergeType = HYDROData_Zone::Merge_UNKNOWN;
   }
@@ -538,15 +560,24 @@ double HYDROData_CalculationCase::GetAltitudeForPoint( const gp_XY& thePoint ) c
     return aResAltitude;
   }
 
+  HYDROData_IInterpolator* aZoneInterpolator = theZone->GetInterpolator();
   if ( aZoneMergeType == HYDROData_Zone::Merge_Object )
   {
-    Handle(HYDROData_Bathymetry) aMergeBathymetry = aZone->GetMergeBathymetry();
-    if ( !aMergeBathymetry.IsNull() )
-      aResAltitude = aMergeBathymetry->GetAltitudeForPoint( thePoint );
+    Handle(HYDROData_IAltitudeObject) aMergeAltitude = theZone->GetMergeAltitude();
+    if ( !aMergeAltitude.IsNull() )
+    {
+      if ( aZoneInterpolator != NULL )
+      {
+        aZoneInterpolator->SetAltitudeObject( aMergeAltitude );
+        aResAltitude = aZoneInterpolator->GetAltitudeForPoint( thePoint );
+      }
+      else
+        aResAltitude = aMergeAltitude->GetAltitudeForPoint( thePoint );
+    }
   }
   else
   {
-    HYDROData_SequenceOfObjects aZoneObjects = aZone->GetGeometryObjects();
+    HYDROData_SequenceOfObjects aZoneObjects = theZone->GetGeometryObjects();
     HYDROData_SequenceOfObjects::Iterator anIter( aZoneObjects );
     for ( ; anIter.More(); anIter.Next() )
     {
@@ -555,12 +586,20 @@ double HYDROData_CalculationCase::GetAltitudeForPoint( const gp_XY& thePoint ) c
       if ( aZoneObj.IsNull() )
         continue;
 
-      Handle(HYDROData_Bathymetry) anObjBathymetry = aZoneObj->GetBathymetry();
-      if ( anObjBathymetry.IsNull() )
+      Handle(HYDROData_IAltitudeObject) anObjAltitude = aZoneObj->GetAltitudeObject();
+      if ( anObjAltitude.IsNull() )
         continue;
 
-      double aPointAltitude = anObjBathymetry->GetAltitudeForPoint( thePoint );
-      if ( ValuesEquals( aPointAltitude, HYDROData_Bathymetry::GetInvalidAltitude() ) )
+      double aPointAltitude = 0.0;
+      if ( aZoneInterpolator != NULL )
+      {
+        aZoneInterpolator->SetAltitudeObject( anObjAltitude );
+        aPointAltitude = aZoneInterpolator->GetAltitudeForPoint( thePoint );
+      }
+      else
+        aPointAltitude = anObjAltitude->GetAltitudeForPoint( thePoint );
+
+      if ( ValuesEquals( aPointAltitude, HYDROData_IAltitudeObject::GetInvalidAltitude() ) )
         continue;
 
       if ( aZoneMergeType == HYDROData_Zone::Merge_UNKNOWN )
@@ -570,7 +609,7 @@ double HYDROData_CalculationCase::GetAltitudeForPoint( const gp_XY& thePoint ) c
       }
       else if ( aZoneMergeType == HYDROData_Zone::Merge_ZMIN )
       {
-        if ( ValuesEquals( aResAltitude, HYDROData_Bathymetry::GetInvalidAltitude() ) ||
+        if ( ValuesEquals( aResAltitude, HYDROData_IAltitudeObject::GetInvalidAltitude() ) ||
              aResAltitude > aPointAltitude )
         {
           aResAltitude = aPointAltitude;
@@ -578,7 +617,7 @@ double HYDROData_CalculationCase::GetAltitudeForPoint( const gp_XY& thePoint ) c
       }
       else if ( aZoneMergeType == HYDROData_Zone::Merge_ZMAX )
       {
-        if ( ValuesEquals( aResAltitude, HYDROData_Bathymetry::GetInvalidAltitude() ) ||
+        if ( ValuesEquals( aResAltitude, HYDROData_IAltitudeObject::GetInvalidAltitude() ) ||
              aResAltitude < aPointAltitude )
         {
           aResAltitude = aPointAltitude;
@@ -590,6 +629,51 @@ double HYDROData_CalculationCase::GetAltitudeForPoint( const gp_XY& thePoint ) c
   return aResAltitude;
 }
 
+NCollection_Sequence<double> HYDROData_CalculationCase::GetAltitudesForPoints( 
+  const NCollection_Sequence<gp_XY>& thePoints,
+  const Handle(HYDROData_Region)&    theRegion ) const
+{
+  NCollection_Sequence<double> aResSeq;
+
+  for ( int i = 1, n = thePoints.Length(); i <= n; ++i )
+  {
+    const gp_XY& thePnt = thePoints.Value( i );
+    
+    double anAltitude = GetAltitudeForPoint( thePnt, theRegion );
+    aResSeq.Append( anAltitude );
+  }
+
+  return aResSeq;
+}
+
+NCollection_Sequence<double> HYDROData_CalculationCase::GetAltitudesForPoints( 
+  const NCollection_Sequence<gp_XY>& thePoints,
+  const Handle(HYDROData_Zone)&      theZone ) const
+{
+  NCollection_Sequence<double> aResSeq;
+
+  for ( int i = 1, n = thePoints.Length(); i <= n; ++i )
+  {
+    const gp_XY& thePnt = thePoints.Value( i );
+    
+    double anAltitude = GetAltitudeForPoint( thePnt, theZone );
+    aResSeq.Append( anAltitude );
+  }
+
+  return aResSeq;
+}
+
+Handle(HYDROData_Region) HYDROData_CalculationCase::GetRegionFromPoint( const gp_XY& thePoint ) const
+{
+  Handle(HYDROData_Region) aResRegion;
+
+  Handle(HYDROData_Zone) aZone = GetZoneFromPoint( thePoint );
+  if ( !aZone.IsNull() )
+    aResRegion = Handle(HYDROData_Region)::DownCast( aZone->GetFatherObject() );
+
+  return aResRegion;
+}
+
 Handle(HYDROData_Zone) HYDROData_CalculationCase::GetZoneFromPoint( const gp_XY& thePoint ) const
 {
   Handle(HYDROData_Zone) aResZone;
@@ -621,6 +705,7 @@ Handle(HYDROData_Zone) HYDROData_CalculationCase::GetZoneFromPoint( const gp_XY&
 
   return aResZone;
 }
+
 HYDROData_CalculationCase::PointClassification HYDROData_CalculationCase::GetPointClassification(
   const gp_XY&                  thePoint,
   const Handle(HYDROData_Zone)& theZone ) const
@@ -632,18 +717,284 @@ HYDROData_CalculationCase::PointClassification HYDROData_CalculationCase::GetPoi
   TopoDS_Face aZoneFace = TopoDS::Face( theZone->GetShape() );
   if ( aZoneFace.IsNull() )
     return aRes;
-
-  // TODO: classify the point position relative to zone
-  // POINT_OUT - point is out of zone face
-  // POINT_IN  - point is inside of zone face
-  // POINT_ON  - point is on the edge of zone face
-  BRepTopAdaptor_FClass2d aClassifier( aZoneFace, Precision::Confusion() );
-  TopAbs_State State = aClassifier.Perform( gp_Pnt2d(thePoint), Standard_False );
+#ifdef DEB_CLASS2D      
+	  TopoDS_Compound aCmp;
+      BRep_Builder aBB;
+      aBB.MakeCompound(aCmp);
+	  aBB.Add(aCmp, aZoneFace);
+	  gp_Pnt aPnt (thePoint.X(), thePoint.Y(), 0.);
+	  BRepBuilderAPI_MakeVertex aMk(aPnt);
+	  aBB.Add(aCmp, aMk.Vertex());
+	  BRepTools::Write(aCmp, "FCL2d.brep");
+#endif  
+  TopAbs_State State = HYDROData_Tool::ComputePointState(thePoint, aZoneFace);
   if (State == TopAbs_OUT)
-	aRes =  POINT_OUT;
+    aRes =  POINT_OUT;
   else if(State == TopAbs_IN)
     aRes =  POINT_IN;
   else if(State == TopAbs_ON)
-    aRes =  POINT_ON;	  
+    aRes =  POINT_ON;
   return aRes;
 }
+
+Handle(HYDROData_Region) HYDROData_CalculationCase::addNewRegion()
+{
+  TDF_Label aNewLab = myLab.FindChild( DataTag_ChildRegion ).NewChild();
+
+  Handle(HYDROData_Region) aNewRegion =
+    Handle(HYDROData_Region)::DownCast( HYDROData_Iterator::CreateObject( aNewLab, KIND_REGION ) );
+  AddRegion( aNewRegion );
+
+  return aNewRegion;
+}
+
+Handle(HYDROData_SplittedShapesGroup) HYDROData_CalculationCase::addNewSplittedGroup()
+{
+  TDF_Label aNewLab = myLab.FindChild( DataTag_SplittedGroups ).NewChild();
+
+  Handle(HYDROData_SplittedShapesGroup) aNewGroup =
+    Handle(HYDROData_SplittedShapesGroup)::DownCast( 
+      HYDROData_Iterator::CreateObject( aNewLab, KIND_SPLITTED_GROUP ) );
+  AddReferenceObject( aNewGroup, DataTag_SplittedGroups );
+
+  return aNewGroup;
+}
+
+bool HYDROData_CalculationCase::Export( GEOM::GEOM_Gen_var  theGeomEngine,
+                                        SALOMEDS::Study_ptr theStudy ) const
+{
+  HYDROData_ShapesGroup::SeqOfGroupsDefs aSeqOfGroupsDefs;
+
+  // Get groups definitions
+  HYDROData_SequenceOfObjects aSplittedGroups = GetSplittedGroups();
+
+  HYDROData_SequenceOfObjects::Iterator anIter( aSplittedGroups );
+  for ( ; anIter.More(); anIter.Next() )
+  {
+    // Get shapes group
+    Handle(HYDROData_ShapesGroup) aGroup =
+      Handle(HYDROData_ShapesGroup)::DownCast( anIter.Value() );
+    if ( aGroup.IsNull() )
+      continue;
+
+    HYDROData_ShapesGroup::GroupDefinition aGroupDef;
+
+    aGroupDef.Name = aGroup->GetName().toLatin1().constData();
+    aGroup->GetShapes( aGroupDef.Shapes );
+
+    aSeqOfGroupsDefs.Append( aGroupDef );
+  }
+  
+  // Get faces
+  TopTools_ListOfShape aFaces;
+  HYDROData_SequenceOfObjects aCaseRegions = GetRegions();
+  HYDROData_SequenceOfObjects::Iterator aRegionIter( aCaseRegions );
+  for ( ; aRegionIter.More(); aRegionIter.Next() )
+  {
+    Handle(HYDROData_Region) aRegion =
+      Handle(HYDROData_Region)::DownCast( aRegionIter.Value() );
+    if( aRegion.IsNull() )
+      continue;
+
+    TopoDS_Shape aRegionShape = aRegion->GetShape( &aSeqOfGroupsDefs );
+    aFaces.Append( aRegionShape );
+  }
+
+  return Export( theGeomEngine, theStudy, aFaces, aSeqOfGroupsDefs );
+}
+
+bool HYDROData_CalculationCase::Export( GEOM::GEOM_Gen_var                            theGeomEngine,
+                                        SALOMEDS::Study_ptr                           theStudy,
+                                        const TopTools_ListOfShape&                   theFaces,
+                                        const HYDROData_ShapesGroup::SeqOfGroupsDefs& theGroupsDefs ) const
+{
+  // Sew faces
+  BRepBuilderAPI_Sewing aSewing( Precision::Confusion() * 10.0 );
+  aSewing.SetNonManifoldMode( Standard_False );
+#ifdef DEB_CALCULATION
+  TCollection_AsciiString aNam("Sh_");
+  int i=1;
+#endif
+  TopTools_ListIteratorOfListOfShape aFaceIter( theFaces );
+  for ( ; aFaceIter.More(); aFaceIter.Next() )
+  {
+    TopoDS_Shape aShape = aFaceIter.Value();
+    if ( aShape.IsNull() )
+      continue;
+
+    if ( aShape.ShapeType() == TopAbs_FACE )
+    {
+      aSewing.Add( aShape );
+#ifdef DEB_CALCULATION
+      TCollection_AsciiString aName = aNam + ++i + ".brep";
+      BRepTools::Write(aShape ,aName.ToCString());
+#endif
+    }
+    else
+    {
+#ifdef DEB_CALCULATION
+      int j = 1;
+#endif
+      TopExp_Explorer anExp( aShape, TopAbs_FACE );
+      for (; anExp.More(); anExp.Next() ) {
+        aSewing.Add( anExp.Current() );
+#ifdef DEB_CALCULATION
+
+        TCollection_AsciiString aName = aNam + i + "_" + ++j + ".brep";
+        BRepTools::Write(anExp.Current() ,aName.ToCString());
+#endif
+      }
+    }
+  } // faces iterator
+  
+  aSewing.Perform();
+  TopoDS_Shape aSewedShape = aSewing.SewedShape();
+
+  // If the sewed shape is empty - return false
+  if ( aSewedShape.IsNull() || !TopoDS_Iterator( aSewedShape ).More() )
+    return false;
+
+#ifdef DEB_CALCULATION
+  BRepTools::Write(aSewedShape ,"Sew.brep");
+#endif
+  // Publish the sewed shape
+  QString aName = EXPORT_NAME;
+  GEOM::GEOM_Object_ptr aMainShape = 
+    publishShapeInGEOM( theGeomEngine, theStudy, aSewedShape, aName );
+
+  if ( aMainShape->_is_nil() )  
+    return false;
+
+  if ( theGroupsDefs.IsEmpty() )
+    return true;
+
+  // Create groups
+  TopTools_IndexedMapOfShape aMapOfSubShapes;
+  TopExp::MapShapes( aSewedShape, aMapOfSubShapes );
+
+  NCollection_DataMap< TCollection_AsciiString, NCollection_Sequence<int> > aGroupsData;
+
+  for ( int aGrId = 1, nbGroups = theGroupsDefs.Length(); aGrId <= nbGroups; ++aGrId )
+  {
+    const HYDROData_ShapesGroup::GroupDefinition& aGroupDef = theGroupsDefs.Value( aGrId );
+
+    NCollection_Sequence<int> aGroupIndexes;
+    for( int i = 1, n = aGroupDef.Shapes.Length(); i <= n; i++ )
+    {
+      const TopoDS_Shape& aShape = aGroupDef.Shapes.Value( i );
+#ifdef DEB_CALCULATION
+      cout << "\nOld shape(" << i << ") = " << aShape.TShape() <<endl;
+#endif
+      
+      TopoDS_Shape aModifiedShape = aShape;
+      if ( aSewing.IsModified( aShape ) )
+        aModifiedShape = aSewing.Modified( aShape );
+      else if ( aSewing.IsModifiedSubShape( aShape ) )
+        aModifiedShape = aSewing.ModifiedSubShape( aShape );
+
+#ifdef DEB_CALCULATION
+      const TopLoc_Location& aL1 = aShape.Location();
+      const TopLoc_Location& aL2 = aModifiedShape.Location();
+      cout << "\nNew shape(" << i << ") = " << aModifiedShape.TShape() << " Location is Equal = " << aL1.IsEqual(aL2)<<endl;
+#endif
+
+      int anIndex = aMapOfSubShapes.FindIndex(aModifiedShape);
+      if ( anIndex > 0 ) {
+        aGroupIndexes.Append( anIndex );
+      } else {
+#ifdef DEB_CALCULATION    
+        TCollection_AsciiString aNam("Lost_");
+        if(!aMapOfSubShapes.Contains(aModifiedShape)) {
+        for ( int anIndex = 1; anIndex <= aMapOfSubShapes.Extent(); anIndex++ )
+        {
+           const TopoDS_Shape& aS = aMapOfSubShapes.FindKey( anIndex );
+           if ( aModifiedShape.IsPartner( aS ) )
+           {
+             cout <<"\nIndex in Map = " << anIndex << "TShape = " << aS.TShape() <<endl;
+             TCollection_AsciiString aName = aNam + i + "_" + anIndex + ".brep";
+             BRepTools::Write(aS ,aName.ToCString());
+            break;
+           }
+         }
+        }
+#endif
+      }
+    }
+    if ( !aGroupIndexes.IsEmpty() )
+      aGroupsData.Bind( aGroupDef.Name, aGroupIndexes );
+  }
+ 
+  if ( !aGroupsData.IsEmpty() )
+  {
+    GEOM::GEOM_IGroupOperations_var aGroupOp = 
+      theGeomEngine->GetIGroupOperations( theStudy->StudyId() );  
+
+    NCollection_DataMap< TCollection_AsciiString, NCollection_Sequence<int> >::Iterator aMapIt( aGroupsData );
+    for ( ; aMapIt.More(); aMapIt.Next() )
+    {
+      const TCollection_AsciiString& aGroupName = aMapIt.Key(); 
+      const NCollection_Sequence<int>& aGroupIndexes = aMapIt.Value();
+
+      GEOM::GEOM_Object_var aGeomGroup = aGroupOp->CreateGroup( aMainShape, TopAbs_EDGE );
+      if ( CORBA::is_nil( aGeomGroup ) || !aGroupOp->IsDone() )
+        continue;
+
+      GEOM::ListOfLong_var aGeomIndexes = new GEOM::ListOfLong;
+      aGeomIndexes->length( aGroupIndexes.Length() );
+
+      for( int i = 1, n = aGroupIndexes.Length(); i <= n; i++ )
+        aGeomIndexes[ i - 1 ] = aGroupIndexes.Value( i );
+
+      aGroupOp->UnionIDs( aGeomGroup, aGeomIndexes );
+      if ( aGroupOp->IsDone() )
+      {
+        SALOMEDS::SObject_var aGroupSO = 
+          theGeomEngine->AddInStudy( theStudy, aGeomGroup, aGroupName.ToCString(), aMainShape );
+      }
+    }
+  }
+
+  return true;
+}
+
+GEOM::GEOM_Object_ptr HYDROData_CalculationCase::publishShapeInGEOM( 
+  GEOM::GEOM_Gen_var theGeomEngine, SALOMEDS::Study_ptr theStudy,
+  const TopoDS_Shape& theShape, const QString& theName ) const
+{
+  GEOM::GEOM_Object_var aGeomObj;
+
+  if ( theGeomEngine->_is_nil() || theStudy->_is_nil() ||
+       theShape.IsNull() ) {
+    return aGeomObj._retn();
+  }
+
+  std::ostringstream aStreamShape;
+  // Write TopoDS_Shape in ASCII format to the stream
+  BRepTools::Write( theShape, aStreamShape );
+  // Returns the number of bytes that have been stored in the stream's buffer.
+  int aSize = aStreamShape.str().size();
+  // Allocate octect buffer of required size
+  CORBA::Octet* anOctetBuf = SALOMEDS::TMPFile::allocbuf( aSize );
+  // Copy ostrstream content to the octect buffer
+  memcpy( anOctetBuf, aStreamShape.str().c_str(), aSize );
+  // Create TMPFile
+  SALOMEDS::TMPFile_var aSeqFile = new SALOMEDS::TMPFile( aSize, aSize, anOctetBuf, 1 );
+
+  // Restore shape from the stream and get the GEOM object
+  GEOM::GEOM_IInsertOperations_var anInsOp = theGeomEngine->GetIInsertOperations( theStudy->StudyId() );
+  aGeomObj = anInsOp->RestoreShape( aSeqFile );
+  
+  // Puplish the GEOM object
+  if ( !aGeomObj->_is_nil() ) {
+    QString aName = GEOMBase::GetDefaultName( theName );
+
+    SALOMEDS::SObject_var aResultSO = 
+      theGeomEngine->PublishInStudy( theStudy, SALOMEDS::SObject::_nil(), 
+                                     aGeomObj, qPrintable( aName ) );
+    if ( aResultSO->_is_nil() ) {
+      aGeomObj = GEOM::GEOM_Object::_nil();
+    }
+  }
+
+  return aGeomObj._retn();
+ }