From 54105a17be9e94dc22a8edd1768407b2ef6dec79 Mon Sep 17 00:00:00 2001 From: "pascale.noyret" Date: Tue, 7 Feb 2017 11:37:43 +0100 Subject: [PATCH] taille fenetre eficas pour coupling mascaret telemac2d --- src/salome_hydro/boundary_conditions/eficas/appli.py | 1 + .../eficas/boundary_conditions_cata.py | 1 + src/salome_hydro/coupling1d2d/eficas/appli.py | 8 ++++++-- src/salome_hydro/coupling1d2d/eficas/coupling1d2d_cata.py | 1 + .../coupling1d2d/eficas/prefs_coupling1d2d.py | 6 ++++++ src/salome_hydro/mascaret/eficas/appli.py | 6 +++++- src/salome_hydro/mascaret/eficas/mascaret_V7_cata.py | 1 + src/salome_hydro/mascaret/eficas/prefs_mascaret.py | 5 +++++ src/salome_hydro/telemac2d/eficas/appli.py | 6 +++++- src/salome_hydro/telemac2d/eficas/prefs_telemac2d.py | 5 +++++ src/salome_hydro/telemac2d/eficas/telemac2d_V6_cata.py | 2 ++ 11 files changed, 38 insertions(+), 4 deletions(-) diff --git a/src/salome_hydro/boundary_conditions/eficas/appli.py b/src/salome_hydro/boundary_conditions/eficas/appli.py index b378329..9d28a01 100644 --- 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 9bb4796..46f73dc 100644 --- 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 9d379dd..641c791 100644 --- 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 b5b1ffe..1fad998 100644 --- 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 82d946e..ed30a09 100644 --- 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 1fd1326..32e46b3 100644 --- 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 3ff4e0a..c3a97a3 100644 --- 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 82d946e..e53112c 100644 --- 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 369995a..a7a69a5 100644 --- 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 82d946e..e53112c 100644 --- 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 6d37255..3f22017 100644 --- 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()" -- 2.39.2