-// Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
//
-// 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 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
-// Lesser General Public License for more details.
+// 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
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+// 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
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
-
// File : GEOMImpl_IAdvancedOperations.cxx
// Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
-//
#include <Standard_Stream.hxx>
+
#include "GEOMImpl_Types.hxx"
#include "GEOMImpl_IAdvancedOperations.hxx"
#include "GEOMImpl_IBasicOperations.hxx"
#include "GEOMImpl_IBlocksOperations.hxx"
#include "GEOMImpl_I3DPrimOperations.hxx"
#include "GEOMImpl_ILocalOperations.hxx"
+#include "GEOMImpl_IHealingOperations.hxx"
#include "GEOMImpl_Gen.hxx"
+#include <Basics_OCCTVersion.hxx>
+
#include <utilities.h>
#include <OpUtil.hxx>
#include <Utils_ExceptHandlers.hxx>
*/
//=============================================================================
GEOMImpl_IAdvancedOperations::GEOMImpl_IAdvancedOperations(GEOM_Engine* theEngine, int theDocID) :
- GEOM_IOperations(theEngine, theDocID)
+ GEOM_IOperations(theEngine, theDocID)
{
MESSAGE("GEOMImpl_IAdvancedOperations::GEOMImpl_IAdvancedOperations");
myBasicOperations = new GEOMImpl_IBasicOperations(GetEngine(), GetDocID());
myBlocksOperations = new GEOMImpl_IBlocksOperations(GetEngine(), GetDocID());
my3DPrimOperations = new GEOMImpl_I3DPrimOperations(GetEngine(), GetDocID());
myLocalOperations = new GEOMImpl_ILocalOperations(GetEngine(), GetDocID());
+ myHealingOperations = new GEOMImpl_IHealingOperations(GetEngine(), GetDocID());
}
//=============================================================================
delete myBlocksOperations;
delete my3DPrimOperations;
delete myLocalOperations;
+ delete myHealingOperations;
}
//=============================================================================
*/
//=============================================================================
gp_Trsf GEOMImpl_IAdvancedOperations::GetPositionTrsf(double theL1, double theL2,
- Handle(GEOM_Object) theP1,
- Handle(GEOM_Object) theP2,
- Handle(GEOM_Object) theP3)
+ Handle(GEOM_Object) theP1,
+ Handle(GEOM_Object) theP2,
+ Handle(GEOM_Object) theP3)
{
// Old Local Coordinates System oldLCS
gp_Pnt P0(0, 0, 0);
*/
//=============================================================================
bool GEOMImpl_IAdvancedOperations::CheckCompatiblePosition(double& theL1, double& theL2,
- Handle(GEOM_Object) theP1,
- Handle(GEOM_Object) theP2,
- Handle(GEOM_Object) theP3,
- double theTolerance)
+ Handle(GEOM_Object) theP1,
+ Handle(GEOM_Object) theP2,
+ Handle(GEOM_Object) theP3,
+ double theTolerance)
{
SetErrorCode(KO);
gp_Pnt P1 = BRep_Tool::Pnt(TopoDS::Vertex(theP1->GetValue()));
//
if (fabs(newL1 - theL1) > Precision::Approximation()) {
if ( (newL1 * (1 - theTolerance) -theL1 <= Precision::Approximation()) &&
- (newL1 * (1 + theTolerance) -theL1 >= Precision::Approximation()) ) {
+ (newL1 * (1 + theTolerance) -theL1 >= Precision::Approximation()) ) {
// std::cerr << "theL1 = newL1" << std::endl;
theL1 = newL1;
} else {
//
if (fabs(newL2 - theL2) > Precision::Approximation()) {
if ( (newL2 * (1 - theTolerance) -theL2 <= Precision::Approximation()) &&
- (newL2 * (1 + theTolerance) -theL2 >= Precision::Approximation()) ) {
+ (newL2 * (1 + theTolerance) -theL2 >= Precision::Approximation()) ) {
theL2 = newL2;
} else {
theL2 = -1;
*/
//=============================================================================
bool GEOMImpl_IAdvancedOperations::MakeGroups(Handle(GEOM_Object) theShape, int shapeType,
- double theR1, double theW1, double theL1,
- double theR2, double theW2, double theL2,
- Handle(TColStd_HSequenceOfTransient) theSeq,
- gp_Trsf aTrsf)
+ double theR1, double theW1, double theL1,
+ double theR2, double theW2, double theL2,
+ Handle(TColStd_HSequenceOfTransient) theSeq,
+ gp_Trsf aTrsf)
{
SetErrorCode(KO);
}
gp_Trsf aTrsfInv = aTrsf.Inverted();
-
- int expectedGroups = 0;
- if (shapeType == TSHAPE_BASIC)
- if (Abs(theR2+theW2-theR1-theW1) <= Precision::Approximation())
- expectedGroups = 10;
- else
- expectedGroups = 11;
- else if (shapeType == TSHAPE_CHAMFER || shapeType == TSHAPE_FILLET)
- expectedGroups = 12;
-
+
+// int expectedGroups = 0;
+// if (shapeType == TSHAPE_BASIC)
+// if (Abs(theR2+theW2-theR1-theW1) <= Precision::Approximation())
+// expectedGroups = 10;
+// else
+// expectedGroups = 11;
+// else if (shapeType == TSHAPE_CHAMFER || shapeType == TSHAPE_FILLET)
+// expectedGroups = 12;
+
double aR1Ext = theR1 + theW1;
double aR2Ext = theR2 + theW2;
-
+
/////////////////////////
//// Groups of Faces ////
/////////////////////////
BRepBuilderAPI_Transform aTransformationBox(aBox->GetValue(), aTrsf, Standard_False);
TopoDS_Shape aBoxShapeTrsf = aTransformationBox.Shape();
aBox->GetLastFunction()->SetValue(aBoxShapeTrsf);
-
+
// Get the shell of the box
- Handle(GEOM_Object) aShell = Handle(GEOM_Object)::DownCast(myShapesOperations->MakeExplode(aBox, TopAbs_SHELL, true)->Value(1));
+ Handle(GEOM_Object) aShell = Handle(GEOM_Object)::DownCast
+ (myShapesOperations->MakeExplode(aBox, TopAbs_SHELL, true)->Value(1));
aBox->GetLastFunction()->SetDescription("");
aShell->GetLastFunction()->SetDescription("");
// Get the common shapes between shell and shape
Handle(GEOM_Object) aCommonCompound = myBooleanOperations->MakeBoolean (theShape, aShell, 1); // MakeCommon
+ if (aCommonCompound.IsNull()) {
+ SetErrorCode(myBooleanOperations->GetErrorCode());
+ return false;
+ }
aCommonCompound->GetLastFunction()->SetDescription("");
// Explode the faces of common shapes => 3 faces
- Handle(TColStd_HSequenceOfTransient) aCommonFaces = myShapesOperations->MakeExplode(aCommonCompound, TopAbs_FACE, true);
+ Handle(TColStd_HSequenceOfTransient) aCommonFaces =
+ myShapesOperations->MakeExplode(aCommonCompound, TopAbs_FACE, true);
aCommonCompound->GetLastFunction()->SetDescription("");
std::list<Handle(GEOM_Object)> aCompoundOfFacesList;
-
+
for (int i=0 ; i<= aCommonFaces->Length()-4 ; i+=4) {
std::list<Handle(GEOM_Object)> aFacesList;
for (int j = 1 ; j <= 4 ; j++) {
Handle(GEOM_Object) aFace = Handle(GEOM_Object)::DownCast(aCommonFaces->Value(i+j)); // Junction faces
if (!aFace.IsNull()) {
- aFace->GetLastFunction()->SetDescription("");
- aFacesList.push_back(aFace);
+ aFace->GetLastFunction()->SetDescription("");
+ aFacesList.push_back(aFace);
}
}
Handle(GEOM_Object) aCompoundOfFaces = myShapesOperations->MakeCompound(aFacesList);
aCompoundOfFacesList.pop_front();
// == END
//
-
-
+
+
// Uncomment the following lines when GetInPlace bug is solved
// == BEGIN
- // Handle(GEOM_Object) aP1 = myBasicOperations->MakePointXYZ(-theL1, 0, 0);
- // Handle(GEOM_Object) aP2 = myBasicOperations->MakePointXYZ(-0, 0, theL2);
- // Handle(GEOM_Object) aP3 = myBasicOperations->MakePointXYZ(theL1, 0, 0);
- // aP1->GetLastFunction()->SetDescription("");
- // aP2->GetLastFunction()->SetDescription("");
- // aP3->GetLastFunction()->SetDescription("");
- // Handle(GEOM_Object) aV1 = myBasicOperations->MakeVectorDXDYDZ(-1, 0, 0);
- // Handle(GEOM_Object) aV2 = myBasicOperations->MakeVectorDXDYDZ(0, 0, 1);
- // Handle(GEOM_Object) aV3 = myBasicOperations->MakeVectorDXDYDZ(1, 0, 0);
- // aV1->GetLastFunction()->SetDescription("");
- // aV2->GetLastFunction()->SetDescription("");
- // aV3->GetLastFunction()->SetDescription("");
- // Handle(GEOM_Object) aPln1 = myBasicOperations->MakePlanePntVec(aP1, aV1, 2*(theR1+theW1+theL2));
- // Handle(GEOM_Object) aPln2 = myBasicOperations->MakePlanePntVec(aP2, aV2, 2*(theR2+theW2));
- // Handle(GEOM_Object) aPln3 = myBasicOperations->MakePlanePntVec(aP3, aV3, 2*(theR1+theW1+theL2));
- // aPln1->GetLastFunction()->SetDescription("");
- // aPln2->GetLastFunction()->SetDescription("");
- // aPln3->GetLastFunction()->SetDescription("");
-
- // BRepBuilderAPI_Transform aTransformation1(aPln1->GetValue(), aTrsf, Standard_False);
- // TopoDS_Shape aTrsf_Shape1 = aTransformation1.Shape();
- // aPln1->GetLastFunction()->SetValue(aTrsf_Shape1);
- // BRepBuilderAPI_Transform aTransformation2(aPln2->GetValue(), aTrsf, Standard_False);
- // TopoDS_Shape aTrsf_Shape2 = aTransformation2.Shape();
- // aPln2->GetLastFunction()->SetValue(aTrsf_Shape2);
- // BRepBuilderAPI_Transform aTransformation3(aPln3->GetValue(), aTrsf, Standard_False);
- // TopoDS_Shape aTrsf_Shape3 = aTransformation3.Shape();
- // aPln3->GetLastFunction()->SetValue(aTrsf_Shape3);
+// Handle(GEOM_Object) aP1 = myBasicOperations->MakePointXYZ(-theL1, 0, 0);
+// Handle(GEOM_Object) aP2 = myBasicOperations->MakePointXYZ(-0, 0, theL2);
+// Handle(GEOM_Object) aP3 = myBasicOperations->MakePointXYZ(theL1, 0, 0);
+// aP1->GetLastFunction()->SetDescription("");
+// aP2->GetLastFunction()->SetDescription("");
+// aP3->GetLastFunction()->SetDescription("");
+// Handle(GEOM_Object) aV1 = myBasicOperations->MakeVectorDXDYDZ(-1, 0, 0);
+// Handle(GEOM_Object) aV2 = myBasicOperations->MakeVectorDXDYDZ(0, 0, 1);
+// Handle(GEOM_Object) aV3 = myBasicOperations->MakeVectorDXDYDZ(1, 0, 0);
+// aV1->GetLastFunction()->SetDescription("");
+// aV2->GetLastFunction()->SetDescription("");
+// aV3->GetLastFunction()->SetDescription("");
+// Handle(GEOM_Object) aPln1 = myBasicOperations->MakePlanePntVec(aP1, aV1, 2*(aR1Ext+theL2));
+// Handle(GEOM_Object) aPln2 = myBasicOperations->MakePlanePntVec(aP2, aV2, 2*(aR2Ext));
+// Handle(GEOM_Object) aPln3 = myBasicOperations->MakePlanePntVec(aP3, aV3, 2*(aR1Ext+theL2));
+// aPln1->GetLastFunction()->SetDescription("");
+// aPln2->GetLastFunction()->SetDescription("");
+// aPln3->GetLastFunction()->SetDescription("");
+//
+// BRepBuilderAPI_Transform aTransformation1(aPln1->GetValue(), aTrsf, Standard_False);
+// TopoDS_Shape aTrsf_Shape1 = aTransformation1.Shape();
+// aPln1->GetLastFunction()->SetValue(aTrsf_Shape1);
+// BRepBuilderAPI_Transform aTransformation2(aPln2->GetValue(), aTrsf, Standard_False);
+// TopoDS_Shape aTrsf_Shape2 = aTransformation2.Shape();
+// aPln2->GetLastFunction()->SetValue(aTrsf_Shape2);
+// BRepBuilderAPI_Transform aTransformation3(aPln3->GetValue(), aTrsf, Standard_False);
+// TopoDS_Shape aTrsf_Shape3 = aTransformation3.Shape();
+// aPln3->GetLastFunction()->SetValue(aTrsf_Shape3);
// == END
//
-
+
Handle(GEOM_Object) junctionFaces1 = myShapesOperations->GetInPlace(theShape, aPln1);
if (junctionFaces1.IsNull())
- junctionFaces1 = myShapesOperations->GetShapesOnShapeAsCompound(aPln1, theShape, TopAbs_FACE, GEOMAlgo_ST_ONIN);
+ junctionFaces1 = myShapesOperations->GetShapesOnShapeAsCompound
+ (aPln1, theShape, TopAbs_FACE, GEOMAlgo_ST_ONIN);
if (!junctionFaces1.IsNull()) {
junctionFaces1->GetLastFunction()->SetDescription("");
junctionFaces1->SetName("JUNCTION_FACE_1");
}
Handle(GEOM_Object) junctionFaces2 = myShapesOperations->GetInPlace(theShape, aPln2);
if (junctionFaces2.IsNull())
- junctionFaces2 = myShapesOperations->GetShapesOnShapeAsCompound(aPln2, theShape, TopAbs_FACE, GEOMAlgo_ST_ONIN);
+ junctionFaces2 = myShapesOperations->GetShapesOnShapeAsCompound
+ (aPln2, theShape, TopAbs_FACE, GEOMAlgo_ST_ONIN);
if (!junctionFaces2.IsNull()) {
junctionFaces2->GetLastFunction()->SetDescription("");
junctionFaces2->SetName("JUNCTION_FACE_2");
}
Handle(GEOM_Object) junctionFaces3 = myShapesOperations->GetInPlace(theShape, aPln3);
if (junctionFaces3.IsNull())
- junctionFaces3 = myShapesOperations->GetShapesOnShapeAsCompound(aPln3, theShape, TopAbs_FACE, GEOMAlgo_ST_ONIN);
+ junctionFaces3 = myShapesOperations->GetShapesOnShapeAsCompound
+ (aPln3, theShape, TopAbs_FACE, GEOMAlgo_ST_ONIN);
if (!junctionFaces3.IsNull()) {
junctionFaces3->GetLastFunction()->SetDescription("");
junctionFaces3->SetName("JUNCTION_FACE_3");
// theSeq->Append(aPln3);
// return false;
}
+ // Comment the following lines when GetInPlace bug is solved
+ // == BEGIN
}
+ // == END
/////////////////////////
//// Groups of Edges ////
/////////////////////////
// Result of propagate
Handle(GEOM_Function) aFunction = theShape->GetLastFunction();
-
+
TCollection_AsciiString theDesc = aFunction->GetDescription();
Handle(TColStd_HSequenceOfTransient) aSeqPropagate = myBlocksOperations->Propagate(theShape);
if (aSeqPropagate.IsNull() || aSeqPropagate->Length() == 0) {
Standard_Integer nbEdges, aNbGroups = aSeqPropagate->Length();
// Recover previous description to get rid of Propagate dump
aFunction->SetDescription(theDesc);
-
+
bool addGroup;
bool circularFoundAndAdded = false;
+ bool circularFound10 = false;
bool incidentPipeFound = false;
bool mainPipeFound = false;
bool mainPipeFoundAndAdded = false;
bool flangeFound = false;
bool flangeFoundAndAdded = false;
bool chamferOrFilletFound = false;
-
+
for (int i=1 ; i<= aNbGroups; i++) {
addGroup = false;
-
+
Handle(GEOM_Object) aGroup = Handle(GEOM_Object)::DownCast(aSeqPropagate->Value(i));
if(aGroup.IsNull())
continue;
-
+
TopoDS_Shape aGroupShape = aGroup->GetValue();
BRepBuilderAPI_Transform aTransformationShapeInv(aGroupShape, aTrsfInv, Standard_False);
TopoDS_Shape aGroupShapeTrsfInv = aTransformationShapeInv.Shape();
-
+
TopTools_IndexedMapOfShape anEdgesMap;
TopExp::MapShapes(aGroupShapeTrsfInv,TopAbs_EDGE, anEdgesMap);
nbEdges = anEdgesMap.Extent();
if (shapeType == TSHAPE_BASIC) {
if ((nbEdges == 21) || /*R1Ext = R2Ext*/(nbEdges == 17)){
- addGroup = true;
- aGroup->SetName("THICKNESS");
+ addGroup = true;
+ aGroup->SetName("THICKNESS");
}
else if (nbEdges == 6) {
- if (!circularFoundAndAdded) {
- circularFoundAndAdded = true;
- addGroup = true;
- aGroup->SetName("CIRCULAR_QUARTER_PIPE");
- }
+ if (!circularFoundAndAdded) {
+ circularFoundAndAdded = true;
+ addGroup = true;
+ aGroup->SetName("CIRCULAR_QUARTER_PIPE");
+ }
}
else if (nbEdges == 8) {
- incidentPipeFound = true;
- mainPipeFound = false;
- radialFound =false;
- flangeFound = false;
-
- TopExp_Explorer Ex(aGroupShapeTrsfInv,TopAbs_VERTEX);
- while (Ex.More()) {
- gp_Pnt aP = BRep_Tool::Pnt(TopoDS::Vertex(Ex.Current()));
- double x=aP.X(), y=aP.Y(), z=aP.Z();
-
-
- if ((Abs(x) > aR2Ext + Precision::Confusion()) ||
- (Abs(y) > aR2Ext + Precision::Confusion())) {
- incidentPipeFound = false;
- }
-
- if ( z < -Precision::Confusion()) {
- // length of main pipe
- mainPipeFound = true;
- if (!mainPipeFoundAndAdded) {
- mainPipeFoundAndAdded = true;
- addGroup = true;
- aGroup->SetName("HALF_LENGTH_MAIN_PIPE");
- }
- }
-
- else if (Abs(x) > (theL1-Precision::Confusion())) {
- // discretisation circulaire
- radialFound = true;
- if (!circularFoundAndAdded) {
- circularFoundAndAdded = true;
- addGroup = true;
- aGroup->SetName("CIRCULAR_QUARTER_PIPE");
- }
- }
+ incidentPipeFound = true;
+ mainPipeFound = false;
+ radialFound =false;
+ flangeFound = false;
+
+ TopExp_Explorer Ex(aGroupShapeTrsfInv,TopAbs_VERTEX);
+ while (Ex.More()) {
+ gp_Pnt aP = BRep_Tool::Pnt(TopoDS::Vertex(Ex.Current()));
+ double x=aP.X(), y=aP.Y(), z=aP.Z();
+
+
+ if ((Abs(x) > aR2Ext + Precision::Confusion()) ||
+ (Abs(y) > aR2Ext + Precision::Confusion())) {
+ incidentPipeFound = false;
+ }
+
+ if ( z < -Precision::Confusion()) {
+ // length of main pipe
+ mainPipeFound = true;
+ if (!mainPipeFoundAndAdded) {
+ mainPipeFoundAndAdded = true;
+ addGroup = true;
+ aGroup->SetName("HALF_LENGTH_MAIN_PIPE");
+ }
+ }
+
+ else if (Abs(x) > (theL1-Precision::Confusion())) {
+ // discretisation circulaire
+ radialFound = true;
+ if (!circularFoundAndAdded) {
+ circularFoundAndAdded = true;
+ addGroup = true;
+ aGroup->SetName("CIRCULAR_QUARTER_PIPE");
+ }
+ }
Ex.Next();
- }
- if (incidentPipeFound) {
- addGroup = true;
- aGroup->SetName("HALF_LENGTH_INCIDENT_PIPE");
- }
- if (!addGroup && (!incidentPipeFound &&
- !radialFound &&
- !mainPipeFound &&
- !flangeFound)) {
- // Flange (collerette)
- flangeFound = true;
- addGroup = true;
- aGroup->SetName("FLANGE");
- }
+ }
+ if (incidentPipeFound) {
+ addGroup = true;
+ aGroup->SetName("HALF_LENGTH_INCIDENT_PIPE");
+ }
+ if (!addGroup && (!incidentPipeFound &&
+ !radialFound &&
+ !mainPipeFound &&
+ !flangeFound)) {
+ // Flange (collerette)
+ flangeFound = true;
+ addGroup = true;
+ aGroup->SetName("FLANGE");
+ }
}
else
- continue;
+ continue;
}
else if (shapeType == TSHAPE_CHAMFER || shapeType == TSHAPE_FILLET) {
if (nbEdges == 25) {
- addGroup = true;
- aGroup->SetName("THICKNESS");
+ addGroup = true;
+ aGroup->SetName("THICKNESS");
}
else if ((nbEdges == 10) || (nbEdges == 6)) {
- if (!circularFoundAndAdded) {
- addGroup = true;
- circularFoundAndAdded = true;
- aGroup->SetName("CIRCULAR_QUARTER_PIPE");
- }
+ if (!circularFoundAndAdded) {
+ addGroup = true;
+ circularFoundAndAdded = true;
+ aGroup->SetName("CIRCULAR_QUARTER_PIPE");
+ if (nbEdges == 10) {
+ circularFound10 = true;
+ }
+ }
+ else if (!circularFound10 && nbEdges == 10) {
+ circularFound10 = true;
+ addGroup = true;
+ aGroup->SetName("CIRCULAR_QUARTER_PIPE");
+ }
}
else if (nbEdges == 8) {
- incidentPipeFound = true;
- mainPipeFound = false;
- flangeFound = false;
-
- TopExp_Explorer Ex(aGroupShapeTrsfInv,TopAbs_VERTEX);
- while (Ex.More()) {
- gp_Pnt aP = BRep_Tool::Pnt(TopoDS::Vertex(Ex.Current()));
- double x=aP.X(), y=aP.Y(), z=aP.Z();
-
- // tuy_princ_long_avant & tuy_princ_long_apres
- bool isMain = (((z < Precision::Confusion()) || (x < Precision::Confusion())) &&
- ((y <= aR1Ext + Precision::Confusion()) ||
- (y <= -(aR1Ext + Precision::Confusion())) ||
- (y <= theR1 + Precision::Confusion()) ||
- (y == -(theR1 + Precision::Confusion()))));
-
-
- if (!isMain) {
- mainPipeFound = false;
- }
-
- // collerette
- if (z < Precision::Confusion()) {
- flangeFound = true;
- if (!flangeFoundAndAdded) {
- flangeFoundAndAdded = true;
- addGroup = true;
- aGroup->SetName("FLANGE");
- }
- }
-
- // tuyau incident
- if ((Abs(x) > aR2Ext + Precision::Confusion()) ||
- (Abs(y) > aR2Ext + Precision::Confusion())) {
- incidentPipeFound = false;
- }
- Ex.Next();
- }
- if (mainPipeFound) {
- addGroup = true;
- aGroup->SetName("HALF_LENGTH_MAIN_PIPE");
- }
- if (incidentPipeFound) {
- addGroup = true;
- aGroup->SetName("HALF_LENGTH_INCIDENT_PIPE");
- }
- if (!addGroup && (!incidentPipeFound &&
- !mainPipeFound &&
- !flangeFound &&
- !chamferOrFilletFound)) {
- addGroup = true;
- chamferOrFilletFound = true;
- if (shapeType == TSHAPE_CHAMFER)
- aGroup->SetName("CHAMFER");
- else
- aGroup->SetName("FILLET");
- }
+ incidentPipeFound = true;
+ mainPipeFound = true;
+ flangeFound = false;
+
+ bool isNearZ0 = false;
+ bool isBelowZ0 = false;
+
+ TopExp_Explorer Ex (aGroupShapeTrsfInv,TopAbs_VERTEX);
+ while (Ex.More()) {
+ gp_Pnt aP = BRep_Tool::Pnt(TopoDS::Vertex(Ex.Current()));
+ double x=aP.X(), y=aP.Y(), z=aP.Z();
+
+ // tuy_princ_long_avant & tuy_princ_long_apres
+ //bool isMain = (((z < Precision::Confusion()) || (x < Precision::Confusion())) &&
+ // ((y <= aR1Ext + Precision::Confusion()) ||
+ // (y <= -(aR1Ext + Precision::Confusion())) ||
+ // (y <= theR1 + Precision::Confusion()) ||
+ // (y == -(theR1 + Precision::Confusion()))));
+ bool isMain = ((z < Precision::Confusion() || x < Precision::Confusion()) &&
+ (fabs(y) > theR1 - Precision::Confusion() ||
+ fabs(y) < Precision::Confusion()));
+
+ if (!isMain) {
+ mainPipeFound = false;
+ }
+
+ // collerette
+ //if (z < Precision::Confusion() && !isMain) {
+ // flangeFound = true;
+ // if (!flangeFoundAndAdded) {
+ // flangeFoundAndAdded = true;
+ // addGroup = true;
+ // aGroup->SetName("FLANGE");
+ // }
+ //}
+ if (fabs(z) < Precision::Confusion()) isNearZ0 = true;
+ if (z < - Precision::Confusion()) isBelowZ0 = true;
+
+ // tuyau incident
+ if ((Abs(x) > aR2Ext + Precision::Confusion()) ||
+ (Abs(y) > aR2Ext + Precision::Confusion())) {
+ incidentPipeFound = false;
+ }
+ Ex.Next();
+ }
+ if (mainPipeFound) {
+ addGroup = true;
+ aGroup->SetName("HALF_LENGTH_MAIN_PIPE");
+ }
+ if (incidentPipeFound) {
+ addGroup = true;
+ aGroup->SetName("HALF_LENGTH_INCIDENT_PIPE");
+ }
+ if (isNearZ0 && !isBelowZ0) {
+ flangeFound = true;
+ if (!flangeFoundAndAdded) {
+ flangeFoundAndAdded = true;
+ addGroup = true;
+ aGroup->SetName("FLANGE");
+ }
+ }
+ if (!addGroup && (!incidentPipeFound &&
+ !mainPipeFound &&
+ !flangeFound &&
+ !chamferOrFilletFound)) {
+ addGroup = true;
+ chamferOrFilletFound = true;
+ if (shapeType == TSHAPE_CHAMFER)
+ aGroup->SetName("CHAMFER");
+ else
+ aGroup->SetName("FILLET");
+ }
}
else
- continue;
+ continue;
}
// Add group to the list
if (addGroup)
return true;
}
-bool GEOMImpl_IAdvancedOperations::MakePipeTShapePartition(Handle(GEOM_Object) theShape,
- double theR1, double theW1, double theL1,
- double theR2, double theW2, double theL2,
- double theH, double theW,
- double theRF, bool isNormal)
+bool GEOMImpl_IAdvancedOperations::MakePipeTShapePartition(Handle(GEOM_Object) theShape,
+ double theR1, double theW1, double theL1,
+ double theR2, double theW2, double theL2,
+ double theH, double theW,
+ double theRF, bool isNormal)
{
SetErrorCode(KO);
Handle(GEOM_Object) wire_t, wire_t2, face_t, face_t2;
Handle(GEOM_Object) chan_racc;
Handle(GEOM_Object) vi1, vi2;
+ Handle(GEOM_Object) Te3;
- Handle(GEOM_Object) Vector_Z = myBasicOperations->MakeVectorDXDYDZ(0, 0, 1);
- Vector_Z->GetLastFunction()->SetDescription("");
-
- // Useful values
- double aSize = 2*(theL1 + theL2);
- double aR1Ext = theR1 + theW1;
- double aR2Ext = theR2 + theW2;
- double theVertCylinderRadius = aR2Ext + theW + theRF;
- double theHoriCylinderRadius = aR1Ext + theH + theRF;
-
- // Common edges on internal cylinder
- Handle(GEOM_Object) box_i = my3DPrimOperations->MakeBoxDXDYDZ(theR2, theR2, theR1);
- box_i->GetLastFunction()->SetDescription("");
- box_i = myTransformOperations->TranslateDXDYDZ(box_i, -theR2, -theR2, 0);
- box_i->GetLastFunction()->SetDescription("");
-
- Handle(GEOM_Function) aFunction = theShape->GetLastFunction();
- TCollection_AsciiString theDesc = aFunction->GetDescription();
- Handle(TColStd_HSequenceOfTransient) edges_i = myShapesOperations->GetShapesOnBox(box_i, theShape, TopAbs_EDGE, GEOMAlgo_ST_IN);
- // Recover previous description to get rid of Propagate dump
- aFunction->SetDescription(theDesc);
- if (edges_i.IsNull() || edges_i->Length() == 0) {
- SetErrorCode("Internal edges not found");
- return false;
- }
- for (int i=1; i<=edges_i->Length();i++) {
- Handle(GEOM_Object) anObj = Handle(GEOM_Object)::DownCast(edges_i->Value(i));
- anObj->GetLastFunction()->SetDescription("");
- }
- arete_intersect_int = Handle(GEOM_Object)::DownCast(edges_i->Value(1));
-
- // search for vertices located on both internal pipes
- aFunction = theShape->GetLastFunction();
- theDesc = aFunction->GetDescription();
- Handle(TColStd_HSequenceOfTransient) vertices_i = myShapesOperations->GetShapesOnBox(box_i, theShape, TopAbs_VERTEX, GEOMAlgo_ST_ONIN);
- // Recover previous description to get rid of Propagate dump
- aFunction->SetDescription(theDesc);
- if (vertices_i.IsNull() || vertices_i->Length() == 0) {
- SetErrorCode("Internal vertices not found");
- return false;
- }
-
- for (int i = 1; i <= vertices_i->Length(); i++) {
- Handle(GEOM_Object) v = Handle(GEOM_Object)::DownCast(vertices_i->Value(i));
- v->GetLastFunction()->SetDescription("");
- TopoDS_Vertex aVertex = TopoDS::Vertex(v->GetValue());
- gp_Pnt aP = BRep_Tool::Pnt(aVertex);
- if (Abs(aP.X()) <= Precision::Confusion()) {
- if (Abs(aP.Y()) - theR2 <= Precision::Confusion())
- vi1 = v;
- } else if (Abs(aP.Y()) <= Precision::Confusion()) {
- if (Abs(aP.X()) - theR1 <= Precision::Confusion())
- vi2 = v;
- }
- }
-
- std::list<Handle(GEOM_Object)> theShapes;
-
- if (isNormal) {
- Handle(GEOM_Object) ve1, ve2;
-
- Handle(GEOM_Object) box_e = my3DPrimOperations->MakeBoxDXDYDZ(aR2Ext, aR2Ext, aR1Ext);
- box_e->GetLastFunction()->SetDescription("");
- box_e = myTransformOperations->TranslateDXDYDZ(box_e, -aR2Ext, -aR2Ext, 0);
- box_e->GetLastFunction()->SetDescription("");
- // Common edges on external cylinder
- aFunction = theShape->GetLastFunction();
- theDesc = aFunction->GetDescription();
- Handle(TColStd_HSequenceOfTransient) edges_e = myShapesOperations->GetShapesOnBox(box_e, theShape, TopAbs_EDGE, GEOMAlgo_ST_IN);
+ try {
+#if OCC_VERSION_LARGE > 0x06010000
+ OCC_CATCH_SIGNALS;
+#endif
+ Handle(GEOM_Object) Vector_Z = myBasicOperations->MakeVectorDXDYDZ(0, 0, 1);
+ Vector_Z->GetLastFunction()->SetDescription("");
+
+ // Useful values
+ double aSize = 2*(theL1 + theL2);
+ double aR1Ext = theR1 + theW1;
+ double aR2Ext = theR2 + theW2;
+ double theVertCylinderRadius = aR2Ext + theW + theRF;
+ double theHoriCylinderRadius = aR1Ext + theH + theRF;
+
+ // Common edges on internal cylinder
+ Handle(GEOM_Object) box_i = my3DPrimOperations->MakeBoxDXDYDZ(theR2, theR2, theR1);
+ box_i->GetLastFunction()->SetDescription("");
+ box_i = myTransformOperations->TranslateDXDYDZ(box_i, -theR2, -theR2, 0);
+ box_i->GetLastFunction()->SetDescription("");
+
+ Handle(GEOM_Function) aFunction = theShape->GetLastFunction();
+ TCollection_AsciiString theDesc = aFunction->GetDescription();
+ Handle(TColStd_HSequenceOfTransient) edges_i =
+ myShapesOperations->GetShapesOnBox(box_i, theShape, TopAbs_EDGE, GEOMAlgo_ST_IN);
// Recover previous description to get rid of Propagate dump
aFunction->SetDescription(theDesc);
- if (edges_e.IsNull() || edges_e->Length() == 0) {
- SetErrorCode("External edges not found");
+ if (edges_i.IsNull() || edges_i->Length() == 0) {
+ SetErrorCode("Internal edges not found");
return false;
}
- for (int i=1; i<=edges_e->Length();i++) {
- Handle(GEOM_Object) anObj = Handle(GEOM_Object)::DownCast(edges_e->Value(i));
+ for (int i=1; i<=edges_i->Length();i++) {
+ Handle(GEOM_Object) anObj = Handle(GEOM_Object)::DownCast(edges_i->Value(i));
anObj->GetLastFunction()->SetDescription("");
}
+ arete_intersect_int = Handle(GEOM_Object)::DownCast(edges_i->Value(1));
- // search for vertices located on both external pipes
+ // search for vertices located on both internal pipes
aFunction = theShape->GetLastFunction();
theDesc = aFunction->GetDescription();
- Handle(TColStd_HSequenceOfTransient) vertices_e = myShapesOperations->GetShapesOnBox(box_e, theShape, TopAbs_VERTEX, GEOMAlgo_ST_ONIN);
+ Handle(TColStd_HSequenceOfTransient) vertices_i =
+ myShapesOperations->GetShapesOnBox(box_i, theShape, TopAbs_VERTEX, GEOMAlgo_ST_ONIN);
// Recover previous description to get rid of Propagate dump
aFunction->SetDescription(theDesc);
- if (vertices_e.IsNull() || vertices_e->Length() == 0) {
- SetErrorCode("External vertices not found");
+ if (vertices_i.IsNull() || vertices_i->Length() == 0) {
+ SetErrorCode("Internal vertices not found");
return false;
}
- for (int i = 1; i <= vertices_e->Length(); i++) {
- Handle(GEOM_Object) v = Handle(GEOM_Object)::DownCast(vertices_e->Value(i));
+ for (int i = 1; i <= vertices_i->Length(); i++) {
+ Handle(GEOM_Object) v = Handle(GEOM_Object)::DownCast(vertices_i->Value(i));
v->GetLastFunction()->SetDescription("");
TopoDS_Vertex aVertex = TopoDS::Vertex(v->GetValue());
gp_Pnt aP = BRep_Tool::Pnt(aVertex);
if (Abs(aP.X()) <= Precision::Confusion()) {
- if (Abs(aP.Y()) - theR2 > Precision::Confusion())
- ve1 = v;
+ if (Abs(aP.Y()) - theR2 <= Precision::Confusion())
+ vi1 = v;
} else if (Abs(aP.Y()) <= Precision::Confusion()) {
- if (Abs(aP.X()) - theR2 > Precision::Confusion())
- ve2 = v;
+ if (Abs(aP.X()) - theR1 <= Precision::Confusion())
+ vi2 = v;
}
}
- Handle(GEOM_Object) edge_e1, edge_e2;
- try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
- OCC_CATCH_SIGNALS;
-#endif
+
+ std::list<Handle(GEOM_Object)> theShapes;
+
+ if (isNormal) {
+ Handle(GEOM_Object) ve1, ve2;
+
+ Handle(GEOM_Object) box_e = my3DPrimOperations->MakeBoxDXDYDZ(aR2Ext, aR2Ext, aR1Ext);
+ box_e->GetLastFunction()->SetDescription("");
+ box_e = myTransformOperations->TranslateDXDYDZ(box_e, -aR2Ext, -aR2Ext, 0);
+ box_e->GetLastFunction()->SetDescription("");
+ // Common edges on external cylinder
+ aFunction = theShape->GetLastFunction();
+ theDesc = aFunction->GetDescription();
+ Handle(TColStd_HSequenceOfTransient) edges_e =
+ myShapesOperations->GetShapesOnBox(box_e, theShape, TopAbs_EDGE, GEOMAlgo_ST_IN);
+ // Recover previous description to get rid of Propagate dump
+ aFunction->SetDescription(theDesc);
+ if (edges_e.IsNull() || edges_e->Length() == 0) {
+ SetErrorCode("External edges not found");
+ return false;
+ }
+ for (int i=1; i<=edges_e->Length();i++) {
+ Handle(GEOM_Object) anObj = Handle(GEOM_Object)::DownCast(edges_e->Value(i));
+ anObj->GetLastFunction()->SetDescription("");
+ }
+
+ // search for vertices located on both external pipes
+ aFunction = theShape->GetLastFunction();
+ theDesc = aFunction->GetDescription();
+ Handle(TColStd_HSequenceOfTransient) vertices_e =
+ myShapesOperations->GetShapesOnBox(box_e, theShape, TopAbs_VERTEX, GEOMAlgo_ST_ONIN);
+ // Recover previous description to get rid of Propagate dump
+ aFunction->SetDescription(theDesc);
+ if (vertices_e.IsNull() || vertices_e->Length() == 0) {
+ SetErrorCode("External vertices not found");
+ return false;
+ }
+
+ for (int i = 1; i <= vertices_e->Length(); i++) {
+ Handle(GEOM_Object) v = Handle(GEOM_Object)::DownCast(vertices_e->Value(i));
+ v->GetLastFunction()->SetDescription("");
+ TopoDS_Vertex aVertex = TopoDS::Vertex(v->GetValue());
+ gp_Pnt aP = BRep_Tool::Pnt(aVertex);
+ if (Abs(aP.X()) <= Precision::Confusion()) {
+ if (Abs(aP.Y()) - theR2 > Precision::Confusion())
+ ve1 = v;
+ } else if (Abs(aP.Y()) <= Precision::Confusion()) {
+ if (Abs(aP.X()) - theR2 > Precision::Confusion())
+ ve2 = v;
+ }
+ }
+ Handle(GEOM_Object) edge_e1, edge_e2;
+
edge_e1 = myBasicOperations->MakeLineTwoPnt(ve1, vi1);
if (edge_e1.IsNull()) {
- SetErrorCode("Edge 1 could not be built");
- return false;
+ SetErrorCode("Edge 1 could not be built");
+ return false;
}
- } catch (Standard_Failure) {
- Handle(Standard_Failure) aFail = Standard_Failure::Caught();
- SetErrorCode(aFail->GetMessageString());
- return false;
- }
-
- try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
- OCC_CATCH_SIGNALS;
-#endif
+
edge_e2 = myBasicOperations->MakeLineTwoPnt(ve2, vi2);
if (edge_e2.IsNull()) {
- SetErrorCode("Edge 2 could not be built");
- return false;
+ SetErrorCode("Edge 2 could not be built");
+ return false;
}
- } catch (Standard_Failure) {
- Handle(Standard_Failure) aFail = Standard_Failure::Caught();
- SetErrorCode(aFail->GetMessageString());
- return false;
- }
-
- edge_e1->GetLastFunction()->SetDescription("");
- edge_e2->GetLastFunction()->SetDescription("");
-
- std::list<Handle(GEOM_Object)> edge_e_elist;
- edge_e_elist.push_back(arete_intersect_int);
- edge_e_elist.push_back(edge_e1);
- edge_e_elist.push_back(Handle(GEOM_Object)::DownCast(edges_e->Value(1)));
- edge_e_elist.push_back(edge_e2);
- wire_t = myShapesOperations->MakeWire(edge_e_elist, 1e-7);
- if (wire_t.IsNull()) {
- SetErrorCode("Impossible to build wire");
- return false;
- }
- wire_t->GetLastFunction()->SetDescription("");
- face_t = myShapesOperations->MakeFace(wire_t, false);
- if (face_t.IsNull()) {
- SetErrorCode("Impossible to build face");
- return false;
- }
- face_t->GetLastFunction()->SetDescription("");
- }
- else {
- Handle(GEOM_Object) P1, P2, P3, P4, P5, P6;
- int idP1, idP2, idP3, idP4;
- int PZX, PZY;
- double ZX=0, ZY=0;
- std::vector<int> LX;
- std::vector<int> LY;
- Handle(GEOM_Object) box_e = my3DPrimOperations->MakeBoxDXDYDZ(theVertCylinderRadius, theVertCylinderRadius, theHoriCylinderRadius);
- box_e->GetLastFunction()->SetDescription("");
- box_e = myTransformOperations->TranslateDXDYDZ(box_e, -theVertCylinderRadius, -theVertCylinderRadius, 0);
- box_e->GetLastFunction()->SetDescription("");
- aFunction = theShape->GetLastFunction();
- theDesc = aFunction->GetDescription();
- Handle(TColStd_HSequenceOfTransient) extremVertices = myShapesOperations->GetShapesOnBox(box_e, theShape, TopAbs_VERTEX, GEOMAlgo_ST_ONIN);
- // Recover previous description to get rid of Propagate dump
- aFunction->SetDescription(theDesc);
-
- if (extremVertices.IsNull() || extremVertices->Length() == 0) {
- if (theRF == 0)
- SetErrorCode("Vertices on chamfer not found");
- else
- SetErrorCode("Vertices on fillet not found");
- return false;
- }
-
- theShapes.push_back(theShape);
- theShapes.push_back(box_e);
- if (extremVertices->Length() != 6) {
- // for (int i=1; i<=extremVertices->Length(); i++){
- // theShapes.push_back(Handle(GEOM_Object)::DownCast(extremVertices->Value(i)));
- // }
- // Handle(GEOM_Object) aCompound = myShapesOperations->MakeCompound(theShapes);
- // TopoDS_Shape aCompoundShape = aCompound->GetValue();
- // theShape->GetLastFunction()->SetValue(aCompoundShape);
- SetErrorCode("Bad number of vertices on chamfer found");
- return false;
+ edge_e1->GetLastFunction()->SetDescription("");
+ edge_e2->GetLastFunction()->SetDescription("");
+
+ std::list<Handle(GEOM_Object)> edge_e_elist;
+ edge_e_elist.push_back(arete_intersect_int);
+ edge_e_elist.push_back(edge_e1);
+ edge_e_elist.push_back(Handle(GEOM_Object)::DownCast(edges_e->Value(1)));
+ edge_e_elist.push_back(edge_e2);
+ wire_t = myShapesOperations->MakeWire(edge_e_elist, 1e-7);
+ if (wire_t.IsNull()) {
+ SetErrorCode("Impossible to build wire");
+ return false;
+ }
+ wire_t->GetLastFunction()->SetDescription("");
+ face_t = myShapesOperations->MakeFace(wire_t, false);
+ if (face_t.IsNull()) {
+ SetErrorCode("Impossible to build face");
+ return false;
+ }
+ face_t->GetLastFunction()->SetDescription("");
}
-
- for (int i=1; i<=extremVertices->Length(); i++){
- Handle(GEOM_Object) aV = Handle(GEOM_Object)::DownCast(extremVertices->Value(i));
- aV->GetLastFunction()->SetDescription("");
- gp_Pnt aP = BRep_Tool::Pnt(TopoDS::Vertex(aV->GetValue()));
+ else {
+ Handle(GEOM_Object) P1, P2, P3, P4, P5, P6;
+ int idP1, idP2, idP3, idP4;
+ int PZX, PZY;
+ double ZX=0, ZY=0;
+ std::vector<int> LX;
+ std::vector<int> LY;
+ Handle(GEOM_Object) box_e = my3DPrimOperations->MakeBoxDXDYDZ
+ (theVertCylinderRadius, theVertCylinderRadius, theHoriCylinderRadius);
+ box_e->GetLastFunction()->SetDescription("");
+ box_e = myTransformOperations->TranslateDXDYDZ
+ (box_e, -theVertCylinderRadius, -theVertCylinderRadius, 0);
+ box_e->GetLastFunction()->SetDescription("");
+
+ aFunction = theShape->GetLastFunction();
+ theDesc = aFunction->GetDescription();
+ Handle(TColStd_HSequenceOfTransient) extremVertices =
+ myShapesOperations->GetShapesOnBox(box_e, theShape, TopAbs_VERTEX, GEOMAlgo_ST_ONIN);
+ // Recover previous description to get rid of Propagate dump
+ aFunction->SetDescription(theDesc);
+
+ if (extremVertices.IsNull() || extremVertices->Length() == 0) {
+ if (theRF == 0)
+ SetErrorCode("Vertices on chamfer not found");
+ else
+ SetErrorCode("Vertices on fillet not found");
+ return false;
+ }
- if (Abs(aP.X()) <= Precision::Confusion()) {
- if (Abs(aP.Y()) - theR2 > Precision::Confusion()) {
- LX.push_back(i);
- if (aP.Z()-ZX > Precision::Confusion()) {
- ZX = aP.Z();
- PZX = i;
- }
- }
+ theShapes.push_back(theShape);
+ theShapes.push_back(box_e);
+ if (extremVertices->Length() != 6) {
+ // for (int i=1; i<=extremVertices->Length(); i++){
+ // theShapes.push_back(Handle(GEOM_Object)::DownCast(extremVertices->Value(i)));
+ // }
+ // Handle(GEOM_Object) aCompound = myShapesOperations->MakeCompound(theShapes);
+ // TopoDS_Shape aCompoundShape = aCompound->GetValue();
+ // theShape->GetLastFunction()->SetValue(aCompoundShape);
+ SetErrorCode("Bad number of vertices on chamfer found");
+ return false;
}
- else {
- if (Abs(aP.X()) - theR2 > Precision::Confusion()) {
- LY.push_back(i);
- if (aP.Z() - ZY > Precision::Confusion()) {
- ZY = aP.Z();
- PZY = i;
- }
- }
+
+ for (int i=1; i<=extremVertices->Length(); i++){
+ Handle(GEOM_Object) aV = Handle(GEOM_Object)::DownCast(extremVertices->Value(i));
+ aV->GetLastFunction()->SetDescription("");
+ gp_Pnt aP = BRep_Tool::Pnt(TopoDS::Vertex(aV->GetValue()));
+
+ if (Abs(aP.X()) <= Precision::Confusion()) {
+ if (Abs(aP.Y()) - theR2 > Precision::Confusion()) {
+ LX.push_back(i);
+ if (aP.Z()-ZX > Precision::Confusion()) {
+ ZX = aP.Z();
+ PZX = i;
+ }
+ }
+ }
+ else {
+ if (Abs(aP.X()) - theR2 > Precision::Confusion()) {
+ LY.push_back(i);
+ if (aP.Z() - ZY > Precision::Confusion()) {
+ ZY = aP.Z();
+ PZY = i;
+ }
+ }
+ }
}
- }
- idP2 = PZX;
- idP4 = PZY;
- idP1 = LX.at(0);
- if (LX.at(0) == PZX)
- idP1 = LX.at(1);
- idP3 = LY.at(0);
- if (LY.at(0) == PZY)
- idP3 = LY.at(1);
-
- P1 = Handle(GEOM_Object)::DownCast(extremVertices->Value(idP1));
- P2 = Handle(GEOM_Object)::DownCast(extremVertices->Value(idP2));
- P3 = Handle(GEOM_Object)::DownCast(extremVertices->Value(idP3));
- P4 = Handle(GEOM_Object)::DownCast(extremVertices->Value(idP4));
-
- Handle(GEOM_Object) Cote_1 = myBasicOperations->MakeLineTwoPnt(P1, vi1);
- if (Cote_1.IsNull()) {
- SetErrorCode("Impossible to build edge in thickness");
- return false;
- }
- Cote_1->GetLastFunction()->SetDescription("");
-
- Handle(GEOM_Object) Cote_2 = myBasicOperations->MakeLineTwoPnt(vi2, P3);
- if (Cote_2.IsNull()) {
- SetErrorCode("Impossible to build edge in thickness");
- return false;
- }
- Cote_2->GetLastFunction()->SetDescription("");
-
- // edge_chan_princ = arete du chanfrein (ou raccord) sur le tuyau principal
- // edge_chan_inc = arete du chanfrein (ou raccord) sur le tuyau incident
- // std::cerr << "Getting chamfer edge on main pipe" << std::endl;
- Handle(GEOM_Object) edge_chan_princ = myBlocksOperations->GetEdge(theShape, P1, P3);
- if (edge_chan_princ.IsNull()) {
- SetErrorCode("Impossible to find edge on main pipe");
- return false;
- }
- edge_chan_princ->GetLastFunction()->SetDescription("");
-
- Handle(GEOM_Object) edge_chan_inc = myBlocksOperations->GetEdge(theShape, P2, P4);
- if (edge_chan_inc.IsNull()) {
- SetErrorCode("Impossible to find edge on incident pipe");
- return false;
- }
- edge_chan_inc->GetLastFunction()->SetDescription("");
-
- std::list<Handle(GEOM_Object)> edgeList1;
- edgeList1.push_back(edge_chan_princ);
- edgeList1.push_back(Cote_1);
- edgeList1.push_back(arete_intersect_int);
- edgeList1.push_back(Cote_2);
-
- // std::cerr << "Creating wire 1" << std::endl;
- wire_t = myShapesOperations->MakeWire(edgeList1, 1e-7);
- if (wire_t.IsNull()) {
- SetErrorCode("Impossible to build wire");
- return false;
- }
- wire_t->GetLastFunction()->SetDescription("");
-
- // std::cerr << "Creating face 1" << std::endl;
- face_t = myShapesOperations->MakeFace(wire_t, false);
- if (face_t.IsNull()) {
- SetErrorCode("Impossible to build face");
- return false;
- }
- face_t->GetLastFunction()->SetDescription("");
- theShapes.push_back(face_t);
-
- gp_Pnt aP2 = BRep_Tool::Pnt(TopoDS::Vertex(P2->GetValue()));
- gp_Pnt aP5 = BRep_Tool::Pnt(TopoDS::Vertex(vi1->GetValue()));
- double deltaZ = aP2.Z() - aP5.Z();
- // std::cerr << "Creating new point from vi1 with deltaZ = " << deltaZ << std::endl;
- Handle(GEOM_Object) P5bis = myTransformOperations->TranslateDXDYDZCopy(vi1, 0, 0, deltaZ);
- if (P5bis.IsNull()) {
- SetErrorCode("Impossible to translate vertex");
- return false;
- }
- P5bis->GetLastFunction()->SetDescription("");
-
- gp_Pnt aP4 = BRep_Tool::Pnt(TopoDS::Vertex(P4->GetValue()));
- gp_Pnt aP6 = BRep_Tool::Pnt(TopoDS::Vertex(vi2->GetValue()));
- deltaZ = aP4.Z() - aP6.Z();
- // std::cerr << "Creating new point from vi2 with deltaZ = " << deltaZ << std::endl;
- Handle(GEOM_Object) P6bis = myTransformOperations->TranslateDXDYDZCopy(vi2, 0, 0, deltaZ);
- if (P6bis.IsNull()) {
- SetErrorCode("Impossible to translate vertex");
- return false;
- }
- P6bis->GetLastFunction()->SetDescription("");
+ idP2 = PZX;
+ idP4 = PZY;
+ idP1 = LX.at(0);
+ if (LX.at(0) == PZX)
+ idP1 = LX.at(1);
+ idP3 = LY.at(0);
+ if (LY.at(0) == PZY)
+ idP3 = LY.at(1);
+
+ P1 = Handle(GEOM_Object)::DownCast(extremVertices->Value(idP1));
+ P2 = Handle(GEOM_Object)::DownCast(extremVertices->Value(idP2));
+ P3 = Handle(GEOM_Object)::DownCast(extremVertices->Value(idP3));
+ P4 = Handle(GEOM_Object)::DownCast(extremVertices->Value(idP4));
+
+ Handle(GEOM_Object) Cote_1 = myBasicOperations->MakeLineTwoPnt(P1, vi1);
+ if (Cote_1.IsNull()) {
+ SetErrorCode("Impossible to build edge in thickness");
+ return false;
+ }
+ Cote_1->GetLastFunction()->SetDescription("");
- // std::cerr << "Creating new line 1 from 2 previous points" << std::endl;
- Handle(GEOM_Object) Cote_3 = myBasicOperations->MakeLineTwoPnt(P5bis, P2);
- if (Cote_3.IsNull()) {
- SetErrorCode("Impossible to build edge in thickness");
- return false;
- }
- Cote_3->GetLastFunction()->SetDescription("");
-
- // std::cerr << "Creating new line 2 from 2 previous points" << std::endl;
- Handle(GEOM_Object) Cote_4 = myBasicOperations->MakeLineTwoPnt(P6bis, P4);
- if (Cote_4.IsNull()) {
- SetErrorCode("Impossible to build edge in thickness");
- return false;
- }
- Cote_4->GetLastFunction()->SetDescription("");
-
- // std::cerr << "Creating new line 3 from 2 previous points" << std::endl;
- Handle(GEOM_Object) Cote_5 = myBasicOperations->MakeLineTwoPnt(P5bis, P6bis);
- if (Cote_4.IsNull()) {
- SetErrorCode("Impossible to build edge in thickness");
- return false;
+ Handle(GEOM_Object) Cote_2 = myBasicOperations->MakeLineTwoPnt(vi2, P3);
+ if (Cote_2.IsNull()) {
+ SetErrorCode("Impossible to build edge in thickness");
+ return false;
+ }
+ Cote_2->GetLastFunction()->SetDescription("");
+
+ // edge_chan_princ = arete du chanfrein (ou raccord) sur le tuyau principal
+ // edge_chan_inc = arete du chanfrein (ou raccord) sur le tuyau incident
+ // std::cerr << "Getting chamfer edge on main pipe" << std::endl;
+ Handle(GEOM_Object) edge_chan_princ = myBlocksOperations->GetEdge(theShape, P1, P3);
+ if (edge_chan_princ.IsNull()) {
+ SetErrorCode("Impossible to find edge on main pipe");
+ return false;
+ }
+ edge_chan_princ->GetLastFunction()->SetDescription("");
+
+ Handle(GEOM_Object) edge_chan_inc = myBlocksOperations->GetEdge(theShape, P2, P4);
+ if (edge_chan_inc.IsNull()) {
+ SetErrorCode("Impossible to find edge on incident pipe");
+ return false;
+ }
+ edge_chan_inc->GetLastFunction()->SetDescription("");
+
+ std::list<Handle(GEOM_Object)> edgeList1;
+ edgeList1.push_back(edge_chan_princ);
+ edgeList1.push_back(Cote_1);
+ edgeList1.push_back(arete_intersect_int);
+ edgeList1.push_back(Cote_2);
+
+ // std::cerr << "Creating wire 1" << std::endl;
+ wire_t = myShapesOperations->MakeWire(edgeList1, 1e-7);
+ if (wire_t.IsNull()) {
+ SetErrorCode("Impossible to build wire");
+ return false;
+ }
+ wire_t->GetLastFunction()->SetDescription("");
+
+ // std::cerr << "Creating face 1" << std::endl;
+ face_t = myShapesOperations->MakeFace(wire_t, false);
+ if (face_t.IsNull()) {
+ SetErrorCode("Impossible to build face");
+ return false;
+ }
+ face_t->GetLastFunction()->SetDescription("");
+ theShapes.push_back(face_t);
+
+ gp_Pnt aP2 = BRep_Tool::Pnt(TopoDS::Vertex(P2->GetValue()));
+ gp_Pnt aP5 = BRep_Tool::Pnt(TopoDS::Vertex(vi1->GetValue()));
+ double deltaZ = aP2.Z() - aP5.Z();
+ // std::cerr << "Creating new point from vi1 with deltaZ = " << deltaZ << std::endl;
+ Handle(GEOM_Object) P5bis = myTransformOperations->TranslateDXDYDZCopy(vi1, 0, 0, deltaZ);
+ if (P5bis.IsNull()) {
+ SetErrorCode("Impossible to translate vertex");
+ return false;
+ }
+ P5bis->GetLastFunction()->SetDescription("");
+
+ gp_Pnt aP4 = BRep_Tool::Pnt(TopoDS::Vertex(P4->GetValue()));
+ gp_Pnt aP6 = BRep_Tool::Pnt(TopoDS::Vertex(vi2->GetValue()));
+ deltaZ = aP4.Z() - aP6.Z();
+ // std::cerr << "Creating new point from vi2 with deltaZ = " << deltaZ << std::endl;
+ Handle(GEOM_Object) P6bis = myTransformOperations->TranslateDXDYDZCopy(vi2, 0, 0, deltaZ);
+ if (P6bis.IsNull()) {
+ SetErrorCode("Impossible to translate vertex");
+ return false;
+ }
+ P6bis->GetLastFunction()->SetDescription("");
+
+ // std::cerr << "Creating new line 1 from 2 previous points" << std::endl;
+ Handle(GEOM_Object) Cote_3 = myBasicOperations->MakeLineTwoPnt(P5bis, P2);
+ if (Cote_3.IsNull()) {
+ SetErrorCode("Impossible to build edge in thickness");
+ return false;
+ }
+ Cote_3->GetLastFunction()->SetDescription("");
+
+ // std::cerr << "Creating new line 2 from 2 previous points" << std::endl;
+ Handle(GEOM_Object) Cote_4 = myBasicOperations->MakeLineTwoPnt(P6bis, P4);
+ if (Cote_4.IsNull()) {
+ SetErrorCode("Impossible to build edge in thickness");
+ return false;
+ }
+ Cote_4->GetLastFunction()->SetDescription("");
+
+ // std::cerr << "Creating new line 3 from 2 previous points" << std::endl;
+ Handle(GEOM_Object) Cote_5 = myBasicOperations->MakeLineTwoPnt(P5bis, P6bis);
+ if (Cote_4.IsNull()) {
+ SetErrorCode("Impossible to build edge in thickness");
+ return false;
+ }
+ Cote_5->GetLastFunction()->SetDescription("");
+
+ //std::list<Handle(GEOM_Object)> edgeList2;
+ //edgeList2.push_back(edge_chan_inc);
+ //edgeList2.push_back(Cote_3);
+ //edgeList2.push_back(Cote_5);
+ //edgeList2.push_back(Cote_4);
+ // std::cerr << "Creating wire 2" << std::endl;
+ //wire_t2 = myShapesOperations->MakeWire(edgeList2, 1e-7);
+ //if (wire_t2.IsNull()) {
+ // SetErrorCode("Impossible to build wire");
+ // return false;
+ //}
+ //wire_t2->GetLastFunction()->SetDescription("");
+ // std::cerr << "Creating face 2" << std::endl;
+ //face_t2 = myShapesOperations->MakeFace(wire_t2, false);
+ face_t2 = my3DPrimOperations->MakePrismVecH(edge_chan_inc, Cote_4, - 2.0*theR2);
+ if (face_t2.IsNull()) {
+ SetErrorCode("Impossible to build face");
+ return false;
+ }
+ face_t2->GetLastFunction()->SetDescription("");
+ theShapes.push_back(face_t2);
}
- Cote_5->GetLastFunction()->SetDescription("");
-
- std::list<Handle(GEOM_Object)> edgeList2;
- edgeList2.push_back(edge_chan_inc);
- edgeList2.push_back(Cote_3);
- edgeList2.push_back(Cote_5);
- edgeList2.push_back(Cote_4);
- // std::cerr << "Creating wire 2" << std::endl;
- wire_t2 = myShapesOperations->MakeWire(edgeList2, 1e-7);
- if (wire_t2.IsNull()) {
- SetErrorCode("Impossible to build wire");
+
+ // Planes
+ Handle(GEOM_Object) aP0 = myBasicOperations->MakePointXYZ(0, 0, 0);
+ Handle(GEOM_Object) aVZ = myBasicOperations->MakeVectorDXDYDZ(0, 0, 1);
+ Handle(GEOM_Object) aVXZ = myBasicOperations->MakeVectorDXDYDZ(aR1Ext, 0, 0.5*(theL1+theVertCylinderRadius));
+ Handle(GEOM_Object) aPlnOZ = myBasicOperations->MakePlanePntVec(aP0, aVZ, aSize);
+ Handle(GEOM_Object) aPlnOXZ = myBasicOperations->MakePlanePntVec(aP0, aVXZ, aSize);
+ aP0->GetLastFunction()->SetDescription("");
+ aVZ->GetLastFunction()->SetDescription("");
+ aVXZ->GetLastFunction()->SetDescription("");
+ aPlnOZ->GetLastFunction()->SetDescription("");
+ aPlnOXZ->GetLastFunction()->SetDescription("");
+ theShapes.push_back(aPlnOZ);
+ theShapes.push_back(aPlnOXZ);
+
+ // Partition
+ Handle(TColStd_HSequenceOfTransient) partitionShapes = new TColStd_HSequenceOfTransient;
+ Handle(TColStd_HSequenceOfTransient) theTools = new TColStd_HSequenceOfTransient;
+ Handle(TColStd_HSequenceOfTransient) theKeepInside = new TColStd_HSequenceOfTransient;
+ Handle(TColStd_HSequenceOfTransient) theRemoveInside = new TColStd_HSequenceOfTransient;
+ Handle(TColStd_HArray1OfInteger) theMaterials;
+ partitionShapes->Append(theShape);
+ theTools->Append(aPlnOZ);
+ if (Abs(aR1Ext - aR2Ext) > Precision::Confusion() )
+ theTools->Append(aPlnOXZ);
+ theTools->Append(face_t);
+ if (!isNormal)
+ theTools->Append(face_t2);
+
+ Te3 = myBooleanOperations->MakePartition
+ (partitionShapes, theTools, theKeepInside, theRemoveInside,
+ TopAbs_SOLID, false, theMaterials, 0, false);
+ if (Te3.IsNull()) {
+ SetErrorCode("Impossible to build partition of TShape");
+// Handle(GEOM_Object) aCompound = myShapesOperations->MakeCompound(theShapes);
+// TopoDS_Shape aCompoundShape = aCompound->GetValue();
+// theShape->GetLastFunction()->SetValue(aCompoundShape);
return false;
}
- wire_t2->GetLastFunction()->SetDescription("");
- // std::cerr << "Creating face 2" << std::endl;
- face_t2 = myShapesOperations->MakeFace(wire_t2, false);
- if (face_t2.IsNull()) {
- SetErrorCode("Impossible to build face");
+ Te3->GetLastFunction()->SetDescription("");
+
+ // Last verification: result should be a block
+ std::list<GEOMImpl_IBlocksOperations::BCError> errList;
+ if (!myBlocksOperations->CheckCompoundOfBlocks(Te3,errList)) {
+ SetErrorCode("TShape is not a block");
return false;
}
- face_t2->GetLastFunction()->SetDescription("");
- theShapes.push_back(face_t2);
- }
-
- // Planes
- Handle(GEOM_Object) aP0 = myBasicOperations->MakePointXYZ(0, 0, 0);
- Handle(GEOM_Object) aVZ = myBasicOperations->MakeVectorDXDYDZ(0, 0, 1);
- Handle(GEOM_Object) aVXZ = myBasicOperations->MakeVectorDXDYDZ(aR1Ext, 0, 0.5*(theL1+theVertCylinderRadius));
- Handle(GEOM_Object) aPlnOZ = myBasicOperations->MakePlanePntVec(aP0, aVZ, aSize);
- Handle(GEOM_Object) aPlnOXZ = myBasicOperations->MakePlanePntVec(aP0, aVXZ, aSize);
- aP0->GetLastFunction()->SetDescription("");
- aVZ->GetLastFunction()->SetDescription("");
- aVXZ->GetLastFunction()->SetDescription("");
- aPlnOZ->GetLastFunction()->SetDescription("");
- aPlnOXZ->GetLastFunction()->SetDescription("");
- theShapes.push_back(aPlnOZ);
- theShapes.push_back(aPlnOXZ);
-
-
- Handle(TColStd_HSequenceOfTransient) partitionShapes = new TColStd_HSequenceOfTransient;
- Handle(TColStd_HSequenceOfTransient) theTools = new TColStd_HSequenceOfTransient;
- Handle(TColStd_HSequenceOfTransient) theKeepInside = new TColStd_HSequenceOfTransient;
- Handle(TColStd_HSequenceOfTransient) theRemoveInside = new TColStd_HSequenceOfTransient;
- Handle(TColStd_HArray1OfInteger) theMaterials;
- partitionShapes->Append(theShape);
- theTools->Append(aPlnOZ);
- if (Abs(aR1Ext - aR2Ext) > Precision::Confusion() )
- theTools->Append(aPlnOXZ);
- theTools->Append(face_t);
- if (!isNormal)
- theTools->Append(face_t2);
-
- Handle(GEOM_Object) Te3 = myBooleanOperations->MakePartition(partitionShapes, theTools, theKeepInside, theRemoveInside, TopAbs_SOLID, false, theMaterials, 0, false);
- if (Te3.IsNull()) {
- SetErrorCode("Impossible to build partition of TShape");
- // Handle(GEOM_Object) aCompound = myShapesOperations->MakeCompound(theShapes);
- // TopoDS_Shape aCompoundShape = aCompound->GetValue();
- // theShape->GetLastFunction()->SetValue(aCompoundShape);
+ TopoDS_Shape aShape = Te3->GetValue();
+ theShape->GetLastFunction()->SetValue(aShape);
+ } catch (Standard_Failure) {
+ Handle(Standard_Failure) aFail = Standard_Failure::Caught();
+ SetErrorCode(aFail->GetMessageString());
return false;
}
- Te3->GetLastFunction()->SetDescription("");
-
- TopoDS_Shape aShape = Te3->GetValue();
- theShape->GetLastFunction()->SetValue(aShape);
-
SetErrorCode(OK);
return true;
}
// Mirror and glue faces
-bool GEOMImpl_IAdvancedOperations::MakePipeTShapeMirrorAndGlue(Handle(GEOM_Object) theShape,
- double theR1, double theW1, double theL1,
- double theR2, double theW2, double theL2)
+bool GEOMImpl_IAdvancedOperations::MakePipeTShapeMirrorAndGlue(Handle(GEOM_Object) theShape,
+ double theR1, double theW1, double theL1,
+ double theR2, double theW2, double theL2)
{
SetErrorCode(KO);
-
+
// Useful values
double aSize = 2*(theL1 + theL2);
double aR1Ext = theR1 + theW1;
//=============================================================================
Handle(TColStd_HSequenceOfTransient)
GEOMImpl_IAdvancedOperations::MakePipeTShape(double theR1, double theW1, double theL1,
- double theR2, double theW2, double theL2,
- bool theHexMesh)
+ double theR2, double theW2, double theL2,
+ bool theHexMesh)
{
MESSAGE("GEOMImpl_IAdvancedOperations::MakePipeTShape");
SetErrorCode(KO);
//Compute the resulting value
try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
OCC_CATCH_SIGNALS;
#endif
if (!GetSolver()->ComputeFunction(aFunction)) {
SetErrorCode("TShape driver failed");
return NULL;
}
+ if (theHexMesh) {
+ if (!MakePipeTShapePartition(aShape, theR1, theW1, theL1, theR2, theW2, theL2))
+ return NULL;
+ if (!MakePipeTShapeMirrorAndGlue(aShape, theR1, theW1, theL1, theR2, theW2, theL2))
+ return NULL;
+ }
} catch (Standard_Failure) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught();
SetErrorCode(aFail->GetMessageString());
return NULL;
}
-
- if (theHexMesh) {
- if (!MakePipeTShapePartition(aShape, theR1, theW1, theL1, theR2, theW2, theL2))
- return NULL;
- if (!MakePipeTShapeMirrorAndGlue(aShape, theR1, theW1, theL1, theR2, theW2, theL2))
- return NULL;
- }
+
Handle(TColStd_HSequenceOfTransient) aSeq = new TColStd_HSequenceOfTransient;
aSeq->Append(aShape);
/*
* Get the groups: BEGIN
*/
- if (!MakeGroups(aShape, TSHAPE_BASIC, theR1, theW1, theL1, theR2, theW2, theL2, aSeq, gp_Trsf()))
+ try {
+ if (!MakeGroups(aShape, TSHAPE_BASIC, theR1, theW1, theL1, theR2, theW2, theL2, aSeq, gp_Trsf()))
+ return NULL;
+ }
+ catch (Standard_Failure) {
+ Handle(Standard_Failure) aFail = Standard_Failure::Caught();
+ SetErrorCode(aFail->GetMessageString());
return NULL;
+ }
TCollection_AsciiString aListRes, anEntry;
// Iterate over the sequence aSeq
aListRes.Trunc(aListRes.Length() - 2);
//Make a Python command
- GEOM::TPythonDump(aFunction) << "[" << aShape << ", " << aListRes.ToCString() << "] = geompy.MakePipeTShape("
- << theR1 << ", " << theW1 << ", " << theL1 << ", " << theR2 << ", " << theW2 << ", " << theL2 << ", "
- << theHexMesh << ")";
+ GEOM::TPythonDump(aFunction)
+ << "[" << aShape << ", " << aListRes.ToCString() << "] = geompy.MakePipeTShape("
+ << theR1 << ", " << theW1 << ", " << theL1 << ", " << theR2 << ", " << theW2 << ", " << theL2 << ", "
+ << theHexMesh << ")";
}
/*
* Get the groups: END
*/
else {
//Make a Python command
- GEOM::TPythonDump(aFunction) << "[" << aShape << "] = geompy.MakePipeTShape(" << theR1 << ", " << theW1 << ", "
- << theL1 << ", " << theR2 << ", " << theW2 << ", " << theL2 << ", " << theHexMesh << ")";
+ GEOM::TPythonDump(aFunction)
+ << "[" << aShape << "] = geompy.MakePipeTShape(" << theR1 << ", " << theW1 << ", "
+ << theL1 << ", " << theR2 << ", " << theW2 << ", " << theL2 << ", " << theHexMesh << ")";
}
SetErrorCode(OK);
//=============================================================================
Handle(TColStd_HSequenceOfTransient)
GEOMImpl_IAdvancedOperations::MakePipeTShapeWithPosition(double theR1, double theW1, double theL1,
- double theR2, double theW2, double theL2,
- bool theHexMesh,
- Handle(GEOM_Object) theP1,
- Handle(GEOM_Object) theP2,
- Handle(GEOM_Object) theP3)
+ double theR2, double theW2, double theL2,
+ bool theHexMesh,
+ Handle(GEOM_Object) theP1,
+ Handle(GEOM_Object) theP2,
+ Handle(GEOM_Object) theP3)
{
SetErrorCode(KO);
//Add a new object
//Compute the resulting value
try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
OCC_CATCH_SIGNALS;
#endif
if (!GetSolver()->ComputeFunction(aFunction)) {
SetErrorCode(aFail->GetMessageString());
return NULL;
}
-
+
if (theHexMesh) {
if (!MakePipeTShapePartition(aShape, theR1, theW1, theL1, theR2, theW2, theL2))
return NULL;
//
// Get the groups: BEGIN
//
- if (!MakeGroups(aShape,TSHAPE_BASIC, theR1, theW1, theL1, theR2, theW2, theL2, aSeq, aTrsf)) {
+ try {
+ if (!MakeGroups(aShape,TSHAPE_BASIC, theR1, theW1, theL1, theR2, theW2, theL2, aSeq, aTrsf)) {
+ return NULL;
+ }
+ }
+ catch (Standard_Failure) {
+ Handle(Standard_Failure) aFail = Standard_Failure::Caught();
+ SetErrorCode(aFail->GetMessageString());
return NULL;
}
aListRes.Trunc(aListRes.Length() - 2);
//Make a Python command
- GEOM::TPythonDump(aFunction) << "[" << aShape << ", " << aListRes.ToCString() << "] = geompy.MakePipeTShape("
- << theR1 << ", " << theW1 << ", " << theL1 << ", " << theR2 << ", " << theW2 << ", " << theL2 << ", "
- << theHexMesh << ", " << theP1 << ", " << theP2 << ", " << theP3 << ")";
+ GEOM::TPythonDump(aFunction)
+ << "[" << aShape << ", " << aListRes.ToCString() << "] = geompy.MakePipeTShape("
+ << theR1 << ", " << theW1 << ", " << theL1 << ", " << theR2 << ", " << theW2 << ", " << theL2 << ", "
+ << theHexMesh << ", " << theP1 << ", " << theP2 << ", " << theP3 << ")";
}
//
// Get the groups: END
else {
//Make a Python command
- GEOM::TPythonDump(aFunction) << "[" << aShape << "] = geompy.MakePipeTShape(" << theR1 << ", " << theW1 << ", "
- << theL1 << ", " << theR2 << ", " << theW2 << ", " << theL2 << ", " << theHexMesh << ", " << theP1
- << ", " << theP2 << ", " << theP3 << ")";
+ GEOM::TPythonDump(aFunction)
+ << "[" << aShape << "] = geompy.MakePipeTShape(" << theR1 << ", " << theW1 << ", "
+ << theL1 << ", " << theR2 << ", " << theW2 << ", " << theL2 << ", " << theHexMesh << ", " << theP1
+ << ", " << theP2 << ", " << theP3 << ")";
}
SetErrorCode(OK);
//=============================================================================
Handle(TColStd_HSequenceOfTransient)
GEOMImpl_IAdvancedOperations::MakePipeTShapeChamfer(double theR1, double theW1, double theL1,
- double theR2, double theW2, double theL2,
- double theH, double theW,
- bool theHexMesh)
+ double theR2, double theW2, double theL2,
+ double theH, double theW,
+ bool theHexMesh)
{
SetErrorCode(KO);
//Add a new object
//Compute the resulting value
try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
OCC_CATCH_SIGNALS;
#endif
if (!GetSolver()->ComputeFunction(aFunction)) {
box_e->GetLastFunction()->SetDescription("");
box_e = myTransformOperations->TranslateDXDYDZ(box_e, -(theR2+theW2), -(theR2+theW2), 0);
box_e->GetLastFunction()->SetDescription("");
-
- Handle(TColStd_HSequenceOfInteger) edges_e = myShapesOperations->GetShapesOnBoxIDs(box_e, aShape, TopAbs_EDGE, GEOMAlgo_ST_IN);
+
+ Handle(TColStd_HSequenceOfInteger) edges_e =
+ myShapesOperations->GetShapesOnBoxIDs(box_e, aShape, TopAbs_EDGE, GEOMAlgo_ST_IN);
box_e->GetLastFunction()->SetDescription("");
if (edges_e.IsNull() || edges_e->Length() == 0) {
SetErrorCode("External edges not found");
- return false;
+ return NULL;
}
int nbEdgesInChamfer = 0;
std::list<int> theEdges;
iv ++;
gp_Pnt aPt = BRep_Tool::Pnt(TopoDS::Vertex(Ex.Current()));
if (Abs(aPt.Z() - (theR1+theW1)) <= Precision::Confusion()) {
- nbEdgesInChamfer ++;
- theEdges.push_back(edgeID);
+ nbEdgesInChamfer ++;
+ theEdges.push_back(edgeID);
}
Ex.Next();
}
return NULL;
}
aChamfer->GetLastFunction()->SetDescription("");
-
+
TopoDS_Shape aChamferShape = aChamfer->GetValue();
aFunction->SetValue(aChamferShape);
// END of chamfer
//
// Get the groups: BEGIN
//
- // if (!MakeGroups(aShape, TSHAPE_CHAMFER, theR1, theW1, theL1, theR2, theW2, theL2, aSeq, gp_Trsf())) {
- // //Make a Python command
- // GEOM::TPythonDump(aFunction) << "[" << aShape << "] = geompy.MakePipeTShapeChamfer(" << theR1 << ", " << theW1
- // << ", " << theL1 << ", " << theR2 << ", " << theW2 << ", " << theL2 << ", " << theH << ", " << theW
- // << ", " << theHexMesh << ")";
- // }
- // else {
- if (!MakeGroups(aShape, TSHAPE_CHAMFER, theR1, theW1, theL1, theR2, theW2, theL2, aSeq, gp_Trsf()))
+ //if (!MakeGroups(aShape, TSHAPE_CHAMFER, theR1, theW1, theL1, theR2, theW2, theL2, aSeq, gp_Trsf())) {
+ // //Make a Python command
+ // GEOM::TPythonDump(aFunction)
+ // << "[" << aShape << "] = geompy.MakePipeTShapeChamfer(" << theR1 << ", " << theW1
+ // << ", " << theL1 << ", " << theR2 << ", " << theW2 << ", " << theL2 << ", " << theH << ", " << theW
+ // << ", " << theHexMesh << ")";
+ //}
+ //else {
+ try {
+ if (!MakeGroups(aShape, TSHAPE_CHAMFER, theR1, theW1, theL1, theR2, theW2, theL2, aSeq, gp_Trsf()))
+ return NULL;
+ }
+ catch (Standard_Failure) {
+ Handle(Standard_Failure) aFail = Standard_Failure::Caught();
+ SetErrorCode(aFail->GetMessageString());
return NULL;
+ }
TCollection_AsciiString aListRes, anEntry;
// Iterate over the sequence aSeq
aListRes.Trunc(aListRes.Length() - 2);
//Make a Python command
- GEOM::TPythonDump(aFunction) << "[" << aShape << ", " << aListRes.ToCString()
- << "] = geompy.MakePipeTShapeChamfer(" << theR1 << ", " << theW1 << ", " << theL1 << ", " << theR2
- << ", " << theW2 << ", " << theL2 << ", " << theH << ", " << theW << ", " << theHexMesh << ")";
- // }
+ GEOM::TPythonDump(aFunction)
+ << "[" << aShape << ", " << aListRes.ToCString()
+ << "] = geompy.MakePipeTShapeChamfer(" << theR1 << ", " << theW1 << ", " << theL1 << ", " << theR2
+ << ", " << theW2 << ", " << theL2 << ", " << theH << ", " << theW << ", " << theHexMesh << ")";
+ //}
}
//
// Get the groups: END
//
else {
//Make a Python command
- GEOM::TPythonDump(aFunction) << "[" << aShape << "] = geompy.MakePipeTShapeChamfer(" << theR1 << ", " << theW1
- << ", " << theL1 << ", " << theR2 << ", " << theW2 << ", " << theL2 << ", " << theH << ", " << theW
- << ", " << theHexMesh << ")";
+ GEOM::TPythonDump(aFunction)
+ << "[" << aShape << "] = geompy.MakePipeTShapeChamfer(" << theR1 << ", " << theW1
+ << ", " << theL1 << ", " << theR2 << ", " << theW2 << ", " << theL2 << ", " << theH << ", " << theW
+ << ", " << theHexMesh << ")";
}
SetErrorCode(OK);
//=============================================================================
Handle(TColStd_HSequenceOfTransient)
GEOMImpl_IAdvancedOperations::MakePipeTShapeChamferWithPosition(double theR1, double theW1, double theL1,
- double theR2, double theW2, double theL2,
- double theH, double theW,
- bool theHexMesh,
- Handle(GEOM_Object) theP1,
- Handle(GEOM_Object) theP2,
- Handle(GEOM_Object) theP3)
+ double theR2, double theW2, double theL2,
+ double theH, double theW,
+ bool theHexMesh,
+ Handle(GEOM_Object) theP1,
+ Handle(GEOM_Object) theP2,
+ Handle(GEOM_Object) theP3)
{
SetErrorCode(KO);
//Add a new object
//Compute the resulting value
try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
OCC_CATCH_SIGNALS;
#endif
if (!GetSolver()->ComputeFunction(aFunction)) {
box_e->GetLastFunction()->SetDescription("");
box_e = myTransformOperations->TranslateDXDYDZ(box_e, -(theR2+theW2), -(theR2+theW2), 0);
box_e->GetLastFunction()->SetDescription("");
-
- Handle(TColStd_HSequenceOfInteger) edges_e = myShapesOperations->GetShapesOnBoxIDs(box_e, aShape, TopAbs_EDGE, GEOMAlgo_ST_IN);
+
+ Handle(TColStd_HSequenceOfInteger) edges_e =
+ myShapesOperations->GetShapesOnBoxIDs(box_e, aShape, TopAbs_EDGE, GEOMAlgo_ST_IN);
box_e->GetLastFunction()->SetDescription("");
if (edges_e.IsNull() || edges_e->Length() == 0) {
SetErrorCode("External edges not found");
- return false;
+ return NULL;
}
int nbEdgesInChamfer = 0;
std::list<int> theEdges;
while (Ex.More()) {
gp_Pnt aPt = BRep_Tool::Pnt(TopoDS::Vertex(Ex.Current()));
if (Abs(aPt.Z() - (theR1+theW1)) <= Precision::Confusion()) {
- nbEdgesInChamfer ++;
- theEdges.push_back(edgeID);
+ nbEdgesInChamfer ++;
+ theEdges.push_back(edgeID);
}
Ex.Next();
}
return NULL;
}
aChamfer->GetLastFunction()->SetDescription("");
-
+
TopoDS_Shape aChamferShape = aChamfer->GetValue();
aFunction->SetValue(aChamferShape);
// END of chamfer
-
+
if (theHexMesh) {
if (!MakePipeTShapePartition(aShape, theR1, theW1, theL1, theR2, theW2, theL2, theH, theW, 0, false))
return NULL;
/*
* Get the groups: BEGIN
*/
- if (!MakeGroups(aShape, TSHAPE_CHAMFER, theR1, theW1, theL1, theR2, theW2, theL2, aSeq, aTrsf))
+ try {
+ if (!MakeGroups(aShape, TSHAPE_CHAMFER, theR1, theW1, theL1, theR2, theW2, theL2, aSeq, aTrsf))
+ return NULL;
+ }
+ catch (Standard_Failure) {
+ Handle(Standard_Failure) aFail = Standard_Failure::Caught();
+ SetErrorCode(aFail->GetMessageString());
return NULL;
+ }
TCollection_AsciiString aListRes, anEntry;
// Iterate over the sequence aSeq
aListRes.Trunc(aListRes.Length() - 2);
//Make a Python command
- GEOM::TPythonDump(aFunction) << "[" << aShape << ", " << aListRes.ToCString()
- << "] = geompy.MakePipeTShapeChamfer(" << theR1 << ", " << theW1 << ", " << theL1 << ", " << theR2
- << ", " << theW2 << ", " << theL2 << ", " << theH << ", " << theW << ", " << theHexMesh << ", "
- << theP1 << ", " << theP2 << ", " << theP3 << ")";
+ GEOM::TPythonDump(aFunction)
+ << "[" << aShape << ", " << aListRes.ToCString()
+ << "] = geompy.MakePipeTShapeChamfer(" << theR1 << ", " << theW1 << ", " << theL1 << ", " << theR2
+ << ", " << theW2 << ", " << theL2 << ", " << theH << ", " << theW << ", " << theHexMesh << ", "
+ << theP1 << ", " << theP2 << ", " << theP3 << ")";
}
/*
* Get the groups: END
*/
else {
//Make a Python command
- GEOM::TPythonDump(aFunction) << "[" << aShape << "] = geompy.MakePipeTShapeChamfer(" << theR1 << ", " << theW1
- << ", " << theL1 << ", " << theR2 << ", " << theW2 << ", " << theL2 << ", " << theH << ", " << theW
- << ", " << theHexMesh << ", " << theP1 << ", " << theP2 << ", " << theP3 << ")";
+ GEOM::TPythonDump(aFunction)
+ << "[" << aShape << "] = geompy.MakePipeTShapeChamfer(" << theR1 << ", " << theW1
+ << ", " << theL1 << ", " << theR2 << ", " << theW2 << ", " << theL2 << ", " << theH << ", " << theW
+ << ", " << theHexMesh << ", " << theP1 << ", " << theP2 << ", " << theP3 << ")";
}
SetErrorCode(OK);
//=============================================================================
Handle(TColStd_HSequenceOfTransient)
GEOMImpl_IAdvancedOperations::MakePipeTShapeFillet(double theR1, double theW1, double theL1,
- double theR2, double theW2, double theL2,
- double theRF, bool theHexMesh)
+ double theR2, double theW2, double theL2,
+ double theRF, bool theHexMesh)
{
SetErrorCode(KO);
//Add a new object
//Compute the resulting value
try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
OCC_CATCH_SIGNALS;
#endif
if (!GetSolver()->ComputeFunction(aFunction)) {
box_e->GetLastFunction()->SetDescription("");
box_e = myTransformOperations->TranslateDXDYDZ(box_e, -(theR2+theW2), -(theR2+theW2), 0);
box_e->GetLastFunction()->SetDescription("");
-
- Handle(TColStd_HSequenceOfInteger) edges_e = myShapesOperations->GetShapesOnBoxIDs(box_e, aShape, TopAbs_EDGE, GEOMAlgo_ST_IN);
+
+ Handle(TColStd_HSequenceOfInteger) edges_e =
+ myShapesOperations->GetShapesOnBoxIDs(box_e, aShape, TopAbs_EDGE, GEOMAlgo_ST_IN);
box_e->GetLastFunction()->SetDescription("");
if (edges_e.IsNull() || edges_e->Length() == 0) {
SetErrorCode("External edges not found");
- return false;
+ return NULL;
}
int nbEdgesInFillet = 0;
std::list<int> theEdges;
while (Ex.More()) {
gp_Pnt aPt = BRep_Tool::Pnt(TopoDS::Vertex(Ex.Current()));
if (Abs(aPt.Z() - (theR1+theW1)) <= Precision::Confusion()) {
- nbEdgesInFillet ++;
- theEdges.push_back(edgeID);
+ nbEdgesInFillet ++;
+ theEdges.push_back(edgeID);
}
Ex.Next();
}
return NULL;
}
if (aFillet.IsNull()) {
- SetErrorCode("Fillet can not be computed on the given shape with the given parameters");
+ //SetErrorCode("Fillet can not be computed on the given shape with the given parameters");
+ SetErrorCode(myLocalOperations->GetErrorCode());
return NULL;
}
aFillet->GetLastFunction()->SetDescription("");
-
+
TopoDS_Shape aFilletShape = aFillet->GetValue();
aFunction->SetValue(aFilletShape);
// END of fillet
+ // BEGIN: Limit tolerances (debug)
+ Handle(GEOM_Object) aCorr1 = myHealingOperations->LimitTolerance(aShape, 1e-07);
+ TopoDS_Shape aCorr1Shape = aCorr1->GetValue();
+ aShape->GetLastFunction()->SetValue(aCorr1Shape);
+ aCorr1->GetLastFunction()->SetDescription("");
+ // END: Limit tolerances (debug)
+
if (theHexMesh) {
if (!MakePipeTShapePartition(aShape, theR1, theW1, theL1, theR2, theW2, theL2, 0, 0, theRF, false))
return NULL;
/*
* Get the groups: BEGIN
*/
- if (!MakeGroups(aShape, TSHAPE_FILLET, theR1, theW1, theL1, theR2, theW2, theL2, aSeq, gp_Trsf()))
+ try {
+ if (!MakeGroups(aShape, TSHAPE_FILLET, theR1, theW1, theL1, theR2, theW2, theL2, aSeq, gp_Trsf()))
+ return NULL;
+ }
+ catch (Standard_Failure) {
+ Handle(Standard_Failure) aFail = Standard_Failure::Caught();
+ SetErrorCode(aFail->GetMessageString());
return NULL;
+ }
TCollection_AsciiString aListRes, anEntry;
// Iterate over the sequence aSeq
aListRes.Trunc(aListRes.Length() - 2);
//Make a Python command
- GEOM::TPythonDump(aFunction) << "[" << aShape << ", " << aListRes.ToCString()
- << "] = geompy.MakePipeTShapeFillet(" << theR1 << ", " << theW1 << ", " << theL1 << ", " << theR2
- << ", " << theW2 << ", " << theL2 << ", " << theRF << ", " << theHexMesh << ")";
+ GEOM::TPythonDump(aFunction)
+ << "[" << aShape << ", " << aListRes.ToCString()
+ << "] = geompy.MakePipeTShapeFillet(" << theR1 << ", " << theW1 << ", " << theL1 << ", " << theR2
+ << ", " << theW2 << ", " << theL2 << ", " << theRF << ", " << theHexMesh << ")";
}
/*
* Get the groups: END
*/
else {
//Make a Python command
- GEOM::TPythonDump(aFunction) << "[" << aShape << "] = geompy.MakePipeTShapeFillet(" << theR1 << ", " << theW1
- << ", " << theL1 << ", " << theR2 << ", " << theW2 << ", " << theL2 << ", " << theRF << ", "
- << theHexMesh << ")";
+ GEOM::TPythonDump(aFunction)
+ << "[" << aShape << "] = geompy.MakePipeTShapeFillet(" << theR1 << ", " << theW1
+ << ", " << theL1 << ", " << theR2 << ", " << theW2 << ", " << theL2 << ", " << theRF << ", "
+ << theHexMesh << ")";
}
-
SetErrorCode(OK);
return aSeq;
-
}
//=============================================================================
//=============================================================================
Handle(TColStd_HSequenceOfTransient)
GEOMImpl_IAdvancedOperations::MakePipeTShapeFilletWithPosition(double theR1, double theW1, double theL1,
- double theR2, double theW2, double theL2,
- double theRF, bool theHexMesh,
- Handle(GEOM_Object) theP1,
- Handle(GEOM_Object) theP2,
- Handle(GEOM_Object) theP3)
+ double theR2, double theW2, double theL2,
+ double theRF, bool theHexMesh,
+ Handle(GEOM_Object) theP1,
+ Handle(GEOM_Object) theP2,
+ Handle(GEOM_Object) theP3)
{
SetErrorCode(KO);
//Add a new object
//Compute the resulting value
try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
OCC_CATCH_SIGNALS;
#endif
if (!GetSolver()->ComputeFunction(aFunction)) {
box_e->GetLastFunction()->SetDescription("");
box_e = myTransformOperations->TranslateDXDYDZ(box_e, -(theR2+theW2), -(theR2+theW2), 0);
box_e->GetLastFunction()->SetDescription("");
-
- Handle(TColStd_HSequenceOfInteger) edges_e = myShapesOperations->GetShapesOnBoxIDs(box_e, aShape, TopAbs_EDGE, GEOMAlgo_ST_IN);
+
+ Handle(TColStd_HSequenceOfInteger) edges_e =
+ myShapesOperations->GetShapesOnBoxIDs(box_e, aShape, TopAbs_EDGE, GEOMAlgo_ST_IN);
box_e->GetLastFunction()->SetDescription("");
if (edges_e.IsNull() || edges_e->Length() == 0) {
SetErrorCode("External edges not found");
- return false;
+ return NULL;
}
int nbEdgesInFillet = 0;
std::list<int> theEdges;
while (Ex.More()) {
gp_Pnt aPt = BRep_Tool::Pnt(TopoDS::Vertex(Ex.Current()));
if (Abs(aPt.Z() - (theR1+theW1)) <= Precision::Confusion()) {
- nbEdgesInFillet ++;
- theEdges.push_back(edgeID);
+ nbEdgesInFillet ++;
+ theEdges.push_back(edgeID);
}
Ex.Next();
}
return NULL;
}
aFillet->GetLastFunction()->SetDescription("");
-
+
TopoDS_Shape aFilletShape = aFillet->GetValue();
aFunction->SetValue(aFilletShape);
// END of fillet
+ // BEGIN: Limit tolerances (debug)
+ Handle(GEOM_Object) aCorr1 = myHealingOperations->LimitTolerance(aShape, 1e-07);
+ TopoDS_Shape aCorr1Shape = aCorr1->GetValue();
+ aShape->GetLastFunction()->SetValue(aCorr1Shape);
+ aCorr1->GetLastFunction()->SetDescription("");
+ // END: Limit tolerances (debug)
+
if (theHexMesh) {
if (!MakePipeTShapePartition(aShape, theR1, theW1, theL1, theR2, theW2, theL2, 0, 0, theRF, false))
return NULL;
/*
* Get the groups: BEGIN
*/
- if (!MakeGroups(aShape, TSHAPE_FILLET, theR1, theW1, theL1, theR2, theW2, theL2, aSeq, aTrsf))
+ try {
+ if (!MakeGroups(aShape, TSHAPE_FILLET, theR1, theW1, theL1, theR2, theW2, theL2, aSeq, aTrsf))
+ return NULL;
+ }
+ catch (Standard_Failure) {
+ Handle(Standard_Failure) aFail = Standard_Failure::Caught();
+ SetErrorCode(aFail->GetMessageString());
return NULL;
+ }
TCollection_AsciiString aListRes, anEntry;
// Iterate over the sequence aSeq
aListRes.Trunc(aListRes.Length() - 2);
//Make a Python command
- GEOM::TPythonDump(aFunction) << "[" << aShape << ", " << aListRes.ToCString()
- << "] = geompy.MakePipeTShapeFillet(" << theR1 << ", " << theW1 << ", " << theL1 << ", " << theR2
- << ", " << theW2 << ", " << theL2 << ", " << theRF << ", " << theHexMesh << ", " << theP1 << ", "
- << theP2 << ", " << theP3 << ")";
+ GEOM::TPythonDump(aFunction)
+ << "[" << aShape << ", " << aListRes.ToCString()
+ << "] = geompy.MakePipeTShapeFillet(" << theR1 << ", " << theW1 << ", " << theL1 << ", " << theR2
+ << ", " << theW2 << ", " << theL2 << ", " << theRF << ", " << theHexMesh << ", " << theP1 << ", "
+ << theP2 << ", " << theP3 << ")";
}
/*
* Get the groups: END
*/
else {
//Make a Python command
- GEOM::TPythonDump(aFunction) << "[" << aShape << "] = geompy.MakePipeTShapeFillet(" << theR1 << ", " << theW1
- << ", " << theL1 << ", " << theR2 << ", " << theW2 << ", " << theL2 << ", " << theRF << ", "
- << theHexMesh << ", " << theP1 << ", " << theP2 << ", " << theP3 << ")";
+ GEOM::TPythonDump(aFunction)
+ << "[" << aShape << "] = geompy.MakePipeTShapeFillet(" << theR1 << ", " << theW1
+ << ", " << theL1 << ", " << theR2 << ", " << theW2 << ", " << theL2 << ", " << theRF << ", "
+ << theHexMesh << ", " << theP1 << ", " << theP2 << ", " << theP3 << ")";
}
SetErrorCode(OK);
