-// 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_ChamferDriver.hxx>
#include <GEOMImpl_IChamfer.hxx>
#include <GEOMImpl_Types.hxx>
#include <GEOMImpl_ILocalOperations.hxx>
-#include <GEOM_Function.hxx>
#include <GEOMImpl_Block6Explorer.hxx>
+#include <GEOMUtils.hxx>
+#include <GEOM_Function.hxx>
+#include <BRepLib.hxx>
#include <BRep_Tool.hxx>
#include <BRepTools.hxx>
#include <BRepFilletAPI_MakeChamfer.hxx>
#include <TopoDS_Face.hxx>
#include <TopoDS_Shape.hxx>
#include <TopoDS_Iterator.hxx>
-#include <TopExp.hxx>
#include <TopExp_Explorer.hxx>
#include <TopTools_MapOfShape.hxx>
#include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
-#include <Precision.hxx>
-#include <gp_Pnt.hxx>
#include <StdFail_NotDone.hxx>
//=======================================================================
return aChamferDriver;
}
-
//=======================================================================
//function : GEOMImpl_ChamferDriver
//purpose :
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_ChamferDriver::Execute(TFunction_Logbook& log) const
+Standard_Integer GEOMImpl_ChamferDriver::Execute(Handle(TFunction_Logbook)& log) const
{
if (Label().IsNull()) return 0;
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label());
M.FindFromIndex(i).Extent() == 2)
fill.Add(aD, E, F);
}
- }else if (aType == CHAMFER_SHAPE_EDGE || aType == CHAMFER_SHAPE_EDGE_AD) {
+ }
+ else if (aType == CHAMFER_SHAPE_EDGE || aType == CHAMFER_SHAPE_EDGE_AD) {
// chamfer on edges, common to two faces, with D1 on the first face
-
+
TopoDS_Shape aFace1, aFace2;
if (GEOMImpl_ILocalOperations::GetSubShape(aShapeBase, aCI.GetFace1(), aFace1) &&
GEOMImpl_ILocalOperations::GetSubShape(aShapeBase, aCI.GetFace2(), aFace2))
- {
- TopoDS_Face F = TopoDS::Face(aFace1);
-
- // fill map of edges of the second face
- TopTools_MapOfShape aMap;
- TopExp_Explorer Exp2 (aFace2, TopAbs_EDGE);
- for (; Exp2.More(); Exp2.Next()) {
- aMap.Add(Exp2.Current());
- }
-
- // find edges of the first face, common with the second face
- TopExp_Explorer Exp (aFace1, TopAbs_EDGE);
- for (; Exp.More(); Exp.Next()) {
- if (aMap.Contains(Exp.Current())) {
- TopoDS_Edge E = TopoDS::Edge(Exp.Current());
- if (!BRepTools::IsReallyClosed(E, F) && !BRep_Tool::Degenerated(E))
- {
- if ( aType == CHAMFER_SHAPE_EDGE )
- {
- double aD1 = aCI.GetD1();
- double aD2 = aCI.GetD2();
- fill.Add(aD1, aD2, E, F);
- }
- else
- {
- double aD = aCI.GetD();
- double anAngle = aCI.GetAngle();
- if ( (anAngle > 0) && (anAngle < (Standard_PI/2)) )
- fill.AddDA(aD, anAngle, E, F);
- }
- }
- }
- }
+ {
+ TopoDS_Face F = TopoDS::Face(aFace1);
+
+ // fill map of edges of the second face
+ TopTools_MapOfShape aMap;
+ TopExp_Explorer Exp2 (aFace2, TopAbs_EDGE);
+ for (; Exp2.More(); Exp2.Next()) {
+ aMap.Add(Exp2.Current());
+ }
+
+ // find edges of the first face, common with the second face
+ TopExp_Explorer Exp (aFace1, TopAbs_EDGE);
+ for (; Exp.More(); Exp.Next()) {
+ if (aMap.Contains(Exp.Current())) {
+ TopoDS_Edge E = TopoDS::Edge(Exp.Current());
+ if (!BRepTools::IsReallyClosed(E, F) && !BRep_Tool::Degenerated(E))
+ {
+ if ( aType == CHAMFER_SHAPE_EDGE )
+ {
+ double aD1 = aCI.GetD1();
+ double aD2 = aCI.GetD2();
+ fill.Add(aD1, aD2, E, F);
+ }
+ else
+ {
+ double aD = aCI.GetD();
+ double anAngle = aCI.GetAngle();
+ if ( (anAngle > 0) && (anAngle < (M_PI/2.)) )
+ fill.AddDA(aD, anAngle, E, F);
+ }
+ }
+ }
}
+ }
}
else if (aType == CHAMFER_SHAPE_FACES || aType == CHAMFER_SHAPE_FACES_AD) {
// chamfer on all edges of the selected faces, with D1 on the selected face
{
TopoDS_Shape aShapeFace;
if (GEOMImpl_ILocalOperations::GetSubShape(aShapeBase, aCI.GetFace(ind), aShapeFace))
- {
- TopoDS_Face F = TopoDS::Face(aShapeFace);
- TopExp_Explorer Exp (F, TopAbs_EDGE);
- for (; Exp.More(); Exp.Next()) {
- if (!aMap.Contains(Exp.Current()))
- {
- TopoDS_Edge E = TopoDS::Edge(Exp.Current());
- if (!BRepTools::IsReallyClosed(E, F) &&
- !BRep_Tool::Degenerated(E) &&
- M.FindFromKey(E).Extent() == 2)
- if (aType == CHAMFER_SHAPE_FACES)
- {
- double aD1 = aCI.GetD1();
- double aD2 = aCI.GetD2();
- fill.Add(aD1, aD2, E, F);
- }
- else
- {
- double aD = aCI.GetD();
- double anAngle = aCI.GetAngle();
- if ( (anAngle > 0) && (anAngle < (Standard_PI/2)) )
- fill.AddDA(aD, anAngle, E, F);
- }
- }
- }
- }
+ {
+ TopoDS_Face F = TopoDS::Face(aShapeFace);
+ TopExp_Explorer Exp (F, TopAbs_EDGE);
+ for (; Exp.More(); Exp.Next()) {
+ if (!aMap.Contains(Exp.Current()))
+ {
+ TopoDS_Edge E = TopoDS::Edge(Exp.Current());
+ if (!BRepTools::IsReallyClosed(E, F) &&
+ !BRep_Tool::Degenerated(E) &&
+ M.FindFromKey(E).Extent() == 2)
+ {
+ if (aType == CHAMFER_SHAPE_FACES)
+ {
+ double aD1 = aCI.GetD1();
+ double aD2 = aCI.GetD2();
+ fill.Add(aD1, aD2, E, F);
+ }
+ else
+ {
+ double aD = aCI.GetD();
+ double anAngle = aCI.GetAngle();
+ if ( (anAngle > 0) && (anAngle < (M_PI/2.)) )
+ fill.AddDA(aD, anAngle, E, F);
+ }
+ }
+ }
+ }
+ }
}
- }
-else if (aType == CHAMFER_SHAPE_EDGES || aType == CHAMFER_SHAPE_EDGES_AD)
+ }
+ else if (aType == CHAMFER_SHAPE_EDGES || aType == CHAMFER_SHAPE_EDGES_AD)
{
- // chamfer on selected edges with lenght param D1 & D2.
+ // chamfer on selected edges with length param D1 & D2.
int aLen = aCI.GetLength();
int ind = 1;
{
TopoDS_Shape aShapeEdge;
if (GEOMImpl_ILocalOperations::GetSubShape(aShapeBase, aCI.GetEdge(ind), aShapeEdge))
- {
- TopoDS_Edge E = TopoDS::Edge(aShapeEdge);
- const TopTools_ListOfShape& aFacesList = M.FindFromKey(E);
- TopoDS_Face F = TopoDS::Face( aFacesList.First() );
- if (aType == CHAMFER_SHAPE_EDGES)
- {
- double aD1 = aCI.GetD1();
- double aD2 = aCI.GetD2();
- fill.Add(aD1, aD2, E, F);
- }
- else
- {
- double aD = aCI.GetD();
- double anAngle = aCI.GetAngle();
- if ( (anAngle > 0) && (anAngle < (Standard_PI/2)) )
- fill.AddDA(aD, anAngle, E, F);
- }
- }
- }
+ {
+ TopoDS_Edge E = TopoDS::Edge(aShapeEdge);
+ const TopTools_ListOfShape& aFacesList = M.FindFromKey(E);
+ TopoDS_Face F = TopoDS::Face( aFacesList.First() );
+ if (aType == CHAMFER_SHAPE_EDGES)
+ {
+ double aD1 = aCI.GetD1();
+ double aD2 = aCI.GetD2();
+ fill.Add(aD1, aD2, E, F);
+ }
+ else
+ {
+ double aD = aCI.GetD();
+ double anAngle = aCI.GetAngle();
+ if ( (anAngle > 0) && (anAngle < (M_PI/2.)) )
+ fill.AddDA(aD, anAngle, E, F);
+ }
+ }
+ }
}
else {
}
if (!fill.IsDone()) {
StdFail_NotDone::Raise("Chamfer can not be computed on the given shape with the given parameters");
}
- aShape = fill.Shape();
+ aShape = GEOMUtils::ReduceCompound( fill.Shape() );
if (aShape.IsNull()) return 0;
+ // reduce tolerances
+ GEOMUtils::FixShapeTolerance( aShape );
+
+ // fix SameParameter flag
+ BRepLib::SameParameter(aShape, 1.E-5, Standard_True);
+
aFunction->SetValue(aShape);
- log.SetTouched(Label());
+ log->SetTouched(Label());
return 1;
}
+//================================================================================
+/*!
+ * \brief Returns a name of creation operation and names and values of creation parameters
+ */
+//================================================================================
-//=======================================================================
-//function : GEOMImpl_ChamferDriver_Type_
-//purpose :
-//=======================================================================
-Standard_EXPORT Handle_Standard_Type& GEOMImpl_ChamferDriver_Type_()
+bool GEOMImpl_ChamferDriver::
+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_ChamferDriver",
- sizeof(GEOMImpl_ChamferDriver),
- 1,
- (Standard_Address)_Ancestors,
- (Standard_Address)NULL);
-
- return _aType;
-}
-
-//=======================================================================
-//function : DownCast
-//purpose :
-//=======================================================================
-const Handle(GEOMImpl_ChamferDriver) Handle(GEOMImpl_ChamferDriver)::DownCast(const Handle(Standard_Transient)& AnObject)
-{
- Handle(GEOMImpl_ChamferDriver) _anOtherObject;
-
- if (!AnObject.IsNull()) {
- if (AnObject->IsKind(STANDARD_TYPE(GEOMImpl_ChamferDriver))) {
- _anOtherObject = Handle(GEOMImpl_ChamferDriver)((Handle(GEOMImpl_ChamferDriver)&)AnObject);
- }
+ if (Label().IsNull()) return 0;
+ Handle(GEOM_Function) function = GEOM_Function::GetFunction(Label());
+
+ GEOMImpl_IChamfer aCI( function );
+ Standard_Integer aType = function->GetType();
+
+ theOperationName = "CHAMFER";
+
+ switch ( aType ) {
+ case CHAMFER_SHAPE_ALL:
+ AddParam( theParams, "Main Object", aCI.GetShape() );
+ AddParam( theParams, "Selected Edges", "all" );
+ AddParam( theParams, "D", aCI.GetD() );
+ break;
+ case CHAMFER_SHAPE_EDGE:
+ AddParam( theParams, "Main Object", aCI.GetShape() );
+ AddParam( theParams, "Face 1", aCI.GetFace1() );
+ AddParam( theParams, "Face 2", aCI.GetFace2() );
+ AddParam( theParams, "D1", aCI.GetD1() );
+ AddParam( theParams, "D2", aCI.GetD2() );
+ break;
+ case CHAMFER_SHAPE_EDGE_AD:
+ AddParam( theParams, "Main Object", aCI.GetShape() );
+ AddParam( theParams, "Face 1", aCI.GetFace1() );
+ AddParam( theParams, "Face 2", aCI.GetFace2() );
+ AddParam( theParams, "D", aCI.GetD() );
+ AddParam( theParams, "Angle", aCI.GetAngle() );
+ break;
+ case CHAMFER_SHAPE_FACES:
+ AddParam( theParams, "Main Object", aCI.GetShape() );
+ AddParam( theParams, "Selected Faces" );
+ if ( aCI.GetLength() > 1 )
+ theParams[1] << aCI.GetLength() << " faces: ";
+ for ( int i = 1, nb = aCI.GetLength(); i <= nb; ++i )
+ theParams[1] << aCI.GetFace(i) << " ";
+ AddParam( theParams, "D1", aCI.GetD1() );
+ AddParam( theParams, "D2", aCI.GetD2() );
+ break;
+ case CHAMFER_SHAPE_FACES_AD:
+ AddParam( theParams, "Main Object", aCI.GetShape() );
+ AddParam( theParams, "Selected Faces" );
+ if ( aCI.GetLength() > 1 )
+ theParams[1] << aCI.GetLength() << " faces: ";
+ for ( int i = 1, nb = aCI.GetLength(); i <= nb; ++i )
+ theParams[1] << aCI.GetFace(i) << " ";
+ AddParam( theParams, "D", aCI.GetD() );
+ AddParam( theParams, "Angle", aCI.GetAngle() );
+ break;
+ case CHAMFER_SHAPE_EDGES:
+ AddParam( theParams, "Main Object", aCI.GetShape() );
+ AddParam( theParams, "Selected Edges" );
+ if ( aCI.GetLength() > 1 )
+ theParams[1] << aCI.GetLength() << " edges: ";
+ for ( int i = 1, nb = aCI.GetLength(); i <= nb; ++i )
+ theParams[1] << aCI.GetEdge(i) << " ";
+ AddParam( theParams, "D1", aCI.GetD1() );
+ AddParam( theParams, "D2", aCI.GetD2() );
+ break;
+ case CHAMFER_SHAPE_EDGES_AD:
+ AddParam( theParams, "Main Object", aCI.GetShape() );
+ AddParam( theParams, "Selected Edges" );
+ if ( aCI.GetLength() > 1 )
+ theParams[1] << aCI.GetLength() << " edges: ";
+ for ( int i = 1, nb = aCI.GetLength(); i <= nb; ++i )
+ theParams[1] << aCI.GetFace(i) << " ";
+ AddParam( theParams, "D", aCI.GetD() );
+ AddParam( theParams, "Angle", aCI.GetAngle() );
+ break;
+ default:
+ return false;
}
- return _anOtherObject ;
+ return true;
}
+
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ChamferDriver,GEOM_BaseDriver);
