Merge branch 'BR_LAND_COVER_MAP' of ssh://git.salome-platform.org/modules/hydro into...

diff --cc .gitignore
index 12916051c48cbbcb0c5ba6930785f3e3ac094c22,12916051c48cbbcb0c5ba6930785f3e3ac094c22..2b75ba9e1c59ce44461cbfe4dc7d1cc4803b6fa7
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -2,3 -2,3 +2,7 @@@ htm
  latex
  documentation.log
  tests.cfg
++
++/src/HYDROGUI/HYDROGUI_LandCoverMapDlg.cxx.BASE.cxx
++/src/HYDROGUI/HYDROGUI_LandCoverMapDlg.cxx.LOCAL.cxx
++/src/HYDROGUI/HYDROGUI_LandCoverMapDlg.cxx.REMOTE.cxx

diff --cc src/HYDROGUI/HYDROGUI_LandCoverMapDlg.cxx
index be0bb55c7eed6f1f8ec0271df2f3fca2c5b327a4,91f3a973326ef6b36d0623fbeb809959c7955345..565b678f5d72c2b02257116cec95654175639007
--- 1/src/HYDROGUI/HYDROGUI_LandCoverMapDlg.cxx
--- 2/src/HYDROGUI/HYDROGUI_LandCoverMapDlg.cxx
+++ b/src/HYDROGUI/HYDROGUI_LandCoverMapDlg.cxx
@@@ -153,26 -147,6 +153,17 @@@ QString HYDROGUI_LandCoverMapDlg::getSe
    return myStricklerTypes->getSelectedStricklerTypeName();
  }
  
- bool HYDROGUI_LandCoverMapDlg::isOk( const Handle(HYDROData_Entity)& theEntity ) const
- {
-   Handle(HYDROData_PolylineXY) aPolylineXY = Handle(HYDROData_PolylineXY)::DownCast(theEntity);
-   Handle(HYDROData_Object) anObject2d3dPrs = Handle(HYDROData_Object)::DownCast(theEntity);  
-   return ( !anObject2d3dPrs.IsNull() ||
-            ( !aPolylineXY.IsNull() && ( ( myOperationId == CreateLandCoverMapId || myOperationId == AddLandCoverId ) && aPolylineXY->IsClosed() ||
-                                         myOperationId == SplitLandCoverId ) ) );
- }
- 
 +void HYDROGUI_LandCoverMapDlg::updateSelectedLandCoversLabel( int theNbSelected )
 +{
 +  QString aLabel;
 +  aLabel.setNum( theNbSelected );
 +  if ( theNbSelected == 0 )
 +    mySelectedLandCoversLabel->setStyleSheet("QLabel { font: italic; color : red; }");
 +  else
 +    mySelectedLandCoversLabel->setStyleSheet("QLabel { font: italic; color : black; }");
 +  mySelectedLandCoversLabel->setText( tr( "LAND_COVER_MAP_SELECTED_FACES" ) + aLabel );
 +}
 +
  void HYDROGUI_LandCoverMapDlg::onLandCoverMapChanged()
  {
    if ( signalsBlocked() )

diff --cc src/HYDROGUI/HYDROGUI_LandCoverMapDlg.h
index 2334a61a894cfa7bc12aef8770a1e0ff08dfb8f5,968db2252061f41230c501e0192799e26e5129b8..101c1f85e5ad8c77128a0b90ce5df3c1fbe940a7
--- 1/src/HYDROGUI/HYDROGUI_LandCoverMapDlg.h
--- 2/src/HYDROGUI/HYDROGUI_LandCoverMapDlg.h
+++ b/src/HYDROGUI/HYDROGUI_LandCoverMapDlg.h
@@@ -52,10 -49,6 +49,8 @@@ public
    void                     setSelectedStricklerTypeName( const QString& theName );
    QString                  getSelectedStricklerTypeName() const;
  
-   virtual bool             isOk( const Handle(HYDROData_Entity)& ) const;
- 
 +  void                     updateSelectedLandCoversLabel( int theNbSelected );
 +
  signals:
    void                     landCoverMapChanged( const QString& theName );
  
@@@ -77,7 -70,7 +72,8 @@@ private
    HYDROGUI_ObjComboBox*           myPolylinesFaces;
    QLabel*                         myStricklerTypesLabel;
    HYDROGUI_StricklerTypeComboBox* myStricklerTypes;
 +  QLabel*                         mySelectedLandCoversLabel;
+   HYDROGUI_LandCoverArgsFilter    myFilter;
  };
  
  #endif