X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGEOMImpl%2FGEOMImpl_PrismDriver.cxx;h=eabed5f259e8f950e96e86e208ad4b465187b040;hb=f04d9d5e1fb66095af14513859211f2a2327545a;hp=87157a5fcfada5d38e32adc67477dffa3e14ea21;hpb=9499b99fe2dcb53e1ea364f97986f8f432b04600;p=modules%2Fgeom.git diff --git a/src/GEOMImpl/GEOMImpl_PrismDriver.cxx b/src/GEOMImpl/GEOMImpl_PrismDriver.cxx index 87157a5fc..eabed5f25 100644 --- a/src/GEOMImpl/GEOMImpl_PrismDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_PrismDriver.cxx @@ -1,69 +1,101 @@ -// Copyright (C) 2005 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// Copyright (C) 2007-2011 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 +// 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 +// +// 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 - #include + #include +#include +#include +#include +#include #include #include #include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include #include +#include + +#include +#include +#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 : -//======================================================================= +//======================================================================= const Standard_GUID& GEOMImpl_PrismDriver::GetID() { static Standard_GUID aPrismDriver("FF1BBB17-5D14-4df2-980B-3A668264EA16"); - return aPrismDriver; + return aPrismDriver; } //======================================================================= //function : GEOMImpl_PrismDriver -//purpose : +//purpose : //======================================================================= -GEOMImpl_PrismDriver::GEOMImpl_PrismDriver() +GEOMImpl_PrismDriver::GEOMImpl_PrismDriver() { } //======================================================================= //function : Execute //purpose : -//======================================================================= +//======================================================================= Standard_Integer GEOMImpl_PrismDriver::Execute(TFunction_Logbook& log) const { - if (Label().IsNull()) return 0; + if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); GEOMImpl_IPrism aCI (aFunction); @@ -71,7 +103,7 @@ Standard_Integer GEOMImpl_PrismDriver::Execute(TFunction_Logbook& log) const TopoDS_Shape aShape; - if (aType == PRISM_BASE_VEC_H) { + if (aType == PRISM_BASE_VEC_H || aType == PRISM_BASE_VEC_H_2WAYS) { Handle(GEOM_Function) aRefBase = aCI.GetBase(); Handle(GEOM_Function) aRefVector = aCI.GetVector(); TopoDS_Shape aShapeBase = aRefBase->GetValue(); @@ -87,11 +119,23 @@ Standard_Integer GEOMImpl_PrismDriver::Execute(TFunction_Logbook& log) const } if (aV.Magnitude() > Precision::Confusion()) { aV.Normalize(); - aShape = BRepPrimAPI_MakePrism(aShapeBase, aV * aCI.GetH(), Standard_False).Shape(); + if (aType != PRISM_BASE_DXDYDZ_2WAYS && aCI.GetScale() > Precision::Confusion()) { + aShape = MakeScaledPrism(aShapeBase, aV * aCI.GetH(), aCI.GetScale()); + } + else { + if (aType == PRISM_BASE_VEC_H_2WAYS) { + gp_Trsf aTrsf; + aTrsf.SetTranslation((-aV) * aCI.GetH()); + BRepBuilderAPI_Transform aTransformation(aShapeBase, aTrsf, Standard_False); + aShapeBase = aTransformation.Shape(); + aCI.SetH(aCI.GetH()*2); + } + aShape = BRepPrimAPI_MakePrism(aShapeBase, aV * aCI.GetH(), Standard_False).Shape(); + } } } } - } else if (aType == PRISM_BASE_TWO_PNT) { + } else if (aType == PRISM_BASE_TWO_PNT || aType == PRISM_BASE_TWO_PNT_2WAYS) { Handle(GEOM_Function) aRefBase = aCI.GetBase(); Handle(GEOM_Function) aRefPnt1 = aCI.GetFirstPoint(); Handle(GEOM_Function) aRefPnt2 = aCI.GetLastPoint(); @@ -105,44 +149,360 @@ Standard_Integer GEOMImpl_PrismDriver::Execute(TFunction_Logbook& log) const if (!V1.IsNull() && !V2.IsNull()) { gp_Vec aV (BRep_Tool::Pnt(V1), BRep_Tool::Pnt(V2)); if (aV.Magnitude() > gp::Resolution()) { - aShape = BRepPrimAPI_MakePrism(aShapeBase, aV, Standard_False).Shape(); + if (aType != PRISM_BASE_DXDYDZ_2WAYS && aCI.GetScale() > Precision::Confusion()) { + aShape = MakeScaledPrism(aShapeBase, aV, aCI.GetScale()); + } + else { + if (aType == PRISM_BASE_TWO_PNT_2WAYS) { + gp_Trsf aTrsf; + aTrsf.SetTranslation(-aV); + BRepBuilderAPI_Transform aTransformation(aShapeBase, aTrsf, Standard_False); + aShapeBase = aTransformation.Shape(); + aV = aV * 2; + } + aShape = BRepPrimAPI_MakePrism(aShapeBase, aV, Standard_False).Shape(); + } + } + } + } + } else if (aType == PRISM_BASE_DXDYDZ || aType == PRISM_BASE_DXDYDZ_2WAYS) { + Handle(GEOM_Function) aRefBase = aCI.GetBase(); + TopoDS_Shape aShapeBase = aRefBase->GetValue(); + gp_Vec aV (aCI.GetDX(), aCI.GetDY(), aCI.GetDZ()); + if (aV.Magnitude() > gp::Resolution()) { + if (aType != PRISM_BASE_DXDYDZ_2WAYS && aCI.GetScale() > Precision::Confusion()) { + aShape = MakeScaledPrism(aShapeBase, aV, aCI.GetScale()); + } + else { + if (aType == PRISM_BASE_DXDYDZ_2WAYS) { + gp_Trsf aTrsf; + aTrsf.SetTranslation(-aV); + BRepBuilderAPI_Transform aTransformation(aShapeBase, aTrsf, Standard_False); + aShapeBase = aTransformation.Shape(); + aV = aV * 2; } + aShape = BRepPrimAPI_MakePrism(aShapeBase, aV, Standard_False).Shape(); } } - } else { } + + else if (aType == DRAFT_PRISM_FEATURE) { + Handle(GEOM_Function) aRefInit = aCI.GetInitShape(); + Handle(GEOM_Function) aRefBase = aCI.GetBase(); + TopoDS_Shape anInitShape = aRefInit->GetValue(); // Initial shape + TopoDS_Shape aSketch = aRefBase->GetValue(); + Standard_Real aHeight = aCI.GetH(); // Height of the extrusion + Standard_Real anAngle = aCI.GetDraftAngle(); // Draft angle + Standard_Boolean isProtrusion = (aCI.GetFuseFlag()==1); + // Flag to know wether the feature is a protrusion (fuse) or a depression (cut) + + if (anInitShape.ShapeType() == TopAbs_COMPOUND) + { + TopExp_Explorer anExp(anInitShape, TopAbs_SOLID); + int solidCount = 0; + for(;anExp.More();anExp.Next()) + { + solidCount++; + } + if (solidCount == 0) + { + Standard_ConstructionError::Raise("The input shape is a compound without any solid"); + } + else if (solidCount > 1) + { + Standard_ConstructionError::Raise("The input shape is a compound with more than one solid"); + } + } + + TopoDS_Face aFaceBase; + + if (aSketch.ShapeType() == TopAbs_FACE) + { + aFaceBase = TopoDS::Face(aSketch); + } + else + { + TopoDS_Wire aWire = TopoDS_Wire(); + + if (aSketch.ShapeType() == TopAbs_EDGE) + { + aWire = BRepBuilderAPI_MakeWire(TopoDS::Edge(aSketch)); + } + else if (aSketch.ShapeType() == TopAbs_WIRE) + { + aWire = TopoDS::Wire(aSketch); + } + else + { + Standard_ConstructionError::Raise("The input sketch is not a wire, an edge or a face"); + } + + TopoDS_Vertex aV1, aV2; + TopExp::Vertices(aWire, aV1, aV2); + if ( !aV1.IsNull() && !aV2.IsNull() && aV1.IsSame(aV2) ) + aWire.Closed( true ); + + if (!aWire.Closed()) + Standard_ConstructionError::Raise("The edge or wire is not closed"); + + // history of the Base wire (RefBase) + Handle(GEOM_Object) aSuppObj; + TDF_LabelSequence aLabelSeq; + aRefBase->GetDependency(aLabelSeq); + + // If the base wire has only one dependency we use it + // to determine the right normal of the face which + // must be oriented towards outside of the solid (like the support face) + if (aLabelSeq.Length()==1) + { + TDF_Label anArgumentRefLabel = aLabelSeq.Value(1); + aSuppObj = GEOM_Object::GetReferencedObject(anArgumentRefLabel); + } + + // Construction of the face if the wire hasn't any support face + aFaceBase = BRepBuilderAPI_MakeFace(aWire); + + if(!aSuppObj.IsNull()) // If the wire has a support + { + TopoDS_Shape aSupport = aSuppObj->GetValue(); + if (aSupport.ShapeType() == TopAbs_FACE) + { + Handle(Geom_Surface) aSurf = BRep_Tool::Surface(TopoDS::Face(aSupport)); + TopoDS_Face aTempFace = BRepBuilderAPI_MakeFace(aSurf, aWire); + + if(aTempFace.Orientation() != TopoDS::Face(aSupport).Orientation()) + { + aFaceBase=TopoDS::Face(aTempFace.Reversed()); + } + else + aFaceBase=aTempFace; + } + } + } + + // Invert height and angle if the operation is an extruded cut + bool invert = !isProtrusion; + + // If the face has a reversed orientation invert for extruded boss operations + if(aFaceBase.Orientation() == TopAbs_REVERSED) + invert = isProtrusion; - if (aShape.IsNull()) return 0; + if(invert) + { + anAngle = -anAngle; // Invert angle and height + aHeight = -aHeight; + } + + BRepFeat_MakeDPrism thePrism(anInitShape, aFaceBase, TopoDS_Face(), + anAngle*PI180, isProtrusion, Standard_True); + + thePrism.Perform(aHeight); + + aShape = thePrism.Shape(); + } - aFunction->SetValue(aShape); + if (aShape.IsNull()) return 0; + + + if (aType == DRAFT_PRISM_FEATURE) + { + TopoDS_Shape aRes = aShape; + + // If the result is a compound with only one solid, + // return the solid + if (aShape.ShapeType() == TopAbs_COMPOUND) + { + TopExp_Explorer anExp(aShape, TopAbs_SOLID); + + int solidNb = 0; + TopoDS_Solid aSolid; + + for(;anExp.More();anExp.Next()) + { + aSolid = TopoDS::Solid(anExp.Current()); + solidNb++; + } + if (solidNb == 1) + { + aRes = aSolid; + } + } + + aFunction->SetValue(aRes); + } + else + { + TopoDS_Shape aRes = GEOMImpl_IShapesOperations::CompsolidToCompound(aShape); + aFunction->SetValue(aRes); + } + - log.SetTouched(Label()); + log.SetTouched(Label()); - return 1; + return 1; } +//======================================================================= +//function : MakeScaledPrism +//purpose : +//======================================================================= +TopoDS_Shape GEOMImpl_PrismDriver::MakeScaledPrism (const TopoDS_Shape& theShapeBase, + const gp_Vec& theVector, + const Standard_Real theScaleFactor, + const gp_Pnt& theCDG, + bool isCDG) +{ + TopoDS_Shape aShape; + BRep_Builder B; + + // 1. aCDG = geompy.MakeCDG(theBase) + gp_Pnt aCDG = theCDG; + if (!isCDG) { + gp_Ax3 aPos = GEOMImpl_IMeasureOperations::GetPosition(theShapeBase); + aCDG = aPos.Location(); + } + TopoDS_Shape aShapeCDG_1 = BRepBuilderAPI_MakeVertex(aCDG).Shape(); + + // Process case of several given shapes + if (theShapeBase.ShapeType() == TopAbs_COMPOUND || + theShapeBase.ShapeType() == TopAbs_SHELL) { + int nbSub = 0; + TopoDS_Shape aShapeI; + TopoDS_Compound aCompound; + B.MakeCompound(aCompound); + TopoDS_Iterator It (theShapeBase, Standard_True, Standard_True); + for (; It.More(); It.Next()) { + nbSub++; + aShapeI = MakeScaledPrism(It.Value(), theVector, theScaleFactor, aCDG, true); + B.Add(aCompound, aShapeI); + } + if (nbSub == 1) + aShape = aShapeI; + else if (nbSub > 1) + aShape = GEOMImpl_GlueDriver::GlueFaces(aCompound, Precision::Confusion(), Standard_True); + return aShape; + } + + // 2. Scale = geompy.MakeScaleTransform(theBase, aCDG, theScaleFactor) + + // Bug 6839: Check for standalone (not included in faces) degenerated edges + TopTools_IndexedDataMapOfShapeListOfShape aEFMap; + TopExp::MapShapesAndAncestors(theShapeBase, TopAbs_EDGE, TopAbs_FACE, aEFMap); + Standard_Integer i, nbE = aEFMap.Extent(); + for (i = 1; i <= nbE; i++) { + TopoDS_Shape anEdgeSh = aEFMap.FindKey(i); + if (BRep_Tool::Degenerated(TopoDS::Edge(anEdgeSh))) { + const TopTools_ListOfShape& aFaces = aEFMap.FindFromIndex(i); + if (aFaces.IsEmpty()) + Standard_ConstructionError::Raise + ("Scaling aborted : cannot scale standalone degenerated edge"); + } + } + + // Perform Scaling + gp_Trsf aTrsf; + aTrsf.SetScale(aCDG, theScaleFactor); + BRepBuilderAPI_Transform aBRepTrsf (theShapeBase, aTrsf, Standard_False); + TopoDS_Shape aScale = aBRepTrsf.Shape(); + + // 3. aBase2 = geompy.MakeTranslationVectorDistance(Scale, theVec, theH) + gp_Trsf aTrsf3; + aTrsf3.SetTranslation(theVector); + TopLoc_Location aLocOrig = aScale.Location(); + gp_Trsf aTrsfOrig = aLocOrig.Transformation(); + TopLoc_Location aLocRes (aTrsf3 * aTrsfOrig); + TopoDS_Shape aBase2 = aScale.Located(aLocRes); + + // 4. aCDG_2 = geompy.MakeTranslationVectorDistance(aCDG, theVec, theH) + gp_Pnt aCDG_2 = aCDG.Translated(theVector); + TopoDS_Shape aShapeCDG_2 = BRepBuilderAPI_MakeVertex(aCDG_2).Shape(); + + // 5. Vector = geompy.MakeVector(aCDG, aCDG_2) + TopoDS_Shape aShapeVec = BRepBuilderAPI_MakeEdge(aCDG, aCDG_2).Shape(); + TopoDS_Edge anEdge = TopoDS::Edge(aShapeVec); + TopoDS_Wire aWirePath = BRepBuilderAPI_MakeWire(anEdge); + + // 6. aPrism = geompy.MakePipeWithDifferentSections([theBase, aBase2], [aCDG, aCDG_2], Vector, False, False) + Handle(TopTools_HSequenceOfShape) aBases = new TopTools_HSequenceOfShape; + aBases->Append(theShapeBase); + aBases->Append(aBase2); + + Handle(TopTools_HSequenceOfShape) aLocs = new TopTools_HSequenceOfShape; + aLocs->Append(aShapeCDG_1); + aLocs->Append(aShapeCDG_2); + + aShape = GEOMImpl_PipeDriver::CreatePipeWithDifferentSections(aWirePath, aBases, aLocs, false, false); + + // 7. Make a solid, if possible + if (theShapeBase.ShapeType() == TopAbs_FACE) { + BRepBuilderAPI_Sewing aSewing (Precision::Confusion()*10.0); + TopExp_Explorer expF (aShape, TopAbs_FACE); + Standard_Integer ifa = 0; + for (; expF.More(); expF.Next()) { + aSewing.Add(expF.Current()); + ifa++; + } + if (ifa > 0) { + aSewing.Perform(); + TopoDS_Shape aShell; + + TopoDS_Shape sh = aSewing.SewedShape(); + if (sh.ShapeType() == TopAbs_FACE && ifa == 1) { + // case for creation of shell from one face + TopoDS_Shell ss; + B.MakeShell(ss); + B.Add(ss,sh); + aShell = ss; + } + else { + TopExp_Explorer exp (sh, TopAbs_SHELL); + Standard_Integer ish = 0; + for (; exp.More(); exp.Next()) { + aShell = exp.Current(); + ish++; + } + if (ish != 1) + aShell = sh; + } + BRepCheck_Shell chkShell (TopoDS::Shell(aShell)); + if (chkShell.Closed() == BRepCheck_NoError) { + TopoDS_Solid Sol; + B.MakeSolid(Sol); + B.Add(Sol, aShell); + BRepClass3d_SolidClassifier SC (Sol); + SC.PerformInfinitePoint(Precision::Confusion()); + if (SC.State() == TopAbs_IN) { + B.MakeSolid(Sol); + B.Add(Sol, aShell.Reversed()); + } + aShape = Sol; + } + } + } + + return aShape; +} //======================================================================= -//function : GEOMImpl_PrismDriver_Type_ +//function : GEOMImpl_PrismDriver_Type_ //purpose : -//======================================================================= +//======================================================================= Standard_EXPORT Handle_Standard_Type& GEOMImpl_PrismDriver_Type_() { static Handle_Standard_Type aType1 = STANDARD_TYPE(TFunction_Driver); - if ( aType1.IsNull()) 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); + 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); - + 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_PrismDriver", - sizeof(GEOMImpl_PrismDriver), - 1, - (Standard_Address)_Ancestors, - (Standard_Address)NULL); + sizeof(GEOMImpl_PrismDriver), + 1, + (Standard_Address)_Ancestors, + (Standard_Address)NULL); return _aType; } @@ -150,7 +510,7 @@ Standard_EXPORT Handle_Standard_Type& GEOMImpl_PrismDriver_Type_() //======================================================================= //function : DownCast //purpose : -//======================================================================= +//======================================================================= const Handle(GEOMImpl_PrismDriver) Handle(GEOMImpl_PrismDriver)::DownCast(const Handle(Standard_Transient)& AnObject) { Handle(GEOMImpl_PrismDriver) _anOtherObject; @@ -161,5 +521,5 @@ const Handle(GEOMImpl_PrismDriver) Handle(GEOMImpl_PrismDriver)::DownCast(const } } - return _anOtherObject ; + return _anOtherObject; }