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

0020635: EDF 1223 SMESH: Error message of RadialQuadrangle algorithm not precise

Browse Source
This commit is contained in:
dmv 2010-01-12 08:07:50 +00:00
parent d316b3a623
commit 85d94c3b51
5 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
idl/SMESH_Gen.idl
View File

@ -96,8 +96,7 @@ module SMESH
COMPERR_EXCEPTION , // other exception raised COMPERR_EXCEPTION , // other exception raised
COMPERR_MEMORY_PB , // memory allocation problem COMPERR_MEMORY_PB , // memory allocation problem
COMPERR_ALGO_FAILED , // computation failed COMPERR_ALGO_FAILED , // computation failed
COMPERR_BAD_SHAPE , // bad geometry COMPERR_BAD_SHAPE // bad geometry
COMPERR_BAD_FACE // bad geometry
}; };
struct ComputeError struct ComputeError
{ {

4
src/SMESH/SMESH_ComputeError.hxx
View File

@ -52,8 +52,7 @@ enum SMESH_ComputeErrorName
COMPERR_EXCEPTION = -6, //!< other exception raised COMPERR_EXCEPTION = -6, //!< other exception raised
COMPERR_MEMORY_PB = -7, //!< std::bad_alloc exception COMPERR_MEMORY_PB = -7, //!< std::bad_alloc exception
COMPERR_ALGO_FAILED = -8, //!< algo failed for some reason COMPERR_ALGO_FAILED = -8, //!< algo failed for some reason
COMPERR_BAD_SHAPE = -9, //!< bad geometry COMPERR_BAD_SHAPE = -9 //!< bad geometry
COMPERR_BAD_FACE = -10 //!< incorrect face type (Radial Algorithms)
}; };
// ============================================================= // =============================================================
@ -100,7 +99,6 @@ std::string SMESH_ComputeError::CommonName() const
_case2char(COMPERR_MEMORY_PB ); _case2char(COMPERR_MEMORY_PB );
_case2char(COMPERR_ALGO_FAILED ); _case2char(COMPERR_ALGO_FAILED );
_case2char(COMPERR_BAD_SHAPE ); _case2char(COMPERR_BAD_SHAPE );
_case2char(COMPERR_BAD_FACE );
default:; default:;
} }
return ""; return "";

1
src/SMESHGUI/SMESHGUI_ComputeDlg.cxx
View File

@ -343,7 +343,6 @@ namespace SMESH
CASE2TEXT( COMPERR_EXCEPTION ); CASE2TEXT( COMPERR_EXCEPTION );
CASE2TEXT( COMPERR_MEMORY_PB ); CASE2TEXT( COMPERR_MEMORY_PB );
CASE2TEXT( COMPERR_BAD_SHAPE ); CASE2TEXT( COMPERR_BAD_SHAPE );
CASE2TEXT( COMPERR_BAD_FACE );
case SMESH::COMPERR_ALGO_FAILED: case SMESH::COMPERR_ALGO_FAILED:
if ( strlen(comment) == 0 ) if ( strlen(comment) == 0 )
text = QObject::tr("COMPERR_ALGO_FAILED"); text = QObject::tr("COMPERR_ALGO_FAILED");

5
src/SMESHGUI/SMESH_msg_en.ts
View File

@ -61,11 +61,6 @@
<source>COMPERR_BAD_SHAPE</source> <source>COMPERR_BAD_SHAPE</source>
<translation>Unexpected geometry</translation> <translation>Unexpected geometry</translation>
</message> </message>
<message>
<source>COMPERR_BAD_FACE</source>
<translation>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)</translation>
</message>
<message> <message>
<source>COMPERR_EXCEPTION</source> <source>COMPERR_EXCEPTION</source>
<translation>Unknown exception</translation> <translation>Unknown exception</translation>

2
src/StdMeshers/StdMeshers_RadialQuadrangle_1D2D.cxx
View File

@ -316,7 +316,7 @@ bool StdMeshers_RadialQuadrangle_1D2D::Compute(SMESH_Mesh& aMesh,
TopoDS_Edge CircEdge, LinEdge1, LinEdge2; TopoDS_Edge CircEdge, LinEdge1, LinEdge2;
int nbe = analyseFace( aShape, CircEdge, LinEdge1, LinEdge2 ); int nbe = analyseFace( aShape, CircEdge, LinEdge1, LinEdge2 );
if( nbe>3 || nbe < 1 || CircEdge.IsNull() ) 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; gp_Pnt P0,P1;
// points for rotation // points for rotation