From f8e283841439965274d3e7d09b6ba966704b1fdd Mon Sep 17 00:00:00 2001
From: DUC ANH HOANG <dh77501n@dsp1043837>
Date: Tue, 18 Jul 2023 17:09:41 +0200
Subject: [PATCH] update salome env on extension adding

---
 src/LightApp/LightApp_Application.cxx     | 14 ++++++++++++--
 src/LightApp/resources/LightApp_msg_en.ts |  4 ++++
 src/LightApp/resources/LightApp_msg_fr.ts |  4 ++++
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/LightApp/LightApp_Application.cxx b/src/LightApp/LightApp_Application.cxx
index 314e2dd24..9db7595f5 100644
--- a/src/LightApp/LightApp_Application.cxx
+++ b/src/LightApp/LightApp_Application.cxx
@@ -960,6 +960,7 @@ void LightApp_Application::onExtAdding()
   // but I didn't compare the performance for each case.
   PyLockWrapper lck; // acquire GIL
   PyObjWrapper extensionUnpacker = PyImport_ImportModule((char*)"SalomeOnDemandTK.extension_unpacker");
+  PyObjWrapper runSalomeOnDemand = PyImport_ImportModule((char*)"runSalomeOnDemand");
 
   // Loop via selected extensions files
   foreach(QString path, paths)
@@ -988,12 +989,21 @@ void LightApp_Application::onExtAdding()
     }
 
     // Add an extension to GUI
+    QFileInfo extFileInfo(path);
+    QString extName = extFileInfo.baseName();
     if (moduleAction)
     {
-      QFileInfo extFileInfo(path);
-      QString extName = extFileInfo.baseName();
       moduleAction->insertExtension(extName);
     }
+
+    // Update environment of salome
+    PyObjWrapper update_env = PyObject_CallMethod(
+      runSalomeOnDemand, (char*)"set_selext_env", (char*)"ss", extRootDir, extName.toStdString().c_str());
+    if (!update_env)
+    {
+      SUIT_MessageBox::warning(desktop(), tr("WRN_WARNING"), tr("WRN_FAILED_UPDATE_ENV").arg(extName + "_env.py") );
+      continue;
+    }
   }
 
   // Udate actions only once after all of them were already inserted
diff --git a/src/LightApp/resources/LightApp_msg_en.ts b/src/LightApp/resources/LightApp_msg_en.ts
index 539ebdbf2..bd3e2155a 100644
--- a/src/LightApp/resources/LightApp_msg_en.ts
+++ b/src/LightApp/resources/LightApp_msg_en.ts
@@ -1247,6 +1247,10 @@ Continue?</translation>
         <source>WRN_FAILED_UNPACK_EXTENSION</source>
         <translation>Failed to unpack a salome extension from file: %1.</translation>
     </message>
+    <message>
+        <source>WRN_FAILED_UPDATE_ENV</source>
+        <translation>Failed to update salome environment from file: %1.</translation>
+    </message>
     <message>
         <source>WRN_FAILED_REMOVE_EXTENSION</source>
         <translation>Failed to remove a salome extension: %1.</translation>
diff --git a/src/LightApp/resources/LightApp_msg_fr.ts b/src/LightApp/resources/LightApp_msg_fr.ts
index da3460b3b..712f6359a 100644
--- a/src/LightApp/resources/LightApp_msg_fr.ts
+++ b/src/LightApp/resources/LightApp_msg_fr.ts
@@ -1181,6 +1181,10 @@ Le fichier n&apos;existe pas</translation>
         <source>WRN_FAILED_UNPACK_EXTENSION</source>
         <translation>Échec de la décompression d'une extension salome à partir d'un fichier: %1.</translation>
     </message>
+    <message>
+        <source>WRN_FAILED_UPDATE_ENV</source>
+        <translation>Échec de la mise à jour de l'environnement de salome à partir du fichier: %1.</translation>
+    </message>
     <message>
         <source>WRN_FAILED_REMOVE_EXTENSION</source>
         <translation>Échec de la suppression d'une extension Salomé: %1.</translation>
-- 
2.39.2