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

NPAL18017: EDF GEOM V3.2.9rc1 : Exception raised when getShapeOn... function return empty list.

Browse Source
This commit is contained in:
jfa 2007-11-29 13:19:23 +00:00
parent 891d75f8ae
commit ebad6202b7
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/GEOM/GEOM_IOperations.hxx
View File

@ -29,6 +29,7 @@
#define OK "PAL_NO_ERROR" #define OK "PAL_NO_ERROR"
#define KO "PAL_NOT_DONE_ERROR" #define KO "PAL_NOT_DONE_ERROR"
#define NOT_FOUND_ANY "NOT_FOUND_ANY"
#define ALREADY_PRESENT "PAL_ELEMENT_ALREADY_PRESENT" #define ALREADY_PRESENT "PAL_ELEMENT_ALREADY_PRESENT"
#define NOT_EXISTS "PAL_ELEMENT_DOES_NOT_EXISTS" #define NOT_EXISTS "PAL_ELEMENT_DOES_NOT_EXISTS"
#define INVALID_TYPE "INVALID_TYPE_OF_ELEMENT" #define INVALID_TYPE "INVALID_TYPE_OF_ELEMENT"

17
src/GEOMImpl/GEOMImpl_IShapesOperations.cxx
View File

@ -780,7 +780,8 @@ Handle(TColStd_HSequenceOfTransient) GEOMImpl_IShapesOperations::MakeExplode
} }
if (listShape.IsEmpty()) { if (listShape.IsEmpty()) {
SetErrorCode("The given shape has no sub-shapes of the requested type"); //SetErrorCode("The given shape has no sub-shapes of the requested type");
SetErrorCode(NOT_FOUND_ANY); // NPAL18017
return aSeq; return aSeq;
} }
@ -825,7 +826,7 @@ Handle(TColStd_HSequenceOfTransient) GEOMImpl_IShapesOperations::MakeExplode
//============================================================================= //=============================================================================
/*! /*!
* GetSubShapeAllIDs * SubShapeAllIDs
*/ */
//============================================================================= //=============================================================================
Handle(TColStd_HSequenceOfInteger) GEOMImpl_IShapesOperations::SubShapeAllIDs Handle(TColStd_HSequenceOfInteger) GEOMImpl_IShapesOperations::SubShapeAllIDs
@ -864,7 +865,8 @@ Handle(TColStd_HSequenceOfInteger) GEOMImpl_IShapesOperations::SubShapeAllIDs
} }
if (listShape.IsEmpty()) { if (listShape.IsEmpty()) {
SetErrorCode("The given shape has no sub-shapes of the requested type"); //SetErrorCode("The given shape has no sub-shapes of the requested type");
SetErrorCode(NOT_FOUND_ANY); // NPAL18017
return aSeq; return aSeq;
} }
@ -1480,7 +1482,8 @@ Handle(TColStd_HSequenceOfInteger)
const TopTools_ListOfShape& listSS = aFinder.Shapes(); // the result const TopTools_ListOfShape& listSS = aFinder.Shapes(); // the result
if (listSS.Extent() < 1) { if (listSS.Extent() < 1) {
SetErrorCode("Not a single sub-shape of the requested type found on the given surface"); //SetErrorCode("Not a single sub-shape of the requested type found on the given surface");
SetErrorCode(NOT_FOUND_ANY); // NPAL18017
return aSeqOfIDs; return aSeqOfIDs;
} }
@ -1654,7 +1657,8 @@ Handle(TColStd_HSequenceOfInteger)
const TopTools_ListOfShape& listSS = aFinder.Shapes(); // the result const TopTools_ListOfShape& listSS = aFinder.Shapes(); // the result
if (listSS.Extent() < 1) { if (listSS.Extent() < 1) {
SetErrorCode("Not a single sub-shape of the requested type found on the given surface"); //SetErrorCode("Not a single sub-shape of the requested type found on the given surface");
SetErrorCode(NOT_FOUND_ANY); // NPAL18017
return aSeqOfIDs; return aSeqOfIDs;
} }
@ -2281,7 +2285,8 @@ Handle(TColStd_HSequenceOfInteger)
const TopTools_ListOfShape& listSS = aFinder.Shapes(); // the result const TopTools_ListOfShape& listSS = aFinder.Shapes(); // the result
if (listSS.Extent() < 1) { if (listSS.Extent() < 1) {
SetErrorCode("Not a single sub-shape of the requested type found on the given surface"); //SetErrorCode("Not a single sub-shape of the requested type found on the given surface");
SetErrorCode(NOT_FOUND_ANY); // NPAL18017
return aSeqOfIDs; return aSeqOfIDs;
} }

3
src/GEOM_SWIG/geompy.py
View File

@ -141,7 +141,8 @@ def addToStudyInFather(aFather, aShape, aName):
# Raise an Error if Operation is Failed # Raise an Error if Operation is Failed
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
def RaiseIfFailed (method_name, operation): def RaiseIfFailed (method_name, operation):
if operation.IsDone() == 0: #NPAL18017#if operation.IsDone() == 0:
if operation.IsDone() == 0 and operation.GetErrorCode() != "NOT_FOUND_ANY":
raise RuntimeError, method_name + " : " + operation.GetErrorCode() raise RuntimeError, method_name + " : " + operation.GetErrorCode()
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------