X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=Ihm%2FI_OBJECT.py;h=48c444c2d223fdcf0513c6456adbeec19767e2c7;hb=9f4ff7ed9afd87c96e11d61e442e39e5511f60d1;hp=0687c4b7a76f955d1722299b1d1f5386dd15436c;hpb=cdd358f4041f957701ac10d86766a85baaef4f78;p=tools%2Feficas.git

diff --git a/Ihm/I_OBJECT.py b/Ihm/I_OBJECT.py
index 0687c4b7..48c444c2 100644
--- a/Ihm/I_OBJECT.py
+++ b/Ihm/I_OBJECT.py
@@ -1,36 +1,28 @@
 # -*- coding: utf-8 -*-
-#            CONFIGURATION MANAGEMENT OF EDF VERSION
-# ======================================================================
-# COPYRIGHT (C) 1991 - 2002  EDF R&D                  WWW.CODE-ASTER.ORG
-# THIS PROGRAM IS FREE SOFTWARE; YOU CAN REDISTRIBUTE IT AND/OR MODIFY
-# IT UNDER THE TERMS OF THE GNU GENERAL PUBLIC LICENSE AS PUBLISHED BY
-# THE FREE SOFTWARE FOUNDATION; EITHER VERSION 2 OF THE LICENSE, OR
-# (AT YOUR OPTION) ANY LATER VERSION.
+# Copyright (C) 2007-2013   EDF R&D
 #
-# THIS PROGRAM IS DISTRIBUTED IN THE HOPE THAT IT WILL BE USEFUL, BUT
-# WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF
-# MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. SEE THE GNU
-# GENERAL PUBLIC LICENSE FOR MORE DETAILS.
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License.
 #
-# YOU SHOULD HAVE RECEIVED A COPY OF THE GNU GENERAL PUBLIC LICENSE
-# ALONG WITH THIS PROGRAM; IF NOT, WRITE TO EDF R&D CODE_ASTER,
-#    1 AVENUE DU GENERAL DE GAULLE, 92141 CLAMART CEDEX, FRANCE.
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
 #
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
-# ======================================================================
 """
 """
-import string
-
+from __future__ import absolute_import
 import Noyau
 
-try:
-  import prefs
-  lang=prefs.lang
-except:
-  lang='fr'
-
-import CONNECTOR
+from . import CONNECTOR
 
 class OBJECT:
   from Noyau.N_CO import CO
@@ -115,6 +107,14 @@ class OBJECT:
     """
     return [],[]
 
+  def get_genealogie_precise(self):
+    if self.parent:
+       l=self.parent.get_genealogie_precise()
+       l.append(self.nom.strip())
+       return l
+    else:
+       return [self.nom.strip()]
+
   def get_genealogie(self):
     """ 
         Retourne la liste des noms des ascendants (noms de MCSIMP,MCFACT,MCBLOC
@@ -122,20 +122,27 @@ class OBJECT:
     """
     if self.parent:
        l=self.parent.get_genealogie()
-       l.append(string.strip(self.nom))
+       l.append(self.nom.strip())
        return l
     else:
-       return [string.strip(self.nom)]
+       return [self.nom.strip()]
 
   def get_fr(self):
      """
          Retourne la chaine d'aide contenue dans le catalogue
          en tenant compte de la langue
      """
-     try :
-        return getattr(self.definition,lang)
+     try:
+     #if 1 :
+        c=getattr(self.definition,self.jdc.lang)
+        return c
      except:
-        return ''
+     #else:
+        try :
+            c=getattr(self.definition,"fr")
+            return c
+        except :
+            return ''
 
   def update_concept(self,sd):
      pass