Salome HOME
Merge commit '9dd90968eb8ad86e7e6ae67f48bb6110bd4ffbdc' into BR_LCM_COMP
[modules/hydro.git] / src / HYDROData / HYDROData_CalculationCase.h
index 4320e4fc5f71d082dc1bec4d04facc52e82f8554..7db0d86bfcb91b9e6b5d7895984ad58968818b18 100644 (file)
 #include <HYDROData_Zone.h>
 #include <HYDROData_Warning.h>
 
+#ifdef WIN32
+  #pragma warning ( disable: 4251 )
+#endif
+
 #ifndef LIGHT_MODE
 // IDL includes
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(GEOM_Gen)
 #endif
 
+#ifdef WIN32
+  #pragma warning( default: 4251 )
+#endif
+
 class gp_XY;
 
 class TopoDS_Shape;
@@ -45,7 +53,7 @@ class Handle(HYDROData_ShapesGroup);
 class Handle(HYDROData_SplittedShapesGroup);
 class Handle(HYDROData_Document);
 class Handle(HYDROData_StricklerTable);
-class Handle(HYDROData_LandCover);
+class Handle(HYDROData_LandCoverMap);
 
 DEFINE_STANDARD_HANDLE(HYDROData_CalculationCase, HYDROData_Entity)
 
@@ -88,11 +96,14 @@ public:
     DataTag_CustomRules,               ///< custom rules
     DataTag_AssignmentMode,            ///< assignment mode
     DataTag_StricklerTable,            ///< reference Strickler table
-    DataTag_LandCover,                 ///< reference land covers
-    DataTag_CustomLandCoverRules,      ///< custom rules for land covers priority
-    DataTag_AssignmentLandCoverMode,   ///< assignment mode of land covers priority
-    DataTag_ChildLandCoverRegion,      ///< child land cover regions
-    DataTag_LandCoverRegion            ///< reference land cover regions
+
+    DataTag_LandCover_Obsolete,                 ///< reference land covers
+    DataTag_CustomLandCoverRules_Obsolete,      ///< custom rules for land covers priority
+    DataTag_AssignmentLandCoverMode_Obsolete,   ///< assignment mode of land covers priority
+    DataTag_ChildLandCoverRegion_Obsolete,      ///< child land cover regions
+    DataTag_LandCoverRegion_Obsolete,           ///< reference land cover regions
+
+    DataTag_LandCoverMap,              ///< reference to land cover map
   };
 
 public:
@@ -113,7 +124,8 @@ public:
   /**
    * 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.
@@ -205,59 +217,36 @@ public:
    */
   HYDRODATA_EXPORT virtual void RemoveStricklerTable();
 
-
-  /**
-   * Add new one reference Land Cover for calculation case.
-   * \param theLandCover the Land Cover to add
-   * \return true in case of success
-   */
-  HYDRODATA_EXPORT virtual bool AddLandCover( const Handle(HYDROData_LandCover)& theLandCover );
-
   /**
-   * Returns all reference Land Covers of calculation case.
-   * \return the list of referenced Land Covers
+   * Returns reference Land Cover Map of calculation case.
+   * \return the referenced Land Cover Map
    */
-  HYDRODATA_EXPORT virtual HYDROData_SequenceOfObjects GetLandCovers() const;
-
-  /**
-   * Removes reference Land Cover from calculation case.
-   * \param theLandCover the Land Cover to remove
-   */
-  HYDRODATA_EXPORT virtual void RemoveLandCover( const Handle(HYDROData_LandCover)& theLandCover );
-
-  /**
-   * Removes all reference Land Covers from calculation case.
-   */
-  HYDRODATA_EXPORT virtual void RemoveLandCovers();
+  HYDRODATA_EXPORT Handle(HYDROData_LandCoverMap) GetLandCoverMap() const;
 
+  HYDRODATA_EXPORT void SetLandCoverMap( const Handle(HYDROData_LandCoverMap)& );
 
   /**
    * Add new one child region for calculation case.
    * The new region is added into the list of reference regions.
    * The label of theZone is changed during this operation
    * because of new region becomes the new parent for this zone.
-   * \param theLandCover if true - Land Cover region will be added
    * \return the created region
    */
-  HYDRODATA_EXPORT virtual Handle(HYDROData_Region) AddNewRegion( const Handle(HYDROData_Zone)& theZone,
-                                                                  const bool theLandCover ); 
+  HYDRODATA_EXPORT virtual Handle(HYDROData_Region) AddNewRegion( const Handle(HYDROData_Zone)& theZone ); 
 
 
   /**
    * Add new one reference region for calculation case.
    * The label of theRegion is changed in case if old parent is not this calculation.
-   * \param theLandCover if true - Land Cover region will bw created
    * \return true in case of success
    */
