X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FdaSalome%2FdaGUI%2FdaEficasWrapper%2FadaoEficasWrapper.py;h=68cf220f688cb8041aa6d4e8a84c7627b93c60f8;hb=ca0a847af7fa0984f05319776a8e7c53f2b22565;hp=87ca6e957c28d9e7481aafa830b2497f63dda593;hpb=949abb22bf7e9bc3ead2df4a52f5878af8afcc52;p=modules%2Fadao.git

diff --git a/src/daSalome/daGUI/daEficasWrapper/adaoEficasWrapper.py b/src/daSalome/daGUI/daEficasWrapper/adaoEficasWrapper.py
index 87ca6e9..68cf220 100644
--- a/src/daSalome/daGUI/daEficasWrapper/adaoEficasWrapper.py
+++ b/src/daSalome/daGUI/daEficasWrapper/adaoEficasWrapper.py
@@ -1,4 +1,4 @@
-# -*- coding: iso-8859-1 -*-
+# -*- coding: utf-8 -*-
 #  Copyright (C) 2010 EDF R&D
 #
 #  This library is free software; you can redistribute it and/or
@@ -18,46 +18,59 @@
 #  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-from eficasWrapper import *
-from PyQt4 import QtGui,QtCore
 import sys
+import os
+from PyQt4 import QtGui,QtCore
+
+# Import from EFICAS_SRC
+import eficasSalome
+# Import from Eficas
+from InterfaceQT4 import qtEficas
 
-# Configuration de l'installation
-my_path = os.path.dirname(os.path.abspath(__file__))
-ADAO_INSTALL_DIR = my_path + "/../daEficas"
-sys.path[:0]=[ADAO_INSTALL_DIR]
+from adaoWrapperUtils import *
 
 #
 # ============================================
 # Specialization of the EficasWrapper for ADAO
 # ============================================
 #
-class AdaoEficasWrapper(EficasWrapper):
+class AdaoEficasWrapper(eficasSalome.MyEficas):
+
+    def __init__(self, parent):
+        # Configuration de l'installation
+        # Permet à EFICAS de faire ses import correctement
+        my_path = os.path.dirname(os.path.abspath(__file__))
+        ADAO_INSTALL_DIR = my_path + "/../daEficas"
+        sys.path[:0]=[ADAO_INSTALL_DIR]
 
-    def __init__(self, parent, code="ADAO"):
-        EficasWrapper.__init__(self, parent, code)
         self.__myCallbackId = {}
         self.__close_editor = None
         self.__file_open_name = ""
+        self.__parent = parent
 
     def init_gui(self):
-      EficasWrapper.init_gui(self)
-      print "self.__myCallbackId", self.__myCallbackId
+      eficasSalome.MyEficas.__init__(self, self.__parent, code="ADAO", module="ADAO")
+      # On réouvre tous les fichiers comm
+      # On fait une copie pour ne pas tomber dans une boucle infinie
       save_CallbackId =  self.__myCallbackId.copy()
       for editor, myCallbackId in save_CallbackId.iteritems():
         self.notifyObserver(EficasEvent.EVENT_TYPES.REOPEN, callbackId=myCallbackId)
 
-    # Association de l'objet editor avec le callbackId
-    def setCallbackId(self, callbackId):
-      index = self.viewmanager.myQtab.currentIndex()
-      self.__myCallbackId[self.viewmanager.dict_editors[index]] = callbackId
+    def addJdcInSalome(  self, jdcPath ):
+      # On gere nous meme l'etude
+      pass
 
-    def getCallbackId(self):
-      if self.__close_editor is None:
-        index = self.viewmanager.myQtab.currentIndex()
-        return self.__myCallbackId[self.viewmanager.dict_editors[index]]
-      else:
-        return self.__myCallbackId[self.__close_editor]
+    def fileNew(self):
+        """
+        @overload
+        """
+        qtEficas.Appli.fileNew(self)
+        self.notifyObserver(EficasEvent.EVENT_TYPES.NEW)
+
+    def openEmptyCase(self, callbackId):
+        qtEficas.Appli.fileNew(self)
+        self.removeCallbackId(callbackId)
+        self.setCallbackId(callbackId)
 
     def fileSave(self):
         """
@@ -166,3 +179,51 @@ class AdaoEficasWrapper(EficasWrapper):
         else:
           return 0
 
+    # ==========================================================================
+    # Function for the notification interface between an EficasWrapper an an
+    # EficasObserver.
+
+    # Association de l'objet editor avec le callbackId
+    def setCallbackId(self, callbackId):
+      index = self.viewmanager.myQtab.currentIndex()
+      self.__myCallbackId[self.viewmanager.dict_editors[index]] = callbackId
+
+    def removeCallbackId(self, callbackId):
+      key_to_remove = None
+      print callbackId
+      for k, v in self.__myCallbackId.iteritems():
+        print k, v
+        if v[0] == callbackId[0] and v[1].GetID() == callbackId[1].GetID():
+          key_to_remove = k
+      if key_to_remove is not None:
+        del self.__myCallbackId[key_to_remove]
+      else:
+        print "Oups - cannot find callbackId"
+
+    def getCallbackId(self):
+      if self.__close_editor is None:
+        index = self.viewmanager.myQtab.currentIndex()
+        return self.__myCallbackId[self.viewmanager.dict_editors[index]]
+      else:
+        return self.__myCallbackId[self.__close_editor]
+
+    def addObserver(self, observer):
+        """
+        In fact, only one observer may be defined for the moment.
+        """
+        try:
+            observer.processEficasEvent
+        except:
+            raise DevelException("the argument should implement the function processEficasEvent")
+        self.__observer = observer
+
+    def notifyObserver(self, eventType, callbackId=None):
+      if eventType != EficasEvent.EVENT_TYPES.NEW and eventType != EficasEvent.EVENT_TYPES.OPEN:
+        if callbackId is None :
+          eficasEvent = EficasEvent(eventType, self.getCallbackId())
+        else:
+          eficasEvent = EficasEvent(eventType, callbackId)
+      else:
+        eficasEvent = EficasEvent(eventType)
+      self.__observer.processEficasEvent(self, eficasEvent)
+