from Pascale: debug embedded Eficas windows

diff --git a/src/salome_hydro/coupling1d2d/eficas/appli.py b/src/salome_hydro/coupling1d2d/eficas/appli.py
index 641c791b6177a74217f94f37a2ea3188b5f480e7..e9c576cdfd5037ef3f57be81f910d494ad6fd19a 100644 (file)
--- a/src/salome_hydro/coupling1d2d/eficas/appli.py
+++ b/src/salome_hydro/coupling1d2d/eficas/appli.py
@@ -68,9 +68,9 @@ class EficasForCoupling1D2DAppli(eficasSalome.MyEficas):
         self.ed = HydroStudyEditor()
         self.codedir = os.path.dirname(__file__)
         sys.path[:0] = [self.codedir]
-        eficasSalome.MyEficas.__init__(self, sgPyQt.getDesktop(), "coupling1d2d",
-                                       fichier, version = version)
         area = QScrollArea(SalomePyQt.SalomePyQt().getDesktop());
+        eficasSalome.MyEficas.__init__(self, area, "coupling1d2d",
+                                       fichier, version = version)
         gridLayout = QGridLayout(area)
         gridLayout.addWidget(self)
         area.setWidgetResizable(1)

diff --git a/src/salome_hydro/mascaret/eficas/appli.py b/src/salome_hydro/mascaret/eficas/appli.py
index 32e46b3450093b48669cf5d5ea6ec7511be614c4..ed5e4e4b613da93b260363c3a96745910cd84ded 100644 (file)
--- a/src/salome_hydro/mascaret/eficas/appli.py
+++ b/src/salome_hydro/mascaret/eficas/appli.py
@@ -51,10 +51,10 @@ class EficasForMascaretAppli(eficasSalome.MyEficas):
         self.ed = HydroStudyEditor()
         self.codedir = os.path.dirname(__file__)
         sys.path[:0] = [self.codedir]
-        eficasSalome.MyEficas.__init__(self, sgPyQt.getDesktop(),
+        area = QScrollArea(SalomePyQt.SalomePyQt().getDesktop());
+        eficasSalome.MyEficas.__init__(self, area,
                                        "mascaret",
                                        fichier, version = version)
-        area = QScrollArea(SalomePyQt.SalomePyQt().getDesktop());
         gridLayout = QGridLayout(area)
         gridLayout.addWidget(self)
         area.setWidgetResizable(1)

diff --git a/src/salome_hydro/pytel/eficas/appli.py b/src/salome_hydro/pytel/eficas/appli.py
index 06e875396dd10de799466e858abd354770a4d2b6..0e0458aed48a43c8721eef2818ebf3d9015822bb 100755 (executable)
--- a/src/salome_hydro/pytel/eficas/appli.py
+++ b/src/salome_hydro/pytel/eficas/appli.py
@@ -47,9 +47,9 @@ class EficasForPytelAppli(eficasSalome.MyEficas):
         self.ed = HydroStudyEditor()
         self.codedir = os.path.dirname(__file__)
         sys.path[:0] = [self.codedir]
-        eficasSalome.MyEficas.__init__(self, sgPyQt.getDesktop(), "pytel",
-                                       fichier, version = version)
         area = QScrollArea(SalomePyQt.SalomePyQt().getDesktop());
+        eficasSalome.MyEficas.__init__(self, area, "pytel",
+                                       fichier, version = version)
         gridLayout = QGridLayout(area)
         gridLayout.addWidget(self)
         area.setWidgetResizable(1)

diff --git a/src/salome_hydro/telemac2d/eficas/appli.py b/src/salome_hydro/telemac2d/eficas/appli.py
index 156ab6239b5bfc1cc9beef0c52aea82a864487d0..834af0065b4d93ecd9785fa2be6c7f3ae68b738c 100644 (file)
--- a/src/salome_hydro/telemac2d/eficas/appli.py
+++ b/src/salome_hydro/telemac2d/eficas/appli.py
@@ -51,15 +51,22 @@ class EficasForTelemac2DAppli(eficasSalome.MyEficas):
         self.ed = HydroStudyEditor()
         self.codedir = os.path.dirname(__file__)
         sys.path[:0] = [self.codedir]
-        eficasSalome.MyEficas.__init__(self, sgPyQt.getDesktop(),
+        #eficasSalome.MyEficas.__init__(self, sgPyQt.getDesktop(),
+        #                               code = code, fichier = fichier,
+        #                               version = version, lang = lang)
+        #area = QScrollArea(SalomePyQt.SalomePyQt().getDesktop());
+        area = QScrollArea(SalomePyQt.SalomePyQt().getDesktop());
+        eficasSalome.MyEficas.__init__(self, area,
                                        code = code, fichier = fichier,
                                        version = version, lang = lang)
-        area = QScrollArea(SalomePyQt.SalomePyQt().getDesktop());
         gridLayout = QGridLayout(area)
         gridLayout.addWidget(self)
         area.setWidgetResizable(1)
         sgPyQt.createView("Eficas Telemac2D", self)
 
+
+
+
     def addJdcInSalome(self, jdcPath):
         """
         Add the newly created file in Salome study