X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=InterfaceQT4%2FmonWidgetCommande.py;h=a78385d6322490978325fc2c0a06362a9bf844ae;hb=7b4162f8842f6ac0f099e392660843bc9896847d;hp=5d4cc30c633d114248c3ba7b54453860650af511;hpb=18b409dacd2948006ce412ffc017295e59bb1524;p=tools%2Feficas.git

diff --git a/InterfaceQT4/monWidgetCommande.py b/InterfaceQT4/monWidgetCommande.py
index 5d4cc30c..a78385d6 100644
--- 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
       self.listeAffichageWidget=[]
       self.inhibe=0
       self.ensure=0
@@ -53,8 +52,11 @@ class MonWidgetCommande(Ui_WidgetCommande,Groupe):
       Groupe.__init__(self,node,editor,None,etape.definition,etape,1,self)
       editor.inhibeSplitter=0
 
+      self.frameAffichage.setMinimumHeight(20)
       if node.item.get_fr() != "" : self.labelDoc.setText(node.item.get_fr())
-      else : self.labelDoc.close()
+      else : 
+        self.labelDoc.close()
+        self.frameAffichage.resize(self.frameAffichage.width(),50)
       
       if (etape.get_type_produit()==None): self.LENom.close()
       elif (hasattr(etape, 'sdnom')) and etape.sdnom != "sansnom" and etape.sdnom != None: self.LENom.setText(etape.sdnom) 
@@ -62,11 +64,6 @@ class MonWidgetCommande(Ui_WidgetCommande,Groupe):
 
       maPolice= QFont("Times", 10,)
       self.setFont(maPolice)
-      print 'jjjjjjjjjjjjjjjjjjjjjjjjj'
-      print self.obj.nom
-      print tr(self.obj.nom)
-      print tr("TITLE")
-      print 'jjjjjjjjjjjjjjjjjjjjjjjjj'
       self.labelNomCommande.setText(tr(self.obj.nom))
 
       self.commandesLayout.addStretch()
@@ -74,27 +71,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)
 
@@ -120,6 +116,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"
@@ -152,8 +152,9 @@ class MonWidgetCommande(Ui_WidgetCommande,Groupe):
            self.inhibe=0
            return True
          except :
-           print self.listeAffichageWidget
-           print "souci ds focusNextPrevChild"
+           pass
+           #print self.listeAffichageWidget
+           #print "souci ds focusNextPrevChild"
       if i==0 and next==False and not self.inhibe: 
          if hasattr(self.editor.fenetreCentraleAffichee,'scrollArea'):
             self.editor.fenetreCentraleAffichee.scrollArea.ensureWidgetVisible(self.listeAffichageWidget[-1])
@@ -228,20 +229,21 @@ class MonWidgetCommande(Ui_WidgetCommande,Groupe):
 
 
   def reaffiche(self,nodeAVoir=None):
+      # Attention delicat. les appels de fonctions ne semblent pas pouvoir etre supprimes!
       self.avantH=self.editor.fenetreCentraleAffichee.scrollAreaCommandes.horizontalScrollBar().sliderPosition()
       self.avantV=self.editor.fenetreCentraleAffichee.scrollAreaCommandes.verticalScrollBar().sliderPosition()
       self.inhibeExpand=True
       self.node.affichePanneau()
-      #print "dans reaffiche de monWidgetCommande", self.avantH, self.avantV
-      QTimer.singleShot(1, self.recentre)
+      #QTimer.singleShot(1, self.recentre)
       if nodeAVoir != None and nodeAVoir!=0:
         self.f=nodeAVoir.fenetre
         if self.f==None : 
              newNode=nodeAVoir.treeParent.chercheNoeudCorrespondant(nodeAVoir.item.object)
              self.f = newNode.fenetre 
-        #print "dans reaffiche",self.f, nodeAVoir.item.nom
-        if self.f != None and self.f.isVisible() : return
-        if self.f != None : QTimer.singleShot(1, self.rendVisible)
+        if self.f != None and self.f.isVisible() : self.inhibeExpand=False; return
+        if self.f != None : self.rendVisible()
+        else : self.recentre()
+      else : self.recentre()
       self.inhibeExpand=False
 
 
@@ -253,10 +255,11 @@ class MonWidgetCommande(Ui_WidgetCommande,Groupe):
 
   def rendVisibleNoeud(self,node):
       self.f=node.fenetre
-      print "dans rendVisibleNoeud",self.f, node.item.nom
+      #print "dans rendVisibleNoeud",self.f
       QTimer.singleShot(1, self.rendVisible)
      
   def rendVisible(self):
+      #print "dans rendVisible",self.f
       QApplication.processEvents()
       self.f.setFocus(7)
       self.editor.fenetreCentraleAffichee.scrollAreaCommandes.ensureWidgetVisible(self.f)