From: mkr <mkr@opencascade.com>
Date: Tue, 17 Nov 2015 13:02:44 +0000 (+0300)
Subject: Merge branch 'BR_LAND_COVER_MAP' of ssh://git.salome-platform.org/modules/hydro into... 
X-Git-Tag: v1.5~26^2~3
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=1bb7b3fb16a40077eaa8299a1e4be340b74f6db6;p=modules%2Fhydro.git

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

1bb7b3fb16a40077eaa8299a1e4be340b74f6db6
diff --cc .gitignore
index 12916051,12916051..2b75ba9e
--- a/.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 be0bb55c,91f3a973..565b678f
--- a/src/HYDROGUI/HYDROGUI_LandCoverMapDlg.cxx
+++ b/src/HYDROGUI/HYDROGUI_LandCoverMapDlg.cxx
@@@ -153,26 -147,6 +153,17 @@@ QString HYDROGUI_LandCoverMapDlg::getSe
    return myStricklerTypes->getSelectedStricklerTypeName();
  }
  
 +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 );
 +}
 +
- 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::onLandCoverMapChanged()
  {
    if ( signalsBlocked() )
diff --cc src/HYDROGUI/HYDROGUI_LandCoverMapDlg.h
index 2334a61a,968db225..101c1f85
--- a/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;
  
 +  void                     updateSelectedLandCoversLabel( int theNbSelected );
 +
-   virtual bool             isOk( const Handle(HYDROData_Entity)& ) const;
- 
  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