From: adv <adv@opencascade.com>
Date: Fri, 31 Jan 2014 11:11:18 +0000 (+0000)
Subject: The workarounds for partition history has been rolled back in view of Linux CAS diffe... 
X-Git-Tag: BR_hydro_v_1_0~7
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=c9d7c382c6cbf049d56cd27a8155376ffcd89175;p=modules%2Fhydro.git

The workarounds for partition history has been rolled back in view of Linux CAS difference.
---

diff --git a/src/HYDROData/HYDROData_SplitToZonesTool.cxx b/src/HYDROData/HYDROData_SplitToZonesTool.cxx
index ae9518b3..16062cf5 100644
--- a/src/HYDROData/HYDROData_SplitToZonesTool.cxx
+++ b/src/HYDROData/HYDROData_SplitToZonesTool.cxx
@@ -260,10 +260,19 @@ HYDROData_SplitToZonesTool::SplitDataList
       const TopTools_ListOfShape& aListOfNew = splitTool.Modified(anIt.Value());
       if(!aListOfNew.IsEmpty())
         foundF = Standard_True;
+
       TopTools_ListOfShape aList;
+
       TopTools_ListIteratorOfListOfShape it(aListOfNew);
       for(;it.More();it.Next())       
-        aList.Append(it.Value());    
+        aList.Append(it.Value());
+      // Bug in History: partition should give only modified entities! => temporary solution is used
+      const TopTools_ListOfShape& aListOfGen = splitTool.Generated(anIt.Value());
+      if(!aListOfGen.IsEmpty())
+        foundF = Standard_True;
+      it.Initialize(aListOfGen);    
+      for(;it.More();it.Next())     
+        aList.Append(it.Value());
       if(!foundF) // face is not modified
         aList.Append (anIt.Value());
       aDM1.Bind(anIt.Value(), aList);
@@ -286,6 +295,11 @@ HYDROData_SplitToZonesTool::SplitDataList
             //BRepTools::Write(it.Value(),aName.ToCString());
   #endif
           }
+          const TopTools_ListOfShape& aListG = splitTool.Generated(exp.Current());
+          if(aListG.Extent()) foundE = Standard_True;
+          it.Initialize(aListG);    
+          for(int k=1;it.More();it.Next(),k++)
+            aList.Append(it.Value());
           //cout << "NB_EDGE = " << aList.Extent() <<endl;
           if(!foundE) {
             aList.Append (exp.Current());