From 85d94c3b5173b69d875cff635ce0a9b2a0d42493 Mon Sep 17 00:00:00 2001 From: dmv Date: Tue, 12 Jan 2010 08:07:50 +0000 Subject: [PATCH] 0020635: EDF 1223 SMESH: Error message of RadialQuadrangle algorithm not precise --- idl/SMESH_Gen.idl | 3 +-- src/SMESH/SMESH_ComputeError.hxx | 4 +--- src/SMESHGUI/SMESHGUI_ComputeDlg.cxx | 1 - src/SMESHGUI/SMESH_msg_en.ts | 5 ----- src/StdMeshers/StdMeshers_RadialQuadrangle_1D2D.cxx | 2 +- 5 files changed, 3 insertions(+), 12 deletions(-) diff --git a/idl/SMESH_Gen.idl b/idl/SMESH_Gen.idl index 76805579b..4bec6e9d8 100644 --- a/idl/SMESH_Gen.idl +++ b/idl/SMESH_Gen.idl @@ -96,8 +96,7 @@ module SMESH COMPERR_EXCEPTION , // other exception raised COMPERR_MEMORY_PB , // memory allocation problem COMPERR_ALGO_FAILED , // computation failed - COMPERR_BAD_SHAPE , // bad geometry - COMPERR_BAD_FACE // bad geometry + COMPERR_BAD_SHAPE // bad geometry }; struct ComputeError { diff --git a/src/SMESH/SMESH_ComputeError.hxx b/src/SMESH/SMESH_ComputeError.hxx index 07f45d085..3cdc1b21f 100644 --- a/src/SMESH/SMESH_ComputeError.hxx +++ b/src/SMESH/SMESH_ComputeError.hxx @@ -52,8 +52,7 @@ enum SMESH_ComputeErrorName COMPERR_EXCEPTION = -6, //!< other exception raised COMPERR_MEMORY_PB = -7, //!< std::bad_alloc exception COMPERR_ALGO_FAILED = -8, //!< algo failed for some reason - COMPERR_BAD_SHAPE = -9, //!< bad geometry - COMPERR_BAD_FACE = -10 //!< incorrect face type (Radial Algorithms) + COMPERR_BAD_SHAPE = -9 //!< bad geometry }; // ============================================================= @@ -100,7 +99,6 @@ std::string SMESH_ComputeError::CommonName() const _case2char(COMPERR_MEMORY_PB ); _case2char(COMPERR_ALGO_FAILED ); _case2char(COMPERR_BAD_SHAPE ); - _case2char(COMPERR_BAD_FACE ); default:; } return ""; diff --git a/src/SMESHGUI/SMESHGUI_ComputeDlg.cxx b/src/SMESHGUI/SMESHGUI_ComputeDlg.cxx index f5a901582..004b18496 100644 --- a/src/SMESHGUI/SMESHGUI_ComputeDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_ComputeDlg.cxx @@ -343,7 +343,6 @@ namespace SMESH CASE2TEXT( COMPERR_EXCEPTION ); CASE2TEXT( COMPERR_MEMORY_PB ); CASE2TEXT( COMPERR_BAD_SHAPE ); - CASE2TEXT( COMPERR_BAD_FACE ); case SMESH::COMPERR_ALGO_FAILED: if ( strlen(comment) == 0 ) text = QObject::tr("COMPERR_ALGO_FAILED"); diff --git a/src/SMESHGUI/SMESH_msg_en.ts b/src/SMESHGUI/SMESH_msg_en.ts index e64478cbe..6a864d0f5 100644 --- a/src/SMESHGUI/SMESH_msg_en.ts +++ b/src/SMESHGUI/SMESH_msg_en.ts @@ -61,11 +61,6 @@ COMPERR_BAD_SHAPE Unexpected geometry - - COMPERR_BAD_FACE - The face must be a full circle or a part of circle -(i.e. the number of edges is less or equal to 3 and one of them is a circle curve) - COMPERR_EXCEPTION Unknown exception diff --git a/src/StdMeshers/StdMeshers_RadialQuadrangle_1D2D.cxx b/src/StdMeshers/StdMeshers_RadialQuadrangle_1D2D.cxx index 5310f3672..21570e7b3 100644 --- a/src/StdMeshers/StdMeshers_RadialQuadrangle_1D2D.cxx +++ b/src/StdMeshers/StdMeshers_RadialQuadrangle_1D2D.cxx @@ -316,7 +316,7 @@ bool StdMeshers_RadialQuadrangle_1D2D::Compute(SMESH_Mesh& aMesh, TopoDS_Edge CircEdge, LinEdge1, LinEdge2; int nbe = analyseFace( aShape, CircEdge, LinEdge1, LinEdge2 ); if( nbe>3 || nbe < 1 || CircEdge.IsNull() ) - return error(COMPERR_BAD_FACE); + return error("The face must be a full circle or a part of circle (i.e. the number of edges is less or equal to 3 and one of them is a circle curve)"); gp_Pnt P0,P1; // points for rotation -- 2.39.2