X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_CalculationDlg.h;h=a769f3d44ddd8eecdd81bb41a939568eba419d1f;hb=a53349567d67f4df0ef737798a25c24d9dc8f08e;hp=15b7578baca31ffc6f291ffe1d347e9ec22da044;hpb=0f62455b5aadea95c79ed6a42871ed1b85f90bc1;p=modules%2Fhydro.git

diff --git a/src/HYDROGUI/HYDROGUI_CalculationDlg.h b/src/HYDROGUI/HYDROGUI_CalculationDlg.h
index 15b7578b..a769f3d4 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,6 +16,7 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
+
 #ifndef HYDROGUI_CALCULATIONDLG_H
 #define HYDROGUI_CALCULATIONDLG_H
 
@@ -27,16 +24,23 @@
 #include <HYDROData_CalculationCase.h>
 
 class HYDROGUI_ObjSelector;
+class HYDROGUI_DataBrowser;
+class HYDROGUI_NameValidator;
+class HYDROGUI_Zone;
+class HYDROGUI_OrderedListWidget;
+class HYDROGUI_PriorityWidget;
+
+class SUIT_DataObject;
+
+class QButtonGroup;
 class QGroupBox;
 class QLineEdit;
 class QListWidget;
 class QComboBox;
 class QLabel;
+class QSplitter;
 class QStringList;
-class HYDROGUI_DataBrowser;
-class HYDROGUI_NameValidator;
-class SUIT_DataObject;
-class HYDROGUI_Zone;
+
 
 class HYDROGUI_CalculationDlg : public HYDROGUI_Wizard
 {
@@ -48,24 +52,42 @@ public:
 
   void                       reset();
 
+  int                        getMode() const;
+
   void                       setObjectName( const QString& theName );
   QString                    getObjectName() const;
 
   void                       setEditedObject( const Handle(HYDROData_CalculationCase) theCase );
 
   void                       setAllGeomObjects( const QStringList& theObjects, const QStringList& theObjectsEntries );
+  QStringList                getAllGeomObjects() const;
   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& );
+
+  void                       setEditZonesEnabled( const bool theIsEnabled );
+
+  HYDROData_ListOfRules      getRules() const;
+  void                       setRules( const HYDROData_ListOfRules& theRules ) const;
 
 public slots:
+  void                       setMode( int theMode );
   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();
+  void                       onOrderChanged();
+
   /**
    * Process items selection: hide/show bathymetry merge type selector.
    */
@@ -81,35 +103,59 @@ public slots:
     SUIT_DataObject* theTargetParent, int theTargetRow, Qt::DropAction theDropAction );
 
 signals:
+  void                       changeMode( int theMode );
+
   void                       addObjects();
   void                       removeObjects();
-  void                       objectSelected( const QString & theObjName );
+  void                       objectsSelected();
+  void                       orderChanged( bool& isConfirmed );
+
+  void                       addGroups();
+  void                       removeGroups();
+  void                       groupsSelected();
+
   void                       boundarySelected( const QString & theObjName );
-  void                       splitZones();
-  void                       hideZones();
   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;
+
+protected slots:
+  void OnNewRegion();
+
 private:
+  QList<Handle(HYDROData_Object)> getGeometryObjects();
 
   QWizardPage*               createObjectsPage();
+  QWizardPage*               createGroupsPage();
   QWizardPage*               createZonesPage();
 
+  QSplitter*                 mySplitter;
+
   QGroupBox*                 myObjectNameGroup;
   QLineEdit*                 myObjectName;
   HYDROGUI_NameValidator*    myValidator;
 
   QComboBox*                 myPolylineName;
 
+  QButtonGroup*              myModeButtons;
+
   QListWidget*               myAvailableGeomObjects;
-  QListWidget*               myGeomObjects;
+  HYDROGUI_OrderedListWidget* myGeomObjects;
+
+  HYDROGUI_PriorityWidget*   myPriorityWidget;
+
+  QListWidget*               myAvailableGroups;
+  QListWidget*               myGroups;
 
   HYDROGUI_DataBrowser*      myBrowser;
   Handle(HYDROData_CalculationCase) myEditedObject;
   QComboBox*                 myBathymetryChoice;
-  QLabel*                    myBatimetryLabel;
+  QLabel*                    myBathymetryLabel;
   HYDROGUI_Zone*             myCurrentZone;
 };