Salome HOME
clear data when new study from button new
[modules/hydro.git] / src / HYDROGUI / HYDROGUI_DataModel.cxx
index 37e4ec0b61e2dc7a6265f4d1e9de13843e58ad85..8f3178629fb188c5ff9719fa74500636f5272b0f 100644 (file)
@@ -1,8 +1,4 @@
-// Copyright (C) 2007-2015  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
+// Copyright (C) 2014-2015  EDF-R&D
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
@@ -25,6 +21,7 @@
 #include "HYDROGUI_DataObject.h"
 #include "HYDROGUI_Module.h"
 #include "HYDROGUI_Tool.h"
+#include "HYDROGUI_Tool2.h"
 #include "HYDROGUI_Zone.h"
 #include "HYDROGUI_Region.h"
 
@@ -47,6 +44,9 @@
 #include <HYDROData_Digue.h>
 #include <HYDROData_River.h>
 #include <HYDROData_Stream.h>
+#include <HYDROData_StricklerTable.h>
+#include <HYDROData_LandCoverMap.h>
+#include <HYDROData_BCPolygon.h>
 
 #include <CAM_Module.h>
 #include <CAM_Study.h>
@@ -60,6 +60,7 @@
 #include <SUIT_Study.h>
 #include <SUIT_Tools.h>
 #include <SUIT_TreeSync.h>
+#include <SUIT_DataObjectIterator.h>
 
 #include <HYDROData_Document.h>
 
 #include <HYDROData_ShapesGroup.h>
 #endif
 
+//#define _DEVDEBUG_
+#include "HYDRO_trace.hxx"
+
 static HYDROData_SequenceOfObjects myCopyingObjects;
 
 const int ENTRY_COLUMN = 2;
 
 
 HYDROGUI_DataModel::HYDROGUI_DataModel( CAM_Module* theModule )
