From: André Ribes <andre.ribes@edf.fr>
Date: Wed, 9 Mar 2011 14:57:15 +0000 (+0100)
Subject: Finalisation
X-Git-Tag: V6_4_0rc3~69
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=3d9dd835e5f075a039c00f3b6172204554fed443;p=modules%2Fadao.git

Finalisation

Print en moins
Bug destruction en moins
---

diff --git a/src/daSalome/daGUI/daEficasWrapper/adaoEficasWrapper.py b/src/daSalome/daGUI/daEficasWrapper/adaoEficasWrapper.py
index d48d2b6..989f63c 100644
--- a/src/daSalome/daGUI/daEficasWrapper/adaoEficasWrapper.py
+++ b/src/daSalome/daGUI/daEficasWrapper/adaoEficasWrapper.py
@@ -128,11 +128,9 @@ class AdaoEficasWrapper(eficasSalome.MyEficas):
         if res != 2: # l utilsateur a annule
           if close_editor.fichier is None:
             # Cas fichier vide
-            print "cas fichier vide"
             self.notifyObserver(EficasEvent.EVENT_TYPES.CLOSE, callbackId=close_editor)
           else:
             # Cas fichier existant
-            print "cas fichier existant"
             self.notifyObserver(EficasEvent.EVENT_TYPES.CLOSE, callbackId=close_editor)
 
 #######
diff --git a/src/daSalome/daGUI/daGuiImpl/adaoCase.py b/src/daSalome/daGUI/daGuiImpl/adaoCase.py
index cd0beb6..527e51f 100644
--- a/src/daSalome/daGUI/daGuiImpl/adaoCase.py
+++ b/src/daSalome/daGUI/daGuiImpl/adaoCase.py
@@ -46,7 +46,6 @@ class AdaoCase:
     if editor is not self.eficas_editor:
       self.eficas_editor = editor
       # Connect to the jdc
-      print self.eficas_editor.jdc
       CONNECTOR.Connect(self.eficas_editor.jdc, "valid", self.editorValidEvent, ())
 
   # Rq on notera que l'on utilise isvalid dans isOk
diff --git a/src/daSalome/daGUI/daGuiImpl/adaoGuiHelper.py b/src/daSalome/daGUI/daGuiImpl/adaoGuiHelper.py
index 944cb78..e93f085 100644
--- a/src/daSalome/daGUI/daGuiImpl/adaoGuiHelper.py
+++ b/src/daSalome/daGUI/daGuiImpl/adaoGuiHelper.py
@@ -66,7 +66,6 @@ def refreshObjectBrowser():
         salome.sg.updateObjBrowser(0)
 
 def selectItem(salomeStudyItem):
-  print "selectItem", salomeStudyItem
   if salome.sg is not None:
     salome.sg.ClearIObjects()
     salome.sg.AddIObject(salomeStudyItem)
diff --git a/src/daSalome/daGUI/daGuiImpl/adaoGuiManager.py b/src/daSalome/daGUI/daGuiImpl/adaoGuiManager.py
index b58b278..766903a 100644
--- a/src/daSalome/daGUI/daGuiImpl/adaoGuiManager.py
+++ b/src/daSalome/daGUI/daGuiImpl/adaoGuiManager.py
@@ -275,14 +275,16 @@ class AdaoCaseManager(EficasObserver):
         break
 
   def _processEficasCloseEvent(self, eficasWrapper, eficasEvent):
+    adaoLogger.debug("Destruction d'un cas")
     editor = eficasEvent.callbackId
     # Recuperation du cas
     adao_case = self.cases[editor]
     # Suppression de l'objet dans l'étude
     adaoStudyEditor.removeItem(adao_case.salome_study_id, adao_case.salome_study_item)
-    adaoGuiHelper.refreshObjectBrowser()
     # Suppression du cas
-    del self.cases[editor]
+    self.cases.pop(editor)
+    # Refresh GUI -> appelle currentSelectionChanged()
+    adaoGuiHelper.refreshObjectBrowser()
 
 #######
 #