X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_DataModel.cxx;h=23d8dc989bd03acc10bea47d8638a5ce7ebf8850;hb=6dd1807886655d96b021fbfb6ba736d79d49a492;hp=2f05232531bec83b84f4750bddb4b1630e78f606;hpb=e744ba34fd38d6744d11b54cd15b6f86350695b2;p=modules%2Fhydro.git

diff --git a/src/HYDROGUI/HYDROGUI_DataModel.cxx b/src/HYDROGUI/HYDROGUI_DataModel.cxx
index 2f052325..23d8dc98 100644
--- a/src/HYDROGUI/HYDROGUI_DataModel.cxx
+++ b/src/HYDROGUI/HYDROGUI_DataModel.cxx
@@ -44,7 +44,7 @@
 #include <HYDROData_River.h>
 #include <HYDROData_Stream.h>
 #include <HYDROData_StricklerTable.h>
-#include <HYDROData_LandCover.h>
+#include <HYDROData_LandCoverMap.h>
 
 #include <CAM_Module.h>
 #include <CAM_Study.h>
@@ -286,8 +286,8 @@ void HYDROGUI_DataModel::update( const int theStudyId )
   // STRICKLER TABLES
   LightApp_DataObject* aStricklerTablesRootObj = createObject( aNewRootObj, tr( partitionName( KIND_STRICKLER_TABLE ).toAscii() ) );
 
-  // LAND COVERS
-  LightApp_DataObject* aLandCoversRootObj = createObject( aNewRootObj, tr( partitionName( KIND_LAND_COVER ).toAscii() ) );
+  // LAND COVER MAPS
+  LightApp_DataObject* aLandCoversRootObj = createObject( aNewRootObj, tr( partitionName( KIND_LAND_COVER_MAP ).toAscii() ) );
 
   // CALCULATION CASES
   LightApp_DataObject* aCalculRootObj = createObject( aNewRootObj, tr( partitionName( KIND_CALCULATION ).toAscii() ) );
@@ -404,12 +404,12 @@ void HYDROGUI_DataModel::update( const int theStudyId )
 
           break;
         }
