NCollection sequences improved.

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

diff --git a/src/HYDROData/HYDROData_CalculationCase.h b/src/HYDROData/HYDROData_CalculationCase.h
index ed719a93709e92615376f6c8610661a87a542ed9..0f2d6579c4c63824ca34f654a9796e441b3e71fd 100644 (file)
--- a/src/HYDROData/HYDROData_CalculationCase.h
+++ b/src/HYDROData/HYDROData_CalculationCase.h
@@ -3,7 +3,7 @@
 #ifndef HYDROData_CalculationCase_HeaderFile
 #define HYDROData_CalculationCase_HeaderFile
 
-#include <HYDROData_Entity.h>
+#include <HYDROData_ShapesGroup.h>
 
 // IDL includes
 #include <SALOMEconfig.h>
@@ -67,7 +67,7 @@ public:
 
   /**
    * Updates the name of this object.
-   * Reimplemented to update the names of regions and zones.
+   * Reimplemented to update the names of regions, zones and splitted groups.
    */
   HYDRODATA_EXPORT virtual void SetName( const QString& theName );
 
@@ -201,8 +201,8 @@ public:
    * \param theStudy SALOMEDS study, is used for publishing of GEOM objects
    * \return true in case of success
    */
-  HYDRODATA_EXPORT virtual bool Export( GEOM::GEOM_Gen_var theGeomEngine,
-                                        SALOMEDS::Study_ptr theStudy );
+  HYDRODATA_EXPORT virtual bool Export( GEOM::GEOM_Gen_var  theGeomEngine,
+                                        SALOMEDS::Study_ptr theStudy ) const;
 
 public:      
   // Public methods to work with Calculation services
@@ -244,12 +244,6 @@ private:
    */
   HYDRODATA_EXPORT virtual Handle(HYDROData_SplittedShapesGroup) addNewSplittedGroup();
 
-  /**
-   * Returns shell containing faces which correspond to regions.
-   * \return shell as TopoDS_Shell
-   */
-  HYDRODATA_EXPORT virtual TopoDS_Shell GetShell();
-
   /**
    * Exports the given faces as shell and the given groups to GEOM module.
    * \param theGeomEngine GEOM module engine
@@ -258,10 +252,10 @@ private:
    * \param theSplittedGroups the list of groups
    * \return true in case of success
    */
-  HYDRODATA_EXPORT bool Export( GEOM::GEOM_Gen_var theGeomEngine,
-                                SALOMEDS::Study_ptr theStudy,
-                                const TopTools_ListOfShape& theFaces,
-                                const HYDROData_SequenceOfObjects& theSplittedGroups );
+  HYDRODATA_EXPORT bool Export( GEOM::GEOM_Gen_var                            theGeomEngine,
+                                SALOMEDS::Study_ptr                           theStudy,
+                                const TopTools_ListOfShape&                   theFaces,
+                                const HYDROData_ShapesGroup::SeqOfGroupsDefs& theGroupsDefs ) const;
 
   /**
    * Publish the given shape in GEOM as a GEOM object.
@@ -271,10 +265,10 @@ private:
    * \param theName the name of the published object
    * \return the published GEOM object
    */
-  GEOM::GEOM_Object_ptr publishShapeInGEOM( GEOM::GEOM_Gen_var theGeomEngine,
+  GEOM::GEOM_Object_ptr publishShapeInGEOM( GEOM::GEOM_Gen_var  theGeomEngine,
                                             SALOMEDS::Study_ptr theStudy,
                                             const TopoDS_Shape& theShape, 
-                                            const QString& theName );
+                                            const QString&      theName ) const;
 
 protected: