AccasintegrationRN5CWeb

diff --git a/Accas/A_ASSD.py b/Accas/A_ASSD.py
index 28b67b2a360a7b2f4bbaaf73fb5e0cd4517702f9..441e20436dfcb09b187ea08e726203eb9b8736c9 100644 (file)
--- a/Accas/A_ASSD.py
+++ b/Accas/A_ASSD.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2007-2021   EDF R&D
+# Copyright (C) 2007-2024   EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -18,7 +18,6 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-from __future__ import absolute_import
 from Ihm import I_ASSD
 from Ihm import I_LASSD
 from Ihm import I_FONCTION
@@ -34,33 +33,49 @@ from Noyau import N_UserASSDMultiple
 # pour faire en sorte que isinstance(o,ASSD) marche encore apres
 # derivation
 
-class ASSD(I_ASSD.ASSD,N_ASSD.ASSD):pass
-#class LASSD(I_LASSD.LASSD,N_LASSD.LASSD):pass
-class LASSD(I_LASSD.LASSD):pass
-class UserASSD(N_UserASSD.UserASSD,ASSD): pass
-class UserASSDMultiple(N_UserASSDMultiple.UserASSDMultiple,UserASSD): pass
 
-class assd(N_ASSD.assd,I_ASSD.assd,ASSD):pass
+class ASSD(I_ASSD.ASSD, N_ASSD.ASSD):
+    pass
 
-class FONCTION(N_FONCTION.FONCTION,I_FONCTION.FONCTION,ASSD):
-    def __init__(self,etape=None,sd=None,reg='oui'):
-        N_FONCTION.FONCTION.__init__(self,etape=etape,sd=sd,reg=reg)
-        I_FONCTION.FONCTION.__init__(self,etape=etape,sd=sd,reg=reg)
+# class LASSD(I_LASSD.LASSD,N_LASSD.LASSD):pass
+class LASSD(I_LASSD.LASSD):
+    pass
 
-class formule(I_FONCTION.formule,N_FONCTION.formule,ASSD):
-    def __init__(self,etape=None,sd=None,reg='oui'):
-        N_FONCTION.formule.__init__(self,etape=etape,sd=sd,reg=reg)
-        I_FONCTION.formule.__init__(self,etape=etape,sd=sd,reg=reg)
+class UserASSD(N_UserASSD.UserASSD, ASSD):
+    pass
 
-class formule_c(formule):pass
+class UserASSDMultiple(N_UserASSDMultiple.UserASSDMultiple, UserASSD):
+    pass
+
+class assd(N_ASSD.assd, I_ASSD.assd, ASSD):
+    pass
+
+class FONCTION(N_FONCTION.FONCTION, I_FONCTION.FONCTION, ASSD):
+    def __init__(self, etape=None, sd=None, reg="oui"):
+        N_FONCTION.FONCTION.__init__(self, etape=etape, sd=sd, reg=reg)
+        I_FONCTION.FONCTION.__init__(self, etape=etape, sd=sd, reg=reg)
+
+class formule(I_FONCTION.formule, N_FONCTION.formule, ASSD):
+    def __init__(self, etape=None, sd=None, reg="oui"):
+        N_FONCTION.formule.__init__(self, etape=etape, sd=sd, reg=reg)
+        I_FONCTION.formule.__init__(self, etape=etape, sd=sd, reg=reg)
+
+class formule_c(formule):
+    pass
 
 # On conserve fonction (ceinture et bretelles)
 # fonction n'existe plus dans N_FONCTION on le remplace par formule
-class fonction(N_FONCTION.formule,I_FONCTION.fonction,ASSD):
-    def __init__(self,etape=None,sd=None,reg='oui'):
-        N_FONCTION.formule.__init__(self,etape=etape,sd=sd,reg=reg)
-        I_FONCTION.fonction.__init__(self,etape=etape,sd=sd,reg=reg)
+class fonction(N_FONCTION.formule, I_FONCTION.fonction, ASSD):
+    """ obsolete class : use formule instead"""
+    def __init__(self, etape=None, sd=None, reg="oui"):
+        N_FONCTION.formule.__init__(self, etape=etape, sd=sd, reg=reg)
+        I_FONCTION.fonction.__init__(self, etape=etape, sd=sd, reg=reg)
+
+class GEOM(N_GEOM.GEOM, I_ASSD.GEOM, ASSD):
+    pass
+
+class geom(N_GEOM.geom, I_ASSD.geom, ASSD):
+    pass
 
-class GEOM(N_GEOM.GEOM,I_ASSD.GEOM,ASSD):pass
-class geom(N_GEOM.geom,I_ASSD.geom,ASSD):pass
-class CO(N_CO.CO,I_ASSD.CO,ASSD):pass
+class CO(N_CO.CO, I_ASSD.CO, ASSD):
+    pass

diff --git a/Accas/A_AU_MOINS_UN.py b/Accas/A_AU_MOINS_UN.py
index 1bcb4e003507fe659d69728cc9910ce6ef48c1ff..e68be303837fea478f638506b852014024e5f37b 100644 (file)
--- a/Accas/A_AU_MOINS_UN.py
+++ b/Accas/A_AU_MOINS_UN.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2007-2021   EDF R&D
+# Copyright (C) 2007-2024   EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -17,14 +17,14 @@
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
-from __future__ import absolute_import
 from Noyau import N_REGLE
 from Validation import V_AU_MOINS_UN
 from Ihm import I_REGLE
 
-class AU_MOINS_UN(V_AU_MOINS_UN.AU_MOINS_UN,I_REGLE.REGLE,N_REGLE.REGLE):
+
+class AU_MOINS_UN(V_AU_MOINS_UN.AU_MOINS_UN, I_REGLE.REGLE, N_REGLE.REGLE):
     """
-        La classe utilise l'initialiseur de REGLE. Il n'est pas
-        necessaire d'expliciter son initialiseur car
-        seule N_REGLE.REGLE en a un
+    Accas class for catalog rule AU_MOINS_UN
+    __init__ is in N_REGLE.REGLE
     """
+    pass

diff --git a/Accas/A_AU_PLUS_UN.py b/Accas/A_AU_PLUS_UN.py
index 8bdcc34f2e118b31613e6b1796d1d9aaeee86175..70295f7435dd50afa93d3274dfb095a431cbf374 100644 (file)
--- a/Accas/A_AU_PLUS_UN.py
+++ b/Accas/A_AU_PLUS_UN.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2007-2021   EDF R&D
+# Copyright (C) 2007-2024   EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -17,15 +17,14 @@
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
-from __future__ import absolute_import
 from Noyau import N_REGLE
 from Validation import V_AU_PLUS_UN
 from Ihm import I_REGLE
 
-class AU_PLUS_UN(V_AU_PLUS_UN.AU_PLUS_UN,I_REGLE.REGLE,N_REGLE.REGLE):
+
+class AU_PLUS_UN(V_AU_PLUS_UN.AU_PLUS_UN, I_REGLE.REGLE, N_REGLE.REGLE):
     """
-        La classe utilise l'initialiseur de REGLE. Il n'est pas
-        necessaire d'expliciter son initialiseur car
-        V_AU_PLUS_UN.AU_PLUS_UN n'en a pas
-        V_UN_PARMI.UN_PARMI et I_REGLE.REGLE  n'en ont pas
+    Accas class for catalog rule AU_PLUS_UN 
+    class instantiation automatically invokes REGLE.__init__() 
     """
