X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FHYDROData%2FHYDROData_SplitToZonesTool.cxx;h=94d57ea7b5647713be2d65eae0fb0b370f2707fe;hb=a4ddb8bafa510cc57431846ed83623fdb860c580;hp=f91732cd2fcdba0a6ae49707008b8b684b76dee3;hpb=6527cd5d3063b2724b60b3f87ed1105244b74cb3;p=modules%2Fhydro.git diff --git a/src/HYDROData/HYDROData_SplitToZonesTool.cxx b/src/HYDROData/HYDROData_SplitToZonesTool.cxx index f91732cd..94d57ea7 100644 --- a/src/HYDROData/HYDROData_SplitToZonesTool.cxx +++ b/src/HYDROData/HYDROData_SplitToZonesTool.cxx @@ -34,12 +34,18 @@ #include #include #include +#include #include #include #include #include #include +#include +#include +#include +#include + //#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)) @@ -47,6 +53,9 @@ static TCollection_AsciiString fileNameBefore("BeforeTranslation"); #endif +//#define _DEVDEBUG_ +#include "HYDRO_trace.hxx" + TopoDS_Face HYDROData_SplitToZonesTool::SplitData::Face() const { TopoDS_Face aResFace; @@ -110,7 +119,7 @@ void HYDROData_SplitToZonesTool::SetFileNames(const QString& theNameBefore, cons #endif } //====================================================================================== -Standard_Integer HYDROData_SplitToZonesTool::SplitFaces(const TopoDS_Compound& theComp, +bool HYDROData_SplitToZonesTool::SplitFaces(const TopoDS_Compound& theComp, HYDROData_Transform& theTool) { theTool.Clear(); @@ -119,18 +128,23 @@ Standard_Integer HYDROData_SplitToZonesTool::SplitFaces(const TopoDS_Compound& t const Standard_Boolean bToTransform = theTool.ToTransform(); theTool.SetToTransform(bToTransform); theTool.Perform(); - Standard_Integer anErr = theTool.ErrorStatus(); - return anErr; + return theTool.HasErrors(); } //====================================================================================== HYDROData_SplitToZonesTool::SplitDataList HYDROData_SplitToZonesTool::Split( const HYDROData_SequenceOfObjects& theObjectList, const HYDROData_SequenceOfObjects& theGroupsList, - const Handle(HYDROData_PolylineXY)& thePolyline ) + const Handle(HYDROData_PolylineXY)& thePolyline, + const HYDROData_SequenceOfObjects& InterPolys) { +#ifndef NDEBUG + DEBTRACE("Split"); +#endif SplitDataList anOutputSplitDataList; - if(theObjectList.IsEmpty()) return anOutputSplitDataList; + NCollection_DataMap OutNE; + if(theObjectList.IsEmpty()) + return anOutputSplitDataList; // Preparation. // Collect the object shapes to split. InputDataList will contain elements which will hold shape & name_of_shape. SplitDataList anInputSplitDataList; @@ -150,7 +164,7 @@ HYDROData_SplitToZonesTool::SplitDataList if ( aShape.IsNull() ) continue; #ifdef DEB_SPLIT_TO_ZONES - TCollection_AsciiString aName = aNam + anIndex + ".brep"; + TCollection_AsciiString aName = aNam + anIndex + "_a.brep"; BRepTools::Write(aShape, aName.ToCString()); #endif if ( aShape.ShapeType() == TopAbs_COMPOUND ) { @@ -198,7 +212,7 @@ HYDROData_SplitToZonesTool::SplitDataList anInputGroupList.append( aSplitData ); #ifdef DEB_SPLIT_TO_ZONES QString aStr = aSplitData.ObjectNames.join(" "); - cout << "Group# = " < 1) { HYDROData_Transform splitTool; - const Standard_Integer anErr = SplitFaces(aCmp, splitTool); + bool anErr = SplitFaces(aCmp, splitTool); if(anErr) return anOutputSplitDataList; aResult = splitTool.Shape(); @@ -258,7 +354,7 @@ HYDROData_SplitToZonesTool::SplitDataList BRepCheck_Analyzer aCheck (aResult); if(!aCheck.IsValid()) { #ifdef DEB_SPLIT_TO_ZONES - cout << "result is not valid" <GetShape()); + if (! thePolyline.IsNull()) { + Handle(TopTools_HSequenceOfShape) aConnectedWires = new TopTools_HSequenceOfShape; + int nbWires = thePolyline->GetNbConnectedWires(aConnectedWires); + const TopoDS_Wire aBndWire = TopoDS::Wire(aConnectedWires->Value(1)); if(!aBndWire.IsNull()) { TopoDS_Face limFace; if(buildLimFace(aBndWire, limFace)) { @@ -382,12 +482,14 @@ HYDROData_SplitToZonesTool::SplitDataList const TopoDS_Shape& aFace = exp.Current(); if(!aFace.IsNull()) { const TopTools_ListOfShape& aListOfNew = mkCom.Modified(aFace); - //cout << "Modified: " << aListOfNew.Extent() <::Iterator spit(OutNE); + for (;spit.More();spit.Next()) + { + const TopoDS_Edge& E = TopoDS::Edge(spit.Key()); + if (E.IsNull()) + continue; + SplitData SDI(SplitData::Data_IntEdge, E, spit.Value()->GetName()); + anOutputSplitDataList.append(SDI); + } + // Step 4. Fill output structure. #ifdef DEB_SPLIT_TO_ZONES TCollection_AsciiString aNam4 ("SC_"); @@ -555,7 +669,7 @@ HYDROData_SplitToZonesTool::SplitDataList else { aDestSplitData.Type = SplitData::Data_Edge; #ifdef DEB_SPLIT_TO_ZONES - TCollection_AsciiString aName = aNam4 + i + ".brep"; + TCollection_AsciiString aName = aNam4 + i + "_k.brep"; BRepTools::Write(aKey,aName.ToCString()); #endif } @@ -569,19 +683,19 @@ HYDROData_SplitToZonesTool::SplitDataList const QStringList& ObjectNames = aDM3.FindFromKey(aSh); aListOfNames.append(ObjectNames); #ifdef DEB_SPLIT_TO_ZONES - TCollection_AsciiString aName = aNam4 + i +"_" + j + ".brep"; + TCollection_AsciiString aName = aNam4 + i +"_" + j + "_l.brep"; BRepTools::Write(aSh ,aName.ToCString()); #endif } else { #ifdef DEB_SPLIT_TO_ZONES - TCollection_AsciiString aName = aNam4 +"__" + i +"_" + j + ".brep"; + TCollection_AsciiString aName = aNam4 +"__" + i +"_" + j + "_m.brep"; BRepTools::Write(aSh ,aName.ToCString()); - cout <