Merge remote branch 'origin/nouvelEficas' into nouvelEficas

[tools/eficas.git] / InterfaceQT4 / browser.py

diff --git a/InterfaceQT4/browser.py b/InterfaceQT4/browser.py
index 2938b9670f13c8ae5b15a29e52afdb06eeee8765..786c3d1baef556759fae31e12c2a10752fa6c135 100644 (file)
--- a/InterfaceQT4/browser.py
+++ b/InterfaceQT4/browser.py
@@ -67,15 +67,17 @@ class JDCTree( QTreeWidget ):
         self.inhibeExpand=False
         #print "self.editor.afficheCommandesPliees", self.editor.afficheCommandesPliees
         if self.racine.children !=[] :  
+
            if self.editor.afficheCommandesPliees : self.racine.children[0].plieToutEtReaffiche()
            else : self.racine.children[0].deplieToutEtReaffiche()
+
            self.racine.children[0].fenetre.donnePremier()
         else : self.racine.affichePanneau()
         #PNPNPN
         #pdb.set_trace()
 
     def contextMenuEvent(self,event) :
-        print "contextMenuEvent"
+        #print "contextMenuEvent"
         coord=event.globalPos()
         item= self.currentItem()
         self.handleContextMenu(item,coord)
@@ -88,7 +90,7 @@ class JDCTree( QTreeWidget ):
         @param coord the position of the mouse pointer (QPoint)
         Attention : existeMenu permet de savoir si un menu est associe a cet item
         """
-        print "handleContextMenu"
+        #print "handleContextMenu"
         if item == None : return
         if item.existeMenu == 0 : return
         if item.menu == None:
@@ -131,7 +133,7 @@ class JDCTree( QTreeWidget ):
 
     def handleOnItem(self,item,int):
         #if (len(self.selectedIndexes())!=2): return
-        print "je passe dans handleOnItem"
+        #print "je passe dans handleOnItem"
         self.inhibeExpand == True 
         self.itemCourrant=item
         itemParent=item
@@ -252,7 +254,7 @@ class JDCNode(QTreeWidgetItem):
         
         listeExpanded=[]
         for item in self.childrenComplete :
-            print dir(item)
+            #print dir(item)
             #if item.isExpanded():
             #   if self.childrenComplete.index(item) < posInsertion :
             #      listeExpanded.append(self.childrenComplete.index(item))
@@ -382,11 +384,10 @@ class JDCNode(QTreeWidgetItem):
         Ajoute un parametre a l'interieur du JDC :
         """
         self.editor.init_modif()
-        if after:
-            pos = 'after'
-        else:
-            pos = 'before'
-        return self.append_brother( PARAMETERS, pos )
+        if after: pos = 'after'
+        else: pos = 'before'
+        child=self.append_brother( PARAMETERS, pos )
+        return  child
     
     
     def select( self ):
@@ -394,7 +395,7 @@ class JDCNode(QTreeWidgetItem):
         Rend le noeud courant (self) selectionne et deselectionne
         tous les autres
         """        
-        print "je suis sur select"
+        #print "je suis sur select"
         for item in self.tree.selectedItems() :
             item.setSelected(0)
         self.setSelected( True )    
@@ -472,7 +473,7 @@ class JDCNode(QTreeWidgetItem):
            else             : child.setDeplie() 
         except :
            child=self.children[index]
-           print "dans le except"
+           #print "dans le except"
         self.tree.inhibeExpand=False
         return child
 
@@ -719,20 +720,20 @@ class JDCNode(QTreeWidgetItem):
     def setPlie(self):
         #print "je mets inhibeExpand a true dans setPlie"
         #print "je suis dans plieTout", self.item.get_nom()
+        import compojdc
+        if self.fenetre == self.editor.fenetreCentraleAffichee  and isinstance(self.treeParent,compojdc.Node): 
+           return
         self.tree.inhibeExpand=True
         self.tree.collapseItem(self)
         self.setPlieChildren()
+        self.tree.inhibeExpand=False
+        #print "je mets inhibeExpand a false dans setPlie"
 
 
         # on ne plie pas au niveau 1
-        #if not(isinstance(self.treeParent,compojdc.Node)) : 
-        #   self.plie=True
-        #else :
         #   self.plie=False
         #   for item in self.children :
         #       item.appartientAUnNoeudPlie=False
-        #self.tree.inhibeExpand=False
-        #print "je mets inhibeExpand a false dans setPlie"
 
     def setPlieChildren(self):
         self.plie=True