From 4d00e79f323cd4d567c6975e206ab770a911c7e9 Mon Sep 17 00:00:00 2001 From: Pascale Noyret Date: Thu, 9 Feb 2012 15:06:22 +0000 Subject: [PATCH] pour les nouvelles prefs --- Aster/CMakeLists.txt | 3 ++- Editeur/catadesc.py | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Aster/CMakeLists.txt b/Aster/CMakeLists.txt index 43110570..0ba9bdbb 100644 --- a/Aster/CMakeLists.txt +++ b/Aster/CMakeLists.txt @@ -24,7 +24,8 @@ install ( FILES configuration_ASTER.py __init__.py prefs_ASTER.py prefs.py properties.py qtEficas_aster.py qtGroup.py style.py - editeur_salome.ini editeur.ini eficas_aster.py + #editeur_salome.ini editeur.ini + eficas_aster.py LICENSE.TERMS DESTINATION ${CMAKE_INSTALL_PREFIX}/Aster ) diff --git a/Editeur/catadesc.py b/Editeur/catadesc.py index bf54b9ee..2dc0bed6 100644 --- a/Editeur/catadesc.py +++ b/Editeur/catadesc.py @@ -22,7 +22,7 @@ class CatalogDescription: def __init__(self, identifier, cata_file_path, file_format = "python", - default = False, code = None, user_name = None, + default = False, code = None,ss_code=None, user_name = None, selectable = True, file_format_in = "python"): """ This class can be used to describe an Eficas catalog. @@ -45,6 +45,9 @@ class CatalogDescription: :param code: Deprecated. Used to indicate the code associated to this catalog + :type ss_code: string + :param ss_code: scheme associated to this catalog (Map only) + :type user_name: string :param user_name: name of the catalog as it will appear in the list @@ -75,6 +78,7 @@ class CatalogDescription: identifier = cata_tuple[1], cata_file_path = cata_tuple[2], file_format = cata_tuple[3]) + if len(cata_tuple) == 5: if cata_tuple[4] == "defaut": desc.default = True -- 2.39.2