test Strickler

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

diff --git a/src/HYDROData/HYDROData_LandCoverMap.cxx b/src/HYDROData/HYDROData_LandCoverMap.cxx
index c766e5caf2811dd2ed822a72cd747d432aa48639..18eaeee8f584d2a19cb444de85aa5a08529895a2 100644 (file)
--- a/src/HYDROData/HYDROData_LandCoverMap.cxx
+++ b/src/HYDROData/HYDROData_LandCoverMap.cxx
@@ -1084,7 +1084,7 @@ TopoDS_Face HYDROData_LandCoverMap::FindByPoint( const gp_Pnt2d& thePoint, QStri
 
 void Dump( const QString& theName, const QStringList& theList, QStringList& theLines )
 {
-  theLines.append( QString( "%1 = QStringList()" ).arg( theName ) );
+  theLines.append( QString( "%1 = []" ).arg( theName ) );
   foreach( QString anItem, theList )
     theLines.append( QString( "%1.append( u\"%2\" )" ).arg( theName ).arg( anItem ) );
 }
@@ -1111,13 +1111,15 @@ QStringList HYDROData_LandCoverMap::DumpToPython( const QString&       thePyScri
   HYDROData_Document::Document( myLab )->CollectQGISValues( anAttr, anAttrValues, aTypes );
   ExportDBF( aDbfFileName, anAttr, anAttrValues, aTypes );
 
-  aResList << QString( "%1.ImportSHP( '%2' )" ).
+  aResList << QString( "if not(%1.ImportSHP( '%2' )):" ).
     arg( aName ).arg( QFileInfo( aShpFileName ).fileName() );
+  aResList << QString( "  raise ValueError('problem while loading LandCoverMap shape')" );
 
   Dump( "attr_values", anAttrValues, aResList );
   Dump( "types", aTypes, aResList );
-  aResList << QString( "%1.ImportDBF( '%2', '%3', attr_values, types )" ).
+  aResList << QString( "if (%1.ImportDBF( '%2', '%3', attr_values, types ) != %1.DBFStatus_OK):" ).
     arg( aName ).arg( QFileInfo( aDbfFileName ).fileName() ).arg( anAttr );
+  aResList << QString( "  raise ValueError('problem while loading LandCoverMap data base')" );
 
   return aResList;
 }