Merge branch 'BR_1328' into BR_DEMO

[modules/hydro.git] / src / HYDROGUI / HYDROGUI_LandCoverMapDlg.h

diff --git a/src/HYDROGUI/HYDROGUI_LandCoverMapDlg.h b/src/HYDROGUI/HYDROGUI_LandCoverMapDlg.h
index 2334a61a894cfa7bc12aef8770a1e0ff08dfb8f5..3547feb8da8e3e1fb9baa47452ae57f236d91bb9 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_LandCoverMapDlg.h
+++ b/src/HYDROGUI/HYDROGUI_LandCoverMapDlg.h
@@ -16,14 +16,11 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-// REMOVED FROM THE PROJECT, BUT KEPT AS A REFERENCE FILE. TO BE DELETED LATER.
-
 #ifndef HYDROGUI_LANDCOVERMAPDLG_H
 #define HYDROGUI_LANDCOVERMAPDLG_H
 
-#include "HYDROGUI_InputPanel.h"
-
-#include "HYDROGUI_ObjComboBox.h"
+#include <HYDROGUI_InputPanel.h>
+#include <HYDROGUI_LandCoverArgsFilter.h>
 
 class HYDROGUI_StricklerTypeComboBox;
 
@@ -31,7 +28,7 @@ class QGroupBox;
 class QLineEdit;
 class QLabel;
 
-class HYDROGUI_LandCoverMapDlg : public HYDROGUI_InputPanel, public HYDROGUI_ObjComboBoxFilter
+class HYDROGUI_LandCoverMapDlg : public HYDROGUI_InputPanel
 {
   Q_OBJECT
 
@@ -54,14 +51,13 @@ public:
 
   void                     updateSelectedLandCoversLabel( int theNbSelected );
 
-  virtual bool             isOk( const Handle(HYDROData_Entity)& ) const;
-
 signals:
   void                     landCoverMapChanged( const QString& theName );
+  void                     polylineFaceChanged();
 
 private slots:
   void                     onLandCoverMapChanged();
-  void                     onPolylineFaceChanged( const QString& );
+  void                     onPolylineFaceChanged();
 
 private:
   void                     updateState( bool theInitialConfigure = false );
@@ -78,6 +74,7 @@ private:
   QLabel*                         myStricklerTypesLabel;
   HYDROGUI_StricklerTypeComboBox* myStricklerTypes;
   QLabel*                         mySelectedLandCoversLabel;
+  HYDROGUI_LandCoverArgsFilter    myFilter;
 };
 
 #endif