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>
|
||||
@ -116,9 +116,9 @@ GEOMImpl_IAdvancedOperations::~GEOMImpl_IAdvancedOperations()
|
||||
*/
|
||||
//=============================================================================
|
||||
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);
|
||||
@ -157,10 +157,10 @@ gp_Trsf GEOMImpl_IAdvancedOperations::GetPositionTrsf(double theL1, double theL2
|
||||
*/
|
||||
//=============================================================================
|
||||
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()));
|
||||
@ -193,7 +193,7 @@ bool GEOMImpl_IAdvancedOperations::CheckCompatiblePosition(double& theL1, double
|
||||
//
|
||||
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 {
|
||||
@ -208,7 +208,7 @@ bool GEOMImpl_IAdvancedOperations::CheckCompatiblePosition(double& theL1, double
|
||||
//
|
||||
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;
|
||||
@ -228,10 +228,10 @@ bool GEOMImpl_IAdvancedOperations::CheckCompatiblePosition(double& theL1, double
|
||||
*/
|
||||
//=============================================================================
|
||||
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);
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -296,8 +298,8 @@ bool GEOMImpl_IAdvancedOperations::MakeGroups(Handle(GEOM_Object) theShape, int
|
||||
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);
|
||||
@ -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");
|
||||
@ -438,144 +443,143 @@ bool GEOMImpl_IAdvancedOperations::MakeGroups(Handle(GEOM_Object) theShape, int
|
||||
|
||||
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;
|
||||
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();
|
||||
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 ((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");
|
||||
}
|
||||
}
|
||||
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");
|
||||
}
|
||||
}
|
||||
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");
|
||||
}
|
||||
}
|
||||
else if (nbEdges == 8) {
|
||||
incidentPipeFound = true;
|
||||
mainPipeFound = true;
|
||||
flangeFound = false;
|
||||
incidentPipeFound = true;
|
||||
mainPipeFound = true;
|
||||
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();
|
||||
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()))));
|
||||
// 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;
|
||||
}
|
||||
|
||||
if (!isMain) {
|
||||
mainPipeFound = false;
|
||||
}
|
||||
// collerette
|
||||
if (z < Precision::Confusion()) {
|
||||
flangeFound = true;
|
||||
if (!flangeFoundAndAdded) {
|
||||
flangeFoundAndAdded = true;
|
||||
addGroup = true;
|
||||
aGroup->SetName("FLANGE");
|
||||
}
|
||||
}
|
||||
|
||||
// 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");
|
||||
}
|
||||
// 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");
|
||||
}
|
||||
}
|
||||
else
|
||||
continue;
|
||||
continue;
|
||||
}
|
||||
// Add group to the list
|
||||
if (addGroup)
|
||||
@ -587,10 +591,10 @@ bool GEOMImpl_IAdvancedOperations::MakeGroups(Handle(GEOM_Object) theShape, int
|
||||
}
|
||||
|
||||
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)
|
||||
double theR1, double theW1, double theL1,
|
||||
double theR2, double theW2, double theL2,
|
||||
double theH, double theW,
|
||||
double theRF, bool isNormal)
|
||||
{
|
||||
SetErrorCode(KO);
|
||||
|
||||
@ -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) {
|
||||
@ -651,10 +657,10 @@ bool GEOMImpl_IAdvancedOperations::MakePipeTShapePartition(Handle(GEOM_Object) t
|
||||
gp_Pnt aP = BRep_Tool::Pnt(aVertex);
|
||||
if (Abs(aP.X()) <= Precision::Confusion()) {
|
||||
if (Abs(aP.Y()) - theR2 <= Precision::Confusion())
|
||||
vi1 = v;
|
||||
vi1 = v;
|
||||
} else if (Abs(aP.Y()) <= Precision::Confusion()) {
|
||||
if (Abs(aP.X()) - theR1 <= Precision::Confusion())
|
||||
vi2 = v;
|
||||
vi2 = v;
|
||||
}
|
||||
}
|
||||
|
||||
@ -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) {
|
||||
@ -699,11 +707,11 @@ bool GEOMImpl_IAdvancedOperations::MakePipeTShapePartition(Handle(GEOM_Object) t
|
||||
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())
|
||||
ve1 = v;
|
||||
} else if (Abs(aP.Y()) <= Precision::Confusion()) {
|
||||
if (Abs(aP.X()) - theR2 > Precision::Confusion())
|
||||
ve2 = v;
|
||||
if (Abs(aP.X()) - theR2 > Precision::Confusion())
|
||||
ve2 = v;
|
||||
}
|
||||
}
|
||||
Handle(GEOM_Object) edge_e1, edge_e2;
|
||||
@ -713,8 +721,8 @@ bool GEOMImpl_IAdvancedOperations::MakePipeTShapePartition(Handle(GEOM_Object) t
|
||||
#endif
|
||||
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();
|
||||
@ -728,8 +736,8 @@ bool GEOMImpl_IAdvancedOperations::MakePipeTShapePartition(Handle(GEOM_Object) t
|
||||
#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();
|
||||
@ -765,22 +773,25 @@ 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);
|
||||
|
||||
if (extremVertices.IsNull() || extremVertices->Length() == 0) {
|
||||
if (theRF == 0)
|
||||
SetErrorCode("Vertices on chamfer not found");
|
||||
SetErrorCode("Vertices on chamfer not found");
|
||||
else
|
||||
SetErrorCode("Vertices on fillet not found");
|
||||
SetErrorCode("Vertices on fillet not found");
|
||||
return false;
|
||||
}
|
||||
|
||||
@ -803,22 +814,22 @@ bool GEOMImpl_IAdvancedOperations::MakePipeTShapePartition(Handle(GEOM_Object) t
|
||||
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;
|
||||
}
|
||||
}
|
||||
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;
|
||||
}
|
||||
}
|
||||
if (Abs(aP.X()) - theR2 > Precision::Confusion()) {
|
||||
LY.push_back(i);
|
||||
if (aP.Z() - ZY > Precision::Confusion()) {
|
||||
ZY = aP.Z();
|
||||
PZY = i;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -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);
|
||||
@ -1011,8 +1039,8 @@ bool GEOMImpl_IAdvancedOperations::MakePipeTShapePartition(Handle(GEOM_Object) t
|
||||
|
||||
// Mirror and glue faces
|
||||
bool GEOMImpl_IAdvancedOperations::MakePipeTShapeMirrorAndGlue(Handle(GEOM_Object) theShape,
|
||||
double theR1, double theW1, double theL1,
|
||||
double theR2, double theW2, double theL2)
|
||||
double theR1, double theW1, double theL1,
|
||||
double theR2, double theW2, double theL2)
|
||||
{
|
||||
SetErrorCode(KO);
|
||||
|
||||
@ -1099,8 +1127,8 @@ bool GEOMImpl_IAdvancedOperations::MakePipeTShapeMirrorAndGlue(Handle(GEOM_Objec
|
||||
//=============================================================================
|
||||
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);
|
||||
@ -1180,17 +1208,19 @@ 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("
|
||||
<< 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);
|
||||
@ -1220,11 +1250,11 @@ GEOMImpl_IAdvancedOperations::MakePipeTShape(double theR1, double theW1, double
|
||||
//=============================================================================
|
||||
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
|
||||
@ -1318,9 +1348,10 @@ GEOMImpl_IAdvancedOperations::MakePipeTShapeWithPosition(double theR1, double th
|
||||
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
|
||||
@ -1328,9 +1359,10 @@ GEOMImpl_IAdvancedOperations::MakePipeTShapeWithPosition(double theR1, double th
|
||||
|
||||
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);
|
||||
@ -1359,9 +1391,9 @@ GEOMImpl_IAdvancedOperations::MakePipeTShapeWithPosition(double theR1, double th
|
||||
//=============================================================================
|
||||
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
|
||||
@ -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) {
|
||||
@ -1434,8 +1467,8 @@ GEOMImpl_IAdvancedOperations::MakePipeTShapeChamfer(double theR1, double theW1,
|
||||
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();
|
||||
}
|
||||
@ -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())) {
|
||||
// //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())) {
|
||||
// //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;
|
||||
@ -1518,19 +1552,21 @@ GEOMImpl_IAdvancedOperations::MakePipeTShapeChamfer(double theR1, double theW1,
|
||||
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);
|
||||
@ -1563,12 +1599,12 @@ GEOMImpl_IAdvancedOperations::MakePipeTShapeChamfer(double theR1, double theW1,
|
||||
//=============================================================================
|
||||
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
|
||||
@ -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) {
|
||||
@ -1644,8 +1681,8 @@ GEOMImpl_IAdvancedOperations::MakePipeTShapeChamferWithPosition(double theR1, do
|
||||
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();
|
||||
}
|
||||
@ -1718,19 +1755,21 @@ GEOMImpl_IAdvancedOperations::MakePipeTShapeChamferWithPosition(double theR1, do
|
||||
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);
|
||||
@ -1758,8 +1797,8 @@ GEOMImpl_IAdvancedOperations::MakePipeTShapeChamferWithPosition(double theR1, do
|
||||
//=============================================================================
|
||||
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
|
||||
@ -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) {
|
||||
@ -1829,8 +1869,8 @@ GEOMImpl_IAdvancedOperations::MakePipeTShapeFillet(double theR1, double theW1, d
|
||||
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();
|
||||
}
|
||||
@ -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,25 +1947,25 @@ GEOMImpl_IAdvancedOperations::MakePipeTShapeFillet(double theR1, double theW1, d
|
||||
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;
|
||||
|
||||
}
|
||||
|
||||
//=============================================================================
|
||||
@ -1943,11 +1992,11 @@ GEOMImpl_IAdvancedOperations::MakePipeTShapeFillet(double theR1, double theW1, d
|
||||
//=============================================================================
|
||||
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
|
||||
@ -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) {
|
||||
@ -2022,8 +2072,8 @@ GEOMImpl_IAdvancedOperations::MakePipeTShapeFilletWithPosition(double theR1, dou
|
||||
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();
|
||||
}
|
||||
@ -2097,19 +2147,21 @@ GEOMImpl_IAdvancedOperations::MakePipeTShapeFilletWithPosition(double theR1, dou
|
||||
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);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user