Salome HOME
NCollection sequences improved.
[modules/hydro.git] / src / HYDROData / HYDROData_SplitToZonesTool.cxx
index a4312ab4671110e8e16b579f9c26ffe467621b7f..3661c514a1f63cb30bdeba18d061910d1170b2ed 100644 (file)
 #include <TopoDS_Compound.hxx>
 #include <TopoDS_Wire.hxx>
 #include <TopoDS_Edge.hxx>
-#include <TopoDS_Iterator.hxx>
 #include <BRepCheck_Analyzer.hxx>
-#include <NCollection_IncAllocator.hxx>
-#include <BOPAlgo_Builder.hxx>
-#include <BOPAlgo_PaveFiller.hxx>
-#include <NCollection_Map.hxx>
-#include <NCollection_DataMap.hxx>
 #include <TopTools_ListOfShape.hxx>
 #include <TopTools_ListIteratorOfListOfShape.hxx>
-#include <TopTools_ShapeMapHasher.hxx>
 #include <gp_Pln.hxx>
 #include <BRepGProp.hxx>
 #include <GProp_GProps.hxx>
 #include <Geom_Plane.hxx>
 #include <BRepBuilderAPI_FindPlane.hxx>
 
-
-typedef NCollection_Map<TopoDS_Shape, TopTools_ShapeMapHasher> HYDROData_MapOfShape;
-typedef HYDROData_MapOfShape::Iterator HYDROData_MapIteratorOfMapOfShape;
-typedef NCollection_DataMap<TopoDS_Shape, TopTools_ListOfShape, TopTools_ShapeMapHasher> HYDROData_DataMapOfShapeListOfShape;
-typedef HYDROData_DataMapOfShapeListOfShape::Iterator HYDROData_DataMapIteratorOfDataMapOfShapeListOfShape;
-typedef NCollection_DataMap<TopoDS_Shape,  QStringList, TopTools_ShapeMapHasher> HYDROData_DataMapOfShapeListOfString;
-typedef HYDROData_DataMapOfShapeListOfString::Iterator HYDROData_DataMapIteratorOfDataMapOfShapeListOfString;
-#undef _NCollection_MapHasher
-
 //#define DEB_SPLIT_TO_ZONES 1
-#ifdef DEB_SPLIT_TO_ZONES
+//#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");
 #endif
+
 TopoDS_Face HYDROData_SplitToZonesTool::SplitData::Face() const
 {
   TopoDS_Face aResFace;
@@ -88,6 +75,38 @@ Standard_Boolean buildLimFace(const TopoDS_Wire& theBndWire, TopoDS_Face& outFac
   }
   return Standard_False;
 }
+//======================================================================================
+
+void HYDROData_SplitToZonesTool::SetFileNames(const QString& theNameBefore, const QString& theNameAfter)
+{
+#ifdef DEB_SPLIT_TO_ZONES_CHECK_PARTITION
+  if(!theNameBefore.isNull() && !theNameBefore.isEmpty())
+  {
+    TCollection_AsciiString aName (theNameBefore.toStdString().data());
+       fileNameBefore = aName;
+  }
+  if(!theNameAfter.isNull() && !theNameAfter.isEmpty())
+  {
+    TCollection_AsciiString aName (theNameAfter.toStdString().data());
+    HYDROData_Transform::SetFileName (aName);
+  }
+#endif
+}
+//======================================================================================
+Standard_Integer HYDROData_SplitToZonesTool::SplitFaces(const TopoDS_Compound& theComp, 
+                                                                                                               HYDROData_Transform& theTool)
+{
+  theTool.Clear();
+  theTool.SetArgument(theComp);
+  theTool.Detect();
+  const Standard_Boolean bToTransform = theTool.ToTransform();  
+  theTool.SetToTransform(bToTransform);  
+  theTool.Perform();
+  Standard_Integer anErr = theTool.ErrorStatus();
+  return anErr;
+}
+
+//======================================================================================
 HYDROData_SplitToZonesTool::SplitDataList
   HYDROData_SplitToZonesTool::Split( const HYDROData_SequenceOfObjects&  theObjectList,
                                      const HYDROData_SequenceOfObjects&  theGroupsList,
@@ -174,12 +193,8 @@ HYDROData_SplitToZonesTool::SplitDataList
       aDM3.Bind(aSh, anInputGroupList.at(i).ObjectNames);
     }
   }
