From: Pascale Noyret Date: Fri, 25 Jan 2008 09:21:56 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: V1_14_OT_1_0~5 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=da6702aa0115a82e3bdeed025077ab8849401096;p=modules%2Feficas.git *** empty log message *** --- diff --git a/Editeur/configuration.py b/Editeur/configuration.py index 47e931b9..9368a6fb 100644 --- a/Editeur/configuration.py +++ b/Editeur/configuration.py @@ -41,6 +41,7 @@ class CONFIGbase: # class CONFIGStyle(CONFIGbase): self.appli = appli + self.salome = appli.salome self.dRepMat={} if self.appli: self.parent=appli.top @@ -218,7 +219,8 @@ class CONFIG(CONFIGbase): self.texte = "EFICAS a besoin de certains renseignements pour se configurer\n"+\ "Veuillez remplir TOUS les champs ci-dessous et appuyer sur 'Valider'\n"+\ "Si vous annulez, EFICAS ne se lancera pas !!" - if appli.salome == 0 : + self.salome=appli.salome + if self.salome == 0 : self.fichier="editeur.ini" else : self.fichier="editeur_salome.ini" @@ -259,6 +261,7 @@ class CONFIG(CONFIGbase): class CONFIGStyle(CONFIGbase): def __init__(self,appli,rep_ini): + self.salome=appli.salome self.texte = "Pour prendre en compte les modifications \n"+\ " RELANCER EFICAS" self.fichier="style.py" diff --git a/InterfaceQT/compofact.py b/InterfaceQT/compofact.py index bf440576..7739e04a 100644 --- a/InterfaceQT/compofact.py +++ b/InterfaceQT/compofact.py @@ -36,7 +36,7 @@ class Node(browser.JDCNode): child=node_selected.doPasteMCF(objetACopier) return child - def doPaste_MCF(self,objetACopier): + def doPasteMCF(self,objetACopier): child = self.parent.append_child(objetACopier, pos=self.item, retour='oui') diff --git a/InterfaceQT/compomclist.py b/InterfaceQT/compomclist.py index e07d05ae..65bdad03 100644 --- a/InterfaceQT/compomclist.py +++ b/InterfaceQT/compomclist.py @@ -30,11 +30,11 @@ class Node(browser.JDCNode): def doPaste(self,node_selected): objet_a_copier = self.item.get_copie_objet() - child=node_selected.doPaste_MCF(objet_a_copier) + child=node_selected.doPasteMCF(objet_a_copier) #print "doPaste",child return child - def doPaste_MCF(self,objet_a_copier): + def doPasteMCF(self,objet_a_copier): child=None # le noeud courant est une MCList if self.item.isMCList() : diff --git a/InterfaceQT/compooper.py b/InterfaceQT/compooper.py index 725e7f19..c638e950 100644 --- a/InterfaceQT/compooper.py +++ b/InterfaceQT/compooper.py @@ -25,7 +25,7 @@ class Node(browser.JDCNode, typeNode.PopUpMenuNode): l'objet passé en argument : node_selected """ objet_a_copier = self.item.get_copie_objet() - child=node_selected.doPaste_Commande(objet_a_copier) + child=node_selected.doPasteCommande(objet_a_copier) return child def doPasteCommande(self,objet_a_copier): @@ -39,7 +39,7 @@ class Node(browser.JDCNode, typeNode.PopUpMenuNode): #if child is None:return 0 return child - def doPaste_MCF(self,objet_a_copier): + def doPasteMCF(self,objet_a_copier): """ Réalise la copie de l'objet passé en argument (objet_a_copier) Il s'agit forcément d'un mot clé facteur diff --git a/InterfaceQT/composimp.py b/InterfaceQT/composimp.py index 18b12d34..257507d4 100644 --- a/InterfaceQT/composimp.py +++ b/InterfaceQT/composimp.py @@ -90,7 +90,7 @@ class Node(browser.JDCNode): #--------------------------------------------------------- # PN ajout pour lancement de Salome #--------------------------------------------------------- - if hasattr( self.editor, 'salome' ): + if self.editor.salome != 0 : ## import panelsSalome ## ## self.item.select_noeud_maille=0 diff --git a/InterfaceQT/editor.py b/InterfaceQT/editor.py index 211d2dbd..c1fb7ac4 100644 --- a/InterfaceQT/editor.py +++ b/InterfaceQT/editor.py @@ -30,15 +30,14 @@ class JDCEditor(QSplitter): Editeur de jdc """ - def __init__(self, fn=None, jdc=None ,parent=None, editor=None, units=None): - #------------------------------------------------------------------------- + def __init__(self,fn = None, jdc = None ,parent=None, editor = None, units = None): + #--------------------------------------------------------------------------------# QSplitter.__init__(self, parent,'') VERSION_CODE = session.d_env.cata - self.parent = parent - self.salome = self.parent.salome - + self.parent = parent + self.salome = self.parent.salome self.top = None self.code = prefs.code self.version_code = VERSION_CODE @@ -56,6 +55,7 @@ class JDCEditor(QSplitter): if hasattr(qApp.mainWidget(),"statusBar"): self.sb = qApp.mainWidget().statusBar() + self.parent = parent self.vm = parent #viewManager self.fileName = fn self.fileInfo = None @@ -311,8 +311,6 @@ class JDCEditor(QSplitter): def viewJdcSource(self): #-----------------------# format = self.format_fichier - print dir(self) - print self.getFileName() #f=open(self.JDCDisplay_courant.fichier,'r') #texteSource=f.read() #f.close() @@ -445,7 +443,7 @@ class JDCEditor(QSplitter): def cut(self): #-------------------# """ - Stocke dans Eficas.noeud_a_editer le noeud à  couper + Stocke dans Eficas.noeud_a_editer le noeud à couper """ if not self.node_selected.item.iscopiable(): QMessageBox.information( self, "Copie impossible", diff --git a/InterfaceQT/monParamPanel.py b/InterfaceQT/monParamPanel.py index 70d70c48..d1917d57 100644 --- a/InterfaceQT/monParamPanel.py +++ b/InterfaceQT/monParamPanel.py @@ -127,6 +127,9 @@ class MonParamPanel(DParam,QTPanelTBW2,QTPanel): listeNomsEtapes = self.node.item.get_l_noms_etapes() self.BuildLBRegles(listeRegles,listeNomsEtapes) + def BNextPressed(self) : + QTPanelTBW2.BNextPressed(self) + def BOkPressed(self): QTPanel.BOkPressed(self) diff --git a/InterfaceQT/qtEficas.py b/InterfaceQT/qtEficas.py index 5dd2b9a2..8c67fff4 100644 --- a/InterfaceQT/qtEficas.py +++ b/InterfaceQT/qtEficas.py @@ -22,18 +22,18 @@ class Appli(Eficas): """ Class implementing the main user interface. """ - def __init__(self,code="ASTER"): + def __init__(self,code="ASTER",salome=0): """ Constructor @param loc locale to be used by the UI (string) @param splash reference to the splashscreen (UI.SplashScreen.SplashScreen) """ - - self.salome=0 self.ihm="QT" self.code=code + self.salome=salome Eficas.__init__(self) + if code == "ASTER" : from Aster import prefs sys.path.append(INSTALLDIR+"/Aster") diff --git a/InterfaceQT/viewManager.py b/InterfaceQT/viewManager.py index fa45504b..6341d177 100644 --- a/InterfaceQT/viewManager.py +++ b/InterfaceQT/viewManager.py @@ -2330,7 +2330,7 @@ class MyTabview(Tabview): def __init__(self, parent, ui): Tabview.__init__(self, parent, ui) self.appli=parent - self.salome=self.appli.salome + self.salome=self.appli.salome self.initRecent() def initRecent(self) :