X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_CalculationCase.h;h=88f2c901abb59b7245b4ecd5f824ed30c6ef8308;hb=e0da09bfb6b059c2671fe4c052f8e6d7ae426050;hp=1a4eb3115bb565fa6739cdd2ccb5d625e4c50455;hpb=e423cfd15575a1feb27386b5516bd0c83bed5fe9;p=modules%2Fhydro.git

diff --git a/src/HYDROData/HYDROData_CalculationCase.h b/src/HYDROData/HYDROData_CalculationCase.h
index 1a4eb311..88f2c901 100644
--- a/src/HYDROData/HYDROData_CalculationCase.h
+++ b/src/HYDROData/HYDROData_CalculationCase.h
@@ -50,7 +50,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);
@@ -92,7 +92,7 @@ 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
@@ -101,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:
@@ -116,14 +117,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.
@@ -219,7 +221,9 @@ public:
    * Returns reference Land Cover Map of calculation case.
    * \return the referenced Land Cover Map
    */
-  HYDRODATA_EXPORT virtual Handle(HYDROData_LandCoverMap) GetLandCoverMap() const;
+  HYDRODATA_EXPORT Handle(HYDROData_LandCoverMap) GetLandCoverMap() const;
+
+  HYDRODATA_EXPORT void SetLandCoverMap( const Handle(HYDROData_LandCoverMap)& );
 
   /**
    * Add new one child region for calculation case.
@@ -263,12 +267,12 @@ 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();
 
   /**
    * Exports the calculation case data (shell and groups) to GEOM module.
@@ -405,16 +409,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
@@ -441,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: