Catch exception from data server raised when there's active study on a server

diff --git a/src/SalomeApp/SalomeApp_Study.cxx b/src/SalomeApp/SalomeApp_Study.cxx
index 070cfef7dfdaf3a0590347fbf8385ce1370e3ab0..8bb0ee1785f29051cf0edeef6a67985afe47884c 100644 (file)
--- a/src/SalomeApp/SalomeApp_Study.cxx
+++ b/src/SalomeApp/SalomeApp_Study.cxx
@@ -41,6 +41,9 @@
 #include <SUIT_ResourceMgr.h>
 #include <SUIT_TreeModel.h>
 #include <SUIT_DataBrowser.h>
+#include <SUIT_MessageBox.h>
+#include <SUIT_Session.h>
+#include <SUIT_Desktop.h>
 
 #include <LightApp_Displayer.h>
 
@@ -458,7 +461,15 @@ bool SalomeApp_Study::createDocument( const QString& theStr )
 
   // initialize myStudyDS, read HDF file
   QString aName = newStudyName();
-  _PTR(Study) study ( SalomeApp_Application::studyMgr()->NewStudy( aName.toUtf8().data() ) );
+
+  _PTR(Study) study;
+  try {
+    study = _PTR(Study)( SalomeApp_Application::studyMgr()->NewStudy( aName.toUtf8().data() ) );
+  }
+  catch(...) {
+    SUIT_MessageBox::critical( SUIT_Session::session()->activeApplication()->desktop(),
+                               tr("ERR_ERROR"), tr("ERR_ACTIVE_STUDY_CREATE") );
+  }
   if ( !study )
     return false;
 
@@ -494,7 +505,14 @@ bool SalomeApp_Study::openDocument( const QString& theFileName )
   MESSAGE( "openDocument" );
 
   // initialize myStudyDS, read HDF file
-  _PTR(Study) study ( SalomeApp_Application::studyMgr()->Open( theFileName.toUtf8().data() ) );
+  _PTR(Study) study;
+  try {
+    study = _PTR(Study) ( SalomeApp_Application::studyMgr()->Open( theFileName.toUtf8().data() ) );
+  }
+  catch(...) {
+    SUIT_MessageBox::critical( SUIT_Session::session()->activeApplication()->desktop(),
+                               tr("ERR_ERROR"), tr("ERR_ACTIVE_STUDY_OPEN") );
+  }
   if ( !study )
     return false;
 

diff --git a/src/SalomeApp/resources/SalomeApp_msg_en.ts b/src/SalomeApp/resources/SalomeApp_msg_en.ts
index 446b0292aed1487bc95989b8a9aaea9ef8f9802f..d663c6ecb9e514d68e164b275ba383b08751f434 100644 (file)
--- a/src/SalomeApp/resources/SalomeApp_msg_en.ts
+++ b/src/SalomeApp/resources/SalomeApp_msg_en.ts
@@ -84,6 +84,16 @@ Python file must include only letters, digits and underscores and start from let
         <source>ERR_NO_VARIABLE</source>
         <translation>Variable with name &quot;%1&quot; doesn&apos;t exist</translation>
     </message>
+    <message>
+        <source>ERR_ACTIVE_STUDY_CREATE</source>
+        <translation>Cannot create study: there is already an active study in this session.
+Launch a new session or close the study.</translation>
+    </message>
+    <message>
+        <source>ERR_ACTIVE_STUDY_OPEN</source>
+        <translation>Cannot open study: there is already an active study in this session.
+Launch a new session or close the study.</translation>
+    </message>
 </context>
 <context>
     <name>SalomeApp_Application</name>

diff --git a/src/SalomeApp/resources/SalomeApp_msg_fr.ts b/src/SalomeApp/resources/SalomeApp_msg_fr.ts
index faf47a5790b3a14a9aab39bf6cf54eb56a56879f..40d7aaa798d425d496a8f7e05952d58f212bd13e 100755 (executable)
--- a/src/SalomeApp/resources/SalomeApp_msg_fr.ts
+++ b/src/SalomeApp/resources/SalomeApp_msg_fr.ts
@@ -84,6 +84,16 @@ Un fichier Python ne doit être composé que de lettres, chiffres et tirets bas
         <source>ERR_NO_VARIABLE</source>
         <translation>La variable &quot;%1&quot; n&apos;existe pas.</translation>
     </message>
+    <message>
+        <source>ERR_ACTIVE_STUDY_CREATE</source>
+        <translation type="unfinished">Cannot create study: there is already an active study in this session.
+Launch a new session or close the study.</translation>
+    </message>
+    <message>
+        <source>ERR_ACTIVE_STUDY_OPEN</source>
+        <translation type="unfinished">Cannot open study: there is already an active study in this session.
+Launch a new session or close the study.</translation>
+    </message>
 </context>
 <context>
     <name>SalomeApp_Application</name>

diff --git a/src/SalomeApp/resources/SalomeApp_msg_ja.ts b/src/SalomeApp/resources/SalomeApp_msg_ja.ts
index 819d6272d4d592e5c07b2c4c733d770acf6ac86f..d55a84b9b07a385d05df4659e8083d1797524738 100644 (file)
--- a/src/SalomeApp/resources/SalomeApp_msg_ja.ts
+++ b/src/SalomeApp/resources/SalomeApp_msg_ja.ts
@@ -83,6 +83,16 @@
       <source>ERR_NO_VARIABLE</source>
       <translation>変数"%1"は存在しません。</translation>
     </message>
+    <message>
+        <source>ERR_ACTIVE_STUDY_CREATE</source>
+        <translation type="unfinished">Cannot create study: there is already an active study in this session.
+Launch a new session or close the study.</translation>
+    </message>
+    <message>
+        <source>ERR_ACTIVE_STUDY_OPEN</source>
+        <translation type="unfinished">Cannot open study: there is already an active study in this session.
+Launch a new session or close the study.</translation>
+    </message>
   </context>
   <context>
     <name>SalomeApp_Application</name>