X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_CalculationDlg.h;h=e2791f2140a016fff88809ed9c9138cd7f81add0;hb=5cae7e874afd2fc1b6f61023e8ebd33a933db3c7;hp=fa48b3690df6f9a2ef333b9f521dff8033f3fa0f;hpb=104fb853e59d3f22d9ff8fcfd9d93257e7ad0398;p=modules%2Fhydro.git

diff --git a/src/HYDROGUI/HYDROGUI_CalculationDlg.h b/src/HYDROGUI/HYDROGUI_CalculationDlg.h
index fa48b369..e2791f21 100644
--- a/src/HYDROGUI/HYDROGUI_CalculationDlg.h
+++ b/src/HYDROGUI/HYDROGUI_CalculationDlg.h
@@ -31,9 +31,12 @@ class QGroupBox;
 class QLineEdit;
 class QListWidget;
 class QComboBox;
+class QLabel;
 class QStringList;
 class HYDROGUI_DataBrowser;
 class HYDROGUI_NameValidator;
+class SUIT_DataObject;
+class HYDROGUI_Zone;
 
 class HYDROGUI_CalculationDlg : public HYDROGUI_Wizard
 {
@@ -53,15 +56,31 @@ public:
   void                       setGeomObjects( const QStringList& theObjects );
   void                       setSelectedGeomObjects( const QStringList& theObjects );
   QStringList                getSelectedGeomObjects() const;
+  HYDROGUI_Zone*             getCurrentZone() const;
 
 public slots:
-    void                     onEmptyName();
-    void                     onAlreadyExists( QString theName );
+  void                       onEmptyName();
+  void                       onAlreadyExists( QString theName );
+  void                       refreshZonesBrowser();
+  /**
+   * Process items selection: hide/show bathymetry merge type selector.
+   */
+  void                       onSelected( SUIT_DataObject* theObject );
+  /**
+   * Process merge type selection: set the selected bathymetry merge type for the currently selected zone.
+   */
+  void                       onMergeTypeSelected( int theIndex );
+  /**
+   * Process zones moving. Create a new region with dropped zones or add to existing one.
+   */
+  void                       onZonesDropped( const QList<SUIT_DataObject*>& theList, 
+    SUIT_DataObject* theTargetParent, int theTargetRow, Qt::DropAction theDropAction );
 
 signals:
-    void                     addObjects();
-    void                     removeObjects();
-    void                     splitZones();
+  void                       addObjects();
+  void                       removeObjects();
+  void                       splitZones();
+  void                       setMergeType( int theMergeType, QString theBathymetryName );
 
 private:
 
@@ -74,9 +93,11 @@ private:
 
   QListWidget*               myGeomObjects;
 
-  HYDROGUI_DataBrowser*         myBrowser;
+  HYDROGUI_DataBrowser*      myBrowser;
   Handle(HYDROData_CalculationCase) myEditedObject;
-  QComboBox*                    myBathymetryChoice;
+  QComboBox*                 myBathymetryChoice;
+  QLabel*                    myBatimetryLabel;
+  HYDROGUI_Zone*             myCurrentZone;
 };
 
 #endif