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

diff --git a/src/HYDROGUI/HYDROGUI_CalculationDlg.h b/src/HYDROGUI/HYDROGUI_CalculationDlg.h
index 9bcdfd8a..d6105168 100644
--- a/src/HYDROGUI/HYDROGUI_CalculationDlg.h
+++ b/src/HYDROGUI/HYDROGUI_CalculationDlg.h
@@ -78,11 +78,14 @@ public:
   void                       setAvailableGroups( const QStringList& );
 
   void                       setEditZonesEnabled( const bool theIsEnabled );
-  void                       setEditLandCoversEnabled( 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 );
@@ -97,9 +100,11 @@ public slots:
   void                       onOrderChanged();
 
   void                       setLandCoverMode( int theMode );
-  void                       setStricklerTable( const QString& theStricklerTableName );
-  void                       includeLandCovers( const QStringList& theLandCovers );
+  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();
 
   /**
@@ -116,6 +121,20 @@ 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 );  
 
@@ -131,7 +150,7 @@ 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 );
+  void                       moveZones( SUIT_DataObject* theRegion, const QList<SUIT_DataObject*>& theZonesList, bool theLandCover );
   void                       clickedInZonesBrowser( SUIT_DataObject* );
 
   void                       changeLandCoverMode( int theMode );
@@ -140,8 +159,11 @@ signals:
   void                       removeLandCovers();
   void                       landCoversSelected();
   void                       orderLandCoverChanged( bool& isConfirmed );
+
+  void                       createLandCoverRegion( const QList<SUIT_DataObject*>& theLandCoverZonesList );
   
   void                       StricklerTableSelected( const QString & theObjName );
+  void                       setMergeStricklerType( int theMergeType, QString& theStricklerTypeName );
 
 protected:
 
@@ -149,16 +171,17 @@ protected:
 
 protected slots:
   void OnNewRegion();
+  void OnNewLandCoverRegion();
 
 private:
-  QList<Handle(HYDROData_Object)> getGeometryObjects();
-  QList<Handle(HYDROData_LandCover)> getLandCovers();
+  QList<Handle(HYDROData_Entity)> getGeometryObjects();
+  QList<Handle(HYDROData_Entity)> getLandCovers();
 
   QWizardPage*               createObjectsPage();
   QWizardPage*               createGroupsPage();
   QWizardPage*               createLandCoversPage();
   QWizardPage*               createZonesPage();
-  QWizardPage*               createLandCoversPartitionPage();
+  QWizardPage*               createLandCoverZonesPage();
 
   QSplitter*                 mySplitter;
   QSplitter*                 myLandCoverSplitter;
@@ -192,6 +215,8 @@ private:
   HYDROGUI_Zone*             myCurrentZone;
 
   HYDROGUI_DataBrowser*      myLandCoverBrowser;
+  QComboBox*                 myStricklerTypeChoice;
+  QLabel*                    myStricklerTypeLabel;
 };
 
 #endif