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

diff --git a/src/HYDROGUI/HYDROGUI_CalculationDlg.h b/src/HYDROGUI/HYDROGUI_CalculationDlg.h
index 7ddb5391..e2791f21 100644
--- a/src/HYDROGUI/HYDROGUI_CalculationDlg.h
+++ b/src/HYDROGUI/HYDROGUI_CalculationDlg.h
@@ -36,6 +36,7 @@ class QStringList;
 class HYDROGUI_DataBrowser;
 class HYDROGUI_NameValidator;
 class SUIT_DataObject;
+class HYDROGUI_Zone;
 
 class HYDROGUI_CalculationDlg : public HYDROGUI_Wizard
 {
@@ -55,19 +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                       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                       setMergeType( int theMergeType, QString theBathymetryName );
 
 private:
 
@@ -84,6 +97,7 @@ private:
   Handle(HYDROData_CalculationCase) myEditedObject;
   QComboBox*                 myBathymetryChoice;
   QLabel*                    myBatimetryLabel;
+  HYDROGUI_Zone*             myCurrentZone;
 };
 
 #endif