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

Mantis issue 0020859: Partition operation fails on first try.

Browse Source
This commit is contained in:
jfa 2010-05-12 11:32:41 +00:00
parent adda7ddab3
commit 92cc19641a
1 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/GEOMImpl/GEOMImpl_PartitionDriver.cxx
View File

@ -35,6 +35,7 @@
#include <TDataStd_IntegerArray.hxx> #include <TDataStd_IntegerArray.hxx>
#include <BRepBuilderAPI_Copy.hxx>
#include <BRep_Tool.hxx> #include <BRep_Tool.hxx>
#include <BRepAlgo.hxx> #include <BRepAlgo.hxx>
@ -141,6 +142,12 @@ Standard_Integer GEOMImpl_PartitionDriver::Execute(TFunction_Logbook& log) const
Standard_NullObject::Raise("In Partition a shape is null"); Standard_NullObject::Raise("In Partition a shape is null");
} }
// //
BRepBuilderAPI_Copy aCopyTool (aShape_i);
if (aCopyTool.IsDone())
aShape_i = aCopyTool.Shape();
else
Standard_NullObject::Raise("Bad shape detected");
//
TopTools_ListOfShape aSimpleShapes; TopTools_ListOfShape aSimpleShapes;
PrepareShapes(aShape_i, aType, aSimpleShapes); PrepareShapes(aShape_i, aType, aSimpleShapes);
TopTools_ListIteratorOfListOfShape aSimpleIter (aSimpleShapes); TopTools_ListIteratorOfListOfShape aSimpleIter (aSimpleShapes);
@ -164,6 +171,12 @@ Standard_Integer GEOMImpl_PartitionDriver::Execute(TFunction_Logbook& log) const
Standard_NullObject::Raise("In Partition a tool shape is null"); Standard_NullObject::Raise("In Partition a tool shape is null");
} }
// //
BRepBuilderAPI_Copy aCopyTool (aShape_i);
if (aCopyTool.IsDone())
aShape_i = aCopyTool.Shape();
else
Standard_NullObject::Raise("Bad shape detected");
//
TopTools_ListOfShape aSimpleShapes; TopTools_ListOfShape aSimpleShapes;
PrepareShapes(aShape_i, aType, aSimpleShapes); PrepareShapes(aShape_i, aType, aSimpleShapes);
TopTools_ListIteratorOfListOfShape aSimpleIter (aSimpleShapes); TopTools_ListIteratorOfListOfShape aSimpleIter (aSimpleShapes);
@ -183,6 +196,12 @@ Standard_Integer GEOMImpl_PartitionDriver::Execute(TFunction_Logbook& log) const
Standard_NullObject::Raise("In Partition a Keep Inside shape is null"); Standard_NullObject::Raise("In Partition a Keep Inside shape is null");
} }
// //
BRepBuilderAPI_Copy aCopyTool (aShape_i);
if (aCopyTool.IsDone())
aShape_i = aCopyTool.Shape();
else
Standard_NullObject::Raise("Bad shape detected");
//
TopTools_ListOfShape aSimpleShapes; TopTools_ListOfShape aSimpleShapes;
PrepareShapes(aShape_i, aType, aSimpleShapes); PrepareShapes(aShape_i, aType, aSimpleShapes);
TopTools_ListIteratorOfListOfShape aSimpleIter (aSimpleShapes); TopTools_ListIteratorOfListOfShape aSimpleIter (aSimpleShapes);
@ -201,6 +220,12 @@ Standard_Integer GEOMImpl_PartitionDriver::Execute(TFunction_Logbook& log) const
Standard_NullObject::Raise("In Partition a Remove Inside shape is null"); Standard_NullObject::Raise("In Partition a Remove Inside shape is null");
} }
// //
BRepBuilderAPI_Copy aCopyTool (aShape_i);
if (aCopyTool.IsDone())
aShape_i = aCopyTool.Shape();
else
Standard_NullObject::Raise("Bad shape detected");
//
TopTools_ListOfShape aSimpleShapes; TopTools_ListOfShape aSimpleShapes;
PrepareShapes(aShape_i, aType, aSimpleShapes); PrepareShapes(aShape_i, aType, aSimpleShapes);
TopTools_ListIteratorOfListOfShape aSimpleIter (aSimpleShapes); TopTools_ListIteratorOfListOfShape aSimpleIter (aSimpleShapes);