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

diff --git a/src/HYDROGUI/HYDROGUI_CalculationDlg.h b/src/HYDROGUI/HYDROGUI_CalculationDlg.h
index d6105168..6b5a4463 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,14 +62,11 @@ 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;
   HYDROGUI_Zone*             getCurrentZone() const;
@@ -78,14 +74,10 @@ public:
   void                       setAvailableGroups( const QStringList& );
 
   void                       setEditZonesEnabled( const bool theIsEnabled );
-  void                       setEditLandCoverZonesEnabled( 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;
-
 public slots:
   void                       setMode( int theMode );
   void                       setBoundary( const QString& theObjName );
@@ -98,15 +90,11 @@ public slots:
   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                       refreshLandCoverZonesBrowser();
-  void                       onDataLandCoverChanged();
-  void                       onOrderLandCoverChanged();
-
+  void                       setLandCoverMap( const QString& theLandCoverMapName, bool theBlockSignals = true );
+  
   /**
    * Process items selection: hide/show bathymetry merge type selector.
    */
@@ -121,20 +109,6 @@ public slots:
   void                       onZonesDropped( const QList<SUIT_DataObject*>& theList, 
     SUIT_DataObject* theTargetParent, int theTargetRow, Qt::DropAction theDropAction );
 
-  /**
-   * Process items selection: hide/show Strickler type merge type selector.
-   */
-  void                       onLandCoverZoneSelected( SUIT_DataObject* theObject );
-  /**
-   * Process merge type selection: set the selected Strickler type merge type for the currently selected zone.
-   */
-  void                       onMergeStricklerTypeSelected( int theIndex );
-  /**
-   * Process land cover zones moving. Create a new region with dropped zones or add to existing one.
-   */
-  void                       onLandCoverZonesDropped( const QList<SUIT_DataObject*>& theList, 
-    SUIT_DataObject* theTargetParent, int theTargetRow, Qt::DropAction theDropAction );
-
 signals:
   void                       changeMode( int theMode );  
 
@@ -142,6 +116,7 @@ signals:
   void                       removeObjects();
   void                       objectsSelected();
   void                       orderChanged( bool& isConfirmed );
+  void                       ruleChanged( bool& isConfirmed );
 
   void                       addGroups();
   void                       removeGroups();
@@ -150,20 +125,14 @@ signals:
   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, bool theLandCover );
+  void                       moveZones( SUIT_DataObject* theRegion, const QList<SUIT_DataObject*>& theZonesList );
   void                       clickedInZonesBrowser( SUIT_DataObject* );
 
-  void                       changeLandCoverMode( int theMode );
-
-  void                       addLandCovers();
-  void                       removeLandCovers();
-  void                       landCoversSelected();
-  void                       orderLandCoverChanged( bool& isConfirmed );
+  void                       landCoverMapSelected( const QString & theObjName );
 
-  void                       createLandCoverRegion( const QList<SUIT_DataObject*>& theLandCoverZonesList );
-  
   void                       StricklerTableSelected( const QString & theObjName );
-  void                       setMergeStricklerType( int theMergeType, QString& theStricklerTypeName );
+
+  void                       regenerateColors();
 
 protected:
 
@@ -171,52 +140,40 @@ protected:
 
 protected slots:
   void OnNewRegion();
-  void OnNewLandCoverRegion();
 
 private:
   QList<Handle(HYDROData_Entity)> getGeometryObjects();
-  QList<Handle(HYDROData_Entity)> getLandCovers();
-
+  
   QWizardPage*               createObjectsPage();
   QWizardPage*               createGroupsPage();
-  QWizardPage*               createLandCoversPage();
+  QWizardPage*               createLandCoverMapPage();
   QWizardPage*               createZonesPage();
-  QWizardPage*               createLandCoverZonesPage();
-
+  
   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;
-
   HYDROGUI_DataBrowser*      myBrowser;
   Handle(HYDROData_CalculationCase) myEditedObject;
   QComboBox*                 myBathymetryChoice;
   QLabel*                    myBathymetryLabel;
   HYDROGUI_Zone*             myCurrentZone;
-
-  HYDROGUI_DataBrowser*      myLandCoverBrowser;
-  QComboBox*                 myStricklerTypeChoice;
-  QLabel*                    myStricklerTypeLabel;
 };
 
 #endif