+    pass

diff --git a/Accas/A_AVANT.py b/Accas/A_AVANT.py
index f32f1fa24940424477381e1dbcb6d2de88c7161d..9c1525c41c60fb3b9a91a2ae9002c959b7bc8a83 100644 (file)
--- a/Accas/A_AVANT.py
+++ b/Accas/A_AVANT.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2007-2021   EDF R&D
+# Copyright (C) 2007-2024   EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -17,13 +17,13 @@
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
-from __future__ import absolute_import
 from Noyau import N_REGLE
 from Ihm import I_REGLE, I_AVANT
 
-class AVANT(I_AVANT.I_AVANT,I_REGLE.REGLE,N_REGLE.REGLE):
+
+class AVANT(I_AVANT.I_AVANT, I_REGLE.REGLE, N_REGLE.REGLE):
     """
-        La classe utilise l'initialiseur de REGLE. Il n'est pas
-        necessaire d'expliciter son initialiseur car
-        I_AVANT.I_AVANT et I_REGLE.REGLE  n'en ont pas
+    Accas class for catalog rule AVANT
+    class instantiation automatically invokes REGLE.__init__()
     """
+    pass

diff --git a/Accas/A_A_CLASSER.py b/Accas/A_A_CLASSER.py
index 1e9e3fcc754290230f08846c6258866f1c812d49..c8c82960c3c4514de345070d3ae1e8f20e4666b1 100644 (file)
--- a/Accas/A_A_CLASSER.py
+++ b/Accas/A_A_CLASSER.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2007-2021   EDF R&D
+# Copyright (C) 2007-2024   EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -17,13 +17,17 @@
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
-from __future__ import absolute_import
 from Noyau import N_REGLE
 from Validation import V_A_CLASSER
 from Ihm import I_A_CLASSER
 
-class A_CLASSER(V_A_CLASSER.A_CLASSER,N_REGLE.REGLE,I_A_CLASSER.A_CLASSER):
+
+class A_CLASSER(V_A_CLASSER.A_CLASSER, N_REGLE.REGLE, I_A_CLASSER.A_CLASSER):
     """
-        La classe utilise l'initialiseur  du module V_.
-        Il faut absolument que V_A_CLASSER soit en premier dans l'heritage
+    Accas class for catalog rule A_CLASSER 
+    It is absolutely necessary that V_A_CLASSER be first in the inheritance
     """
+    # to do --> prevoir un X_A_CLASSER pour la projection XSD 
+    # Est-ce possible en 1ere passe ou faut-il modifier pendant une 2nd passe ?
+    # ajouter une methode dump a tous les objets ?
+    pass

diff --git a/Accas/A_BLOC.py b/Accas/A_BLOC.py
index d68b28e35d2d404799753df01db2f43600d40a09..13cbbaa658fa0cc33c92bdc0a570298be1a506e5 100644 (file)
--- a/Accas/A_BLOC.py
+++ b/Accas/A_BLOC.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2007-2021   EDF R&D
+# Copyright (C) 2007-2024   EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -17,15 +17,18 @@
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
-from __future__ import absolute_import
 from Noyau import N_BLOC
 from Ihm import I_ENTITE
 from Accas import A_MCBLOC
-from Efi2Xsd.AccasXsd  import X_BLOC
+from Efi2Xsd.AccasXsd import X_BLOC
 
 
-class BLOC(N_BLOC.BLOC,X_BLOC,I_ENTITE.ENTITE):
-    class_instance=A_MCBLOC.MCBLOC
-    def __init__(self,*tup,**args):
+class BLOC(N_BLOC.BLOC, X_BLOC, I_ENTITE.ENTITE):
+    """
+    Accas class for catalog definition keyword BLOC
+    """
+    class_instance = A_MCBLOC.MCBLOC
+
+    def __init__(self, *tup, **args):
         I_ENTITE.ENTITE.__init__(self)
-        N_BLOC.BLOC.__init__(self,*tup,**args)
+        N_BLOC.BLOC.__init__(self, *tup, **args)

diff --git a/Accas/A_ENSEMBLE.py b/Accas/A_ENSEMBLE.py
index 62d289fa9d5785b11400f8a09e81040327989426..c0a66c28bac2d2d7df780a9d344642a11bfcd3d1 100644 (file)
--- a/Accas/A_ENSEMBLE.py
+++ b/Accas/A_ENSEMBLE.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2007-2021   EDF R&D
+# Copyright (C) 2007-2024   EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -17,15 +17,14 @@
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
-from __future__ import absolute_import
 from Noyau import N_REGLE
 from Validation import V_ENSEMBLE
 from Ihm import I_REGLE
 
-class ENSEMBLE(I_REGLE.REGLE,V_ENSEMBLE.ENSEMBLE,N_REGLE.REGLE):
+
+class ENSEMBLE(I_REGLE.REGLE, V_ENSEMBLE.ENSEMBLE, N_REGLE.REGLE):
     """
-        La classe utilise l'initialiseur de REGLE. Il n'est pas
-        necessaire d'expliciter son initialiseur car
-        seule N_REGLE.REGLE en a un
-    
+    Accas class for catalog rule ENSEMBLE
+    class instantiation automatically invokes REGLE.__init__()
     """
+    pass

diff --git a/Accas/A_ETAPE.py b/Accas/A_ETAPE.py
index 301dfd9ff42d2b9077f3e8c2aa07c349c4c847cb..08bfbe80780708c65e85485059a4db54c5544faf 100644 (file)
--- a/Accas/A_ETAPE.py
+++ b/Accas/A_ETAPE.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2007-2021   EDF R&D
+# Copyright (C) 2007-2024   EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -17,13 +17,17 @@
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
-from __future__ import absolute_import
 from Noyau import N_ETAPE
 from Validation import V_ETAPE
 from Ihm import I_ETAPE
-from Efi2Xsd.MCAccasXML  import X_ETAPE
+from Efi2Xsd.MCAccasXML import X_ETAPE
 
-class ETAPE(I_ETAPE.ETAPE,V_ETAPE.ETAPE,X_ETAPE,N_ETAPE.ETAPE):
-    def __init__(self,oper=None,reuse=None,args={}):
-        N_ETAPE.ETAPE.__init__(self,oper,reuse,args)
+
+class ETAPE(I_ETAPE.ETAPE, V_ETAPE.ETAPE, X_ETAPE, N_ETAPE.ETAPE):
+    """
+    parent class for PROC, MACRO and OPER (JDD object)
+    """
+
+    def __init__(self, oper=None, reuse=None, args={}):
+        N_ETAPE.ETAPE.__init__(self, oper, reuse, args)
         V_ETAPE.ETAPE.__init__(self)

