The bathymetry is changed to their base altitude class for geometry objects (Bug...

[modules/hydro.git] / src / HYDROGUI / HYDROGUI_Zone.cxx

diff --git a/src/HYDROGUI/HYDROGUI_Zone.cxx b/src/HYDROGUI/HYDROGUI_Zone.cxx
index 4485ec4f32d06c669953b2d563101340247ec42d..8a5bc0d3b21e59a901452aa62108a0f7bcb214c6 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_Zone.cxx
+++ b/src/HYDROGUI/HYDROGUI_Zone.cxx
@@ -24,7 +24,7 @@
 
 #include <HYDROData_Zone.h>
 #include <HYDROData_Object.h>
-#include <HYDROData_Bathymetry.h>
+#include <HYDROData_IAltitudeObject.h>
 
 #include <SUIT_DataObject.h>
 #include <QSet>
@@ -48,9 +48,9 @@ QString HYDROGUI_Zone::text( const int theColumnId ) const
         // Get Ref.Object name
         aRes = getRefObjectNames();
         break;
-      case BathymetryId:
-        // Get bathymetry name
-        aRes = getBathimetryName();
+      case AltitudeObjId:
+        // Get altitude object name
+        aRes = getAltitudeName();
         break;
       default:
         aRes = LightApp_DataObject::text( theColumnId );
@@ -85,7 +85,7 @@ QString HYDROGUI_Zone::getRefObjectNames() const
   return aRes;
 }
 
