From 6cfc36b7d5ac8c0bebf42ad50422d6e469a8b487 Mon Sep 17 00:00:00 2001 From: Eric Fayolle Date: Thu, 28 Nov 2019 17:20:45 +0100 Subject: [PATCH] =?utf8?q?Mise=20au=20point=20de=20l'encha=C3=AEnement=20d?= =?utf8?q?es=20catalogues?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- Efi2Xsd/AccasXsd.py | 27 ++++---- Efi2Xsd/balisesXSD.py | 7 +- .../MappingAccasXsd/TestMultipleCata/Makefile | 45 +++++++++++++ .../TestMultipleCata/XMLSchema11_local.xsd | 1 + .../TestMultipleCata/cata_CFD1.py | 20 ++++++ .../TestMultipleCata/cata_CFD2.py | 19 ++++++ .../TestMultipleCata/cata_CFDCommun.py | 20 ++++++ .../TestMultipleCata/cata_MD1.py | 19 ++++++ .../TestMultipleCata/cata_MD2.py | 20 ++++++ .../TestMultipleCata/cata_MDCommun.py | 19 ++++++ .../TestMultipleCata/cata_modeleCommun.py | 13 ++++ .../TestMultipleCata/generateXSD.py | 36 +++++++++++ .../MappingAccasXsd/TestMultipleCata/prefs.py | 22 +++++++ .../TestMultipleCata/prefs_Test.py | 61 ++++++++++++++++++ .../prefs_TestMultipleCata.py | 64 +++++++++++++++++++ .../TestMultipleCata/qtEficasTest.py | 36 +++++++++++ .../MappingAccasXsd/TestMultipleCata/xml.xsd | 1 + 17 files changed, 413 insertions(+), 17 deletions(-) create mode 100755 Tests/MappingAccasXsd/TestMultipleCata/Makefile create mode 120000 Tests/MappingAccasXsd/TestMultipleCata/XMLSchema11_local.xsd create mode 100755 Tests/MappingAccasXsd/TestMultipleCata/cata_CFD1.py create mode 100755 Tests/MappingAccasXsd/TestMultipleCata/cata_CFD2.py create mode 100755 Tests/MappingAccasXsd/TestMultipleCata/cata_CFDCommun.py create mode 100755 Tests/MappingAccasXsd/TestMultipleCata/cata_MD1.py create mode 100755 Tests/MappingAccasXsd/TestMultipleCata/cata_MD2.py create mode 100755 Tests/MappingAccasXsd/TestMultipleCata/cata_MDCommun.py create mode 100755 Tests/MappingAccasXsd/TestMultipleCata/cata_modeleCommun.py create mode 100755 Tests/MappingAccasXsd/TestMultipleCata/generateXSD.py create mode 100644 Tests/MappingAccasXsd/TestMultipleCata/prefs.py create mode 100644 Tests/MappingAccasXsd/TestMultipleCata/prefs_Test.py create mode 100644 Tests/MappingAccasXsd/TestMultipleCata/prefs_TestMultipleCata.py create mode 100755 Tests/MappingAccasXsd/TestMultipleCata/qtEficasTest.py create mode 120000 Tests/MappingAccasXsd/TestMultipleCata/xml.xsd diff --git a/Efi2Xsd/AccasXsd.py b/Efi2Xsd/AccasXsd.py index a4e92744..e64eac52 100755 --- a/Efi2Xsd/AccasXsd.py +++ b/Efi2Xsd/AccasXsd.py @@ -34,7 +34,8 @@ class X_definition: obj=self while ( not hasattr(obj,'nomDuCodeDumpe') ): obj=obj.pere self.nomDuCodeDumpe = obj.nomDuCodeDumpe - + self.code=obj.code + #def genealogie(self,n): # texte=self.nom # obj=self @@ -122,7 +123,7 @@ class X_definitionComposee (X_definition): else : self.texteComplexe = "" - self.texteElt=eltCompoDsSequence.format(self.nom,self.nomDuCodeDumpe,self.nomDuTypePyxb,self.minOccurs,self.maxOccurs) + self.texteElt=eltCompoDsSequence.format(self.nom,self.code,self.nomDuTypePyxb,self.minOccurs,self.maxOccurs) #print (self.texteComplexe) #print ('------------------------------------------------') @@ -191,7 +192,7 @@ class X_BLOC (X_definitionComposee): else : self.texteComplexe = "" - self.texteElt=substDsSequence.format(self.nomDuCodeDumpe,self.nomDuTypePyxb,0,1) + self.texteElt=substDsSequence.format(self.code,self.nomDuTypePyxb,0,1) #print ('------------------------------------------------') @@ -237,13 +238,13 @@ class X_SIMP (X_definition): # a revoir pour les tuples avec defaut txtDefaut="" for val in self.defaut : txtDefaut+=str(val) +" " - self.texteElt = eltWithDefautDsSequence.format(nomUtil,self.nomDuCodeDumpe,self.nomDuTypePyxb,minOccurs,1,txtDefaut) + self.texteElt = eltWithDefautDsSequence.format(nomUtil,self.code,self.nomDuTypePyxb,minOccurs,1,txtDefaut) else : if str(self.defaut) == 'True' : txtDefaut = 'true' else : txtDefaut = str(self.defaut) - self.texteElt = eltWithDefautDsSequence.format(nomUtil,self.nomDuCodeDumpe,self.nomDuTypePyxb,minOccurs,1,txtDefaut) + self.texteElt = eltWithDefautDsSequence.format(nomUtil,self.code,self.nomDuTypePyxb,minOccurs,1,txtDefaut) - else : self.texteElt = eltDsSequence.format(nomUtil,self.nomDuCodeDumpe,self.nomDuTypePyxb,minOccurs,1) + else : self.texteElt = eltDsSequence.format(nomUtil,self.code,self.nomDuTypePyxb,minOccurs,1) # self.aCreer est mis a jour ds definitNomDuTypePyxb if not self.aCreer : return @@ -337,28 +338,27 @@ class X_JDC_CATA : self.texteElt = "" if self.implement == "" : - self.nomDuCodeDumpe=self.labelCode + self.nomDuCodeDumpe=self.code self.texteCata += debutTypeCata.format(self.nomDuCodeDumpe) else : + self.implement,self.nomDuXsdInclus=self.implement.split(':') self.nomDuCodeDumpe = self.implement self.texteCata += debutTypeCataExtension.format(self.nomDuCodeDumpe) self.texteCata += debutExtension.format(self.code,self.nomDuCodeDumpe) - self.texteInclusion += includeCata.format(self.code) + self.texteInclusion += includeCata.format(self.nomDuXsdInclus) self.nomDuTypePyxb = 'T_'+self.nomDuCodeDumpe self.dumpLesCommandes() - #self.texteSimple += TypeEtEltAbstraitCodeSpec.format(self.nomDuCodeDumpe) - self.texteTypeAbstrait='' for codeHeritant in self.importedBy: self.texteCata += EltCodeSpecDsCata.format(codeHeritant) - self.texteTypeAbstrait += eltAbstrait.format(codeHeritant,codeHeritant,codeHeritant,codeHeritant) + self.texteTypeAbstrait += eltAbstrait.format(codeHeritant,codeHeritant,self.code,codeHeritant) if self.implement != "" : self.texteCata = self.texteCata + finExtension + finTypeCompo else : self.texteCata += finTypeCata - self.texteElt = eltCata.format(self.nomDuCodeDumpe,self.nomDuCodeDumpe, self.nomDuTypePyxb) + self.texteElt = eltCata.format(self.nomDuCodeDumpe,self.code, self.nomDuTypePyxb) self.texteXSD = texteDebut.format(self.code,self.code,self.code,self.code) if self.texteInclusion != "" : self.texteXSD += self.texteInclusion @@ -437,8 +437,9 @@ class X_JDC_CATA : for c in allClassToDump : if not(isinstance(c, Accas.OPER)) and not(isinstance(c, Accas.PROC)) : continue c.nomDuCodeDumpe=self.nomDuCodeDumpe + c.code=self.code c.dumpXsd() self.texteSimple += c.texteSimple self.texteComplexe += c.texteComplexe - c.texteElt=eltCompoDsSequenceInExtension.format(c.nom,self.nomDuCodeDumpe,c.nomDuTypePyxb) + c.texteElt=eltCompoDsSequenceInExtension.format(c.nom,self.code,c.nomDuTypePyxb) self.texteCata += c.texteElt diff --git a/Efi2Xsd/balisesXSD.py b/Efi2Xsd/balisesXSD.py index 0dc86a3d..eff5d568 100644 --- a/Efi2Xsd/balisesXSD.py +++ b/Efi2Xsd/balisesXSD.py @@ -48,16 +48,15 @@ debutTypeCataExtension = '\t\n' finTypeCata = '\t\t\n\t\n' finSchema = '' eltCata = '\t\n' -TypeEtEltAbstraitCodeSpec = '\t\n\t\n' -EltCodeSpecDsCata='\t\t\t\n' +EltCodeSpecDsCata='\t\t\t\n' includeCata = '\n\n' # EXTENSION -debutExtension = '\t\t\n\t\t\n\t\t\n' +debutExtension = '\t\t\n\t\t\n\t\t\n' finExtension = '\t\t\n\t\t\n\t\t\n' # TYPE ABSTRAIT -eltAbstrait = '\t\n\t\n' +eltAbstrait = '\t\n\t\n' if __name__ == '__main__' : diff --git a/Tests/MappingAccasXsd/TestMultipleCata/Makefile b/Tests/MappingAccasXsd/TestMultipleCata/Makefile new file mode 100755 index 00000000..cefb6c3a --- /dev/null +++ b/Tests/MappingAccasXsd/TestMultipleCata/Makefile @@ -0,0 +1,45 @@ +SUFFIXES= .xsd + +PYXB=pyxbgen + +#$(PYXB) -m $(basename $@) -u $< --location-prefix-rewrite http://chercheurs.edf.com/logiciels/vimmp= --write-for-customization \ +# L'utilisation de $? ne fonctionne pas dans le cas de catalogues multiple. +# En effet, si on modifie un seul catalogue, $? donne uniquement le fichier modifié et pyxb détecte +# que notre génération dépend du fichier non modifié qui n'est pas passé en paramètre et qui n'est pas regénéré. +# Une solution constiste à utiliser $^ + +#xmllint ne semble pas vérifier les includes... + +.SUFFIXES: _genere.xsd _genere.py .py + +.py_genere.xsd: + python2 ./generateXSD.py -c ./$< + +_genere.xsd_genere.py: + xmllint --schema XMLSchema11_local.xsd --xinclude --noout $^ + $(PYXB) -m $(basename $@) -u $^ --write-for-customization + + + +all: xsdAll driverAll + +xsdAll: xsdTestMutlipleCata +driverAll: pyTestMutlipleCata + +xsdTestMutlipleCata: cata_CFD1_genere.xsd cata_CFD2_genere.xsd cata_CFDCommun_genere.xsd cata_MD1_genere.xsd cata_MD2_genere.xsd cata_MDCommun_genere.xsd cata_modeleCommun_genere.xsd + +pyTestMutlipleCata: cata_CFD1_genere.py cata_CFD2_genere.py cata_CFDCommun_genere.py cata_MD1_genere.py cata_MD2_genere.py cata_MDCommun_genere.py cata_modeleCommun_genere.py + + +xml: + @echo "Reminder: a .comm file is needed for this step" + ./generateXML.py -c cata_1.py cata_1_test_1.comm + +clean: + rm -f *.pyc *~ + rm -rf *_genere.py raw __pycache__ + rm -f *_genere.xsd + +check: + xmllint --schema XMLSchema11.xsd cata_1_genere.xsd + diff --git a/Tests/MappingAccasXsd/TestMultipleCata/XMLSchema11_local.xsd b/Tests/MappingAccasXsd/TestMultipleCata/XMLSchema11_local.xsd new file mode 120000 index 00000000..db58cd92 --- /dev/null +++ b/Tests/MappingAccasXsd/TestMultipleCata/XMLSchema11_local.xsd @@ -0,0 +1 @@ +../XMLSchema11_local.xsd \ No newline at end of file diff --git a/Tests/MappingAccasXsd/TestMultipleCata/cata_CFD1.py b/Tests/MappingAccasXsd/TestMultipleCata/cata_CFD1.py new file mode 100755 index 00000000..93837630 --- /dev/null +++ b/Tests/MappingAccasXsd/TestMultipleCata/cata_CFD1.py @@ -0,0 +1,20 @@ +autonome = 0 +#autonome = 1 + +if autonome : + from Accas import * + JdC = JDC_CATA ( + code = 'CFD1', + ) + importedBy=() +else : + from cata_CFDCommun import * + implement='CFD1:CFDCommun' + importedBy=() + +Proc1DuCFD1=PROC(nom='Proc1DuCFD1', + S1DuCFD1= SIMP(statut='o', typ='I', defaut = 91), +) +Proc2DuCFD1=PROC(nom='Proc2DuCFD1', + S2DuCFD1= SIMP(statut='o', typ='I', defaut = 92), +) diff --git a/Tests/MappingAccasXsd/TestMultipleCata/cata_CFD2.py b/Tests/MappingAccasXsd/TestMultipleCata/cata_CFD2.py new file mode 100755 index 00000000..d743819f --- /dev/null +++ b/Tests/MappingAccasXsd/TestMultipleCata/cata_CFD2.py @@ -0,0 +1,19 @@ +autonome = 0 +autonome = 1 + +if autonome : + from Accas import * + JdC = JDC_CATA ( + code = 'CFD2', + ) +else : + from cata_CFDCommun import * + implement = 'CFD2:CFDCommun' + importedBy=() + +Proc1DuCFD2=PROC(nom='Proc1DuCFD2', + S1DuCFD2= SIMP(statut='o', typ='I', defaut = 91), +) +Proc2DuCFD2=PROC(nom='Proc2DuCFD2', + S2DuCFD2= SIMP(statut='o', typ='I', defaut = 92), +) diff --git a/Tests/MappingAccasXsd/TestMultipleCata/cata_CFDCommun.py b/Tests/MappingAccasXsd/TestMultipleCata/cata_CFDCommun.py new file mode 100755 index 00000000..53880187 --- /dev/null +++ b/Tests/MappingAccasXsd/TestMultipleCata/cata_CFDCommun.py @@ -0,0 +1,20 @@ +autonome = 0 +autonome = 1 + +if autonome : + from Accas import * + JdC = JDC_CATA ( + code = 'CFDCommun', + ) + importedBy=('CFD1','CFD2','CFDSpecific') +else : + from cata_modeleCommun import * + importedBy=('CFD1','CFD2','CFDSpecific') + implement='CFDCommun:modeleCommun' + +Proc1DuCFDCommun=PROC(nom='Proc1DuCFDCommun', + S1DuCFDCommun= SIMP(statut='o', typ='I', defaut = 91), +) +Proc2DuCFDCommun=PROC(nom='Proc2DuCFDCommun', + S2DuCFDCommun= SIMP(statut='o', typ='I', defaut = 92), +) diff --git a/Tests/MappingAccasXsd/TestMultipleCata/cata_MD1.py b/Tests/MappingAccasXsd/TestMultipleCata/cata_MD1.py new file mode 100755 index 00000000..0d0a0df3 --- /dev/null +++ b/Tests/MappingAccasXsd/TestMultipleCata/cata_MD1.py @@ -0,0 +1,19 @@ +autonome = 0 +import traceback;traceback.print_stack() + +if autonome : + from Accas import * + JdC = JDC_CATA ( + code = 'MD1', + ) +else : + from cata_MDCommun import * + implement='MD1:MDCommun' + importedBy=() + +Proc1DuMD1=PROC(nom='Proc1DuMD1', + S1DuMD1= SIMP(statut='o', typ='I', defaut = 111), +) +Proc2DuMD1=PROC(nom='Proc2DuMD1', + S2DuMD1= SIMP(statut='o', typ='I', defaut = 112), +) diff --git a/Tests/MappingAccasXsd/TestMultipleCata/cata_MD2.py b/Tests/MappingAccasXsd/TestMultipleCata/cata_MD2.py new file mode 100755 index 00000000..cad6a7ab --- /dev/null +++ b/Tests/MappingAccasXsd/TestMultipleCata/cata_MD2.py @@ -0,0 +1,20 @@ +autonome = 0 +autonome = 1 + + +if autonome : + from Accas import * + JdC = JDC_CATA ( + code = 'MD2', + ) +else : + from cata_MDCommun import * + implement='MD2' + importedBy=() + +Proc1DuMD2=PROC(nom='Proc1DuMD2', + S1DuMD2= SIMP(statut='o', typ='I', defaut = 121), +) +Proc2DuMD2=PROC(nom='Proc2DuMD2', + S2DuMD1= SIMP(statut='o', typ='I', defaut = 122), +) diff --git a/Tests/MappingAccasXsd/TestMultipleCata/cata_MDCommun.py b/Tests/MappingAccasXsd/TestMultipleCata/cata_MDCommun.py new file mode 100755 index 00000000..d220be45 --- /dev/null +++ b/Tests/MappingAccasXsd/TestMultipleCata/cata_MDCommun.py @@ -0,0 +1,19 @@ +autonome = 0 + +if autonome : + from Accas import * + JdC = JDC_CATA ( + code = 'MDCommun', + ) + importedBy=('MD1','MD2','MDSpecific') +else : + from cata_modeleCommun import * + implement = 'MDCommun:modeleCommun' + importedBy=('MD1','MD2','MDSpecific') + +Proc1DuMDCommun=PROC(nom='Proc1DuMDCommun', + S1DuMDCommun= SIMP(statut='o', typ='I', defaut = 11), +) +Proc2DuMDCommun=PROC(nom='Proc2DuMDCommun', + S2DuMDCommun= SIMP(statut='o', typ='I', defaut = 12), +) diff --git a/Tests/MappingAccasXsd/TestMultipleCata/cata_modeleCommun.py b/Tests/MappingAccasXsd/TestMultipleCata/cata_modeleCommun.py new file mode 100755 index 00000000..06b44dd0 --- /dev/null +++ b/Tests/MappingAccasXsd/TestMultipleCata/cata_modeleCommun.py @@ -0,0 +1,13 @@ + +from Accas import * +JdC = JDC_CATA ( + code = 'modeleCommun', +) +importedBy=('MDCommun', 'CFDCommun', 'DomainSpecfic') + +Proc1DuModeleCommun=PROC(nom='Proc1DuModeleCommun', + S1DuModeleCommun= SIMP(statut='o', typ='I', defaut = 1), +) +Proc2DuModeleCommun=PROC(nom='Proc2DuModeleCommun', + S2DuModeleCommun= SIMP(statut='o', typ='I', defaut = 2), +) diff --git a/Tests/MappingAccasXsd/TestMultipleCata/generateXSD.py b/Tests/MappingAccasXsd/TestMultipleCata/generateXSD.py new file mode 100755 index 00000000..5d92d5ef --- /dev/null +++ b/Tests/MappingAccasXsd/TestMultipleCata/generateXSD.py @@ -0,0 +1,36 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- +# Copyright (C) 2007-2013 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 +# +""" + Ce module sert a lancer EFICAS configure pour Meteo +""" +# Modules Python +# Modules Eficas +import prefs +name='prefs_'+prefs.code +__import__(name) + +import sys +import os +sys.path.append(os.path.join(os.path.abspath(os.path.dirname(__file__)),'../../..')) + +import prefs +from InterfaceQT4 import eficas_go +eficas_go.genereXSD(code=prefs.code) diff --git a/Tests/MappingAccasXsd/TestMultipleCata/prefs.py b/Tests/MappingAccasXsd/TestMultipleCata/prefs.py new file mode 100644 index 00000000..d809d651 --- /dev/null +++ b/Tests/MappingAccasXsd/TestMultipleCata/prefs.py @@ -0,0 +1,22 @@ +# Copyright (C) 2007-2012 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 +# +code="TestMultipleCata" +import sys, os +if os.path.dirname(os.path.abspath(__file__)) not in sys.path : + sys.path.insert(0,os.path.dirname(os.path.abspath(__file__))) diff --git a/Tests/MappingAccasXsd/TestMultipleCata/prefs_Test.py b/Tests/MappingAccasXsd/TestMultipleCata/prefs_Test.py new file mode 100644 index 00000000..6b05827f --- /dev/null +++ b/Tests/MappingAccasXsd/TestMultipleCata/prefs_Test.py @@ -0,0 +1,61 @@ +# -*- coding: utf-8 -*- +# maConfiguration 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. +# +# 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. +# +# 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. +# +# +# ====================================================================== + +import os,sys +# repIni sert a localiser le fichier editeur.ini +# Obligatoire +repIni=os.path.dirname(os.path.abspath(__file__)) +INSTALLDIR=os.path.join(repIni,'..') +sys.path[:0]=[INSTALLDIR] + + +# lang indique la langue utilisee pour les chaines d'aide : fr ou ang +lang='ang' + +# Codage des strings qui accepte les accents (en remplacement de 'ascii') +encoding='iso-8859-1' + +# +#typeDeCata='XML' +catalogues=( +# ('VimmpEssai','VimmpEssai',os.path.join(repIni,'cata_Vimmp_2304.py'),'python','python'), + ('Test1','Test1',os.path.join(repIni,'cata_1.py'),'xml','python'), +# ('Vimmp','Vimmp',os.path.join(repIni,'cata_Vimmp.py'),'xml','python'), +# ('MD','VimmpG',os.path.join(repIni,'cata_gromacs.py'),'xml','python'), +# ('VimmpEN','VimmpEN',os.path.join(repIni,'cata_en.py'),'python','python'), +) +nombreDeBoutonParLigne=4 +#simpleClic=True +closeFrameRechercheCommande=False +closeFrameRechercheCommandeSurPageDesCommandes=True +#boutonDsMenuBar=False +#closeArbre=True +#afficheListesPliees=False +#afficheCommandesPliees = False +afficheCommandesPliees=True +enleverActionStructures = True +enleverParametres = True +enleverSupprimer = True +#ajoutExecution = True +#translatorFichier = os.path.join(repIni,'Meteo') +#withXSD=True +#dumpXSD=True +#afficheIhm=False diff --git a/Tests/MappingAccasXsd/TestMultipleCata/prefs_TestMultipleCata.py b/Tests/MappingAccasXsd/TestMultipleCata/prefs_TestMultipleCata.py new file mode 100644 index 00000000..eb2ad270 --- /dev/null +++ b/Tests/MappingAccasXsd/TestMultipleCata/prefs_TestMultipleCata.py @@ -0,0 +1,64 @@ +# -*- coding: utf-8 -*- +# maConfiguration 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. +# +# 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. +# +# 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. +# +# +# ====================================================================== + +import os,sys +# repIni sert a localiser le fichier editeur.ini +# Obligatoire +repIni=os.path.dirname(os.path.abspath(__file__)) +INSTALLDIR=os.path.join(repIni,'..') +sys.path[:0]=[INSTALLDIR] + + +# lang indique la langue utilisee pour les chaines d'aide : fr ou ang +lang='ang' + +# Codage des strings qui accepte les accents (en remplacement de 'ascii') +encoding='iso-8859-1' + +# +#typeDeCata='XML' +catalogues=( + ('CFD1' ,'CFD1' ,os.path.join(repIni,'cata_CFD1.py') ,'xml','python'), + ('CFD2' ,'CFD2' ,os.path.join(repIni,'cata_CFD2.py') ,'xml','python'), + ('CFDCommun' ,'CFDCommun' ,os.path.join(repIni,'cata_CFDCommun.py') ,'xml','python'), + ('MD1' ,'MD1' ,os.path.join(repIni,'cata_MD1.py') ,'xml','python'), + ('MD2' ,'MD2' ,os.path.join(repIni,'cata_MD2.py') ,'xml','python'), + ('MDCommun' ,'MDCommun' ,os.path.join(repIni,'cata_MDCommun.py') ,'xml','python'), + ('modeleCommun','modeleCommun' ,os.path.join(repIni,'cata_modeleCommun.py'),'xml','python'), +) + +nombreDeBoutonParLigne=4 +#simpleClic=True +closeFrameRechercheCommande=False +closeFrameRechercheCommandeSurPageDesCommandes=True +#boutonDsMenuBar=False +#closeArbre=True +#afficheListesPliees=False +#afficheCommandesPliees = False +afficheCommandesPliees=True +enleverActionStructures = True +enleverParametres = True +enleverSupprimer = True +#ajoutExecution = True +#translatorFichier = os.path.join(repIni,'Meteo') +#withXSD=True +#dumpXSD=True +#afficheIhm=False diff --git a/Tests/MappingAccasXsd/TestMultipleCata/qtEficasTest.py b/Tests/MappingAccasXsd/TestMultipleCata/qtEficasTest.py new file mode 100755 index 00000000..7f785dc4 --- /dev/null +++ b/Tests/MappingAccasXsd/TestMultipleCata/qtEficasTest.py @@ -0,0 +1,36 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- +# Copyright (C) 2007-2013 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 +# +""" + Ce module sert a lancer EFICAS configure pour TEST +""" +# Modules Python +# Modules Eficas +import prefs +name='prefs_'+prefs.code +__import__(name) + +import sys +import os +sys.path.append(os.path.join(os.path.abspath(os.path.dirname(__file__)),'../../..')) + +import prefs +from InterfaceQT4 import eficas_go +eficas_go.lanceEficas(code=prefs.code) diff --git a/Tests/MappingAccasXsd/TestMultipleCata/xml.xsd b/Tests/MappingAccasXsd/TestMultipleCata/xml.xsd new file mode 120000 index 00000000..1216c3fd --- /dev/null +++ b/Tests/MappingAccasXsd/TestMultipleCata/xml.xsd @@ -0,0 +1 @@ +../xml.xsd \ No newline at end of file -- 2.39.2