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

diff --git a/src/HYDROGUI/HYDROGUI_CalculationDlg.h b/src/HYDROGUI/HYDROGUI_CalculationDlg.h
index f559b07f..6b5a4463 100644
--- a/src/HYDROGUI/HYDROGUI_CalculationDlg.h
+++ b/src/HYDROGUI/HYDROGUI_CalculationDlg.h
@@ -1,12 +1,8 @@
-// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
+// Copyright (C) 2014-2015  EDF-R&D
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -20,11 +16,13 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
+
 #ifndef HYDROGUI_CALCULATIONDLG_H
 #define HYDROGUI_CALCULATIONDLG_H
 
 #include "HYDROGUI_Wizard.h"
 #include <HYDROData_CalculationCase.h>
+#include <HYDROData_LandCoverMap.h>
 
 class HYDROGUI_ObjSelector;
 class HYDROGUI_DataBrowser;
@@ -56,7 +54,7 @@ public:
   void                       reset();
 
   int                        getMode() const;
-
+  
   void                       setObjectName( const QString& theName );
   QString                    getObjectName() const;
 
@@ -65,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;
@@ -89,6 +89,12 @@ public slots:
   void                       onAlreadyExists( QString theName );
   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.
    */
@@ -104,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();
@@ -120,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;
 
@@ -152,7 +172,7 @@ private:
   HYDROGUI_DataBrowser*      myBrowser;
   Handle(HYDROData_CalculationCase) myEditedObject;
   QComboBox*                 myBathymetryChoice;
-  QLabel*                    myBatimetryLabel;
+  QLabel*                    myBathymetryLabel;
   HYDROGUI_Zone*             myCurrentZone;
 };