ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-04-25 10:22:05 +05:00
Code Issues Packages Projects Releases Wiki Activity

Mantis issue 0021682: EDF 2224 : T-shape fails with specific values

Browse Source
This commit is contained in:
jfa 2012-07-04 10:00:00 +00:00
parent 1005fe15f3
commit a33055ee5b
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/GEOMImpl/GEOMImpl_IAdvancedOperations.cxx
View File

@ -56,8 +56,10 @@
#include <gp_Pnt.hxx> #include <gp_Pnt.hxx>
#include <gp_Vec.hxx> #include <gp_Vec.hxx>
#include <gp_Ax3.hxx> #include <gp_Ax3.hxx>
#include <BRepBuilderAPI_Transform.hxx> #include <BRepBuilderAPI_Transform.hxx>
#include <BRep_Tool.hxx> #include <BRep_Tool.hxx>
#include <cmath> #include <cmath>
#include <TFunction_DriverTable.hxx> #include <TFunction_DriverTable.hxx>
@ -757,13 +759,13 @@ bool GEOMImpl_IAdvancedOperations::MakePipeTShapePartition(Handle(GEOM_Object) t
break; break;
} }
Handle(GEOM_Object) edge_e1, edge_e2; Handle(GEOM_Object) edge_e1, edge_e2;
edge_e1 = myBasicOperations->MakeLineTwoPnt(ve1, vi1); edge_e1 = myBasicOperations->MakeLineTwoPnt(ve1, vi1);
if (edge_e1.IsNull()) { if (edge_e1.IsNull()) {
SetErrorCode("Edge 1 could not be built"); SetErrorCode("Edge 1 could not be built");
return false; return false;
} }
edge_e2 = myBasicOperations->MakeLineTwoPnt(ve2, vi2); edge_e2 = myBasicOperations->MakeLineTwoPnt(ve2, vi2);
if (edge_e2.IsNull()) { if (edge_e2.IsNull()) {
SetErrorCode("Edge 2 could not be built"); SetErrorCode("Edge 2 could not be built");
@ -790,7 +792,7 @@ bool GEOMImpl_IAdvancedOperations::MakePipeTShapePartition(Handle(GEOM_Object) t
return false; return false;
} }
face_t->GetLastFunction()->SetDescription(""); face_t->GetLastFunction()->SetDescription("");
theShapes.push_back(theShape); theShapes.push_back(theShape);
theShapes.push_back(vi1); theShapes.push_back(vi1);
theShapes.push_back(vi2); theShapes.push_back(vi2);
@ -996,7 +998,10 @@ bool GEOMImpl_IAdvancedOperations::MakePipeTShapePartition(Handle(GEOM_Object) t
//wire_t2->GetLastFunction()->SetDescription(""); //wire_t2->GetLastFunction()->SetDescription("");
// std::cerr << "Creating face 2" << std::endl; // 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);
// Mantis issue 0021682
face_t2 = my3DPrimOperations->MakePrismVecH(edge_chan_inc, Cote_4, - (theR2 + theW2));
//face_t2 = my3DPrimOperations->MakePrismVecH(edge_chan_inc, Cote_4, - 2.0*theR2);
if (face_t2.IsNull()) { if (face_t2.IsNull()) {
SetErrorCode("Impossible to build face"); SetErrorCode("Impossible to build face");
return false; return false;
@ -1025,9 +1030,10 @@ bool GEOMImpl_IAdvancedOperations::MakePipeTShapePartition(Handle(GEOM_Object) t
Handle(TColStd_HSequenceOfTransient) theKeepInside = new TColStd_HSequenceOfTransient; Handle(TColStd_HSequenceOfTransient) theKeepInside = new TColStd_HSequenceOfTransient;
Handle(TColStd_HSequenceOfTransient) theRemoveInside = new TColStd_HSequenceOfTransient; Handle(TColStd_HSequenceOfTransient) theRemoveInside = new TColStd_HSequenceOfTransient;
Handle(TColStd_HArray1OfInteger) theMaterials; Handle(TColStd_HArray1OfInteger) theMaterials;
partitionShapes->Append(theShape); partitionShapes->Append(theShape);
theTools->Append(aPlnOZ); theTools->Append(aPlnOZ);
if (Abs(aR1Ext - aR2Ext) > Precision::Confusion() ) if (Abs(aR1Ext - aR2Ext) > Precision::Confusion())
theTools->Append(aPlnOXZ); theTools->Append(aPlnOXZ);
theTools->Append(face_t); theTools->Append(face_t);
if (!isNormal) if (!isNormal)
@ -1048,7 +1054,7 @@ bool GEOMImpl_IAdvancedOperations::MakePipeTShapePartition(Handle(GEOM_Object) t
SetErrorCode("TShape is not a compound of block"); SetErrorCode("TShape is not a compound of block");
return false; return false;
} }
// // BEGIN Compound of created shapes - Only for debug purpose // // BEGIN Compound of created shapes - Only for debug purpose
// theShapes.clear(); // theShapes.clear();
// theShapes.push_back(theShape); // theShapes.push_back(theShape);
@ -1058,12 +1064,12 @@ bool GEOMImpl_IAdvancedOperations::MakePipeTShapePartition(Handle(GEOM_Object) t
// theShapes.push_back(face_t); // theShapes.push_back(face_t);
// if (!isNormal) // if (!isNormal)
// theShapes.push_back(face_t2); // theShapes.push_back(face_t2);
// //
// Handle(GEOM_Object) aCompound = myShapesOperations->MakeCompound(theShapes); // Handle(GEOM_Object) aCompound = myShapesOperations->MakeCompound(theShapes);
// TopoDS_Shape aCompoundShape = aCompound->GetValue(); // TopoDS_Shape aCompoundShape = aCompound->GetValue();
// theShape->GetLastFunction()->SetValue(aCompoundShape); // theShape->GetLastFunction()->SetValue(aCompoundShape);
// // END Compound of created shapes - Only for debug purpose // // END Compound of created shapes - Only for debug purpose
TopoDS_Shape aShape = Te3->GetValue(); TopoDS_Shape aShape = Te3->GetValue();
theShape->GetLastFunction()->SetValue(aShape); theShape->GetLastFunction()->SetValue(aShape);
} catch (Standard_Failure) { } catch (Standard_Failure) {