From: Paul RASCLE <paul.rascle@edf.fr>
Date: Wed, 28 Jun 2017 15:39:52 +0000 (+0200)
Subject: from Pascale: debug embedded Eficas windows
X-Git-Tag: Salome_8_3_Hydro_2_0rc1~12
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=c9a23702b736139d2860e61e22a75e4dc6c3ac16;p=modules%2Fhydrosolver.git

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 641c791..e9c576c 100644
--- 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 32e46b3..ed5e4e4 100644
--- 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 06e8753..0e0458a 100755
--- 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 156ab62..834af00 100644
--- 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