public:
// Enumeration of mergin types for conflict altitudes
- enum MergeAltitudesType
+ enum MergeType
{
Merge_ZMIN, // The minimum values
Merge_ZMAX, // The maximum values
* Sets the merging type for conflict altitudes.
* By default it is set to Merge_ZMIN.
*/
- void SetMergeType( const MergeAltitudesType& theType );
+ void SetMergeType( const MergeType& theType );
/**
* Returns the merging type for conflict altitudes.
*/
- MergeAltitudesType GetMergeType() const;
+ MergeType GetMergeType() const;
/**
if ( !aRefAltitude.IsNull() )
{
Py_BEGIN_ALLOW_THREADS
- sipSelfWasArg ? sipCpp->HYDROData_Zone::SetMergeAltitude( aRefAltitude ) :
- sipCpp->SetMergeAltitude( aRefAltitude );
+ sipSelfWasArg ? sipCpp->HYDROData_Zone::SetMergeObject( aRefAltitude ) :
+ sipCpp->SetMergeObject( aRefAltitude );
Py_END_ALLOW_THREADS
}
Handle(HYDROData_IAltitudeObject) aRefAltitude;
Py_BEGIN_ALLOW_THREADS
- aRefAltitude = sipSelfWasArg ? sipCpp->HYDROData_Zone::GetMergeAltitude() :
- sipCpp->GetMergeAltitude();
+ Handle(HYDROData_Entity) aRefObject = sipSelfWasArg ? sipCpp->HYDROData_Zone::GetMergeObject() :
+ sipCpp->GetMergeObject();
+ aRefAltitude = Handle(HYDROData_IAltitudeObject)::DownCast( aRefObject );
Py_END_ALLOW_THREADS
sipRes = (HYDROData_IAltitudeObject*)createPointer( aRefAltitude );
* Removes the reference altitude for resolving the conflict.
*/
void RemoveMergeAltitude();
+ %MethodCode
+
+ Py_BEGIN_ALLOW_THREADS
+ sipSelfWasArg ? sipCpp->HYDROData_Zone::RemoveMergeObject() :
+ sipCpp->RemoveMergeObject();
+ Py_END_ALLOW_THREADS
+
+ %End
+
+ /**
+ * Sets the reference object to resolve the conflict.
+ * This object is used only in case of "Merge_Object" merge type.
+ */
+ void SetMergeObject( HYDROData_Entity theObject ) [void (const Handle_HYDROData_Entity&)];
+ %MethodCode
+
+ Handle(HYDROData_Entity) aRefObject =
+ Handle(HYDROData_Entity)::DownCast( createHandle( a0 ) );
+ if ( !aRefObject.IsNull() )
+ {
+ Py_BEGIN_ALLOW_THREADS
+ sipSelfWasArg ? sipCpp->HYDROData_Zone::SetMergeObject( aRefObject ) :
+ sipCpp->SetMergeObject( aRefObject );
+ Py_END_ALLOW_THREADS
+ }
+ %End
+
+ /**
+ * Returns the reference object to resolve the conflict.
+ */
+ HYDROData_Entity GetMergeObject() const [Handle_HYDROData_Entity ()];
+ %MethodCode
+
+ Handle(HYDROData_Entity) aRefObject;
+
+ Py_BEGIN_ALLOW_THREADS
+ aRefObject = sipSelfWasArg ? sipCpp->HYDROData_Zone::GetMergeObject() :
+ sipCpp->GetMergeObject();
+ Py_END_ALLOW_THREADS
+
+ sipRes = (HYDROData_Entity*)createPointer( aRefObject );
+
+ %End
+
+ /**
+ * Removes the reference object for resolving the conflict.
+ */
+ void RemoveMergeObject();
/**
- * dd new one geometry object for zone.
+ * Add new one object for zone.
*/
- void AddGeometryObject( HYDROData_Object theRegion ) [void (const Handle_HYDROData_Object&)];
+ void AddObject( HYDROData_Entity theObject ) [void (const Handle_HYDROData_Entity&)];
%MethodCode
- Handle(HYDROData_Object) aGeomObj =
- Handle(HYDROData_Object)::DownCast( createHandle( a0 ) );
- if ( !aGeomObj.IsNull() )
+ Handle(HYDROData_Entity) anObj =
+ Handle(HYDROData_Entity)::DownCast( createHandle( a0 ) );
+ if ( !anObj.IsNull() )
{
Py_BEGIN_ALLOW_THREADS
- sipSelfWasArg ? sipCpp->HYDROData_Zone::AddGeometryObject( aGeomObj ) :
- sipCpp->AddGeometryObject( aGeomObj );
+ sipSelfWasArg ? sipCpp->HYDROData_Zone::AddObject( anObj ) :
+ sipCpp->AddObject( anObj );
Py_END_ALLOW_THREADS
}
%End
/**
- * Returns all geometry objects of zone.
+ * Returns all objects of zone.
*/
- HYDROData_SequenceOfObjects GetGeometryObjects() const;
+ HYDROData_SequenceOfObjects GetObjects() const;
/**
- * Removes all geometry objects from zone.
+ * Removes all objects from zone.
*/
- void RemoveGeometryObjects();
+ void RemoveObjects();
/**