PN

[tools/eficas.git] / Editeur / compooper.py

diff --git a/Editeur/compooper.py b/Editeur/compooper.py
index 4dfeff128d0f7914e6c70f259d5b1a332c7b3ee5..945baceeac30a997b350e73e74c2f285267682db 100644 (file)
--- a/Editeur/compooper.py
+++ b/Editeur/compooper.py
@@ -37,9 +37,10 @@ class OPERPanel(panels.OngletPanel):
     nb.add('Commentaire',tab_text='Paramètre/Commentaire')
     panneau=Pmw.PanedWidget(nb.page("Mocles"),
                             orient='horizontal')
-    panneau.add('left',min=0.4,max=0.6,size=0.5)
-    panneau.add('right',min=0.4,max=0.6,size=0.5)
+    panneau.add('left',min=0.4,max=0.60,size=0.50)
+    panneau.add('right',min=0.4,max=0.60,size=0.50)
     panneau.pack(expand=1,fill='both')
+    panneau.setnaturalsize()
     self.makeCommandePage(nb.page("Commande"))
     self.makeConceptPage_oper(nb.page("Concept"))
     self.makeMoclesPage(panneau.pane('left'))
@@ -47,7 +48,9 @@ class OPERPanel(panels.OngletPanel):
     #self.makeCommentairePage(nb.page("Commentaire"))
     self.makeParamCommentPage_for_etape(nb.page("Commentaire"))
     nb.tab('Mocles').focus_set()
-    nb.setnaturalsize()
+    self.nb.setnaturalsize()
+    self.enlevebind()
+    self.creebind()
     self.affiche()
 
   def makeConceptPage_oper(self,page):
@@ -245,38 +248,6 @@ class EtapeTreeItem(Objecttreeitem.ObjectTreeItem):
       self.sublist=sublist
       return self.sublist
 
-  def GetSubList_BAK(self):
-      raise "OBSOLETE"
-      if self.isactif():
-         liste=self.object.mc_liste
-      else:
-         liste=[]
-
-      sublist=[]
-      isublist=iter(self.sublist)
-      iliste=iter(liste)
-
-      while(1):
-         old_obj=obj=None
-         for item in isublist:
-            old_obj=item.getObject()
-            if old_obj in liste:break
-
-         for obj in iliste:
-            if obj is old_obj:break
-            # nouvel objet : on cree un nouvel item
-            def setfunction(value, object=obj):
-                object.setval(value)
-            it = self.make_objecttreeitem(self.appli, obj.nom + " : ", obj, setfunction)
-            sublist.append(it)
-
-         if old_obj is None and obj is None:break
-         if old_obj is obj:
-            sublist.append(item)
-
-      self.sublist=sublist
-      return self.sublist
-
   def isvalid(self):
       return self.object.isvalid()
 
@@ -292,8 +263,13 @@ class EtapeTreeItem(Objecttreeitem.ObjectTreeItem):
 
   def nomme_sd(self,nom):
       """ Lance la méthode de nommage de la SD """
+      oldnom=""
+      if self.object.sd != None :
+         oldnom=self.object.sd.nom
       test,mess= self.object.nomme_sd(nom)
       if test:self.object.parent.reset_context()
+      if (test and self.appli.dict_reels.has_key(oldnom) ):
+              self.appli.dict_reels[nom]=self.appli.dict_reels[oldnom]
       return test,mess
 
   def is_reentrant(self):
@@ -323,51 +299,12 @@ class EtapeTreeItem(Objecttreeitem.ObjectTreeItem):
       commande_comment.jdc = commande_comment.parent = self.object.jdc
 
       pos=self.object.parent.etapes.index(self.object)
+      parent=self.object.parent
       self.object.parent.suppentite(self.object)
-      self.object.parent.addentite(commande_comment,pos)
+      parent.addentite(commande_comment,pos)
 
       return commande_comment
 
-  def additem_BAK(self,name,pos):
-      raise "OBSOLETE"
-      mcent=self.addentite(name,pos)
-
-      self.expandable=1
-      if mcent == 0 :
-          # on ne peut ajouter l'élément de nom name
-          return 0
-      def setfunction(value, object=mcent):
-          object.setval(value)
-      item = self.make_objecttreeitem(self.appli,mcent.nom + " : ", mcent, setfunction)
-      return item
-
-  def GetSubList_BAK(self):
-      raise "OBSOLETE"
-      sublist=[]
-      for obj in self.object.mc_liste:
-        def setfunction(value, object=obj):
-          object.setval(value)
-        item = self.make_objecttreeitem(self.appli, obj.nom + " : ", obj, setfunction)
-        sublist.append(item)
-      return sublist
-
-  def verif_condition_bloc_BAK(self):
-      raise "OBSOLETE"
-      return self.object.verif_condition_bloc()
-
-  def replace_child_BAK(self,old_item,new_item):
-     """
-     Remplace old_item.getObject() par new_item.getObject() dans 
-     les fils de self.object
-     """
-     raise "OBSOLETE"
-     old_itemobject=old_item.getObject()
-     index = self.object.mc_liste.index(old_itemobject)
-     self.object.init_modif()
-     self.object.mc_liste.remove(old_itemobject)
-     self.object.mc_liste.insert(index,new_item.getObject())
-     self.object.fin_modif()
-     
 import Accas
 treeitem = EtapeTreeItem
 objet = Accas.ETAPE