Salome HOME
Bug #334: Different behavior in Edit calculation case input panel.
[modules/hydro.git] / src / HYDROData / HYDROData_SplitToZonesTool.cxx
index 3658fa5c767b89daf4cae83df775bbbbb9612dc9..d076706fadf98920b6266bf9f770ddc7d9932e80 100644 (file)
@@ -23,8 +23,8 @@
 #include <Geom_Plane.hxx>
 #include <BRepBuilderAPI_FindPlane.hxx>
 
-#define DEB_SPLIT_TO_ZONES 1
-#define DEB_SPLIT_TO_ZONES_CHECK_PARTITION 1
+//#define DEB_SPLIT_TO_ZONES 1
+//#define DEB_SPLIT_TO_ZONES_CHECK_PARTITION 1
 #if (defined (DEB_SPLIT_TO_ZONES) || defined(DEB_SPLIT_TO_ZONES_CHECK_PARTITION))
 #include <BRepTools.hxx>
 static TCollection_AsciiString fileNameBefore("BeforeTranslation");
@@ -117,7 +117,7 @@ HYDROData_SplitToZonesTool::SplitDataList
   // Preparation. 
   // Collect the object shapes to split. InputDataList will contain elements which will hold shape & name_of_shape.
   SplitDataList anInputSplitDataList;
-  TCollection_AsciiString aNam("Faces_");
+  //TCollection_AsciiString aNam("Faces_");
   for( int anIndex = 1, aLength = theObjectList.Length(); anIndex <= aLength; anIndex++ )
   {
     Handle(HYDROData_Object) aGeomObj = 
@@ -148,7 +148,7 @@ HYDROData_SplitToZonesTool::SplitDataList
   }
   //
   SplitDataList anInputGroupList;
-  for( int anIndex = 1; anIndex <= theGroupsList.Length(); anIndex++ )
+  for( int anIndex = 1, aLength = theGroupsList.Length(); anIndex <=aLength; anIndex++ )
   {
     Handle(HYDROData_ShapesGroup) aGeomGroup = 
       Handle(HYDROData_ShapesGroup)::DownCast( theGroupsList.Value( anIndex ) );
@@ -170,20 +170,28 @@ HYDROData_SplitToZonesTool::SplitDataList
             SplitData aSplitData( SplitData::Data_Edge, anEdge, aGeomGroup->GetName() );
             anInputGroupList.append( aSplitData );
           }
-          }
+               }
       } else {
         SplitData aSplitData( SplitData::Data_Edge, aGroupShape, aGeomGroup->GetName() );
         anInputGroupList.append( aSplitData );
+#ifdef DEB_SPLIT_TO_ZONES
+               QString aStr = aSplitData.ObjectNames.join(" "); 
+               cout << "Group# = " <<anIndex <<" Nmb in grp = " << i<< " Names = "<<aStr.toStdString() << " size = " <<aSplitData.ObjectNames.size() <<endl;   
+#endif
       }
-    }
+       }
   }
   // If only one shape is given we don't split it 
   // algorithm just returns the unpacked input data
-  if(theObjectList.Size() == 1)  {
-       anOutputSplitDataList.append(anInputSplitDataList); 
-       if(!theGroupsList.IsEmpty() ) 
-         anOutputSplitDataList.append(anInputGroupList);       
-    return anOutputSplitDataList;
+  bool limplus1Object(false);
+  if(theObjectList.Size() == 1 )  {
+       if(thePolyline.IsNull()) {
+         anOutputSplitDataList.append(anInputSplitDataList); 
+         if(!theGroupsList.IsEmpty() ) 
+           anOutputSplitDataList.append(anInputGroupList);     
+      return anOutputSplitDataList;
+       } else
+               limplus1Object = true;// size =1 && hasLimits
   }
   HYDROData_DataMapOfShapeListOfString aDM3;
   if(!anInputGroupList.isEmpty()) {// Old edge ==> List_Of_Names
@@ -194,6 +202,7 @@ HYDROData_SplitToZonesTool::SplitDataList
     }
   }
   // Step 1. Prepare Partition structures. 
+  TopoDS_Shape aResult;
   BOPCol_ListOfShape aLS;  
   QStringList aListOfNames;
   TopoDS_Compound aCmp;
@@ -212,11 +221,13 @@ HYDROData_SplitToZonesTool::SplitDataList
   BRepTools::Write(aCmp, aNameBefore.ToCString());
 #endif
 
