#include <HYDROData_Zone.h>
#include <HYDROData_Object.h>
#include <HYDROData_IAltitudeObject.h>
-#include <HYDROData_LandCover.h>
#include <SUIT_DataObject.h>
#include <QSet>
HYDROData_SequenceOfObjects::Iterator anIter( aSeq );
for ( ; anIter.More(); anIter.Next() )
{
- Handle(HYDROData_Entity) aRefGeomObj =
- Handle(HYDROData_Entity)::DownCast( anIter.Value() );
+ Handle(HYDROData_Entity) aRefGeomObj = anIter.Value();
if ( !aRefGeomObj.IsNull() )
{
// Get Ref.Object name
QString aName;
for ( ; anIter.More(); anIter.Next() )
{
+ aName.clear();
Handle(HYDROData_Object) aRefGeomObj =
Handle(HYDROData_Object)::DownCast( anIter.Value() );
if ( !aRefGeomObj.IsNull() )
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 ) )
{
// Get altitude object
aMergeObject = aRefGeomObj->GetAltitudeObject();
- } else {
- aMergeObject = Handle(HYDROData_LandCover)::DownCast( anIter.Value() );
}
if ( !aMergeObject.IsNull() && theMergeObjectName == aMergeObject->GetName() )