From: szy <szy@opencascade.com>
Date: Wed, 18 Dec 2013 12:48:30 +0000 (+0000)
Subject: 18.12.2013.Update of Split method (basesd on bug of Partition algorithm in history).
X-Git-Tag: BR_hydro_v_0_6~41
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=1462940bc2cdc36635cf45f8f95147fe7c2d5021;p=modules%2Fhydro.git

18.12.2013.Update of Split method (basesd on bug of Partition algorithm in history).
---

diff --git a/src/HYDROData/HYDROData_SplitToZonesTool.cxx b/src/HYDROData/HYDROData_SplitToZonesTool.cxx
index de99585d..cbc77b7c 100644
--- a/src/HYDROData/HYDROData_SplitToZonesTool.cxx
+++ b/src/HYDROData/HYDROData_SplitToZonesTool.cxx
@@ -137,10 +137,19 @@ HYDROData_SplitToZonesTool::SplitDataList
   
   // Step 3. Collect history  
   HYDROData_DataMapOfShapeListOfShape aDM1;
-  anIt.Init(aLS);
+  anIt.Init(aLS); 
   for (;anIt.More();anIt.Next()) {
-	const TopTools_ListOfShape& aListOfNew = aBuilder->Modified(anIt.Value());
-	aDM1.Bind(anIt.Value(), aListOfNew);
+	const TopTools_ListOfShape& aListOfNew = aBuilder->Modified(anIt.Value());	
+    TopTools_ListOfShape aList;
+	TopTools_ListIteratorOfListOfShape it1(aListOfNew);
+	for(;it1.More();it1.Next())       
+	  aList.Append(it1.Value());
+    const TopTools_ListOfShape& aListOfGen = aBuilder->Generated(anIt.Value());
+	TopTools_ListIteratorOfListOfShape it2(aListOfGen);    
+	for(;it2.More();it2.Next())     
+	  aList.Append(it2.Value());
+
+	aDM1.Bind(anIt.Value(), aList);
 	//cout << "NB_Face = " << aList.Extent() <<endl;
 	//TopExp_Explorer exp (anIt.Value(), TopAbs_EDGE);
 	//for (;exp.More();exp.Next()) {
@@ -148,6 +157,7 @@ HYDROData_SplitToZonesTool::SplitDataList
 	 // cout << "NB_EDGE = " << aList2.Extent() <<endl;
 	//}
   }
+
   // aDM2: NewShape ==> ListOfOldShapes
   HYDROData_DataMapOfShapeListOfShape aDM2;
   HYDROData_DataMapIteratorOfDataMapOfShapeListOfShape aMIt(aDM1);
@@ -166,7 +176,7 @@ HYDROData_SplitToZonesTool::SplitDataList
 	  }
 	}
   }
-
+  //cout << "DM2 Ext = " <<aDM2.Extent() <<endl;
   // Step 4. Fill output structure.
   aMIt.Initialize(aDM2);
   for(;aMIt.More();aMIt.Next()) {