diff --git a/Accas/A_EVAL.py b/Accas/A_EVAL.py
index 16905ee21f1696ce31d60febbc35dcb13b162c5a..428c467f2c8719e31ccd0aa54b9749c653bce10c 100644 (file)
--- a/Accas/A_EVAL.py
+++ b/Accas/A_EVAL.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2007-2021   EDF R&D
+# Copyright (C) 2007-2024   EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -17,9 +17,11 @@
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
-from __future__ import absolute_import
 from Ihm import I_EVAL
 
 class EVAL(I_EVAL.EVAL):
-    def __init__(self,str):
-        I_EVAL.EVAL.__init__(self,str)
+    """
+    class used to evaluate parameter
+    """
+    def __init__(self, str):
+        I_EVAL.EVAL.__init__(self, str)

diff --git a/Accas/A_EXCLUS.py b/Accas/A_EXCLUS.py
index d302aaf24b23c67b300a4b6e9441834d98ea0936..a144986f8541d3ca6de763926dbd56f9d00e3734 100644 (file)
--- a/Accas/A_EXCLUS.py
+++ b/Accas/A_EXCLUS.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2007-2021   EDF R&D
+# Copyright (C) 2007-2024   EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -17,14 +17,14 @@
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
-from __future__ import absolute_import
 from Noyau import N_REGLE
 from Validation import V_EXCLUS
 from Ihm import I_EXCLUS
 
-class EXCLUS(I_EXCLUS.EXCLUS,V_EXCLUS.EXCLUS,N_REGLE.REGLE):
+
+class EXCLUS(I_EXCLUS.EXCLUS, V_EXCLUS.EXCLUS, N_REGLE.REGLE):
     """
-        La classe utilise l'initialiseur de REGLE. Il n'est pas
-        necessaire d'expliciter son initialiseur car
-        I_EXCLUS.EXCLUS V_EXCLUS.EXCLUS n'en ont pas
+    Accas class for catalog rule EXCLUS
+    class instantiation automatically invokes REGLE.__init__()
     """
+    pass

diff --git a/Accas/A_FACT.py b/Accas/A_FACT.py
index 27ee372d1eca949e6b56764c8b08e7de13676944..b865eac36700c50e1f7a233f0caf75eb868ba5b3 100644 (file)
--- a/Accas/A_FACT.py
+++ b/Accas/A_FACT.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2007-2021   EDF R&D
+# Copyright (C) 2007-2024   EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -17,23 +17,30 @@
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
-from __future__ import absolute_import
 from Noyau import N_FACT
 from Ihm import I_ENTITE
 from Accas import A_MCFACT
 from Accas import A_MCLIST
-from Efi2Xsd.AccasXsd  import X_FACT
+from Efi2Xsd.AccasXsd import X_FACT
 
 
-class FACT(N_FACT.FACT,X_FACT,I_ENTITE.ENTITE):
+class FACT(N_FACT.FACT, X_FACT, I_ENTITE.ENTITE):
+    """
+    Accas class for catalog definition keyword FACT
+    """
     class_instance = A_MCFACT.MCFACT
-    list_instance  = A_MCLIST.MCList
-    def __init__(self,*tup,**args):
+    list_instance = A_MCLIST.MCList
+
+    def __init__(self, *tup, **args):
         I_ENTITE.ENTITE.__init__(self)
-        N_FACT.FACT.__init__(self,*tup,**args)
+        N_FACT.FACT.__init__(self, *tup, **args)
+
 
 from Noyau import N_OBJECT
 from Ihm import I_OBJECT
 
-class ErrorObj(I_OBJECT.ErrorObj,N_OBJECT.ErrorObj):pass
-N_OBJECT.ErrorObj=ErrorObj
+class ErrorObj(I_OBJECT.ErrorObj, N_OBJECT.ErrorObj):
+    pass
+
+
+N_OBJECT.ErrorObj = ErrorObj

diff --git a/Accas/A_FICHIER.py b/Accas/A_FICHIER.py
index 473f4058213e01c692820176050d1da8f2ed04b1..e17f496dd82fdd5b767dcb4a5beb1f3e5285dd0f 100644 (file)
--- a/Accas/A_FICHIER.py
+++ b/Accas/A_FICHIER.py
@@ -1,4 +1,5 @@
-# Copyright (C) 2007-2021   EDF R&D
+# -*- coding: utf-8 -*-
+# Copyright (C) 2007-2024   EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -16,14 +17,15 @@
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
-
-# This empty class is replaced by the class eficas.SalomeEntry
-# (defined in Salome EFICAS module) when Eficas is launched in Salome context.
-# It handles the objects that can be selected from Salome object browser.
-
-from __future__ import absolute_import
 from Ihm import I_FICHIER
 
-class Fichier (I_FICHIER.Fichier):
-    def __init__(self,*tup,**args):
-        I_FICHIER.FICHIER.__init__(self,*tup,**args)
+
+class Fichier(I_FICHIER.Fichier):
+    """
+    This empty class is replaced by the class eficas.SalomeEntry
+    (defined in Salome EFICAS module) when Eficas is launched in Salome context.
+    It handles the objects that can be selected from Salome object browser.
+    """
+    def __init__(self, *tup, **args):
+        I_FICHIER.FICHIER.__init__(self, *tup, **args)
+    # To do --> a travailler pour ajouter tous les types de fichier (existant ou non, avec un chemin relatif pour etre vraiment utilise hors salome

diff --git a/Accas/A_FORM.py b/Accas/A_FORM.py
index c310fa11d9bdd3b7793996b897f5cc6ddf943ddd..fd8d38074be7895aad9b0d0013aec65ae2faef7f 100644 (file)
--- a/Accas/A_FORM.py
+++ b/Accas/A_FORM.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2007-2021   EDF R&D
+# Copyright (C) 2007-2024   EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -20,7 +20,11 @@
 from __future__ import absolute_import
 from Noyau import N_FORM
 from Ihm import I_ENTITE
-from . import A_FORM_ETAPE
+from Accas import A_FORM_ETAPE
 
-class FORM(N_FORM.FORM,I_ENTITE.ENTITE):
-    class_instance=A_FORM_ETAPE.FORM_ETAPE
+
+class FORM(N_FORM.FORM, I_ENTITE.ENTITE):
+    """
+    Accas class for catalog definition keyword FORMULE
+    """
+    class_instance = A_FORM_ETAPE.FORM_ETAPE

diff --git a/Accas/A_FORM_ETAPE.py b/Accas/A_FORM_ETAPE.py
index b6161946ba5087bfbd2d5410b94f465bd5710457..1aeef15ab63c26fed17fc75567445bd924cd9eca 100644 (file)
--- a/Accas/A_FORM_ETAPE.py
+++ b/Accas/A_FORM_ETAPE.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2007-2021   EDF R&D
+# Copyright (C) 2007-2024   EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -18,13 +18,17 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-from __future__ import absolute_import
 from Noyau import N_FORM_ETAPE
 from Validation import V_MACRO_ETAPE
 from Ihm import I_FORM_ETAPE
 
-class FORM_ETAPE(I_FORM_ETAPE.FORM_ETAPE,V_MACRO_ETAPE.MACRO_ETAPE,N_FORM_ETAPE.FORM_ETAPE):
-    def __init__(self,oper=None,reuse=None,args={}):
-        N_FORM_ETAPE.FORM_ETAPE.__init__(self,oper,reuse,args)
+
+class FORM_ETAPE( I_FORM_ETAPE.FORM_ETAPE, V_MACRO_ETAPE.MACRO_ETAPE, N_FORM_ETAPE.FORM_ETAPE):
+    """
+    specific class for Aster FORM_ETAPE 
+    most likely as MACRO
+    """
+    def __init__(self, oper=None, reuse=None, args={}):
+        N_FORM_ETAPE.FORM_ETAPE.__init__(self, oper, reuse, args)
         V_MACRO_ETAPE.MACRO_ETAPE.__init__(self)
         I_FORM_ETAPE.FORM_ETAPE.__init__(self)

diff --git a/Accas/A_JDC.py b/Accas/A_JDC.py
index cc05f3056ff062530646ee2905672a791a17f486..de6f1ede196245b826115f8d8139e5a3ca0d7c8e 100644 (file)
--- a/Accas/A_JDC.py
+++ b/Accas/A_JDC.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2007-2021   EDF R&D
+# Copyright (C) 2007-2024   EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -17,20 +17,23 @@
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
-from __future__ import absolute_import
 from Noyau import N_JDC
 from Validation import V_JDC
 from Extensions import jdc
 from Ihm import I_JDC
-from Efi2Xsd.MCAccasXML  import X_JDC
+from Efi2Xsd.MCAccasXML import X_JDC
 
-class JDC(jdc.JDC,I_JDC.JDC,X_JDC,V_JDC.JDC,N_JDC.JDC):
-    from .A_ASSD import CO,assd
 
-    def __init__(self,*pos,**args):
-        N_JDC.JDC.__init__(self,*pos,**args)
+class JDC(jdc.JDC, I_JDC.JDC, X_JDC, V_JDC.JDC, N_JDC.JDC):
+    """
+    parent class for dataset object (JDC) 
+    """
+    from .A_ASSD import CO, assd
+
+    def __init__(self, *pos, **args):
+        N_JDC.JDC.__init__(self, *pos, **args)
         X_JDC.__init__(self)
         V_JDC.JDC.__init__(self)
         I_JDC.JDC.__init__(self)
         jdc.JDC.__init__(self)
-        self.icmd=0
+        self.icmd = 0

diff --git a/Accas/A_JDC_CATA.py b/Accas/A_JDC_CATA.py
index 1e34ba1046cbc8262a62b875310e1951e8174387..384a35501a37c1d3172e8802a03a7b5111971745 100644 (file)
--- a/Accas/A_JDC_CATA.py
+++ b/Accas/A_JDC_CATA.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2007-2021   EDF R&D
+# Copyright (C) 2007-2024   EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -17,16 +17,21 @@
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
-from __future__ import absolute_import
-from . import A_JDC
+from Accas import A_JDC
 from Noyau import N_JDC_CATA
 from Ihm import I_JDC_CATA
-from Efi2Xsd.AccasXsd  import X_JDC_CATA
+from Efi2Xsd.AccasXsd import X_JDC_CATA
 
-class JDC_CATA(I_JDC_CATA.JDC_CATA,N_JDC_CATA.JDC_CATA,X_JDC_CATA):
-    class_instance=A_JDC.JDC
-    def __init__(self,*pos,**kw):
-        #print pos
-        #print kw
-        N_JDC_CATA.JDC_CATA.__init__(self,*pos,**kw)
+
+class JDC_CATA(I_JDC_CATA.JDC_CATA, N_JDC_CATA.JDC_CATA, X_JDC_CATA):
+    """
+    Accas class that defines a catalog object that is object which will be used 
+    to control conformity of the dataset with its definition
+    """
+    class_instance = A_JDC.JDC
+
+    def __init__(self, *pos, **kw):
+        # print (pos)
+        # print (kw)
+        N_JDC_CATA.JDC_CATA.__init__(self, *pos, **kw)
         I_JDC_CATA.JDC_CATA.__init__(self)

diff --git a/Accas/A_JDC_CATA_SINGLETON.py b/Accas/A_JDC_CATA_SINGLETON.py
new file mode 100644 (file)
index 0000000..5a69ffc
--- /dev/null
+++ b/Accas/A_JDC_CATA_SINGLETON.py
@@ -0,0 +1,37 @@
+# -*- coding: utf-8 -*-
+# Copyright (C) 2007-2024   EDF R&D
+#
+# 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.
+#
+# 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
+#
+
+from Noyau.N_utils import Singleton
+from Accas import JDC_CATA
+
+class JDC_CATA_SINGLETON(Singleton, JDC_CATA):
+    """
+    class used for defining catalogs which can be either standalone
+    either imported by another catalog
+    the steps are recorded in the correct JDC_CATA
+    """
+    def __init__(self, *pos, **kw):
+        if hasattr(self, "initialised"):
+            return
+        self.initialised = True
+        JDC_CATA.__init__(self, *pos, **kw)
+     # to do : reflechir pour les imports des drivers a utiliser le nom du code 
+     # de maniere a pour pourvoir utiliser n importe lequel des driver pour lire
+     # le XML

diff --git a/Accas/A_MACRO.py b/Accas/A_MACRO.py
index b8f7b93bd8656809e300f1ac10968fba3b53dcb2..7b63bfea794488b100a98fdd24c9551b134fe442 100644 (file)
--- a/Accas/A_MACRO.py
+++ b/Accas/A_MACRO.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2007-2021   EDF R&D
+# Copyright (C) 2007-2024   EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -22,8 +22,14 @@ from Noyau import N_MACRO
 from Ihm import I_ENTITE
 from . import A_MACRO_ETAPE
 
-class MACRO(N_MACRO.MACRO,I_ENTITE.ENTITE):
-    class_instance=A_MACRO_ETAPE.MACRO_ETAPE
-    def __init__(self,*tup,**args):
+
+class MACRO(N_MACRO.MACRO, I_ENTITE.ENTITE):
+    """
+    parent class of MACRO definition
+    unused class that could/should be reactivated
+    """
+    class_instance = A_MACRO_ETAPE.MACRO_ETAPE
+
+    def __init__(self, *tup, **args):
         I_ENTITE.ENTITE.__init__(self)
-        N_MACRO.MACRO.__init__(self,*tup,**args)
+        N_MACRO.MACRO.__init__(self, *tup, **args)

diff --git a/Accas/A_MACRO_ETAPE.py b/Accas/A_MACRO_ETAPE.py
index 74ef0b4bd9b8921c8b9c6d5c54164ba770941cfa..b6610b91b2a709f46d99f15d3f231ca08e9e7b94 100644 (file)
--- a/Accas/A_MACRO_ETAPE.py
+++ b/Accas/A_MACRO_ETAPE.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2007-2021   EDF R&D
+# Copyright (C) 2007-2024   EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -17,19 +17,24 @@
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
-from __future__ import absolute_import
 from Noyau import N_MACRO_ETAPE
 from Validation import V_MACRO_ETAPE
 from Ihm import I_MACRO_ETAPE
-from .A_ASSD import CO
-from Efi2Xsd.MCAccasXML  import X_MCCOMPO
+from Accas.A_ASSD import CO
+from Efi2Xsd.MCAccasXML import X_MCCOMPO
 
