X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=Accas%2FA_ASSD.py;h=88cc13af3b84314ee9785c13a280d791c0d9b289;hb=e4f9ed44499c18435beb762c4deb1df9f1c8343a;hp=2791dd9493803337f71144efdd956964c59851ce;hpb=2446a0c7137fa3418368ec577194a6d00e54ed65;p=tools%2Feficas.git

diff --git a/Accas/A_ASSD.py b/Accas/A_ASSD.py
index 2791dd94..88cc13af 100644
--- a/Accas/A_ASSD.py
+++ b/Accas/A_ASSD.py
@@ -1,60 +1,63 @@
 # -*- 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-2021   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
 #
-# ======================================================================
 
+from __future__ import absolute_import
 from Ihm import I_ASSD
 from Ihm import I_LASSD
 from Ihm import I_FONCTION
-from Noyau import N_ASSD 
-#from Noyau import N_LASSD 
-from Noyau import N_GEOM 
-from Noyau import N_FONCTION 
-from Noyau import N_CO 
+from Noyau import N_ASSD
+from Noyau import N_GEOM
+from Noyau import N_FONCTION
+from Noyau import N_CO
+from Noyau import N_UserASSD
 
-# On ajoute la classe ASSD dans l'héritage multiple pour recréer 
-# une hiérarchie d'héritage identique à celle de Noyau
-# pour faire en sorte que isinstance(o,ASSD) marche encore après 
-# dérivation
+# On ajoute la classe ASSD dans l'heritage multiple pour recreer
+# une hierarchie d'heritage identique a celle de Noyau
+# 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 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)
+    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)
+    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)
+    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