From 4bc8c22ca67517068e4e1370f0f221aefa5eb49c Mon Sep 17 00:00:00 2001
From: Jean-Philippe ARGAUD <jean-philippe.argaud@edf.fr>
Date: Fri, 19 Jul 2019 14:59:34 +0200
Subject: [PATCH] Minor corrections

---
 bin/gui_Adao_QT_Eficas.py            | 5 ++---
 src/daComposant/daCore/Interfaces.py | 5 ++---
 src/daSalome/adaoBuilder.py          | 8 ++++++++
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/bin/gui_Adao_QT_Eficas.py b/bin/gui_Adao_QT_Eficas.py
index f527069..38d7ec7 100755
--- a/bin/gui_Adao_QT_Eficas.py
+++ b/bin/gui_Adao_QT_Eficas.py
@@ -25,6 +25,5 @@
    Launching the standalone EFICAS/ADAO interface
 """
 
-import adao
-from daCore.Interfaces import EficasGUI
-EficasGUI().gui()
+from adao import adaoBuilder
+adaoBuilder.Gui()
diff --git a/src/daComposant/daCore/Interfaces.py b/src/daComposant/daCore/Interfaces.py
index dc4b45d..5a47dcf 100644
--- a/src/daComposant/daCore/Interfaces.py
+++ b/src/daComposant/daCore/Interfaces.py
@@ -1007,7 +1007,7 @@ class EficasGUI(object):
         if not __path_ok:
             print("\nWarning:\n"+\
                 "  It seems you have some troubles with your installation. It may\n"+\
-                "  exists other errors than are not explained as above, like some\n"+\
+                "  exists other errors that are not explained as above, like some\n"+\
                 "  incomplete or obsolete Python 3 and module installation.\n"+\
                 "  \n"+\
                 "  Please correct the above error(s) before launching the\n"+\
@@ -1015,8 +1015,7 @@ class EficasGUI(object):
                   )
             sys.exit(2)
         else:
-            print("Launching the standalone EFICAS/ADAO interface...")
-        logging.debug("All the ADAO/EFICAS/QT5 paths have been found")
+            logging.debug("All the ADAO/EFICAS/QT5 paths have been found")
         sys.path.insert(0,__EFICAS_ROOT)
         sys.path.insert(0,os.path.join(adao.adao_py_dir,"daEficas"))
         if __addpath is not None and os.path.exists(os.path.abspath(__addpath)):
diff --git a/src/daSalome/adaoBuilder.py b/src/daSalome/adaoBuilder.py
index b3e42f6..45c2c8f 100644
--- a/src/daSalome/adaoBuilder.py
+++ b/src/daSalome/adaoBuilder.py
@@ -58,6 +58,14 @@ class New(_Aidsm):
     def __init__(self, name = ""):
         _Aidsm.__init__(self, name)
 
+class Gui(object):
+    """
+    Generic ADAO GUI builder
+    """
+    def __init__(self):
+        from daCore.Interfaces import EficasGUI
+        EficasGUI().gui()
+
 # ==============================================================================
 if __name__ == "__main__":
     print('\n AUTODIAGNOSTIC \n')
-- 
2.39.2