-class MACRO_ETAPE(I_MACRO_ETAPE.MACRO_ETAPE,
-                  X_MCCOMPO,
-                  V_MACRO_ETAPE.MACRO_ETAPE,
-                  N_MACRO_ETAPE.MACRO_ETAPE):
-    typeCO=CO
-    def __init__(self,oper=None,reuse=None,args={}):
-        N_MACRO_ETAPE.MACRO_ETAPE.__init__(self,oper,reuse,args)
+
+class MACRO_ETAPE( I_MACRO_ETAPE.MACRO_ETAPE, X_MCCOMPO,
+                   V_MACRO_ETAPE.MACRO_ETAPE, N_MACRO_ETAPE.MACRO_ETAPE,):
+    """
+    parent class of MACRO objects
+    unused class that could/should be reactivated
+    a macro is a set of command 
+    differs from step (PROC or OPER) for supervision
+    """
+    typeCO = CO
+
+    def __init__(self, oper=None, reuse=None, args={}):
+        N_MACRO_ETAPE.MACRO_ETAPE.__init__(self, oper, reuse, args)
         V_MACRO_ETAPE.MACRO_ETAPE.__init__(self)
         I_MACRO_ETAPE.MACRO_ETAPE.__init__(self)

diff --git a/Accas/A_MCBLOC.py b/Accas/A_MCBLOC.py
index e871ffdabfb95cd1e465a3fd91b709269da87519..0de4377ddb78b3241e03e4c9dfa1ecd2cb5866ee 100644 (file)
--- a/Accas/A_MCBLOC.py
+++ b/Accas/A_MCBLOC.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2007-2021   EDF R&D
+# Copyright (C) 2007-2024   EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -21,10 +21,14 @@ from __future__ import absolute_import
 from Noyau import N_MCBLOC
 from Validation import V_MCBLOC
 from Ihm import I_MCBLOC
-from Efi2Xsd.MCAccasXML  import X_MCBLOC
+from Efi2Xsd.MCAccasXML import X_MCBLOC
 
 
-class MCBLOC(I_MCBLOC.MCBLOC,N_MCBLOC.MCBLOC,X_MCBLOC,V_MCBLOC.MCBLOC):
-    def __init__(self,val,definition,nom,parent,dicoPyxbDeConstruction=None):
-        N_MCBLOC.MCBLOC.__init__(self,val,definition,nom,parent,dicoPyxbDeConstruction=dicoPyxbDeConstruction)
+class MCBLOC(I_MCBLOC.MCBLOC, N_MCBLOC.MCBLOC, X_MCBLOC, V_MCBLOC.MCBLOC):
+    """
+    class of BLOC objet
+    """
+    def __init__(self, val, definition, nom, parent, dicoPyxbDeConstruction=None):
+        N_MCBLOC.MCBLOC.__init__(self, val, definition, nom,
+                        parent, dicoPyxbDeConstruction=dicoPyxbDeConstruction)
         V_MCBLOC.MCBLOC.__init__(self)

diff --git a/Accas/A_MCFACT.py b/Accas/A_MCFACT.py
index 87c5a3d461a37db8f4eb0af9423f31979298e00a..6cd1988faaa00227ab628e9d014e75f6d3af7afa 100644 (file)
--- a/Accas/A_MCFACT.py
+++ b/Accas/A_MCFACT.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2007-2021   EDF R&D
+# Copyright (C) 2007-2024   EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -21,9 +21,14 @@ from __future__ import absolute_import
 from Noyau import N_MCFACT
 from Validation import V_MCFACT
 from Ihm import I_MCFACT
-from Efi2Xsd.MCAccasXML  import X_MCFACT
+from Efi2Xsd.MCAccasXML import X_MCFACT
 
-class MCFACT(I_MCFACT.MCFACT,N_MCFACT.MCFACT,X_MCFACT,V_MCFACT.MCFACT):
-    def __init__(self,val,definition,nom,parent,dicoPyxbDeConstruction=None):
-        N_MCFACT.MCFACT.__init__(self,val,definition,nom,parent,dicoPyxbDeConstruction=dicoPyxbDeConstruction)
+
+class MCFACT(I_MCFACT.MCFACT, N_MCFACT.MCFACT, X_MCFACT, V_MCFACT.MCFACT):
+    """
+    class of FACT object (MCFACT = mot clef FACTEUR)
+    """
+    def __init__(self, val, definition, nom, parent, dicoPyxbDeConstruction=None):
+        N_MCFACT.MCFACT.__init__(self, val, definition, nom,
+                 parent, dicoPyxbDeConstruction=dicoPyxbDeConstruction)
         V_MCFACT.MCFACT.__init__(self)

diff --git a/Accas/A_MCLIST.py b/Accas/A_MCLIST.py
index f80f1368bee584ec065903b2bbb4bfbf82d7888b..810f37ba066d89c4564cd8d9116404218f622010 100644 (file)
--- a/Accas/A_MCLIST.py
+++ b/Accas/A_MCLIST.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2007-2021   EDF R&D
+# Copyright (C) 2007-2024   EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -21,9 +21,13 @@ from __future__ import absolute_import
 from Noyau import N_MCLIST
 from Validation import V_MCLIST
 from Ihm import I_MCLIST
-from Efi2Xsd.MCAccasXML  import X_MCLIST
+from Efi2Xsd.MCAccasXML import X_MCLIST
 
 
-class MCList(I_MCLIST.MCList,N_MCLIST.MCList,X_MCLIST,V_MCLIST.MCList):
+class MCList(I_MCLIST.MCList, N_MCLIST.MCList, X_MCLIST, V_MCLIST.MCList):
+    """
+    class of keywords which are also lists
+    overload the python list class
+    """
     def __init__(self):
         N_MCLIST.MCList.__init__(self)

diff --git a/Accas/A_MCNUPLET.py b/Accas/A_MCNUPLET.py
index 7451527084d1eee341070c60576e6d5d4d9a9089..09e4efe941d68f0bf137ab9939d3e8da70cbb56c 100644 (file)
--- a/Accas/A_MCNUPLET.py
+++ b/Accas/A_MCNUPLET.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2007-2021   EDF R&D
+# Copyright (C) 2007-2024   EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -17,10 +17,10 @@
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
-from __future__ import absolute_import
 from Extensions import mcnuplet
 from Ihm import I_MCCOMPO
 
-class MCNUPLET(mcnuplet.MCNUPLET,I_MCCOMPO.MCCOMPO):
-    def __init__(self,*pos,**args):
-        mcnuplet.MCNUPLET.__init__(self,*pos,**args)
+
+class MCNUPLET(mcnuplet.MCNUPLET, I_MCCOMPO.MCCOMPO):
+    def __init__(self, *pos, **args):
+        mcnuplet.MCNUPLET.__init__(self, *pos, **args)

diff --git a/Accas/A_MCSIMP.py b/Accas/A_MCSIMP.py
index 525262c7cf5e87030a499f1319c794fad701a5cd..b0618e42048979f1a3006e2d6b15525521cc952a 100644 (file)
--- a/Accas/A_MCSIMP.py
+++ b/Accas/A_MCSIMP.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2007-2021   EDF R&D
+# Copyright (C) 2007-2024   EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -17,14 +17,18 @@
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
-from __future__ import absolute_import
 from Noyau import N_MCSIMP
 from Validation import V_MCSIMP
 from Ihm import I_MCSIMP
