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

PAL10403: pb with GetEdgeNearPoint()

Browse Source
This commit is contained in:
jfa 2005-10-27 09:06:28 +00:00
parent 69938ce963
commit 98de978f52
1 changed files with 9 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/GEOMImpl/GEOMImpl_IBlocksOperations.cxx
View File

@ -458,7 +458,7 @@ Handle(GEOM_Object) GEOMImpl_IBlocksOperations::MakeBlockCompound
//============================================================================= //=============================================================================
/*! /*!
* GetEdge * GetPoint
*/ */
//============================================================================= //=============================================================================
Handle(GEOM_Object) GEOMImpl_IBlocksOperations::GetPoint Handle(GEOM_Object) GEOMImpl_IBlocksOperations::GetPoint
@ -478,13 +478,7 @@ Handle(GEOM_Object) GEOMImpl_IBlocksOperations::GetPoint
TopoDS_Shape aBlockOrComp = theShape->GetValue(); TopoDS_Shape aBlockOrComp = theShape->GetValue();
if (aBlockOrComp.IsNull()) { if (aBlockOrComp.IsNull()) {
SetErrorCode("Block or compound is null"); SetErrorCode("Given shape is null");
return NULL;
}
if (aBlockOrComp.ShapeType() != TopAbs_SOLID &&
aBlockOrComp.ShapeType() != TopAbs_COMPOUND &&
aBlockOrComp.ShapeType() != TopAbs_COMPSOLID) {
SetErrorCode("Shape is neither a block, nor a compound of blocks");
return NULL; return NULL;
} }
@ -555,13 +549,7 @@ Handle(GEOM_Object) GEOMImpl_IBlocksOperations::GetEdge
TopoDS_Shape aBlockOrComp = theShape->GetValue(); TopoDS_Shape aBlockOrComp = theShape->GetValue();
if (aBlockOrComp.IsNull()) { if (aBlockOrComp.IsNull()) {
SetErrorCode("Block or compound is null"); SetErrorCode("Given shape is null");
return NULL;
}
if (aBlockOrComp.ShapeType() != TopAbs_SOLID &&
aBlockOrComp.ShapeType() != TopAbs_COMPOUND &&
aBlockOrComp.ShapeType() != TopAbs_COMPSOLID) {
SetErrorCode("Shape is neither a block, nor a compound of blocks");
return NULL; return NULL;
} }
@ -666,13 +654,7 @@ Handle(GEOM_Object) GEOMImpl_IBlocksOperations::GetEdgeNearPoint
TopoDS_Shape aBlockOrComp = theShape->GetValue(); TopoDS_Shape aBlockOrComp = theShape->GetValue();
if (aBlockOrComp.IsNull()) { if (aBlockOrComp.IsNull()) {
SetErrorCode("Block or compound is null"); SetErrorCode("Given shape is null");
return NULL;
}
if (aBlockOrComp.ShapeType() != TopAbs_SOLID &&
aBlockOrComp.ShapeType() != TopAbs_COMPOUND &&
aBlockOrComp.ShapeType() != TopAbs_COMPSOLID) {
SetErrorCode("Shape is neither a block, nor a compound of blocks");
return NULL; return NULL;
} }
@ -702,6 +684,11 @@ Handle(GEOM_Object) GEOMImpl_IBlocksOperations::GetEdgeNearPoint
} }
} }
if (nbEdges == 0) {
SetErrorCode("Given shape contains no edges");
return NULL;
}
mapShape.Clear(); mapShape.Clear();
Standard_Integer ind = 1; Standard_Integer ind = 1;
TopTools_Array1OfShape anEdges (1, nbEdges); TopTools_Array1OfShape anEdges (1, nbEdges);
@ -792,12 +779,6 @@ Handle(GEOM_Object) GEOMImpl_IBlocksOperations::GetFaceByPoints
SetErrorCode("Block or compound is null"); SetErrorCode("Block or compound is null");
return NULL; return NULL;
} }
if (aBlockOrComp.ShapeType() != TopAbs_SOLID &&
aBlockOrComp.ShapeType() != TopAbs_COMPOUND &&
aBlockOrComp.ShapeType() != TopAbs_COMPSOLID) {
SetErrorCode("Shape is neither a block, nor a compound of blocks");
return NULL;
}
TopoDS_Shape anArg1 = thePoint1->GetValue(); TopoDS_Shape anArg1 = thePoint1->GetValue();
TopoDS_Shape anArg2 = thePoint2->GetValue(); TopoDS_Shape anArg2 = thePoint2->GetValue();