-        case KIND_LAND_COVER:
+        case KIND_LAND_COVER_MAP:
         {
-          Handle(HYDROData_LandCover) aLandCoverObj =
-            Handle(HYDROData_LandCover)::DownCast( anObj );
-          if( !aLandCoverObj.IsNull() ) {
-            obj = createObject( aLandCoversRootObj, aLandCoverObj );
+          Handle(HYDROData_LandCoverMap) aLandCoverMapObj =
+            Handle(HYDROData_LandCoverMap)::DownCast( anObj );
+          if( !aLandCoverMapObj.IsNull() ) {
+            obj = createObject( aLandCoversRootObj, aLandCoverMapObj );
           }
 
           break;
@@ -710,7 +710,7 @@ QString HYDROGUI_DataModel::partitionName( const ObjectKind theObjectKind )
     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:        return "LAND_COVERS";
+    case KIND_LAND_COVER_MAP:    return "LAND_COVER_MAPS";
     default: break;
   }
   return QString();
@@ -734,7 +734,7 @@ LightApp_DataObject* HYDROGUI_DataModel::createObject( SUIT_DataObject*
                     aKind == KIND_SHAPES_GROUP || aKind == KIND_SPLITTED_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;
+                    aKind == KIND_DIGUE || aKind == KIND_DUMMY_3D || aKind == KIND_LAND_COVER_MAP;
   if ( !visibility )
   {
     Handle(HYDROData_Profile) aProfObj = Handle(HYDROData_Profile)::DownCast( theModelObject );
@@ -992,7 +992,7 @@ void HYDROGUI_DataModel::buildObjectTree( SUIT_DataObject* theParent,
     LightApp_DataObject* aCaseRegionsSect = 
       createObject( aGuiObj, tr( "CASE_REGIONS" ), aGuiObj->entry() );
 
-    HYDROData_SequenceOfObjects aCaseRegions = aCaseObj->GetRegions( false );
+    HYDROData_SequenceOfObjects aCaseRegions = aCaseObj->GetRegions();
     HYDROData_SequenceOfObjects::Iterator anIter( aCaseRegions );
     for ( ; anIter.More(); anIter.Next() )
     {
@@ -1001,20 +1001,7 @@ void HYDROGUI_DataModel::buildObjectTree( SUIT_DataObject* theParent,
       if( !aCaseRegion.IsNull() && !aCaseRegion->IsRemoved() )
         createRegion( aCaseRegionsSect, aCaseRegion, "", true, theIsInOperation );
     }
-
-    LightApp_DataObject* aCaseLandCoverRegionsSect = 
-      createObject( aGuiObj, tr( "CASE_LAND_COVER_REGIONS" ), aGuiObj->entry() );
-
-    HYDROData_SequenceOfObjects aCaseLandCoverRegions = aCaseObj->GetRegions( true );
-    anIter.Init( aCaseLandCoverRegions );
-    for ( ; anIter.More(); anIter.Next() )
-    {
-      Handle(HYDROData_Region) aCaseLCRegion =
-        Handle(HYDROData_Region)::DownCast( anIter.Value() );
-      if( !aCaseLCRegion.IsNull() && !aCaseLCRegion->IsRemoved() )
-        createRegion( aCaseLandCoverRegionsSect, aCaseLCRegion, "", true, theIsInOperation );
-    }
-    
+   
 #ifdef DEB_GROUPS
     HYDROData_SequenceOfObjects aCalcGroups = aCaseObj->GetGeometryGroups();
     buildObjectPartition( aGuiObj, aCalcGroups, tr( "OBJECT_GROUPS" ), false );
@@ -1085,19 +1072,19 @@ void HYDROGUI_DataModel::buildObjectTree( SUIT_DataObject* theParent,
       createObject( aGuiObj, aBottomPolyline, aGuiObj->entry(), false );
     }
   }
-  else if ( anObjectKind == KIND_LAND_COVER )
+  else if ( anObjectKind == KIND_LAND_COVER_MAP )
   {
-    Handle(HYDROData_LandCover) aLandCoverObj =
-      Handle(HYDROData_LandCover)::DownCast( aDataObj );
+    Handle(HYDROData_LandCoverMap) aLandCoverMapObj =
+      Handle(HYDROData_LandCoverMap)::DownCast( aDataObj );
 
-    HYDROData_SequenceOfObjects aPolylines = aLandCoverObj->GetPolylines();
-    buildObjectPartition( aGuiObj, aPolylines, tr( "LAND_COVER_POLYLINES" ), true );
+    /*TODO: reference objects of the land cover map 
+    HYDROData_SequenceOfObjects aPolylines = aLandCoverMapObj->GetPolylines();
+    buildObjectPartition( aGuiObj, aPolylines, tr( "LAND_COVER_POLYLINES" ), true );*/
   }
   
 }
 
-void HYDROGUI_DataModel::buildCaseTree( SUIT_DataObject* theParent, Handle(HYDROData_CalculationCase) theCase,
-                                        const bool theLandCover )
+void HYDROGUI_DataModel::buildCaseTree( SUIT_DataObject* theParent, Handle(HYDROData_CalculationCase) theCase )
 {
   if ( !theCase.IsNull() )
   {
@@ -1113,7 +1100,7 @@ void HYDROGUI_DataModel::buildCaseTree( SUIT_DataObject* theParent, Handle(HYDRO
 
     new HYDROGUI_DropTargetObject( theParent, tr( "NEW_REGION" ), "", true );
 
-    HYDROData_SequenceOfObjects aCaseRegions = theCase->GetRegions( theLandCover );
+    HYDROData_SequenceOfObjects aCaseRegions = theCase->GetRegions();
     HYDROData_SequenceOfObjects::Iterator anIter( aCaseRegions );
     for ( ; anIter.More(); anIter.Next() )
     {
@@ -1184,8 +1171,7 @@ SUIT_DataObject* HYDROGUI_DataModel::findChildByName( const SUIT_DataObject* the
 }
 
 bool HYDROGUI_DataModel::createNewRegion( Handle(HYDROData_CalculationCase) theCase, 
-                                         const QList<HYDROGUI_Zone*>& theZonesList,
-                                         const bool theLandCover )
+                                         const QList<HYDROGUI_Zone*>& theZonesList )
 {
   bool isOk = !theCase.IsNull();
   if ( isOk )
@@ -1199,7 +1185,7 @@ bool HYDROGUI_DataModel::createNewRegion( Handle(HYDROData_CalculationCase) theC
       {
         if ( aRegion.IsNull() )
         {
-          aRegion = theCase->AddNewRegion( aZone, theLandCover );
+          aRegion = theCase->AddNewRegion( aZone );
           isOk = !aRegion.IsNull();
         }
         else