pour les nouvelles prefs

diff --git a/Aster/CMakeLists.txt b/Aster/CMakeLists.txt
index 431105707289718f796fba1ac1df1643b6fb6114..0ba9bdbb1e2ff269ce62c957b1da41560b4c9e55 100644 (file)
--- 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 bf54b9eeb6d7bb4b4db4bdd662ded37501aa2729..2dc0bed620df104e07c895ce3ab2a677e3f9f202 100644 (file)
--- 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