X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_CalculationDlg.h;h=eaf3aa26aa6a52a2e81a437d88753c6953b79619;hb=a1431f03eac1d1aed4203d0568d987c41ce939b3;hp=11d38363ba97aa92df0abc70e6bd42ac659f64f9;hpb=a8a5de888cfc087b13db88108b9d2c729a13c5d2;p=modules%2Fhydro.git

diff --git a/src/HYDROGUI/HYDROGUI_CalculationDlg.h b/src/HYDROGUI/HYDROGUI_CalculationDlg.h
index 11d38363..eaf3aa26 100644
--- a/src/HYDROGUI/HYDROGUI_CalculationDlg.h
+++ b/src/HYDROGUI/HYDROGUI_CalculationDlg.h
@@ -53,14 +53,26 @@ public:
 
   void                       setEditedObject( const Handle(HYDROData_CalculationCase) theCase );
 
-  void                       setGeomObjects( const QStringList& theObjects );
+  void                       setAllGeomObjects( const QStringList& theObjects, const QStringList& theObjectsEntries );
+  void                       setPolylineNames( const QStringList& theObjects, const QStringList& theObjectsEntries );
   QStringList                getSelectedGeomObjects() const;
+  QStringList                getSelectedAvailableGeomObjects() const;
+  QStringList                getSelectedGroups() const;
+  QStringList                getSelectedAvailableGroups() const;
   HYDROGUI_Zone*             getCurrentZone() const;
 
+  void                       setAvailableGroups( const QStringList& );
+
 public slots:
+  void                       setBoundary( const QString& theObjName );
+  void                       includeGeomObjects( const QStringList& theObjects );
+  void                       excludeGeomObjects( const QStringList& theObjects );
+  void                       includeGroups( const QStringList& theObjects );
+  void                       excludeGroups( const QStringList& theObjects );
   void                       onEmptyName();
   void                       onAlreadyExists( QString theName );
   void                       refreshZonesBrowser();
+  void                       onDataChanged();
   /**
    * Process items selection: hide/show bathymetry merge type selector.
    */
@@ -78,25 +90,40 @@ public slots:
 signals:
   void                       addObjects();
   void                       removeObjects();
-  void                       objectSelected( const QString & theObjName );
-  void                       splitZones();
-  void                       hideZones();
+  void                       objectsSelected();
+
+  void                       addGroups();
+  void                       removeGroups();
+  void                       groupsSelected();
+
+  void                       boundarySelected( const QString & theObjName );
   void                       setMergeType( int theMergeType, QString& theBathymetryName );
   void                       createRegion( const QList<SUIT_DataObject*>& theZonesList );
   void                       moveZones( SUIT_DataObject* theRegion, const QList<SUIT_DataObject*>& theZonesList );
   void                       clickedInZonesBrowser( SUIT_DataObject* );
 
+protected:
+
+  virtual bool               acceptCurrent() const;
+
 private:
 
   QWizardPage*               createObjectsPage();
+  QWizardPage*               createGroupsPage();
   QWizardPage*               createZonesPage();
 
   QGroupBox*                 myObjectNameGroup;
   QLineEdit*                 myObjectName;
   HYDROGUI_NameValidator*    myValidator;
 
+  QComboBox*                 myPolylineName;
+
+  QListWidget*               myAvailableGeomObjects;
   QListWidget*               myGeomObjects;
 
+  QListWidget*               myAvailableGroups;
+  QListWidget*               myGroups;
+
   HYDROGUI_DataBrowser*      myBrowser;
   Handle(HYDROData_CalculationCase) myEditedObject;
   QComboBox*                 myBathymetryChoice;