Merge branch 'BR_1328' into BR_DEMO

[modules/hydro.git] / src / HYDROGUI / HYDROGUI_LandCoverOp.cxx

diff --git a/src/HYDROGUI/HYDROGUI_LandCoverOp.cxx b/src/HYDROGUI/HYDROGUI_LandCoverOp.cxx
index 2d2c5705a6459435b331599cbfb85420bc72c427..32d45fd4ddd11d954b0e9e876464bd0229c5b176 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_LandCoverOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_LandCoverOp.cxx
@@ -107,15 +107,16 @@ void HYDROGUI_LandCoverOp::startOperation()
     if ( !aStricklerTableObj.IsNull() )
     {
       // Get Strickler table data from the data model
-      TColStd_SequenceOfExtendedString aTypes = aStricklerTableObj->GetTypes();
-      for ( int i = 1; i <= aTypes.Length(); i++ )
+      QStringList aTypes = aStricklerTableObj->GetTypes();
+      for ( QStringList::iterator it = aTypes.begin(); it != aTypes.end(); ++it )
       {
-        QString aType = HYDROGUI_Tool::ToQString( aTypes.Value( i ) );
-        if ( !aType.isEmpty() && !aStricklerTypes.contains( aType ))
+        QString aType = *it;
+        if ( !aType.isEmpty() && !aStricklerTypes.contains( aType ) )
           aStricklerTypes.append( aType );
       }
     }
   }
+
   aStricklerTypes.sort();
   aPanel->setAdditionalParams( aStricklerTypes );
 
@@ -371,7 +372,7 @@ bool HYDROGUI_LandCoverOp::confirmPolylinesChange() const
     return true;
 
   // Check if the land cover object is already modified or not
-  bool isConfirmed = myEditedObject->IsMustBeUpdated();
+  bool isConfirmed = myEditedObject->IsMustBeUpdated( HYDROData_Entity::Geom_2d );
   if ( !isConfirmed )
   {
     // If not modified check if the land cover has already defined polylines