Merge branch 'BR_2017_PORTING' into BR_2018_V8_5

[modules/hydro.git] / src / HYDROData / HYDROData_LandCoverMap.cxx

diff --git a/src/HYDROData/HYDROData_LandCoverMap.cxx b/src/HYDROData/HYDROData_LandCoverMap.cxx
index 18eaeee8f584d2a19cb444de85aa5a08529895a2..873ba0580f49b0e4aec75e05346ed62cbc8496ac 100644 (file)
--- a/src/HYDROData/HYDROData_LandCoverMap.cxx
+++ b/src/HYDROData/HYDROData_LandCoverMap.cxx
@@ -678,8 +678,7 @@ TopoDS_Shape HYDROData_LandCoverMap::MergeFaces( const TopTools_ListOfShape& the
   aPF.SetFuzzyValue( theTolerance );
 
   aPF.Perform();
-  anError = aPF.ErrorStatus();
-  if( anError )
+  if( aPF.HasErrors())
     return TopoDS_Shape();
 
   BOPAlgo_Builder anAlgo;
@@ -688,8 +687,7 @@ TopoDS_Shape HYDROData_LandCoverMap::MergeFaces( const TopTools_ListOfShape& the
     anAlgo.AddArgument( anIt.Value() );
 
   anAlgo.PerformWithFiller( aPF ); 
-  anError = anAlgo.ErrorStatus();
-  if( anError )
+  if( anAlgo.HasErrors())
     return TopoDS_Shape();
 
   const TopoDS_Shape& aMergedShape = anAlgo.Shape();
@@ -856,8 +854,7 @@ bool HYDROData_LandCoverMap::LocalPartition( const TopoDS_Shape& theNewShape, co
   // prepare pave filler
   aPaveFiller.SetArguments( aShapesList );
   aPaveFiller.Perform();
-  Standard_Integer anError = aPaveFiller.ErrorStatus();
-  if( anError )
+  if( aPaveFiller.HasErrors())
     return false;
 
   // add faces to builder
@@ -869,8 +866,7 @@ bool HYDROData_LandCoverMap::LocalPartition( const TopoDS_Shape& theNewShape, co
 
   // perform the partition with the pave filler
   aBuilder.PerformWithFiller( aPaveFiller );
-  anError = aBuilder.ErrorStatus();
-  if( anError )
+  if( aBuilder.HasErrors())
     return false;
 
   //std::cout << "History:" << std::endl;
@@ -1043,6 +1039,7 @@ void HYDROData_LandCoverMap::StoreLandCovers( const HYDROData_MapOfFaceToStrickl
   }
   
   Handle( TDataStd_ExtStringArray ) aTypes = TDataStd_ExtStringArray::Set( myLab.FindChild( DataTag_Types ), 0, aSTypes.size() - 1, Standard_True );
+  aTypes->SetID(TDataStd_ExtStringArray::GetID());
   int k = 0;
   foreach (QString aST, aSTypes)
   {