From: asl <asl@opencascade.com>
Date: Thu, 25 Sep 2014 12:32:03 +0000 (+0000)
Subject: regression in partition algorithm
X-Git-Tag: BR_hydro_v1_0_3
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=5f3b6c10e9cbc45cb23730cf6e7a6d9dff9ec47f;p=modules%2Fhydro.git

regression in partition algorithm
---

diff --git a/src/HYDROData/HYDROData_SplitToZonesTool.cxx b/src/HYDROData/HYDROData_SplitToZonesTool.cxx
index 16062cf5..fabf15d9 100644
--- a/src/HYDROData/HYDROData_SplitToZonesTool.cxx
+++ b/src/HYDROData/HYDROData_SplitToZonesTool.cxx
@@ -266,13 +266,15 @@ HYDROData_SplitToZonesTool::SplitDataList
       TopTools_ListIteratorOfListOfShape it(aListOfNew);
       for(;it.More();it.Next())       
         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());
+      //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);
@@ -295,12 +297,14 @@ 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());
+          /* *********************************************************************
+		  //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());
   #ifdef DEB_SPLIT_TO_ZONES
@@ -371,7 +375,7 @@ HYDROData_SplitToZonesTool::SplitDataList
                     if(!mkCom.IsDeleted(aFace)) {
                       const TopTools_ListOfShape& aListOfGen = mkCom.Generated(aFace);    
                       if(!aListOfGen.IsEmpty()) {
-                        aDM4.Bind(aFace, aListOfGen);    
+                        /* aDM4.Bind(aFace, aListOfGen); ???   */
 #ifdef DEB_SPLIT_TO_ZONES
                         //TCollection_AsciiString aName = aNam + i + "g.brep";
                         //BRepTools::Write(aListOfGen.Last(), aName.ToCString());
@@ -397,7 +401,7 @@ HYDROData_SplitToZonesTool::SplitDataList
                    if(!mkCom.IsDeleted(anEdge)) {
                      const TopTools_ListOfShape& aListOfGenEd = mkCom.Generated(anEdge);
                      if(!aListOfGenEd.IsEmpty()) {
-                       aDM4.Bind(anEdge, aListOfGenEd);
+                       /* aDM4.Bind(anEdge, aListOfGenEd); ???*/
                      } else {
                        TopTools_ListOfShape aList; 
                        aList.Append(anEdge);
@@ -433,7 +437,7 @@ HYDROData_SplitToZonesTool::SplitDataList
                if(!mkCom.IsDeleted(anEdge)) {
                  const TopTools_ListOfShape& aListOfGenEd = mkCom.Generated(anEdge);
                  if(!aListOfGenEd.IsEmpty()) {
-                   aDM4.Bind(anEdge, aListOfGenEd);
+                   /* aDM4.Bind(anEdge, aListOfGenEd); ??? */
                  } else {
                    TopTools_ListOfShape aList; 
                    aList.Append(anEdge);