-// 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
bool isMergingNeed() const;
/**
- * Returns the list of altidude object names.
+ * Returns the list of source object names.
*/
- QStringList getAltitudes() const;
+ QStringList getObjects() const;
/**
* Returns the merging type for conflict altidudes.
*/
- HYDROData_Zone::MergeAltitudesType getMergeType() const;
+ HYDROData_Zone::MergeType getMergeType() const;
/**
- * Set the merging type for conflict altidudes.
- * If the type is Merge_Object then use the second parameter to set the merge bathymetry.
+ * Set the merging type for conflict altidudes/types.
+ * If the type is Merge_Object then use the second parameter to set the merge bathymetry/land cover.
*/
- void setMergeType( int theMergeType, QString theAltitudeName = QString() );
+ void setMergeType( int theMergeType, QString theMergeObjectName = QString() );
private:
QString getRefObjectNames() const;
- QString getAltitudeName() const;
+ QString getObjectName() const;
};
#endif