From: pascale.noyret <pascale.noyret@edf.fr>
Date: Fri, 21 Sep 2018 11:43:59 +0000 (+0200)
Subject: passage V9
X-Git-Tag: V9_2_0
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=83806a596695d95e9f53fb94af6147ff97684687;p=modules%2Feficas.git

passage V9
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6661afeb..4963b3be 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,8 +27,8 @@ CMAKE_POLICY(SET CMP0003 NEW)
 # Project name, upper case
 STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
 
-SET(${PROJECT_NAME_UC}_MAJOR_VERSION 8)
-SET(${PROJECT_NAME_UC}_MINOR_VERSION 5)
+SET(${PROJECT_NAME_UC}_MAJOR_VERSION 9)
+SET(${PROJECT_NAME_UC}_MINOR_VERSION 0)
 SET(${PROJECT_NAME_UC}_PATCH_VERSION 0)
 SET(${PROJECT_NAME_UC}_VERSION
   ${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION})
diff --git a/src/EFICASGUI/EFICASGUI.py b/src/EFICASGUI/EFICASGUI.py
index a95792c5..30cea061 100644
--- a/src/EFICASGUI/EFICASGUI.py
+++ b/src/EFICASGUI/EFICASGUI.py
@@ -18,6 +18,7 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
+# -*- coding: utf-8 -*-
 
 import os
 
@@ -122,25 +123,26 @@ class GUIcontext:
 ################################################
 
 # study-to-context map
-__study2context__ = {}
+#__study2context__ = {}
 # current context
-__current_context__ = None
+#__current_context__ = None
+
 
 
 # ##
 # set and return current GUI context
 # study ID is passed as parameter
 # ##
-def _setContext(studyID):
-    global eficasRoot
-    if eficasRoot is None:
-        return
-    global __study2context__, __current_context__
-    if studyID not in __study2context__:
-        __study2context__[studyID] = GUIcontext()
-        pass
-    __current_context__ = __study2context__[studyID]
-    return __current_context__
+#def _setContext(studyID):
+#    global eficasRoot
+#    if eficasRoot is None:
+#        return
+#    global __study2context__, __current_context__
+#    if studyID not in __study2context__:
+#        __study2context__[studyID] = GUIcontext()
+#        pass
+#    __current_context__ = __study2context__[studyID]
+#    return __current_context__
 
 
 # -----------------------------------------------------------------------------
@@ -155,11 +157,11 @@ def OnGUIEvent(commandID):
 
 # -----------------------------------------------------------------------------
 
-def setSettings():
-    """
-    Cette méthode permet les initialisations.
-    """
-    _setContext(sgPyQt.getStudyId())
+#def setSettings():
+#    """
+#    Cette méthode permet les initialisations.
+#    """
+    #_setContext(sgPyQt.getStudyId())
 
 
 def activate():
@@ -169,13 +171,14 @@ def activate():
 
     Portage V3.
     """
-    setSettings()
+#    setSettings()
+    GUIcontext()
 
 
 # -----------------------------------------------------------------------------
 
-def activeStudyChanged(ID):
-    _setContext(ID)
+#def activeStudyChanged(ID):
+#    _setContext(ID)
 
 
 # -----------------------------------------------------------------------------
diff --git a/src/EFICASGUI/eficasSalome.py b/src/EFICASGUI/eficasSalome.py
index 40d0e1a4..8aac9093 100644
--- a/src/EFICASGUI/eficasSalome.py
+++ b/src/EFICASGUI/eficasSalome.py
@@ -489,7 +489,7 @@ class MyEficas(qtEficas.Appli):
             from salome.smesh import smeshBuilder
             smesh = smeshBuilder.New(theStudy)
             smesh.CreateMeshesFromMED(fileName)
-            salome.sg.updateObjBrowser(1)
+            salome.sg.updateObjBrowser()
             return 1, ""
         except:
             return (0, "Pb a l import")
@@ -598,7 +598,7 @@ class MyEficas(qtEficas.Appli):
                                                      # icon    = "ICON_COMM_FILE",
                                                      comment=str(jdcPath))
 
-            salome.sg.updateObjBrowser(1)
+            salome.sg.updateObjBrowser()
 
             if commEntry:
                 ok, msgError = True, ''
@@ -687,7 +687,7 @@ class MyEficas(qtEficas.Appli):
             structElemManager = StructuralElementManager()
             elem = structElemManager.createElement(liste_commandes)
             elem.display()
-            salome.sg.updateObjBrowser(True)
+            salome.sg.updateObjBrowser()
         except InvalidParameterError as err:
             trStr = self.tr("Invalid parameter for group %(group)s: %(expr)s must be "
                             "greater than %(minval)g (actual value is %(value)g)")