-from Efi2Xsd.MCAccasXML  import X_MCSIMP
+from Efi2Xsd.MCAccasXML import X_MCSIMP
 
-class MCSIMP(I_MCSIMP.MCSIMP,N_MCSIMP.MCSIMP,X_MCSIMP,V_MCSIMP.MCSIMP):
-    def __init__(self,val,definition,nom,parent,objPyxbDeConstruction=None):
-    #le defaut de objPyxbDeConstruction permet de lire les comm avec des modeles sans equivalent XSD
+
+class MCSIMP(I_MCSIMP.MCSIMP, N_MCSIMP.MCSIMP, X_MCSIMP, V_MCSIMP.MCSIMP):
+    """
+    class for SIMP object (MCSIMP = mot clef simp)
+    """
+    def __init__(self, val, definition, nom, parent, objPyxbDeConstruction=None):
+        # le defaut de objPyxbDeConstruction permet de lire les comm 
+        # avec des modeles sans equivalent XSD
         N_MCSIMP.MCSIMP.__init__(self,val,definition,nom,parent,objPyxbDeConstruction)
         V_MCSIMP.MCSIMP.__init__(self)

diff --git a/Accas/A_MEME_NOMBRE.py b/Accas/A_MEME_NOMBRE.py
index 0bf042893a9137e77828edb76af50d6e2858d3a0..07f0b9bae6870fc85c31f3bdbef95a3196ddf20e 100644 (file)
--- a/Accas/A_MEME_NOMBRE.py
+++ b/Accas/A_MEME_NOMBRE.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2007-2021   EDF R&D
+# Copyright (C) 2007-2024   EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -22,9 +22,9 @@ from Noyau import N_REGLE
 from Validation import V_MEME_NOMBRE
 from Ihm import I_REGLE
 
-class MEME_NOMBRE(V_MEME_NOMBRE.MEME_NOMBRE,I_REGLE.REGLE,N_REGLE.REGLE):
+
+class MEME_NOMBRE(V_MEME_NOMBRE.MEME_NOMBRE, I_REGLE.REGLE, N_REGLE.REGLE):
     """
-        La classe utilise l'initialiseur de REGLE. Il n'est pas
-        necessaire d'expliciter son initialiseur car
-        seule N_REGLE.REGLE en a un
+    Accas class for catalog rule MEME_NOMBRE
     """
+    pass

diff --git a/Accas/A_NUPLET.py b/Accas/A_NUPLET.py
index 89ac50028ba3d08ced2100a1789be885740f60c2..16eab113ca6677abf8e3eb9295465f5403c29a3e 100644 (file)
--- a/Accas/A_NUPLET.py
+++ b/Accas/A_NUPLET.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2007-2021   EDF R&D
+# Copyright (C) 2007-2024   EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -17,11 +17,11 @@
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
-from __future__ import absolute_import
 from Extensions import nuplet
-from . import A_MCLIST
-from . import A_MCNUPLET
+from Accas import A_MCLIST
+from Accas import A_MCNUPLET
+
 
 class NUPL(nuplet.NUPL):
     class_instance = A_MCNUPLET.MCNUPLET
-    list_instance  = A_MCLIST.MCList
+    list_instance = A_MCLIST.MCList

diff --git a/Accas/A_OPER.py b/Accas/A_OPER.py
index 353a69efefc424503b6a87dd1067ab078278ec80..201a1c5f23cfbd5d663e182ff13e90c7d2e9f9a4 100644 (file)
--- a/Accas/A_OPER.py
+++ b/Accas/A_OPER.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2007-2021   EDF R&D
+# Copyright (C) 2007-2024   EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -21,11 +21,16 @@ from __future__ import absolute_import
 from Noyau import N_OPER
 from Ihm import I_ENTITE
 from Accas import A_ETAPE
-from Efi2Xsd.AccasXsd  import X_OPER
+from Efi2Xsd.AccasXsd import X_OPER
 
 
-class OPER(N_OPER.OPER,X_OPER,I_ENTITE.ENTITE):
-    class_instance=A_ETAPE.ETAPE
-    def __init__(self,*tup,**args):
+class OPER(N_OPER.OPER, X_OPER, I_ENTITE.ENTITE):
+    """
+    Accas class for catalog definition keyword OPER
+    """
+
+    class_instance = A_ETAPE.ETAPE
+
+    def __init__(self, *tup, **args):
         I_ENTITE.ENTITE.__init__(self)
-        N_OPER.OPER.__init__(self,*tup,**args)
+        N_OPER.OPER.__init__(self, *tup, **args)

diff --git a/Accas/A_PRESENT_ABSENT.py b/Accas/A_PRESENT_ABSENT.py
index b8a895f3cf1b257db8ff444df501b556fca3154e..5a6df3295d4b0437f714c994d7edc866921e6a24 100644 (file)
--- a/Accas/A_PRESENT_ABSENT.py
+++ b/Accas/A_PRESENT_ABSENT.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2007-2021   EDF R&D
+# Copyright (C) 2007-2024   EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -22,10 +22,12 @@ from Noyau import N_REGLE
 from Validation import V_PRESENT_ABSENT
 from Ihm import I_PRESENT_ABSENT
 
-class PRESENT_ABSENT(I_PRESENT_ABSENT.PRESENT_ABSENT,V_PRESENT_ABSENT.PRESENT_ABSENT,
-                     N_REGLE.REGLE):
+
+class PRESENT_ABSENT( I_PRESENT_ABSENT.PRESENT_ABSENT, 
+                      V_PRESENT_ABSENT.PRESENT_ABSENT, 
+                      N_REGLE.REGLE
+                    ):
     """
-        La classe utilise l'initialiseur de REGLE. Il n'est pas
-        necessaire d'expliciter son initialiseur car
-        seule N_REGLE.REGLE.py en a un
+    Accas class for catalog rule PRESENT_ABSENT
     """
+    pass

diff --git a/Accas/A_PRESENT_PRESENT.py b/Accas/A_PRESENT_PRESENT.py
index 9da2781cccd9f5df6fff15f8c621e19bd8cc4cb3..1cb636df7d0eb6ef422a068613cf2f22bdae74f7 100644 (file)
--- a/Accas/A_PRESENT_PRESENT.py
+++ b/Accas/A_PRESENT_PRESENT.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2007-2021   EDF R&D
+# Copyright (C) 2007-2024   EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -22,11 +22,11 @@ from Noyau import N_REGLE
 from Validation import V_PRESENT_PRESENT
 from Ihm import I_PRESENT_PRESENT
 
+
 class PRESENT_PRESENT(I_PRESENT_PRESENT.PRESENT_PRESENT,
                       V_PRESENT_PRESENT.PRESENT_PRESENT,
                       N_REGLE.REGLE):
     """
-        La classe utilise l'initialiseur de REGLE. Il n'est pas
-        necessaire d'expliciter son initialiseur car
-        seule N_REGLE.REGLE en a un
+    Accas class for catalog rule PRESENT_PRESENT
     """