-: LightApp_DataModel( theModule )
+: LightApp_DataModel( theModule ), myIsAboutToClose(false)
 {
+  DEBTRACE("HYDROGUI_DataModel");
   update( module()->application()->activeStudy()->id() );
 }
 
 HYDROGUI_DataModel::~HYDROGUI_DataModel()
 {
+  DEBTRACE("~HYDROGUI_DataModel");
+}
+
+bool HYDROGUI_DataModel::create( CAM_Study* theStudy )
+{
+  DEBTRACE("create");
+    bool status = LightApp_DataModel::create( theStudy );
+    if ( status )
+        updateDocument();
+    return status;
 }
 
 bool HYDROGUI_DataModel::open( const QString& theURL,
                                CAM_Study* theStudy,
                                QStringList theFileList )
 {
+  DEBTRACE("open");
   LightApp_DataModel::open( theURL, theStudy, theFileList );
   const int aStudyId = theStudy->id();
 
@@ -109,19 +125,20 @@ bool HYDROGUI_DataModel::open( const QString& theURL,
 
     try
     {
-      res = HYDROData_Document::Load( (char*)aDataFullPath.toLatin1().constData(), aStudyId );
+      res = HYDROData_Document::Load( (char*)aDataFullPath.toLatin1().constData() );
     }
     catch(...)
     {
       res = DocError_UnknownProblem;
     }
-    if( res != DocError_OK )
+    
+    if ( res != DocError_OK )
     {
       module()->application()->putInfo( tr( "LOAD_ERROR" ) );
       return false;
     }
 
-    if( !aStatesFullPath.isEmpty() )
+    if ( !aStatesFullPath.isEmpty() )
     {
       QFile aFile( aStatesFullPath );
       if( aFile.open( QFile::ReadOnly ) )
@@ -130,11 +147,13 @@ bool HYDROGUI_DataModel::open( const QString& theURL,
         aFile.close();
       }
     }
+
+    updateDocument();
   }
 
   // if the document open was successful, the data model update happens
   // in the set mode of the module
-  if( res == DocError_OK )
+  if ( res == DocError_OK )
     update( aStudyId );
 
   return true;
@@ -142,6 +161,7 @@ bool HYDROGUI_DataModel::open( const QString& theURL,
 
 bool HYDROGUI_DataModel::save( QStringList& theFileList )
 {
+  DEBTRACE("save");
   if( !module()->application()->activeStudy() )
     return false;
   
@@ -150,7 +170,7 @@ bool HYDROGUI_DataModel::save( QStringList& theFileList )
   QString aTmpDir;
   SUIT_ResourceMgr* resMgr = module()->application()->resourceMgr();
   bool isMultiFile = false;
-  if( resMgr )
+  if ( resMgr )
     isMultiFile = resMgr->booleanValue( "Study", "multi_file", false );
 
   // save module data to temporary files
@@ -191,26 +211,39 @@ bool HYDROGUI_DataModel::saveAs( const QString& theURL,
                                  CAM_Study*,
                                  QStringList& theFileList )
 {
+  DEBTRACE("saveAs");
   myStudyURL = theURL;
   return save( theFileList );
 }
 
 bool HYDROGUI_DataModel::close()
 {
+  DEBTRACE("close");
+  myIsAboutToClose = true;
+  HYDROGUI_Module* aModule = dynamic_cast<HYDROGUI_Module*>( module() );
+  if ( aModule )
+      aModule->clearCache();
   return true;
 }
 
+bool HYDROGUI_DataModel::isAboutToClose()
+{
+  DEBTRACE("isAboutToClose " << myIsAboutToClose);
+  return myIsAboutToClose;
+}
+
 bool HYDROGUI_DataModel::dumpPython( const QString& theURL,
                                      CAM_Study*     theStudy,
                                      bool           isMultiFile,
                                      QStringList&   theListOfFiles )
 {
+  DEBTRACE("dumpPython");
   LightApp_DataModel::dumpPython( theURL, theStudy, isMultiFile, theListOfFiles );
 
   int aStudyId = theStudy->id();
 
   LightApp_Study* aStudy = ::qobject_cast<LightApp_Study*>( theStudy );
-  Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( aStudyId );
+  Handle(HYDROData_Document) aDocument = HYDROData_Document::Document();
   if ( aDocument.IsNull() || !aStudy )
     return false;
 
@@ -239,6 +272,7 @@ bool HYDROGUI_DataModel::isSaved() const
 
 void HYDROGUI_DataModel::update( const int theStudyId )
 {
+  DEBTRACE("update");
   LightApp_Application* anApp = dynamic_cast<LightApp_Application*>( module()->application() );
   if( !anApp )
     return;
@@ -250,45 +284,64 @@ void HYDROGUI_DataModel::update( const int theStudyId )
   // create a new root object
   CAM_DataObject* aNewRootObj = new CAM_DataObject();
 
-  Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( theStudyId );
+  Handle(HYDROData_Document) aDocument = HYDROData_Document::Document();
   if( aDocument.IsNull() )
     return;
 
   // Create root objects:
 
   // IMAGES
-  LightApp_DataObject* anImageRootObj = createObject( aNewRootObj, tr( partitionName( KIND_IMAGE ).toAscii() ) );
+  LightApp_DataObject* anImageRootObj = createObject( aNewRootObj, tr( partitionName( KIND_IMAGE ).toLatin1() ) );
 
   // BATHYMETRY
-  LightApp_DataObject* aBathymetryRootObj = createObject( aNewRootObj, tr( partitionName( KIND_BATHYMETRY ).toAscii() ) );
+  LightApp_DataObject* aBathymetryRootObj = createObject( aNewRootObj, tr( partitionName( KIND_BATHYMETRY ).toLatin1() ) );
 
-  // ARTIFICIAL OBJECTS
-  LightApp_DataObject* anArtificialObjectsRootObj = createObject( aNewRootObj, tr( partitionName( KIND_ARTIFICIAL_OBJECT ).toAscii() ) );
+  // POLYLINES
+  LightApp_DataObject* aPolylineRootObj = createObject( aNewRootObj, tr( partitionName( KIND_POLYLINEXY ).toLatin1() ) );
+
+  // PROFILES
+  LightApp_DataObject* aProfileRootObj = createObject( aNewRootObj, tr( partitionName( KIND_PROFILE ).toLatin1() ) );
+
+  // POLYLINES 3D
+  LightApp_DataObject* aPolyline3DRootObj = createObject( aNewRootObj, tr( partitionName( KIND_POLYLINE ).toLatin1() ) );
 
   // NATURAL OBJECTS
-  LightApp_DataObject* aNaturalObjectsRootObj = createObject( aNewRootObj, tr( partitionName( KIND_NATURAL_OBJECT ).toAscii() ) );
+  LightApp_DataObject* aNaturalObjectsRootObj = createObject( aNewRootObj, tr( partitionName( KIND_NATURAL_OBJECT ).toLatin1() ) );
+
+  // ARTIFICIAL OBJECTS
+  LightApp_DataObject* anArtificialObjectsRootObj = createObject( aNewRootObj, tr( partitionName( KIND_ARTIFICIAL_OBJECT ).toLatin1() ) );
 
   // OBSTACLES
-  LightApp_DataObject* anObstaclesRootObj = createObject( aNewRootObj, tr( partitionName( KIND_OBSTACLE ).toAscii() ) );
+  LightApp_DataObject* anObstaclesRootObj = createObject( aNewRootObj, tr( partitionName( KIND_OBSTACLE ).toLatin1() ) );
 
-  // CALCULATION CASES
-  LightApp_DataObject* aCalculRootObj = createObject( aNewRootObj, tr( partitionName( KIND_CALCULATION ).toAscii() ) );
+  //BC Polygons
+  LightApp_DataObject* aBCPolygonRootObj = createObject( aNewRootObj, tr( partitionName( KIND_BC_POLYGON ).toLatin1() ) );
 
-  // POLYLINES
-  LightApp_DataObject* aPolylineRootObj = createObject( aNewRootObj, tr( partitionName( KIND_POLYLINEXY ).toAscii() ) );
+  // STRICKLER TABLES
+  LightApp_DataObject* aStricklerTablesRootObj = createObject( aNewRootObj, tr( partitionName( KIND_STRICKLER_TABLE ).toLatin1() ) );
 
-  // POLYLINES
-  LightApp_DataObject* aPolyline3DRootObj = createObject( aNewRootObj, tr( partitionName( KIND_POLYLINE ).toAscii() ) );
+  // LAND COVER MAPS
+  LightApp_DataObject* aLandCoversRootObj = createObject( aNewRootObj, tr( partitionName( KIND_LAND_COVER_MAP ).toLatin1() ) );
 
-  // PROFILES
-  LightApp_DataObject* aProfileRootObj = createObject( aNewRootObj, tr( partitionName( KIND_PROFILE ).toAscii() ) );
+  // CALCULATION CASES
+  LightApp_DataObject* aCalculRootObj = createObject( aNewRootObj, tr( partitionName( KIND_CALCULATION ).toLatin1() ) );
 
   // VISUAL STATES
-  LightApp_DataObject* aVisualStateRootObj = createObject( aNewRootObj, tr( partitionName( KIND_VISUAL_STATE ).toAscii() ) );
+  LightApp_DataObject* aVisualStateRootObj = createObject( aNewRootObj, tr( partitionName( KIND_VISUAL_STATE ).toLatin1() ) );
+
+
+  int aNoStricklerTableObj = 0;
 
   HYDROData_Iterator anIterator( aDocument, KIND_UNKNOWN );
-  for( ; anIterator.More(); anIterator.Next() ) {
-    Handle(HYDROData_Entity) anObj = anIterator.Current();
+  std::vector<Handle(HYDROData_Entity)> ents;
+
+  for( ; anIterator.More(); anIterator.Next() )
+    ents.push_back(anIterator.Current());
+
+  for (int i = 0; i< ents.size();i++)
+  {
+    LightApp_DataObject* obj = 0;
+    Handle(HYDROData_Entity) anObj = ents[i];
 
     if ( !anObj.IsNull() )
     {
@@ -298,7 +351,7 @@ void HYDROGUI_DataModel::update( const int theStudyId )
           Handle(HYDROData_Image) anImageObj =
             Handle(HYDROData_Image)::DownCast( anObj );
           if( !anImageObj.IsNull() ) {
-            createObject( anImageRootObj, anImageObj );
+            obj = createObject( anImageRootObj, anImageObj );
           }
 
           break;
@@ -308,7 +361,7 @@ void HYDROGUI_DataModel::update( const int theStudyId )
           Handle(HYDROData_Bathymetry) aBathymetryObj =
             Handle(HYDROData_Bathymetry)::DownCast( anObj );
           if( !aBathymetryObj.IsNull() ) {
-            createObject( aBathymetryRootObj, aBathymetryObj );
+            obj = createObject( aBathymetryRootObj, aBathymetryObj );
           }
 
           break;
@@ -318,7 +371,7 @@ void HYDROGUI_DataModel::update( const int theStudyId )
           Handle(HYDROData_Channel) aChannelObj =
             Handle(HYDROData_Channel)::DownCast( anObj );
           if( !aChannelObj.IsNull() ) {
-            createObject( anArtificialObjectsRootObj, aChannelObj );
+            obj = createObject( anArtificialObjectsRootObj, aChannelObj );
           }
 
           break;
@@ -328,7 +381,7 @@ void HYDROGUI_DataModel::update( const int theStudyId )
           Handle(HYDROData_Digue) aDigueObj =
             Handle(HYDROData_Digue)::DownCast( anObj );
           if( !aDigueObj.IsNull() ) {
-            createObject( anArtificialObjectsRootObj, aDigueObj );
+            obj = createObject( anArtificialObjectsRootObj, aDigueObj );
           }
 
           break;
@@ -338,7 +391,7 @@ void HYDROGUI_DataModel::update( const int theStudyId )
           Handle(HYDROData_ImmersibleZone) anImmersibleZoneObj =
             Handle(HYDROData_ImmersibleZone)::DownCast( anObj );
           if( !anImmersibleZoneObj.IsNull() ) {
-            createObject( aNaturalObjectsRootObj, anImmersibleZoneObj );
+            obj = createObject( aNaturalObjectsRootObj, anImmersibleZoneObj );
           }
 
           break;
@@ -348,7 +401,7 @@ void HYDROGUI_DataModel::update( const int theStudyId )
           Handle(HYDROData_River) aRiverObj =
             Handle(HYDROData_River)::DownCast( anObj );
           if( !aRiverObj.IsNull() ) {
-            createObject( aNaturalObjectsRootObj, aRiverObj );
+            obj = createObject( aNaturalObjectsRootObj, aRiverObj );
           }
 
           break;
@@ -358,7 +411,7 @@ void HYDROGUI_DataModel::update( const int theStudyId )
           Handle(HYDROData_Stream) aStreamObj =
             Handle(HYDROData_Stream)::DownCast( anObj );
           if( !aStreamObj.IsNull() ) {
-            createObject( aNaturalObjectsRootObj, aStreamObj );
+            obj = createObject( aNaturalObjectsRootObj, aStreamObj );
           }
 
           break;
@@ -368,7 +421,28 @@ void HYDROGUI_DataModel::update( const int theStudyId )
           Handle(HYDROData_Obstacle) anObstacleObj =
             Handle(HYDROData_Obstacle)::DownCast( anObj );
           if( !anObstacleObj.IsNull() ) {
-            createObject( anObstaclesRootObj, anObstacleObj );
+            obj = createObject( anObstaclesRootObj, anObstacleObj );
+          }
+
+          break;
+        }
+               case KIND_STRICKLER_TABLE:
+        {
+          Handle(HYDROData_StricklerTable) aStricklerTableObj =
+            Handle(HYDROData_StricklerTable)::DownCast( anObj );
+          if( !aStricklerTableObj.IsNull() ) {
+            obj = createObject( aStricklerTablesRootObj, aStricklerTableObj );
+          }
+                 aNoStricklerTableObj++;
+
+          break;
+        }
+        case KIND_LAND_COVER_MAP:
+        {
+          Handle(HYDROData_LandCoverMap) aLandCoverMapObj =
+            Handle(HYDROData_LandCoverMap)::DownCast( anObj );
+          if( !aLandCoverMapObj.IsNull() ) {
+            obj = createObject( aLandCoversRootObj, aLandCoverMapObj );
           }
 
           break;
@@ -378,7 +452,7 @@ void HYDROGUI_DataModel::update( const int theStudyId )
           Handle(HYDROData_CalculationCase) aCalculObj =
             Handle(HYDROData_CalculationCase)::DownCast( anObj );
           if( !aCalculObj.IsNull() ) {
-            createObject( aCalculRootObj, aCalculObj );
+            obj = createObject( aCalculRootObj, aCalculObj );
           }
 
           break;
@@ -388,7 +462,7 @@ void HYDROGUI_DataModel::update( const int theStudyId )
           Handle(HYDROData_PolylineXY) aPolylineObj =
             Handle(HYDROData_PolylineXY)::DownCast( anObj );
           if( !aPolylineObj.IsNull() ) {
-            createObject( aPolylineRootObj, aPolylineObj );
+            obj = createObject( aPolylineRootObj, aPolylineObj );
           }
 
           break;
@@ -398,7 +472,7 @@ void HYDROGUI_DataModel::update( const int theStudyId )
           Handle(HYDROData_Polyline3D) aPolylineObj =
             Handle(HYDROData_Polyline3D)::DownCast( anObj );
           if( !aPolylineObj.IsNull() ) {
-            createObject( aPolyline3DRootObj, aPolylineObj );
+            obj = createObject( aPolyline3DRootObj, aPolylineObj );
           }
 
           break;
@@ -408,7 +482,7 @@ void HYDROGUI_DataModel::update( const int theStudyId )
           Handle(HYDROData_Profile) aProfileObj =
             Handle(HYDROData_Profile)::DownCast( anObj );
           if( !aProfileObj.IsNull() ) {
-            createObject( aProfileRootObj, aProfileObj );
+            obj = createObject( aProfileRootObj, aProfileObj );
           }
 
           break;
@@ -418,7 +492,17 @@ void HYDROGUI_DataModel::update( const int theStudyId )
           Handle(HYDROData_VisualState) aVisualStateObj =
             Handle(HYDROData_VisualState)::DownCast( anObj );
           if( !aVisualStateObj.IsNull() ) {
-            createObject( aVisualStateRootObj, aVisualStateObj );
+            obj = createObject( aVisualStateRootObj, aVisualStateObj );
+          }
+
+          break;
+        }
+        case KIND_BC_POLYGON:
+        {
+          Handle(HYDROData_BCPolygon) aBCPolygonObj =
+            Handle(HYDROData_BCPolygon)::DownCast( anObj );
+          if( !aBCPolygonObj.IsNull() ) {
+            obj = createObject( aBCPolygonRootObj, aBCPolygonObj );
           }
 
           break;
@@ -427,26 +511,102 @@ void HYDROGUI_DataModel::update( const int theStudyId )
     }
   }
 
+  // Create default Strickler table object
+  if ( aNoStricklerTableObj == 0 )
+    createDefaultStricklerTable( aDocument, aStricklerTablesRootObj );
+
   //if( SUIT_DataBrowser* anObjectBrowser = anApp->objectBrowser() )
   //{
   //  anObjectBrowser->setAutoOpenLevel( 3 );
   //  anObjectBrowser->openLevels();
   //}
 
-  HYDROGUI_DataModelSync aSync( aNewRootObj );
   SUIT_DataObject* aRoot = root();
+
+  if (aRoot)
+  {
+    std::map<std::string, SUIT_DataObject*> entry2ObjNewRoot;
+    SUIT_DataObjectIterator::DetourType dt = SUIT_DataObjectIterator::DepthLeft;
+    for ( SUIT_DataObjectIterator it( aNewRootObj, dt ); it.current(); ++it )
+    {
+      LightApp_DataObject* aCurObjN = dynamic_cast<LightApp_DataObject*>(it.current());
+      if (aCurObjN)
+        entry2ObjNewRoot[aCurObjN->entry().toStdString()] = it.current();
+    }
+
+    for ( SUIT_DataObjectIterator it( aRoot, dt ); it.current(); ++it )
+    {
+      LightApp_DataObject* aCurObjO = dynamic_cast<LightApp_DataObject*>(it.current());
+      if (aCurObjO && aCurObjO->childCount() > 0)
+      {
+        std::string entry = aCurObjO->entry().toStdString();
+        SUIT_DataObject* newNode = entry2ObjNewRoot[entry];
+        if (newNode && aCurObjO->childCount() > 0)
+        {
+          DataObjectList newchildren;
+          newNode->children(newchildren);
+          //new root - remove children 
+          std::map<std::string, SUIT_DataObject*> newNode2Entries;
+          for ( DataObjectList::const_iterator it = newchildren.begin(); it != newchildren.end(); ++it )
+          {
+            SUIT_DataObject* cc = *it;
+            LightApp_DataObject* obj = dynamic_cast<LightApp_DataObject*>(cc);
+            newNode2Entries[obj->entry().toStdString()] = cc;
+            newNode->removeChild(cc);
+          }
+          //
+          std::set<SUIT_DataObject*> objtemp;
+
+          DataObjectList oldchildren;
+          aCurObjO->children(oldchildren);  
+          for ( DataObjectList::const_iterator it = oldchildren.begin(); it != oldchildren.end(); ++it )
+          {
+            SUIT_DataObject* old_ch = *it;
+            std::string entr = dynamic_cast<LightApp_DataObject*>(old_ch)->entry().toStdString();
+            if (newNode2Entries.count(entr) > 0)
+            {
+              SUIT_DataObject* obj = newNode2Entries[entr]; 
+              newNode->appendChild(obj);
+              objtemp.insert(obj);
+            }
+          }
+          //
+          for ( DataObjectList::const_iterator it = newchildren.begin(); it != newchildren.end(); ++it )
+          {
+            SUIT_DataObject* ch = *it;
+            if (objtemp.count(ch) == 0)
+              newNode->appendChild(ch);
+          }
+          { //IF DEBUG
+            //add. check
+            DataObjectList newchildren2;
+            newNode->children(newchildren2);
+            std::set<std::string> entries2, entries1;
+            for ( DataObjectList::const_iterator it = newchildren2.begin(); it != newchildren2.end(); ++it )
+              entries2.insert((dynamic_cast<LightApp_DataObject*>(*it))->entry().toStdString());
+            for ( DataObjectList::const_iterator it = newchildren.begin(); it != newchildren.end(); ++it )
+              entries1.insert((dynamic_cast<LightApp_DataObject*>(*it))->entry().toStdString());
+            assert(entries1 == entries2);
+          }
+        }
+      }
+    }
+  }
+
+  HYDROGUI_DataModelSync aSync( aNewRootObj );
   bool isNewDoc = aRoot==0;
   if( isNewDoc )
     aRoot = createRootModuleObject( aStudyRoot );
   ::synchronize < suitPtr, suitPtr, HYDROGUI_DataModelSync >
     ( aNewRootObj, aRoot, aSync );
 
+  SUIT_DataBrowser* ob = anApp->objectBrowser();
 
-  if( !myStates.isEmpty() )
+  if ( !myStates.isEmpty() )
   {
-    LightApp_Application* anApp = dynamic_cast<LightApp_Application*>( module()->application() );
-    anApp->objectBrowser()->updateTree();
-    anApp->objectBrowser()->setOpenStates( myStates, ENTRY_COLUMN );
+    ob->updateTree();
+    ob->setAutoOpenLevel( 1 );
+    //ob->setOpenStates( myStates, ENTRY_COLUMN );
     myStates.clear();
   }
 }
@@ -488,6 +648,7 @@ CAM_DataObject* HYDROGUI_DataModel::createRootModuleObject( SUIT_DataObject* the
 
 void HYDROGUI_DataModel::updateModel()
 {
+  DEBTRACE("updateModel");
   HYDROGUI_Module* aModule = dynamic_cast<HYDROGUI_Module*>( module() );
   if( aModule )
     update( aModule->getStudyId() );
@@ -593,7 +754,7 @@ bool HYDROGUI_DataModel::canCopy()
       bool isChildObject = aKind == KIND_DUMMY_3D || 
                            aKind == KIND_ZONE ||
                            aKind == KIND_SHAPES_GROUP || 
-                           aKind == KIND_SPLITTED_GROUP;
+                           aKind == KIND_SPLIT_GROUP;
       if ( isUnrecognized || isChildObject ) {
         isCanCopy = false;
         break;
@@ -634,29 +795,11 @@ bool HYDROGUI_DataModel::paste()
       Handle(HYDROData_Entity) aClone = getDocument()->CreateObject( aKind );
       if( !aClone.IsNull() )
       {
-        anObject->CopyTo( aClone );
+        anObject->CopyTo( aClone, true );
         anIsChanged = true;
 
         // remove Z layer
         aClone->RemoveZLevel();
-        
-        // generate a new unique name for the clone object:
-        // case 1: Image_1 -> Image_2
-        // case 2: ImageObj -> ImageObj_1
-        QString aName = aClone->GetName();
-        QString aPrefix = aName;
-        if( aName.contains( '_' ) ) // case 1
-        {
-          QString aSuffix = aName.section( '_', -1 );
-          bool anIsInteger = false;
-          aSuffix.toInt( &anIsInteger );
-          if( anIsInteger )
-            aPrefix = aName.section( '_', 0, -2 );
-        }
-        else // case 2
-          aPrefix = aName;
-        aName = HYDROGUI_Tool::GenerateObjectName( (HYDROGUI_Module*)module(), aPrefix );
-        aClone->SetName( aName );
       }
     }
   }
@@ -682,6 +825,10 @@ QString HYDROGUI_DataModel::partitionName( const ObjectKind theObjectKind )
     case KIND_OBSTACLE:          return "OBSTACLES";
     case KIND_ARTIFICIAL_OBJECT: return "ARTIFICIAL_OBJECTS";
     case KIND_NATURAL_OBJECT:    return "NATURAL_OBJECTS";
+    case KIND_STRICKLER_TABLE:   return "STRICKLER_TABLES";
+    case KIND_LAND_COVER_MAP:    return "LAND_COVER_MAPS";
+    case KIND_REGION:            return "REGIONS";
+    case KIND_BC_POLYGON:        return "BOUNDARY_POLYGONS";
     default: break;
   }
   return QString();
@@ -690,7 +837,7 @@ QString HYDROGUI_DataModel::partitionName( const ObjectKind theObjectKind )
 Handle(HYDROData_Document) HYDROGUI_DataModel::getDocument() const
 {
   int aStudyId = module()->application()->activeStudy()->id();
-  return HYDROData_Document::Document( aStudyId );
+  return HYDROData_Document::Document();
 }
 
 LightApp_DataObject* HYDROGUI_DataModel::createObject( SUIT_DataObject*         theParent,
@@ -699,7 +846,31 @@ LightApp_DataObject* HYDROGUI_DataModel::createObject( SUIT_DataObject*
                                                        const bool               theIsBuildTree )
 {
   HYDROGUI_DataObject* aResObj = new HYDROGUI_DataObject( theParent, theModelObject, theParentEntry );
-  
+
+  const ObjectKind aKind = theModelObject->GetKind();
+  bool visibility = aKind == KIND_IMAGE || aKind == KIND_POLYLINEXY || aKind == KIND_POLYLINE ||
+                    aKind == KIND_SHAPES_GROUP || aKind == KIND_SPLIT_GROUP || aKind == KIND_ZONE ||
+                    aKind == KIND_IMMERSIBLE_ZONE || aKind == KIND_REGION || aKind == KIND_BATHYMETRY ||
+                    aKind == KIND_OBSTACLE || aKind == KIND_STREAM || aKind == KIND_CHANNEL ||
+                    aKind == KIND_DIGUE || aKind == KIND_DUMMY_3D || aKind == KIND_LAND_COVER_MAP ||
+                    aKind == KIND_BC_POLYGON;
+  if ( !visibility )
+  {
+    Handle(HYDROData_Profile) aProfObj = Handle(HYDROData_Profile)::DownCast( theModelObject );
+    visibility = !aProfObj.IsNull() && aProfObj->IsValid();
+  }
+
+  if ( aKind == KIND_REGION )
+  {
+      QString an = aResObj->name();
+      int a = 0;
+  }
+
+  if ( visibility )
+  {
+    setObjectVisibilityState( theModelObject, aResObj );
+  }
+
   if ( theIsBuildTree )
   {
     buildObjectTree( theParent, aResObj, theParentEntry );
@@ -727,8 +898,12 @@ LightApp_DataObject* HYDROGUI_DataModel::createZone( SUIT_DataObject*       theP
                                                      const bool             theIsBuildTree,
                                                      const bool             theIsInOperation )
 {
-  return buildObject( theParent, new HYDROGUI_Zone( theParent, theModelObject, theParentEntry, theIsInOperation ), 
-    theParentEntry, theIsBuildTree, theIsInOperation );
+  HYDROGUI_Zone* aZone = new HYDROGUI_Zone( theParent, theModelObject, theParentEntry, theIsInOperation );
+  LightApp_DataObject* aDataObj = buildObject( theParent, aZone, theParentEntry, theIsBuildTree, theIsInOperation );
+
+  setObjectVisibilityState( theModelObject, aZone );
+
+  return aDataObj;
 }
 
 LightApp_DataObject* HYDROGUI_DataModel::createRegion( SUIT_DataObject*         theParent,
@@ -741,6 +916,34 @@ LightApp_DataObject* HYDROGUI_DataModel::createRegion( SUIT_DataObject*
     theParentEntry, theIsBuildTree, theIsInOperation );
 }
 
+void HYDROGUI_DataModel::createDefaultStricklerTable( const Handle(HYDROData_Document)& theDocument,
+                                                      LightApp_DataObject*              theParent )
+{
+  // Create default Strickler table object
+  Handle(HYDROData_StricklerTable) aStricklerTableObj =
+    Handle(HYDROData_StricklerTable)::DownCast( theDocument->CreateObject(KIND_STRICKLER_TABLE) );     
+  if ( !aStricklerTableObj.IsNull() )
+  {
+    SUIT_ResourceMgr* resMgr = module()->application()->resourceMgr();
+    QString defTablePath = resMgr->path( "resources", module()->name(), tr( "DEFAULT_STRICKLER_TABLE_FILE" ) );
+    aStricklerTableObj->Import( defTablePath );
+       // Set name
+    QString aStricklerTableName;
+    if ( aStricklerTableObj->GetName().isEmpty() )
+    {
+      HYDROGUI_Module* aModule = dynamic_cast<HYDROGUI_Module*>( module() );
+      if ( aModule )
+        aStricklerTableName = HYDROGUI_Tool::GenerateObjectName( aModule, tr( "DEFAULT_STRICKLER_TABLE_NAME" ) );
+    }
+    if ( aStricklerTableObj->GetName() != aStricklerTableName )
+      aStricklerTableObj->SetName( aStricklerTableName );
+
+    aStricklerTableObj->Update();
+
+    LightApp_DataObject* obj = createObject( theParent, aStricklerTableObj );
+  }
+}
+
 LightApp_DataObject* HYDROGUI_DataModel::createObject( SUIT_DataObject* theParent,
                                                        const QString&   theName,
                                                        const QString&   theParentEntry )
@@ -879,10 +1082,10 @@ void HYDROGUI_DataModel::buildObjectTree( SUIT_DataObject* theParent,
       createObject( aPolylineSect, aPolyline, aGuiObj->entry(), false );
 
     LightApp_DataObject* aCaseAOSect = 
-      createObject( aGuiObj, tr( partitionName( KIND_ARTIFICIAL_OBJECT ).toAscii() ),
+      createObject( aGuiObj, tr( partitionName( KIND_ARTIFICIAL_OBJECT ).toLatin1() ),
                     aGuiObj->entry() );
     LightApp_DataObject* aCaseNOSect = 
-      createObject( aGuiObj, tr( partitionName( KIND_NATURAL_OBJECT ).toAscii() ),
+      createObject( aGuiObj, tr( partitionName( KIND_NATURAL_OBJECT ).toLatin1() ),
                     aGuiObj->entry() );
 
     HYDROData_SequenceOfObjects aSeq = aCaseObj->GetGeometryObjects();
@@ -903,8 +1106,22 @@ void HYDROGUI_DataModel::buildObjectTree( SUIT_DataObject* theParent,
         aNObject = Handle(HYDROData_NaturalObject)::DownCast( anEntity );
         if ( !aNObject.IsNull() )
           createObject( aCaseNOSect, aNObject, aGuiObj->entry(), false );
-      }
+      }    
     }
+
+    LightApp_DataObject* aBoundaryPolygonSect = 
+      createObject( aGuiObj, tr( "CASE_BOUNDARY_POLYGONS" ), aGuiObj->entry() );
+    HYDROData_SequenceOfObjects aBCPolygons = aCaseObj->GetBoundaryPolygons();
+    for (int i = 1; i <= aBCPolygons.Size(); i++ )
+      createObject( aBoundaryPolygonSect, aBCPolygons(i), aGuiObj->entry(), false );
+
+    LightApp_DataObject* aLandCoverMapSect = 
+      createObject( aGuiObj, tr( "CASE_LAND_COVER_MAP" ), aGuiObj->entry() );
+
+    Handle(HYDROData_LandCoverMap) aLandCoverMap = aCaseObj->GetLandCoverMap();
+    if ( !aLandCoverMap.IsNull() && !aLandCoverMap->IsRemoved() )
+      createObject( aLandCoverMapSect, aLandCoverMap, aGuiObj->entry(), false );
+
     LightApp_DataObject* aCaseRegionsSect = 
       createObject( aGuiObj, tr( "CASE_REGIONS" ), aGuiObj->entry() );
 
@@ -917,13 +1134,13 @@ void HYDROGUI_DataModel::buildObjectTree( SUIT_DataObject* theParent,
       if( !aCaseRegion.IsNull() && !aCaseRegion->IsRemoved() )
         createRegion( aCaseRegionsSect, aCaseRegion, "", true, theIsInOperation );
     }
-
+   
 #ifdef DEB_GROUPS
     HYDROData_SequenceOfObjects aCalcGroups = aCaseObj->GetGeometryGroups();
     buildObjectPartition( aGuiObj, aCalcGroups, tr( "OBJECT_GROUPS" ), false );
 
-    HYDROData_SequenceOfObjects aCalcSplitGroups = aCaseObj->GetSplittedGroups();
-    buildObjectPartition( aGuiObj, aCalcSplitGroups, tr( "CASE_SPLITTED_GROUPS" ), false );
+    HYDROData_SequenceOfObjects aCalcSplitGroups = aCaseObj->GetSplitGroups();
+    buildObjectPartition( aGuiObj, aCalcSplitGroups, tr( "CASE_SPLIT_GROUPS" ), false );
 #endif
 
   }
@@ -988,6 +1205,31 @@ void HYDROGUI_DataModel::buildObjectTree( SUIT_DataObject* theParent,
       createObject( aGuiObj, aBottomPolyline, aGuiObj->entry(), false );
     }
   }
+  else if ( anObjectKind == KIND_LAND_COVER_MAP )
+  {
+    Handle(HYDROData_LandCoverMap) aLandCoverMapObj =
+      Handle(HYDROData_LandCoverMap)::DownCast( aDataObj );
+
+    /*TODO: reference objects of the land cover map 
+    HYDROData_SequenceOfObjects aPolylines = aLandCoverMapObj->GetPolylines();
+    buildObjectPartition( aGuiObj, aPolylines, tr( "LAND_COVER_POLYLINES" ), true );*/
+  }
+  else if ( anObjectKind == KIND_BC_POLYGON )
+  {
+    Handle(HYDROData_BCPolygon) aBCObj =
+      Handle(HYDROData_BCPolygon)::DownCast( aDataObj );
+
+    LightApp_DataObject* aPolylineSect = 
+      createObject( aGuiObj, tr( "BC_POLYGON_POLYLINE" ), aGuiObj->entry() );
+
+    Handle(HYDROData_PolylineXY) aPolyline = aBCObj->GetPolyline();
+    if ( !aPolyline.IsNull() && !aPolyline->IsRemoved() )
+      createObject( aPolylineSect, aPolyline, aGuiObj->entry(), false );
+  }
+  HYDROGUI_Module* aModule = dynamic_cast<HYDROGUI_Module*>( module() );
+  if( aModule )
+    aModule->enableLCMActions();
+  
 }
 
 void HYDROGUI_DataModel::buildCaseTree( SUIT_DataObject* theParent, Handle(HYDROData_CalculationCase) theCase )
@@ -1127,3 +1369,29 @@ bool HYDROGUI_DataModel::rename( Handle(HYDROData_Entity) theEntity, const QStri
   return true;
 }
 
+void HYDROGUI_DataModel::updateDocument()
+{
+  DEBTRACE("updateDocument");
+    // Sets the default strickler coefficient from preferences to document.
+    Handle(HYDROData_Document) aDoc = getDocument();
+    SUIT_ResourceMgr* resMgr = module()->application()->resourceMgr();
+    if ( resMgr && !aDoc.IsNull() )
+      aDoc->SetDefaultStricklerCoefficient( resMgr->doubleValue( "preferences", "default_strickler_coefficient", 0 ) );
+}
+
+void HYDROGUI_DataModel::setObjectVisibilityState( Handle(HYDROData_Entity) theModelObject,
+                                                   HYDROGUI_DataObject* theObject )
+{
+  SUIT_AbstractModel* treeModel = 0;
+  LightApp_Application* app = dynamic_cast<LightApp_Application*>( module()->application() );
+  if ( app )
+    treeModel = dynamic_cast<SUIT_AbstractModel*>( app->objectBrowser()->model() );
+
+  if ( treeModel )
+  {
+    HYDROGUI_Module* aModule = dynamic_cast<HYDROGUI_Module*>( module() );
+    bool isVisible = aModule->isObjectVisible( -1, theModelObject );
+    Qtx::VisibilityState aVisState = isVisible ? Qtx::ShownState : Qtx::HiddenState;
+    treeModel->setVisibilityState( theObject->text( theObject->customData( Qtx::IdType ).toInt() ), aVisState, false );
+  }
+}