From: gdd Date: Mon, 25 Oct 2010 12:35:56 +0000 (+0000) Subject: Mantis issue 20998: EDF 1572 GEOM: Some limitations to the PipeTShape X-Git-Tag: V5_1_5rc1~1 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=a1c82891d9174eba49493b428c87a3bbc1df8a0f;p=modules%2Fgeom.git Mantis issue 20998: EDF 1572 GEOM: Some limitations to the PipeTShape Additional fixes. --- diff --git a/src/GEOMImpl/GEOMImpl_IAdvancedOperations.cxx b/src/GEOMImpl/GEOMImpl_IAdvancedOperations.cxx index 69db22f57..82a56be6a 100644 --- a/src/GEOMImpl/GEOMImpl_IAdvancedOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_IAdvancedOperations.cxx @@ -55,7 +55,6 @@ #include #include #include -#include #include #include @@ -947,11 +946,11 @@ bool GEOMImpl_IAdvancedOperations::MakePipeTShapePartition(Handle(GEOM_Object) t } Cote_5->GetLastFunction()->SetDescription(""); - std::list edgeList2; - edgeList2.push_back(edge_chan_inc); - edgeList2.push_back(Cote_3); - edgeList2.push_back(Cote_5); - edgeList2.push_back(Cote_4); + //std::list edgeList2; + //edgeList2.push_back(edge_chan_inc); + //edgeList2.push_back(Cote_3); + //edgeList2.push_back(Cote_5); + //edgeList2.push_back(Cote_4); // std::cerr << "Creating wire 2" << std::endl; //wire_t2 = myShapesOperations->MakeWire(edgeList2, 1e-7); //if (wire_t2.IsNull()) { @@ -984,20 +983,6 @@ bool GEOMImpl_IAdvancedOperations::MakePipeTShapePartition(Handle(GEOM_Object) t theShapes.push_back(aPlnOZ); theShapes.push_back(aPlnOXZ); - // tmp - /* - BRepTools::Write(theShape->GetValue(), - "/dn25/salome/jfa/DATA/Salome/BUGS/M_0020998_Some_limitations_to_the_PipeTShape/theShape.brep"); - BRepTools::Write(aPlnOZ->GetValue(), - "/dn25/salome/jfa/DATA/Salome/BUGS/M_0020998_Some_limitations_to_the_PipeTShape/aPlnOZ.brep"); - BRepTools::Write(aPlnOXZ->GetValue(), - "/dn25/salome/jfa/DATA/Salome/BUGS/M_0020998_Some_limitations_to_the_PipeTShape/aPlnOXZ.brep"); - BRepTools::Write(face_t->GetValue(), - "/dn25/salome/jfa/DATA/Salome/BUGS/M_0020998_Some_limitations_to_the_PipeTShape/face_t.brep"); - BRepTools::Write(face_t2->GetValue(), - "/dn25/salome/jfa/DATA/Salome/BUGS/M_0020998_Some_limitations_to_the_PipeTShape/face_t2.brep"); - */ - // Partition Handle(TColStd_HSequenceOfTransient) partitionShapes = new TColStd_HSequenceOfTransient; Handle(TColStd_HSequenceOfTransient) theTools = new TColStd_HSequenceOfTransient; @@ -2100,6 +2085,15 @@ GEOMImpl_IAdvancedOperations::MakePipeTShapeFilletWithPosition(double theR1, dou aFunction->SetValue(aFilletShape); // END of fillet + // BEGIN: Limit tolerances (debug) + GEOMImpl_IHealingOperations myHealingOperations (GetEngine(), GetDocID()); + + Handle(GEOM_Object) aCorr1 = myHealingOperations.LimitTolerance(aShape, 1e-07); + TopoDS_Shape aCorr1Shape = aCorr1->GetValue(); + aShape->GetLastFunction()->SetValue(aCorr1Shape); + aCorr1->GetLastFunction()->SetDescription(""); + // END: Limit tolerances (debug) + if (theHexMesh) { if (!MakePipeTShapePartition(aShape, theR1, theW1, theL1, theR2, theW2, theL2, 0, 0, theRF, false)) return NULL;