Implememtation of evaluation for improvement 0019296.

diff --git a/doc/salome/gui/SMESH/images/mesh_evaluation_succeed.png b/doc/salome/gui/SMESH/images/mesh_evaluation_succeed.png
new file mode 100755 (executable)
index 0000000..b9aeb52
Binary files /dev/null and b/doc/salome/gui/SMESH/images/mesh_evaluation_succeed.png differ

diff --git a/doc/salome/gui/SMESH/input/constructing_meshes.doc b/doc/salome/gui/SMESH/input/constructing_meshes.doc
index a0960e2ea0cc49c1e903449c3590c15156bc4585..df932426f1cb749b35cf04172c0695127e909e74 100644 (file)
--- a/doc/salome/gui/SMESH/input/constructing_meshes.doc
+++ b/doc/salome/gui/SMESH/input/constructing_meshes.doc
@@ -145,9 +145,17 @@ existing faces</b>. They are not entirely usable from the GUI, so a
 mesh created using these algorithms should be exported into a python
 script, edited and then imported into the GUi. 
 
+<li>It is possible to make evaluation of size of prospective mesh
+before \b Compute operation. For this, select your mesh in the <b>Object
+Browser</b> and from the \b Mesh menu select \b Evaluate. Result of
+evaluation will be represented by the following information box:
+
+\image html mesh_evaluation_succeed.png
+
+
 Consider trying a sample script for construction of a mesh from our 
 \ref tui_creating_meshes_page "TUI Scripts" section.
 </li>
 </ol>
 
-*/
\ No newline at end of file
+*/

diff --git a/src/SMESHGUI/SMESHGUI_ComputeDlg.cxx b/src/SMESHGUI/SMESHGUI_ComputeDlg.cxx
index 55e9ad332e2adcb5077336cbda252944447f4430..1852b4b613baa350abc9d9dfce610e419768fbca 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_ComputeDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_ComputeDlg.cxx
@@ -2019,7 +2019,8 @@ void SMESHGUI_BaseComputeOp::evaluateMesh()
   if ( memoryLack )
     aMemoryReserve.release();
 
-  myCompDlg->setWindowTitle(tr( evaluateFailed ? "SMESH_WRN_COMPUTE_FAILED" : "SMESH_COMPUTE_SUCCEED"));
+  evaluateFailed =  ( aCompErrors->length() > 0 );
+  myCompDlg->setWindowTitle(tr( evaluateFailed ? "SMESH_WRN_EVALUATE_FAILED" : "SMESH_EVALUATE_SUCCEED"));
 
   // SHOW ERRORS
   

diff --git a/src/SMESHGUI/SMESH_msg_en.ts b/src/SMESHGUI/SMESH_msg_en.ts
index 10a95c873ddabec75336637bc1650dbf0f079794..edde69cc34b197f90b020aeff32223bfc1945644 100644 (file)
--- a/src/SMESHGUI/SMESH_msg_en.ts
+++ b/src/SMESHGUI/SMESH_msg_en.ts
@@ -966,6 +966,10 @@ Please enter correct values and try again</translation>
             <source>SMESH_COMPUTE_SUCCEED</source>
             <translation>Mesh computation succeed</translation>
         </message>
+        <message>
+            <source>SMESH_EVALUATE_SUCCEED</source>
+            <translation>Mesh evaluation succeed</translation>
+        </message>
         <message>
             <source>SMESH_CONTENT</source>
             <translation>Content</translation>
@@ -1863,6 +1867,10 @@ Consider saving your work before application crash</translation>
             <source>SMESH_WRN_COMPUTE_FAILED</source>
             <translation>Mesh computation failed</translation>
         </message>
+        <message>
+            <source>SMESH_WRN_EVALUATE_FAILED</source>
+            <translation>Mesh evaluation failed</translation>
+        </message>
         <message>
             <source>SMESH_WRN_EMPTY_NAME</source>
             <translation>Empty name is not valid</translation>