From: mzn <mzn@opencascade.com>
Date: Thu, 25 Jun 2015 13:11:34 +0000 (+0300)
Subject: Merge branch 'BR_v14_rc' of ssh://git.salome-platform.org/modules/hydro into BR_v14_rc
X-Git-Tag: v1.4.2~31^2
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=3b59e1468a122ec7d237649886bc3e5d6a6a8117;p=modules%2Fhydro.git

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

3b59e1468a122ec7d237649886bc3e5d6a6a8117
diff --cc src/HYDROGUI/HYDROGUI_Module.cxx
index 80d85173,60d109b3..a4177f66
--- a/src/HYDROGUI/HYDROGUI_Module.cxx
+++ b/src/HYDROGUI/HYDROGUI_Module.cxx
@@@ -1803,23 -1799,3 +1804,23 @@@ bool HYDROGUI_Module::isLandCoversScala
  {
    return myLandCoverColoringMap.contains( theViewId );
  }
 +
 +void HYDROGUI_Module::setObjectRemoved( const Handle(HYDROData_Entity)& theObject )
 +{
 +  if ( theObject.IsNull() || !theObject->IsRemoved() ) {
 +    return;
 +  }
 +
 +  if ( theObject->GetKind() == KIND_STRICKLER_TABLE ) {
 +    Handle(HYDROData_StricklerTable) aTable = 
 +      Handle(HYDROData_StricklerTable)::DownCast( theObject );
 +    QList<int> aViewIds;
 +    QMutableMapIterator<int, Handle(HYDROData_StricklerTable)> anIter( myLandCoverColoringMap );
 +    while ( anIter.hasNext() ) {
 +      if ( HYDROGUI_DataObject::dataObjectEntry( anIter.next().value() ) == 
 +           HYDROGUI_DataObject::dataObjectEntry( aTable ) ) {
 +        anIter.remove();
 +      }
 +    }
 +  }
- }
++}