-// Copyright (C) 2005 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// Copyright (C) 2007-2016 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
-//
+//
// 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.
-//
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// License as published by the Free Software Foundation; either
+// 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
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
// Lesser General Public License for more details.
//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
-#include <Standard_Stream.hxx>
-
#include <GEOMImpl_FilletDriver.hxx>
#include <GEOMImpl_IFillet.hxx>
#include <GEOMImpl_Types.hxx>
#include <GEOMImpl_ILocalOperations.hxx>
+#include <GEOMUtils.hxx>
#include <GEOM_Function.hxx>
#include <BRepFilletAPI_MakeFillet.hxx>
-#include <BRepCheck_Analyzer.hxx>
-#include <BRep_Tool.hxx>
-
#include <TopoDS.hxx>
#include <TopoDS_Shape.hxx>
#include <TopoDS_Edge.hxx>
#include <TopAbs.hxx>
#include <TopExp_Explorer.hxx>
-
-#include <Precision.hxx>
-#include <gp_Pnt.hxx>
#include <StdFail_NotDone.hxx>
+// Debug PipeTShape function: uncomment the macro below to correct tolerance
+// of resulting face after fillet creation
+// VSR 30/12/2014: macro disabled
+//#define FIX_FACE_TOLERANCE
+// Debug PipeTShape function: uncomment the macro below to correct tolerance
+// of resulting curves after fillet creation
+// VSR 30/12/2014: macro disabled
+//#define FIX_CURVES_TOLERANCES
+
//=======================================================================
//function : GetID
//purpose :
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_FilletDriver::Execute(TFunction_Logbook& log) const
+Standard_Integer GEOMImpl_FilletDriver::Execute(LOGBOOK& log) const
{
if (Label().IsNull()) return 0;
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label());
TopoDS_Edge E = TopoDS::Edge(Exp.Current());
fill.Add(E);
}
- } else if (aType == FILLET_SHAPE_EDGES) {
+ }
+ else if (aType == FILLET_SHAPE_EDGES || aType == FILLET_SHAPE_EDGES_2R) {
int aLen = aCI.GetLength();
int ind = 1;
for (; ind <= aLen; ind++) {
TopoDS_Shape aShapeEdge;
if (GEOMImpl_ILocalOperations::GetSubShape
(aShapeBase, aCI.GetEdge(ind), aShapeEdge)) {
- fill.Add(TopoDS::Edge(aShapeEdge));
+ fill.Add(TopoDS::Edge(aShapeEdge));
}
}
- } else if (aType == FILLET_SHAPE_FACES) {
+ }
+ else if (aType == FILLET_SHAPE_FACES || aType == FILLET_SHAPE_FACES_2R) {
int aLen = aCI.GetLength();
int ind = 1;
for (; ind <= aLen; ind++) {
}
}
}
- } else {
+ }
+ else {
}
- for (int i = 1; i <= fill.NbContours(); i++) {
- fill.SetRadius(aCI.GetR(), i, i);
+ if (aType == FILLET_SHAPE_FACES || aType == FILLET_SHAPE_EDGES || aType == FILLET_SHAPE_ALL) {
+ for (int i = 1; i <= fill.NbContours(); i++)
+ fill.SetRadius(aCI.GetR(), i, 1);
+ }
+ else if (aType == FILLET_SHAPE_FACES_2R || aType == FILLET_SHAPE_EDGES_2R) {
+ for (int i = 1; i <= fill.NbContours(); i++) {
+ fill.SetRadius(aCI.GetR1(), aCI.GetR2(), i, 1);
+ }
}
+
fill.Build();
if (!fill.IsDone()) {
StdFail_NotDone::Raise("Fillet can't be computed on the given shape with the given radius");
}
- aShape = fill.Shape();
+ aShape = GEOMUtils::ReduceCompound( fill.Shape() );
if (aShape.IsNull()) return 0;
- // Check shape validity
- BRepCheck_Analyzer ana (aShape, false);
- if (!ana.IsValid()) {
+#if defined(FIX_CURVES_TOLERANCES)
+ bool isOk = GEOMUtils::FixShapeCurves(aShape);
+#elif defined(FIX_FACE_TOLERANCE)
+ bool isOk = GEOMUtils::FixShapeTolerance(aShape, TopAbs_FACE);
+#else
+ // 08.07.2008 added by skl during fixing bug 19761 from Mantis
+ bool isOk = GEOMUtils::CheckShape(aShape) || GEOMUtils::FixShapeTolerance(aShape);
+#endif
+ if ( !isOk )
StdFail_NotDone::Raise("Fillet algorithm have produced an invalid shape result");
- }
aFunction->SetValue(aShape);
+#if OCC_VERSION_MAJOR < 7
log.SetTouched(Label());
+#else
+ log->SetTouched(Label());
+#endif
return 1;
}
+//================================================================================
+/*!
+ * \brief Returns a name of creation operation and names and values of creation parameters
+ */
+//================================================================================
-//=======================================================================
-//function : GEOMImpl_FilletDriver_Type_
-//purpose :
-//=======================================================================
-Standard_EXPORT Handle_Standard_Type& GEOMImpl_FilletDriver_Type_()
+bool GEOMImpl_FilletDriver::
+GetCreationInformation(std::string& theOperationName,
+ std::vector<GEOM_Param>& theParams)
{
-
- 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);
-
-
- static Handle_Standard_Transient _Ancestors[]= {aType1,aType2,aType3,NULL};
- static Handle_Standard_Type _aType = new Standard_Type("GEOMImpl_FilletDriver",
- sizeof(GEOMImpl_FilletDriver),
- 1,
- (Standard_Address)_Ancestors,
- (Standard_Address)NULL);
-
- return _aType;
-}
-
-//=======================================================================
-//function : DownCast
-//purpose :
-//=======================================================================
-const Handle(GEOMImpl_FilletDriver) Handle(GEOMImpl_FilletDriver)::DownCast(const Handle(Standard_Transient)& AnObject)
-{
- Handle(GEOMImpl_FilletDriver) _anOtherObject;
-
- if (!AnObject.IsNull()) {
- if (AnObject->IsKind(STANDARD_TYPE(GEOMImpl_FilletDriver))) {
- _anOtherObject = Handle(GEOMImpl_FilletDriver)((Handle(GEOMImpl_FilletDriver)&)AnObject);
- }
+ if (Label().IsNull()) return 0;
+ Handle(GEOM_Function) function = GEOM_Function::GetFunction(Label());
+
+ GEOMImpl_IFillet aCI( function );
+ Standard_Integer aType = function->GetType();
+
+ theOperationName = "FILLET";
+
+ switch ( aType ) {
+ case FILLET_SHAPE_ALL:
+ AddParam( theParams, "Main Object", aCI.GetShape() );
+ AddParam( theParams, "Selected edges", "all" );
+ break;
+ case FILLET_SHAPE_EDGES:
+ case FILLET_SHAPE_EDGES_2R:
+ AddParam( theParams, "Main Object", aCI.GetShape() );
+ AddParam( theParams, "Selected edges" );
+ if ( aCI.GetLength() > 1 )
+ theParams[1] << aCI.GetLength() << " edges: ";
+ for (int i = 1; i <= aCI.GetLength(); ++i )
+ theParams[1] << aCI.GetEdge( i ) << " ";
+ if ( aType == FILLET_SHAPE_EDGES ) {
+ AddParam( theParams, "Radius", aCI.GetR() );
+ }
+ else {
+ AddParam( theParams, "R1", aCI.GetR1() );
+ AddParam( theParams, "R2", aCI.GetR2() );
+ }
+ break;
+ case FILLET_SHAPE_FACES:
+ case FILLET_SHAPE_FACES_2R:
+ AddParam( theParams, "Main Object", aCI.GetShape() );
+ AddParam( theParams, "Selected faces" );
+ if ( aCI.GetLength() > 1 )
+ theParams[1] << aCI.GetLength() << " faces: ";
+ for (int i = 1; i <= aCI.GetLength(); ++i )
+ theParams[1] << aCI.GetFace( i ) << " ";
+ if ( aType == FILLET_SHAPE_FACES ) {
+ AddParam( theParams, "Radius", aCI.GetR() );
+ }
+ else {
+ AddParam( theParams, "R1", aCI.GetR1() );
+ AddParam( theParams, "R2", aCI.GetR2() );
+ }
+ break;
+ default:
+ return false;
}
-
- return _anOtherObject ;
+
+ return true;
}
+
+OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_FilletDriver,GEOM_BaseDriver);