-QString HYDROGUI_Zone::getBathimetryName() const
+QString HYDROGUI_Zone::getAltitudeName() const
 {
   QString aRes;
   Handle(HYDROData_Zone) aZone = Handle(HYDROData_Zone)::DownCast( modelObject() );
@@ -96,9 +96,9 @@ QString HYDROGUI_Zone::getBathimetryName() const
     if ( ( isMergingNeed && aZone->GetMergeType() == HYDROData_Zone::Merge_UNKNOWN ) 
       || ( aSeq.Length() == 1 ) || ( !isMergingNeed ) )
     {
-      // Collect all used bathymetries names when merging is necessary
-      // or just get the name of bathymetry of a single geometry object
-      // or just get the name of a single bathymetry
+      // Collect all used altitudes names when merging is necessary
+      // or just get the name of altitude of a single geometry object
+      // or just get the name of a single altitude
       HYDROData_SequenceOfObjects::Iterator anIter( aSeq );
       QSet<QString> aNamesSet;
       QString aName;
@@ -108,14 +108,14 @@ QString HYDROGUI_Zone::getBathimetryName() const
           Handle(HYDROData_Object)::DownCast( anIter.Value() );
         if ( !aRefGeomObj.IsNull() )
         {
-          // Get bathymetry name
-          Handle(HYDROData_Bathymetry) aBathymetry = aRefGeomObj->GetBathymetry();
-          if ( !aBathymetry.IsNull() )
+          // Get altitude object name
+          Handle(HYDROData_IAltitudeObject) anAltitudeObj = aRefGeomObj->GetAltitudeObject();
+          if ( !anAltitudeObj.IsNull() )
           {
-            aName = aBathymetry->GetName();
+            aName = anAltitudeObj->GetName();
             if ( !isMergingNeed )
             {
-              // Get the first geometry object's bathymetry name and go out
+              // Get the first geometry object's altitude name and go out
               aRes = aName;
               break;
             }
@@ -144,13 +144,11 @@ QString HYDROGUI_Zone::getBathimetryName() const
         case HYDROData_Zone::Merge_ZMAX:    // The maximum values
           aRes = QObject::tr( "MERGE_ZMAX" );
           break;
-        case HYDROData_Zone::Merge_Object:   // Only one bathymetry will be taken into account
+        case HYDROData_Zone::Merge_Object:   // Only one altitude will be taken into account
         {
-          Handle(HYDROData_Bathymetry) aBathymetry = aZone->GetMergeBathymetry();
-          if ( !aBathymetry.IsNull() )
-          {
-            aRes = aBathymetry->GetName();
-          }
+          Handle(HYDROData_IAltitudeObject) anAltitude = aZone->GetMergeAltitude();
+          if ( !anAltitude.IsNull() )
+            aRes = anAltitude->GetName();
           break;
         }
         default:
@@ -177,7 +175,7 @@ bool HYDROGUI_Zone::isMergingNeed() const
 
 QColor HYDROGUI_Zone::color( const ColorRole theColorRole, const int theColumnId ) const
 {
-  // Implement red color for bathymetry conflicts in case creation dialog
+  // Implement red color for altitude conflicts in case creation dialog
   QColor aRes;
   Handle(HYDROData_Zone) aZone = Handle(HYDROData_Zone)::DownCast( modelObject() );
   if ( !aZone.IsNull() )
@@ -208,15 +206,15 @@ QColor HYDROGUI_Zone::color( const ColorRole theColorRole, const int theColumnId
   return aRes;
 }
 
-QStringList HYDROGUI_Zone::getBathymetries() const
+QStringList HYDROGUI_Zone::getAltitudes() const
 {
   QStringList aRes;
   Handle(HYDROData_Zone) aZone = Handle(HYDROData_Zone)::DownCast( modelObject() );
   if ( !aZone.IsNull() )
   {
     HYDROData_SequenceOfObjects aSeq = aZone->GetGeometryObjects();
-    // Collect all used bathymetries names when merging is necessary
-    // or just get the name of bathymetry of a single geometry object
+    // Collect all used altitudes names when merging is necessary
+    // or just get the name of altitude of a single geometry object
     HYDROData_SequenceOfObjects::Iterator anIter( aSeq );
     for ( ; anIter.More(); anIter.Next() )
     {
@@ -224,21 +222,18 @@ QStringList HYDROGUI_Zone::getBathymetries() const
         Handle(HYDROData_Object)::DownCast( anIter.Value() );
       if ( !aRefGeomObj.IsNull() )
       {
-        // Get bathymetry name
-        Handle(HYDROData_Bathymetry) aBathymetry = aRefGeomObj->GetBathymetry();
-        if ( !aBathymetry.IsNull() && !aRes.contains( aBathymetry->GetName() ))
-        {
-          aRes.append( aBathymetry->GetName() );
-        }
+        Handle(HYDROData_IAltitudeObject) anAltitudeObj = aRefGeomObj->GetAltitudeObject();
+        if ( !anAltitudeObj.IsNull() && !aRes.contains( anAltitudeObj->GetName() ) )
+          aRes.append( anAltitudeObj->GetName() );
       }
     }
   }
   return aRes;
 }
 
-HYDROData_Zone::MergeBathymetriesType HYDROGUI_Zone::getMergeType() const
+HYDROData_Zone::MergeAltitudesType HYDROGUI_Zone::getMergeType() const
 {
-  HYDROData_Zone::MergeBathymetriesType aRes = HYDROData_Zone::Merge_UNKNOWN;
+  HYDROData_Zone::MergeAltitudesType aRes = HYDROData_Zone::Merge_UNKNOWN;
   Handle(HYDROData_Zone) aZone = Handle(HYDROData_Zone)::DownCast( modelObject() );
   if ( !aZone.IsNull() )
   {
@@ -247,17 +242,17 @@ HYDROData_Zone::MergeBathymetriesType HYDROGUI_Zone::getMergeType() const
   return aRes;
 }
 
-void HYDROGUI_Zone::setMergeType( int theMergeType, QString theBathymetryName )
+void HYDROGUI_Zone::setMergeType( int theMergeType, QString theAltitudeName )
 {
   Handle(HYDROData_Zone) aZone = Handle(HYDROData_Zone)::DownCast( modelObject() );
   if ( !aZone.IsNull() )
   {
-    HYDROData_Zone::MergeBathymetriesType aMergeType = 
-      ( HYDROData_Zone::MergeBathymetriesType )theMergeType;
+    HYDROData_Zone::MergeAltitudesType aMergeType = 
+      ( HYDROData_Zone::MergeAltitudesType )theMergeType;
     aZone->SetMergeType( aMergeType );
     if ( aMergeType == HYDROData_Zone::Merge_Object )
     {
-      // Find a bathymetry by the given name and set it as the zone's merge bathymetry
+      // Find an altitude object by the given name and set it as the zone's merge altitude
       HYDROData_SequenceOfObjects aSeq = aZone->GetGeometryObjects();
       HYDROData_SequenceOfObjects::Iterator anIter( aSeq );
       for ( ; anIter.More(); anIter.Next() )
@@ -266,11 +261,11 @@ void HYDROGUI_Zone::setMergeType( int theMergeType, QString theBathymetryName )
           Handle(HYDROData_Object)::DownCast( anIter.Value() );
         if ( !aRefGeomObj.IsNull() )
         {
-          // Get bathymetry name
-          Handle(HYDROData_Bathymetry) aBathymetry = aRefGeomObj->GetBathymetry();
-          if ( !aBathymetry.IsNull() && theBathymetryName == aBathymetry->GetName() )
+          // Get altitude object name
+          Handle(HYDROData_IAltitudeObject) anAltitudeObj = aRefGeomObj->GetAltitudeObject();
+          if ( !anAltitudeObj.IsNull() && theAltitudeName == anAltitudeObj->GetName() )
           {
-            aZone->SetMergeBathymetry( aBathymetry );
+            aZone->SetMergeAltitude( anAltitudeObj );
             break;
           }
         }