ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-01-27 14:40:33 +05:00
Code Issues Packages Projects Releases Wiki Activity

0021263: EDF 1868: Several use cases fail (regressions)

Browse Source 
0021568: EDF GEOM: PipeTShape with Fillet and prepared for hexa mesh cannot be built
This commit is contained in:
skv 2012-11-09 06:14:12 +00:00
parent 04858cf024
commit bcea256296
1 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/GEOMImpl/GEOMImpl_IAdvancedOperations.cxx
View File

@ -56,6 +56,7 @@
#include <TopoDS.hxx> #include <TopoDS.hxx>
#include <TopoDS_Vertex.hxx> #include <TopoDS_Vertex.hxx>
#include <TopTools_IndexedMapOfShape.hxx> #include <TopTools_IndexedMapOfShape.hxx>
#include <TColStd_IndexedDataMapOfTransientTransient.hxx>
#include <gp_Pnt.hxx> #include <gp_Pnt.hxx>
#include <gp_Vec.hxx> #include <gp_Vec.hxx>
@ -70,6 +71,7 @@
#include <TFunction_Driver.hxx> #include <TFunction_Driver.hxx>
#include <TFunction_Logbook.hxx> #include <TFunction_Logbook.hxx>
#include <TDF_Tool.hxx> #include <TDF_Tool.hxx>
#include <TNaming_CopyShape.hxx>
#include <Standard_Failure.hxx> #include <Standard_Failure.hxx>
#include <Standard_ErrorHandler.hxx> // CAREFUL ! position of this file is critic : see Lucien PIGNOLONI / OCC #include <Standard_ErrorHandler.hxx> // CAREFUL ! position of this file is critic : see Lucien PIGNOLONI / OCC
@ -1138,6 +1140,11 @@ bool GEOMImpl_IAdvancedOperations::MakePipeTShapeMirrorAndGlue(Handle(GEOM_Objec
return false; return false;
} }
// Copy source shape
TopoDS_Shape aShapeCopy;
TColStd_IndexedDataMapOfTransientTransient aMapTShapes;
TNaming_CopyShape::CopyTool(Te7->GetValue(), aMapTShapes, aShapeCopy);
Handle(GEOM_Object) Te8 = myShapesOperations->MakeGlueFaces(Te7, 1e-7, true); Handle(GEOM_Object) Te8 = myShapesOperations->MakeGlueFaces(Te7, 1e-7, true);
if (Te8.IsNull()) { if (Te8.IsNull()) {
SetErrorCode("Impossible to glue faces of TShape"); SetErrorCode("Impossible to glue faces of TShape");
@ -1145,6 +1152,34 @@ bool GEOMImpl_IAdvancedOperations::MakePipeTShapeMirrorAndGlue(Handle(GEOM_Objec
} }
TopoDS_Shape aShape = Te8->GetValue(); TopoDS_Shape aShape = Te8->GetValue();
BRepCheck_Analyzer anAna (aShape, Standard_True);
if (!anAna.IsValid()) {
// Try to do gluing with the tolerance equal to maximal
// tolerance of vertices of the source shape.
Standard_Real aTolMax = -RealLast();
for (TopExp_Explorer ExV (aShapeCopy, TopAbs_VERTEX); ExV.More(); ExV.Next()) {
TopoDS_Vertex aVertex = TopoDS::Vertex(ExV.Current());
Standard_Real aTol = BRep_Tool::Tolerance(aVertex);
if (aTol > aTolMax) {
aTolMax = aTol;
}
}
// Perform gluing
Te7->GetLastFunction()->SetValue(aShapeCopy);
Te8 = myShapesOperations->MakeGlueFaces(Te7, aTolMax, true);
if (Te8.IsNull()) {
SetErrorCode("Impossible to glue faces of TShape");
return false;
}
aShape = Te8->GetValue();
}
theShape->GetLastFunction()->SetValue(aShape); theShape->GetLastFunction()->SetValue(aShape);