X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_LandCoverMap.h;h=e00eaebd9be20760f0dbfa058d8e1c6b3c77e3a0;hb=58bb6b7459bebeeb089c9ed486c4683a8bae7288;hp=f6e681b04bff09cdf79d04060799c3d498635004;hpb=9082efb75ca2505f8b4c5096d37e8d87491cd5d9;p=modules%2Fhydro.git diff --git a/src/HYDROData/HYDROData_LandCoverMap.h b/src/HYDROData/HYDROData_LandCoverMap.h index f6e681b0..e00eaebd 100644 --- a/src/HYDROData/HYDROData_LandCoverMap.h +++ b/src/HYDROData/HYDROData_LandCoverMap.h @@ -28,19 +28,16 @@ #include #include -class Handle_HYDROData_StricklerTable; +class HYDROData_StricklerTable; #include typedef NCollection_IndexedDataMap HYDROData_MapOfFaceToStricklerType; -DEFINE_STANDARD_HANDLE( HYDROData_LandCoverMap, HYDROData_Entity ) - class TopoDS_Shape; class TopoDS_Wire; class TopoDS_Iterator; -class TopTools_ListOfShape; -class Handle( HYDROData_PolylineXY ); -class Handle( HYDROData_Object ); +class HYDROData_PolylineXY; +class HYDROData_Object; class gp_XY; class HYDROData_LandCoverMap : public HYDROData_Entity @@ -111,12 +108,13 @@ public: HYDRODATA_EXPORT bool ExportTelemac( const QString& theFileName, double theDeflection, - const Handle_HYDROData_StricklerTable& theTable, + const Handle(HYDROData_StricklerTable)& theTable, QString& statMessage) const; HYDRODATA_EXPORT bool Add( const Handle( HYDROData_Object )&, const QString& theType ); HYDRODATA_EXPORT bool Add( const Handle( HYDROData_PolylineXY )&, const QString& theType ); + using HYDROData_Entity::Remove; HYDRODATA_EXPORT bool Remove( const TopoDS_Face& ); HYDRODATA_EXPORT bool Remove( const TopTools_ListOfShape& ); @@ -170,7 +168,7 @@ protected: double theTolerance = 1E-5 ); public: - DEFINE_STANDARD_RTTI( HYDROData_LandCoverMap ); + DEFINE_STANDARD_RTTIEXT( HYDROData_LandCoverMap, HYDROData_Entity ); private: friend class Explorer;