-  HYDRODATA_EXPORT virtual bool AddRegion( const Handle(HYDROData_Region)& theRegion,
-                                           const bool theLandCover );
+  HYDRODATA_EXPORT virtual bool AddRegion( const Handle(HYDROData_Region)& theRegion );
 
   /**
    * Returns all reference regions of calculation case.
-   * \param theLandCover if true - Land Cover regions will be returned
    * \return the list of reference regions
    */
-  HYDRODATA_EXPORT virtual HYDROData_SequenceOfObjects GetRegions( const bool theLandCover ) const;
+  HYDRODATA_EXPORT virtual HYDROData_SequenceOfObjects GetRegions() const;
 
   /**
    * Updates names of regions to correct order.
@@ -267,16 +256,13 @@ public:
   /**
    * Removes reference region from calculation case.
    * \param theRegion the region to remove
-   * \param theLandCover if true - it means that Land Cover region to be removed
    */
-  HYDRODATA_EXPORT virtual void RemoveRegion( const Handle(HYDROData_Region)& theRegion,
-                                              const bool theLandCover ); 
+  HYDRODATA_EXPORT virtual void RemoveRegion( const Handle(HYDROData_Region)& theRegion ); 
 
   /**
    * Removes all reference regions from calculation case.
-   * \param theLandCover if true - it means that Land Cover regions to be removed
    */
-  HYDRODATA_EXPORT virtual void RemoveRegions( const bool theLandCover );
+  HYDRODATA_EXPORT virtual void RemoveRegions();
 
   /**
    * Returns all reference geometry groups of calculation case.
@@ -368,22 +354,18 @@ public:
   /**
    * Returns region to which the point is belongs.
    * \param thePoint the point to examine
-   * \param theLandCover the flag indicating,
    * if it is needed to search Land Cover region
    * \return result region
    */
-  HYDRODATA_EXPORT virtual Handle(HYDROData_Region) GetRegionFromPoint( const gp_XY& thePoint,
-                                                                        const bool theLandCover ) const;
+  HYDRODATA_EXPORT virtual Handle(HYDROData_Region) GetRegionFromPoint( const gp_XY& thePoint ) const;
 
   /**
    * Returns zone to which the point is belongs.
    * \param thePoint the point to examine
-   * \param theLandCover the flag indicating,
    * if it is needed to search Land Cover zone
    * \return result zone
    */
-  HYDRODATA_EXPORT virtual Handle(HYDROData_Zone) GetZoneFromPoint( const gp_XY& thePoint,
-                                                                    const bool theLandCover ) const;
+  HYDRODATA_EXPORT virtual Handle(HYDROData_Zone) GetZoneFromPoint( const gp_XY& thePoint ) const;
 
   /**
    * Returns classification of point for given zone.
@@ -412,11 +394,7 @@ public:
                                  HYDROData_Zone::MergeType& theMergeType,
                                  HYDROData_CalculationCase::DataTag& theDataTag ) const;
 
-  HYDRODATA_EXPORT void SetAssignmentLandCoverMode( AssignmentMode theMode );
-  HYDRODATA_EXPORT AssignmentMode GetAssignmentLandCoverMode() const;
-
   HYDRODATA_EXPORT QString DumpRules() const;
-  HYDRODATA_EXPORT QString DumpLandCoverRules() const;
 
   HYDRODATA_EXPORT HYDROData_Warning GetLastWarning() const;
 
@@ -428,7 +406,6 @@ private:
    */
   Handle(HYDROData_Region) addNewRegion( const Handle(HYDROData_Document)& theDoc,
                                          const QString& thePrefixOrName,
-                                         const bool theLandCover,
                                          bool isPrefix = true );
 
   /**
@@ -453,17 +430,14 @@ private:
 #endif
   
   void CreateRegionsDef( const Handle(HYDROData_Document)& theDoc,
-                         const HYDROData_SplitToZonesTool::SplitDataList& theZones,
-                         const bool theLandCover );
+                         const HYDROData_SplitToZonesTool::SplitDataList& theZones );
   void CreateRegionsAuto( const Handle(HYDROData_Document)& theDoc,
-                          const HYDROData_SplitToZonesTool::SplitDataList& theZones,
-                          const bool theLandCover );
+                          const HYDROData_SplitToZonesTool::SplitDataList& theZones );
 
   void CreateEdgeGroupsDef( const Handle(HYDROData_Document)& theDoc,
                             const HYDROData_SplitToZonesTool::SplitDataList& theEdges );
 
   void DumpRulesToPython( const QString& theCalcCaseName, QStringList& theScript ) const;
-  void DumpLandCoverRulesToPython( const QString& theCalcCaseName, QStringList& theScript ) const;
 
   void SetWarning( HYDROData_WarningType theType = WARN_OK, const QString& theData = "" );
 
@@ -471,8 +445,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: