taille fenetre eficas pour coupling mascaret telemac2d

diff --git a/src/salome_hydro/boundary_conditions/eficas/appli.py b/src/salome_hydro/boundary_conditions/eficas/appli.py
index b3783292ff7b4f001f3f17afa653e4c9bdf94aa6..9d28a01830701d1f32c952ece650a9d1dfab5cc8 100644 (file)
--- a/src/salome_hydro/boundary_conditions/eficas/appli.py
+++ b/src/salome_hydro/boundary_conditions/eficas/appli.py
@@ -18,6 +18,7 @@
 import os
 import sys
 
+
 import SalomePyQt
 sgPyQt = SalomePyQt.SalomePyQt()
 

diff --git a/src/salome_hydro/boundary_conditions/eficas/boundary_conditions_cata.py b/src/salome_hydro/boundary_conditions/eficas/boundary_conditions_cata.py
index 9bb47965f3944da8b64f3a6971f203781390b0ca..46f73dc5e1d26c83ee0e7772610e344d1a9a9f2f 100644 (file)
--- a/src/salome_hydro/boundary_conditions/eficas/boundary_conditions_cata.py
+++ b/src/salome_hydro/boundary_conditions/eficas/boundary_conditions_cata.py
@@ -57,3 +57,4 @@ BOUNDARY_CONDITION = PROC(
                   ang = u"Boundary condition type for the V component of the water velocity",
                  ),
 )
+TEXTE_NEW_JDC="BOUNDARY_CONDITION()"

diff --git a/src/salome_hydro/coupling1d2d/eficas/appli.py b/src/salome_hydro/coupling1d2d/eficas/appli.py
index 9d379dd4dffff36edd88aebdbf6c4637b4fc036b..641c791b6177a74217f94f37a2ea3188b5f480e7 100644 (file)
--- a/src/salome_hydro/coupling1d2d/eficas/appli.py
+++ b/src/salome_hydro/coupling1d2d/eficas/appli.py
@@ -21,8 +21,7 @@ import os
 import sys
 import re
 
-from PyQt5.QtGui import *
-from PyQt5.QtWidgets import *
+from PyQt5.QtWidgets import QMessageBox , QScrollArea, QGridLayout
 
 import salome
 import SalomePyQt
@@ -71,6 +70,11 @@ class EficasForCoupling1D2DAppli(eficasSalome.MyEficas):
         sys.path[:0] = [self.codedir]
         eficasSalome.MyEficas.__init__(self, sgPyQt.getDesktop(), "coupling1d2d",
                                        fichier, version = version)
+        area = QScrollArea(SalomePyQt.SalomePyQt().getDesktop());
+        gridLayout = QGridLayout(area)
+        gridLayout.addWidget(self)
+        area.setWidgetResizable(1)
+
         sgPyQt.createView("Eficas Coupling 1D/2D", self)
 
     def selectGroupFromSalome(self, kwType = None, editor=None):

diff --git a/src/salome_hydro/coupling1d2d/eficas/coupling1d2d_cata.py b/src/salome_hydro/coupling1d2d/eficas/coupling1d2d_cata.py
index b5b1ffeceab9f5dd291eb30943a9361b3bc23e9f..1fad998fa64f0811084da52eb077915f6bcef346 100644 (file)
--- a/src/salome_hydro/coupling1d2d/eficas/coupling1d2d_cata.py
+++ b/src/salome_hydro/coupling1d2d/eficas/coupling1d2d_cata.py
@@ -44,3 +44,4 @@ COUPLAGE1D2D = PROC(
                              fr = u"Fichier de données pour la génération du graphique",
                              ang = u"Data file for the graphics generation"),
 )
+TEXTE_NEW_JDC="COUPLAGE1D2D()"

diff --git a/src/salome_hydro/coupling1d2d/eficas/prefs_coupling1d2d.py b/src/salome_hydro/coupling1d2d/eficas/prefs_coupling1d2d.py
index 82d946ec74224054b0afd5d3cce218bd78e26d87..ed30a092a82a099b619a30b97de798587c41670c 100644 (file)
--- a/src/salome_hydro/coupling1d2d/eficas/prefs_coupling1d2d.py
+++ b/src/salome_hydro/coupling1d2d/eficas/prefs_coupling1d2d.py
@@ -20,3 +20,9 @@ import sys
 
 repIni = os.path.dirname(__file__)
 INSTALLDIR = os.getenv("EFICAS_ROOT")
+closeAutreCommande=True
+closeFrameRechercheCommande=True
+closeArbre=True
+closeCopier=True
+suiteTelemac=True
+

diff --git a/src/salome_hydro/mascaret/eficas/appli.py b/src/salome_hydro/mascaret/eficas/appli.py
index 1fd132631e967cdb471d12abb3f70fee173ec967..32e46b3450093b48669cf5d5ea6ec7511be614c4 100644 (file)
--- a/src/salome_hydro/mascaret/eficas/appli.py
+++ b/src/salome_hydro/mascaret/eficas/appli.py
@@ -21,7 +21,7 @@ import os
 import sys
 import re
 
-from PyQt5.QtWidgets import QMessageBox 
+from PyQt5.QtWidgets import QMessageBox , QScrollArea, QGridLayout
 
 
 import salome
@@ -54,6 +54,10 @@ class EficasForMascaretAppli(eficasSalome.MyEficas):
         eficasSalome.MyEficas.__init__(self, sgPyQt.getDesktop(),
                                        "mascaret",
                                        fichier, version = version)
+        area = QScrollArea(SalomePyQt.SalomePyQt().getDesktop());
+        gridLayout = QGridLayout(area)
+        gridLayout.addWidget(self)
+        area.setWidgetResizable(1)
         sgPyQt.createView("Eficas Mascaret", self)
 
     def addJdcInSalome(self, jdcPath):

diff --git a/src/salome_hydro/mascaret/eficas/mascaret_V7_cata.py b/src/salome_hydro/mascaret/eficas/mascaret_V7_cata.py
index 3ff4e0ab259208510ad6e8895496c48aaad29cb5..c3a97a3404231acbdc26cde099a858859ff8e40a 100644 (file)
--- a/src/salome_hydro/mascaret/eficas/mascaret_V7_cata.py
+++ b/src/salome_hydro/mascaret/eficas/mascaret_V7_cata.py
@@ -104,3 +104,4 @@ MASCARET = PROC(
                    ang = u'Mascaret variable (ex : "Modele.Lois.Debit(1,1-2,0)")'),
                            ),
 )
+TEXTE_NEW_JDC="MASCARET()"

diff --git a/src/salome_hydro/mascaret/eficas/prefs_mascaret.py b/src/salome_hydro/mascaret/eficas/prefs_mascaret.py
index 82d946ec74224054b0afd5d3cce218bd78e26d87..e53112cf17960af03e9469a2ac4b30c9bf901bfa 100644 (file)
--- a/src/salome_hydro/mascaret/eficas/prefs_mascaret.py
+++ b/src/salome_hydro/mascaret/eficas/prefs_mascaret.py
@@ -20,3 +20,8 @@ import sys
 
 repIni = os.path.dirname(__file__)
 INSTALLDIR = os.getenv("EFICAS_ROOT")
+closeAutreCommande=True
+closeFrameRechercheCommande=True
+closeArbre=True
+closeCopier=True
+suiteTelemac=True

diff --git a/src/salome_hydro/telemac2d/eficas/appli.py b/src/salome_hydro/telemac2d/eficas/appli.py
index 369995aed783a3d531d86cb3008df8fd1254700b..a7a69a58997cdefe43a0516e4254eaaf76e96390 100644 (file)
--- a/src/salome_hydro/telemac2d/eficas/appli.py
+++ b/src/salome_hydro/telemac2d/eficas/appli.py
@@ -21,7 +21,7 @@ import os
 import sys
 import re
 
-from PyQt5.QtWidgets import QMessageBox
+from PyQt5.QtWidgets import QMessageBox , QScrollArea, QGridLayout
 
 
 import salome
@@ -54,6 +54,10 @@ class EficasForTelemac2DAppli(eficasSalome.MyEficas):
         eficasSalome.MyEficas.__init__(self, sgPyQt.getDesktop(),
                                        "telemac2d",
                                        fichier, version = version)
+        area = QScrollArea(SalomePyQt.SalomePyQt().getDesktop());
+        gridLayout = QGridLayout(area)
+        gridLayout.addWidget(self)
+        area.setWidgetResizable(1)
         sgPyQt.createView("Eficas Telemac2D", self)
 
     def addJdcInSalome(self, jdcPath):

diff --git a/src/salome_hydro/telemac2d/eficas/prefs_telemac2d.py b/src/salome_hydro/telemac2d/eficas/prefs_telemac2d.py
index 82d946ec74224054b0afd5d3cce218bd78e26d87..e53112cf17960af03e9469a2ac4b30c9bf901bfa 100644 (file)
--- a/src/salome_hydro/telemac2d/eficas/prefs_telemac2d.py
+++ b/src/salome_hydro/telemac2d/eficas/prefs_telemac2d.py
@@ -20,3 +20,8 @@ import sys
 
 repIni = os.path.dirname(__file__)
 INSTALLDIR = os.getenv("EFICAS_ROOT")
+closeAutreCommande=True
+closeFrameRechercheCommande=True
+closeArbre=True
+closeCopier=True
+suiteTelemac=True

diff --git a/src/salome_hydro/telemac2d/eficas/telemac2d_V6_cata.py b/src/salome_hydro/telemac2d/eficas/telemac2d_V6_cata.py
index 6d372554d070c7ffa3d37e4635c8c1a6bd4f83ac..3f220179684824bf5829dba506d70476177643c8 100644 (file)
--- a/src/salome_hydro/telemac2d/eficas/telemac2d_V6_cata.py
+++ b/src/salome_hydro/telemac2d/eficas/telemac2d_V6_cata.py
@@ -105,3 +105,5 @@ TELEMAC2D = PROC(
                            ),
                           ),
 )
+
+TEXTE_NEW_JDC="TELEMAC2D()"