-  // Step 1. Prepare Partition structures.
-  Handle(NCollection_BaseAllocator) pA1 = new NCollection_IncAllocator, pA2 = new NCollection_IncAllocator;
-  BOPAlgo_PaveFiller* aPaveFiller      = new BOPAlgo_PaveFiller(pA1);
-  BOPAlgo_Builder* aBuilder            = new BOPAlgo_Builder(pA2);
+  // Step 1. Prepare Partition structures. 
   BOPCol_ListOfShape aLS;  
-
   QStringList aListOfNames;
   TopoDS_Compound aCmp;
   BRep_Builder aBB;
@@ -192,47 +207,16 @@ HYDROData_SplitToZonesTool::SplitDataList
     //TCollection_AsciiString aName = aNam + i + ".brep";
     //BRepTools::Write(aSh, aName.ToCString());
   }
-  HYDROData_Transform sTool;
-  sTool.Clear();
-  sTool.SetArgument(aCmp);
-  sTool.Detect();
-  const Standard_Boolean bToTransform = sTool.ToTransform();
-  Standard_Integer anErr(0);  
-  sTool.SetToTransform(bToTransform);  
-  sTool.Perform();
-  anErr = sTool.ErrorStatus();
-  if(anErr)
-    return anOutputSplitDataList;
-  const TopoDS_Shape& aResult = sTool.Shape();
-  /* 
-  else {  
-  BOP ==
-  aPaveFiller->SetArguments(aLS);
-  aPaveFiller->Perform();
-  anErr = aPaveFiller->ErrorStatus();
-  if(anErr) 
-    return anOutputSplitDataList;
-  BOPDS_PDS pDS = aPaveFiller->PDS();
-  if (!pDS) 
-    return anOutputSplitDataList;
-  aBuilder->Clear();
-
-  // Step 2. Split faces 
-  BOPCol_ListIteratorOfListOfShape anIt(aLS);
-  for (; anIt.More(); anIt.Next()) {
-    const TopoDS_Shape& aS = anIt.Value();
-    aBuilder->AddArgument(aS);
-  }
-  aBuilder->PerformWithFiller(*aPaveFiller);
-  anErr = aBuilder->ErrorStatus();
+#ifdef DEB_SPLIT_TO_ZONES_CHECK_PARTITION
+  TCollection_AsciiString aNameBefore = fileNameBefore + ".brep";
+  BRepTools::Write(aCmp, aNameBefore.ToCString());
+#endif
 
-  ////
-  if(anErr) 
+  HYDROData_Transform splitTool; 
+  const Standard_Integer anErr = SplitFaces(aCmp, splitTool);    
+  if(anErr)
     return anOutputSplitDataList;
-  aResult = aBuilder->Shape();
-  } */
-
+  const TopoDS_Shape& aResult = splitTool.Shape();
   if (aResult.IsNull()) 
     return anOutputSplitDataList;
   BRepCheck_Analyzer aCheck (aResult);
@@ -250,11 +234,11 @@ HYDROData_SplitToZonesTool::SplitDataList
   // Step 3. Collect history  
   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 = /*aBuilder->*/sTool.Modified(anIt.Value());
+    const TopTools_ListOfShape& aListOfNew = splitTool.Modified(anIt.Value());
        if(!aListOfNew.IsEmpty())
          foundF = Standard_True;
     TopTools_ListOfShape aList;
