X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=Openturns_Wrapper%2Fconfiguration_OPENTURNS_WRAPPER.py;h=64d0b05ed879ac8baa8d77fba3e31e315c60d6d3;hb=16d5922e798b1254eb558678612711d72ed38b32;hp=f15bcd9932abaad886449fd8201713361e76acec;hpb=61f2a263b67981f299c496ce7ef8bccc3ac6e68b;p=tools%2Feficas.git

diff --git a/Openturns_Wrapper/configuration_OPENTURNS_WRAPPER.py b/Openturns_Wrapper/configuration_OPENTURNS_WRAPPER.py
index f15bcd99..64d0b05e 100644
--- a/Openturns_Wrapper/configuration_OPENTURNS_WRAPPER.py
+++ b/Openturns_Wrapper/configuration_OPENTURNS_WRAPPER.py
@@ -1,25 +1,24 @@
 # -*- 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
 #
-# ======================================================================
 """
-    Ce module sert pour charger les paramètres de configuration d'EFICAS
+    Ce module sert pour charger les paramètres de configuration d'EFICAS
 """
 # Modules Python
 import configuration
@@ -32,25 +31,20 @@ class CONFIG(configuration.CONFIG_BASE):
   def __init__(self,appli,repIni):
   #-----------------------------------
 
-      configuration.CONFIG_BASE.__init__(self,appli,repIni,'.Eficas_Openturns')
-      self.INSTALLDIR =os.path.dirname(__file__)
-
-      self.labels_user=['exec_acrobat', 'catalogues','savedir','path_doc','OpenTURNS_path']
-      self.labels_eficas=["OpenTURNS_path","rep_user","INSTALLDIR","path_doc","exec_acrobat"]
-      self.labels_eficas=self.labels_eficas+["rep_cata","initialdir","savedir","catalogues"]
-      self.setValeurs()
-      self.cataFile="catalogues_openturns.ini"
 
+      self.labels_user=['exec_acrobat', 'catalogues','savedir','path_doc']
+      self.labels_eficas=["OpenTURNS_path","path_doc","exec_acrobat"]
+      self.labels_eficas=self.labels_eficas+["rep_cata","lang","catalogues"]
+      configuration.CONFIG_BASE.__init__(self,appli,repIni)
 
   #---------------------------------------
   def lecture_fichier_ini_standard(self):
   #---------------------------------------
        configuration.CONFIG_BASE.lecture_fichier_ini_standard(self)
-       if hasattr(self,'OpenTURNS_path') :
-         self.oldOTPath=self.OpenTURNS_path
+       if hasattr(self,'OpenTURNS_path') : self.oldOTPath=self.OpenTURNS_path
 
   #---------------------------------------
-  def lecture_fichier_ini_utilisateur(self):
+  def lecture_fichier_ini_integrateur(self):
   #---------------------------------------
        configuration.CONFIG_BASE.lecture_fichier_ini_utilisateur(self)
        if hasattr(self,'OpenTURNS_path') :