+  HYDROData_DataMapOfShapeListOfShape aDM1;
+  if(anInputSplitDataList.size() > 1) {
   HYDROData_Transform splitTool; 
   const Standard_Integer anErr = SplitFaces(aCmp, splitTool);    
   if(anErr)
     return anOutputSplitDataList;
-  const TopoDS_Shape& aResult = splitTool.Shape();
+  aResult = splitTool.Shape();
   if (aResult.IsNull()) 
     return anOutputSplitDataList;
   BRepCheck_Analyzer aCheck (aResult);
@@ -232,10 +243,10 @@ HYDROData_SplitToZonesTool::SplitDataList
 #endif
   
   // Step 3. Collect history  
-  HYDROData_DataMapOfShapeListOfShape aDM1;
+  //HYDROData_DataMapOfShapeListOfShape aDM1;
   BOPCol_ListIteratorOfListOfShape anIt(aLS); 
-  TCollection_AsciiString aNamM ("EdgM_");
-  TCollection_AsciiString aNamG ("EdgG_");
+  //TCollection_AsciiString aNamM ("EdgM_");
+  //TCollection_AsciiString aNamG ("EdgG_");
   for (int i =1;anIt.More();anIt.Next(),i++) {
        Standard_Boolean foundF(Standard_False);
     const TopTools_ListOfShape& aListOfNew = splitTool.Modified(anIt.Value());
@@ -259,9 +270,9 @@ HYDROData_SplitToZonesTool::SplitDataList
        TCollection_AsciiString aName;
 #endif
        if(!anInputGroupList.isEmpty() ) { // 1
-      aList.Clear();
          TopExp_Explorer exp (anIt.Value(), TopAbs_EDGE);
          for (int j =1;exp.More();exp.Next(),j++) {
+        aList.Clear();
            Standard_Boolean foundE(Standard_False);
            const TopTools_ListOfShape& aListM = splitTool.Modified(exp.Current());     
                //cout << "NB_EDGE_M = " << aListM.Extent() <<endl;
@@ -285,22 +296,24 @@ HYDROData_SplitToZonesTool::SplitDataList
                  aList.Append (exp.Current());
 #ifdef DEB_SPLIT_TO_ZONES
                  aName = aNamG + i + j +".brep";
-                 //BRepTools::Write(exp.Current(),aName.ToCString());
+                 BRepTools::Write(exp.Current(),aName.ToCString());
                  cout << aName.ToCString()<< " = " << exp.Current().TShape() <<endl;
 #endif
                }
                aDM1.Bind(exp.Current(), aList);
-         }      
+         }
        }
   }
-
+  } else 
+         aResult = anInputSplitDataList.at(0).Shape; // get single input shape
   // aDM2: NewShape ==> ListOfOldShapes
   HYDROData_DataMapOfShapeListOfShape aDM2;
   // make limiting face
   HYDROData_DataMapOfShapeListOfShape aDM4;
   Standard_Boolean hasLimits(Standard_False);
