X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_CalculationDlg.h;h=07307c744ab465a48e758dcfdd7324779bd6e2e9;hb=60c1b803621af637e863bf91a54f59251a28552c;hp=6b5a44639c9d80a33394c26cffd47b04bcdfca63;hpb=6527cd5d3063b2724b60b3f87ed1105244b74cb3;p=modules%2Fhydro.git

diff --git a/src/HYDROGUI/HYDROGUI_CalculationDlg.h b/src/HYDROGUI/HYDROGUI_CalculationDlg.h
index 6b5a4463..07307c74 100644
--- a/src/HYDROGUI/HYDROGUI_CalculationDlg.h
+++ b/src/HYDROGUI/HYDROGUI_CalculationDlg.h
@@ -69,15 +69,22 @@ public:
   QStringList                getSelectedAvailableGeomObjects() const;
   QStringList                getSelectedGroups() const;
   QStringList                getSelectedAvailableGroups() const;
+  QStringList                getSelectedBoundaryPolygons() const;
+  QStringList                getSelectedISBoundaryPolygons() const;
+  QStringList                getSelectedAvailableBoundaryPolygons() const;
   HYDROGUI_Zone*             getCurrentZone() const;
   
   void                       setAvailableGroups( const QStringList& );
 
+  void                       setAvailableBoundaryPolygons( const QStringList&, const QVector<int>& );
+
   void                       setEditZonesEnabled( const bool theIsEnabled );
 
   HYDROData_ListOfRules      getRules() const;
   void                       setRules( const HYDROData_ListOfRules& theRules ) const;
 
+  QList<Handle(HYDROData_Entity)> getGeometryObjects(bool GeomObjOnly = true);
+
 public slots:
   void                       setMode( int theMode );
   void                       setBoundary( const QString& theObjName );
@@ -85,6 +92,14 @@ public slots:
   void                       excludeGeomObjects( const QStringList& theObjects );
   void                       includeGroups( const QStringList& theObjects );
   void                       excludeGroups( const QStringList& theObjects );
+
+  void                       includeBoundaryPolygons( const QStringList& theObjects );
+  void                       includeISBoundaryPolygons( const QStringList& theObjects );
+
+  void                       excludeBoundaryPolygons( const QStringList& theObjects );
+  void                       excludeISBoundaryPolygons( const QStringList& theObjects );
+
+
   void                       onEmptyName();
   void                       onAlreadyExists( QString theName );
   void                       refreshZonesBrowser();
@@ -122,6 +137,9 @@ signals:
   void                       removeGroups();
   void                       groupsSelected();
 
+  void                       addBoundaryPolygons();
+  void                       removeBoundaryPolygons();
+
   void                       boundarySelected( const QString & theObjName );
   void                       setMergeType( int theMergeType, QString& theBathymetryName );
   void                       createRegion( const QList<SUIT_DataObject*>& theZonesList );
@@ -142,10 +160,12 @@ protected slots:
   void OnNewRegion();
 
 private:
-  QList<Handle(HYDROData_Entity)> getGeometryObjects();
+
   
   QWizardPage*               createObjectsPage();
   QWizardPage*               createGroupsPage();
+  QWizardPage*               createBoundaryPolygonsPage();
+
   QWizardPage*               createLandCoverMapPage();
   QWizardPage*               createZonesPage();
   
@@ -169,6 +189,11 @@ private:
   QListWidget*               myAvailableGroups;
   QListWidget*               myGroups;
 
+  QListWidget*               myAvailableBoundaryPolygons;
+  QListWidget*               myBoundaryPolygons;
+  QListWidget*               myISBoundaryPolygons;
+
+
   HYDROGUI_DataBrowser*      myBrowser;
   Handle(HYDROData_CalculationCase) myEditedObject;
   QComboBox*                 myBathymetryChoice;