Merge commit '9dd90968eb8ad86e7e6ae67f48bb6110bd4ffbdc' into BR_LCM_COMP

[modules/hydro.git] / src / HYDROData / HYDROData_CalculationCase.h

diff --git a/src/HYDROData/HYDROData_CalculationCase.h b/src/HYDROData/HYDROData_CalculationCase.h
index 7e52ea2f2f1a8bde0265abe345bc229027c8d20a..7db0d86bfcb91b9e6b5d7895984ad58968818b18 100644 (file)
--- a/src/HYDROData/HYDROData_CalculationCase.h
+++ b/src/HYDROData/HYDROData_CalculationCase.h
@@ -25,12 +25,20 @@
 #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,6 +53,7 @@ class Handle(HYDROData_ShapesGroup);
 class Handle(HYDROData_SplittedShapesGroup);
 class Handle(HYDROData_Document);
 class Handle(HYDROData_StricklerTable);
+class Handle(HYDROData_LandCoverMap);
 
 DEFINE_STANDARD_HANDLE(HYDROData_CalculationCase, HYDROData_Entity)
 
@@ -92,8 +101,9 @@ public:
     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_LandCoverRegion_Obsolete,           ///< reference land cover regions
 
+    DataTag_LandCoverMap,              ///< reference to land cover map
   };
 
 public:
@@ -114,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.
@@ -206,6 +217,14 @@ public:
    */
   HYDRODATA_EXPORT virtual void RemoveStricklerTable();
 
+  /**
+   * Returns reference Land Cover Map of calculation case.
+   * \return the referenced Land Cover Map
+   */
+  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.
@@ -426,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: