X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_CalculationCase.h;h=ca0fd81cb7440fd67c66a972ae83b618904bd734;hb=39b1848f103d89cfb544a1651b3fbf221fc2c401;hp=4f09be72ec1e39b582747c55fba5434f598a26e8;hpb=947094c3fdd08e49a696111b3d58c561461544c6;p=modules%2Fhydro.git diff --git a/src/HYDROData/HYDROData_CalculationCase.h b/src/HYDROData/HYDROData_CalculationCase.h index 4f09be72..ca0fd81c 100644 --- a/src/HYDROData/HYDROData_CalculationCase.h +++ b/src/HYDROData/HYDROData_CalculationCase.h @@ -24,6 +24,7 @@ #include #include #include +#include #ifdef WIN32 #pragma warning ( disable: 4251 ) @@ -50,7 +51,7 @@ class Handle(HYDROData_Region); class Handle(HYDROData_Zone); class Handle(HYDROData_PolylineXY); class Handle(HYDROData_ShapesGroup); -class Handle(HYDROData_SplittedShapesGroup); +class Handle(HYDROData_SplitShapesGroup); class Handle(HYDROData_Document); class Handle(HYDROData_StricklerTable); class Handle(HYDROData_LandCoverMap); @@ -59,7 +60,7 @@ DEFINE_STANDARD_HANDLE(HYDROData_CalculationCase, HYDROData_Entity) /**\class HYDROData_CalculationCase - * \brief Calculation case is defined by selection of Geometry objects with or without “Zone of water”. + * \brief Calculation case is defined by selection of Geometry objects with or without �Zone of water�. * */ class HYDROData_CalculationCase : public HYDROData_Entity @@ -92,10 +93,11 @@ public: DataTag_Region, ///< reference regions DataTag_Polyline, ///< reference boundary polyline DataTag_GeometryGroup, ///< reference geometry groups - DataTag_SplittedGroups, ///< reference splitted groups + DataTag_SplitGroups, ///< reference split groups DataTag_CustomRules, ///< custom rules DataTag_AssignmentMode, ///< assignment mode DataTag_StricklerTable, ///< reference Strickler table + DataTag_InterPoly, ///< intersection polyline DataTag_LandCover_Obsolete, ///< reference land covers DataTag_CustomLandCoverRules_Obsolete, ///< custom rules for land covers priority @@ -117,14 +119,15 @@ public: /** * Updates the name of this object. - * Reimplemented to update the names of regions, zones and splitted groups. + * Reimplemented to update the names of regions, zones and split groups. */ HYDRODATA_EXPORT virtual void SetName( const QString& theName ); /** * Dump Calculation object to Python script representation. */ - HYDRODATA_EXPORT virtual QStringList DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const; + HYDRODATA_EXPORT virtual QStringList DumpToPython( const QString& thePyScriptPath, + MapOfTreatedObjects& theTreatedObjects ) const; /** * Update the calcualtion case object. @@ -266,12 +269,18 @@ public: /** * Returns all reference geometry groups of calculation case. */ - HYDRODATA_EXPORT virtual HYDROData_SequenceOfObjects GetSplittedGroups() const; + HYDRODATA_EXPORT virtual HYDROData_SequenceOfObjects GetSplitGroups() const; /** * Removes all reference geometry groups from calculation case. */ - HYDRODATA_EXPORT virtual void RemoveSplittedGroups(); + HYDRODATA_EXPORT virtual void RemoveSplitGroups(); + + HYDRODATA_EXPORT virtual bool AddInterPoly( const Handle(HYDROData_PolylineXY)& theInterPolyline ); + + HYDRODATA_EXPORT virtual void RemoveInterPolyObject( const Handle(HYDROData_PolylineXY)& theInterPolyline ); + + HYDRODATA_EXPORT virtual HYDROData_SequenceOfObjects GetInterPolyObjects() const; /** * Exports the calculation case data (shell and groups) to GEOM module. @@ -312,7 +321,8 @@ public: * \return result altitude value */ HYDRODATA_EXPORT virtual double GetAltitudeForPoint( const gp_XY& thePoint, - const Handle(HYDROData_Region)& theRegion ) const; + const Handle(HYDROData_Region)& theRegion, + int theMethod = 0) const; /** * Returns altitude for given point on given zone. @@ -321,7 +331,8 @@ public: * \return result altitude value */ HYDRODATA_EXPORT virtual double GetAltitudeForPoint( const gp_XY& thePoint, - const Handle(HYDROData_Zone)& theZone ) const; + const Handle(HYDROData_Zone)& theZone, + int theMethod = 0) const; /** * Returns strickler coefficient for given point. @@ -330,6 +341,10 @@ public: */ HYDRODATA_EXPORT double GetStricklerCoefficientForPoint( const gp_XY& thePoint ) const; + HYDRODATA_EXPORT std::vector GetStricklerCoefficientForPoints(const std::vector& thePoints, + double DefValue, + bool UseMax ) const; + /** * Returns altitudes for given points on given region. * \param thePoints the points to examine @@ -338,7 +353,8 @@ public: */ HYDRODATA_EXPORT virtual NCollection_Sequence GetAltitudesForPoints( const NCollection_Sequence& thePoints, - const Handle(HYDROData_Region)& theRegion ) const; + const Handle(HYDROData_Region)& theRegion, + int theMethod = 0) const; /** * Returns altitudes for given points on given zone. @@ -348,7 +364,8 @@ public: */ HYDRODATA_EXPORT virtual NCollection_Sequence GetAltitudesForPoints( const NCollection_Sequence& thePoints, - const Handle(HYDROData_Zone)& theZone ) const; + const Handle(HYDROData_Zone)& theZone, + int theMethod = 0) const; /** * Returns region to which the point is belongs. @@ -408,16 +425,16 @@ private: bool isPrefix = true ); /** - * Add new one splitted edges group for calculation case. + * Add new one split edges group for calculation case. */ - Handle(HYDROData_SplittedShapesGroup) addNewSplittedGroup( const QString& theName ); + Handle(HYDROData_SplitShapesGroup) addNewSplitGroup( const QString& theName ); /** * Exports the given faces as shell and the given groups to GEOM module. * \param theGeomEngine GEOM module engine * \param theStudy SALOMEDS study, is used for publishing of GEOM objects * \param theFaces the list of faces to make shell - * \param theSplittedGroups the list of groups + * \param theSplitGroups the list of groups * \return true in case of success */ #ifndef LIGHT_MODE @@ -444,8 +461,9 @@ private: const QString& theOldCaseName, const QString& theName ); - void DumpRegionsToPython( QStringList& theResList, - MapOfTreatedObjects& theTreatedObjects, + void DumpRegionsToPython( QStringList& theResList, + const QString& thePyScriptPath, + MapOfTreatedObjects& theTreatedObjects, const HYDROData_SequenceOfObjects& theRegions ) const; protected: