Merge branch 'BR_LCM_COMP' into HEAD

[modules/hydro.git] / src / HYDROGUI / HYDROGUI_DataModel.h

diff --git a/src/HYDROGUI/HYDROGUI_DataModel.h b/src/HYDROGUI/HYDROGUI_DataModel.h
index 33d6a07f4886c0a3847e13ec85dc08c5eeedf996..2b7d92176c7bd94a8f5b232b6fcd805d6d783f3f 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_DataModel.h
+++ b/src/HYDROGUI/HYDROGUI_DataModel.h
@@ -150,8 +150,7 @@ public:
    * Create a new region in the given calculation case containing given zones. 
    */
   bool createNewRegion( Handle(HYDROData_CalculationCase) theCase,
-                        const QList<HYDROGUI_Zone*>& theZonesList,
-                        const bool theLandCover );
+                        const QList<HYDROGUI_Zone*>& theZonesList );
 
   /**
    * Correct an internal model object according to the current document mode
@@ -236,8 +235,7 @@ public:
    * \param theLandCover if true - land cover regions will be represented in the tree
    */
   void buildCaseTree( SUIT_DataObject*                  theParent,
-                      Handle(HYDROData_CalculationCase) theCase,
-                      const bool theLandCover );
+                      Handle(HYDROData_CalculationCase) theCase );
 
   /**
    * Updates the object subtree.
@@ -257,6 +255,14 @@ public:
    */
   static QString partitionName( const ObjectKind theObjectKind );
 
+  /**
+   * Creates the default Strickler table object: both GUI data object and corresponding model object
+   * \param theDocument a document into which created object will be added
+   * \param theParent a created object will be appended as a child of this GUI object
+   */
+  void                 createDefaultStricklerTable( const Handle(HYDROData_Document)& theDocument,
+                                                    LightApp_DataObject*              theParent );
+
 protected:
   /**
    * Returns the document for the current study
@@ -326,13 +332,6 @@ protected:
                                      const QString&           theParentEntry,
                                      const bool               theIsBuildTree ,
                                      const bool               theIsInOperation = false );
-  /**
-   * Creates the default Strickler table object: both GUI data object and corresponding model object
-   * \param theDocument a document into which created object will be added
-   * \param theParent a created object will be appended as a child of this GUI object
-   */
-  void                 createDefaultStricklerTable( const Handle(HYDROData_Document)& theDocument,
-                                                    LightApp_DataObject*              theParent );
   /**
    * Build partition for object.
    * \param theObject gui object for which the partition will be build