X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_CalculationDlg.h;h=6b5a44639c9d80a33394c26cffd47b04bcdfca63;hb=f993e4d01e9bb9de221db4c90d7a6c617696f3ec;hp=ba2fb2cbd9e36f1bc58dc27a1a44b28b8f12dd9e;hpb=2cf9e838e652ae811d9b3931914771ad1836c6b8;p=modules%2Fhydro.git

diff --git a/src/HYDROGUI/HYDROGUI_CalculationDlg.h b/src/HYDROGUI/HYDROGUI_CalculationDlg.h
index ba2fb2cb..6b5a4463 100644
--- a/src/HYDROGUI/HYDROGUI_CalculationDlg.h
+++ b/src/HYDROGUI/HYDROGUI_CalculationDlg.h
@@ -22,6 +22,7 @@
 
 #include "HYDROGUI_Wizard.h"
 #include <HYDROData_CalculationCase.h>
+#include <HYDROData_LandCoverMap.h>
 
 class HYDROGUI_ObjSelector;
 class HYDROGUI_DataBrowser;
@@ -53,7 +54,7 @@ public:
   void                       reset();
 
   int                        getMode() const;
-
+  
   void                       setObjectName( const QString& theName );
   QString                    getObjectName() const;
 
@@ -62,6 +63,8 @@ public:
   void                       setAllGeomObjects( const QStringList& theObjects, const QStringList& theObjectsEntries );
   QStringList                getAllGeomObjects() const;
   void                       setPolylineNames( const QStringList& theObjects, const QStringList& theObjectsEntries );
+  void                       setLandCoverMapsNames( const QStringList& theObjects, const QStringList& theObjectsEntries );
+  void                       setStricklerTableNames( const QStringList& theObjects, const QStringList& theObjectsEntries );
   QStringList                getSelectedGeomObjects() const;
   QStringList                getSelectedAvailableGeomObjects() const;
   QStringList                getSelectedGroups() const;
@@ -87,7 +90,11 @@ public slots:
   void                       refreshZonesBrowser();
   void                       onDataChanged();
   void                       onOrderChanged();
+  void                       onRuleChanged();
 
+  void                       setStricklerTable( const QString& theStricklerTableName, bool theBlockSignals = true );
+  void                       setLandCoverMap( const QString& theLandCoverMapName, bool theBlockSignals = true );
+  
   /**
    * Process items selection: hide/show bathymetry merge type selector.
    */
@@ -103,11 +110,13 @@ public slots:
     SUIT_DataObject* theTargetParent, int theTargetRow, Qt::DropAction theDropAction );
 
 signals:
-  void                       changeMode( int theMode );
+  void                       changeMode( int theMode );  
 
   void                       addObjects();
   void                       removeObjects();
   void                       objectsSelected();
+  void                       orderChanged( bool& isConfirmed );
+  void                       ruleChanged( bool& isConfirmed );
 
   void                       addGroups();
   void                       removeGroups();
@@ -119,24 +128,36 @@ signals:
   void                       moveZones( SUIT_DataObject* theRegion, const QList<SUIT_DataObject*>& theZonesList );
   void                       clickedInZonesBrowser( SUIT_DataObject* );
 
+  void                       landCoverMapSelected( const QString & theObjName );
+
+  void                       StricklerTableSelected( const QString & theObjName );
+
+  void                       regenerateColors();
+
 protected:
 
   virtual bool               acceptCurrent() const;
 
-private:
-  QList<Handle(HYDROData_Object)> getGeometryObjects();
+protected slots:
+  void OnNewRegion();
 
+private:
+  QList<Handle(HYDROData_Entity)> getGeometryObjects();
+  
   QWizardPage*               createObjectsPage();
   QWizardPage*               createGroupsPage();
+  QWizardPage*               createLandCoverMapPage();
   QWizardPage*               createZonesPage();
-
+  
   QSplitter*                 mySplitter;
-
+  
   QGroupBox*                 myObjectNameGroup;
   QLineEdit*                 myObjectName;
   HYDROGUI_NameValidator*    myValidator;
 
   QComboBox*                 myPolylineName;
+  QComboBox*                 myLandCoverMapName;
+  QComboBox*                 myStricklerTableName;
 
   QButtonGroup*              myModeButtons;