+    pass

diff --git a/Accas/A_PROC.py b/Accas/A_PROC.py
index a22a170e4a0d2233fbf0984fc79805fa611cc725..283f59eab5130bcb1d8856e4fac79672715d9a5e 100644 (file)
--- a/Accas/A_PROC.py
+++ b/Accas/A_PROC.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2007-2021   EDF R&D
+# Copyright (C) 2007-2024   EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -17,16 +17,20 @@
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
-from __future__ import absolute_import
 from Noyau import N_PROC
 from Ihm import I_ENTITE
 from Accas import A_PROC_ETAPE
 from Efi2Xsd.AccasXsd import X_PROC
 
-class PROC(N_PROC.PROC,X_PROC,I_ENTITE.ENTITE):
-    class_instance=A_PROC_ETAPE.PROC_ETAPE
-    def __init__(self,*tup,**args):
-        #print (tup)
-        #print (args)
+
+class PROC(N_PROC.PROC, X_PROC, I_ENTITE.ENTITE):
+    """
+    Accas class for catalog definition keyword PROC
+    """
+    class_instance = A_PROC_ETAPE.PROC_ETAPE
+
+    def __init__(self, *tup, **args):
+        # print (tup)
+        # print (args)
         I_ENTITE.ENTITE.__init__(self)
-        N_PROC.PROC.__init__(self,*tup,**args)
+        N_PROC.PROC.__init__(self, *tup, **args)

diff --git a/Accas/A_PROC_ETAPE.py b/Accas/A_PROC_ETAPE.py
index 9f395ee0c2a67533410fa51b7d958406afedf58e..dcdd30627533a12fab18af0a523e75cd9438c2c3 100644 (file)
--- a/Accas/A_PROC_ETAPE.py
+++ b/Accas/A_PROC_ETAPE.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2007-2021   EDF R&D
+# Copyright (C) 2007-2024   EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -17,16 +17,19 @@
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
-from __future__ import absolute_import
 from Noyau import N_PROC_ETAPE
 from Validation import V_PROC_ETAPE
 from Ihm import I_PROC_ETAPE
-from Efi2Xsd.MCAccasXML  import X_MCCOMPO
+from Efi2Xsd.MCAccasXML import X_MCCOMPO
+
 
 class PROC_ETAPE(I_PROC_ETAPE.PROC_ETAPE,
                  V_PROC_ETAPE.PROC_ETAPE,
                  X_MCCOMPO,
                  N_PROC_ETAPE.PROC_ETAPE):
-    def __init__(self,oper=None,args={}):
-        N_PROC_ETAPE.PROC_ETAPE.__init__(self,oper=oper,args=args)
+    """
+    Accas class for dataset object PROC_ETAPE
+    """
+    def __init__(self, oper=None, args={}):
+        N_PROC_ETAPE.PROC_ETAPE.__init__(self, oper=oper, args=args)
         V_PROC_ETAPE.PROC_ETAPE.__init__(self)

diff --git a/Accas/A_SALOME_ENTRY.py b/Accas/A_SALOME_ENTRY.py
index e52b4cf99c976c25a7c886e6f01fc706f2f2c502..cfe688e021f0d163fdda57fa6d05e5b6ae5ab2b5 100644 (file)
--- a/Accas/A_SALOME_ENTRY.py
+++ b/Accas/A_SALOME_ENTRY.py
@@ -1,4 +1,5 @@
-# Copyright (C) 2007-2021   EDF R&D
+# -*- coding: utf-8 -*-
+# Copyright (C) 2007-2024   EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -17,10 +18,13 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-# This empty class is replaced by the class eficas.SalomeEntry
-# (defined in Salome EFICAS module) when Eficas is launched in Salome context.
-# It handles the objects that can be selected from Salome object browser.
-#from builtins import object
-#class SalomeEntry(object):
+
 class SalomeEntry:
+    """
+     This empty class is replaced by the class eficas.SalomeEntry
+     (defined in Salome EFICAS module) when Eficas is launched in Salome context.
+     It handles the objects that can be selected from Salome object browser.
+     from builtins import object
+     class SalomeEntry(object):
+    """
     pass

diff --git a/Accas/A_SENSIBILITE.py b/Accas/A_SENSIBILITE.py
index f59759a796ab0af416140d3a57082324770c9317..f41eaa7524d094ebcd3d5217132985b0115a9c27 100644 (file)
--- a/Accas/A_SENSIBILITE.py
+++ b/Accas/A_SENSIBILITE.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2007-2021   EDF R&D
+# Copyright (C) 2007-2024   EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -18,10 +18,26 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-from __future__ import absolute_import
 from Ihm import I_REGLE
 from Noyau import N_SENSIBILITE
 
-class REUSE_SENSIBLE(I_REGLE.REGLE,N_SENSIBILITE.REUSE_SENSIBLE):pass
-class CONCEPT_SENSIBLE(I_REGLE.REGLE,N_SENSIBILITE.CONCEPT_SENSIBLE):pass
-class DERIVABLE(I_REGLE.REGLE,N_SENSIBILITE.DERIVABLE):pass
+
+class REUSE_SENSIBLE(I_REGLE.REGLE, N_SENSIBILITE.REUSE_SENSIBLE):
+    """ 
+    obsolete class which was used by the supervisor
+    """
+    pass
+
+
+class CONCEPT_SENSIBLE(I_REGLE.REGLE, N_SENSIBILITE.CONCEPT_SENSIBLE):
+    """ 
+    obsolete class which was used by the supervisor
+    """
+    pass
+
+
+class DERIVABLE(I_REGLE.REGLE, N_SENSIBILITE.DERIVABLE):
+    """ 
+    obsolete class which was used by the supervisor
+    """
+    pass

diff --git a/Accas/A_SIMP.py b/Accas/A_SIMP.py
index 59c5f444c4f0bb27d059aa8ca80efd3519110289..6ec8d9d3b1c799f2db80243ae8a974078ea6c538 100644 (file)
--- a/Accas/A_SIMP.py
+++ b/Accas/A_SIMP.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2007-2021   EDF R&D
+# Copyright (C) 2007-2024   EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -17,16 +17,20 @@
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
-from __future__ import absolute_import
 from Noyau import N_SIMP
 from Ihm import I_ENTITE
 from Accas import A_MCSIMP
 from Efi2Xsd.AccasXsd import X_SIMP
 
-class SIMP(N_SIMP.SIMP,X_SIMP,I_ENTITE.ENTITE):
-    class_instance=A_MCSIMP.MCSIMP
-    def __init__(self,*tup,**args):
-        #print tup
-        #print args
+
+class SIMP(N_SIMP.SIMP, X_SIMP, I_ENTITE.ENTITE):
+    """ 
+    Accas class for catalog definition keyword SIMP
+    """
+    class_instance = A_MCSIMP.MCSIMP
+
+    def __init__(self, *tup, **args):
+        # print (tup)
+        # print (args)
         I_ENTITE.ENTITE.__init__(self)
-        N_SIMP.SIMP.__init__(self,*tup,**args)
+        N_SIMP.SIMP.__init__(self, *tup, **args)