@@ -262,7 +246,7 @@ HYDROData_SplitToZonesTool::SplitDataList
     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 = /*aBuilder->*/sTool.Generated(anIt.Value());
+    const TopTools_ListOfShape& aListOfGen = splitTool.Generated(anIt.Value());
        if(!aListOfGen.IsEmpty())
          foundF = Standard_True;
        it.Initialize(aListOfGen);    
@@ -271,13 +255,15 @@ HYDROData_SplitToZonesTool::SplitDataList
     if(!foundF) // face is not modified
          aList.Append (anIt.Value());
        aDM1.Bind(anIt.Value(), aList);
-       //TCollection_AsciiString aName;
+#ifdef DEB_SPLIT_TO_ZONES
+       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++) {
            Standard_Boolean foundE(Standard_False);
-           const TopTools_ListOfShape& aListM = /*aBuilder->*/sTool.Modified(exp.Current());   
+           const TopTools_ListOfShape& aListM = splitTool.Modified(exp.Current());     
                //cout << "NB_EDGE_M = " << aListM.Extent() <<endl;
                if(aListM.Extent()) foundE = Standard_True;
                it.Initialize(aListM);    
@@ -286,7 +272,7 @@ HYDROData_SplitToZonesTool::SplitDataList
                  //aName = aNamM + i + j +k +".brep";
                  //BRepTools::Write(it.Value(),aName.ToCString());
                }
-               const TopTools_ListOfShape& aListG = /*aBuilder->*/sTool.Generated(exp.Current());
+               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++)   {  
@@ -295,11 +281,14 @@ HYDROData_SplitToZonesTool::SplitDataList
                  //BRepTools::Write(it.Value(),aName.ToCString());
                }
                //cout << "NB_EDGE = " << aList.Extent() <<endl;
-               if(!foundE) //{
+               if(!foundE) {
                  aList.Append (exp.Current());
-               //aName = aNamG + i + j +".brep";
-               //BRepTools::Write(exp.Current(),aName.ToCString());
-               //}
+#ifdef DEB_SPLIT_TO_ZONES
+                 aName = aNamG + i + j +".brep";
+                 //BRepTools::Write(exp.Current(),aName.ToCString());
+                 cout << aName.ToCString()<< " = " << exp.Current().TShape() <<endl;
+#endif
+               }
                aDM1.Bind(exp.Current(), aList);
          }      
        }
@@ -457,8 +446,9 @@ HYDROData_SplitToZonesTool::SplitDataList
        }
   }
   // Step 4. Fill output structure.
-  //TCollection_AsciiString aNam4 ("SC_");
-  
+#ifdef DEB_SPLIT_TO_ZONES
+  TCollection_AsciiString aNam4 ("SC_");
+#endif  
   HYDROData_DataMapIteratorOfDataMapOfShapeListOfShape aMIt(aDM2);
   for(int i =1;aMIt.More();aMIt.Next(),i++) {
     SplitData aDestSplitData;
@@ -466,13 +456,13 @@ HYDROData_SplitToZonesTool::SplitDataList
     aDestSplitData.Shape = aKey;
     if(aKey.ShapeType() == TopAbs_FACE)
       aDestSplitData.Type = SplitData::Data_Zone;
-    else
+       else {
       aDestSplitData.Type = SplitData::Data_Edge;
 #ifdef DEB_SPLIT_TO_ZONES
-         //TCollection_AsciiString aName = aNam4 + i + ".brep";
-         //BRepTools::Write(aKey,aName.ToCString());
+         TCollection_AsciiString aName = aNam4 + i + ".brep";
+         BRepTools::Write(aKey,aName.ToCString());
 #endif 
-
+       }
 
     QStringList aListOfNames; // names processing
     const TopTools_ListOfShape& aListOfOld = aMIt.Value();
@@ -482,6 +472,13 @@ HYDROData_SplitToZonesTool::SplitDataList
          if(aDM3.IsBound(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;   
+               }       
+#endif 
          }      
        }