-  if (! thePolyline.IsNull()) {         
-    //const TopoDS_Shape aShape = thePolyline->GetShape();     
+  QString aBndName;
+  HYDROData_MapOfShape aBndView;
+  if (! thePolyline.IsNull()) {    
     const TopoDS_Wire aBndWire = TopoDS::Wire(thePolyline->GetShape());
     if(!aBndWire.IsNull()) {
       TopoDS_Face limFace;       
@@ -314,15 +327,21 @@ HYDROData_SplitToZonesTool::SplitDataList
 #ifdef DEB_SPLIT_TO_ZONES
                    BRepTools::Write(aComResult,"CommonV.brep");
 #endif 
-
-                   hasLimits = Standard_True; // DM2 should filled here
+                       aBndName = thePolyline->GetName();
+                   hasLimits = Standard_True; // DM2 should be filled here
+                       TopExp_Explorer exp (limFace, TopAbs_EDGE);
+                       for (int i =1;exp.More();exp.Next(),i++) {
+              const TopoDS_Shape& anEdge = exp.Current();
+                         if(anEdge.IsNull()) continue;
+                         aBndView.Add(anEdge);
+                       }
                    HYDROData_MapOfShape aView;
-                   TopExp_Explorer exp (aResult, TopAbs_FACE);
-                   for (int i =1;exp.More();exp.Next(),i++) {
+                       exp.Init (aResult, TopAbs_FACE);
+                       for (int i =1;exp.More();exp.Next(),i++) {
               const TopoDS_Shape& aFace = exp.Current();
                      if(!aFace.IsNull()) {
                        const TopTools_ListOfShape& aListOfNew = mkCom.Modified(aFace);
-                         //cout << "Modified: " << aListOfNew.Extent() <<endl;                 
+                           //cout << "Modified: " << aListOfNew.Extent() <<endl;                       
                 const TopTools_ListOfShape& aListOfGen = mkCom.Generated(aFace);                       
                            if(!aListOfNew.IsEmpty()) {
                      aDM4.Bind(aFace, aListOfNew);
@@ -392,9 +411,29 @@ HYDROData_SplitToZonesTool::SplitDataList
                   }
                 }
                 //cout << "DM4 Ext = " <<aDM4.Extent() <<endl;
+                if(limplus1Object) {
+                  // fill DM1 (old - new) and DM2 (new - old)
+                  HYDROData_DataMapIteratorOfDataMapOfShapeListOfShape mIt(aDM4);
+           for(;mIt.More();mIt.Next()) {
+                        const TopoDS_Shape& aKey = mIt.Key();//old
+                        TopTools_ListOfShape aList;
+                        aList.Append(aKey);
+                        const TopTools_ListOfShape& aListOfNew = mIt.Value();
+                        aDM1.Bind(aKey, aListOfNew);
+                        TopTools_ListIteratorOfListOfShape it(aListOfNew);
+                        for(;it.More();it.Next()) {
+                          if(!aDM2.IsBound(it.Value()))
+                                aDM2.Bind(it.Value(), aList);
+                          else {
+                                TopTools_ListOfShape& aList = aDM2.ChangeFind(it.Value());
+                                aList.Prepend(aKey);
+                          }
+                        }
+                  }
+                } else {
          HYDROData_DataMapIteratorOfDataMapOfShapeListOfShape aMIt(aDM1); 
                 //DM4 contains Old - New after common op. DM1: old - new after Split op.
-         for(;aMIt.More();aMIt.Next()) {
+                for(;aMIt.More();aMIt.Next()) {
            const TopoDS_Shape& aKey = aMIt.Key();
            TopTools_ListOfShape aList;
            aList.Append(aKey);
@@ -415,8 +454,9 @@ HYDROData_SplitToZonesTool::SplitDataList
                                  }
                                }
                         }
-                  }//
-                 }
+                  }
+                }
+                }
                 } else {
                         hasLimits = Standard_False;
 #ifdef DEB_SPLIT_TO_ZONES
@@ -426,7 +466,7 @@ HYDROData_SplitToZonesTool::SplitDataList
           }
          }
        }
-  }
+  }// end limits processing
   if(!hasLimits) {
     HYDROData_DataMapIteratorOfDataMapOfShapeListOfShape aMIt(aDM1);
     for(;aMIt.More();aMIt.Next()) {
@@ -467,23 +507,31 @@ HYDROData_SplitToZonesTool::SplitDataList
     QStringList aListOfNames; // names processing
     const TopTools_ListOfShape& aListOfOld = aMIt.Value();
     TopTools_ListIteratorOfListOfShape it(aListOfOld);
-       for(;it.More();it.Next()) {     
+       for(int j =1;it.More();it.Next(),j++) { 
          const TopoDS_Shape& aSh = it.Value(); //old
          if(aDM3.IsBound(aSh)) {
-           const QStringList& ObjectNames = aDM3.Find(aSh);
+           const QStringList& ObjectNames = aDM3.Find(aSh);    
                aListOfNames.append(ObjectNames);
 #ifdef DEB_SPLIT_TO_ZONES
-
-               for ( int k = 1;k <= ObjectNames.length(); ++k ) {
-                       QString aStr = ObjectNames.last(); 
-                       cout << "Indx = " << i<< " k = " << k << " size = " <<ObjectNames.size() << " Name = "<<aStr.toStdString() <<endl;   
-               }       
+               TCollection_AsciiString aName = aNam4 + i +"_" + j + ".brep";
+           BRepTools::Write(aSh ,aName.ToCString());           
 #endif 
-         }      
+         }     else {
+                 if(aBndView.Contains(aSh) && hasLimits) {                     
+                       aListOfNames.append(aBndName);
+#ifdef DEB_SPLIT_TO_ZONES
+                       cout << " BndName = "<<aBndName.toStdString() <<endl; 
+#endif
+                 }
+         }
        }
 
        aDestSplitData.ObjectNames = aListOfNames;  
-       anOutputSplitDataList.append(aDestSplitData);
+       anOutputSplitDataList.append(aDestSplitData);   
+#ifdef DEB_SPLIT_TO_ZONES
+       QString aStr = aDestSplitData.ObjectNames.join(" "); 
+       cout << "New# = " << i<< " Names = "<<aStr.toStdString() << " size = " <<aDestSplitData.ObjectNames.size() <<endl; 
+#endif
   }
  
   return anOutputSplitDataList;