*** empty log message ***

diff --git a/Editeur/configuration.py b/Editeur/configuration.py
index 47e931b998c2fe9882396f8aecd689158298cf1d..9368a6fb6764a5735a3517b0e36d3fb00fed6630 100644 (file)
--- 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 bf4405769886182682b2e4b268269dfb99fb1d20..7739e04ac877eac94227932e0f3c574c0991904a 100644 (file)
--- 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 e07d05ae9d357289d62944d6a9cfd1605cab4d55..65bdad035e9fde9e4ed0d3bd09183cb1061bf95c 100644 (file)
--- 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 725e7f1926430e49e96ce99303d07ff524248a63..c638e95077aa694ce3bbbd77f9a223a109c64b5f 100644 (file)
--- 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 18b12d3400bb3b08afd4ed975bb83b9aa3e43acc..257507d45bacb7f1bf6aece4bc2822c4741ea56a 100644 (file)
--- 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 211d2dbd02bb441eb09fb444e35103f21318cdaa..c1fb7ac489987ab2f26d2ca19e3cd34bd732639b 100644 (file)
--- 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 70d70c48093a40fc7e04b0ad07f08f1e71229d09..d1917d5755dcb46e1ef31aed8d7ff97c4a1e827e 100644 (file)
--- 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 5dd2b9a2da3aa2ff80140d4ae612f5a5028a6580..8c67fff4f440c792c0e1e0aa6ca7e5719f2f47c1 100644 (file)
--- 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 fa45504bcebf6634cfd7014978c1631ba5608e68..6341d177315741551cff56dd7b03df75586fa904 100644 (file)
--- 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) :