ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-04-24 20:02:03 +05:00
Code Issues Packages Projects Releases Wiki Activity

NPAL19230: Fix shape after RemoveExtraEdges, because sometimes it is not valid.

Browse Source
This commit is contained in:
jfa 2008-03-18 10:22:32 +00:00
parent be31b630d5
commit 77f03a4d00
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/GEOMImpl/GEOMImpl_BlockDriver.cxx
View File

@ -34,7 +34,7 @@
#include <GEOM_Function.hxx> #include <GEOM_Function.hxx>
#include <ShHealOper_Sewing.hxx> #include <ShHealOper_Sewing.hxx>
//#include <NMTAlgo_Splitter1.hxx> #include <ShHealOper_ShapeProcess.hxx>
#include <GEOMAlgo_Gluer.hxx> #include <GEOMAlgo_Gluer.hxx>
#include <BlockFix_BlockFixAPI.hxx> #include <BlockFix_BlockFixAPI.hxx>
@ -53,6 +53,7 @@
#include <BRepBuilderAPI_MakeWire.hxx> #include <BRepBuilderAPI_MakeWire.hxx>
#include <BRepBuilderAPI_MakePolygon.hxx> #include <BRepBuilderAPI_MakePolygon.hxx>
#include <BRepBuilderAPI_Transform.hxx> #include <BRepBuilderAPI_Transform.hxx>
#include <BRepCheck_Analyzer.hxx>
#include <BRepClass_FaceClassifier.hxx> #include <BRepClass_FaceClassifier.hxx>
#include <BRepClass3d_SolidClassifier.hxx> #include <BRepClass3d_SolidClassifier.hxx>
#include <BRepExtrema_ExtPF.hxx> #include <BRepExtrema_ExtPF.hxx>
@ -507,17 +508,28 @@ Standard_Integer GEOMImpl_BlockDriver::Execute(TFunction_Logbook& log) const
aTool.SetShape(aBlockOrComp); aTool.SetShape(aBlockOrComp);
aTool.Perform(); aTool.Perform();
if (aType == BLOCK_REMOVE_EXTRA) { TopoDS_Shape aFixedExtra = aTool.Shape();
// Repair result
BRepCheck_Analyzer ana (aFixedExtra, false);
if (!ana.IsValid()) {
TopoDS_Shape aFixed;
ShHealOper_ShapeProcess aHealer;
aHealer.Perform(aFixedExtra, aFixed);
if (aHealer.isDone())
aFixedExtra = aFixed;
}
if (aType == BLOCK_REMOVE_EXTRA)
{
aShape = aFixedExtra;
aShape = aTool.Shape();
if (aShape == aBlockOrComp) { if (aShape == aBlockOrComp) {
MESSAGE("No modifications have been done"); MESSAGE("No modifications have been done");
} }
}
} else { // aType == BLOCK_COMPOUND_IMPROVE else // aType == BLOCK_COMPOUND_IMPROVE
{
TopoDS_Shape aFixedExtra = aTool.Shape();
// 2. Separate non-blocks // 2. Separate non-blocks
TopTools_ListOfShape BLO; // All blocks from the given compound TopTools_ListOfShape BLO; // All blocks from the given compound
TopTools_ListOfShape NOT; // Not blocks TopTools_ListOfShape NOT; // Not blocks