X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=InterfaceQT4%2Feditor.py;h=2be9a3c0c6a82a03057b9c81e557f6211de3d96b;hb=91f8ed1cbaed8a138bc89ad058c99625b2aee6c5;hp=2104e6baed5d7b48dce87619a633c252b94fd987;hpb=b2ab08fd7617bc1919416221b7032890e7fcc78a;p=tools%2Feficas.git diff --git a/InterfaceQT4/editor.py b/InterfaceQT4/editor.py index 2104e6ba..2be9a3c0 100644 --- a/InterfaceQT4/editor.py +++ b/InterfaceQT4/editor.py @@ -36,7 +36,7 @@ from Editeur import comploader from Editeur import Objecttreeitem from desBaseWidget import Ui_baseWidget from monViewTexte import ViewText -from monWidgetParam import MonWidgetParam +from monWidgetCreeParam import MonWidgetCreeParam import browser import readercata @@ -76,13 +76,13 @@ class JDCEditor(Ui_baseWidget,QtGui.QWidget): # ces attributs sont mis a jour par definitCode appelee par newEditor self.code = self.appliEficas.CONFIGURATION.code + self.mode_nouv_commande=self.appliEficas.CONFIGURATION.mode_nouv_commande + self.affiche=self.appliEficas.CONFIGURATION.affiche if self.code in ['MAP','CARMELCND'] : self.afficheCommandesPliees=False - self.affiche_alpha=1 if self.code in ['MAP',] : self.widgetTree.close() self.widgetTree=None self.appliEficas.resize(1440,self.appliEficas.height()) - self.affiche_alpha=0 else : self.appliEficas.resize(2000,self.appliEficas.height()) @@ -95,6 +95,7 @@ class JDCEditor(Ui_baseWidget,QtGui.QWidget): self.readercata=self.appliEficas.readercata if self.readercata.fic_cata == None : return #Sortie Salome self.titre=self.readercata.titre + self.Ordre_Des_Commandes=self.readercata.Ordre_Des_Commandes self.format = self.appliEficas.format_fichier @@ -147,7 +148,6 @@ class JDCEditor(Ui_baseWidget,QtGui.QWidget): #------- construction du jdc -------------- jdc_item = None - self.mode_nouv_commande=self.readercata.mode_nouv_commande self.nouveau=0 if self.fichier is not None: # fichier jdc fourni @@ -176,6 +176,7 @@ class JDCEditor(Ui_baseWidget,QtGui.QWidget): if self.jdc: self.jdc.appli = self self.jdc.lang = self.appli.langue + self.jdc.aReafficher=False txt_exception = None if not jdc: self.jdc.analyse() @@ -196,7 +197,6 @@ class JDCEditor(Ui_baseWidget,QtGui.QWidget): if jdc_item: self.tree = browser.JDCTree( jdc_item, self ) - self.jdc.aReafficher=False self.appliEficas.construitMenu() #--------------------------------# @@ -395,7 +395,7 @@ class JDCEditor(Ui_baseWidget,QtGui.QWidget): #-----------------------# def gestionParam(self): #-----------------------# - w = MonWidgetParam( self) + w = MonWidgetCreeParam( self) w.show() #-----------------------# @@ -1200,7 +1200,8 @@ class JDCEditor(Ui_baseWidget,QtGui.QWidget): #---------------------------# def _newTELEMAC(self): #---------------------------# - texte="INITIALIZATION();INITIAL_STATE();BOUNDARY_CONDITIONS();NUMERICAL_PARAMETERS();PHYSICAL_PARAMETERS()" + texte="INITIALIZATION();BOUNDARY_CONDITIONS();GENERAL_PARAMETERS();PHYSICAL_PARAMETERS();NUMERICAL_PARAMETERS();" + #texte="" return texte #---------------------------#