Merge remote-tracking branch 'origin/BR_1321_ECW' into BR_DEMO

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

diff --git a/src/HYDROGUI/HYDROGUI_Zone.cxx b/src/HYDROGUI/HYDROGUI_Zone.cxx
index 8561008c5ae563fda77aa41710130b650839e1c2..6da859d9a4ede9ff32f9f022bd03304fe2aef58d 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_Zone.cxx
+++ b/src/HYDROGUI/HYDROGUI_Zone.cxx
@@ -21,7 +21,6 @@
 #include <HYDROData_Zone.h>
 #include <HYDROData_Object.h>
 #include <HYDROData_IAltitudeObject.h>
-#include <HYDROData_LandCover.h>
 
 #include <SUIT_DataObject.h>
 #include <QSet>
@@ -66,8 +65,7 @@ QString HYDROGUI_Zone::getRefObjectNames() const
     HYDROData_SequenceOfObjects::Iterator anIter( aSeq );
     for ( ; anIter.More(); anIter.Next() )
     {
-      Handle(HYDROData_Object) aRefGeomObj =
-        Handle(HYDROData_Object)::DownCast( anIter.Value() );
+      Handle(HYDROData_Entity) aRefGeomObj = anIter.Value();
       if ( !aRefGeomObj.IsNull() )
       {
         // Get Ref.Object name
@@ -101,6 +99,7 @@ QString HYDROGUI_Zone::getObjectName() const
       QString aName;
       for ( ; anIter.More(); anIter.Next() )
       {
+        aName.clear();
         Handle(HYDROData_Object) aRefGeomObj =
           Handle(HYDROData_Object)::DownCast( anIter.Value() );
         if ( !aRefGeomObj.IsNull() )
@@ -116,14 +115,14 @@ QString HYDROGUI_Zone::getObjectName() const
               aRes = aName;
               break;
             }
-
-            if ( !aNamesSet.contains( aName ) )
-            {
-              aRes += aName + ", ";
-              aNamesSet.insert( aName );
-            }
           }
         }
+
+        if ( !aName.isEmpty() && !aNamesSet.contains( aName ) )
+        {
+          aRes += aName + ", ";
+          aNamesSet.insert( aName );
+        }
       }
       // Remove the last comma if necessary
       if ( isMergingNeed && ( aRes.length() > 1 ) )
@@ -264,8 +263,6 @@ void HYDROGUI_Zone::setMergeType( int theMergeType, QString theMergeObjectName )
         {
           // Get altitude object
           aMergeObject = aRefGeomObj->GetAltitudeObject();
-        } else {
-          aMergeObject = Handle(HYDROData_LandCover)::DownCast( anIter.Value() );
         }
 
         if ( !aMergeObject.IsNull() && theMergeObjectName == aMergeObject->GetName() )