Merge avec Master pour Telemac en V9 du 23/05

diff --cc Adao/prefs_Adao.py
index 581f0916a634cfcc4941ea8fcdd1a6a12891fa62,4e758db64ac0a1256fb6babf4c02adfeccdf8890..f2726fbcf1c6f5521700420392b1452979f0561d
--- 1/Adao/prefs_Adao.py
--- 2/Adao/prefs_Adao.py
+++ b/Adao/prefs_Adao.py
@@@ -19,7 -19,8 +19,6 @@@ catalogues = 
  # ('Adao','V83',os.path.join(repIni,'ADAO_Cata_V0_V8_3_0_DEV.py'),'dicoImbrique','dico'),
  # ('Adao','dico',os.path.join(repIni,'ADAO_Cata_V0_V8_3_0_DEV.py'),'dico','dico'),
   ('Adao','V83',os.path.join(repIni,'ADAO_Cata_V0_V8_3_0_DEV.py'),'python','python'),
 -# ('Adao','V83',os.path.join(repIni,'ADAO_Cata_PN.py'),'python','python'),
--# ('Adao','V751',os.path.join(repIni,'ADAO_Cata_V0_V7_5_1.py'),'python','python'),
  )
  
  # lang indique la langue utilisee pour les chaines d'aide : fr ou ang

diff --cc Editeur/Objecttreeitem.py
index e27551440d3611a8ab91ba5e4a51ad635c02c412,7d419ca959eda4a91a329c93c8b6eaa073e471e1..233cc1651e47745d98a34becf247c901497f96b5
--- 1/Editeur/Objecttreeitem.py
--- 2/Editeur/Objecttreeitem.py
+++ b/Editeur/Objecttreeitem.py
@@@ -290,10 -290,12 +290,11 @@@ class ObjectTreeItem(TreeItem,Delegate)
          elif type(pos) == int :
              # la position est fixee 
              index = pos
-         elif type(pos) == types.InstanceType:
+         #elif type(pos) == types.InstanceType:
+         elif type(pos) == object :
              # pos est un item. Il faut inserer name apres pos
              index = self.getIndex(pos) +1
-         elif type(name) == types.InstanceType:
 -        #elif type(name) == types.InstanceType:
+         elif type(name) == object :
              index = self.getIndexChild(name.nom)
          else:
              index = self.getIndexChild(name)

diff --cc Efi2Xsd/MCAccasXsd.py
index eb20219c7c25d3accaaca501c84984e40d030ac1,1365685251a50a2457336300d16d53353794bd70..1365685251a50a2457336300d16d53353794bd70
mode 100755,100644..100755
--- 1/Efi2Xsd/MCAccasXsd.py
--- 2/Efi2Xsd/MCAccasXsd.py
+++ b/Efi2Xsd/MCAccasXsd.py

diff --cc InterfaceQT4/browser.py
index d7634c116369daa91c3938b1d585db240b23b20c,7d4b71f75b751efd174a49d762238dfae0783a30..79181258dd1f3c7a4fe70757575283e855a5ff0b
--- 1/InterfaceQT4/browser.py
--- 2/InterfaceQT4/browser.py
+++ b/InterfaceQT4/browser.py
@@@ -704,7 -703,7 +703,6 @@@ class JDCNode(QTreeWidgetItem,GereRegle
  
      def onAdd(self,object):
          if self.JESUISOFF==1 : return
-         #print "onAdd pour ", self.item.nom, object.nom
 -        #print ("onAdd pour ", self.item.nom, object)
          self.editor.initModif()
          self.updateNodes()
          # PN -- non necessaire si item=jdc
@@@ -712,7 -711,7 +710,6 @@@
   
      def onSupp(self,object):
          if self.JESUISOFF==1 : return
-         #print "onSup pour ", self.item.nom, object.nom
 -        #print "onSup pour ", self.item.nom, object
          self.editor.initModif()
          self.updateNodes()
          # PN -- non necessaire si item=jdc

diff --cc InterfaceQT4/editorSsIhm.py
index 4fc4772d035b52e16fa019ed534980a6aefb5ca9,b60a39b8d387ecd0ab16519d4567340bf7b91eb5..a786cb169c66f10c7beb1729a99bae2f41f23baf
--- 1/InterfaceQT4/editorSsIhm.py
--- 2/InterfaceQT4/editorSsIhm.py
+++ b/InterfaceQT4/editorSsIhm.py
@@@ -266,8 -266,13 +266,12 @@@ class JDCEditorSsIhm 
          if units is not None:
             jdc.recorded_units=units
             jdc.old_recorded_units=units
--        ## PNPN est ce que la ligne suivante est bien utile ?
-         if texte == "" :jdc.analyse()
+         # elle positionne le contexte
+         # est ce qu on ne doit pas changer le format en Accas si on vient d accas ?
+         if self.format == 'xml' : return jdc
+         if texte == "" :
+            jdc.editor=self
+            jdc.analyse()
          return jdc
  
     #--------------------------------#

diff --cc InterfaceQT4/eficas_go.py
index e5ef13efc0f5dec216d42c27cc03af275bc194be,d7aea420395a51840183530d2c185f726b943139..7fa359926e0de9ded7ce8ba662e420982ef2b57c
--- 1/InterfaceQT4/eficas_go.py
--- 2/InterfaceQT4/eficas_go.py
+++ b/InterfaceQT4/eficas_go.py
@@@ -46,7 -46,7 +46,6 @@@ def getEficasSsIhm(code=None,fichier=No
      options=session.parse(['ssIhm','-k',code,'-v',versionCode])
      return Eficas
  
--
  def lanceEficas(code=None,fichier=None,ssCode=None,multi=False,langue='en'):
      """
          Lance l'appli EFICAS
@@@ -77,23 -77,6 +76,22 @@@
      res=app.exec_()
      sys.exit(res)
  
- 
 +def lanceEficasMap2(code=None,fichier=None,ssCode=None,multi=True,langue='en'):
 +    from Editeur  import session
 +    options=session.parse(sys.argv)
 +    from InterfaceQT4.qtEficas import Appli
 +    app = QApplication(sys.argv)
 +    Eficas=Appli(code='Map2',salome=0,ssCode='V2',multi=False,langue=langue)
 +    Eficas.show()
 +
 +    Eficas.fileNew()
 +    Eficas.ssCode='V2017'
 +    Eficas.readercata.demandeCatalogue='V2017'
 +    Eficas.fileNew()
 +    Eficas.fileNew()
 +
 +    res=app.exec_()
 +    sys.exit(res)
  
  def lanceEficas_ssIhm(code=None,fichier=None,ssCode=None,version=None,debug=False,langue='en'):
      """

diff --cc ProcessOutputs_Eficas/configuration_PSEN_N1.py
index c61ac010fb85724bbd4a80022cdb630366a795cb,e17d4912097cb3d0104d1f4e0368fe9773603f2a..9ed5eb539a6007622c3d2e30273fc8c95a75aa6d
--- 1/ProcessOutputs_Eficas/configuration_PSEN_N1.py
--- 2/ProcessOutputs_Eficas/configuration_PSEN_N1.py
+++ b/ProcessOutputs_Eficas/configuration_PSEN_N1.py
@@@ -26,8 -26,8 +26,8 @@@ from InterfaceQT4 import configuratio
  import os\r
  \r
  \r
- class CONFIG(configuration.configBase):\r
+ class CONFIG(configuration.CONFIG_BASE):\r
 -  ## test\r
 +\r
    #-----------------------------------\r
    def __init__(self,appli,repIni):\r
    #-----------------------------------\r