Merge branch 'nouvelEficas' of http://git.forge-pleiade.der.edf.fr/git/eficas into...

[tools/eficas.git] / InterfaceQT4 / editor.py

diff --git a/InterfaceQT4/editor.py b/InterfaceQT4/editor.py
index dc96afa1e2f0a0e4da6979b6620f3c3eee268c6b..92f39b254988530ae1defc47f52a4c471d858aa6 100644 (file)
--- a/InterfaceQT4/editor.py
+++ b/InterfaceQT4/editor.py
@@ -36,6 +36,7 @@ from Editeur        import comploader
 from Editeur        import Objecttreeitem
 from desBaseWidget  import Ui_baseWidget
 from monViewTexte   import ViewText 
+from monWidgetParam import MonWidgetParam 
 import browser
 import readercata
 
@@ -162,7 +163,6 @@ class JDCEditor(Ui_baseWidget,QtGui.QWidget):
         if self.jdc:
             self.jdc.appli = self
             self.jdc.lang    = self.appli.langue
-            print self.jdc.lang
             txt_exception  = None
             if not jdc:
                 self.jdc.analyse()
@@ -180,6 +180,7 @@ class JDCEditor(Ui_baseWidget,QtGui.QWidget):
 
         if jdc_item:
             self.tree = browser.JDCTree( jdc_item,  self )
+        self.jdc.aReafficher=False
         self.appliEficas.construitMenu()
 
     #--------------------------------#
@@ -194,6 +195,7 @@ class JDCEditor(Ui_baseWidget,QtGui.QWidget):
         texte=""
         if self.code == "CARMELCND" : texte=self._newJDCCND()
         if self.code == "ZCRACKS" : texte=self._newZCRACKS()
+        if self.code == "TELEMAC" : texte=self._newTELEMAC()
         #   texte=self.newTexteCND
        
         jdc=self.readercata.cata[0].JdC( procedure =texte,
@@ -323,12 +325,10 @@ class JDCEditor(Ui_baseWidget,QtGui.QWidget):
             QMessageBox.critical( self, tr("Type de fichier non reconnu"),tr("EFICAS ne sait pas ouvrir ce type de fichier"))
             return None
 
-    #----------------------------------------------#
-    def _viewText(self, txt, caption = "FILE_VIEWER"):
-    #----------------------------------------------#
-        w = ViewText( self.QWParent )
-        w.setWindowTitle( caption )
-        w.setText(txt)
+    #-----------------------------------------------------------------------#
+    def _viewText(self, txt, caption = "FILE_VIEWER",largeur=1200,hauteur=600):
+    #--------------------------------------------------------------------#
+        w = ViewText( self.QWParent,self ,caption,txt,largeur,hauteur)
         w.show()
     #
 
@@ -376,6 +376,12 @@ class JDCEditor(Ui_baseWidget,QtGui.QWidget):
         
 
 
+    #-----------------------#
+    def gestionParam(self):
+    #-----------------------#
+        w = MonWidgetParam( self)
+        w.show()
+
     #-----------------------#
     def viewJdcSource(self):
     #-----------------------#
@@ -1158,6 +1164,14 @@ class JDCEditor(Ui_baseWidget,QtGui.QWidget):
         return ligne
 
 
+    #---------------------------#
+    def _newTELEMAC(self):
+    #---------------------------#
+        texte="INITIALIZATION();TIDE_PARAMETERS();INITIAL_STATE();NUMERICAL_PARAMETERS();PHYSICAL_PARAMETERS()"
+        return texte
+
+    #---------------------------#
+
     #---------------------------#
     def _newZCRACKS(self):
     #---------------------------#