Tout ok sauf la gestion de la duplication...

[modules/adao.git] / src / daSalome / daGUI / daEficasWrapper / datassimEficasWrapper.py

diff --git a/src/daSalome/daGUI/daEficasWrapper/datassimEficasWrapper.py b/src/daSalome/daGUI/daEficasWrapper/datassimEficasWrapper.py
index 8b83a7c52070111aca7b866f7f3111bf54196432..9f27c153a14677abfe1e91ab674d1ee78044e4ab 100644 (file)
--- a/src/daSalome/daGUI/daEficasWrapper/datassimEficasWrapper.py
+++ b/src/daSalome/daGUI/daEficasWrapper/datassimEficasWrapper.py
@@ -82,9 +82,9 @@ class DatassimEficasWrapper(EficasWrapper):
       if self.__close_editor is None:
         index = self.viewmanager.myQtab.currentIndex()
         editor = self.viewmanager.dict_editors[index]
-        return str(editor.fichier)
+        return editor.fichier
       else:
-        return str(self.__close_editor.fichier)
+        return self.__close_editor.fichier
 
     def Openfile(self, filename):
       self.viewmanager.handleOpen(fichier=filename)
@@ -140,5 +140,9 @@ class DatassimEficasWrapper(EficasWrapper):
       """
       while len(self.viewmanager.dict_editors) > 0:
         self.viewmanager.myQtab.setCurrentIndex(0)
-        res = self.fileClose()
-        if res==2 : return res   # l utilsateur a annule
+        if self.viewmanager.myQtab.currentIndex() == 0:
+          res = self.fileClose()
+          if res==2 : return res   # l utilsateur a annule
+        else:
+          return 0
+