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

diff --git a/idl/SMESH_Gen.idl b/idl/SMESH_Gen.idl
index 76805579b03648717d3d5ee511d2becc86059ab8..4bec6e9d868310c0055bf966a6e8c14597e65c06 100644 (file)
--- 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_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
   {
   };
   struct ComputeError
   {

diff --git a/src/SMESH/SMESH_ComputeError.hxx b/src/SMESH/SMESH_ComputeError.hxx
index 07f45d0850b26bbdbd17ea5230ff7eb3aa76d541..3cdc1b21ff7aea4f3738c26e0aa15d766b54cd9b 100644 (file)
--- 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_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_MEMORY_PB     );
   _case2char(COMPERR_ALGO_FAILED   );
   _case2char(COMPERR_BAD_SHAPE     );

-  _case2char(COMPERR_BAD_FACE      );

   default:;
   }
   return "";
   default:;
   }
   return "";

diff --git a/src/SMESHGUI/SMESHGUI_ComputeDlg.cxx b/src/SMESHGUI/SMESHGUI_ComputeDlg.cxx
index f5a901582db8ae988e1543a5bb803fb513e8c86c..004b1849678906a6a55cd8a31091ab14b5e10588 100644 (file)
--- 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_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");
     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 e64478cbe0d0dc8ba4834f0fd8224e7cfe76a2be..6a864d0f5ab95cb2d9aae43cb306bb9f8d6a1d2e 100644 (file)
--- a/src/SMESHGUI/SMESH_msg_en.ts
+++ b/src/SMESHGUI/SMESH_msg_en.ts
@@ -61,11 +61,6 @@
             <source>COMPERR_BAD_SHAPE</source>
             <translation>Unexpected geometry</translation>
         </message>
             <source>COMPERR_BAD_SHAPE</source>
             <translation>Unexpected geometry</translation>
         </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>
             <source>COMPERR_EXCEPTION</source>
             <translation>Unknown exception</translation>
         <message>
             <source>COMPERR_EXCEPTION</source>
             <translation>Unknown exception</translation>

diff --git a/src/StdMeshers/StdMeshers_RadialQuadrangle_1D2D.cxx b/src/StdMeshers/StdMeshers_RadialQuadrangle_1D2D.cxx
index 5310f36725bc86b3cf24de2d7f53bdd7e7bf7dd8..21570e7b3e9dd16500c1ce4ec1b60f096300d281 100644 (file)
--- 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() )
   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
   
   gp_Pnt P0,P1;
   // points for rotation