diff --git a/Accas/A_TUPLE.py b/Accas/A_TUPLE.py
index 3abdd0679f479c5f9ebbcd45563e328680fc8098..8b2a1a4bd6b9d09415a6b724a669f2b6216f16d7 100644 (file)
--- a/Accas/A_TUPLE.py
+++ b/Accas/A_TUPLE.py
@@ -1,12 +1,37 @@
+# -*- coding: utf-8 -*-
+# Copyright (C) 2007-2024   EDF R&D
 #
-from __future__ import absolute_import
+# 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.
+#
+# 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
+#
+
 from Noyau import N_TUPLE
-from Ihm  import I_TUPLE
-
-class Tuple (N_TUPLE.N_Tuple): pass
-class Matrice (I_TUPLE.I_Matrice,N_TUPLE.N_Matrice):pass
-#      def __init__(self,*tup,**args):
-#          I_TUPLE.I_Matrice.__init__(self)
-#          N_TUPLE.N_Matrice(self,*tup,**args)
-#          print (tup)
-#          print (args)
+from Ihm import I_TUPLE
+
+
+class Tuple(N_TUPLE.N_Tuple):
+    """
+    Accas class for catalog definition keyword Tuple
+    """
+    pass
+
+
+class Matrice(I_TUPLE.I_Matrice, N_TUPLE.N_Matrice):
+    """
+    Accas class for catalog definition keyword Matrice
+    """
+    pass
+

diff --git a/Accas/A_UN_PARMI.py b/Accas/A_UN_PARMI.py
index f15504bdd017e6c5e13ad5453c2aacdb84460cbe..03bf197cabbb3aaa690103aad1d725440639d0ba 100644 (file)
--- a/Accas/A_UN_PARMI.py
+++ b/Accas/A_UN_PARMI.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2007-2021   EDF R&D
+# Copyright (C) 2007-2024   EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -17,14 +17,13 @@
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
-from __future__ import absolute_import
 from Noyau import N_REGLE
 from Validation import V_UN_PARMI
 from Ihm import I_UN_PARMI
 
-class UN_PARMI(I_UN_PARMI.UN_PARMI,V_UN_PARMI.UN_PARMI,N_REGLE.REGLE):
+
+class UN_PARMI(I_UN_PARMI.UN_PARMI, V_UN_PARMI.UN_PARMI, N_REGLE.REGLE):
     """
-        La classe utilise l'initialiseur de REGLE. Il n'est pas
-        necessaire d'expliciter son initialiseur car
-        V_UN_PARMI.UN_PARMI et I_UN_PARMI.UN_PARMI  n'en ont pas
+    Accas class for catalog rule UN_PARMI
     """
+    pass

diff --git a/Accas/A_VALIDATOR.py b/Accas/A_VALIDATOR.py
index e3f227eda3af0c03669ad453014287e28a312357..33bcf9790215694db54fb3645007edb2953b75c3 100644 (file)
--- a/Accas/A_VALIDATOR.py
+++ b/Accas/A_VALIDATOR.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2007-2021   EDF R&D
+# Copyright (C) 2007-2024   EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -17,5 +17,4 @@
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
-from __future__ import absolute_import
 from Ihm.I_VALIDATOR import *

diff --git a/Accas/__init__.py b/Accas/__init__.py
index b87034f77deb6e8ad8618f6ddafb889afb35bd1c..93f4ab82ac716b03803f8eb941df692b7ecfc8ac 100644 (file)
--- a/Accas/__init__.py
+++ b/Accas/__init__.py
@@ -1,5 +1,5 @@
 # -*- coding: iso-8859-1 -*-
-# Copyright (C) 2007-2021   EDF R&D
+# Copyright (C) 2007-2024   EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -30,22 +30,23 @@
 """
 
 
-from __future__ import absolute_import
 import warnings
-warnings.filterwarnings('error','Non-ASCII character.*pep-0263',DeprecationWarning)
+
+warnings.filterwarnings("error", "Non-ASCII character.*pep-0263", DeprecationWarning)
 
 from .A_JDC_CATA import JDC_CATA
-from .A_OPER     import OPER
-from .A_PROC     import PROC
-from .A_MACRO    import MACRO
-from .A_FORM     import FORM
-from .A_BLOC     import BLOC
-from .A_FACT     import FACT
-from .A_SIMP     import SIMP
-from .A_EVAL     import EVAL
-from .A_NUPLET   import NUPL
-from .A_TUPLE    import Tuple
-from .A_TUPLE    import Matrice
+from .A_JDC_CATA_SINGLETON import JDC_CATA_SINGLETON
+from .A_OPER import OPER
+from .A_PROC import PROC
+from .A_MACRO import MACRO
+from .A_FORM import FORM
+from .A_BLOC import BLOC
+from .A_FACT import FACT
+from .A_SIMP import SIMP
+from .A_EVAL import EVAL
+from .A_NUPLET import NUPL
+from .A_TUPLE import Tuple
+from .A_TUPLE import Matrice
 
 
 from .A_JDC import JDC
@@ -70,8 +71,9 @@ from .A_ENSEMBLE import ENSEMBLE
 from .A_A_CLASSER import A_CLASSER
 from .A_AVANT import AVANT
 
-from .A_ASSD import ASSD,assd, UserASSD, UserASSDMultiple
-from .A_ASSD import GEOM,geom
+from .A_ASSD import ASSD, assd, UserASSD, UserASSDMultiple
+from .A_ASSD import GEOM, geom
+
 # Pour le moment on laisse fonction (ceinture et bretelles)
 from .A_ASSD import FONCTION, fonction
 from .A_ASSD import formule
@@ -86,19 +88,22 @@ from Noyau.N_utils import AsType
 from Noyau.N_OPS import OPS, EMPTY_OPS
 from Noyau.N_ASSD import not_checked
 
-from .A_VALIDATOR import OrVal,AndVal,OnlyStr
-from .A_VALIDATOR import OrdList,NoRepeat,LongStr,Compulsory,Absent,Together
+from .A_VALIDATOR import OrVal, AndVal, OnlyStr
+from .A_VALIDATOR import OrdList, NoRepeat, LongStr, Compulsory, Absent, Together
 from .A_VALIDATOR import RangeVal, EnumVal, TypeVal, PairVal
 from .A_VALIDATOR import CardVal, InstanceVal
 from .A_VALIDATOR import VerifTypeTuple, VerifExiste
 from .A_VALIDATOR import FileExtVal, FunctionVal
 from .A_VALIDATOR import CreeMotClef
+from .A_VALIDATOR import compareAutreMC
+from .A_VALIDATOR import infFrereMC, supFrereMC
 
 # On remplace la factory des validateurs initialement dans Noyau par celle
 # de A_VALIDATOR
-from .A_VALIDATOR  import validatorFactory
+from .A_VALIDATOR import validatorFactory
 import Noyau.N_ENTITE
-Noyau.N_ENTITE.ENTITE.factories['validator']=validatorFactory
+
+Noyau.N_ENTITE.ENTITE.factories["validator"] = validatorFactory
 
 from .A_SENSIBILITE import CONCEPT_SENSIBLE, REUSE_SENSIBLE, DERIVABLE