Salome HOME
projects
/
modules
/
hydro.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of https://git.salome-platform.org/git/modules/hydro
[modules/hydro.git]
/
src
/
HYDROData
/
HYDROData_Zone.h
diff --git
a/src/HYDROData/HYDROData_Zone.h
b/src/HYDROData/HYDROData_Zone.h
index cc19eadd0d2b6c69c867354782d81df1ba4efd2a..cde3b789a8f0a2a7facef4709c4ea50a23d2e982 100644
(file)
--- a/
src/HYDROData/HYDROData_Zone.h
+++ b/
src/HYDROData/HYDROData_Zone.h
@@
-1,8
+1,4
@@
-// 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
// 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
@@
-26,8
+22,7
@@
#include "HYDROData_Entity.h"
#include "HYDROData_IInterpolator.h"
#include "HYDROData_Entity.h"
#include "HYDROData_IInterpolator.h"
-class Handle(HYDROData_Object);
-class Handle(HYDROData_IAltitudeObject);
+class Handle(HYDROData_LandCover);
class TopoDS_Shape;
DEFINE_STANDARD_HANDLE(HYDROData_Zone, HYDROData_Entity)
class TopoDS_Shape;
DEFINE_STANDARD_HANDLE(HYDROData_Zone, HYDROData_Entity)
@@
-41,13
+36,13
@@
class HYDROData_Zone : public HYDROData_Entity
public:
public:
- // Enumeration of mergin types for conflict altitudes
- enum Merge
Altitudes
Type
+ // Enumeration of mergin types for conflict altitudes
/types
+ enum MergeType
{
Merge_UNKNOWN, // Undefined
Merge_ZMIN, // The minimum values
Merge_ZMAX, // The maximum values
{
Merge_UNKNOWN, // Undefined
Merge_ZMIN, // The minimum values
Merge_ZMAX, // The maximum values
- Merge_Object // Only one altitude will be taken into account
+ Merge_Object // Only one altitude
/land cover
will be taken into account
};
protected:
};
protected:
@@
-58,9
+53,9
@@
protected:
{
DataTag_First = HYDROData_Entity::DataTag_First + 100, ///< first tag, to reserve
DataTag_Shape, ///< reference shape
{
DataTag_First = HYDROData_Entity::DataTag_First + 100, ///< first tag, to reserve
DataTag_Shape, ///< reference shape
- DataTag_
GeometryObject, ///< reference geometry
objects
- DataTag_MergeType, ///< mergin type of conflict bathymetries
- DataTag_Merge
Altitude, ///< reference altitude
for conflict merge
+ DataTag_
Object, ///< reference
objects
+ DataTag_MergeType, ///< mergin type of conflict bathymetries
/types
+ DataTag_Merge
Object, ///< reference altitude/land cover
for conflict merge
};
public:
};
public:
@@
-124,51
+119,59
@@
public:
* * Returns the interpolator of zone object.
*/
HYDRODATA_EXPORT virtual HYDROData_IInterpolator* GetInterpolator() const;
* * Returns the interpolator of zone object.
*/
HYDRODATA_EXPORT virtual HYDROData_IInterpolator* GetInterpolator() const;
-
-
+
/**
* Sets the merging type for conflict altitudes.
* By default it is set to Merge_UNKNOWN.
*/
/**
* Sets the merging type for conflict altitudes.
* By default it is set to Merge_UNKNOWN.
*/
- HYDRODATA_EXPORT virtual void SetMergeType( const Merge
Altitudes
Type& theType );
+ HYDRODATA_EXPORT virtual void SetMergeType( const MergeType& theType );
/**
/**
- * Returns the merging type for conflict altitudes.
+ * Returns the merging type for conflict altitudes
/types
.
*/
*/
- HYDRODATA_EXPORT virtual Merge
Altitudes
Type GetMergeType() const;
+ HYDRODATA_EXPORT virtual MergeType GetMergeType() const;
/**
/**
- * Sets the reference
altitude
to resolve the conflict.
+ * Sets the reference
object
to resolve the conflict.
* This object is used only in case of "Merge_Object" merge type.
* This object is used only in case of "Merge_Object" merge type.
+ * \param theObject the merge object
*/
*/
- HYDRODATA_EXPORT virtual void SetMerge
Altitude( const Handle(HYDROData_IAltitudeObject)& theAltitude
);
+ HYDRODATA_EXPORT virtual void SetMerge
Object( const Handle(HYDROData_Entity)& theObject
);
/**
/**
- * Returns the reference altitude to resolve the conflict.
+ * Returns the reference object to resolve the conflict.
+ * \return the merge object
*/
*/
- HYDRODATA_EXPORT virtual Handle(HYDROData_
IAltitudeObject) GetMergeAltitude
() const;
+ HYDRODATA_EXPORT virtual Handle(HYDROData_
Entity) GetMergeObject
() const;
/**
/**
- * Removes the reference
altitude
for resolving the conflict.
+ * Removes the reference
object
for resolving the conflict.
*/
*/
- HYDRODATA_EXPORT virtual void RemoveMerge
Altitude
();
+ HYDRODATA_EXPORT virtual void RemoveMerge
Object
();
+ /**
+ * Add new one object for zone.
+ * \param theObject the object to add
+ */
+ HYDRODATA_EXPORT virtual bool AddObject( const Handle(HYDROData_Entity)& theObject );
/**
/**
- * Add new one geometry object for zone.
+ * Returns all objects of zone.
+ * \return the list of objects
*/
*/
- HYDRODATA_EXPORT virtual
bool AddGeometryObject( const Handle(HYDROData_Object)& theObject )
;
+ HYDRODATA_EXPORT virtual
HYDROData_SequenceOfObjects GetObjects() const
;
/**
/**
- * Re
turns all geometry objects of
zone.
+ * Re
moves all objects from
zone.
*/
*/
- HYDRODATA_EXPORT virtual
HYDROData_SequenceOfObjects GetGeometryObjects() const
;
+ HYDRODATA_EXPORT virtual
void RemoveObjects()
;
/**
/**
- * Removes all geometry objects from zone.
+ * Returns submersible flag.
+ * \return true if all objects of the zone is submersible
*/
*/
- HYDRODATA_EXPORT
virtual void RemoveGeometryObjects()
;
+ HYDRODATA_EXPORT
bool IsSubmersible() const
;
protected:
protected: