To implement issue 0016172: EDF 452 SMESH : Define in the preferences if we want...

diff --git a/resources/SalomeApp.xml b/resources/SalomeApp.xml
index ff008e6d8175fe3c90760aeaf80fc181871bffcc..8f4b7b0e87ef42fb7030be24295d70e10a09302b 100644 (file)
--- a/resources/SalomeApp.xml
+++ b/resources/SalomeApp.xml
@@ -39,6 +39,7 @@
     <parameter name="auto_update"                  value="true" />
     <parameter name="display_mode"                 value="1"    />
     <parameter name="auto_groups"                  value="false"/>
+    <parameter name="show_result_notification"     value="2"/>
   </section>
   <section name="resources">
     <!-- Module resources -->

diff --git a/src/SMESHGUI/SMESHGUI.cxx b/src/SMESHGUI/SMESHGUI.cxx
index 16c564fb8ea88c4ed8734809e8f2dae22bf01b84..9c5dab2b614e64766a441e920ca9761e5ffa91e1 100644 (file)
--- a/src/SMESHGUI/SMESHGUI.cxx
+++ b/src/SMESHGUI/SMESHGUI.cxx
@@ -3311,6 +3311,20 @@ void SMESHGUI::createPreferences()
   addPreference( tr( "PREF_AUTO_GROUPS" ), exportgroup, LightApp_Preferences::Bool, "SMESH", "auto_groups" );
   addPreference( tr( "PREF_RENUMBER" ), exportgroup, LightApp_Preferences::Bool, "SMESH", "renumbering" );
 
+  int computeGroup = addPreference( tr( "PREF_GROUP_COMPUTE" ), genTab );
+  setPreferenceProperty( computeGroup, "columns", 2 );
+  int notifyMode = addPreference( tr( "PREF_NOTIFY_MODE" ), computeGroup, LightApp_Preferences::Selector, "SMESH", "show_result_notification" );
+  modes.clear();
+  modes.append( "Never" );
+  modes.append( "Errors only" );
+  modes.append( "Always" );
+  indices.clear();
+  indices.append( 0 );
+  indices.append( 1 );
+  indices.append( 2 );
+  setPreferenceProperty( notifyMode, "strings", modes );
+  setPreferenceProperty( notifyMode, "indexes", indices );
+
   int meshTab = addPreference( tr( "PREF_TAB_MESH" ) );
   int nodeGroup = addPreference( tr( "PREF_GROUP_NODES" ), meshTab );
   setPreferenceProperty( nodeGroup, "columns", 2 );

diff --git a/src/SMESHGUI/SMESHGUI_ComputeDlg.cxx b/src/SMESHGUI/SMESHGUI_ComputeDlg.cxx
index 5390249344d7ee1978074223ace279cec18401ed..d62255d86b2654e27e89985e432570aa5f90893a 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_ComputeDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_ComputeDlg.cxx
@@ -1157,7 +1157,23 @@ void SMESHGUI_ComputeOp::startOperation()
       currentCellChanged(); // to update buttons
     }
   }
-  myDlg->show();
+  SUIT_ResourceMgr* resMgr = SMESH::GetResourceMgr( SMESHGUI::GetSMESHGUI() );
+  int aNotifyMode = resMgr->integerValue( "SMESH", "show_result_notification" );
+
+  switch( aNotifyMode ) {
+  case 0: // show the mesh computation result dialog NEVER
+    commit();
+    break;
+  case 1: // show the mesh computation result dialog if there are some errors
+    if ( memoryLack || !noCompError || !noHypoError )
+      myDlg->show();
+    else
+      commit();
+    break;
+  default: // show the result dialog after each mesh computation
+    myDlg->show();
+  }
+
 }
 
 //================================================================================

diff --git a/src/SMESHGUI/SMESH_msg_en.ts b/src/SMESHGUI/SMESH_msg_en.ts
index 6c8904091c64580d635eeed7b8dca3a05e79ff04..bef24fd989bce3e26a94f8f6b0d3d9641b92200d 100644 (file)
--- a/src/SMESHGUI/SMESH_msg_en.ts
+++ b/src/SMESHGUI/SMESH_msg_en.ts
@@ -2816,6 +2816,10 @@ Please, create VTK viewer and try again</translation>
             <source>PREF_FILL</source>
             <translation>Fill</translation>
         </message>
+        <message>
+            <source>PREF_NOTIFY_MODE</source>
+            <translation>Show a computation result notification</translation>
+        </message>
         <message>
             <source>PREF_GROUP_ELEMENTS</source>
             <translation>Elements</translation>
@@ -2824,6 +2828,10 @@ Please, create VTK viewer and try again</translation>
             <source>PREF_GROUP_EXPORT</source>
             <translation>Mesh export</translation>
         </message>
+        <message>
+            <source>PREF_GROUP_COMPUTE</source>
+            <translation>Mesh computation</translation>
+        </message>
         <message>
             <source>PREF_GROUP_NODES</source>
             <translation>Nodes</translation>