X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGEOMImpl%2FGEOMImpl_OffsetDriver.cxx;h=bb6ef1cd3b7146c666e72076597ad03f4981bd93;hb=de644ac6fe44325aaa8ce9c1aa729dd9189eea6e;hp=2c870d03c7aa4a35a12149f455ff76187537cfb5;hpb=5b3622aa2363853841fd5b4205c78a715bfee4a4;p=modules%2Fgeom.git diff --git a/src/GEOMImpl/GEOMImpl_OffsetDriver.cxx b/src/GEOMImpl/GEOMImpl_OffsetDriver.cxx index 2c870d03c..bb6ef1cd3 100644 --- a/src/GEOMImpl/GEOMImpl_OffsetDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_OffsetDriver.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2022 CEA/DEN, EDF R&D, OPEN CASCADE // // Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS @@ -6,7 +6,7 @@ // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public // License as published by the Free Software Foundation; either -// version 2.1 of the License. +// version 2.1 of the License, or (at your option) any later version. // // This library is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -26,29 +26,18 @@ #include #include #include +#include #include -#include -#include +#include #include -#include #include #include - #include - #include -#include - -#include -#include -#include - #include #include -#include "utilities.h" - //======================================================================= //function : GetID //purpose : @@ -59,7 +48,6 @@ const Standard_GUID& GEOMImpl_OffsetDriver::GetID() return aOffsetDriver; } - //======================================================================= //function : GEOMImpl_OffsetDriver //purpose : @@ -72,7 +60,7 @@ GEOMImpl_OffsetDriver::GEOMImpl_OffsetDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_OffsetDriver::Execute(TFunction_Logbook& log) const +Standard_Integer GEOMImpl_OffsetDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -81,122 +69,172 @@ Standard_Integer GEOMImpl_OffsetDriver::Execute(TFunction_Logbook& log) const Standard_Integer aType = aFunction->GetType(); TopoDS_Shape aShape; - + Handle(GEOM_Function) aRefShape = aCI.GetShape(); TopoDS_Shape aShapeBase = aRefShape->GetValue(); Standard_Real anOffset = aCI.GetValue(); + Standard_Boolean isInside = aCI.GetParam(); Standard_Real aTol = Precision::Confusion(); - + + if (isInside) + anOffset = -anOffset; + if (Abs(anOffset) < aTol) { - TCollection_AsciiString aMsg ("Absolute value of offset can not be less than the tolerance value ("); - aMsg += TCollection_AsciiString(aTol); - aMsg += ")"; - StdFail_NotDone::Raise(aMsg.ToCString()); + TCollection_AsciiString aMsg ("Absolute value of offset can not be less than the tolerance value ("); + aMsg += TCollection_AsciiString(aTol); + aMsg += ")"; + StdFail_NotDone::Raise(aMsg.ToCString()); } - if (aType == OFFSET_SHAPE || aType == OFFSET_SHAPE_COPY) { - BRepOffsetAPI_MakeOffsetShape MO (aShapeBase, - aCI.GetValue(), - aTol); - if (MO.IsDone()) { + if ( aType == OFFSET_SHAPE || aType == OFFSET_SHAPE_COPY ) + { + BRepOffsetAPI_MakeOffsetShape MO; + BRepOffset_Mode aMode = BRepOffset_Skin; + Standard_Boolean anIntersection = Standard_False, aSelfInter = Standard_False; + MO.PerformByJoin( aShapeBase, + aCI.GetValue(), + aTol, + aMode, + anIntersection, + aSelfInter, + aCI.GetJoinByPipes() ? GeomAbs_Arc : GeomAbs_Intersection ); + + if ( MO.IsDone() ) { aShape = MO.Shape(); - // 23.04.2010 skl for bug 21699 from Mantis - BRepCheck_Analyzer ana (aShape, Standard_True); - ana.Init(aShape); - if (!ana.IsValid()) { - ShapeFix_ShapeTolerance aSFT; - aSFT.LimitTolerance(aShape, Precision::Confusion(), - Precision::Confusion(), TopAbs_SHAPE); - Handle(ShapeFix_Shape) aSfs = new ShapeFix_Shape(aShape); - aSfs->Perform(); - aShape = aSfs->Shape(); - ana.Init(aShape); - if (!ana.IsValid()) - Standard_ConstructionError::Raise("Boolean operation aborted : non valid shape result"); - } + if ( !GEOMUtils::CheckShape(aShape, true) && !GEOMUtils::FixShapeTolerance(aShape) ) + Standard_ConstructionError::Raise("Boolean operation aborted : non valid shape result"); } else { StdFail_NotDone::Raise("Offset construction failed"); } - } + } else if (aType == OFFSET_THICKENING || aType == OFFSET_THICKENING_COPY) { - BRepClass3d_SolidClassifier aClassifier = BRepClass3d_SolidClassifier(aShapeBase); - aClassifier.PerformInfinitePoint(Precision::Confusion()); - if (aClassifier.State()==TopAbs_IN) - { - // If the generated pipe faces normals are oriented towards the inside, the offset is negative - // so that the thickening is still towards outside - anOffset=-anOffset; - } + const TopAbs_ShapeEnum aType = aShapeBase.ShapeType(); + + if (aType == TopAbs_FACE || aType == TopAbs_SHELL) { + // Create a thick solid. + BRepClass3d_SolidClassifier aClassifier(aShapeBase); + aClassifier.PerformInfinitePoint(Precision::Confusion()); + if (aClassifier.State()==TopAbs_IN) + { + // If the generated pipe faces normals are oriented towards the inside, the offset is negative + // so that the thickening is still towards outside + anOffset=-anOffset; + } - BRepOffset_MakeOffset myOffsetShape(aShapeBase, anOffset, aTol, BRepOffset_Skin, - Standard_False, Standard_False, GeomAbs_Intersection, Standard_True); - - if (!myOffsetShape.IsDone()) - { - StdFail_NotDone::Raise("Thickening construction failed"); - } - aShape = myOffsetShape.Shape(); - - // Control the solid orientation. This is mostly done to fix a bug in case of extrusion - // of a circle. The built solid is then badly oriented - BRepClass3d_SolidClassifier anotherClassifier = BRepClass3d_SolidClassifier(aShape); - anotherClassifier.PerformInfinitePoint(Precision::Confusion()); - if (anotherClassifier.State()==TopAbs_IN) - { - aShape.Reverse(); - } - } + BRepOffset_MakeOffset myOffsetShape(aShapeBase, anOffset, aTol, BRepOffset_Skin, + Standard_False, Standard_False, GeomAbs_Intersection, Standard_True); - if (aShape.IsNull()) return 0; + if (!myOffsetShape.IsDone()) + { + StdFail_NotDone::Raise("Thickening construction failed"); + } + aShape = myOffsetShape.Shape(); + + // Control the solid orientation. This is mostly done to fix a bug in case of extrusion + // of a circle. The built solid is then badly oriented + BRepClass3d_SolidClassifier anotherClassifier(aShape); + anotherClassifier.PerformInfinitePoint(Precision::Confusion()); + if (anotherClassifier.State()==TopAbs_IN) + { + aShape.Reverse(); + } + } else if (aType == TopAbs_SOLID) { + // Create a hollowed solid. + Handle(TColStd_HArray1OfInteger) aFacesIDs = aCI.GetFaceIDs(); + TopTools_ListOfShape aFacesToRm; - aFunction->SetValue(aShape); + if (aFacesIDs.IsNull()) { + return 0; + } - log.SetTouched(Label()); + TopTools_IndexedMapOfShape anIndices; - return 1; -} + TopExp::MapShapes(aShapeBase, anIndices); + Standard_Integer aNbShapes = anIndices.Extent(); + Standard_Integer i; -//======================================================================= -//function : GEOMImpl_OffsetDriver_Type_ -//purpose : -//======================================================================= -Standard_EXPORT Handle_Standard_Type& GEOMImpl_OffsetDriver_Type_() -{ + for (i = aFacesIDs->Lower(); i <= aFacesIDs->Upper(); ++i) { + const Standard_Integer anIndex = aFacesIDs->Value(i); + + if (anIndex < 1 || anIndex > aNbShapes) { + // Invalid index. + return 0; + } - static Handle_Standard_Type aType1 = STANDARD_TYPE(TFunction_Driver); - if ( aType1.IsNull()) aType1 = STANDARD_TYPE(TFunction_Driver); - static Handle_Standard_Type aType2 = STANDARD_TYPE(MMgt_TShared); - if ( aType2.IsNull()) aType2 = STANDARD_TYPE(MMgt_TShared); - static Handle_Standard_Type aType3 = STANDARD_TYPE(Standard_Transient); - if ( aType3.IsNull()) aType3 = STANDARD_TYPE(Standard_Transient); + const TopoDS_Shape &aFace = anIndices.FindKey(anIndex); + if (aFace.ShapeType() != TopAbs_FACE) { + // Shape by index is not a face. + return 0; + } + + aFacesToRm.Append(aFace); + } - static Handle_Standard_Transient _Ancestors[]= {aType1,aType2,aType3,NULL}; - static Handle_Standard_Type _aType = new Standard_Type("GEOMImpl_OffsetDriver", - sizeof(GEOMImpl_OffsetDriver), - 1, - (Standard_Address)_Ancestors, - (Standard_Address)NULL); + // Create a hollowed solid. + BRepOffsetAPI_MakeThickSolid aMkSolid; + aMkSolid.MakeThickSolidByJoin (aShapeBase, aFacesToRm, anOffset, aTol, BRepOffset_Skin, + Standard_False, Standard_False, GeomAbs_Intersection); - return _aType; + if (aMkSolid.IsDone()) { + aShape = aMkSolid.Shape(); + } + } + } + + if (aShape.IsNull()) return 0; + + aFunction->SetValue(aShape); + + log->SetTouched(Label()); + + return 1; } -//======================================================================= -//function : DownCast -//purpose : -//======================================================================= -const Handle(GEOMImpl_OffsetDriver) Handle(GEOMImpl_OffsetDriver)::DownCast(const Handle(Standard_Transient)& AnObject) +//================================================================================ +/*! + * \brief Returns a name of creation operation and names and values of creation parameters + */ +//================================================================================ + +bool GEOMImpl_OffsetDriver:: +GetCreationInformation(std::string& theOperationName, + std::vector& theParams) { - Handle(GEOMImpl_OffsetDriver) _anOtherObject; + if (Label().IsNull()) return 0; + Handle(GEOM_Function) function = GEOM_Function::GetFunction(Label()); + + GEOMImpl_IOffset aCI( function ); + Standard_Integer aType = function->GetType(); + + switch ( aType ) { + case OFFSET_SHAPE: + case OFFSET_SHAPE_COPY: + theOperationName = "OFFSET"; + AddParam( theParams, "Object", aCI.GetShape() ); + AddParam( theParams, "Offset", aCI.GetValue() ); + break; + case OFFSET_THICKENING: + case OFFSET_THICKENING_COPY: + theOperationName = "THICKNESS"; + AddParam( theParams, "Object", aCI.GetShape() ); + AddParam( theParams, "Offset", aCI.GetParam() ? -aCI.GetValue() : aCI.GetValue() ); + { + Handle(TColStd_HArray1OfInteger) aFacesIDs = aCI.GetFaceIDs(); - if (!AnObject.IsNull()) { - if (AnObject->IsKind(STANDARD_TYPE(GEOMImpl_OffsetDriver))) { - _anOtherObject = Handle(GEOMImpl_OffsetDriver)((Handle(GEOMImpl_OffsetDriver)&)AnObject); - } + if (aFacesIDs.IsNull() == Standard_False) { + AddParam(theParams, "Faces IDs", aFacesIDs); + } + } + break; + default: + return false; } - - return _anOtherObject ; + + return true; } + +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_OffsetDriver,GEOM_BaseDriver)