X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_LandCoverMap.cxx;h=a429e381ae43931784e002cf925fac6169926e8a;hb=545854182f0363f61284d5abe34c3627d4f3b088;hp=449c443e57a404c5e0db173570de386dc22f87ef;hpb=40025264ffe3c9de3de7b8f20da4cc73b1ad3f14;p=modules%2Fhydro.git

diff --git a/src/HYDROData/HYDROData_LandCoverMap.cxx b/src/HYDROData/HYDROData_LandCoverMap.cxx
index 449c443e..a429e381 100644
--- a/src/HYDROData/HYDROData_LandCoverMap.cxx
+++ b/src/HYDROData/HYDROData_LandCoverMap.cxx
@@ -208,10 +208,12 @@ HYDROData_LandCoverMap::DBFStatus HYDROData_LandCoverMap::ImportDBF( const QStri
                                                                      const QString& theFieldName, 
                                                                      const QStringList& theDBFValues,
                                                                      const QStringList& theStricklerTypes,
-                                                                     QMap<int, int> theIndices )
+                                                                     const QList<int>& theIndices )
 {
+  if (theDBFValues.size() != theStricklerTypes.size())
+    return DBFStatus_DIFF_SIZE_ERROR;
   HYDROData_ShapeFile aDBFImporter;
-  if (aDBFImporter.DBF_OpenDBF(theDBFFileName))
+  if (!aDBFImporter.DBF_OpenDBF(theDBFFileName))
     return DBFStatus_OPEN_FILE_ERROR; //cant open file
 
   QStringList FieldList = aDBFImporter.DBF_GetFieldList();
@@ -230,7 +232,7 @@ HYDROData_LandCoverMap::DBFStatus HYDROData_LandCoverMap::ImportDBF( const QStri
     HYDROData_ShapeFile::DBF_AttrValue AValue = theAttrV[theIndices[CurIndex]];
     int StricklerTypesInd = theDBFValues.indexOf(QString(AValue.myStrVal));
     if ( StricklerTypesInd != -1)
-      anIt.SetStricklerType(theDBFValues[StricklerTypesInd]);
+      anIt.SetStricklerType(theStricklerTypes[StricklerTypesInd]);
     else
       allOK = false;
   }
@@ -523,7 +525,11 @@ TopoDS_Shape HYDROData_LandCoverMap::MergeFaces( const TopTools_ListOfShape& the
   BOPCol_ListOfShape aLC;
   anIt.Initialize(theFaces);
   for( ; anIt.More(); anIt.Next() )
+  {
+    if (anIt.Value().ShapeType() != TopAbs_FACE)
+      return TopoDS_Shape();
     aLC.Append( anIt.Value() );
+  }
 
   BOPAlgo_PaveFiller aPF;
   aPF.SetArguments( aLC );
@@ -698,9 +704,11 @@ bool HYDROData_LandCoverMap::LocalPartition( const TopoDS_Shape& theNewShape, co
 */
 void HYDROData_LandCoverMap::StoreLandCovers( const HYDROData_MapOfFaceToStricklerType& theMap )
 {
-  TopoDS_Compound aCompound;
-  BRep_Builder aCompoundBuilder;
-  aCompoundBuilder.MakeCompound( aCompound );
+  TopoDS_Shell aShell;
+  BRep_Builder aShellBuilder;
+  aShellBuilder.MakeShell( aShell );
+  aShell.Closed( Standard_False );
+  TopTools_ListOfShape aListOfFaces;
 
   int n = theMap.Size();
   Handle( TDataStd_ExtStringArray ) aTypes = 
@@ -709,12 +717,16 @@ void HYDROData_LandCoverMap::StoreLandCovers( const HYDROData_MapOfFaceToStrickl
   for( int i=0; aNFIt.More(); aNFIt.Next(), i++ )
   {
     TopoDS_Face aFace = aNFIt.Key();
+    if (aFace.IsNull())
+      continue;
     QString aType = aNFIt.Value();
-    aCompoundBuilder.Add( aCompound, aFace );
+    aShellBuilder.Add( aShell, aFace );
+    aListOfFaces.Append(aFace);
     aTypes->SetValue( i, HYDROData_Tool::toExtString( aType ) );
   }
+  TopoDS_Shape aMF = MergeFaces(aListOfFaces, false);
 
-  SetShape( aCompound );
+  SetShape( aListOfFaces.Extent() < 2 ? aShell : MergeFaces(aListOfFaces, false));
 }
 
 /**
@@ -737,3 +749,27 @@ TopoDS_Face HYDROData_LandCoverMap::FindByPoint( const gp_Pnt2d& thePoint, QStri
   theType = "";
   return TopoDS_Face();
 }
+
+/**
+  Dump to Python
+  @param theTreatedObjects the map of treated objects
+*/
+QStringList HYDROData_LandCoverMap::DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const
+{
+  QStringList aResList = dumpObjectCreation( theTreatedObjects );
+  QString aName = GetObjPyName();
+
+  //Handle(HYDROData_PolylineXY) aHydAxis = GetHydraulicAxis();
+  //setPythonReferenceObject( theTreatedObjects, aResList, aHydAxis, "SetHydraulicAxis" );
+
+  //HYDROData_SequenceOfObjects aSeqOfProfiles = GetProfiles();
+  //for ( int i = 1, aNb = aSeqOfProfiles.Size(); i <= aNb; ++i )
+  //{
+    //const Handle(HYDROData_Entity) aProfile = aSeqOfProfiles.Value( i );
+    //setPythonReferenceObject( theTreatedObjects, aResList, aProfile, "AddProfile" );
+  //}
+
+  //TODO
+
+  return aResList;
+}