From 8e39c7eaa9bdce152cef21a8f4863b6e3d6d361f Mon Sep 17 00:00:00 2001 From: "pascale.noyret" Date: Wed, 30 May 2018 15:31:56 +0200 Subject: [PATCH] essai de fact xml avec maxOccurs=4 --- Accas/A_BLOC.py | 6 ++- Accas/A_ETAPE.py | 6 +-- Accas/A_FACT.py | 8 ++-- Accas/A_JDC.py | 4 +- Accas/A_JDC_CATA.py | 3 +- Accas/A_MACRO_ETAPE.py | 2 + Accas/A_MCBLOC.py | 4 +- Accas/A_MCFACT.py | 3 +- Accas/A_MCLIST.py | 4 +- Accas/A_MCSIMP.py | 3 +- Accas/A_OPER.py | 6 ++- Accas/A_PROC.py | 9 ++-- Accas/A_PROC_ETAPE.py | 2 + Accas/A_SIMP.py | 5 ++- Atmo/atmo.png | Bin 13314 -> 0 bytes Atmo/cata_test_fact_genere.xsd | 24 +++++----- Atmo/cata_test_types.py | 77 +++++++++++++++++++++++++++++++++ Atmo/cree_essai1_fact_xml.py | 23 ++++++++++ Atmo/essai1_fact.xml | 16 +++++++ Atmo/essai2_fact.xml | 20 +++++++++ 20 files changed, 191 insertions(+), 34 deletions(-) delete mode 100755 Atmo/atmo.png create mode 100755 Atmo/cata_test_types.py create mode 100644 Atmo/cree_essai1_fact_xml.py create mode 100644 Atmo/essai1_fact.xml create mode 100644 Atmo/essai2_fact.xml diff --git a/Accas/A_BLOC.py b/Accas/A_BLOC.py index 29571726..badd8d9d 100644 --- a/Accas/A_BLOC.py +++ b/Accas/A_BLOC.py @@ -20,9 +20,11 @@ from __future__ import absolute_import from Noyau import N_BLOC from Ihm import I_ENTITE -from . import A_MCBLOC +from Accas import A_MCBLOC +from Efi2Xsd.AccasXsd import X_BLOC -class BLOC(N_BLOC.BLOC,I_ENTITE.ENTITE): + +class BLOC(N_BLOC.BLOC,X_BLOC,I_ENTITE.ENTITE): class_instance=A_MCBLOC.MCBLOC def __init__(self,*tup,**args): I_ENTITE.ENTITE.__init__(self) diff --git a/Accas/A_ETAPE.py b/Accas/A_ETAPE.py index 0a9b8e94..4c72b812 100644 --- a/Accas/A_ETAPE.py +++ b/Accas/A_ETAPE.py @@ -21,10 +21,10 @@ from __future__ import absolute_import from Noyau import N_ETAPE from Validation import V_ETAPE from Ihm import I_ETAPE +from Efi2Xsd.MCAccasXsd import X_MCCOMPO -class ETAPE(I_ETAPE.ETAPE,V_ETAPE.ETAPE, - N_ETAPE.ETAPE): +class ETAPE(I_ETAPE.ETAPE,V_ETAPE.ETAPE,X_MCCOMPO,N_ETAPE.ETAPE): def __init__(self,oper=None,reuse=None,args={}): - # Pas de constructeur pour B_ETAPE.ETAPE + #print ('ETAPE accas', oper.nom) N_ETAPE.ETAPE.__init__(self,oper,reuse,args) V_ETAPE.ETAPE.__init__(self) diff --git a/Accas/A_FACT.py b/Accas/A_FACT.py index e26c97fa..ebccc614 100644 --- a/Accas/A_FACT.py +++ b/Accas/A_FACT.py @@ -20,10 +20,12 @@ from __future__ import absolute_import from Noyau import N_FACT from Ihm import I_ENTITE -from . import A_MCFACT -from . import A_MCLIST +from Accas import A_MCFACT +from Accas import A_MCLIST +from Efi2Xsd.AccasXsd import X_FACT -class FACT(N_FACT.FACT,I_ENTITE.ENTITE): + +class FACT(N_FACT.FACT,X_FACT,I_ENTITE.ENTITE): class_instance=A_MCFACT.MCFACT list_instance=A_MCLIST.MCList def __init__(self,*tup,**args): diff --git a/Accas/A_JDC.py b/Accas/A_JDC.py index 8ef54772..d17bd234 100644 --- a/Accas/A_JDC.py +++ b/Accas/A_JDC.py @@ -22,12 +22,14 @@ from Noyau import N_JDC from Validation import V_JDC from Extensions import jdc from Ihm import I_JDC +from Efi2Xsd.MCAccasXsd import X_JDC -class JDC(jdc.JDC,I_JDC.JDC,V_JDC.JDC,N_JDC.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) + X_JDC.__init__(self) V_JDC.JDC.__init__(self) I_JDC.JDC.__init__(self) jdc.JDC.__init__(self) diff --git a/Accas/A_JDC_CATA.py b/Accas/A_JDC_CATA.py index 75e1c27e..fd8a248d 100644 --- a/Accas/A_JDC_CATA.py +++ b/Accas/A_JDC_CATA.py @@ -21,8 +21,9 @@ from __future__ import absolute_import from . import A_JDC from Noyau import N_JDC_CATA from Ihm import I_JDC_CATA +from Efi2Xsd.AccasXsd import X_JDC_CATA -class JDC_CATA(I_JDC_CATA.JDC_CATA,N_JDC_CATA.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 diff --git a/Accas/A_MACRO_ETAPE.py b/Accas/A_MACRO_ETAPE.py index a9af4827..2bba807e 100644 --- a/Accas/A_MACRO_ETAPE.py +++ b/Accas/A_MACRO_ETAPE.py @@ -22,8 +22,10 @@ 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.MCAccasXsd 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 diff --git a/Accas/A_MCBLOC.py b/Accas/A_MCBLOC.py index 0cc5047b..d6d1bcb5 100644 --- a/Accas/A_MCBLOC.py +++ b/Accas/A_MCBLOC.py @@ -21,8 +21,10 @@ from __future__ import absolute_import from Noyau import N_MCBLOC from Validation import V_MCBLOC from Ihm import I_MCBLOC +from Efi2Xsd.MCAccasXsd import X_MCCOMPO -class MCBLOC(I_MCBLOC.MCBLOC,N_MCBLOC.MCBLOC,V_MCBLOC.MCBLOC): + +class MCBLOC(I_MCBLOC.MCBLOC,N_MCBLOC.MCBLOC,X_MCCOMPO,V_MCBLOC.MCBLOC): def __init__(self,val,definition,nom,parent): N_MCBLOC.MCBLOC.__init__(self,val,definition,nom,parent) V_MCBLOC.MCBLOC.__init__(self) diff --git a/Accas/A_MCFACT.py b/Accas/A_MCFACT.py index 03128a79..31fe0a4e 100644 --- a/Accas/A_MCFACT.py +++ b/Accas/A_MCFACT.py @@ -21,8 +21,9 @@ from __future__ import absolute_import from Noyau import N_MCFACT from Validation import V_MCFACT from Ihm import I_MCFACT +from Efi2Xsd.MCAccasXsd import X_MCFACT -class MCFACT(I_MCFACT.MCFACT,N_MCFACT.MCFACT,V_MCFACT.MCFACT): +class MCFACT(I_MCFACT.MCFACT,N_MCFACT.MCFACT,X_MCFACT,V_MCFACT.MCFACT): def __init__(self,val,definition,nom,parent): N_MCFACT.MCFACT.__init__(self,val,definition,nom,parent) V_MCFACT.MCFACT.__init__(self) diff --git a/Accas/A_MCLIST.py b/Accas/A_MCLIST.py index 7ba5c53f..5554f5ec 100644 --- a/Accas/A_MCLIST.py +++ b/Accas/A_MCLIST.py @@ -21,7 +21,9 @@ from __future__ import absolute_import from Noyau import N_MCLIST from Validation import V_MCLIST from Ihm import I_MCLIST +from Efi2Xsd.MCAccasXsd import X_MCLIST -class MCList(I_MCLIST.MCList,N_MCLIST.MCList,V_MCLIST.MCList): + +class MCList(I_MCLIST.MCList,N_MCLIST.MCList,X_MCLIST,V_MCLIST.MCList): def __init__(self): N_MCLIST.MCList.__init__(self) diff --git a/Accas/A_MCSIMP.py b/Accas/A_MCSIMP.py index cc246e89..c3920907 100644 --- a/Accas/A_MCSIMP.py +++ b/Accas/A_MCSIMP.py @@ -21,8 +21,9 @@ from __future__ import absolute_import from Noyau import N_MCSIMP from Validation import V_MCSIMP from Ihm import I_MCSIMP +from Efi2Xsd.MCAccasXsd import X_MCSIMP -class MCSIMP(I_MCSIMP.MCSIMP,N_MCSIMP.MCSIMP,V_MCSIMP.MCSIMP): +class MCSIMP(I_MCSIMP.MCSIMP,N_MCSIMP.MCSIMP,X_MCSIMP,V_MCSIMP.MCSIMP): def __init__(self,val,definition,nom,parent): N_MCSIMP.MCSIMP.__init__(self,val,definition,nom,parent) V_MCSIMP.MCSIMP.__init__(self) diff --git a/Accas/A_OPER.py b/Accas/A_OPER.py index 7c1e59e4..c1a4f0a5 100644 --- a/Accas/A_OPER.py +++ b/Accas/A_OPER.py @@ -20,9 +20,11 @@ from __future__ import absolute_import from Noyau import N_OPER from Ihm import I_ENTITE -from . import A_ETAPE +from Accas import A_ETAPE +from Efi2Xsd.AccasXsd import X_OPER -class OPER(N_OPER.OPER,I_ENTITE.ENTITE): + +class OPER(N_OPER.OPER,X_OPER,I_ENTITE.ENTITE): class_instance=A_ETAPE.ETAPE def __init__(self,*tup,**args): I_ENTITE.ENTITE.__init__(self) diff --git a/Accas/A_PROC.py b/Accas/A_PROC.py index a920913d..0ae8bb48 100644 --- a/Accas/A_PROC.py +++ b/Accas/A_PROC.py @@ -20,13 +20,14 @@ from __future__ import absolute_import from Noyau import N_PROC from Ihm import I_ENTITE -from . import A_PROC_ETAPE +from Accas import A_PROC_ETAPE +from Efi2Xsd.AccasXsd import X_PROC -class PROC(N_PROC.PROC,I_ENTITE.ENTITE): +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 + #print (tup) + #print (args) I_ENTITE.ENTITE.__init__(self) N_PROC.PROC.__init__(self,*tup,**args) diff --git a/Accas/A_PROC_ETAPE.py b/Accas/A_PROC_ETAPE.py index b3ab7529..7db1db8b 100644 --- a/Accas/A_PROC_ETAPE.py +++ b/Accas/A_PROC_ETAPE.py @@ -21,9 +21,11 @@ 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.MCAccasXsd 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) diff --git a/Accas/A_SIMP.py b/Accas/A_SIMP.py index 9a438d15..584627ed 100644 --- a/Accas/A_SIMP.py +++ b/Accas/A_SIMP.py @@ -20,9 +20,10 @@ from __future__ import absolute_import from Noyau import N_SIMP from Ihm import I_ENTITE -from . import A_MCSIMP +from Accas import A_MCSIMP +from Efi2Xsd.AccasXsd import X_SIMP -class SIMP(N_SIMP.SIMP,I_ENTITE.ENTITE): +class SIMP(N_SIMP.SIMP,X_SIMP,I_ENTITE.ENTITE): class_instance=A_MCSIMP.MCSIMP def __init__(self,*tup,**args): #print tup diff --git a/Atmo/atmo.png b/Atmo/atmo.png deleted file mode 100755 index 2e8d4a5f78b5965b315a0b72b64e0c86ee1baf66..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 13314 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 - - + + - - + + - + - - + + - + - - + + - + - + diff --git a/Atmo/cata_test_types.py b/Atmo/cata_test_types.py new file mode 100755 index 00000000..d0f75fe8 --- /dev/null +++ b/Atmo/cata_test_types.py @@ -0,0 +1,77 @@ +# -*- coding: utf-8 -*- +# +# Copyright (C) 2012-2013 EDF +# +# This file is part of SALOME HYDRO module. +# +# SALOME HYDRO module 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 3 of the License, or +# (at your option) any later version. +# +# SALOME HYDRO module 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. +# +# You should have received a copy of the GNU General Public License +# along with SALOME HYDRO module. If not, see . + +import types +from Accas import * + + + +JdC = JDC_CATA(code='Atmos',regles = (UN_PARMI('Wind',)), + ) +Wind = PROC( nom="Wind", op = None, + FACTA = FACT( statut='o', + VinAetBnotC = SIMP(statut = "o", typ = 'I'), + SousFactInAetBnotC = FACT( statut='o', + S1 = SIMP(statut = "o", typ = 'I'), + S2 = SIMP(statut = "o", typ = 'I'), + ), + ), + FACTB = FACT( statut='o', + VinAetBnotC = SIMP(statut = "o", typ = 'I'), + SousFactInAetBnotC = FACT( statut='o', + S1 = SIMP(statut = "o", typ = 'I'), + S2 = SIMP(statut = "o", typ = 'I'), + ), + ), + FACTC = FACT( statut='o', + VinAetBnotC = SIMP(statut = "o", typ = 'R'), + SousFactInAetBnotC = FACT( statut='o', + S1 = SIMP(statut = "o", typ = 'I'), + S2 = SIMP(statut = "o", typ = 'R'), + ), + ), + FACTD = FACT( statut='o', + # identique FACTC + # donc pas de creation de Type mais utilisation de ceux de FACTC + VinAetBnotC = SIMP(statut = "o", typ = 'R'), + SousFactInAetBnotC = FACT( statut='o', + S1 = SIMP(statut = "o", typ = 'I'), + S2 = SIMP(statut = "o", typ = 'R'), + ), + ), + FACTE = FACT( statut='o', + S3 = SIMP(statut = "o", typ = 'I'), + BinEetFNotG = BLOC(condition="S3 == 0", + S4 = SIMP(statut = "o", typ = 'I'), + ), + ), + FACTF = FACT( statut='o', + S3 = SIMP(statut = "o", typ = 'I'), + BinEetFNotG = BLOC(condition="S3 == 0", + S4 = SIMP(statut = "o", typ = 'I'), + ), + ), + FACTG = FACT( statut='o', + S3 = SIMP(statut = "o", typ = 'I'), + BinEetFNotG = BLOC(condition="S3 == 1", + S4 = SIMP(statut = "o", typ = 'I'), + ), + ), +) + diff --git a/Atmo/cree_essai1_fact_xml.py b/Atmo/cree_essai1_fact_xml.py new file mode 100644 index 00000000..0d51a13c --- /dev/null +++ b/Atmo/cree_essai1_fact_xml.py @@ -0,0 +1,23 @@ +# -*- coding: utf-8 -*- +import raw.cata_genere_fact as mdm +s1=mdm.T_Niveau1SIMP(1) +s2=mdm.T_Niveau2SIMP(2) +s31=mdm.T_Niveau3SIMP(3) +s4=mdm.T_Niveau4SIMP(4) +s32=mdm.T_Niveau3SIMP(5) +s6=mdm.T_Niveau4SIMP(6) + +f31=mdm.T_Niveau3Fact(s4) +f32=mdm.T_Niveau3Fact(s6) + +#f2=mdm.T_Niveau2Fact(s31,f31) +f2=mdm.T_Niveau2Fact(s32,f32) +# ligne suivante nonok ? +#f2=mdm.T_Niveau2Fact(s31,f31,s32,f32) +#f2=mdm.T_Niveau2Fact(s31) # ok --> s obligatoire et f facultatif +#f2=mdm.T_Niveau2Fact(f31) # nok +f1=mdm.T_Niveau1Fact(s2,f2) +wind=mdm.T_Wind(s1,f1) +jdd=mdm.Atmos(wind) +#print (jdd.toxml()) +print(jdd.toDOM().toprettyxml()) diff --git a/Atmo/essai1_fact.xml b/Atmo/essai1_fact.xml new file mode 100644 index 00000000..2266d6ba --- /dev/null +++ b/Atmo/essai1_fact.xml @@ -0,0 +1,16 @@ + + + + 1 + + 2 + + 5 + + 6 + + + + + + diff --git a/Atmo/essai2_fact.xml b/Atmo/essai2_fact.xml new file mode 100644 index 00000000..3d771100 --- /dev/null +++ b/Atmo/essai2_fact.xml @@ -0,0 +1,20 @@ + + + + 1 + + 2 + + 3 + + 4 + + 5 + + 6 + + + + + + -- 2.39.2