X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_CalculationDlg.h;h=07307c744ab465a48e758dcfdd7324779bd6e2e9;hb=60c1b803621af637e863bf91a54f59251a28552c;hp=f4ee385fd047cbee7db7f1c5bf57e309f9554612;hpb=21eebcb554d7cf6c6ee051aca4f01d84750abce3;p=modules%2Fhydro.git

diff --git a/src/HYDROGUI/HYDROGUI_CalculationDlg.h b/src/HYDROGUI/HYDROGUI_CalculationDlg.h
index f4ee385f..07307c74 100644
--- a/src/HYDROGUI/HYDROGUI_CalculationDlg.h
+++ b/src/HYDROGUI/HYDROGUI_CalculationDlg.h
@@ -22,7 +22,7 @@
 
 #include "HYDROGUI_Wizard.h"
 #include <HYDROData_CalculationCase.h>
-#include <HYDROData_LandCover.h>
+#include <HYDROData_LandCoverMap.h>
 
 class HYDROGUI_ObjSelector;
 class HYDROGUI_DataBrowser;
@@ -54,8 +54,7 @@ public:
   void                       reset();
 
   int                        getMode() const;
-  int                        getLandCoverMode() const;
-
+  
   void                       setObjectName( const QString& theName );
   QString                    getObjectName() const;
 
@@ -63,28 +62,28 @@ public:
 
   void                       setAllGeomObjects( const QStringList& theObjects, const QStringList& theObjectsEntries );
   QStringList                getAllGeomObjects() const;
-  void                       setAllLandCovers( const QStringList& theObjects, const QStringList& theObjectsEntries );
-  QStringList                getAllLandCovers() 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                getSelectedLandCovers() const;
   QStringList                getSelectedAvailableGeomObjects() const;
-  QStringList                getSelectedAvailableLandCovers() const;
   QStringList                getSelectedGroups() const;
   QStringList                getSelectedAvailableGroups() const;
+  QStringList                getSelectedBoundaryPolygons() const;
+  QStringList                getSelectedISBoundaryPolygons() const;
+  QStringList                getSelectedAvailableBoundaryPolygons() const;
   HYDROGUI_Zone*             getCurrentZone() const;
   
   void                       setAvailableGroups( const QStringList& );
 
+  void                       setAvailableBoundaryPolygons( const QStringList&, const QVector<int>& );
+
   void                       setEditZonesEnabled( const bool theIsEnabled );
-  void                       setEditLandCoversEnabled( const bool theIsEnabled );
 
   HYDROData_ListOfRules      getRules() const;
   void                       setRules( const HYDROData_ListOfRules& theRules ) const;
 
-  HYDROData_ListOfRules      getLandCoverRules() const;
-  void                       setLandCoverRules( const HYDROData_ListOfRules& theRules ) const;
+  QList<Handle(HYDROData_Entity)> getGeometryObjects(bool GeomObjOnly = true);
 
 public slots:
   void                       setMode( int theMode );
@@ -93,18 +92,24 @@ public slots:
   void                       excludeGeomObjects( const QStringList& theObjects );
   void                       includeGroups( const QStringList& theObjects );
   void                       excludeGroups( const QStringList& theObjects );
+
+  void                       includeBoundaryPolygons( const QStringList& theObjects );
+  void                       includeISBoundaryPolygons( const QStringList& theObjects );
+
+  void                       excludeBoundaryPolygons( const QStringList& theObjects );
+  void                       excludeISBoundaryPolygons( const QStringList& theObjects );
+
+
   void                       onEmptyName();
   void                       onAlreadyExists( QString theName );
   void                       refreshZonesBrowser();
   void                       onDataChanged();
   void                       onOrderChanged();
+  void                       onRuleChanged();
 
-  void                       setLandCoverMode( int theMode );
   void                       setStricklerTable( const QString& theStricklerTableName, bool theBlockSignals = true );
-  void                       includeLandCovers( const QStringList& theLandCovers, bool theReset );
-  void                       excludeLandCovers( const QStringList& theLandCovers );
-  void                       onOrderLandCoverChanged();
-
+  void                       setLandCoverMap( const QString& theLandCoverMapName, bool theBlockSignals = true );
+  
   /**
    * Process items selection: hide/show bathymetry merge type selector.
    */
@@ -126,26 +131,27 @@ signals:
   void                       removeObjects();
   void                       objectsSelected();
   void                       orderChanged( bool& isConfirmed );
+  void                       ruleChanged( bool& isConfirmed );
 
   void                       addGroups();
   void                       removeGroups();
   void                       groupsSelected();
 
+  void                       addBoundaryPolygons();
+  void                       removeBoundaryPolygons();
+
   void                       boundarySelected( const QString & theObjName );
   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* );
 
-  void                       changeLandCoverMode( int theMode );
+  void                       landCoverMapSelected( const QString & theObjName );
 
-  void                       addLandCovers();
-  void                       removeLandCovers();
-  void                       landCoversSelected();
-  void                       orderLandCoverChanged( bool& isConfirmed );
-  
   void                       StricklerTableSelected( const QString & theObjName );
 
+  void                       regenerateColors();
+
 protected:
 
   virtual bool               acceptCurrent() const;
@@ -154,47 +160,45 @@ protected slots:
   void OnNewRegion();
 
 private:
-  QList<Handle(HYDROData_Entity)> getGeometryObjects();
-  QList<Handle(HYDROData_Entity)> getLandCovers();
 
+  
   QWizardPage*               createObjectsPage();
   QWizardPage*               createGroupsPage();
-  QWizardPage*               createLandCoversPage();
-  QWizardPage*               createZonesPage();
-  QWizardPage*               createLandCoversPartitionPage();
+  QWizardPage*               createBoundaryPolygonsPage();
 
+  QWizardPage*               createLandCoverMapPage();
+  QWizardPage*               createZonesPage();
+  
   QSplitter*                 mySplitter;
-  QSplitter*                 myLandCoverSplitter;
-
+  
   QGroupBox*                 myObjectNameGroup;
   QLineEdit*                 myObjectName;
   HYDROGUI_NameValidator*    myValidator;
 
   QComboBox*                 myPolylineName;
+  QComboBox*                 myLandCoverMapName;
   QComboBox*                 myStricklerTableName;
 
   QButtonGroup*              myModeButtons;
-  QButtonGroup*              myLandCoverModeButtons;
 
   QListWidget*               myAvailableGeomObjects;
   HYDROGUI_OrderedListWidget* myGeomObjects;
 
   HYDROGUI_PriorityWidget*   myPriorityWidget;
-  HYDROGUI_PriorityWidget*   myLandCoverPriorityWidget;
 
   QListWidget*               myAvailableGroups;
   QListWidget*               myGroups;
 
-  QListWidget*               myAvailableLandCovers;
-  HYDROGUI_OrderedListWidget* myLandCovers;
+  QListWidget*               myAvailableBoundaryPolygons;
+  QListWidget*               myBoundaryPolygons;
+  QListWidget*               myISBoundaryPolygons;
+
 
   HYDROGUI_DataBrowser*      myBrowser;
   Handle(HYDROData_CalculationCase) myEditedObject;
   QComboBox*                 myBathymetryChoice;
   QLabel*                    myBathymetryLabel;
   HYDROGUI_Zone*             myCurrentZone;
-
-  HYDROGUI_DataBrowser*      myLandCoverBrowser;
 };
 
 #endif