qques bugs

diff --git a/InterfaceQT4/eficas_go.py b/InterfaceQT4/eficas_go.py
index ad76ff3d2a55333bcb45a3fb8fb052526cbfddb4..3323ad79f38396148f5738925673457e0dec94c8 100755 (executable)
--- a/InterfaceQT4/eficas_go.py
+++ b/InterfaceQT4/eficas_go.py
@@ -67,7 +67,6 @@ def lance_eficas_ssIhm(code=None,fichier=None,ssCode=None,version=None):
     if code == None : code=options.code
 
     from qtEficas import Appli
-    app = QApplication(sys.argv)
     Eficas=Appli(code=code,ssCode=ssCode,ssIhm=True)
 
     from ssIhm  import QWParentSSIhm
@@ -91,6 +90,7 @@ def lance_eficas_ssIhm_cherche_cr(code=None,fichier=None,ssCode=None,version=Non
     print monEditeur.jdc.cr
 
 def lance_eficas_ssIhm_reecrit(code=None,fichier=None,ssCode=None,version=None,ou=None,cr=False):
+    #print 'lance_eficas_ssIhm_reecrit', fichier
     monEditeur=lance_eficas_ssIhm(code,fichier,ssCode,version)
     if ou == None : 
        fileName=fichier.split(".")[0]+"_reecrit.comm"
@@ -108,7 +108,6 @@ def lance_eficas_ssIhm_reecrit(code=None,fichier=None,ssCode=None,version=None,o
        f.write(str(monEditeur.jdc.report()))
        f.close()
 
-
 def lance_eficas_param(code='Adao',fichier=None,version='V0',macro='ASSIMILATION_STUDY'):
     """
         Lance l'appli EFICAS pour trouver les noms des groupes

diff --git a/InterfaceQT4/monChoixCommande.py b/InterfaceQT4/monChoixCommande.py
index d7c34f062e6b85865d1fbbe3dba4ea8cea2d0d87..cdef4528f196f6fcce778af3c2a3f7852fac18fa 100644 (file)
--- a/InterfaceQT4/monChoixCommande.py
+++ b/InterfaceQT4/monChoixCommande.py
@@ -110,7 +110,7 @@ class MonChoixCommande(Ui_ChoixCommandes,QWidget):
          self.affiche_ordre==1;  
          self.RBOrdre.setChecked(True);  
          self.afficheOrdre()
-      if self.editor.code == "Adao" : self.frameAffichage.close()
+      if self.editor.closeFrameRechercheCommande == True : self.frameAffichage.close()
 
   def afficheRegle(self):
       self.node.tree.AppelleBuildLBRegles()

diff --git a/InterfaceQT4/monRecherche.py b/InterfaceQT4/monRecherche.py
index 0f8433062d97d03a64bb6835052ce5d8bc8ae0c1..6f30fd4160a1d0c8597bce34930808777350886f 100644 (file)
--- a/InterfaceQT4/monRecherche.py
+++ b/InterfaceQT4/monRecherche.py
@@ -42,7 +42,6 @@ class DRecherche(Ui_desRecherche ,QDialog):
       QDialog.__init__(self,parent)
       self.parentQT=parent
       self.tree=self.parentQT.tree
-      self.setModal(True)
       self.setupUi(self)
       self.PBSuivant.setDefault(True)
       self.PBSuivant.setAutoDefault(False)

diff --git a/InterfaceQT4/monWidgetCBSD.py b/InterfaceQT4/monWidgetCBSD.py
index 14ecd23347fef9723faf000ab6be002a45de93b3..6a79f9d56b72d7b2fcf232b9c70a55b0f30f35d5 100644 (file)
--- a/InterfaceQT4/monWidgetCBSD.py
+++ b/InterfaceQT4/monWidgetCBSD.py
@@ -66,6 +66,7 @@ class MonWidgetCB (Ui_WidgetCB,Feuille):
         if monEnvQT5:
            self.CBChoix.currentIndexChanged.connect(self.ChoixSaisi)
         else :
+           self.connect(self.CBChoix,SIGNAL("currentIndexChanged(int)"),self.ChoixSaisi
 
       for choix in self.monSimpDef.into:
           if not(type(choix) in types.StringTypes) : choix=str(choix)

diff --git a/InterfaceQT4/monWidgetCommande.py b/InterfaceQT4/monWidgetCommande.py
index c4ba914d5a5d81410f4f76b732ad3c08e22c148b..32da3c1547c9a93cf42e32e4547aa904a7ed3bcf 100644 (file)
--- a/InterfaceQT4/monWidgetCommande.py
+++ b/InterfaceQT4/monWidgetCommande.py
@@ -45,7 +45,6 @@ class MonWidgetCommande(Ui_WidgetCommande,Groupe):
   """
   """
   def __init__(self,node,editor,etape):
-      #print "MonWidgetCommande ", self,node.item.get_fr()
       self.listeAffichageWidget=[]
       self.inhibe=0
       self.ensure=0
@@ -69,27 +68,26 @@ class MonWidgetCommande(Ui_WidgetCommande,Groupe):
       self.scrollAreaCommandes.focusInEvent=self.focusInEvent
 
      
-      if monEnvQT5 :
-         if self.editor.code in ['MAP','CARMELCND'] : self.bCatalogue.close()
-         else : self.bCatalogue.clicked.connect(self.afficheCatalogue)
-         if self.editor.code in ['Adao','MAP'] : 
-               self.bAvant.close()
-               self.bApres.close()
-         else : 
-               self.bAvant.clicked.connect(self.afficheAvant)
-               self.bApres.clicked.connect(self.afficheApres)
+      if self.editor.closeFrameRechercheCommande==True : self.closeAutreCommande()
+      else :
+        if monEnvQT5 :
+         try :
+           self.bCatalogue.clicked.connect(self.afficheCatalogue)
+           self.bAvant.clicked.connect(self.afficheAvant)
+           self.bApres.clicked.connect(self.afficheApres)
+         except :
+           pass
          self.LENom.returnPressed.connect(self.nomChange)
-      else : 
-         if self.editor.code in ['MAP','CARMELCND'] : self.bCatalogue.close()
-         else : self.connect(self.bCatalogue,SIGNAL("clicked()"), self.afficheCatalogue)
-         if self.editor.code in ['Adao','MAP'] : 
-               self.bAvant.close()
-               self.bApres.close()
-         else : 
-               self.connect(self.bAvant,SIGNAL("clicked()"), self.afficheAvant)
-               self.connect(self.bApres,SIGNAL("clicked()"), self.afficheApres)
+        else : 
+         try :
+            self.connect(self.bCatalogue,SIGNAL("clicked()"), self.afficheCatalogue)
+            self.connect(self.bAvant,SIGNAL("clicked()"), self.afficheAvant)
+            self.connect(self.bApres,SIGNAL("clicked()"), self.afficheApres)
+         except :
+            pass
          self.connect(self.LENom,SIGNAL("returnPressed()"),self.nomChange)
    
+      if self.editor.code in ['CARMELCND',] : self.closeAutreCommande()
       self.racine=self.node.tree.racine
       if self.node.item.GetIconName() == "ast-red-square" : self.LENom.setDisabled(True)
 
@@ -115,6 +113,10 @@ class MonWidgetCommande(Ui_WidgetCommande,Groupe):
       self.editor.restoreSplitterSizes()
       #print "fin init de widget Commande"
       
+  def closeAutreCommande(self):
+      self.bCatalogue.close()
+      self.bAvant.close()
+      self.bApres.close()
 
   def donnePremier(self):
       #print "dans donnePremier"

diff --git a/InterfaceQT4/monWidgetSimpSalome.py b/InterfaceQT4/monWidgetSimpSalome.py
index 194ac1118a9189795a78309f62506ff0e2d3149c..f5299f9a77ed0e28bee4dfa1294df8acc6606d39 100644 (file)
--- a/InterfaceQT4/monWidgetSimpSalome.py
+++ b/InterfaceQT4/monWidgetSimpSalome.py
@@ -20,7 +20,10 @@
 # Modules Python
 import string,types,os
 
+
 # Modules Eficas
+from determine import monEnvQT5
+
 if monEnvQT5:
     from PyQt5.QtWidgets import QLineEdit
     from PyQt5.QtCore import Qt

diff --git a/InterfaceQT4/readercata.py b/InterfaceQT4/readercata.py
index 9137cd3e31990d0043ff055ff26c6d5dbf71f790..91f174dd9b29c47d6172b7a1cd087a9b2925e738 100644 (file)
--- a/InterfaceQT4/readercata.py
+++ b/InterfaceQT4/readercata.py
@@ -317,29 +317,24 @@ class READERCATA:
         self.dicoMC={} 
         listeEtapes=self.cata[0].JdC.commandes
         for e in self.cata[0].JdC.commandes:
-        #for e in (self.cata[0].JdC.commandes[0],):
-            #print e.nom
             self.traite_entite(e)
-        #for e in self.cata[0].JdC.commandes:
-        #    self.cree_rubrique(e,self.dico,0)
-        #print self.dicoInverse
-
-        #from Extensions import localisation
-        #app=QApplication
-        # tres dommage  A Revoir
-        #localisation.localise(app,"fr")
-        self.dicoInverseFrancais={}
-        self.dicoFrancaisAnglais={}
-        self.dicoAnglaisFrancais={}
-        for k in self.dicoInverse.keys():
-            listefr=[]
-            for nom, obj in self.dicoInverse[k] :
-                listefr.append((tr(nom),obj))
-                self.dicoFrancaisAnglais[tr(nom)]=nom
-                self.dicoAnglaisFrancais[nom]=tr(nom)
-            self.dicoInverseFrancais[tr(k)]=listefr
-            #print tr(k),listefr
-        if self.appliEficas.langue=="ang" : localisation.localise(app,"en")
+
+        #self.dicoFrancaisAnglais={}
+        #self.dicoAnglaisFrancais={}
+        #for k in self.dicoInverse.keys():
+        #    listefr=[]
+        #    for nom, obj in self.dicoInverse[k] :
+        #        listefr.append((tr(nom),obj))
+        #        self.dicoFrancaisAnglais[tr(nom)]=nom
+        #        self.dicoAnglaisFrancais[nom]=tr(nom)
+        #    self.dicoInverseFrancais[tr(k)]=listefr
+        #    #print tr(k),listefr
+        if self.appliEficas.langue=="ang" :
+           from dicoCasEnToCata import DicoCasEnToCata as dicoCasToCata
+        else :
+           from dicoCasFrToCata import DicoCasFrToCata as dicoCasToCata
+        self.dicoCasToCata=dicoCasToCata
+        
         
          
         
@@ -360,6 +355,7 @@ class READERCATA:
                 moi=moi.pere
           liste.append((moi.nom,moi))
           self.dicoInverse[e.nom]=liste
+          self.dicoInverse[tr(e.nom)]=liste
 
    def cree_rubrique(self,e,dico, niveau):
        from Accas import A_BLOC

diff --git a/InterfaceQT4/viewManager.py b/InterfaceQT4/viewManager.py
index b75e31a3a8ccab97478c605fb33d1a26d0b61892..186128e1f12e85910caea2656dcb111809b29811 100644 (file)
--- a/InterfaceQT4/viewManager.py
+++ b/InterfaceQT4/viewManager.py
@@ -139,6 +139,13 @@ class MyTabview:
        editor=self.dict_editors[index]
        editor.handleRechercher()
 
+   def handleRechercherDsCatalogue(self):
+       #print "passage dans handleRechercher"
+       index=self.myQtab.currentIndex()
+       if index < 0 : return
+       editor=self.dict_editors[index]
+       editor.handleRechercherDsCatalogue()
+
    def handleDeplier(self):
        index=self.myQtab.currentIndex()
        if index < 0 : return
@@ -290,6 +297,7 @@ class MyTabview:
        else :
             from editor import JDCEditor
             editor = JDCEditor(self.appliEficas,fichier, jdc, self.myQtab,units=units,vm = self,include=include)
+
             if double != None : 
                self.doubles[editor]=double
             if editor.jdc: # le fichier est bien un jdc