mirror of
https://git.salome-platform.org/gitpub/modules/geom.git
synced 2025-01-01 04:10:34 +05:00
Mantis issue 0020998: EDF 1572 GEOM: Some limitations to the PipeTShape.
This commit is contained in:
jfa
parent
623c7e262e
commit
3059f9d552
@ -16,10 +16,8 @@
|
||||
//
|
||||
// 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"
|
||||
@ -31,6 +29,7 @@
|
||||
#include "GEOMImpl_IBlocksOperations.hxx"
|
||||
#include "GEOMImpl_I3DPrimOperations.hxx"
|
||||
#include "GEOMImpl_ILocalOperations.hxx"
|
||||
#include "GEOMImpl_IHealingOperations.hxx"
|
||||
|
||||
#include "GEOMImpl_Gen.hxx"
|
||||
|
||||
@ -56,6 +55,7 @@
|
||||
#include <gp_Ax3.hxx>
|
||||
#include <BRepBuilderAPI_Transform.hxx>
|
||||
#include <BRep_Tool.hxx>
|
||||
#include <BRepTools.hxx>
|
||||
#include <cmath>
|
||||
|
||||
#include <TFunction_DriverTable.hxx>
|
||||
@ -276,7 +276,8 @@ bool GEOMImpl_IAdvancedOperations::MakeGroups(Handle(GEOM_Object) theShape, int
|
||||
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
|
||||
@ -287,7 +288,8 @@ bool GEOMImpl_IAdvancedOperations::MakeGroups(Handle(GEOM_Object) theShape, int
|
||||
}
|
||||
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;
|
||||
|
||||
@ -353,7 +355,8 @@ bool GEOMImpl_IAdvancedOperations::MakeGroups(Handle(GEOM_Object) theShape, int
|
||||
|
||||
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");
|
||||
@ -366,7 +369,8 @@ bool GEOMImpl_IAdvancedOperations::MakeGroups(Handle(GEOM_Object) theShape, int
|
||||
}
|
||||
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");
|
||||
@ -379,7 +383,8 @@ bool GEOMImpl_IAdvancedOperations::MakeGroups(Handle(GEOM_Object) theShape, int
|
||||
}
|
||||
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");
|
||||
@ -532,7 +537,6 @@ bool GEOMImpl_IAdvancedOperations::MakeGroups(Handle(GEOM_Object) theShape, int
|
||||
(y <= theR1 + Precision::Confusion()) ||
|
||||
(y == -(theR1 + Precision::Confusion()))));
|
||||
|
||||
|
||||
if (!isMain) {
|
||||
mainPipeFound = false;
|
||||
}
|
||||
@ -620,7 +624,8 @@ bool GEOMImpl_IAdvancedOperations::MakePipeTShapePartition(Handle(GEOM_Object) t
|
||||
|
||||
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);
|
||||
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) {
|
||||
@ -636,7 +641,8 @@ bool GEOMImpl_IAdvancedOperations::MakePipeTShapePartition(Handle(GEOM_Object) t
|
||||
// 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);
|
||||
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) {
|
||||
@ -670,7 +676,8 @@ bool GEOMImpl_IAdvancedOperations::MakePipeTShapePartition(Handle(GEOM_Object) t
|
||||
// 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);
|
||||
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) {
|
||||
@ -685,7 +692,8 @@ bool GEOMImpl_IAdvancedOperations::MakePipeTShapePartition(Handle(GEOM_Object) t
|
||||
// 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);
|
||||
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) {
|
||||
@ -765,14 +773,17 @@ bool GEOMImpl_IAdvancedOperations::MakePipeTShapePartition(Handle(GEOM_Object) t
|
||||
double ZX=0, ZY=0;
|
||||
std::vector<int> LX;
|
||||
std::vector<int> LY;
|
||||
Handle(GEOM_Object) box_e = my3DPrimOperations->MakeBoxDXDYDZ(theVertCylinderRadius, theVertCylinderRadius, theHoriCylinderRadius);
|
||||
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 = 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);
|
||||
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);
|
||||
|
||||
@ -942,14 +953,15 @@ bool GEOMImpl_IAdvancedOperations::MakePipeTShapePartition(Handle(GEOM_Object) t
|
||||
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("");
|
||||
//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 = 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;
|
||||
@ -972,7 +984,21 @@ bool GEOMImpl_IAdvancedOperations::MakePipeTShapePartition(Handle(GEOM_Object) t
|
||||
theShapes.push_back(aPlnOZ);
|
||||
theShapes.push_back(aPlnOXZ);
|
||||
|
||||
// tmp
|
||||
/*
|
||||
BRepTools::Write(theShape->GetValue(),
|
||||
"/dn25/salome/jfa/DATA/Salome/BUGS/M_0020998_Some_limitations_to_the_PipeTShape/theShape.brep");
|
||||
BRepTools::Write(aPlnOZ->GetValue(),
|
||||
"/dn25/salome/jfa/DATA/Salome/BUGS/M_0020998_Some_limitations_to_the_PipeTShape/aPlnOZ.brep");
|
||||
BRepTools::Write(aPlnOXZ->GetValue(),
|
||||
"/dn25/salome/jfa/DATA/Salome/BUGS/M_0020998_Some_limitations_to_the_PipeTShape/aPlnOXZ.brep");
|
||||
BRepTools::Write(face_t->GetValue(),
|
||||
"/dn25/salome/jfa/DATA/Salome/BUGS/M_0020998_Some_limitations_to_the_PipeTShape/face_t.brep");
|
||||
BRepTools::Write(face_t2->GetValue(),
|
||||
"/dn25/salome/jfa/DATA/Salome/BUGS/M_0020998_Some_limitations_to_the_PipeTShape/face_t2.brep");
|
||||
*/
|
||||
|
||||
// Partition
|
||||
Handle(TColStd_HSequenceOfTransient) partitionShapes = new TColStd_HSequenceOfTransient;
|
||||
Handle(TColStd_HSequenceOfTransient) theTools = new TColStd_HSequenceOfTransient;
|
||||
Handle(TColStd_HSequenceOfTransient) theKeepInside = new TColStd_HSequenceOfTransient;
|
||||
@ -986,7 +1012,9 @@ bool GEOMImpl_IAdvancedOperations::MakePipeTShapePartition(Handle(GEOM_Object) t
|
||||
if (!isNormal)
|
||||
theTools->Append(face_t2);
|
||||
|
||||
Handle(GEOM_Object) Te3 = myBooleanOperations->MakePartition(partitionShapes, theTools, theKeepInside, theRemoveInside, TopAbs_SOLID, false, theMaterials, 0, false);
|
||||
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);
|
||||
@ -1180,7 +1208,8 @@ GEOMImpl_IAdvancedOperations::MakePipeTShape(double theR1, double theW1, double
|
||||
aListRes.Trunc(aListRes.Length() - 2);
|
||||
|
||||
//Make a Python command
|
||||
GEOM::TPythonDump(aFunction) << "[" << aShape << ", " << aListRes.ToCString() << "] = geompy.MakePipeTShape("
|
||||
GEOM::TPythonDump(aFunction)
|
||||
<< "[" << aShape << ", " << aListRes.ToCString() << "] = geompy.MakePipeTShape("
|
||||
<< theR1 << ", " << theW1 << ", " << theL1 << ", " << theR2 << ", " << theW2 << ", " << theL2 << ", "
|
||||
<< theHexMesh << ")";
|
||||
}
|
||||
@ -1189,7 +1218,8 @@ GEOMImpl_IAdvancedOperations::MakePipeTShape(double theR1, double theW1, double
|
||||
*/
|
||||
else {
|
||||
//Make a Python command
|
||||
GEOM::TPythonDump(aFunction) << "[" << aShape << "] = geompy.MakePipeTShape(" << theR1 << ", " << theW1 << ", "
|
||||
GEOM::TPythonDump(aFunction)
|
||||
<< "[" << aShape << "] = geompy.MakePipeTShape(" << theR1 << ", " << theW1 << ", "
|
||||
<< theL1 << ", " << theR2 << ", " << theW2 << ", " << theL2 << ", " << theHexMesh << ")";
|
||||
}
|
||||
|
||||
@ -1318,7 +1348,8 @@ GEOMImpl_IAdvancedOperations::MakePipeTShapeWithPosition(double theR1, double th
|
||||
aListRes.Trunc(aListRes.Length() - 2);
|
||||
|
||||
//Make a Python command
|
||||
GEOM::TPythonDump(aFunction) << "[" << aShape << ", " << aListRes.ToCString() << "] = geompy.MakePipeTShape("
|
||||
GEOM::TPythonDump(aFunction)
|
||||
<< "[" << aShape << ", " << aListRes.ToCString() << "] = geompy.MakePipeTShape("
|
||||
<< theR1 << ", " << theW1 << ", " << theL1 << ", " << theR2 << ", " << theW2 << ", " << theL2 << ", "
|
||||
<< theHexMesh << ", " << theP1 << ", " << theP2 << ", " << theP3 << ")";
|
||||
}
|
||||
@ -1328,7 +1359,8 @@ GEOMImpl_IAdvancedOperations::MakePipeTShapeWithPosition(double theR1, double th
|
||||
|
||||
else {
|
||||
//Make a Python command
|
||||
GEOM::TPythonDump(aFunction) << "[" << aShape << "] = geompy.MakePipeTShape(" << theR1 << ", " << theW1 << ", "
|
||||
GEOM::TPythonDump(aFunction)
|
||||
<< "[" << aShape << "] = geompy.MakePipeTShape(" << theR1 << ", " << theW1 << ", "
|
||||
<< theL1 << ", " << theR2 << ", " << theW2 << ", " << theL2 << ", " << theHexMesh << ", " << theP1
|
||||
<< ", " << theP2 << ", " << theP3 << ")";
|
||||
}
|
||||
@ -1416,7 +1448,8 @@ GEOMImpl_IAdvancedOperations::MakePipeTShapeChamfer(double theR1, double theW1,
|
||||
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) {
|
||||
@ -1484,13 +1517,14 @@ GEOMImpl_IAdvancedOperations::MakePipeTShapeChamfer(double theR1, double theW1,
|
||||
//
|
||||
// Get the groups: BEGIN
|
||||
//
|
||||
// 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
|
||||
// GEOM::TPythonDump(aFunction)
|
||||
// << "[" << aShape << "] = geompy.MakePipeTShapeChamfer(" << theR1 << ", " << theW1
|
||||
// << ", " << theL1 << ", " << theR2 << ", " << theW2 << ", " << theL2 << ", " << theH << ", " << theW
|
||||
// << ", " << theHexMesh << ")";
|
||||
// }
|
||||
// else {
|
||||
//}
|
||||
//else {
|
||||
try {
|
||||
if (!MakeGroups(aShape, TSHAPE_CHAMFER, theR1, theW1, theL1, theR2, theW2, theL2, aSeq, gp_Trsf()))
|
||||
return NULL;
|
||||
@ -1518,17 +1552,19 @@ GEOMImpl_IAdvancedOperations::MakePipeTShapeChamfer(double theR1, double theW1,
|
||||
aListRes.Trunc(aListRes.Length() - 2);
|
||||
|
||||
//Make a Python command
|
||||
GEOM::TPythonDump(aFunction) << "[" << aShape << ", " << aListRes.ToCString()
|
||||
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
|
||||
GEOM::TPythonDump(aFunction)
|
||||
<< "[" << aShape << "] = geompy.MakePipeTShapeChamfer(" << theR1 << ", " << theW1
|
||||
<< ", " << theL1 << ", " << theR2 << ", " << theW2 << ", " << theL2 << ", " << theH << ", " << theW
|
||||
<< ", " << theHexMesh << ")";
|
||||
}
|
||||
@ -1628,7 +1664,8 @@ GEOMImpl_IAdvancedOperations::MakePipeTShapeChamferWithPosition(double theR1, do
|
||||
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) {
|
||||
@ -1718,7 +1755,8 @@ GEOMImpl_IAdvancedOperations::MakePipeTShapeChamferWithPosition(double theR1, do
|
||||
aListRes.Trunc(aListRes.Length() - 2);
|
||||
|
||||
//Make a Python command
|
||||
GEOM::TPythonDump(aFunction) << "[" << aShape << ", " << aListRes.ToCString()
|
||||
GEOM::TPythonDump(aFunction)
|
||||
<< "[" << aShape << ", " << aListRes.ToCString()
|
||||
<< "] = geompy.MakePipeTShapeChamfer(" << theR1 << ", " << theW1 << ", " << theL1 << ", " << theR2
|
||||
<< ", " << theW2 << ", " << theL2 << ", " << theH << ", " << theW << ", " << theHexMesh << ", "
|
||||
<< theP1 << ", " << theP2 << ", " << theP3 << ")";
|
||||
@ -1728,7 +1766,8 @@ GEOMImpl_IAdvancedOperations::MakePipeTShapeChamferWithPosition(double theR1, do
|
||||
*/
|
||||
else {
|
||||
//Make a Python command
|
||||
GEOM::TPythonDump(aFunction) << "[" << aShape << "] = geompy.MakePipeTShapeChamfer(" << theR1 << ", " << theW1
|
||||
GEOM::TPythonDump(aFunction)
|
||||
<< "[" << aShape << "] = geompy.MakePipeTShapeChamfer(" << theR1 << ", " << theW1
|
||||
<< ", " << theL1 << ", " << theR2 << ", " << theW2 << ", " << theL2 << ", " << theH << ", " << theW
|
||||
<< ", " << theHexMesh << ", " << theP1 << ", " << theP2 << ", " << theP3 << ")";
|
||||
}
|
||||
@ -1813,7 +1852,8 @@ GEOMImpl_IAdvancedOperations::MakePipeTShapeFillet(double theR1, double theW1, d
|
||||
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) {
|
||||
@ -1848,7 +1888,7 @@ GEOMImpl_IAdvancedOperations::MakePipeTShapeFillet(double theR1, double theW1, d
|
||||
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;
|
||||
}
|
||||
@ -1858,6 +1898,15 @@ GEOMImpl_IAdvancedOperations::MakePipeTShapeFillet(double theR1, double theW1, d
|
||||
aFunction->SetValue(aFilletShape);
|
||||
// END of fillet
|
||||
|
||||
// BEGIN: Limit tolerances (debug)
|
||||
GEOMImpl_IHealingOperations myHealingOperations (GetEngine(), GetDocID());
|
||||
|
||||
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;
|
||||
@ -1898,7 +1947,8 @@ GEOMImpl_IAdvancedOperations::MakePipeTShapeFillet(double theR1, double theW1, d
|
||||
aListRes.Trunc(aListRes.Length() - 2);
|
||||
|
||||
//Make a Python command
|
||||
GEOM::TPythonDump(aFunction) << "[" << aShape << ", " << aListRes.ToCString()
|
||||
GEOM::TPythonDump(aFunction)
|
||||
<< "[" << aShape << ", " << aListRes.ToCString()
|
||||
<< "] = geompy.MakePipeTShapeFillet(" << theR1 << ", " << theW1 << ", " << theL1 << ", " << theR2
|
||||
<< ", " << theW2 << ", " << theL2 << ", " << theRF << ", " << theHexMesh << ")";
|
||||
}
|
||||
@ -1907,16 +1957,15 @@ GEOMImpl_IAdvancedOperations::MakePipeTShapeFillet(double theR1, double theW1, d
|
||||
*/
|
||||
else {
|
||||
//Make a Python command
|
||||
GEOM::TPythonDump(aFunction) << "[" << aShape << "] = geompy.MakePipeTShapeFillet(" << theR1 << ", " << theW1
|
||||
GEOM::TPythonDump(aFunction)
|
||||
<< "[" << aShape << "] = geompy.MakePipeTShapeFillet(" << theR1 << ", " << theW1
|
||||
<< ", " << theL1 << ", " << theR2 << ", " << theW2 << ", " << theL2 << ", " << theRF << ", "
|
||||
<< theHexMesh << ")";
|
||||
}
|
||||
|
||||
|
||||
SetErrorCode(OK);
|
||||
|
||||
return aSeq;
|
||||
|
||||
}
|
||||
|
||||
//=============================================================================
|
||||
@ -2006,7 +2055,8 @@ GEOMImpl_IAdvancedOperations::MakePipeTShapeFilletWithPosition(double theR1, dou
|
||||
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) {
|
||||
@ -2097,7 +2147,8 @@ GEOMImpl_IAdvancedOperations::MakePipeTShapeFilletWithPosition(double theR1, dou
|
||||
aListRes.Trunc(aListRes.Length() - 2);
|
||||
|
||||
//Make a Python command
|
||||
GEOM::TPythonDump(aFunction) << "[" << aShape << ", " << aListRes.ToCString()
|
||||
GEOM::TPythonDump(aFunction)
|
||||
<< "[" << aShape << ", " << aListRes.ToCString()
|
||||
<< "] = geompy.MakePipeTShapeFillet(" << theR1 << ", " << theW1 << ", " << theL1 << ", " << theR2
|
||||
<< ", " << theW2 << ", " << theL2 << ", " << theRF << ", " << theHexMesh << ", " << theP1 << ", "
|
||||
<< theP2 << ", " << theP3 << ")";
|
||||
@ -2107,7 +2158,8 @@ GEOMImpl_IAdvancedOperations::MakePipeTShapeFilletWithPosition(double theR1, dou
|
||||
*/
|
||||
else {
|
||||
//Make a Python command
|
||||
GEOM::TPythonDump(aFunction) << "[" << aShape << "] = geompy.MakePipeTShapeFillet(" << theR1 << ", " << theW1
|
||||
GEOM::TPythonDump(aFunction)
|
||||
<< "[" << aShape << "] = geompy.MakePipeTShapeFillet(" << theR1 << ", " << theW1
|
||||
<< ", " << theL1 << ", " << theR2 << ", " << theW2 << ", " << theL2 << ", " << theRF << ", "
|
||||
<< theHexMesh << ", " << theP1 << ", " << theP2 << ", " << theP3 << ")";
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user