From e4f9ed44499c18435beb762c4deb1df9f1c8343a Mon Sep 17 00:00:00 2001 From: "pascale.noyret" Date: Wed, 21 Jul 2021 17:30:47 +0200 Subject: [PATCH] chgt Copyrigth --- Accas/A_ASSD.py | 36 +- Accas/A_AU_MOINS_UN.py | 12 +- Accas/A_AU_PLUS_UN.py | 12 +- Accas/A_AVANT.py | 12 +- Accas/A_A_CLASSER.py | 10 +- Accas/A_BLOC.py | 11 +- Accas/A_ENSEMBLE.py | 12 +- Accas/A_ETAPE.py | 8 +- Accas/A_EVAL.py | 8 +- Accas/A_EXCLUS.py | 12 +- Accas/A_FACT.py | 13 +- Accas/A_FICHIER.py | 8 +- Accas/A_FORM.py | 6 +- Accas/A_FORM_ETAPE.py | 11 +- Accas/A_JDC.py | 18 +- Accas/A_JDC_CATA.py | 14 +- Accas/A_MACRO.py | 13 +- Accas/A_MACRO_ETAPE.py | 12 +- Accas/A_MCBLOC.py | 8 +- Accas/A_MCFACT.py | 8 +- Accas/A_MCLIST.py | 6 +- Accas/A_MCNUPLET.py | 6 +- Accas/A_MCSIMP.py | 10 +- Accas/A_MEME_NOMBRE.py | 12 +- Accas/A_NUPLET.py | 6 +- Accas/A_OPER.py | 12 +- Accas/A_PRESENT_ABSENT.py | 12 +- Accas/A_PRESENT_PRESENT.py | 12 +- Accas/A_PROC.py | 17 +- Accas/A_PROC_ETAPE.py | 8 +- Accas/A_SALOME_ENTRY.py | 4 +- Accas/A_SENSIBILITE.py | 5 +- Accas/A_SIMP.py | 15 +- Accas/A_TUPLE.py | 23 +- Accas/A_UN_PARMI.py | 12 +- Accas/A_VALIDATOR.py | 2 +- Accas/__init__.py | 8 +- Adao/configuration_Adao.py | 41 +- Adao/monCode_Cata.py | 2 +- Adao/prefs.py | 6 +- Adao/prefs_Adao.py | 1 - Adao/qtDico.py | 2 +- Adao/qtEficas_Adao.py | 2 +- CatasDeTests/.b.py.swp | Bin 0 -> 12288 bytes CatasDeTests/.cataMemesNoms.py.swp | Bin 0 -> 12288 bytes CatasDeTests/.cataSimple_driver.xsd.swp | Bin 0 -> 12288 bytes CatasDeTests/.cataTesteDelete.py.swp | Bin 0 -> 12288 bytes CatasDeTests/ReadMe.txt | 1 + CatasDeTests/cataListes.py | 37 + CatasDeTests/cata_1.py | 53 + CatasDeTests/cata_1.xsd | 29 + CatasDeTests/cata_FactFreresMemesNoms.py | 62 + .../cata_FactFreresMemesNomsV1_ref.xsd | 54 + .../cata_FactFreresMemesNoms_driver.py | 2 + CatasDeTests/cata_FactFreresMemesNoms_ref.xsd | 59 + CatasDeTests/cata_UserAssd.py | 69 + CatasDeTests/cata_UserAssd.xsd | 161 ++ CatasDeTests/cata_UserAssd.xsd_ref | 62 + CatasDeTests/cata_UserAssd2.xsd | 184 ++ CatasDeTests/cata_UserAssd2_driver.py | 2 + CatasDeTests/cata_UserAssd_driver.py | 2 + CatasDeTests/decorateur/metier.py | 21 + CatasDeTests/exemple.xml | 10 + CatasDeTests/generateXML.py | 36 + CatasDeTests/generateXSD.py | 36 + CatasDeTests/log | 32 + CatasDeTests/prefs.py | 22 + CatasDeTests/prefs_Essai.py | 50 + CatasDeTests/qtEficasEssai.py | 36 + {EssaiInit => CatasDeTests}/raw/__init__.py | 0 .../raw/cata_FactFreresMemesNoms_driver.py | 359 +++ CatasDeTests/raw/cata_UserAssd2_driver.py | 917 ++++++++ CatasDeTests/raw/cata_UserAssd_driver.py | 937 ++++++++ CatasDeTests/raw/toto.py | 550 +++++ CatasDeTests/ref/cata_Vimmp_genere.xsd | 1104 +++++++++ CatasDeTests/ref/cata_gromacs_genere.xsd | 373 ++++ Editeur/Eficas_utils.py | 2 +- Editeur/Objecttreeitem.py | 2 +- Editeur/TroisDPal.py | 2 +- Editeur/__init__.py | 2 +- Editeur/analyse_catalogue.py | 2 +- Editeur/analyse_catalogue_initial.py | 2 +- Editeur/autre_analyse_cata.py | 2 +- Editeur/basestyle.py | 2 +- Editeur/cata2Xml.py | 2 +- Editeur/catadesc.py | 2 +- Editeur/chercheBlocInto.py | 2 +- Editeur/chercheNbElem.py | 2 +- Editeur/comploader.py | 2 +- Editeur/fontes.py | 2 +- Editeur/import_code.py | 2 +- Editeur/listePatrons.py | 2 +- Editeur/session.py | 2 +- Editeur/styles.py | 2 +- Editeur/uiinfo.py | 2 +- Efi2Xsd/MCAccasXML.py | 6 +- Efi2Xsd/__init__.py | 2 +- Extensions/__init__.py | 2 +- Extensions/commande_comm.py | 2 +- Extensions/commentaire.py | 2 +- Extensions/etape_niveau.py | 2 +- Extensions/interpreteur_formule.py | 2 +- Extensions/jdc.py | 2 +- Extensions/jdc_include.py | 2 +- Extensions/mcnuplet.py | 2 +- Extensions/niveau.py | 2 +- Extensions/nuplet.py | 2 +- Extensions/param2.py | 2 +- Extensions/parametre.py | 2 +- Extensions/parametre_eval.py | 2 +- Extensions/pluginloader.py | 2 +- Ihm/CONNECTOR.py | 2 +- Ihm/I_ASSD.py | 2 +- Ihm/I_AVANT.py | 2 +- Ihm/I_A_CLASSER.py | 2 +- Ihm/I_ENTITE.py | 2 +- Ihm/I_ETAPE.py | 2 +- Ihm/I_EVAL.py | 2 +- Ihm/I_EXCLUS.py | 2 +- Ihm/I_FICHIER.py | 2 +- Ihm/I_FONCTION.py | 2 +- Ihm/I_FORM_ETAPE.py | 2 +- Ihm/I_JDC.py | 2 +- Ihm/I_JDC_CATA.py | 2 +- Ihm/I_LASSD.py | 2 +- Ihm/I_MACRO_ETAPE.py | 30 +- Ihm/I_MCBLOC.py | 2 +- Ihm/I_MCCOMPO.py | 2 +- Ihm/I_MCFACT.py | 2 +- Ihm/I_MCLIST.py | 2 +- Ihm/I_MCSIMP.py | 2 +- Ihm/I_OBJECT.py | 2 +- Ihm/I_PRESENT_ABSENT.py | 2 +- Ihm/I_PRESENT_PRESENT.py | 2 +- Ihm/I_PROC_ETAPE.py | 2 +- Ihm/I_REGLE.py | 2 +- Ihm/I_UN_PARMI.py | 2 +- Ihm/I_VALIDATOR.py | 2 +- Ihm/__init__.py | 2 +- InterfaceQT4/__init__.py | 2 +- InterfaceQT4/aiemonWidgetPlusieursBase.py | 2 +- InterfaceQT4/bizarreEditorDu5aout.py | 2 +- InterfaceQT4/browser.py | 2 +- InterfaceQT4/compobloc.py | 2 +- InterfaceQT4/compocomm.py | 2 +- InterfaceQT4/compocommandecomm.py | 2 +- InterfaceQT4/compofact.py | 2 +- InterfaceQT4/compoformule.py | 2 +- InterfaceQT4/compojdc.py | 2 +- InterfaceQT4/compomacro.py | 2 +- InterfaceQT4/compomclist.py | 2 +- InterfaceQT4/compooper.py | 2 +- InterfaceQT4/compoparam.py | 2 +- InterfaceQT4/compoproc.py | 2 +- InterfaceQT4/composimp.py | 2 +- InterfaceQT4/configuration.py | 18 +- InterfaceQT4/editor.pourCIST | 1967 ----------------- InterfaceQT4/editor.py | 2 +- InterfaceQT4/editorJuillet.py | 1249 ----------- InterfaceQT4/editorSsIhm.py | 2 +- InterfaceQT4/eficas_go.py | 4 +- InterfaceQT4/feuille.py | 2 +- InterfaceQT4/gereIcones.py | 2 +- InterfaceQT4/gereListe.py | 6 +- InterfaceQT4/gereListeAvril11.py | 2 +- InterfaceQT4/gereRegles.py | 2 +- InterfaceQT4/gereTraduction.py | 2 +- InterfaceQT4/getVersion.py | 2 +- InterfaceQT4/groupe.py | 2 +- InterfaceQT4/monBoutonValide.py | 2 +- InterfaceQT4/monChoixCata.py | 2 +- InterfaceQT4/monChoixCode.py | 2 +- InterfaceQT4/monChoixCommande.py | 2 +- InterfaceQT4/monChoixLangue.py | 2 +- InterfaceQT4/monFonctionPanel.py | 2 +- InterfaceQT4/monGroupeOptionnel.py | 2 +- InterfaceQT4/monLabelClic.py | 2 +- InterfaceQT4/monLayoutBouton.py | 2 +- InterfaceQT4/monRecherche.py | 2 +- InterfaceQT4/monRechercheCatalogue.py | 2 +- InterfaceQT4/monSelectVal.py | 2 +- InterfaceQT4/monViewRegles.py | 2 +- InterfaceQT4/monViewTexte.py | 2 +- InterfaceQT4/monVisu.py | 2 +- InterfaceQT4/monWidget4a6RadioButton.py | 2 +- InterfaceQT4/monWidget4a6RadioButtonSD.py | 2 +- InterfaceQT4/monWidgetBloc.py | 2 +- InterfaceQT4/monWidgetCB.py | 2 +- InterfaceQT4/monWidgetCBIntoSug.py | 2 +- InterfaceQT4/monWidgetCBSD.py | 2 +- InterfaceQT4/monWidgetCommande.py | 2 +- .../monWidgetCommandeDeplie1Niveau.py | 2 +- InterfaceQT4/monWidgetCommentaire.py | 2 +- InterfaceQT4/monWidgetCreeParam.py | 2 +- InterfaceQT4/monWidgetCreeUserAssd.py | 2 +- InterfaceQT4/monWidgetDate.py | 2 +- InterfaceQT4/monWidgetFact.py | 2 +- InterfaceQT4/monWidgetFactPlie.py | 2 +- InterfaceQT4/monWidgetFormule.py | 2 +- InterfaceQT4/monWidgetHeure.py | 2 +- InterfaceQT4/monWidgetInactif.py | 2 +- InterfaceQT4/monWidgetInfo.py | 2 +- InterfaceQT4/monWidgetIntoSug.py | 2 +- InterfaceQT4/monWidgetMatrice.py | 2 +- InterfaceQT4/monWidgetNiveauFact.py | 2 +- InterfaceQT4/monWidgetOptionnel.py | 2 +- InterfaceQT4/monWidgetParam.py | 2 +- .../monWidgetPlusieursASSDIntoOrdonne.py | 14 +- InterfaceQT4/monWidgetPlusieursBase.py | 182 +- InterfaceQT4/monWidgetPlusieursInto.py | 7 +- InterfaceQT4/monWidgetPlusieursIntoOrdonne.py | 14 +- InterfaceQT4/monWidgetPlusieursPlie.py | 2 +- InterfaceQT4/monWidgetPlusieursTuple.py | 2 +- InterfaceQT4/monWidgetPlusieursTuple2.py | 2 +- InterfaceQT4/monWidgetPlusieursTuple3.py | 2 +- .../monWidgetPlusieursTupleAvril11.py | 2 +- InterfaceQT4/monWidgetPlusieursTupleN.py | 2 +- InterfaceQT4/monWidgetRadioButton.py | 2 +- InterfaceQT4/monWidgetSDCOInto.py | 2 +- InterfaceQT4/monWidgetSimpBase.py | 2 +- InterfaceQT4/monWidgetSimpBool.py | 2 +- InterfaceQT4/monWidgetSimpComplexe.py | 2 +- InterfaceQT4/monWidgetSimpFichier.py | 2 +- InterfaceQT4/monWidgetSimpSalome.py | 2 +- InterfaceQT4/monWidgetSimpTuple.py | 2 +- InterfaceQT4/monWidgetSimpTuple2.py | 2 +- InterfaceQT4/monWidgetSimpTuple3.py | 2 +- InterfaceQT4/monWidgetSimpTupleN.py | 2 +- InterfaceQT4/monWidgetSimpTxt.py | 2 +- InterfaceQT4/monWidgetTableau.py | 2 +- InterfaceQT4/monWidgetUniqueSDCO.py | 2 +- InterfaceQT4/monWidgetVide.py | 2 +- InterfaceQT4/politiquesValidation.py | 2 +- InterfaceQT4/qtEficas.py | 1034 ++++++++- InterfaceQT4/qtEficasSsIhm.py | 2 +- InterfaceQT4/qtEficas_with_log.py | 2 +- InterfaceQT4/qtSaisie.py | 2 +- InterfaceQT4/readercata.py | 2 +- InterfaceQT4/readercataXML.py | 2 +- InterfaceQT4/ssIhm.py | 2 +- InterfaceQT4/typeNode.py | 2 +- InterfaceQT4/viewManager.py | 2 +- InterfaceQT4/viewManagerSsIhm.py | 2 +- MAP/configuration_MAP.py | 2 +- MAP/prefs.py | 2 +- MAP/prefs_MAP.py | 2 +- MAP/qtEficas_map.py | 2 +- MAP/style.py | 2 +- MT/prefs.py | 2 +- MT/qtEficasMT.py | 2 +- {EssaiInit => Med}/Cata_MED_FAM.xml | 0 {EssaiInit => Med}/Cata_MED_FAM.xml.mini | 0 {EssaiInit => Med}/Cata_MED_FAM.xml.origin | 0 {EssaiInit => Med}/README.txt | 0 {EssaiInit => Med}/aide1 | 0 {EssaiInit => Med}/efficas.py | 0 {EssaiInit => Med}/model.xsd | 0 {PSEN_Eficas/PSEN => Med/raw}/__init__.py | 0 {EssaiInit => Med}/raw/efficas.py | 0 {EssaiInit => Med}/readerEfficas.py | 0 Noyau/N_ASSD.py | 9 +- Noyau/N_BLOC.py | 2 +- Noyau/N_CO.py | 2 +- Noyau/N_CONVERT.py | 2 +- Noyau/N_CR.py | 2 +- Noyau/N_ETAPE.py | 2 +- Noyau/N_FACT.py | 2 +- Noyau/N_FONCTION.py | 2 +- Noyau/N_FORM.py | 2 +- Noyau/N_FORM_ETAPE.py | 2 +- Noyau/N_GEOM.py | 2 +- Noyau/N_JDC.py | 2 +- Noyau/N_JDC_CATA.py | 2 +- Noyau/N_LASSD.py | 2 +- Noyau/N_MACRO.py | 2 +- Noyau/N_MACRO_ETAPE.py | 2 +- Noyau/N_MCBLOC.py | 2 +- Noyau/N_MCCOMPO.py | 2 +- Noyau/N_MCFACT.py | 2 +- Noyau/N_MCLIST.py | 2 +- Noyau/N_MCSIMP.py | 2 +- Noyau/N_OBJECT.py | 2 +- Noyau/N_OPER.py | 2 +- Noyau/N_OPS.py | 2 +- Noyau/N_PROC.py | 2 +- Noyau/N_PROC_ETAPE.py | 2 +- Noyau/N_REGLE.py | 2 +- Noyau/N_SENSIBILITE.py | 2 +- Noyau/N_SIMP.py | 2 +- Noyau/N_UserASSD.py | 2 +- Noyau/N_VALIDATOR.py | 2 +- Noyau/N__F.py | 2 +- Noyau/N_types.py | 2 +- Noyau/N_utils.py | 2 +- Noyau/nommage.py | 2 +- Noyau/strfunc.py | 2 +- OldCodes/Aster/__init__.py | 2 +- OldCodes/Aster/configuration_ASTER.py | 2 +- OldCodes/Aster/prefs.py | 2 +- OldCodes/Aster/prefs_ASTER.py | 2 +- OldCodes/Aster/properties.py | 2 +- OldCodes/Aster/qtEficas_aster.py | 2 +- OldCodes/Aster/qtGroup.py | 2 +- OldCodes/Aster/style.py | 2 +- .../Carmel3D}/CMakeLists.txt | 0 .../Carmel3D}/Carmel3D_Cata_V0.py | 2 +- .../Carmel3D}/Carmel3D_Cata_frequentiel_V0.py | 2 +- .../Carmel3D}/Carmel3D_Cata_frequentiel_V1.py | 2 +- {Carmel3D => OldCodes/Carmel3D}/E24 | 0 {Carmel3D => OldCodes/Carmel3D}/FEV1000 | 0 {Carmel3D => OldCodes/Carmel3D}/FEV470 | 0 {Carmel3D => OldCodes/Carmel3D}/FEV600 | 0 {Carmel3D => OldCodes/Carmel3D}/FEV800 | 0 {Carmel3D => OldCodes/Carmel3D}/HA600 | 0 {Carmel3D => OldCodes/Carmel3D}/M600_65 | 0 {Carmel3D => OldCodes/Carmel3D}/M6X2ISO1 | 0 .../Carmel3D}/M6X_epsilon.mater | 0 .../Carmel3D}/M6X_homog_mu.mater | 0 .../Carmel3D}/M6X_homog_sigma.mater | 0 .../Carmel3D}/M6X_lineaire_mu.mater | 0 .../Carmel3D}/M6X_lineaire_sigma.mater | 0 {Carmel3D => OldCodes/Carmel3D}/M6X_mu.mater | 0 {Carmel3D => OldCodes/Carmel3D}/__init__.py | 0 .../Carmel3D}/ajoutGroupe.py | 0 .../Carmel3D}/configuration_CARMEL3D.py | 2 +- .../Carmel3D}/materiaux/ACIER_TEAM13 | 0 .../Carmel3D}/materiaux/CMakeLists.txt | 0 {Carmel3D => OldCodes/Carmel3D}/materiaux/E24 | 0 .../Carmel3D}/materiaux/FEV1000 | 0 .../Carmel3D}/materiaux/FEV470 | 0 .../Carmel3D}/materiaux/FEV600 | 0 .../Carmel3D}/materiaux/FEV800 | 0 .../Carmel3D}/materiaux/HA600 | 0 .../Carmel3D}/materiaux/M600_65 | 0 .../Carmel3D}/materiaux/M6X2ISO1 | 0 .../Carmel3D}/materiaux/M6X_epsilon.mater | 0 .../Carmel3D}/materiaux/M6X_homogene_mu.mater | 0 .../materiaux/M6X_homogene_sigma.mater | 0 .../Carmel3D}/materiaux/M6X_lineaire_mu.mater | 0 .../materiaux/M6X_lineaire_sigma.mater | 0 .../Carmel3D}/materiaux/M6X_mu.mater | 0 .../Carmel3D}/materiaux/M6X_sigma.mater | 0 .../Carmel3D}/materiaux/materiaux.comm | 0 {Carmel3D => OldCodes/Carmel3D}/opsCarmel.py | 2 +- {Carmel3D => OldCodes/Carmel3D}/prefs.py | 2 +- .../Carmel3D}/prefs_CARMEL3D.py | 2 +- {Carmel3D => OldCodes/Carmel3D}/properties.py | 0 .../Carmel3D}/qtEficas_Carmel3D.py | 2 +- {Carmel3D => OldCodes/Carmel3D}/style.py | 0 OldCodes/CarmelCND/prefs.py | 2 +- OldCodes/CarmelCND/qtEficas_CarmelCND.py | 2 +- OldCodes/CarmelCS/prefs.py | 2 +- OldCodes/CarmelCS/qtEficas_CarmelCS.py | 2 +- OldCodes/MED/CataAZ.py | 210 ++ OldCodes/MED/Elementary_Lists_52996_Cata.py | 86 + OldCodes/MED/Elementary_Lists_53000_Cata.py | 52 + OldCodes/MED/Elementary_Lists_53013_Cata.py | 59 + OldCodes/MED/Elementary_Lists_53036_Cata.py | 59 + OldCodes/MED/Elementary_Lists_Cata.py | 59 + .../MED}/Global_Condition_Cata.py | 0 OldCodes/MED/Many_Concepts_52983_Cata.py | 39 + OldCodes/MED/Many_Concepts_52988_Cata.py | 76 + OldCodes/MED/Many_Concepts_52989_Cata.py | 77 + .../MED}/Many_Concepts_52992_Cata.py | 0 {monCode => OldCodes/MED}/Matrix_Cata.py | 0 OldCodes/MED/Nested_Cond_52945_Cata.py | 61 + OldCodes/MED/Nested_Cond_52946_Cata.py | 62 + OldCodes/MED/Nested_Cond_52947_Cata.py | 17 + OldCodes/MED/Nested_Cond_52948_Cata.py | 21 + OldCodes/MED/Nested_Cond_52949_Cata.py | 19 + OldCodes/MED/Nested_Cond_52952_Cata.py | 60 + OldCodes/MED/Separate_Blocks_52958_Cata.py | 29 + OldCodes/MED/Separate_Blocks_52963_Cata.py | 40 + OldCodes/MED/Separate_Blocks_52966_Cata.py | 48 + OldCodes/MED/Separate_Blocks_52972_Cata.py | 66 + OldCodes/MED/Separate_Blocks_52975_Cata.py | 66 + OldCodes/MED/a | 110 + OldCodes/MED/cata_diapo.py | 48 + OldCodes/MED/cata_med.py | 29 + .../MED/configuration_MED.py | 0 OldCodes/MED/images/essaiAster.png | Bin 0 -> 11576 bytes OldCodes/MED/items_integer_space.txt | 2 + OldCodes/MED/monCode_qtEficas.py | 33 + OldCodes/MED/prefs.py | 22 + OldCodes/MED/prefs_MED.py | 48 + OldCodes/MED/prefs_monCode.py | 68 + {PSEN_Eficas => OldCodes/MED}/properties.py | 0 OldCodes/MED/qtEficas_AZ.py | 32 + OldCodes/MED/qtEficas_Med.py | 32 + OldCodes/MED/typescript | 34 + .../OpenTURNS_Cata_Study_V8.py | 2 +- .../configuration_OPENTURNS_STUDY.py | 2 +- OldCodes/Openturns_Study/opsOT.py | 2 +- OldCodes/Openturns_Study/prefs.py | 2 +- .../qtEficas_openturns_study.py | 2 +- .../OpenTURNS_Cata_Wrapper_V4.py | 2 +- .../configuration_OPENTURNS_WRAPPER.py | 2 +- OldCodes/Openturns_Wrapper/prefs.py | 2 +- .../ExtractGeneratorLoadLineandTransfoDico.py | 0 .../ExtractGeneratorandLoadList.py | 0 .../PSEN_Eficas}/PSEN/PSEN_GUI.py | 0 .../PSEN_Eficas}/PSEN/PSSEWrapper.py | 0 .../PSEN_Eficas/PSEN}/__init__.py | 0 .../PSEN_Eficas}/PSEN/exploit2.ows | 0 .../PSEN_Eficas}/PSEN/support_functions.py | 0 .../PSEN_Eficas}/PSEN_Cata.py | 2 +- OldCodes/PSEN_Eficas/configuration_PSEN.py | 43 + .../PSEN_Eficas}/mesScripts.py | 0 .../PSEN_Eficas}/mesScripts_PSEN.py | 0 .../PSEN_Eficas}/opsPSEN.py | 2 +- .../PSEN_Eficas}/prefs.py | 2 +- .../PSEN_Eficas}/prefs_PSEN.py | 0 .../PSEN_Eficas}/properties.py | 0 .../PSEN_Eficas}/qtEficas_PSEN.py | 2 +- OldCodes/PSEN_N1/PSEN_Cata_N1.py | 2 +- OldCodes/PSEN_N1/opsPSEN_N1.py | 2 +- OldCodes/PSEN_N1/prefs.py | 2 +- OldCodes/PSEN_N1/qtEficas_PSEN_N1.py | 2 +- .../ProcessOutputs_Eficas}/EssaiMulti.py | 0 .../ExtractGeneratorLoadLineandTransfoDico.py | 0 ...tGeneratorLoadLineandTransfoDicoProcess.py | 0 .../ProcessOutputs_Eficas}/PSEN_Cata_N1.py | 2 +- .../ProcessOutputs_Eficas}/PSEN_Cata_N1.py.ok | 0 .../ProcessOutputs_Cata.py | 2 +- .../configuration_PSEN_N1.py | 0 .../mesScripts_PSEN_N1.py | 0 .../ProcessOutputs_Eficas}/opsPSEN_N1.py | 2 +- .../ProcessOutputs_Eficas}/prefs.py | 2 +- .../ProcessOutputs_Eficas}/prefs_PSEN_N1.py | 0 .../ProcessOutputs_Eficas}/properties.py | 0 .../qtEficas_PSEN_N1.py | 2 +- {SPECA => OldCodes/SPECA}/SPECA_Cata_V1.py | 0 {SPECA => OldCodes/SPECA}/SPECA_Cata_V2016.py | 0 {SPECA => OldCodes/SPECA}/SPECA_Cata_V2_00.py | 0 .../SPECA}/configuration_SPECA.py | 0 {SPECA => OldCodes/SPECA}/prefs.py | 0 {SPECA => OldCodes/SPECA}/prefs_SPECA.py | 0 {monCode => OldCodes/SPECA}/properties.py | 0 {SPECA => OldCodes/SPECA}/qtEficasSPECA.py | 2 +- OldCodes/Sep/SEP_Cata_V1_4.py | 2 +- OldCodes/Sep/__init__.py | 2 +- OldCodes/Sep/configuration_SEP.py | 2 +- OldCodes/Sep/prefs.py | 2 +- OldCodes/Sep/prefs_SEP.py | 2 +- OldCodes/Sep/qtEficas_SEP.py | 2 +- OldCodes/ZCracks/prefs.py | 2 +- OldCodes/ZCracks/qtEficas_ZCracks.py | 2 +- .../boundary_conditions}/CMakeLists.txt | 0 .../boundary_conditions}/__init__.py | 0 .../boundary_conditions}/appli.py | 0 .../boundary_conditions_cata.py | 0 .../configuration_boundary_conditions.py | 0 .../generator_boundary_conditions.py | 0 .../boundary_conditions}/prefs.py | 0 .../prefs_boundary_conditions.py | 0 OldCodes/ts/prefs.py | 2 +- Telemac/__init__.py | 2 +- Telemac/aideAuxConvertisseurs.py | 2 +- {mascaret => Telemac/mascaret}/CMakeLists.txt | 0 Telemac/mascaret/__init__.py | 0 {mascaret => Telemac/mascaret}/appli.py | 2 +- .../mascaret}/configuration_mascaret.py | 2 +- .../mascaret}/mascaret_V7_cata.py | 0 {mascaret => Telemac/mascaret}/prefs.py | 0 .../mascaret}/prefs_mascaret.py | 2 +- Telemac/prefs.py | 2 +- Telemac/qtEficas_Telemac.py | 2 +- Tests/EficasEngineTest.py | 2 +- Tests/HTMLTestRunner.py | 824 ------- Traducteur/__init__.py | 2 +- Traducteur/calcG.py | 2 +- Traducteur/changeValeur.py | 2 +- Traducteur/dictErreurs.py | 2 +- Traducteur/inseremocle.py | 2 +- Traducteur/load.py | 2 +- Traducteur/log.py | 2 +- Traducteur/mocles.py | 2 +- Traducteur/movemocle.py | 2 +- Traducteur/parseur.py | 2 +- Traducteur/regles.py | 2 +- Traducteur/removemocle.py | 2 +- Traducteur/renamemocle.py | 2 +- Traducteur/traduitV10V11.py | 2 +- Traducteur/traduitV11V12.py | 2 +- Traducteur/traduitV7V8.py | 2 +- Traducteur/traduitV8V9.py | 2 +- Traducteur/traduitV9V10.py | 2 +- Traducteur/utils.py | 2 +- Traducteur/visiteur.py | 2 +- Validation/__init__.py | 2 +- VirtualPolymer/prefs.py | 2 +- VirtualPolymer/qtEficasVP.py | 2 +- convert/__init__.py | 2 +- convert/autre_parseur.py | 2 +- convert/convert_TELEMAC.py | 2 +- convert/convert_XML.py | 2 +- convert/convert_dico.py | 2 +- convert/convert_map.py | 2 +- convert/convert_pyth.py | 2 +- convert/convert_python.py | 2 +- convert/old/convert_openturns_study.py | 2 +- convert/old/convert_openturns_wrapper.py | 2 +- convert/parseur_python.py | 2 +- generator/Formatage.py | 2 +- generator/__init__.py | 2 +- generator/generator_GroupMA.py | 2 +- generator/generator_PSEN.py | 2 +- generator/generator_ProcessOutputs.py | 2 +- generator/generator_TELEMAC.py | 2 +- generator/generator_XML.py | 2 +- generator/generator_aplat.py | 2 +- generator/generator_dico.py | 2 +- generator/generator_dicoImbrique.py | 2 +- generator/generator_map.py | 2 +- generator/generator_mapVP.py | 2 +- generator/generator_modification.py | 2 +- generator/generator_python.py | 2 +- generator/generator_vers3DSalome.py | 2 +- generator/oldCodes/DefautASTER.py | 2 +- generator/oldCodes/OpenturnsBase.py | 2 +- generator/oldCodes/OpenturnsSTD.py | 2 +- generator/oldCodes/OpenturnsXML.py | 2 +- generator/oldCodes/generator_CARMEL3D.py | 2 +- .../oldCodes/generator_CARMEL3D_temporel.py | 2 +- generator/oldCodes/generator_CARMELCND.py | 2 +- generator/oldCodes/generator_CARMELCS.py | 2 +- generator/oldCodes/generator_SEP.py | 2 +- generator/oldCodes/generator_ZCracks.py | 2 +- generator/oldCodes/generator_asterv5.py | 2 +- generator/oldCodes/generator_cuve2dg.py | 2 +- .../oldCodes/generator_file_from_template.py | 2 +- generator/oldCodes/generator_homard.py | 2 +- generator/oldCodes/generator_ini.py | 2 +- generator/oldCodes/generator_openturns.py | 2 +- .../oldCodes/generator_openturns_study.py | 2 +- .../oldCodes/generator_openturns_wrapper.py | 2 +- generator/oldCodes/generator_pyth.py | 2 +- generator/oldCodes/generator_python6.py | 2 +- .../oldGenerator_CARMEL3D_frequentiel.py | 2 +- monCode/prefs_monCode.py | 69 - 540 files changed, 8655 insertions(+), 4865 deletions(-) create mode 100644 CatasDeTests/.b.py.swp create mode 100644 CatasDeTests/.cataMemesNoms.py.swp create mode 100644 CatasDeTests/.cataSimple_driver.xsd.swp create mode 100644 CatasDeTests/.cataTesteDelete.py.swp create mode 100644 CatasDeTests/ReadMe.txt create mode 100644 CatasDeTests/cataListes.py create mode 100644 CatasDeTests/cata_1.py create mode 100644 CatasDeTests/cata_1.xsd create mode 100644 CatasDeTests/cata_FactFreresMemesNoms.py create mode 100644 CatasDeTests/cata_FactFreresMemesNomsV1_ref.xsd create mode 100644 CatasDeTests/cata_FactFreresMemesNoms_driver.py create mode 100644 CatasDeTests/cata_FactFreresMemesNoms_ref.xsd create mode 100644 CatasDeTests/cata_UserAssd.py create mode 100644 CatasDeTests/cata_UserAssd.xsd create mode 100644 CatasDeTests/cata_UserAssd.xsd_ref create mode 100644 CatasDeTests/cata_UserAssd2.xsd create mode 100644 CatasDeTests/cata_UserAssd2_driver.py create mode 100644 CatasDeTests/cata_UserAssd_driver.py create mode 100644 CatasDeTests/decorateur/metier.py create mode 100644 CatasDeTests/exemple.xml create mode 100755 CatasDeTests/generateXML.py create mode 100755 CatasDeTests/generateXSD.py create mode 100644 CatasDeTests/log create mode 100644 CatasDeTests/prefs.py create mode 100644 CatasDeTests/prefs_Essai.py create mode 100755 CatasDeTests/qtEficasEssai.py rename {EssaiInit => CatasDeTests}/raw/__init__.py (100%) create mode 100644 CatasDeTests/raw/cata_FactFreresMemesNoms_driver.py create mode 100644 CatasDeTests/raw/cata_UserAssd2_driver.py create mode 100644 CatasDeTests/raw/cata_UserAssd_driver.py create mode 100644 CatasDeTests/raw/toto.py create mode 100644 CatasDeTests/ref/cata_Vimmp_genere.xsd create mode 100644 CatasDeTests/ref/cata_gromacs_genere.xsd delete mode 100644 InterfaceQT4/editor.pourCIST delete mode 100755 InterfaceQT4/editorJuillet.py rename {EssaiInit => Med}/Cata_MED_FAM.xml (100%) rename {EssaiInit => Med}/Cata_MED_FAM.xml.mini (100%) rename {EssaiInit => Med}/Cata_MED_FAM.xml.origin (100%) rename {EssaiInit => Med}/README.txt (100%) rename {EssaiInit => Med}/aide1 (100%) rename {EssaiInit => Med}/efficas.py (100%) rename {EssaiInit => Med}/model.xsd (100%) rename {PSEN_Eficas/PSEN => Med/raw}/__init__.py (100%) mode change 100755 => 100644 rename {EssaiInit => Med}/raw/efficas.py (100%) rename {EssaiInit => Med}/readerEfficas.py (100%) rename {Carmel3D => OldCodes/Carmel3D}/CMakeLists.txt (100%) rename {Carmel3D => OldCodes/Carmel3D}/Carmel3D_Cata_V0.py (99%) rename {Carmel3D => OldCodes/Carmel3D}/Carmel3D_Cata_frequentiel_V0.py (98%) rename {Carmel3D => OldCodes/Carmel3D}/Carmel3D_Cata_frequentiel_V1.py (99%) rename {Carmel3D => OldCodes/Carmel3D}/E24 (100%) rename {Carmel3D => OldCodes/Carmel3D}/FEV1000 (100%) rename {Carmel3D => OldCodes/Carmel3D}/FEV470 (100%) rename {Carmel3D => OldCodes/Carmel3D}/FEV600 (100%) rename {Carmel3D => OldCodes/Carmel3D}/FEV800 (100%) rename {Carmel3D => OldCodes/Carmel3D}/HA600 (100%) rename {Carmel3D => OldCodes/Carmel3D}/M600_65 (100%) rename {Carmel3D => OldCodes/Carmel3D}/M6X2ISO1 (100%) rename {Carmel3D => OldCodes/Carmel3D}/M6X_epsilon.mater (100%) rename {Carmel3D => OldCodes/Carmel3D}/M6X_homog_mu.mater (100%) rename {Carmel3D => OldCodes/Carmel3D}/M6X_homog_sigma.mater (100%) rename {Carmel3D => OldCodes/Carmel3D}/M6X_lineaire_mu.mater (100%) rename {Carmel3D => OldCodes/Carmel3D}/M6X_lineaire_sigma.mater (100%) rename {Carmel3D => OldCodes/Carmel3D}/M6X_mu.mater (100%) rename {Carmel3D => OldCodes/Carmel3D}/__init__.py (100%) rename {Carmel3D => OldCodes/Carmel3D}/ajoutGroupe.py (100%) rename {Carmel3D => OldCodes/Carmel3D}/configuration_CARMEL3D.py (94%) rename {Carmel3D => OldCodes/Carmel3D}/materiaux/ACIER_TEAM13 (100%) rename {Carmel3D => OldCodes/Carmel3D}/materiaux/CMakeLists.txt (100%) rename {Carmel3D => OldCodes/Carmel3D}/materiaux/E24 (100%) rename {Carmel3D => OldCodes/Carmel3D}/materiaux/FEV1000 (100%) rename {Carmel3D => OldCodes/Carmel3D}/materiaux/FEV470 (100%) rename {Carmel3D => OldCodes/Carmel3D}/materiaux/FEV600 (100%) rename {Carmel3D => OldCodes/Carmel3D}/materiaux/FEV800 (100%) rename {Carmel3D => OldCodes/Carmel3D}/materiaux/HA600 (100%) rename {Carmel3D => OldCodes/Carmel3D}/materiaux/M600_65 (100%) rename {Carmel3D => OldCodes/Carmel3D}/materiaux/M6X2ISO1 (100%) rename {Carmel3D => OldCodes/Carmel3D}/materiaux/M6X_epsilon.mater (100%) rename {Carmel3D => OldCodes/Carmel3D}/materiaux/M6X_homogene_mu.mater (100%) rename {Carmel3D => OldCodes/Carmel3D}/materiaux/M6X_homogene_sigma.mater (100%) rename {Carmel3D => OldCodes/Carmel3D}/materiaux/M6X_lineaire_mu.mater (100%) rename {Carmel3D => OldCodes/Carmel3D}/materiaux/M6X_lineaire_sigma.mater (100%) rename {Carmel3D => OldCodes/Carmel3D}/materiaux/M6X_mu.mater (100%) rename {Carmel3D => OldCodes/Carmel3D}/materiaux/M6X_sigma.mater (100%) rename {Carmel3D => OldCodes/Carmel3D}/materiaux/materiaux.comm (100%) rename {Carmel3D => OldCodes/Carmel3D}/opsCarmel.py (97%) rename {Carmel3D => OldCodes/Carmel3D}/prefs.py (96%) rename {Carmel3D => OldCodes/Carmel3D}/prefs_CARMEL3D.py (97%) rename {Carmel3D => OldCodes/Carmel3D}/properties.py (100%) rename {Carmel3D => OldCodes/Carmel3D}/qtEficas_Carmel3D.py (96%) rename {Carmel3D => OldCodes/Carmel3D}/style.py (100%) create mode 100755 OldCodes/MED/CataAZ.py create mode 100644 OldCodes/MED/Elementary_Lists_52996_Cata.py create mode 100644 OldCodes/MED/Elementary_Lists_53000_Cata.py create mode 100644 OldCodes/MED/Elementary_Lists_53013_Cata.py create mode 100644 OldCodes/MED/Elementary_Lists_53036_Cata.py create mode 100755 OldCodes/MED/Elementary_Lists_Cata.py rename {monCode => OldCodes/MED}/Global_Condition_Cata.py (100%) create mode 100644 OldCodes/MED/Many_Concepts_52983_Cata.py create mode 100644 OldCodes/MED/Many_Concepts_52988_Cata.py create mode 100644 OldCodes/MED/Many_Concepts_52989_Cata.py rename {monCode => OldCodes/MED}/Many_Concepts_52992_Cata.py (100%) rename {monCode => OldCodes/MED}/Matrix_Cata.py (100%) create mode 100644 OldCodes/MED/Nested_Cond_52945_Cata.py create mode 100644 OldCodes/MED/Nested_Cond_52946_Cata.py create mode 100644 OldCodes/MED/Nested_Cond_52947_Cata.py create mode 100644 OldCodes/MED/Nested_Cond_52948_Cata.py create mode 100644 OldCodes/MED/Nested_Cond_52949_Cata.py create mode 100644 OldCodes/MED/Nested_Cond_52952_Cata.py create mode 100644 OldCodes/MED/Separate_Blocks_52958_Cata.py create mode 100644 OldCodes/MED/Separate_Blocks_52963_Cata.py create mode 100644 OldCodes/MED/Separate_Blocks_52966_Cata.py create mode 100644 OldCodes/MED/Separate_Blocks_52972_Cata.py create mode 100644 OldCodes/MED/Separate_Blocks_52975_Cata.py create mode 100644 OldCodes/MED/a create mode 100644 OldCodes/MED/cata_diapo.py create mode 100644 OldCodes/MED/cata_med.py rename PSEN_Eficas/configuration_PSEN.py => OldCodes/MED/configuration_MED.py (100%) mode change 100755 => 100644 create mode 100644 OldCodes/MED/images/essaiAster.png create mode 100644 OldCodes/MED/items_integer_space.txt create mode 100755 OldCodes/MED/monCode_qtEficas.py create mode 100644 OldCodes/MED/prefs.py create mode 100644 OldCodes/MED/prefs_MED.py create mode 100644 OldCodes/MED/prefs_monCode.py rename {PSEN_Eficas => OldCodes/MED}/properties.py (100%) mode change 100755 => 100644 create mode 100755 OldCodes/MED/qtEficas_AZ.py create mode 100755 OldCodes/MED/qtEficas_Med.py create mode 100644 OldCodes/MED/typescript rename {PSEN_Eficas => OldCodes/PSEN_Eficas}/ExtractGeneratorLoadLineandTransfoDico.py (100%) rename {PSEN_Eficas => OldCodes/PSEN_Eficas}/ExtractGeneratorandLoadList.py (100%) rename {PSEN_Eficas => OldCodes/PSEN_Eficas}/PSEN/PSEN_GUI.py (100%) rename {PSEN_Eficas => OldCodes/PSEN_Eficas}/PSEN/PSSEWrapper.py (100%) rename {boundary_conditions => OldCodes/PSEN_Eficas/PSEN}/__init__.py (100%) mode change 100644 => 100755 rename {PSEN_Eficas => OldCodes/PSEN_Eficas}/PSEN/exploit2.ows (100%) rename {PSEN_Eficas => OldCodes/PSEN_Eficas}/PSEN/support_functions.py (100%) rename {PSEN_Eficas => OldCodes/PSEN_Eficas}/PSEN_Cata.py (99%) create mode 100755 OldCodes/PSEN_Eficas/configuration_PSEN.py rename {PSEN_Eficas => OldCodes/PSEN_Eficas}/mesScripts.py (100%) rename {PSEN_Eficas => OldCodes/PSEN_Eficas}/mesScripts_PSEN.py (100%) rename {PSEN_Eficas => OldCodes/PSEN_Eficas}/opsPSEN.py (99%) rename {PSEN_Eficas => OldCodes/PSEN_Eficas}/prefs.py (96%) rename {PSEN_Eficas => OldCodes/PSEN_Eficas}/prefs_PSEN.py (100%) rename {ProcessOutputs_Eficas => OldCodes/PSEN_Eficas}/properties.py (100%) mode change 100644 => 100755 rename {PSEN_Eficas => OldCodes/PSEN_Eficas}/qtEficas_PSEN.py (96%) rename {ProcessOutputs_Eficas => OldCodes/ProcessOutputs_Eficas}/EssaiMulti.py (100%) rename {ProcessOutputs_Eficas => OldCodes/ProcessOutputs_Eficas}/ExtractGeneratorLoadLineandTransfoDico.py (100%) rename {ProcessOutputs_Eficas => OldCodes/ProcessOutputs_Eficas}/ExtractGeneratorLoadLineandTransfoDicoProcess.py (100%) rename {ProcessOutputs_Eficas => OldCodes/ProcessOutputs_Eficas}/PSEN_Cata_N1.py (99%) rename {ProcessOutputs_Eficas => OldCodes/ProcessOutputs_Eficas}/PSEN_Cata_N1.py.ok (100%) rename {ProcessOutputs_Eficas => OldCodes/ProcessOutputs_Eficas}/ProcessOutputs_Cata.py (99%) rename {ProcessOutputs_Eficas => OldCodes/ProcessOutputs_Eficas}/configuration_PSEN_N1.py (100%) rename {ProcessOutputs_Eficas => OldCodes/ProcessOutputs_Eficas}/mesScripts_PSEN_N1.py (100%) rename {ProcessOutputs_Eficas => OldCodes/ProcessOutputs_Eficas}/opsPSEN_N1.py (99%) rename {ProcessOutputs_Eficas => OldCodes/ProcessOutputs_Eficas}/prefs.py (96%) rename {ProcessOutputs_Eficas => OldCodes/ProcessOutputs_Eficas}/prefs_PSEN_N1.py (100%) rename {SPECA => OldCodes/ProcessOutputs_Eficas}/properties.py (100%) rename {ProcessOutputs_Eficas => OldCodes/ProcessOutputs_Eficas}/qtEficas_PSEN_N1.py (97%) rename {SPECA => OldCodes/SPECA}/SPECA_Cata_V1.py (100%) rename {SPECA => OldCodes/SPECA}/SPECA_Cata_V2016.py (100%) rename {SPECA => OldCodes/SPECA}/SPECA_Cata_V2_00.py (100%) rename {SPECA => OldCodes/SPECA}/configuration_SPECA.py (100%) rename {SPECA => OldCodes/SPECA}/prefs.py (100%) rename {SPECA => OldCodes/SPECA}/prefs_SPECA.py (100%) rename {monCode => OldCodes/SPECA}/properties.py (100%) rename {SPECA => OldCodes/SPECA}/qtEficasSPECA.py (96%) rename {boundary_conditions => OldCodes/boundary_conditions}/CMakeLists.txt (100%) rename {mascaret => OldCodes/boundary_conditions}/__init__.py (100%) rename {boundary_conditions => OldCodes/boundary_conditions}/appli.py (100%) rename {boundary_conditions => OldCodes/boundary_conditions}/boundary_conditions_cata.py (100%) rename {boundary_conditions => OldCodes/boundary_conditions}/configuration_boundary_conditions.py (100%) rename {boundary_conditions => OldCodes/boundary_conditions}/generator_boundary_conditions.py (100%) rename {boundary_conditions => OldCodes/boundary_conditions}/prefs.py (100%) rename {boundary_conditions => OldCodes/boundary_conditions}/prefs_boundary_conditions.py (100%) rename {mascaret => Telemac/mascaret}/CMakeLists.txt (100%) create mode 100644 Telemac/mascaret/__init__.py rename {mascaret => Telemac/mascaret}/appli.py (98%) rename {mascaret => Telemac/mascaret}/configuration_mascaret.py (97%) rename {mascaret => Telemac/mascaret}/mascaret_V7_cata.py (100%) rename {mascaret => Telemac/mascaret}/prefs.py (100%) rename {mascaret => Telemac/mascaret}/prefs_mascaret.py (96%) delete mode 100644 Tests/HTMLTestRunner.py delete mode 100644 monCode/prefs_monCode.py diff --git a/Accas/A_ASSD.py b/Accas/A_ASSD.py index 22c98794..88cc13af 100644 --- a/Accas/A_ASSD.py +++ b/Accas/A_ASSD.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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,15 +22,15 @@ 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_GEOM -from Noyau import N_FONCTION -from Noyau import N_CO -from Noyau import N_UserASSD +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'heritage multiple pour recreer +# 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 +# pour faire en sorte que isinstance(o,ASSD) marche encore apres # derivation class ASSD(I_ASSD.ASSD,N_ASSD.ASSD):pass @@ -41,26 +41,24 @@ 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 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 e8945759..743f7d03 100644 --- a/Accas/A_AU_MOINS_UN.py +++ b/Accas/A_AU_MOINS_UN.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 @@ -23,8 +23,8 @@ 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): - """ - La classe utilise l'initialiseur de REGLE. Il n'est pas - necessaire d'expliciter son initialiseur car - V_AU_MOINS_UN.AU_MOINS_UN n'en a pas - """ + """ + La classe utilise l'initialiseur de REGLE. Il n'est pas + necessaire d'expliciter son initialiseur car + V_AU_MOINS_UN.AU_MOINS_UN n'en a pas + """ diff --git a/Accas/A_AU_PLUS_UN.py b/Accas/A_AU_PLUS_UN.py index 1cf38da6..197f936a 100644 --- a/Accas/A_AU_PLUS_UN.py +++ b/Accas/A_AU_PLUS_UN.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 @@ -23,8 +23,8 @@ 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): - """ - 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 - """ + """ + 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 + """ diff --git a/Accas/A_AVANT.py b/Accas/A_AVANT.py index 63aa2507..2f697723 100644 --- a/Accas/A_AVANT.py +++ b/Accas/A_AVANT.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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,8 @@ from Noyau import N_REGLE from Ihm import I_REGLE, I_AVANT 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 n'en a pas - """ + """ + La classe utilise l'initialiseur de REGLE. Il n'est pas + necessaire d'expliciter son initialiseur car + I_AVANT.I_AVANT n'en a pas + """ diff --git a/Accas/A_A_CLASSER.py b/Accas/A_A_CLASSER.py index 70ec47a8..1e9e3fcc 100644 --- a/Accas/A_A_CLASSER.py +++ b/Accas/A_A_CLASSER.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 @@ -23,7 +23,7 @@ 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): - """ - La classe utilise l'initialiseur du module V_. - Il faut absolument que V_A_CLASSER soit en premier dans l'heritage - """ + """ + La classe utilise l'initialiseur du module V_. + Il faut absolument que V_A_CLASSER soit en premier dans l'heritage + """ diff --git a/Accas/A_BLOC.py b/Accas/A_BLOC.py index badd8d9d..d68b28e3 100644 --- a/Accas/A_BLOC.py +++ b/Accas/A_BLOC.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 @@ -25,8 +25,7 @@ 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): - I_ENTITE.ENTITE.__init__(self) - N_BLOC.BLOC.__init__(self,*tup,**args) - + class_instance=A_MCBLOC.MCBLOC + def __init__(self,*tup,**args): + I_ENTITE.ENTITE.__init__(self) + N_BLOC.BLOC.__init__(self,*tup,**args) diff --git a/Accas/A_ENSEMBLE.py b/Accas/A_ENSEMBLE.py index 8b4a3a78..e60c16be 100644 --- a/Accas/A_ENSEMBLE.py +++ b/Accas/A_ENSEMBLE.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 @@ -23,8 +23,8 @@ from Validation import V_ENSEMBLE from Ihm import I_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 - V_ENSEMBLE.ENSEMBLE n'en a pas - """ + """ + La classe utilise l'initialiseur de REGLE. Il n'est pas + necessaire d'expliciter son initialiseur car + V_ENSEMBLE.ENSEMBLE n'en a pas + """ diff --git a/Accas/A_ETAPE.py b/Accas/A_ETAPE.py index 11dc12de..301dfd9f 100644 --- a/Accas/A_ETAPE.py +++ b/Accas/A_ETAPE.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 @@ -24,6 +24,6 @@ from Ihm import I_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) - V_ETAPE.ETAPE.__init__(self) + 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 eb04237d..16905ee2 100644 --- a/Accas/A_EVAL.py +++ b/Accas/A_EVAL.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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,8 +18,8 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # from __future__ import absolute_import -from Ihm import I_EVAL +from Ihm import I_EVAL class EVAL(I_EVAL.EVAL): - def __init__(self,str): - I_EVAL.EVAL.__init__(self,str) + def __init__(self,str): + I_EVAL.EVAL.__init__(self,str) diff --git a/Accas/A_EXCLUS.py b/Accas/A_EXCLUS.py index 432dc45b..d69af075 100644 --- a/Accas/A_EXCLUS.py +++ b/Accas/A_EXCLUS.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 @@ -23,8 +23,8 @@ from Validation import V_EXCLUS from Ihm import I_EXCLUS 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 - V_EXCLUS.EXCLUS n'en a pas - """ + """ + La classe utilise l'initialiseur de REGLE. Il n'est pas + necessaire d'expliciter son initialiseur car + V_EXCLUS.EXCLUS n'en a pas + """ diff --git a/Accas/A_FACT.py b/Accas/A_FACT.py index ebccc614..776c6f10 100644 --- a/Accas/A_FACT.py +++ b/Accas/A_FACT.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 @@ -26,15 +26,14 @@ from Efi2Xsd.AccasXsd import X_FACT 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): - I_ENTITE.ENTITE.__init__(self) - N_FACT.FACT.__init__(self,*tup,**args) + class_instance=A_MCFACT.MCFACT + list_instance=A_MCLIST.MCList + def __init__(self,*tup,**args): + I_ENTITE.ENTITE.__init__(self) + 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 - diff --git a/Accas/A_FICHIER.py b/Accas/A_FICHIER.py index d7aab167..473f4058 100644 --- a/Accas/A_FICHIER.py +++ b/Accas/A_FICHIER.py @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 @@ -25,7 +25,5 @@ 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) - - + def __init__(self,*tup,**args): + I_FICHIER.FICHIER.__init__(self,*tup,**args) diff --git a/Accas/A_FORM.py b/Accas/A_FORM.py index 06af6942..c310fa11 100644 --- a/Accas/A_FORM.py +++ b/Accas/A_FORM.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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,7 @@ from __future__ import absolute_import from Noyau import N_FORM from Ihm import I_ENTITE -from . import A_FORM_ETAPE +from . import A_FORM_ETAPE class FORM(N_FORM.FORM,I_ENTITE.ENTITE): - class_instance=A_FORM_ETAPE.FORM_ETAPE + class_instance=A_FORM_ETAPE.FORM_ETAPE diff --git a/Accas/A_FORM_ETAPE.py b/Accas/A_FORM_ETAPE.py index 5eb2c1e0..b6161946 100644 --- a/Accas/A_FORM_ETAPE.py +++ b/Accas/A_FORM_ETAPE.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 @@ -24,8 +24,7 @@ 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) - V_MACRO_ETAPE.MACRO_ETAPE.__init__(self) - I_FORM_ETAPE.FORM_ETAPE.__init__(self) - + 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 3748913d..cc05f305 100644 --- a/Accas/A_JDC.py +++ b/Accas/A_JDC.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 @@ -25,12 +25,12 @@ from Ihm import I_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 + 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 + 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 diff --git a/Accas/A_JDC_CATA.py b/Accas/A_JDC_CATA.py index fd8a248d..1e34ba10 100644 --- a/Accas/A_JDC_CATA.py +++ b/Accas/A_JDC_CATA.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 @@ -24,9 +24,9 @@ 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,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) - I_JDC_CATA.JDC_CATA.__init__(self) + 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_MACRO.py b/Accas/A_MACRO.py index 2a059062..b8f7b93b 100644 --- a/Accas/A_MACRO.py +++ b/Accas/A_MACRO.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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,11 +20,10 @@ from __future__ import absolute_import from Noyau import N_MACRO from Ihm import I_ENTITE -from . import A_MACRO_ETAPE +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): - I_ENTITE.ENTITE.__init__(self) - N_MACRO.MACRO.__init__(self,*tup,**args) - + class_instance=A_MACRO_ETAPE.MACRO_ETAPE + def __init__(self,*tup,**args): + I_ENTITE.ENTITE.__init__(self) + N_MACRO.MACRO.__init__(self,*tup,**args) diff --git a/Accas/A_MACRO_ETAPE.py b/Accas/A_MACRO_ETAPE.py index 28a3ce74..74ef0b4b 100644 --- a/Accas/A_MACRO_ETAPE.py +++ b/Accas/A_MACRO_ETAPE.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 @@ -28,8 +28,8 @@ 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) - V_MACRO_ETAPE.MACRO_ETAPE.__init__(self) - I_MACRO_ETAPE.MACRO_ETAPE.__init__(self) + 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 5bd5cebd..e871ffda 100644 --- a/Accas/A_MCBLOC.py +++ b/Accas/A_MCBLOC.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 @@ -25,6 +25,6 @@ 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) - V_MCBLOC.MCBLOC.__init__(self) + 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 769dcd28..87c5a3d4 100644 --- a/Accas/A_MCFACT.py +++ b/Accas/A_MCFACT.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 @@ -24,6 +24,6 @@ from Ihm import I_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) - V_MCFACT.MCFACT.__init__(self) + 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 922abb89..f80f1368 100644 --- a/Accas/A_MCLIST.py +++ b/Accas/A_MCLIST.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 @@ -25,5 +25,5 @@ from Efi2Xsd.MCAccasXML import X_MCLIST class MCList(I_MCLIST.MCList,N_MCLIST.MCList,X_MCLIST,V_MCLIST.MCList): - def __init__(self): - N_MCLIST.MCList.__init__(self) + def __init__(self): + N_MCLIST.MCList.__init__(self) diff --git a/Accas/A_MCNUPLET.py b/Accas/A_MCNUPLET.py index 465eae7c..74515270 100644 --- a/Accas/A_MCNUPLET.py +++ b/Accas/A_MCNUPLET.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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,5 +22,5 @@ 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) + def __init__(self,*pos,**args): + mcnuplet.MCNUPLET.__init__(self,*pos,**args) diff --git a/Accas/A_MCSIMP.py b/Accas/A_MCSIMP.py index 7c7ecbca..d24cd7a6 100644 --- a/Accas/A_MCSIMP.py +++ b/Accas/A_MCSIMP.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 @@ -24,7 +24,7 @@ from Ihm import I_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): - #def __init__(self,val,definition,nom,parent,objPyxbDeConstruction) quand cela sera correct dans les update_etape. pour l instant on laisse le defaut a None : 9 Aout 18: - N_MCSIMP.MCSIMP.__init__(self,val,definition,nom,parent,objPyxbDeConstruction) - V_MCSIMP.MCSIMP.__init__(self) + def __init__(self,val,definition,nom,parent,objPyxbDeConstruction=None): + #def __init__(self,val,definition,nom,parent,objPyxbDeConstruction) quand cela sera correct dans les update_etape. pour l instant on laisse le defaut a None : 9 Aout 18: + 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 93efdd27..39f4dcb5 100644 --- a/Accas/A_MEME_NOMBRE.py +++ b/Accas/A_MEME_NOMBRE.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 @@ -23,8 +23,8 @@ 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): - """ - La classe utilise l'initialiseur de REGLE. Il n'est pas - necessaire d'expliciter son initialiseur car - V_MEME_NOMBRE.MEME_NOMBRE n'en a pas - """ + """ + La classe utilise l'initialiseur de REGLE. Il n'est pas + necessaire d'expliciter son initialiseur car + V_MEME_NOMBRE.MEME_NOMBRE n'en a pas + """ diff --git a/Accas/A_NUPLET.py b/Accas/A_NUPLET.py index d9fbe353..6546f5a5 100644 --- a/Accas/A_NUPLET.py +++ b/Accas/A_NUPLET.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 @@ -23,5 +23,5 @@ from . import A_MCLIST from . import A_MCNUPLET class NUPL(nuplet.NUPL): - class_instance=A_MCNUPLET.MCNUPLET - list_instance=A_MCLIST.MCList + class_instance=A_MCNUPLET.MCNUPLET + list_instance=A_MCLIST.MCList diff --git a/Accas/A_OPER.py b/Accas/A_OPER.py index c1a4f0a5..353a69ef 100644 --- a/Accas/A_OPER.py +++ b/Accas/A_OPER.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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,12 +20,12 @@ from __future__ import absolute_import from Noyau import N_OPER from Ihm import I_ENTITE -from Accas import A_ETAPE +from Accas import A_ETAPE 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): - I_ENTITE.ENTITE.__init__(self) - N_OPER.OPER.__init__(self,*tup,**args) + class_instance=A_ETAPE.ETAPE + def __init__(self,*tup,**args): + I_ENTITE.ENTITE.__init__(self) + N_OPER.OPER.__init__(self,*tup,**args) diff --git a/Accas/A_PRESENT_ABSENT.py b/Accas/A_PRESENT_ABSENT.py index 00f6e2eb..3572b84a 100644 --- a/Accas/A_PRESENT_ABSENT.py +++ b/Accas/A_PRESENT_ABSENT.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 @@ -24,8 +24,8 @@ from Ihm import I_PRESENT_ABSENT 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 - V_PRESENT_ABSENT.PRESENT_ABSENT n'en a pas - """ + """ + La classe utilise l'initialiseur de REGLE. Il n'est pas + necessaire d'expliciter son initialiseur car + V_PRESENT_ABSENT.PRESENT_ABSENT n'en a pas + """ diff --git a/Accas/A_PRESENT_PRESENT.py b/Accas/A_PRESENT_PRESENT.py index 397bf769..f46b32f8 100644 --- a/Accas/A_PRESENT_PRESENT.py +++ b/Accas/A_PRESENT_PRESENT.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 @@ -25,8 +25,8 @@ 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 - V_PRESENT_PRESENT.PRESENT_PRESENT n'en a pas - """ + """ + La classe utilise l'initialiseur de REGLE. Il n'est pas + necessaire d'expliciter son initialiseur car + V_PRESENT_PRESENT.PRESENT_PRESENT n'en a pas + """ diff --git a/Accas/A_PROC.py b/Accas/A_PROC.py index 0ae8bb48..a22a170e 100644 --- a/Accas/A_PROC.py +++ b/Accas/A_PROC.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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,14 +20,13 @@ from __future__ import absolute_import from Noyau import N_PROC from Ihm import I_ENTITE -from Accas import A_PROC_ETAPE +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) - I_ENTITE.ENTITE.__init__(self) - N_PROC.PROC.__init__(self,*tup,**args) - + 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) diff --git a/Accas/A_PROC_ETAPE.py b/Accas/A_PROC_ETAPE.py index 6fdd8361..9f395ee0 100644 --- a/Accas/A_PROC_ETAPE.py +++ b/Accas/A_PROC_ETAPE.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 @@ -27,6 +27,6 @@ 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) - V_PROC_ETAPE.PROC_ETAPE.__init__(self) + 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 e420831b..e52b4cf9 100644 --- a/Accas/A_SALOME_ENTRY.py +++ b/Accas/A_SALOME_ENTRY.py @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 @@ -23,4 +23,4 @@ #from builtins import object #class SalomeEntry(object): class SalomeEntry: - pass + pass diff --git a/Accas/A_SENSIBILITE.py b/Accas/A_SENSIBILITE.py index 6bf30627..f59759a7 100644 --- a/Accas/A_SENSIBILITE.py +++ b/Accas/A_SENSIBILITE.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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,9 +20,8 @@ from __future__ import absolute_import from Ihm import I_REGLE -from Noyau import N_SENSIBILITE +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 - diff --git a/Accas/A_SIMP.py b/Accas/A_SIMP.py index 584627ed..59c5f444 100644 --- a/Accas/A_SIMP.py +++ b/Accas/A_SIMP.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 @@ -24,10 +24,9 @@ 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 - I_ENTITE.ENTITE.__init__(self) - N_SIMP.SIMP.__init__(self,*tup,**args) - + 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) diff --git a/Accas/A_TUPLE.py b/Accas/A_TUPLE.py index 4cbd14e3..cdc2e7da 100644 --- a/Accas/A_TUPLE.py +++ b/Accas/A_TUPLE.py @@ -1,16 +1,15 @@ import types class Tuple: - def __init__(self,ntuple): - self.ntuple=ntuple + def __init__(self,ntuple): + self.ntuple=ntuple - def __convert__(self,valeur): - try: - if isinstance(valeur, basestring) : return None - except NameError: - if isinstance(valeur, str): return None - if len(valeur) != self.ntuple: return None - return valeur - - def info(self): - return "Tuple de %s elements" % self.ntuple + def __convert__(self,valeur): + try: + if isinstance(valeur, basestring) : return None + except NameError: + if isinstance(valeur, str): return None + if len(valeur) != self.ntuple: return None + return valeur + def info(self): + return "Tuple de %s elements" % self.ntuple diff --git a/Accas/A_UN_PARMI.py b/Accas/A_UN_PARMI.py index 109a3e76..af03b09a 100644 --- a/Accas/A_UN_PARMI.py +++ b/Accas/A_UN_PARMI.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 @@ -23,8 +23,8 @@ 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): - """ - La classe utilise l'initialiseur de REGLE. Il n'est pas - necessaire d'expliciter son initialiseur car - V_UN_PARMI.UN_PARMI n'en a pas - """ + """ + La classe utilise l'initialiseur de REGLE. Il n'est pas + necessaire d'expliciter son initialiseur car + V_UN_PARMI.UN_PARMI n'en a pas + """ diff --git a/Accas/A_VALIDATOR.py b/Accas/A_VALIDATOR.py index 725a9a7a..e3f227ed 100644 --- a/Accas/A_VALIDATOR.py +++ b/Accas/A_VALIDATOR.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Accas/__init__.py b/Accas/__init__.py index 52682045..ce4722da 100644 --- a/Accas/__init__.py +++ b/Accas/__init__.py @@ -1,5 +1,5 @@ # -*- coding: iso-8859-1 -*- -# Copyright (C) 2007-2019 EDF R&D +# Copyright (C) 2007-2021 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 @@ -94,7 +94,7 @@ 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 CreeMotClef # On remplace la factory des validateurs initialement dans Noyau par celle # de A_VALIDATOR @@ -107,9 +107,9 @@ from .A_SENSIBILITE import CONCEPT_SENSIBLE, REUSE_SENSIBLE, DERIVABLE from Extensions.niveau import NIVEAU from Extensions.etape_niveau import ETAPE_NIVEAU from Extensions.commentaire import COMMENTAIRE -from Extensions.parametre import PARAMETRE +from Extensions.parametre import PARAMETRE from Extensions.parametre_eval import PARAMETRE_EVAL -from Extensions.commande_comm import COMMANDE_COMM +from Extensions.commande_comm import COMMANDE_COMM from Extensions.mcnuplet import MCNUPLET from .A_SALOME_ENTRY import SalomeEntry diff --git a/Adao/configuration_Adao.py b/Adao/configuration_Adao.py index 735905fb..e757a2d0 100644 --- a/Adao/configuration_Adao.py +++ b/Adao/configuration_Adao.py @@ -38,27 +38,26 @@ from InterfaceQT4 import configuration # et sauvegarder les fichiers utilisateurs class CONFIG(configuration.configBase): - def __init__(self,appli,repIni): - - self.labels_eficas=['lang','rep_cata','catalogues','closeAutreCommande','closeFrameRechercheCommande','closeEntete','taille'] - configuration.configBase.__init__(self,appli,repIni) - - #self.rep_user = os.environ["HOME"] - self.rep_user = os.path.expanduser("~") - self.appli = appli - self.code = appli.code - # self.lang = "fr" - self.rep_ini = repIni - self.rep_mat=" " # Compatbilite Aster - self.savedir = self.rep_user - self.generator_module = "generator_adao" - self.convert_module = "convert_adao" - - # Format des catalogues... - # (code, version, catalogue, formatIn, formatOut) - # Il faut les mettre dans un tuple - #self.catalogues = (("ADAO", "V0", os.path.join(self.rep_ini, 'ADAO_Cata_V0.py'), "adao"),) + def __init__(self,appli,repIni): + + self.labels_eficas=['lang','rep_cata','catalogues','closeAutreCommande','closeFrameRechercheCommande','closeEntete','taille'] + configuration.configBase.__init__(self,appli,repIni) + + #self.rep_user = os.environ["HOME"] + self.rep_user = os.path.expanduser("~") + self.appli = appli + self.code = appli.code + # self.lang = "fr" + self.rep_ini = repIni + self.rep_mat=" " # Compatbilite Aster + self.savedir = self.rep_user + self.generator_module = "generator_adao" + self.convert_module = "convert_adao" + + # Format des catalogues... + # (code, version, catalogue, formatIn, formatOut) + # Il faut les mettre dans un tuple + #self.catalogues = (("ADAO", "V0", os.path.join(self.rep_ini, 'ADAO_Cata_V0.py'), "adao"),) def make_config(appli,rep): return CONFIG(appli,rep) - diff --git a/Adao/monCode_Cata.py b/Adao/monCode_Cata.py index 2f370716..5e4e4292 100644 --- a/Adao/monCode_Cata.py +++ b/Adao/monCode_Cata.py @@ -15,7 +15,7 @@ ASSIMILATION_STUDY = PROC(nom="ASSIMILATION_STUDY", op=None, repetable Study_repertory = SIMP(statut="f", typ = "Repertoire", min=1, max=1), Debug = SIMP(statut="o", typ = "I", into=(0, 1), defaut=0), Algorithm = SIMP(statut="o", typ = "TXM", into=("3DVAR", "Blue", "EnsembleBlue", "KalmanFilter", "LinearLeastSquares", "NonLinearLeastSquares", "ParticleSwarmOptimization", "QuantileRegression", )), - Background = FACT(statut="o", + Background = FACT(statut="o", regles=(UN_PARMI('SCRIPT_DATA_FILE','VECTOR_STRING'),), Stored = SIMP(statut="o", typ = "I", into=(0, 1), defaut=0, fr="Choix de stockage interne ou non du concept parent", ang="Choice of the storage or not of the parent concept"), SCRIPT_DATA_FILE = SIMP(statut = "f", typ = "FichierNoAbs", validators=(OnlyStr()), fr="En attente d'un nom de fichier script, avec ou sans le chemin complet pour le trouver, contenant la définition d'une variable interne de même nom que le concept parent", ang="Waiting for a script file name, with or without the full path to find it, containing the definition of an internal variable of the same name as the parent concept"), diff --git a/Adao/prefs.py b/Adao/prefs.py index 5cbdc263..c235a3e8 100644 --- a/Adao/prefs.py +++ b/Adao/prefs.py @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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,7 +16,7 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -code="Adao" +code="Adao" 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__))) + sys.path.insert(0,os.path.dirname(os.path.abspath(__file__))) diff --git a/Adao/prefs_Adao.py b/Adao/prefs_Adao.py index 4e758db6..5555f082 100644 --- a/Adao/prefs_Adao.py +++ b/Adao/prefs_Adao.py @@ -33,4 +33,3 @@ closeArbre = True translatorFichier = os.path.join(repIni,'Adao') nombreDeBoutonParLigne=1 #dumpXSD=True - diff --git a/Adao/qtDico.py b/Adao/qtDico.py index 51156caa..09866c03 100755 --- a/Adao/qtDico.py +++ b/Adao/qtDico.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Adao/qtEficas_Adao.py b/Adao/qtEficas_Adao.py index 43605163..9ff2b4c3 100755 --- a/Adao/qtEficas_Adao.py +++ b/Adao/qtEficas_Adao.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/CatasDeTests/.b.py.swp b/CatasDeTests/.b.py.swp new file mode 100644 index 0000000000000000000000000000000000000000..4f9432919ae86a71705b9dd38858cc9685cfb70e GIT binary patch literal 12288 zcmeI2O>7%Q6vwAPp?nljxga5=AwjISG84AwJV}?F;{?Z@ggkcs+ZVro`y%-`M@aF}#lo@WaA5l32A#sv;^NZr#p&~2 zix*sYs`kjb(B+nBvY@8eE)(7YkIoiWnPx$W*La|Vg@)7VO<&QB8U>63Gbzy3tp}G6 zpMLn*Lxphu{M>!?t|O;sGBuNo0!9I&fKk9GU=%P47zK<1MuBTX0o^%3UPma`CE*m4 z?*n7s$*K7=3K#{90!9I&fKk9GU=%P47zK<1MggOMQQ#_6fVqVHcs(J94#Ii-|9}7Q z|L^V~uF?KDYp$0QZ7l4&geu3_bxDfe(&?uWrIx zfPrQ3$Bl$s0Uv?0;BN3UV*VOj0&jscU<=$2LOp)H;VMk1aoH&F|5c#5!xh-ztG?7+ zc5~-kH*ev?vI#!v3SAAy$LBP6CS1%Ia;Ev3^4lf9*==*FbAE@*oYi7Y?d-KZ%XSoJ zZqByR+L9x)tlv1d+1qPuF|W(>G&wuT+T2cUDD5aAHO&o;=BXupNjJT&V%R91%e{cp z6Y1$brWrHQqTJ(Q3?<(5m||M^(h)&CF=r1}%ub^a5uTMj9c!%Dgcms3d8t!FVbK0D z+Y*j|n&az4(oI`uH`F$@njeTc>TvV0rgwa~Av8yZ!y1YW`k(zUvX+^dNUjKk z3^bEX9u`rac2IIoLr7Q1ZKuHkfrLraaGdyhTkHvGpBSpUH1xa`4GxuD?9u#$UBaTZ z=|0O~FuO=1hwgPENB4~yK@5kPByBuRBR7J_HbkKL%GnqCN@nhrk*q1+QK49A|LJmOdK7Xj)TG^Aplrt(EE?1hA8PIg_q| z^`z>9l~O72kA5Nj$6e{#=oS;ZLsD;luQ{v<72uT%PXaWDsN=1BeuH^< z9}sTz0)xkMOKdy!fa_DLv%_RLe#fcE{)2m(+0(^JwOlVhvs&J)RZg9>|8kFt#EmQ5 ze|D3^^NMWYr3TOQV4ch4v7MV1O>yH)@!6_PT6kZjP5i398g=x#tHdr>6eqsY^eFig DXc))q literal 0 HcmV?d00001 diff --git a/CatasDeTests/.cataMemesNoms.py.swp b/CatasDeTests/.cataMemesNoms.py.swp new file mode 100644 index 0000000000000000000000000000000000000000..6c632e98e0fbe0b95d54d1d3bbe12714c0543bdb GIT binary patch literal 12288 zcmeI2&u<$=6vwBO-%x&6LYy9rij&Imue3?p$P#PEPTktEYp+`(fvoX*T(7jdV|K=| zEF_SSI3ghqz4e4RRst^kAt0m*#1W}?F5LL8W2Y&u-KyaNnw7p;@6Nop?|t5TcA~hQ zx?ZZ#M&dlf@fu_Gr-!Y|7hkbYT*j=6>#59Uw6OT-sD5f=eSPEn`r>_`9ym;1voGwp zy3lnUuI!NSbJt6X@l`UAV4%CJo2Qy< znRF`JvvlTNdh?Cu-0fz;5HJJ`0YktLFa!(%L%nbpHhV3~4eFS|7U4=HF zG?aqghW>g9KA_tWht5LxUS#YJ^fA zTn{v5&&V@zJ?dv;rC6LgqRXS3l!?=OFK6|KCzOjE=$ z89S`QEY(>u-AP62u_Hy8)Nhu>qTTbW{ebUWCYvi)^ULJOpyO&+2FM{6wF?krX$_q* z?W6ngPXd~4ibVnaTjARuRF1;Qr57fUK9ayBt2skZpFafmGhce-EG=*|7u$3WA8k9^ zF^_LMTY$&6oj*&Dj`_)EDgE$SDvMeu9jw*rQP&32kNWlCE=KKoq24G}cUyVOw#wC= zW+5B9-b%&TxQAE9KONZ-kxfA)(Y!}c(mo=sg_vC<7PY%2e_4vL( z=8kapMTa=vVEQAH-LcuuZj;JFDG}0+2t>#|stwwn>x{E{=*nS$phdn61wOGfP^koh zuN3O}%hs-KrmaRI~n)O<>QAprJ5wS-}AR72+ ziZ&8(R*+vk)E=e6eddZuttjd5iZq(>-K0I z(*u<_(imGLP)iZQ+?O4?`Q;T;~J;P=yx zp2UMrQsUuLKGFC@aQYk*gKlVGOe+PlwykOu-@wDDU~eAH61q2gnwIk`lu4yFS2L;f NCKa}eRDW-q{SBKN$D05E literal 0 HcmV?d00001 diff --git a/CatasDeTests/.cataSimple_driver.xsd.swp b/CatasDeTests/.cataSimple_driver.xsd.swp new file mode 100644 index 0000000000000000000000000000000000000000..d766936d9d8dd87ae10c8fe02a52bcf86b933e77 GIT binary patch literal 12288 zcmeI2J!~9B6vroNz(5Fs0!0)oiv*Q#@0`TGI6gY?nc@#&&@eY|_{<>&X=cTY36b#1k|(zY*7e+D{huC1=FU0FT7-X}$e!F#={ zyVBeo%8=`x;&-`>0^v%*HaA@Fh@Q|!2O$bw8E26=7$|vHsK!JOP9K8a5&G2COgOOVQ%Nk`L)X5 zbH{$mBK;5nB0vO)01+SpM1Tko0U|&IhyW2F0{=k*93RxLKgHN9_}*{7|5yM2f4#`q zw@?PPp@+{i_5k_};?N#+9l8Ylb%C+pp`W1#(AUr*#G&)hpU*M&BlIbB4SEB*2t9n3 zv0tDcpl_hBpf>a-^!GE2eGf&@htOM40R6Va*cZ?p=w;{+`27=fAG!l=LCcVx&#MqU zM1Tko0U|&Ih`^Z$L=hi}jbNhJbvPC=-(*Wmt{A5FPTr*VQ6{X-^9t)Ym7y~%ZJ>>a zL@W~HDKYH$+KBAnrq*2gUM!P$!!TF6<2O;_ld9D6gR(m`4_$AMuAC?RG*1R%;5)Z$ zis5X0#>octIn1}Jy{Vcma;8?z<9%%u4^786 zDi?0zCr8}F#Yh_i-5I6K~DY5W)c*?g$Y z4yelT7x=f+#31a}T-e0~Wexvea#Xo7O7?Rj$|%{n?Hd_M&5g)av&f@v^Pr8-=jO(>UMXEJX_R(C3LcFF`iop;xHGla(9UtyIN3V#xCd`{!ZKBRP~f2)yZbFjpZ@YE^KF-0ns8=-Fh3 ztC2A8V9o1{hge!;W3u%iz-gx-98nE17&fqsf+!uyP>M(g#ks*Iag^wFS2%mSGqrGW za0jqg3_8KdS$cYObksPy+(^|ZSZOv}!3TS{yRNFwHg2G{H=S>*fx{MCS31C!+VS^$ Lx0c)fjZO9sJO}Y# literal 0 HcmV?d00001 diff --git a/CatasDeTests/.cataTesteDelete.py.swp b/CatasDeTests/.cataTesteDelete.py.swp new file mode 100644 index 0000000000000000000000000000000000000000..aee2e78d3f9e6e6f2fe9350c01b18a463a64ccbd GIT binary patch literal 12288 zcmeI2OK%%h6vuBtJWBz=5*CLB;iPi?Y?HRZ5)(gCw@&QZPD`XhbUnVVN1B;C%v>jU z1A-4wRV=zKh%W%_*a2%62q7c{Vhs{(5Fdd59Y5kEjVbIvccj1Ob?4mk|DAKkiZY$d z_38$#q|PyH&oVZ=_sg5V-oC^BC^KeVT+ZY!=o|C5ZWLrzmX}w~EzckK&M08|TKoLE zqsl$U=21K3yWDZpB0ftOx#Cetv_+(%w2c#eBuc^+N~D6}{P^asAz%p1BXEl4bJ>g@ zv2gk&dj7esd4tV8L%<8#B)PNp=9)>=Bim{KOyU_d48_-SYDs%}t2fYZr z0DX0mu`i)7pgT|t`u$19K7#H+Ayk1*LJa!)3C3|}k96Y<<1za2WWnVcW%u#__ z)r|%%MvAL}DkNkgNop7r5>*^@MUM{@6|zTyx}w5uRT`|h(#|4C#VWRGkv#r(ff8rV zBo3tH3O!8EwN|SaX>m4PSF{{2C~-fk#iMkvgBkUX$%tmd98Pdz@WI2)M*CZL6I#e^ z`rOE+p74;%k;Nmvjw4O1gl`aiM>*2hkgL9?hsPUD4bPWeA#uMENM)ucrfH$pI!c3w z>fcm*|LLPBk8?1cd&IFQy+B3+4n|!vf=6+$>4rJjFSC`LRPlk?9h$i*0-<=v-Jg55 zLk~in2lxP5I~1bk;A7DIIITsRX$QS{a9uB-sW)3zkPw`Hq_lr9_J;xP0J4>t=N{=iX-vSd}NitM)hKtCJHMB`FlJ z+Y*BMN(GnF>Ak(ZRK#8BiL-&rRZoUqN`|-6B;n4(cg1vx_C&|y+R%99Ycdc%X0v%$ zq-^Q21;nh#f!_r<&8zC$sU)4hNNwQ-XyS&;ZIPtbz)^zo`Am}5WTf=S4T~s~%Vx7@ zv-!*lZM7_fsyVjsvF?zTe~b1U)hE?=B66Kh$iv|(p*p@)N!kl_KqYZoPzCKxE!k6h zJT|#42Nd?+Q4#g|jQV#L1SykYq1@Y<+W!Y9fkI&2{06kh|1ChdOrb>b`fT z34#`RG8Fi|Q9u=?ko-ouS-fm*wym{lt=it!94poKX1Ud(O1()IHLPa4THLBxO=@g4 z8}(K>MR7&631ov99kkGmYWs41t4-GCHr=qAO@!QDjbX&Sx-0xRebm`?U<#%~?kjBz z0opUT2;{n0_MwBY80m~2?4yW?z!fO)0L0Lm0zVH z3U6~C1>d)=XX1W0Eiw6ok6u0+PJmw+J#7n1bfZjG$*Sx81}>Hg#um{mp>wORXtB6N VxlHE5*<2=jfy$){HD4*QzW|8|+x-9l literal 0 HcmV?d00001 diff --git a/CatasDeTests/ReadMe.txt b/CatasDeTests/ReadMe.txt new file mode 100644 index 00000000..fd828658 --- /dev/null +++ b/CatasDeTests/ReadMe.txt @@ -0,0 +1 @@ +xmllint --schema XMLSchema11.xsd cata_genere.xsd diff --git a/CatasDeTests/cataListes.py b/CatasDeTests/cataListes.py new file mode 100644 index 00000000..e16fe0d9 --- /dev/null +++ b/CatasDeTests/cataListes.py @@ -0,0 +1,37 @@ +# Copyright (C) 2008-2018 EDF R&D +# +# This file is part of SALOME ADAO module +# +# 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 +import os, re +import Accas +from Accas import * +monFichier=os.path.abspath(__file__) + +JdC = JDC_CATA ( + code='Essai' + ) +VERSION_CATALOGUE='V_0' + +# tout est Facultatif car sinon, on ne peut pas supprimer et c 'est ce qu on veut tester + + +DefinitionListe = PROC( nom='DefinitionListe', + listeTexte = SIMP( statut='f', typ = 'TXM',max='**'), + listeIntInto = SIMP( statut='f', typ = 'I',homo="SansOrdreNiDoublon",max='**', into=(1,2,3,4)), + listeIntIntoOrdre = SIMP( statut='f', typ = 'I',max='**', into=(1,2,3,4)), +) diff --git a/CatasDeTests/cata_1.py b/CatasDeTests/cata_1.py new file mode 100644 index 00000000..2a78327e --- /dev/null +++ b/CatasDeTests/cata_1.py @@ -0,0 +1,53 @@ +# coding: utf-8 -*- +# + +#import os +#import types +#monFile=os.path.abspath(__file__) + +from Accas import * +import types + +#type UserASSD +class User_Data(UserASSD): pass +#type ASSD +class Mesh(ASSD): pass +class MeshU(UserASSD): pass + +#Be careful when modidying the order/names od the test_simp since they are used bye the documentation xsd_mapping.rst +#beginJdC +JdC = JDC_CATA(code='Test1',) + +#Usecase 1abis : Le contenu de l'objet est completement déterminé par les paramètres suivants +#CreateMesh = OPER(nom = 'CreateMesh', sd_prod=Mesh, +# meshname = SIMP(typ='TXM'), +# dimension = SIMP(typ='I', into=[1,2,3]), +# listOfEntities = SIMP(typ='I', max='**'),) +##Usecase 1ater : Il est possible de créer plusieurs +#CreateBoth = OPER(nom = 'CreateBoth', sd_prod=Mesh, +# meshname = SIMP(typ=(MeshU,'createObject')), +# dimension = SIMP(typ='I', into=[1,2,3]), +# listOfEntities = SIMP(typ='I', max='**'),) +# +##Usecase 1b : Chaque champ (crée à la racine) utilise l'objet maillage précedement construit (à la racine) +## statut='o', ?? +MyField = PROC(nom='MyField', + onMesh = SIMP(statut='o',typ=Mesh),) + +# +############################# +##Usecase 2a : Il est possible de créer plusieurs maillages dans une structure nommée meshes +## La définition du nom du maillage dans le JDD sert de référence à un notre mesh (un objet python du type UserASSD Mesh +## est également crée pour l'occasion (sans paramètre au constructeur) ). +## le typ du SIMP est en fait une chaîne pour laquelle il est possible d'ajouter un validateur. +#Meshes = PROC(nom = 'Meshes', +# mesh = FACT(max='**', +# name = SIMP(typ=(MeshU,'createObject')), +# dimension = SIMP(typ='I', into=[1,2,3]), +# listOfEntities = SIMP(typ='I', max='**'), +# ), +# )#Meshes + +#MyFieldBis = PROC(nom='MyFieldBis', +# onMesh = SIMP(statut='o',typ=MeshU),) +# diff --git a/CatasDeTests/cata_1.xsd b/CatasDeTests/cata_1.xsd new file mode 100644 index 00000000..aa2dca62 --- /dev/null +++ b/CatasDeTests/cata_1.xsd @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/CatasDeTests/cata_FactFreresMemesNoms.py b/CatasDeTests/cata_FactFreresMemesNoms.py new file mode 100644 index 00000000..9ed00041 --- /dev/null +++ b/CatasDeTests/cata_FactFreresMemesNoms.py @@ -0,0 +1,62 @@ +# Copyright (C) 2008-2018 EDF R&D +# +# This file is part of SALOME ADAO module +# +# 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 +import os, re +import Accas +from Accas import * +monFichier=os.path.abspath(__file__) + +JdC = JDC_CATA ( + code='Essai' + ) +VERSION_CATALOGUE='V_0' + +#leProc = PROC(nom = 'leProc', +# unSimp = SIMP(statut='o', typ ='I'), +# bloc1 = BLOC(condition = "UnSimp == 1", +# leFact1 = FACT(statut = 'o', +# Name = SIMP(typ='TXM', statut='o',), +# ScalarFluxModel = SIMP(typ='TXM', statut='o'), +# ), +# ), # fin bloc1 +# bloc2 = BLOC(condition = "UnSimp == 2", +# leFact1 = FACT(statut = 'o', +# Name = SIMP(typ='TXM', statut='o',), +# ), +# ) +#) +leProcV2 = PROC(nom = 'leProcV2', + unSimpV2 = SIMP(statut='o', typ ='I'), + blocV21 = BLOC(condition = "UnSimpV2 == 1", + leFactV21 = FACT(statut = 'o', + ScalarV2 = FACT(statut = 'f', max ='**', + NameV2 = SIMP(typ='TXM', statut='o',), + ScalarFluxModelV2 = SIMP(typ='TXM', statut='o'), + ),# Scalar + ), + ), # fin bloc1 + blocV22 = BLOC(condition = "UnSimp == 2", + leFactV21 = FACT(statut = 'o', + ScalarV2 = FACT ( statut = 'f', max ='**', + NameV2 = SIMP(typ='TXM', statut='o',), + ),# ScalarV2 + ), + ), # fin bloc2 +) + diff --git a/CatasDeTests/cata_FactFreresMemesNomsV1_ref.xsd b/CatasDeTests/cata_FactFreresMemesNomsV1_ref.xsd new file mode 100644 index 00000000..6a7ea537 --- /dev/null +++ b/CatasDeTests/cata_FactFreresMemesNomsV1_ref.xsd @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/CatasDeTests/cata_FactFreresMemesNoms_driver.py b/CatasDeTests/cata_FactFreresMemesNoms_driver.py new file mode 100644 index 00000000..67aa30a3 --- /dev/null +++ b/CatasDeTests/cata_FactFreresMemesNoms_driver.py @@ -0,0 +1,2 @@ +# -*- coding: utf-8 -*- +from raw.cata_FactFreresMemesNoms_driver import * diff --git a/CatasDeTests/cata_FactFreresMemesNoms_ref.xsd b/CatasDeTests/cata_FactFreresMemesNoms_ref.xsd new file mode 100644 index 00000000..d917bbce --- /dev/null +++ b/CatasDeTests/cata_FactFreresMemesNoms_ref.xsd @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/CatasDeTests/cata_UserAssd.py b/CatasDeTests/cata_UserAssd.py new file mode 100644 index 00000000..5ff16c03 --- /dev/null +++ b/CatasDeTests/cata_UserAssd.py @@ -0,0 +1,69 @@ +# Copyright (C) 2008-2018 EDF R&D +# +# This file is part of SALOME ADAO module +# +# 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 +import os, re +import Accas +from Accas import * +monFichier=os.path.abspath(__file__) + +JdC = JDC_CATA ( + code='Essai' + ) +VERSION_CATALOGUE='V_0' + +# tout est Facultatif car sinon, on ne peut pas supprimer et c 'est ce qu on veut tester + +class laClasseUser(UserASSD): pass +class laClasseUserDerive(laClasseUser): pass +class lASSD(ASSD): pass + +# En fait, cela n pas vraiment de sens que cela soit dans le fact +# ou si ? pour l instant on laisse de cote + +DefinitionDsFactDsOper = OPER( nom='DefinitionDsFactDsOper', sd_prod=lASSD, + unFact1 = FACT(statut='f', max="**", + creeUserAssd = SIMP( statut='f', typ = (laClasseUser,'createObject'),), + ), +) + +DefinitionDsSimpDsOper = OPER( nom='DefinitionDsSimpDsOper', sd_prod=lASSD, + creeUserAssd = SIMP( statut='f', typ = (laClasseUserDerive,'createObject'),), +) + +DefinitionDsFactDsProc = PROC( nom='DefinitionDsFactDsProc', + unFact = FACT(statut='f', + creeUserAssd = SIMP( statut='f', typ = (laClasseUser,'createObject'),), + ), +) +DefinitionDsSimpDsProc = PROC( nom='DefinitionDsSimpDsProc', + creeUserAssd = SIMP( statut='f', typ = (laClasseUser,'createObject'),), +) + +DefinitionDsSimpListe = PROC( nom='DefinitionDsSimpListe', + creeUserAssd = SIMP( statut='f', typ = (laClasseUser,'createObject'),max='**'), +) + +UtiliseUnUserAssD = PROC( nom = 'UtiliseUnUserAssD', + utiliseUnUserAssd = SIMP(statut= 'o',typ =laClasseUser), +) +UtiliseEtDefinitDsLeMemeProc = PROC( nom = 'UtiliseEtDefinitDsLeMemeProc', + utiliseUserAssd = SIMP(statut= 'o',typ= laClasseUser,max='**'), + creeUserAssd = SIMP( statut='f', typ = (laClasseUser,'createObject'),), +) + diff --git a/CatasDeTests/cata_UserAssd.xsd b/CatasDeTests/cata_UserAssd.xsd new file mode 100644 index 00000000..083ea0ce --- /dev/null +++ b/CatasDeTests/cata_UserAssd.xsd @@ -0,0 +1,161 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {'T_creeUserAssd': {'_creeUserAssd_DefinitionDsSimpDsOper': 'T_creeUserAssd_2', '_creeUserAssd_DefinitionDsSimpListe': 'T_creeUserAssd_4'}} + + + + + \ No newline at end of file diff --git a/CatasDeTests/cata_UserAssd.xsd_ref b/CatasDeTests/cata_UserAssd.xsd_ref new file mode 100644 index 00000000..0650a123 --- /dev/null +++ b/CatasDeTests/cata_UserAssd.xsd_ref @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/CatasDeTests/cata_UserAssd2.xsd b/CatasDeTests/cata_UserAssd2.xsd new file mode 100644 index 00000000..74724aa1 --- /dev/null +++ b/CatasDeTests/cata_UserAssd2.xsd @@ -0,0 +1,184 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {'T_creeUserAssd': {'_creeUserAssd_DefinitionDsSimpListe': 'T_creeUserAssd_4'}} + + + + + diff --git a/CatasDeTests/cata_UserAssd2_driver.py b/CatasDeTests/cata_UserAssd2_driver.py new file mode 100644 index 00000000..16add34c --- /dev/null +++ b/CatasDeTests/cata_UserAssd2_driver.py @@ -0,0 +1,2 @@ +# -*- coding: utf-8 -*- +from raw.cata_UserAssd2_driver import * diff --git a/CatasDeTests/cata_UserAssd_driver.py b/CatasDeTests/cata_UserAssd_driver.py new file mode 100644 index 00000000..52b09173 --- /dev/null +++ b/CatasDeTests/cata_UserAssd_driver.py @@ -0,0 +1,2 @@ +# -*- coding: utf-8 -*- +from raw.cata_UserAssd_driver import * diff --git a/CatasDeTests/decorateur/metier.py b/CatasDeTests/decorateur/metier.py new file mode 100644 index 00000000..7ccc9aa9 --- /dev/null +++ b/CatasDeTests/decorateur/metier.py @@ -0,0 +1,21 @@ +def MaFonction (monArgument1, monArgument2 = 3): + print ('********************************************') + print ('je passe dans MaFonction du catalogue metier') + print ('monArgument1 = ', monArgument1) + print ('monArgument2 = ', monArgument2) + print ('********************************************') + +# ---------------------------------------- + +import os, sys +if os.path.join(os.path.abspath(os.path.dirname(__file__)),'..') not in sys.path : + sys.path.append(os.path.join(os.path.abspath(os.path.dirname(__file__)),'..')) +from InterfaceQT4.eficas_go import validateFonction + +#MaFonction('1er appel sans Validation') +#MaFonction(1) +MaFonction=validateFonction(MaFonction) +#MaFonction('1er appel texte avec validation') +MaFonction('1er appel texte avec validation', monArgument2= 33) +MaFonction(1) + diff --git a/CatasDeTests/exemple.xml b/CatasDeTests/exemple.xml new file mode 100644 index 00000000..e5a99c50 --- /dev/null +++ b/CatasDeTests/exemple.xml @@ -0,0 +1,10 @@ + + + + aa + + + aa + + + diff --git a/CatasDeTests/generateXML.py b/CatasDeTests/generateXML.py new file mode 100755 index 00000000..b84bb643 --- /dev/null +++ b/CatasDeTests/generateXML.py @@ -0,0 +1,36 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- +# Copyright (C) 2007-2021 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.genereXML(code=prefs.code) diff --git a/CatasDeTests/generateXSD.py b/CatasDeTests/generateXSD.py new file mode 100755 index 00000000..de32610b --- /dev/null +++ b/CatasDeTests/generateXSD.py @@ -0,0 +1,36 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- +# Copyright (C) 2007-2021 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/CatasDeTests/log b/CatasDeTests/log new file mode 100644 index 00000000..e63be550 --- /dev/null +++ b/CatasDeTests/log @@ -0,0 +1,32 @@ +avecEltAbstrait ------------------- False +self.importedBy ------------------- [] +self.code ------------------- Essai +self.implement ------------------- Essai +self.nomDuCodeDumpe ------------------- Essai +self.nomDuXsdPere ------------------- Essai +_________ dumpXsd___________ leProcV2 False True +_________ dumpXsd___________ leFactV21 True 1 +________________________ leFactV21 +_________ dumpXsd___________ ScalarV2 False True + + + + + + + + +fin ________________________ leFactV21 + + + + + + +_________ dumpXsd___________ leFactV21 True False +________________________ leFactV21 +_________ dumpXsd___________ ScalarV2 False True + + +fin ________________________ leFactV21 +__________________________ decommenter pour le texteXSD________________________ diff --git a/CatasDeTests/prefs.py b/CatasDeTests/prefs.py new file mode 100644 index 00000000..8eb6e5ee --- /dev/null +++ b/CatasDeTests/prefs.py @@ -0,0 +1,22 @@ +# Copyright (C) 2007-2021 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="Essai" +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/CatasDeTests/prefs_Essai.py b/CatasDeTests/prefs_Essai.py new file mode 100644 index 00000000..694afe00 --- /dev/null +++ b/CatasDeTests/prefs_Essai.py @@ -0,0 +1,50 @@ +# -*- 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='fr' + +# Codage des strings qui accepte les accents (en remplacement de 'ascii') +encoding='iso-8859-1' + +# +#typeDeCata='XML' +catalogues=( + ('Essai','UserASSD',os.path.join(repIni,'cataListes.py'),'python','python'), +) +#nombreDeBoutonParLigne=4 +simpleClic=True +#closeFrameRechercheCommande=True +boutonDsMenuBar=False +#closeArbre=True +afficheListesPliees=False +#withXSD=True +afficheCommandesPliees = False +#dumpXSD=True +#afficheIhm=False diff --git a/CatasDeTests/qtEficasEssai.py b/CatasDeTests/qtEficasEssai.py new file mode 100755 index 00000000..4fcb6536 --- /dev/null +++ b/CatasDeTests/qtEficasEssai.py @@ -0,0 +1,36 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- +# Copyright (C) 2007-2021 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 MAP +""" +# Modules Python +# Modules Eficas +import prefs +name='prefs_'+prefs.code +__import__(name) + +import os, sys +sys.path.append(os.path.join(os.path.abspath(os.path.dirname(__file__)),'..')) + +import prefs +from InterfaceQT4 import eficas_go +print (prefs.code) +eficas_go.lanceEficas(code=prefs.code) diff --git a/EssaiInit/raw/__init__.py b/CatasDeTests/raw/__init__.py similarity index 100% rename from EssaiInit/raw/__init__.py rename to CatasDeTests/raw/__init__.py diff --git a/CatasDeTests/raw/cata_FactFreresMemesNoms_driver.py b/CatasDeTests/raw/cata_FactFreresMemesNoms_driver.py new file mode 100644 index 00000000..70befdf2 --- /dev/null +++ b/CatasDeTests/raw/cata_FactFreresMemesNoms_driver.py @@ -0,0 +1,359 @@ +# ./raw/cata_FactFreresMemesNoms_driver.py +# -*- coding: utf-8 -*- +# PyXB bindings for NM:9c3bd166183fcfc95687f415bcc4a066eb33ac79 +# Generated 2020-10-22 12:32:22.612163 by PyXB version 1.2.5 using Python 3.4.2.final.0 +# Namespace http://chercheurs.edf.com/logiciels/Essai + +from __future__ import unicode_literals +import pyxb +import pyxb.binding +import pyxb.binding.saxer +import io +import pyxb.utils.utility +import pyxb.utils.domutils +import sys +import pyxb.utils.six as _six +# Unique identifier for bindings created at the same time +_GenerationUID = pyxb.utils.utility.UniqueIdentifier('urn:uuid:deafbfb4-1451-11eb-b347-cc3d82d871d8') + +# Version of PyXB used to generate the bindings +_PyXBVersion = '1.2.5' +# Generated bindings are not compatible across PyXB versions +if pyxb.__version__ != _PyXBVersion: + raise pyxb.PyXBVersionError(_PyXBVersion) + +# A holder for module-level binding classes so we can access them from +# inside class definitions where property names may conflict. +_module_typeBindings = pyxb.utils.utility.Object() + +# Import bindings for namespaces imported into schema +import pyxb.binding.datatypes + +# NOTE: All namespace declarations are reserved within the binding +Namespace = pyxb.namespace.NamespaceForURI('http://chercheurs.edf.com/logiciels/Essai', create_if_missing=True) +Namespace.configureCategories(['typeBinding', 'elementBinding']) + +def CreateFromDocument (xml_text, default_namespace=None, location_base=None): + """Parse the given XML and use the document element to create a + Python instance. + + @param xml_text An XML document. This should be data (Python 2 + str or Python 3 bytes), or a text (Python 2 unicode or Python 3 + str) in the L{pyxb._InputEncoding} encoding. + + @keyword default_namespace The L{pyxb.Namespace} instance to use as the + default namespace where there is no default namespace in scope. + If unspecified or C{None}, the namespace of the module containing + this function will be used. + + @keyword location_base: An object to be recorded as the base of all + L{pyxb.utils.utility.Location} instances associated with events and + objects handled by the parser. You might pass the URI from which + the document was obtained. + """ + + if pyxb.XMLStyle_saxer != pyxb._XMLStyle: + dom = pyxb.utils.domutils.StringToDOM(xml_text) + return CreateFromDOM(dom.documentElement, default_namespace=default_namespace) + if default_namespace is None: + default_namespace = Namespace.fallbackNamespace() + saxer = pyxb.binding.saxer.make_parser(fallback_namespace=default_namespace, location_base=location_base) + handler = saxer.getContentHandler() + xmld = xml_text + if isinstance(xmld, _six.text_type): + xmld = xmld.encode(pyxb._InputEncoding) + saxer.parse(io.BytesIO(xmld)) + instance = handler.rootObject() + return instance + +def CreateFromDOM (node, default_namespace=None): + """Create a Python instance from the given DOM node. + The node tag must correspond to an element declaration in this module. + + @deprecated: Forcing use of DOM interface is unnecessary; use L{CreateFromDocument}.""" + if default_namespace is None: + default_namespace = Namespace.fallbackNamespace() + return pyxb.binding.basis.element.AnyCreateFromDOM(node, default_namespace) + + +# Atomic simple type: {http://chercheurs.edf.com/logiciels/Essai}T_unSimp +class T_unSimp (pyxb.binding.datatypes.int): + + """An atomic simple type.""" + + _ExpandedName = pyxb.namespace.ExpandedName(Namespace, 'T_unSimp') + _XSDLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_FactFreresMemesNoms.xsd', 7, 1) + _Documentation = None +T_unSimp._InitializeFacetMap() +Namespace.addCategoryObject('typeBinding', 'T_unSimp', T_unSimp) +_module_typeBindings.T_unSimp = T_unSimp + +# Atomic simple type: {http://chercheurs.edf.com/logiciels/Essai}T_Name +class T_Name (pyxb.binding.datatypes.string): + + """An atomic simple type.""" + + _ExpandedName = pyxb.namespace.ExpandedName(Namespace, 'T_Name') + _XSDLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_FactFreresMemesNoms.xsd', 11, 1) + _Documentation = None +T_Name._InitializeFacetMap() +Namespace.addCategoryObject('typeBinding', 'T_Name', T_Name) +_module_typeBindings.T_Name = T_Name + +# Atomic simple type: {http://chercheurs.edf.com/logiciels/Essai}T_ScalarFluxModel +class T_ScalarFluxModel (pyxb.binding.datatypes.string): + + """An atomic simple type.""" + + _ExpandedName = pyxb.namespace.ExpandedName(Namespace, 'T_ScalarFluxModel') + _XSDLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_FactFreresMemesNoms.xsd', 15, 1) + _Documentation = None +T_ScalarFluxModel._InitializeFacetMap() +Namespace.addCategoryObject('typeBinding', 'T_ScalarFluxModel', T_ScalarFluxModel) +_module_typeBindings.T_ScalarFluxModel = T_ScalarFluxModel + +# Complex type {http://chercheurs.edf.com/logiciels/Essai}T_leFact1 with content type ELEMENT_ONLY +class T_leFact1 (pyxb.binding.basis.complexTypeDefinition): + """Complex type {http://chercheurs.edf.com/logiciels/Essai}T_leFact1 with content type ELEMENT_ONLY""" + _TypeDefinition = None + _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY + _Abstract = False + _ExpandedName = pyxb.namespace.ExpandedName(Namespace, 'T_leFact1') + _XSDLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_FactFreresMemesNoms.xsd', 24, 1) + _ElementMap = {} + _AttributeMap = {} + # Base type is pyxb.binding.datatypes.anyType + + # Element {http://chercheurs.edf.com/logiciels/Essai}Name uses Python identifier Name + __Name = pyxb.binding.content.ElementDeclaration(pyxb.namespace.ExpandedName(Namespace, 'Name'), 'Name', '__httpchercheurs_edf_comlogicielsEssai_T_leFact1_httpchercheurs_edf_comlogicielsEssaiName', False, pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_FactFreresMemesNoms.xsd', 27, 3), ) + + + Name = property(__Name.value, __Name.set, None, None) + + + # Element {http://chercheurs.edf.com/logiciels/Essai}ScalarFluxModel uses Python identifier ScalarFluxModel + __ScalarFluxModel = pyxb.binding.content.ElementDeclaration(pyxb.namespace.ExpandedName(Namespace, 'ScalarFluxModel'), 'ScalarFluxModel', '__httpchercheurs_edf_comlogicielsEssai_T_leFact1_httpchercheurs_edf_comlogicielsEssaiScalarFluxModel', False, pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_FactFreresMemesNoms.xsd', 28, 3), ) + + + ScalarFluxModel = property(__ScalarFluxModel.value, __ScalarFluxModel.set, None, None) + + _ElementMap.update({ + __Name.name() : __Name, + __ScalarFluxModel.name() : __ScalarFluxModel + }) + _AttributeMap.update({ + + }) +_module_typeBindings.T_leFact1 = T_leFact1 +Namespace.addCategoryObject('typeBinding', 'T_leFact1', T_leFact1) + + +# Complex type {http://chercheurs.edf.com/logiciels/Essai}T_step_Essai with content type EMPTY +class T_step_Essai (pyxb.binding.basis.complexTypeDefinition): + """Complex type {http://chercheurs.edf.com/logiciels/Essai}T_step_Essai with content type EMPTY""" + _TypeDefinition = None + _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_EMPTY + _Abstract = True + _ExpandedName = pyxb.namespace.ExpandedName(Namespace, 'T_step_Essai') + _XSDLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_FactFreresMemesNoms.xsd', 46, 1) + _ElementMap = {} + _AttributeMap = {} + # Base type is pyxb.binding.datatypes.anyType + _ElementMap.update({ + + }) + _AttributeMap.update({ + + }) +_module_typeBindings.T_step_Essai = T_step_Essai +Namespace.addCategoryObject('typeBinding', 'T_step_Essai', T_step_Essai) + + +# Complex type {http://chercheurs.edf.com/logiciels/Essai}T_Essai with content type ELEMENT_ONLY +class T_Essai (pyxb.binding.basis.complexTypeDefinition): + """Complex type {http://chercheurs.edf.com/logiciels/Essai}T_Essai with content type ELEMENT_ONLY""" + _TypeDefinition = None + _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY + _Abstract = False + _ExpandedName = pyxb.namespace.ExpandedName(Namespace, 'T_Essai') + _XSDLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_FactFreresMemesNoms.xsd', 49, 2) + _ElementMap = {} + _AttributeMap = {} + # Base type is pyxb.binding.datatypes.anyType + + # Element {http://chercheurs.edf.com/logiciels/Essai}step_Essai uses Python identifier step_Essai + __step_Essai = pyxb.binding.content.ElementDeclaration(pyxb.namespace.ExpandedName(Namespace, 'step_Essai'), 'step_Essai', '__httpchercheurs_edf_comlogicielsEssai_T_Essai_httpchercheurs_edf_comlogicielsEssaistep_Essai', True, pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_FactFreresMemesNoms.xsd', 47, 1), ) + + + step_Essai = property(__step_Essai.value, __step_Essai.set, None, None) + + _ElementMap.update({ + __step_Essai.name() : __step_Essai + }) + _AttributeMap.update({ + + }) +_module_typeBindings.T_Essai = T_Essai +Namespace.addCategoryObject('typeBinding', 'T_Essai', T_Essai) + + +# Complex type {http://chercheurs.edf.com/logiciels/Essai}T_leProc with content type ELEMENT_ONLY +class T_leProc (T_step_Essai): + """Complex type {http://chercheurs.edf.com/logiciels/Essai}T_leProc with content type ELEMENT_ONLY""" + _TypeDefinition = None + _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY + _Abstract = False + _ExpandedName = pyxb.namespace.ExpandedName(Namespace, 'T_leProc') + _XSDLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_FactFreresMemesNoms.xsd', 35, 1) + _ElementMap = T_step_Essai._ElementMap.copy() + _AttributeMap = T_step_Essai._AttributeMap.copy() + # Base type is T_step_Essai + + # Element {http://chercheurs.edf.com/logiciels/Essai}leFact1 uses Python identifier leFact1 + __leFact1 = pyxb.binding.content.ElementDeclaration(pyxb.namespace.ExpandedName(Namespace, 'leFact1'), 'leFact1', '__httpchercheurs_edf_comlogicielsEssai_T_leProc_httpchercheurs_edf_comlogicielsEssaileFact1', False, pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_FactFreresMemesNoms.xsd', 21, 3), ) + + + leFact1 = property(__leFact1.value, __leFact1.set, None, None) + + + # Element {http://chercheurs.edf.com/logiciels/Essai}unSimp uses Python identifier unSimp + __unSimp = pyxb.binding.content.ElementDeclaration(pyxb.namespace.ExpandedName(Namespace, 'unSimp'), 'unSimp', '__httpchercheurs_edf_comlogicielsEssai_T_leProc_httpchercheurs_edf_comlogicielsEssaiunSimp', False, pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_FactFreresMemesNoms.xsd', 39, 3), ) + + + unSimp = property(__unSimp.value, __unSimp.set, None, None) + + _ElementMap.update({ + __leFact1.name() : __leFact1, + __unSimp.name() : __unSimp + }) + _AttributeMap.update({ + + }) +_module_typeBindings.T_leProc = T_leProc +Namespace.addCategoryObject('typeBinding', 'T_leProc', T_leProc) + + +step_Essai = pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, 'step_Essai'), T_step_Essai, location=pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_FactFreresMemesNoms.xsd', 47, 1)) +Namespace.addCategoryObject('elementBinding', step_Essai.name().localName(), step_Essai) + +Essai = pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, 'Essai'), T_Essai, location=pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_FactFreresMemesNoms.xsd', 48, 1)) +Namespace.addCategoryObject('elementBinding', Essai.name().localName(), Essai) + +leProc = pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, 'leProc'), T_leProc, location=pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_FactFreresMemesNoms.xsd', 45, 1)) +Namespace.addCategoryObject('elementBinding', leProc.name().localName(), leProc) + + + +T_leFact1._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, 'Name'), T_Name, scope=T_leFact1, location=pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_FactFreresMemesNoms.xsd', 27, 3))) + +T_leFact1._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, 'ScalarFluxModel'), T_ScalarFluxModel, scope=T_leFact1, location=pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_FactFreresMemesNoms.xsd', 28, 3))) + +def _BuildAutomaton (): + # Remove this helper function from the namespace after it is invoked + global _BuildAutomaton + del _BuildAutomaton + import pyxb.utils.fac as fac + + counters = set() + states = [] + final_update = None + symbol = pyxb.binding.content.ElementUse(T_leFact1._UseForTag(pyxb.namespace.ExpandedName(Namespace, 'Name')), pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_FactFreresMemesNoms.xsd', 27, 3)) + st_0 = fac.State(symbol, is_initial=True, final_update=final_update, is_unordered_catenation=False) + states.append(st_0) + final_update = set() + symbol = pyxb.binding.content.ElementUse(T_leFact1._UseForTag(pyxb.namespace.ExpandedName(Namespace, 'ScalarFluxModel')), pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_FactFreresMemesNoms.xsd', 28, 3)) + st_1 = fac.State(symbol, is_initial=False, final_update=final_update, is_unordered_catenation=False) + states.append(st_1) + final_update = set() + symbol = pyxb.binding.content.ElementUse(T_leFact1._UseForTag(pyxb.namespace.ExpandedName(Namespace, 'Name')), pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_FactFreresMemesNoms.xsd', 31, 3)) + st_2 = fac.State(symbol, is_initial=True, final_update=final_update, is_unordered_catenation=False) + states.append(st_2) + transitions = [] + transitions.append(fac.Transition(st_1, [ + ])) + st_0._set_transitionSet(transitions) + transitions = [] + st_1._set_transitionSet(transitions) + transitions = [] + st_2._set_transitionSet(transitions) + return fac.Automaton(states, counters, False, containing_state=None) +T_leFact1._Automaton = _BuildAutomaton() + + + + +T_Essai._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, 'step_Essai'), T_step_Essai, scope=T_Essai, location=pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_FactFreresMemesNoms.xsd', 47, 1))) + +def _BuildAutomaton_ (): + # Remove this helper function from the namespace after it is invoked + global _BuildAutomaton_ + del _BuildAutomaton_ + import pyxb.utils.fac as fac + + counters = set() + cc_0 = fac.CounterCondition(min=0, max=None, metadata=pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_FactFreresMemesNoms.xsd', 50, 4)) + counters.add(cc_0) + cc_1 = fac.CounterCondition(min=0, max=1, metadata=pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_FactFreresMemesNoms.xsd', 51, 3)) + counters.add(cc_1) + states = [] + final_update = set() + final_update.add(fac.UpdateInstruction(cc_0, False)) + final_update.add(fac.UpdateInstruction(cc_1, False)) + symbol = pyxb.binding.content.ElementUse(T_Essai._UseForTag(pyxb.namespace.ExpandedName(Namespace, 'step_Essai')), pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_FactFreresMemesNoms.xsd', 51, 3)) + st_0 = fac.State(symbol, is_initial=True, final_update=final_update, is_unordered_catenation=False) + states.append(st_0) + transitions = [] + transitions.append(fac.Transition(st_0, [ + fac.UpdateInstruction(cc_0, True), + fac.UpdateInstruction(cc_1, False) ])) + transitions.append(fac.Transition(st_0, [ + fac.UpdateInstruction(cc_1, True) ])) + st_0._set_transitionSet(transitions) + return fac.Automaton(states, counters, True, containing_state=None) +T_Essai._Automaton = _BuildAutomaton_() + + + + +T_leProc._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, 'leFact1'), T_leFact1, scope=T_leProc, location=pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_FactFreresMemesNoms.xsd', 21, 3))) + +T_leProc._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, 'unSimp'), T_unSimp, scope=T_leProc, location=pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_FactFreresMemesNoms.xsd', 39, 3))) + +def _BuildAutomaton_2 (): + # Remove this helper function from the namespace after it is invoked + global _BuildAutomaton_2 + del _BuildAutomaton_2 + import pyxb.utils.fac as fac + + counters = set() + cc_0 = fac.CounterCondition(min=0, max=1, metadata=pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_FactFreresMemesNoms.xsd', 40, 3)) + counters.add(cc_0) + cc_1 = fac.CounterCondition(min=0, max=1, metadata=pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_FactFreresMemesNoms.xsd', 21, 3)) + counters.add(cc_1) + states = [] + final_update = set() + symbol = pyxb.binding.content.ElementUse(T_leProc._UseForTag(pyxb.namespace.ExpandedName(Namespace, 'unSimp')), pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_FactFreresMemesNoms.xsd', 39, 3)) + st_0 = fac.State(symbol, is_initial=True, final_update=final_update, is_unordered_catenation=False) + states.append(st_0) + final_update = set() + final_update.add(fac.UpdateInstruction(cc_0, False)) + final_update.add(fac.UpdateInstruction(cc_1, False)) + symbol = pyxb.binding.content.ElementUse(T_leProc._UseForTag(pyxb.namespace.ExpandedName(Namespace, 'leFact1')), pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_FactFreresMemesNoms.xsd', 21, 3)) + st_1 = fac.State(symbol, is_initial=False, final_update=final_update, is_unordered_catenation=False) + states.append(st_1) + transitions = [] + transitions.append(fac.Transition(st_1, [ + ])) + st_0._set_transitionSet(transitions) + transitions = [] + transitions.append(fac.Transition(st_1, [ + fac.UpdateInstruction(cc_0, True), + fac.UpdateInstruction(cc_1, False) ])) + transitions.append(fac.Transition(st_1, [ + fac.UpdateInstruction(cc_1, True) ])) + st_1._set_transitionSet(transitions) + return fac.Automaton(states, counters, False, containing_state=None) +T_leProc._Automaton = _BuildAutomaton_2() + + +leProc._setSubstitutionGroup(step_Essai) diff --git a/CatasDeTests/raw/cata_UserAssd2_driver.py b/CatasDeTests/raw/cata_UserAssd2_driver.py new file mode 100644 index 00000000..5927f1f2 --- /dev/null +++ b/CatasDeTests/raw/cata_UserAssd2_driver.py @@ -0,0 +1,917 @@ +# ./raw/cata_UserAssd2_driver.py +# -*- coding: utf-8 -*- +# PyXB bindings for NM:9c3bd166183fcfc95687f415bcc4a066eb33ac79 +# Generated 2020-10-14 16:20:43.053836 by PyXB version 1.2.5 using Python 3.4.2.final.0 +# Namespace http://chercheurs.edf.com/logiciels/Essai + +from __future__ import unicode_literals +import pyxb +import pyxb.binding +import pyxb.binding.saxer +import io +import pyxb.utils.utility +import pyxb.utils.domutils +import sys +import pyxb.utils.six as _six +# Unique identifier for bindings created at the same time +_GenerationUID = pyxb.utils.utility.UniqueIdentifier('urn:uuid:71791ae6-0e28-11eb-9ba5-cc3d82d871d8') + +# Version of PyXB used to generate the bindings +_PyXBVersion = '1.2.5' +# Generated bindings are not compatible across PyXB versions +if pyxb.__version__ != _PyXBVersion: + raise pyxb.PyXBVersionError(_PyXBVersion) + +# A holder for module-level binding classes so we can access them from +# inside class definitions where property names may conflict. +_module_typeBindings = pyxb.utils.utility.Object() + +# Import bindings for namespaces imported into schema +import pyxb.binding.datatypes + +# NOTE: All namespace declarations are reserved within the binding +Namespace = pyxb.namespace.NamespaceForURI('http://chercheurs.edf.com/logiciels/Essai', create_if_missing=True) +Namespace.configureCategories(['typeBinding', 'elementBinding']) + +def CreateFromDocument (xml_text, default_namespace=None, location_base=None): + """Parse the given XML and use the document element to create a + Python instance. + + @param xml_text An XML document. This should be data (Python 2 + str or Python 3 bytes), or a text (Python 2 unicode or Python 3 + str) in the L{pyxb._InputEncoding} encoding. + + @keyword default_namespace The L{pyxb.Namespace} instance to use as the + default namespace where there is no default namespace in scope. + If unspecified or C{None}, the namespace of the module containing + this function will be used. + + @keyword location_base: An object to be recorded as the base of all + L{pyxb.utils.utility.Location} instances associated with events and + objects handled by the parser. You might pass the URI from which + the document was obtained. + """ + + if pyxb.XMLStyle_saxer != pyxb._XMLStyle: + dom = pyxb.utils.domutils.StringToDOM(xml_text) + return CreateFromDOM(dom.documentElement, default_namespace=default_namespace) + if default_namespace is None: + default_namespace = Namespace.fallbackNamespace() + saxer = pyxb.binding.saxer.make_parser(fallback_namespace=default_namespace, location_base=location_base) + handler = saxer.getContentHandler() + xmld = xml_text + if isinstance(xmld, _six.text_type): + xmld = xmld.encode(pyxb._InputEncoding) + saxer.parse(io.BytesIO(xmld)) + instance = handler.rootObject() + return instance + +def CreateFromDOM (node, default_namespace=None): + """Create a Python instance from the given DOM node. + The node tag must correspond to an element declaration in this module. + + @deprecated: Forcing use of DOM interface is unnecessary; use L{CreateFromDocument}.""" + if default_namespace is None: + default_namespace = Namespace.fallbackNamespace() + return pyxb.binding.basis.element.AnyCreateFromDOM(node, default_namespace) + + +# Atomic simple type: {http://chercheurs.edf.com/logiciels/Essai}T_creeUserAssd +class T_creeUserAssd (pyxb.binding.datatypes.string): + + """An atomic simple type.""" + + _ExpandedName = pyxb.namespace.ExpandedName(Namespace, 'T_creeUserAssd') + _XSDLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd2.xsd', 7, 1) + _Documentation = None +T_creeUserAssd._InitializeFacetMap() +Namespace.addCategoryObject('typeBinding', 'T_creeUserAssd', T_creeUserAssd) +_module_typeBindings.T_creeUserAssd = T_creeUserAssd + +# Atomic simple type: {http://chercheurs.edf.com/logiciels/Essai}T_creeUserAssd2 +class T_creeUserAssd2 (pyxb.binding.datatypes.string): + + """An atomic simple type.""" + + _ExpandedName = pyxb.namespace.ExpandedName(Namespace, 'T_creeUserAssd2') + _XSDLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd2.xsd', 11, 1) + _Documentation = None +T_creeUserAssd2._InitializeFacetMap() +Namespace.addCategoryObject('typeBinding', 'T_creeUserAssd2', T_creeUserAssd2) +_module_typeBindings.T_creeUserAssd2 = T_creeUserAssd2 + +# Atomic simple type: [anonymous] +class STD_ANON (pyxb.binding.datatypes.string): + + """An atomic simple type.""" + + _ExpandedName = None + _XSDLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd2.xsd', 22, 5) + _Documentation = None +STD_ANON._InitializeFacetMap() +_module_typeBindings.STD_ANON = STD_ANON + +# Atomic simple type: [anonymous] +class STD_ANON_ (pyxb.binding.datatypes.string): + + """An atomic simple type.""" + + _ExpandedName = None + _XSDLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd2.xsd', 34, 5) + _Documentation = None +STD_ANON_._InitializeFacetMap() +_module_typeBindings.STD_ANON_ = STD_ANON_ + +# Atomic simple type: [anonymous] +class STD_ANON_2 (pyxb.binding.datatypes.string): + + """An atomic simple type.""" + + _ExpandedName = None + _XSDLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd2.xsd', 46, 5) + _Documentation = None +STD_ANON_2._InitializeFacetMap() +_module_typeBindings.STD_ANON_2 = STD_ANON_2 + +# Atomic simple type: {http://chercheurs.edf.com/logiciels/Essai}PNEFdico_Essai +class PNEFdico_Essai (pyxb.binding.datatypes.string): + + """{'T_creeUserAssd': {'_creeUserAssd_DefinitionDsSimpListe': 'T_creeUserAssd_4'}} + """ + + _ExpandedName = pyxb.namespace.ExpandedName(Namespace, 'PNEFdico_Essai') + _XSDLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd2.xsd', 177, 1) + _Documentation = "{'T_creeUserAssd': {'_creeUserAssd_DefinitionDsSimpListe': 'T_creeUserAssd_4'}}\n\t\t" +PNEFdico_Essai._InitializeFacetMap() +Namespace.addCategoryObject('typeBinding', 'PNEFdico_Essai', PNEFdico_Essai) +_module_typeBindings.PNEFdico_Essai = PNEFdico_Essai + +# List simple type: [anonymous] +# superclasses pyxb.binding.datatypes.anySimpleType +class STD_ANON_3 (pyxb.binding.basis.STD_list): + + """Simple type that is a list of STD_ANON.""" + + _ExpandedName = None + _XSDLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd2.xsd', 20, 3) + _Documentation = None + + _ItemType = STD_ANON +STD_ANON_3._InitializeFacetMap() +_module_typeBindings.STD_ANON_3 = STD_ANON_3 + +# List simple type: [anonymous] +# superclasses pyxb.binding.datatypes.anySimpleType +class STD_ANON_4 (pyxb.binding.basis.STD_list): + + """Simple type that is a list of STD_ANON_.""" + + _ExpandedName = None + _XSDLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd2.xsd', 32, 3) + _Documentation = None + + _ItemType = STD_ANON_ +STD_ANON_4._InitializeFacetMap() +_module_typeBindings.STD_ANON_4 = STD_ANON_4 + +# List simple type: [anonymous] +# superclasses pyxb.binding.datatypes.anySimpleType +class STD_ANON_5 (pyxb.binding.basis.STD_list): + + """Simple type that is a list of STD_ANON_2.""" + + _ExpandedName = None + _XSDLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd2.xsd', 44, 3) + _Documentation = None + + _ItemType = STD_ANON_2 +STD_ANON_5._InitializeFacetMap() +_module_typeBindings.STD_ANON_5 = STD_ANON_5 + +# List simple type: {http://chercheurs.edf.com/logiciels/Essai}T_creeUserAssd_4 +# superclasses STD_ANON_3 +class T_creeUserAssd_4 (pyxb.binding.basis.STD_list): + + """Simple type that is a list of STD_ANON.""" + + _ExpandedName = pyxb.namespace.ExpandedName(Namespace, 'T_creeUserAssd_4') + _XSDLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd2.xsd', 18, 1) + _Documentation = None + + _ItemType = STD_ANON +T_creeUserAssd_4._InitializeFacetMap() +Namespace.addCategoryObject('typeBinding', 'T_creeUserAssd_4', T_creeUserAssd_4) +_module_typeBindings.T_creeUserAssd_4 = T_creeUserAssd_4 + +# List simple type: {http://chercheurs.edf.com/logiciels/Essai}T_utiliseUserAssd +# superclasses STD_ANON_4 +class T_utiliseUserAssd (pyxb.binding.basis.STD_list): + + """Simple type that is a list of STD_ANON_.""" + + _ExpandedName = pyxb.namespace.ExpandedName(Namespace, 'T_utiliseUserAssd') + _XSDLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd2.xsd', 30, 1) + _Documentation = None + + _ItemType = STD_ANON_ +T_utiliseUserAssd._InitializeFacetMap() +Namespace.addCategoryObject('typeBinding', 'T_utiliseUserAssd', T_utiliseUserAssd) +_module_typeBindings.T_utiliseUserAssd = T_utiliseUserAssd + +# List simple type: {http://chercheurs.edf.com/logiciels/Essai}T_utiliseListeUneListeUserAssd +# superclasses STD_ANON_5 +class T_utiliseListeUneListeUserAssd (pyxb.binding.basis.STD_list): + + """Simple type that is a list of STD_ANON_2.""" + + _ExpandedName = pyxb.namespace.ExpandedName(Namespace, 'T_utiliseListeUneListeUserAssd') + _XSDLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd2.xsd', 42, 1) + _Documentation = None + + _ItemType = STD_ANON_2 +T_utiliseListeUneListeUserAssd._InitializeFacetMap() +Namespace.addCategoryObject('typeBinding', 'T_utiliseListeUneListeUserAssd', T_utiliseListeUneListeUserAssd) +_module_typeBindings.T_utiliseListeUneListeUserAssd = T_utiliseListeUneListeUserAssd + +# Complex type {http://chercheurs.edf.com/logiciels/Essai}T_unFact1 with content type ELEMENT_ONLY +class T_unFact1 (pyxb.binding.basis.complexTypeDefinition): + """Complex type {http://chercheurs.edf.com/logiciels/Essai}T_unFact1 with content type ELEMENT_ONLY""" + _TypeDefinition = None + _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY + _Abstract = False + _ExpandedName = pyxb.namespace.ExpandedName(Namespace, 'T_unFact1') + _XSDLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd2.xsd', 54, 1) + _ElementMap = {} + _AttributeMap = {} + # Base type is pyxb.binding.datatypes.anyType + + # Element {http://chercheurs.edf.com/logiciels/Essai}creeUserAssd uses Python identifier creeUserAssd + __creeUserAssd = pyxb.binding.content.ElementDeclaration(pyxb.namespace.ExpandedName(Namespace, 'creeUserAssd'), 'creeUserAssd', '__httpchercheurs_edf_comlogicielsEssai_T_unFact1_httpchercheurs_edf_comlogicielsEssaicreeUserAssd', False, pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd2.xsd', 56, 3), ) + + + creeUserAssd = property(__creeUserAssd.value, __creeUserAssd.set, None, None) + + _ElementMap.update({ + __creeUserAssd.name() : __creeUserAssd + }) + _AttributeMap.update({ + + }) +_module_typeBindings.T_unFact1 = T_unFact1 +Namespace.addCategoryObject('typeBinding', 'T_unFact1', T_unFact1) + + +# Complex type {http://chercheurs.edf.com/logiciels/Essai}T_unFact with content type ELEMENT_ONLY +class T_unFact (pyxb.binding.basis.complexTypeDefinition): + """Complex type {http://chercheurs.edf.com/logiciels/Essai}T_unFact with content type ELEMENT_ONLY""" + _TypeDefinition = None + _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY + _Abstract = False + _ExpandedName = pyxb.namespace.ExpandedName(Namespace, 'T_unFact') + _XSDLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd2.xsd', 75, 1) + _ElementMap = {} + _AttributeMap = {} + # Base type is pyxb.binding.datatypes.anyType + + # Element {http://chercheurs.edf.com/logiciels/Essai}creeUserAssd uses Python identifier creeUserAssd + __creeUserAssd = pyxb.binding.content.ElementDeclaration(pyxb.namespace.ExpandedName(Namespace, 'creeUserAssd'), 'creeUserAssd', '__httpchercheurs_edf_comlogicielsEssai_T_unFact_httpchercheurs_edf_comlogicielsEssaicreeUserAssd', False, pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd2.xsd', 77, 3), ) + + + creeUserAssd = property(__creeUserAssd.value, __creeUserAssd.set, None, None) + + _ElementMap.update({ + __creeUserAssd.name() : __creeUserAssd + }) + _AttributeMap.update({ + + }) +_module_typeBindings.T_unFact = T_unFact +Namespace.addCategoryObject('typeBinding', 'T_unFact', T_unFact) + + +# Complex type {http://chercheurs.edf.com/logiciels/Essai}T_step_Essai with content type EMPTY +class T_step_Essai (pyxb.binding.basis.complexTypeDefinition): + """Complex type {http://chercheurs.edf.com/logiciels/Essai}T_step_Essai with content type EMPTY""" + _TypeDefinition = None + _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_EMPTY + _Abstract = True + _ExpandedName = pyxb.namespace.ExpandedName(Namespace, 'T_step_Essai') + _XSDLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd2.xsd', 169, 1) + _ElementMap = {} + _AttributeMap = {} + # Base type is pyxb.binding.datatypes.anyType + _ElementMap.update({ + + }) + _AttributeMap.update({ + + }) +_module_typeBindings.T_step_Essai = T_step_Essai +Namespace.addCategoryObject('typeBinding', 'T_step_Essai', T_step_Essai) + + +# Complex type {http://chercheurs.edf.com/logiciels/Essai}T_Essai with content type ELEMENT_ONLY +class T_Essai (pyxb.binding.basis.complexTypeDefinition): + """Complex type {http://chercheurs.edf.com/logiciels/Essai}T_Essai with content type ELEMENT_ONLY""" + _TypeDefinition = None + _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY + _Abstract = False + _ExpandedName = pyxb.namespace.ExpandedName(Namespace, 'T_Essai') + _XSDLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd2.xsd', 172, 2) + _ElementMap = {} + _AttributeMap = {} + # Base type is pyxb.binding.datatypes.anyType + + # Element {http://chercheurs.edf.com/logiciels/Essai}step_Essai uses Python identifier step_Essai + __step_Essai = pyxb.binding.content.ElementDeclaration(pyxb.namespace.ExpandedName(Namespace, 'step_Essai'), 'step_Essai', '__httpchercheurs_edf_comlogicielsEssai_T_Essai_httpchercheurs_edf_comlogicielsEssaistep_Essai', True, pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd2.xsd', 170, 1), ) + + + step_Essai = property(__step_Essai.value, __step_Essai.set, None, None) + + _ElementMap.update({ + __step_Essai.name() : __step_Essai + }) + _AttributeMap.update({ + + }) +_module_typeBindings.T_Essai = T_Essai +Namespace.addCategoryObject('typeBinding', 'T_Essai', T_Essai) + + +# Complex type {http://chercheurs.edf.com/logiciels/Essai}T_DefinitionDsFactDsOper with content type ELEMENT_ONLY +class T_DefinitionDsFactDsOper (T_step_Essai): + """Complex type {http://chercheurs.edf.com/logiciels/Essai}T_DefinitionDsFactDsOper with content type ELEMENT_ONLY""" + _TypeDefinition = None + _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY + _Abstract = False + _ExpandedName = pyxb.namespace.ExpandedName(Namespace, 'T_DefinitionDsFactDsOper') + _XSDLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd2.xsd', 63, 1) + _ElementMap = T_step_Essai._ElementMap.copy() + _AttributeMap = T_step_Essai._AttributeMap.copy() + # Base type is T_step_Essai + + # Element {http://chercheurs.edf.com/logiciels/Essai}unFact1 uses Python identifier unFact1 + __unFact1 = pyxb.binding.content.ElementDeclaration(pyxb.namespace.ExpandedName(Namespace, 'unFact1'), 'unFact1', '__httpchercheurs_edf_comlogicielsEssai_T_DefinitionDsFactDsOper_httpchercheurs_edf_comlogicielsEssaiunFact1', True, pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd2.xsd', 67, 3), ) + + + unFact1 = property(__unFact1.value, __unFact1.set, None, None) + + + # Attribute name uses Python identifier name + __name = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, 'name'), 'name', '__httpchercheurs_edf_comlogicielsEssai_T_DefinitionDsFactDsOper_name', pyxb.binding.datatypes.string) + __name._DeclarationLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd2.xsd', 69, 2) + __name._UseLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd2.xsd', 69, 2) + + name = property(__name.value, __name.set, None, None) + + + # Attribute accasType uses Python identifier accasType + __accasType = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, 'accasType'), 'accasType', '__httpchercheurs_edf_comlogicielsEssai_T_DefinitionDsFactDsOper_accasType', pyxb.binding.datatypes.string, fixed=True, unicode_default='ASSD') + __accasType._DeclarationLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd2.xsd', 70, 2) + __accasType._UseLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd2.xsd', 70, 2) + + accasType = property(__accasType.value, __accasType.set, None, None) + + + # Attribute typeUtilisateur uses Python identifier typeUtilisateur + __typeUtilisateur = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, 'typeUtilisateur'), 'typeUtilisateur', '__httpchercheurs_edf_comlogicielsEssai_T_DefinitionDsFactDsOper_typeUtilisateur', pyxb.binding.datatypes.string, fixed=True, unicode_default='lASSD') + __typeUtilisateur._DeclarationLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd2.xsd', 71, 2) + __typeUtilisateur._UseLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd2.xsd', 71, 2) + + typeUtilisateur = property(__typeUtilisateur.value, __typeUtilisateur.set, None, None) + + _ElementMap.update({ + __unFact1.name() : __unFact1 + }) + _AttributeMap.update({ + __name.name() : __name, + __accasType.name() : __accasType, + __typeUtilisateur.name() : __typeUtilisateur + }) +_module_typeBindings.T_DefinitionDsFactDsOper = T_DefinitionDsFactDsOper +Namespace.addCategoryObject('typeBinding', 'T_DefinitionDsFactDsOper', T_DefinitionDsFactDsOper) + + +# Complex type {http://chercheurs.edf.com/logiciels/Essai}T_DefinitionDsFactDsProc with content type ELEMENT_ONLY +class T_DefinitionDsFactDsProc (T_step_Essai): + """Complex type {http://chercheurs.edf.com/logiciels/Essai}T_DefinitionDsFactDsProc with content type ELEMENT_ONLY""" + _TypeDefinition = None + _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY + _Abstract = False + _ExpandedName = pyxb.namespace.ExpandedName(Namespace, 'T_DefinitionDsFactDsProc') + _XSDLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd2.xsd', 84, 1) + _ElementMap = T_step_Essai._ElementMap.copy() + _AttributeMap = T_step_Essai._AttributeMap.copy() + # Base type is T_step_Essai + + # Element {http://chercheurs.edf.com/logiciels/Essai}unFact uses Python identifier unFact + __unFact = pyxb.binding.content.ElementDeclaration(pyxb.namespace.ExpandedName(Namespace, 'unFact'), 'unFact', '__httpchercheurs_edf_comlogicielsEssai_T_DefinitionDsFactDsProc_httpchercheurs_edf_comlogicielsEssaiunFact', False, pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd2.xsd', 88, 3), ) + + + unFact = property(__unFact.value, __unFact.set, None, None) + + _ElementMap.update({ + __unFact.name() : __unFact + }) + _AttributeMap.update({ + + }) +_module_typeBindings.T_DefinitionDsFactDsProc = T_DefinitionDsFactDsProc +Namespace.addCategoryObject('typeBinding', 'T_DefinitionDsFactDsProc', T_DefinitionDsFactDsProc) + + +# Complex type {http://chercheurs.edf.com/logiciels/Essai}T_DefinitionDsSimpDsOper with content type ELEMENT_ONLY +class T_DefinitionDsSimpDsOper (T_step_Essai): + """Complex type {http://chercheurs.edf.com/logiciels/Essai}T_DefinitionDsSimpDsOper with content type ELEMENT_ONLY""" + _TypeDefinition = None + _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY + _Abstract = False + _ExpandedName = pyxb.namespace.ExpandedName(Namespace, 'T_DefinitionDsSimpDsOper') + _XSDLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd2.xsd', 93, 1) + _ElementMap = T_step_Essai._ElementMap.copy() + _AttributeMap = T_step_Essai._AttributeMap.copy() + # Base type is T_step_Essai + + # Element {http://chercheurs.edf.com/logiciels/Essai}creeUserAssd uses Python identifier creeUserAssd + __creeUserAssd = pyxb.binding.content.ElementDeclaration(pyxb.namespace.ExpandedName(Namespace, 'creeUserAssd'), 'creeUserAssd', '__httpchercheurs_edf_comlogicielsEssai_T_DefinitionDsSimpDsOper_httpchercheurs_edf_comlogicielsEssaicreeUserAssd', False, pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd2.xsd', 97, 3), ) + + + creeUserAssd = property(__creeUserAssd.value, __creeUserAssd.set, None, None) + + + # Attribute name uses Python identifier name + __name = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, 'name'), 'name', '__httpchercheurs_edf_comlogicielsEssai_T_DefinitionDsSimpDsOper_name', pyxb.binding.datatypes.string) + __name._DeclarationLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd2.xsd', 103, 2) + __name._UseLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd2.xsd', 103, 2) + + name = property(__name.value, __name.set, None, None) + + + # Attribute accasType uses Python identifier accasType + __accasType = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, 'accasType'), 'accasType', '__httpchercheurs_edf_comlogicielsEssai_T_DefinitionDsSimpDsOper_accasType', pyxb.binding.datatypes.string, fixed=True, unicode_default='ASSD') + __accasType._DeclarationLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd2.xsd', 104, 2) + __accasType._UseLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd2.xsd', 104, 2) + + accasType = property(__accasType.value, __accasType.set, None, None) + + + # Attribute typeUtilisateur uses Python identifier typeUtilisateur + __typeUtilisateur = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, 'typeUtilisateur'), 'typeUtilisateur', '__httpchercheurs_edf_comlogicielsEssai_T_DefinitionDsSimpDsOper_typeUtilisateur', pyxb.binding.datatypes.string, fixed=True, unicode_default='lASSD') + __typeUtilisateur._DeclarationLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd2.xsd', 105, 2) + __typeUtilisateur._UseLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd2.xsd', 105, 2) + + typeUtilisateur = property(__typeUtilisateur.value, __typeUtilisateur.set, None, None) + + _ElementMap.update({ + __creeUserAssd.name() : __creeUserAssd + }) + _AttributeMap.update({ + __name.name() : __name, + __accasType.name() : __accasType, + __typeUtilisateur.name() : __typeUtilisateur + }) +_module_typeBindings.T_DefinitionDsSimpDsOper = T_DefinitionDsSimpDsOper +Namespace.addCategoryObject('typeBinding', 'T_DefinitionDsSimpDsOper', T_DefinitionDsSimpDsOper) + + +# Complex type {http://chercheurs.edf.com/logiciels/Essai}T_DefinitionDsSimpDsProc with content type ELEMENT_ONLY +class T_DefinitionDsSimpDsProc (T_step_Essai): + """Complex type {http://chercheurs.edf.com/logiciels/Essai}T_DefinitionDsSimpDsProc with content type ELEMENT_ONLY""" + _TypeDefinition = None + _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY + _Abstract = False + _ExpandedName = pyxb.namespace.ExpandedName(Namespace, 'T_DefinitionDsSimpDsProc') + _XSDLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd2.xsd', 109, 1) + _ElementMap = T_step_Essai._ElementMap.copy() + _AttributeMap = T_step_Essai._AttributeMap.copy() + # Base type is T_step_Essai + + # Element {http://chercheurs.edf.com/logiciels/Essai}creeUserAssd uses Python identifier creeUserAssd + __creeUserAssd = pyxb.binding.content.ElementDeclaration(pyxb.namespace.ExpandedName(Namespace, 'creeUserAssd'), 'creeUserAssd', '__httpchercheurs_edf_comlogicielsEssai_T_DefinitionDsSimpDsProc_httpchercheurs_edf_comlogicielsEssaicreeUserAssd', False, pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd2.xsd', 113, 3), ) + + + creeUserAssd = property(__creeUserAssd.value, __creeUserAssd.set, None, None) + + _ElementMap.update({ + __creeUserAssd.name() : __creeUserAssd + }) + _AttributeMap.update({ + + }) +_module_typeBindings.T_DefinitionDsSimpDsProc = T_DefinitionDsSimpDsProc +Namespace.addCategoryObject('typeBinding', 'T_DefinitionDsSimpDsProc', T_DefinitionDsSimpDsProc) + + +# Complex type {http://chercheurs.edf.com/logiciels/Essai}T_DefinitionDsSimpListe with content type ELEMENT_ONLY +class T_DefinitionDsSimpListe (T_step_Essai): + """Complex type {http://chercheurs.edf.com/logiciels/Essai}T_DefinitionDsSimpListe with content type ELEMENT_ONLY""" + _TypeDefinition = None + _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY + _Abstract = False + _ExpandedName = pyxb.namespace.ExpandedName(Namespace, 'T_DefinitionDsSimpListe') + _XSDLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd2.xsd', 118, 1) + _ElementMap = T_step_Essai._ElementMap.copy() + _AttributeMap = T_step_Essai._AttributeMap.copy() + # Base type is T_step_Essai + + # Element {http://chercheurs.edf.com/logiciels/Essai}creeUserAssd uses Python identifier creeUserAssd + __creeUserAssd = pyxb.binding.content.ElementDeclaration(pyxb.namespace.ExpandedName(Namespace, 'creeUserAssd'), 'creeUserAssd', '__httpchercheurs_edf_comlogicielsEssai_T_DefinitionDsSimpListe_httpchercheurs_edf_comlogicielsEssaicreeUserAssd', False, pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd2.xsd', 122, 3), ) + + + creeUserAssd = property(__creeUserAssd.value, __creeUserAssd.set, None, None) + + _ElementMap.update({ + __creeUserAssd.name() : __creeUserAssd + }) + _AttributeMap.update({ + + }) +_module_typeBindings.T_DefinitionDsSimpListe = T_DefinitionDsSimpListe +Namespace.addCategoryObject('typeBinding', 'T_DefinitionDsSimpListe', T_DefinitionDsSimpListe) + + +# Complex type {http://chercheurs.edf.com/logiciels/Essai}T_UtiliseEtDefinitDsLeMemeProc with content type ELEMENT_ONLY +class T_UtiliseEtDefinitDsLeMemeProc (T_step_Essai): + """Complex type {http://chercheurs.edf.com/logiciels/Essai}T_UtiliseEtDefinitDsLeMemeProc with content type ELEMENT_ONLY""" + _TypeDefinition = None + _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY + _Abstract = False + _ExpandedName = pyxb.namespace.ExpandedName(Namespace, 'T_UtiliseEtDefinitDsLeMemeProc') + _XSDLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd2.xsd', 131, 1) + _ElementMap = T_step_Essai._ElementMap.copy() + _AttributeMap = T_step_Essai._AttributeMap.copy() + # Base type is T_step_Essai + + # Element {http://chercheurs.edf.com/logiciels/Essai}utiliseUserAssd uses Python identifier utiliseUserAssd + __utiliseUserAssd = pyxb.binding.content.ElementDeclaration(pyxb.namespace.ExpandedName(Namespace, 'utiliseUserAssd'), 'utiliseUserAssd', '__httpchercheurs_edf_comlogicielsEssai_T_UtiliseEtDefinitDsLeMemeProc_httpchercheurs_edf_comlogicielsEssaiutiliseUserAssd', False, pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd2.xsd', 135, 3), ) + + + utiliseUserAssd = property(__utiliseUserAssd.value, __utiliseUserAssd.set, None, None) + + + # Element {http://chercheurs.edf.com/logiciels/Essai}creeUserAssd uses Python identifier creeUserAssd + __creeUserAssd = pyxb.binding.content.ElementDeclaration(pyxb.namespace.ExpandedName(Namespace, 'creeUserAssd'), 'creeUserAssd', '__httpchercheurs_edf_comlogicielsEssai_T_UtiliseEtDefinitDsLeMemeProc_httpchercheurs_edf_comlogicielsEssaicreeUserAssd', False, pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd2.xsd', 140, 3), ) + + + creeUserAssd = property(__creeUserAssd.value, __creeUserAssd.set, None, None) + + _ElementMap.update({ + __utiliseUserAssd.name() : __utiliseUserAssd, + __creeUserAssd.name() : __creeUserAssd + }) + _AttributeMap.update({ + + }) +_module_typeBindings.T_UtiliseEtDefinitDsLeMemeProc = T_UtiliseEtDefinitDsLeMemeProc +Namespace.addCategoryObject('typeBinding', 'T_UtiliseEtDefinitDsLeMemeProc', T_UtiliseEtDefinitDsLeMemeProc) + + +# Complex type {http://chercheurs.edf.com/logiciels/Essai}T_UtiliseUserAssD with content type ELEMENT_ONLY +class T_UtiliseUserAssD (T_step_Essai): + """Complex type {http://chercheurs.edf.com/logiciels/Essai}T_UtiliseUserAssD with content type ELEMENT_ONLY""" + _TypeDefinition = None + _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY + _Abstract = False + _ExpandedName = pyxb.namespace.ExpandedName(Namespace, 'T_UtiliseUserAssD') + _XSDLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd2.xsd', 149, 1) + _ElementMap = T_step_Essai._ElementMap.copy() + _AttributeMap = T_step_Essai._AttributeMap.copy() + # Base type is T_step_Essai + + # Element {http://chercheurs.edf.com/logiciels/Essai}utiliseListeUneListeUserAssd uses Python identifier utiliseListeUneListeUserAssd + __utiliseListeUneListeUserAssd = pyxb.binding.content.ElementDeclaration(pyxb.namespace.ExpandedName(Namespace, 'utiliseListeUneListeUserAssd'), 'utiliseListeUneListeUserAssd', '__httpchercheurs_edf_comlogicielsEssai_T_UtiliseUserAssD_httpchercheurs_edf_comlogicielsEssaiutiliseListeUneListeUserAssd', False, pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd2.xsd', 153, 3), ) + + + utiliseListeUneListeUserAssd = property(__utiliseListeUneListeUserAssd.value, __utiliseListeUneListeUserAssd.set, None, None) + + _ElementMap.update({ + __utiliseListeUneListeUserAssd.name() : __utiliseListeUneListeUserAssd + }) + _AttributeMap.update({ + + }) +_module_typeBindings.T_UtiliseUserAssD = T_UtiliseUserAssD +Namespace.addCategoryObject('typeBinding', 'T_UtiliseUserAssD', T_UtiliseUserAssD) + + +step_Essai = pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, 'step_Essai'), T_step_Essai, location=pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd2.xsd', 170, 1)) +Namespace.addCategoryObject('elementBinding', step_Essai.name().localName(), step_Essai) + +Essai = pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, 'Essai'), T_Essai, location=pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd2.xsd', 171, 1)) +Namespace.addCategoryObject('elementBinding', Essai.name().localName(), Essai) + +DefinitionDsFactDsOper = pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, 'DefinitionDsFactDsOper'), T_DefinitionDsFactDsOper, location=pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd2.xsd', 162, 1)) +Namespace.addCategoryObject('elementBinding', DefinitionDsFactDsOper.name().localName(), DefinitionDsFactDsOper) + +DefinitionDsFactDsProc = pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, 'DefinitionDsFactDsProc'), T_DefinitionDsFactDsProc, location=pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd2.xsd', 163, 1)) +Namespace.addCategoryObject('elementBinding', DefinitionDsFactDsProc.name().localName(), DefinitionDsFactDsProc) + +DefinitionDsSimpDsOper = pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, 'DefinitionDsSimpDsOper'), T_DefinitionDsSimpDsOper, location=pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd2.xsd', 164, 1)) +Namespace.addCategoryObject('elementBinding', DefinitionDsSimpDsOper.name().localName(), DefinitionDsSimpDsOper) + +DefinitionDsSimpDsProc = pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, 'DefinitionDsSimpDsProc'), T_DefinitionDsSimpDsProc, location=pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd2.xsd', 165, 1)) +Namespace.addCategoryObject('elementBinding', DefinitionDsSimpDsProc.name().localName(), DefinitionDsSimpDsProc) + +DefinitionDsSimpListe = pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, 'DefinitionDsSimpListe'), T_DefinitionDsSimpListe, location=pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd2.xsd', 166, 1)) +Namespace.addCategoryObject('elementBinding', DefinitionDsSimpListe.name().localName(), DefinitionDsSimpListe) + +UtiliseEtDefinitDsLeMemeProc = pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, 'UtiliseEtDefinitDsLeMemeProc'), T_UtiliseEtDefinitDsLeMemeProc, location=pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd2.xsd', 167, 1)) +Namespace.addCategoryObject('elementBinding', UtiliseEtDefinitDsLeMemeProc.name().localName(), UtiliseEtDefinitDsLeMemeProc) + +UtiliseUserAssD = pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, 'UtiliseUserAssD'), T_UtiliseUserAssD, location=pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd2.xsd', 168, 1)) +Namespace.addCategoryObject('elementBinding', UtiliseUserAssD.name().localName(), UtiliseUserAssD) + + + +T_unFact1._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, 'creeUserAssd'), T_creeUserAssd, scope=T_unFact1, location=pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd2.xsd', 56, 3))) + +def _BuildAutomaton (): + # Remove this helper function from the namespace after it is invoked + global _BuildAutomaton + del _BuildAutomaton + import pyxb.utils.fac as fac + + counters = set() + cc_0 = fac.CounterCondition(min=0, max=1, metadata=pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd2.xsd', 56, 3)) + counters.add(cc_0) + states = [] + final_update = set() + final_update.add(fac.UpdateInstruction(cc_0, False)) + symbol = pyxb.binding.content.ElementUse(T_unFact1._UseForTag(pyxb.namespace.ExpandedName(Namespace, 'creeUserAssd')), pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd2.xsd', 56, 3)) + st_0 = fac.State(symbol, is_initial=True, final_update=final_update, is_unordered_catenation=False) + states.append(st_0) + transitions = [] + transitions.append(fac.Transition(st_0, [ + fac.UpdateInstruction(cc_0, True) ])) + st_0._set_transitionSet(transitions) + return fac.Automaton(states, counters, True, containing_state=None) +T_unFact1._Automaton = _BuildAutomaton() + + + + +T_unFact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, 'creeUserAssd'), T_creeUserAssd, scope=T_unFact, location=pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd2.xsd', 77, 3))) + +def _BuildAutomaton_ (): + # Remove this helper function from the namespace after it is invoked + global _BuildAutomaton_ + del _BuildAutomaton_ + import pyxb.utils.fac as fac + + counters = set() + cc_0 = fac.CounterCondition(min=0, max=1, metadata=pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd2.xsd', 77, 3)) + counters.add(cc_0) + states = [] + final_update = set() + final_update.add(fac.UpdateInstruction(cc_0, False)) + symbol = pyxb.binding.content.ElementUse(T_unFact._UseForTag(pyxb.namespace.ExpandedName(Namespace, 'creeUserAssd')), pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd2.xsd', 77, 3)) + st_0 = fac.State(symbol, is_initial=True, final_update=final_update, is_unordered_catenation=False) + states.append(st_0) + transitions = [] + transitions.append(fac.Transition(st_0, [ + fac.UpdateInstruction(cc_0, True) ])) + st_0._set_transitionSet(transitions) + return fac.Automaton(states, counters, True, containing_state=None) +T_unFact._Automaton = _BuildAutomaton_() + + + + +T_Essai._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, 'step_Essai'), T_step_Essai, scope=T_Essai, location=pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd2.xsd', 170, 1))) + +def _BuildAutomaton_2 (): + # Remove this helper function from the namespace after it is invoked + global _BuildAutomaton_2 + del _BuildAutomaton_2 + import pyxb.utils.fac as fac + + counters = set() + cc_0 = fac.CounterCondition(min=0, max=None, metadata=pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd2.xsd', 173, 4)) + counters.add(cc_0) + cc_1 = fac.CounterCondition(min=0, max=1, metadata=pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd2.xsd', 174, 3)) + counters.add(cc_1) + states = [] + final_update = set() + final_update.add(fac.UpdateInstruction(cc_0, False)) + final_update.add(fac.UpdateInstruction(cc_1, False)) + symbol = pyxb.binding.content.ElementUse(T_Essai._UseForTag(pyxb.namespace.ExpandedName(Namespace, 'step_Essai')), pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd2.xsd', 174, 3)) + st_0 = fac.State(symbol, is_initial=True, final_update=final_update, is_unordered_catenation=False) + states.append(st_0) + transitions = [] + transitions.append(fac.Transition(st_0, [ + fac.UpdateInstruction(cc_0, True), + fac.UpdateInstruction(cc_1, False) ])) + transitions.append(fac.Transition(st_0, [ + fac.UpdateInstruction(cc_1, True) ])) + st_0._set_transitionSet(transitions) + return fac.Automaton(states, counters, True, containing_state=None) +T_Essai._Automaton = _BuildAutomaton_2() + + + + +T_DefinitionDsFactDsOper._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, 'unFact1'), T_unFact1, scope=T_DefinitionDsFactDsOper, location=pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd2.xsd', 67, 3))) + +def _BuildAutomaton_3 (): + # Remove this helper function from the namespace after it is invoked + global _BuildAutomaton_3 + del _BuildAutomaton_3 + import pyxb.utils.fac as fac + + counters = set() + cc_0 = fac.CounterCondition(min=0, max=None, metadata=pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd2.xsd', 67, 3)) + counters.add(cc_0) + states = [] + final_update = set() + final_update.add(fac.UpdateInstruction(cc_0, False)) + symbol = pyxb.binding.content.ElementUse(T_DefinitionDsFactDsOper._UseForTag(pyxb.namespace.ExpandedName(Namespace, 'unFact1')), pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd2.xsd', 67, 3)) + st_0 = fac.State(symbol, is_initial=True, final_update=final_update, is_unordered_catenation=False) + states.append(st_0) + transitions = [] + transitions.append(fac.Transition(st_0, [ + fac.UpdateInstruction(cc_0, True) ])) + st_0._set_transitionSet(transitions) + return fac.Automaton(states, counters, True, containing_state=None) +T_DefinitionDsFactDsOper._Automaton = _BuildAutomaton_3() + + + + +T_DefinitionDsFactDsProc._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, 'unFact'), T_unFact, scope=T_DefinitionDsFactDsProc, location=pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd2.xsd', 88, 3))) + +def _BuildAutomaton_4 (): + # Remove this helper function from the namespace after it is invoked + global _BuildAutomaton_4 + del _BuildAutomaton_4 + import pyxb.utils.fac as fac + + counters = set() + cc_0 = fac.CounterCondition(min=0, max=1, metadata=pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd2.xsd', 88, 3)) + counters.add(cc_0) + states = [] + final_update = set() + final_update.add(fac.UpdateInstruction(cc_0, False)) + symbol = pyxb.binding.content.ElementUse(T_DefinitionDsFactDsProc._UseForTag(pyxb.namespace.ExpandedName(Namespace, 'unFact')), pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd2.xsd', 88, 3)) + st_0 = fac.State(symbol, is_initial=True, final_update=final_update, is_unordered_catenation=False) + states.append(st_0) + transitions = [] + transitions.append(fac.Transition(st_0, [ + fac.UpdateInstruction(cc_0, True) ])) + st_0._set_transitionSet(transitions) + return fac.Automaton(states, counters, True, containing_state=None) +T_DefinitionDsFactDsProc._Automaton = _BuildAutomaton_4() + + + + +T_DefinitionDsSimpDsOper._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, 'creeUserAssd'), T_creeUserAssd, scope=T_DefinitionDsSimpDsOper, location=pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd2.xsd', 97, 3))) + +def _BuildAutomaton_5 (): + # Remove this helper function from the namespace after it is invoked + global _BuildAutomaton_5 + del _BuildAutomaton_5 + import pyxb.utils.fac as fac + + counters = set() + cc_0 = fac.CounterCondition(min=0, max=1, metadata=pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd2.xsd', 97, 3)) + counters.add(cc_0) + states = [] + final_update = set() + final_update.add(fac.UpdateInstruction(cc_0, False)) + symbol = pyxb.binding.content.ElementUse(T_DefinitionDsSimpDsOper._UseForTag(pyxb.namespace.ExpandedName(Namespace, 'creeUserAssd')), pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd2.xsd', 97, 3)) + st_0 = fac.State(symbol, is_initial=True, final_update=final_update, is_unordered_catenation=False) + states.append(st_0) + transitions = [] + transitions.append(fac.Transition(st_0, [ + fac.UpdateInstruction(cc_0, True) ])) + st_0._set_transitionSet(transitions) + return fac.Automaton(states, counters, True, containing_state=None) +T_DefinitionDsSimpDsOper._Automaton = _BuildAutomaton_5() + + + + +T_DefinitionDsSimpDsProc._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, 'creeUserAssd'), T_creeUserAssd, scope=T_DefinitionDsSimpDsProc, location=pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd2.xsd', 113, 3))) + +def _BuildAutomaton_6 (): + # Remove this helper function from the namespace after it is invoked + global _BuildAutomaton_6 + del _BuildAutomaton_6 + import pyxb.utils.fac as fac + + counters = set() + cc_0 = fac.CounterCondition(min=0, max=1, metadata=pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd2.xsd', 113, 3)) + counters.add(cc_0) + states = [] + final_update = set() + final_update.add(fac.UpdateInstruction(cc_0, False)) + symbol = pyxb.binding.content.ElementUse(T_DefinitionDsSimpDsProc._UseForTag(pyxb.namespace.ExpandedName(Namespace, 'creeUserAssd')), pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd2.xsd', 113, 3)) + st_0 = fac.State(symbol, is_initial=True, final_update=final_update, is_unordered_catenation=False) + states.append(st_0) + transitions = [] + transitions.append(fac.Transition(st_0, [ + fac.UpdateInstruction(cc_0, True) ])) + st_0._set_transitionSet(transitions) + return fac.Automaton(states, counters, True, containing_state=None) +T_DefinitionDsSimpDsProc._Automaton = _BuildAutomaton_6() + + + + +T_DefinitionDsSimpListe._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, 'creeUserAssd'), T_creeUserAssd_4, scope=T_DefinitionDsSimpListe, location=pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd2.xsd', 122, 3))) + +def _BuildAutomaton_7 (): + # Remove this helper function from the namespace after it is invoked + global _BuildAutomaton_7 + del _BuildAutomaton_7 + import pyxb.utils.fac as fac + + counters = set() + cc_0 = fac.CounterCondition(min=0, max=1, metadata=pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd2.xsd', 122, 3)) + counters.add(cc_0) + states = [] + final_update = set() + final_update.add(fac.UpdateInstruction(cc_0, False)) + symbol = pyxb.binding.content.ElementUse(T_DefinitionDsSimpListe._UseForTag(pyxb.namespace.ExpandedName(Namespace, 'creeUserAssd')), pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd2.xsd', 122, 3)) + st_0 = fac.State(symbol, is_initial=True, final_update=final_update, is_unordered_catenation=False) + states.append(st_0) + transitions = [] + transitions.append(fac.Transition(st_0, [ + fac.UpdateInstruction(cc_0, True) ])) + st_0._set_transitionSet(transitions) + return fac.Automaton(states, counters, True, containing_state=None) +T_DefinitionDsSimpListe._Automaton = _BuildAutomaton_7() + + + + +T_UtiliseEtDefinitDsLeMemeProc._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, 'utiliseUserAssd'), T_utiliseUserAssd, scope=T_UtiliseEtDefinitDsLeMemeProc, location=pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd2.xsd', 135, 3))) + +T_UtiliseEtDefinitDsLeMemeProc._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, 'creeUserAssd'), T_creeUserAssd, scope=T_UtiliseEtDefinitDsLeMemeProc, location=pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd2.xsd', 140, 3))) + +def _BuildAutomaton_8 (): + # Remove this helper function from the namespace after it is invoked + global _BuildAutomaton_8 + del _BuildAutomaton_8 + import pyxb.utils.fac as fac + + counters = set() + cc_0 = fac.CounterCondition(min=0, max=1, metadata=pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd2.xsd', 140, 3)) + counters.add(cc_0) + states = [] + final_update = set() + symbol = pyxb.binding.content.ElementUse(T_UtiliseEtDefinitDsLeMemeProc._UseForTag(pyxb.namespace.ExpandedName(Namespace, 'utiliseUserAssd')), pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd2.xsd', 135, 3)) + st_0 = fac.State(symbol, is_initial=True, final_update=final_update, is_unordered_catenation=False) + states.append(st_0) + final_update = set() + final_update.add(fac.UpdateInstruction(cc_0, False)) + symbol = pyxb.binding.content.ElementUse(T_UtiliseEtDefinitDsLeMemeProc._UseForTag(pyxb.namespace.ExpandedName(Namespace, 'creeUserAssd')), pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd2.xsd', 140, 3)) + st_1 = fac.State(symbol, is_initial=False, final_update=final_update, is_unordered_catenation=False) + states.append(st_1) + transitions = [] + transitions.append(fac.Transition(st_1, [ + ])) + st_0._set_transitionSet(transitions) + transitions = [] + transitions.append(fac.Transition(st_1, [ + fac.UpdateInstruction(cc_0, True) ])) + st_1._set_transitionSet(transitions) + return fac.Automaton(states, counters, False, containing_state=None) +T_UtiliseEtDefinitDsLeMemeProc._Automaton = _BuildAutomaton_8() + + + + +T_UtiliseUserAssD._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, 'utiliseListeUneListeUserAssd'), T_utiliseListeUneListeUserAssd, scope=T_UtiliseUserAssD, location=pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd2.xsd', 153, 3))) + +def _BuildAutomaton_9 (): + # Remove this helper function from the namespace after it is invoked + global _BuildAutomaton_9 + del _BuildAutomaton_9 + import pyxb.utils.fac as fac + + counters = set() + states = [] + final_update = set() + symbol = pyxb.binding.content.ElementUse(T_UtiliseUserAssD._UseForTag(pyxb.namespace.ExpandedName(Namespace, 'utiliseListeUneListeUserAssd')), pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd2.xsd', 153, 3)) + st_0 = fac.State(symbol, is_initial=True, final_update=final_update, is_unordered_catenation=False) + states.append(st_0) + transitions = [] + st_0._set_transitionSet(transitions) + return fac.Automaton(states, counters, False, containing_state=None) +T_UtiliseUserAssD._Automaton = _BuildAutomaton_9() + + +DefinitionDsFactDsOper._setSubstitutionGroup(step_Essai) + +DefinitionDsFactDsProc._setSubstitutionGroup(step_Essai) + +DefinitionDsSimpDsOper._setSubstitutionGroup(step_Essai) + +DefinitionDsSimpDsProc._setSubstitutionGroup(step_Essai) + +DefinitionDsSimpListe._setSubstitutionGroup(step_Essai) + +UtiliseEtDefinitDsLeMemeProc._setSubstitutionGroup(step_Essai) + +UtiliseUserAssD._setSubstitutionGroup(step_Essai) diff --git a/CatasDeTests/raw/cata_UserAssd_driver.py b/CatasDeTests/raw/cata_UserAssd_driver.py new file mode 100644 index 00000000..f9a8fbbf --- /dev/null +++ b/CatasDeTests/raw/cata_UserAssd_driver.py @@ -0,0 +1,937 @@ +# ./raw/cata_UserAssd_driver.py +# -*- coding: utf-8 -*- +# PyXB bindings for NM:9c3bd166183fcfc95687f415bcc4a066eb33ac79 +# Generated 2020-10-19 16:07:37.824784 by PyXB version 1.2.5 using Python 3.4.2.final.0 +# Namespace http://chercheurs.edf.com/logiciels/Essai + +from __future__ import unicode_literals +import pyxb +import pyxb.binding +import pyxb.binding.saxer +import io +import pyxb.utils.utility +import pyxb.utils.domutils +import sys +import pyxb.utils.six as _six +# Unique identifier for bindings created at the same time +_GenerationUID = pyxb.utils.utility.UniqueIdentifier('urn:uuid:7181a702-1214-11eb-a804-cc3d82d871d8') + +# Version of PyXB used to generate the bindings +_PyXBVersion = '1.2.5' +# Generated bindings are not compatible across PyXB versions +if pyxb.__version__ != _PyXBVersion: + raise pyxb.PyXBVersionError(_PyXBVersion) + +# A holder for module-level binding classes so we can access them from +# inside class definitions where property names may conflict. +_module_typeBindings = pyxb.utils.utility.Object() + +# Import bindings for namespaces imported into schema +import pyxb.binding.datatypes + +# NOTE: All namespace declarations are reserved within the binding +Namespace = pyxb.namespace.NamespaceForURI('http://chercheurs.edf.com/logiciels/Essai', create_if_missing=True) +Namespace.configureCategories(['typeBinding', 'elementBinding']) + +def CreateFromDocument (xml_text, default_namespace=None, location_base=None): + """Parse the given XML and use the document element to create a + Python instance. + + @param xml_text An XML document. This should be data (Python 2 + str or Python 3 bytes), or a text (Python 2 unicode or Python 3 + str) in the L{pyxb._InputEncoding} encoding. + + @keyword default_namespace The L{pyxb.Namespace} instance to use as the + default namespace where there is no default namespace in scope. + If unspecified or C{None}, the namespace of the module containing + this function will be used. + + @keyword location_base: An object to be recorded as the base of all + L{pyxb.utils.utility.Location} instances associated with events and + objects handled by the parser. You might pass the URI from which + the document was obtained. + """ + + if pyxb.XMLStyle_saxer != pyxb._XMLStyle: + dom = pyxb.utils.domutils.StringToDOM(xml_text) + return CreateFromDOM(dom.documentElement, default_namespace=default_namespace) + if default_namespace is None: + default_namespace = Namespace.fallbackNamespace() + saxer = pyxb.binding.saxer.make_parser(fallback_namespace=default_namespace, location_base=location_base) + handler = saxer.getContentHandler() + xmld = xml_text + if isinstance(xmld, _six.text_type): + xmld = xmld.encode(pyxb._InputEncoding) + saxer.parse(io.BytesIO(xmld)) + instance = handler.rootObject() + return instance + +def CreateFromDOM (node, default_namespace=None): + """Create a Python instance from the given DOM node. + The node tag must correspond to an element declaration in this module. + + @deprecated: Forcing use of DOM interface is unnecessary; use L{CreateFromDocument}.""" + if default_namespace is None: + default_namespace = Namespace.fallbackNamespace() + return pyxb.binding.basis.element.AnyCreateFromDOM(node, default_namespace) + + +# Atomic simple type: {http://chercheurs.edf.com/logiciels/Essai}AccasUserAssd +class AccasUserAssd (pyxb.binding.datatypes.string): + + """An atomic simple type.""" + + _ExpandedName = pyxb.namespace.ExpandedName(Namespace, 'AccasUserAssd') + _XSDLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd.xsd', 7, 1) + _Documentation = None +AccasUserAssd._InitializeFacetMap() +Namespace.addCategoryObject('typeBinding', 'AccasUserAssd', AccasUserAssd) +_module_typeBindings.AccasUserAssd = AccasUserAssd + +# Atomic simple type: {http://chercheurs.edf.com/logiciels/Essai}PNEFdico_Essai +class PNEFdico_Essai (pyxb.binding.datatypes.string): + + """{'T_creeUserAssd': {'_creeUserAssd_DefinitionDsSimpDsOper': 'T_creeUserAssd_2', '_creeUserAssd_DefinitionDsSimpListe': 'T_creeUserAssd_4'}} + """ + + _ExpandedName = pyxb.namespace.ExpandedName(Namespace, 'PNEFdico_Essai') + _XSDLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd.xsd', 154, 1) + _Documentation = "{'T_creeUserAssd': {'_creeUserAssd_DefinitionDsSimpDsOper': 'T_creeUserAssd_2', '_creeUserAssd_DefinitionDsSimpListe': 'T_creeUserAssd_4'}}\n\t\t" +PNEFdico_Essai._InitializeFacetMap() +Namespace.addCategoryObject('typeBinding', 'PNEFdico_Essai', PNEFdico_Essai) +_module_typeBindings.PNEFdico_Essai = PNEFdico_Essai + +# Atomic simple type: {http://chercheurs.edf.com/logiciels/Essai}laClasseUser_C +class laClasseUser_C (AccasUserAssd): + + """An atomic simple type.""" + + _ExpandedName = pyxb.namespace.ExpandedName(Namespace, 'laClasseUser_C') + _XSDLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd.xsd', 11, 1) + _Documentation = None +laClasseUser_C._InitializeFacetMap() +Namespace.addCategoryObject('typeBinding', 'laClasseUser_C', laClasseUser_C) +_module_typeBindings.laClasseUser_C = laClasseUser_C + +# Atomic simple type: {http://chercheurs.edf.com/logiciels/Essai}laClasseUserDerive_C +class laClasseUserDerive_C (AccasUserAssd): + + """An atomic simple type.""" + + _ExpandedName = pyxb.namespace.ExpandedName(Namespace, 'laClasseUserDerive_C') + _XSDLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd.xsd', 19, 1) + _Documentation = None +laClasseUserDerive_C._InitializeFacetMap() +Namespace.addCategoryObject('typeBinding', 'laClasseUserDerive_C', laClasseUserDerive_C) +_module_typeBindings.laClasseUserDerive_C = laClasseUserDerive_C + +# Atomic simple type: {http://chercheurs.edf.com/logiciels/Essai}laClasseUser_U +class laClasseUser_U (AccasUserAssd): + + """An atomic simple type.""" + + _ExpandedName = pyxb.namespace.ExpandedName(Namespace, 'laClasseUser_U') + _XSDLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd.xsd', 39, 1) + _Documentation = None +laClasseUser_U._InitializeFacetMap() +Namespace.addCategoryObject('typeBinding', 'laClasseUser_U', laClasseUser_U) +_module_typeBindings.laClasseUser_U = laClasseUser_U + +# Atomic simple type: {http://chercheurs.edf.com/logiciels/Essai}T_creeUserAssd +class T_creeUserAssd (laClasseUser_C): + + """An atomic simple type.""" + + _ExpandedName = pyxb.namespace.ExpandedName(Namespace, 'T_creeUserAssd') + _XSDLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd.xsd', 15, 1) + _Documentation = None +T_creeUserAssd._InitializeFacetMap() +Namespace.addCategoryObject('typeBinding', 'T_creeUserAssd', T_creeUserAssd) +_module_typeBindings.T_creeUserAssd = T_creeUserAssd + +# Atomic simple type: {http://chercheurs.edf.com/logiciels/Essai}T_creeUserAssd_2 +class T_creeUserAssd_2 (laClasseUserDerive_C): + + """An atomic simple type.""" + + _ExpandedName = pyxb.namespace.ExpandedName(Namespace, 'T_creeUserAssd_2') + _XSDLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd.xsd', 23, 1) + _Documentation = None +T_creeUserAssd_2._InitializeFacetMap() +Namespace.addCategoryObject('typeBinding', 'T_creeUserAssd_2', T_creeUserAssd_2) +_module_typeBindings.T_creeUserAssd_2 = T_creeUserAssd_2 + +# Atomic simple type: [anonymous] +class STD_ANON (laClasseUser_C): + + """An atomic simple type.""" + + _ExpandedName = None + _XSDLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd.xsd', 31, 5) + _Documentation = None +STD_ANON._InitializeFacetMap() +_module_typeBindings.STD_ANON = STD_ANON + +# Atomic simple type: [anonymous] +class STD_ANON_ (laClasseUser_U): + + """An atomic simple type.""" + + _ExpandedName = None + _XSDLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd.xsd', 47, 5) + _Documentation = None +STD_ANON_._InitializeFacetMap() +_module_typeBindings.STD_ANON_ = STD_ANON_ + +# Atomic simple type: {http://chercheurs.edf.com/logiciels/Essai}T_utiliseUnUserAssd +class T_utiliseUnUserAssd (laClasseUser_U): + + """An atomic simple type.""" + + _ExpandedName = pyxb.namespace.ExpandedName(Namespace, 'T_utiliseUnUserAssd') + _XSDLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd.xsd', 55, 1) + _Documentation = None +T_utiliseUnUserAssd._InitializeFacetMap() +Namespace.addCategoryObject('typeBinding', 'T_utiliseUnUserAssd', T_utiliseUnUserAssd) +_module_typeBindings.T_utiliseUnUserAssd = T_utiliseUnUserAssd + +# List simple type: [anonymous] +# superclasses pyxb.binding.datatypes.anySimpleType +class STD_ANON_2 (pyxb.binding.basis.STD_list): + + """Simple type that is a list of STD_ANON.""" + + _ExpandedName = None + _XSDLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd.xsd', 29, 3) + _Documentation = None + + _ItemType = STD_ANON +STD_ANON_2._InitializeFacetMap() +_module_typeBindings.STD_ANON_2 = STD_ANON_2 + +# List simple type: [anonymous] +# superclasses pyxb.binding.datatypes.anySimpleType +class STD_ANON_3 (pyxb.binding.basis.STD_list): + + """Simple type that is a list of STD_ANON_.""" + + _ExpandedName = None + _XSDLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd.xsd', 45, 3) + _Documentation = None + + _ItemType = STD_ANON_ +STD_ANON_3._InitializeFacetMap() +_module_typeBindings.STD_ANON_3 = STD_ANON_3 + +# List simple type: {http://chercheurs.edf.com/logiciels/Essai}T_creeUserAssd_4 +# superclasses STD_ANON_2 +class T_creeUserAssd_4 (pyxb.binding.basis.STD_list): + + """Simple type that is a list of STD_ANON.""" + + _ExpandedName = pyxb.namespace.ExpandedName(Namespace, 'T_creeUserAssd_4') + _XSDLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd.xsd', 27, 1) + _Documentation = None + + _ItemType = STD_ANON +T_creeUserAssd_4._InitializeFacetMap() +Namespace.addCategoryObject('typeBinding', 'T_creeUserAssd_4', T_creeUserAssd_4) +_module_typeBindings.T_creeUserAssd_4 = T_creeUserAssd_4 + +# List simple type: {http://chercheurs.edf.com/logiciels/Essai}T_utiliseUserAssd +# superclasses STD_ANON_3 +class T_utiliseUserAssd (pyxb.binding.basis.STD_list): + + """Simple type that is a list of STD_ANON_.""" + + _ExpandedName = pyxb.namespace.ExpandedName(Namespace, 'T_utiliseUserAssd') + _XSDLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd.xsd', 43, 1) + _Documentation = None + + _ItemType = STD_ANON_ +T_utiliseUserAssd._InitializeFacetMap() +Namespace.addCategoryObject('typeBinding', 'T_utiliseUserAssd', T_utiliseUserAssd) +_module_typeBindings.T_utiliseUserAssd = T_utiliseUserAssd + +# Complex type {http://chercheurs.edf.com/logiciels/Essai}T_unFact1 with content type ELEMENT_ONLY +class T_unFact1 (pyxb.binding.basis.complexTypeDefinition): + """Complex type {http://chercheurs.edf.com/logiciels/Essai}T_unFact1 with content type ELEMENT_ONLY""" + _TypeDefinition = None + _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY + _Abstract = False + _ExpandedName = pyxb.namespace.ExpandedName(Namespace, 'T_unFact1') + _XSDLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd.xsd', 59, 1) + _ElementMap = {} + _AttributeMap = {} + # Base type is pyxb.binding.datatypes.anyType + + # Element {http://chercheurs.edf.com/logiciels/Essai}creeUserAssd uses Python identifier creeUserAssd + __creeUserAssd = pyxb.binding.content.ElementDeclaration(pyxb.namespace.ExpandedName(Namespace, 'creeUserAssd'), 'creeUserAssd', '__httpchercheurs_edf_comlogicielsEssai_T_unFact1_httpchercheurs_edf_comlogicielsEssaicreeUserAssd', False, pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd.xsd', 61, 3), ) + + + creeUserAssd = property(__creeUserAssd.value, __creeUserAssd.set, None, None) + + _ElementMap.update({ + __creeUserAssd.name() : __creeUserAssd + }) + _AttributeMap.update({ + + }) +_module_typeBindings.T_unFact1 = T_unFact1 +Namespace.addCategoryObject('typeBinding', 'T_unFact1', T_unFact1) + + +# Complex type {http://chercheurs.edf.com/logiciels/Essai}T_unFact with content type ELEMENT_ONLY +class T_unFact (pyxb.binding.basis.complexTypeDefinition): + """Complex type {http://chercheurs.edf.com/logiciels/Essai}T_unFact with content type ELEMENT_ONLY""" + _TypeDefinition = None + _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY + _Abstract = False + _ExpandedName = pyxb.namespace.ExpandedName(Namespace, 'T_unFact') + _XSDLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd.xsd', 76, 1) + _ElementMap = {} + _AttributeMap = {} + # Base type is pyxb.binding.datatypes.anyType + + # Element {http://chercheurs.edf.com/logiciels/Essai}creeUserAssd uses Python identifier creeUserAssd + __creeUserAssd = pyxb.binding.content.ElementDeclaration(pyxb.namespace.ExpandedName(Namespace, 'creeUserAssd'), 'creeUserAssd', '__httpchercheurs_edf_comlogicielsEssai_T_unFact_httpchercheurs_edf_comlogicielsEssaicreeUserAssd', False, pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd.xsd', 78, 3), ) + + + creeUserAssd = property(__creeUserAssd.value, __creeUserAssd.set, None, None) + + _ElementMap.update({ + __creeUserAssd.name() : __creeUserAssd + }) + _AttributeMap.update({ + + }) +_module_typeBindings.T_unFact = T_unFact +Namespace.addCategoryObject('typeBinding', 'T_unFact', T_unFact) + + +# Complex type {http://chercheurs.edf.com/logiciels/Essai}T_step_Essai with content type EMPTY +class T_step_Essai (pyxb.binding.basis.complexTypeDefinition): + """Complex type {http://chercheurs.edf.com/logiciels/Essai}T_step_Essai with content type EMPTY""" + _TypeDefinition = None + _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_EMPTY + _Abstract = True + _ExpandedName = pyxb.namespace.ExpandedName(Namespace, 'T_step_Essai') + _XSDLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd.xsd', 146, 1) + _ElementMap = {} + _AttributeMap = {} + # Base type is pyxb.binding.datatypes.anyType + _ElementMap.update({ + + }) + _AttributeMap.update({ + + }) +_module_typeBindings.T_step_Essai = T_step_Essai +Namespace.addCategoryObject('typeBinding', 'T_step_Essai', T_step_Essai) + + +# Complex type {http://chercheurs.edf.com/logiciels/Essai}T_Essai with content type ELEMENT_ONLY +class T_Essai (pyxb.binding.basis.complexTypeDefinition): + """Complex type {http://chercheurs.edf.com/logiciels/Essai}T_Essai with content type ELEMENT_ONLY""" + _TypeDefinition = None + _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY + _Abstract = False + _ExpandedName = pyxb.namespace.ExpandedName(Namespace, 'T_Essai') + _XSDLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd.xsd', 149, 2) + _ElementMap = {} + _AttributeMap = {} + # Base type is pyxb.binding.datatypes.anyType + + # Element {http://chercheurs.edf.com/logiciels/Essai}step_Essai uses Python identifier step_Essai + __step_Essai = pyxb.binding.content.ElementDeclaration(pyxb.namespace.ExpandedName(Namespace, 'step_Essai'), 'step_Essai', '__httpchercheurs_edf_comlogicielsEssai_T_Essai_httpchercheurs_edf_comlogicielsEssaistep_Essai', True, pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd.xsd', 147, 1), ) + + + step_Essai = property(__step_Essai.value, __step_Essai.set, None, None) + + _ElementMap.update({ + __step_Essai.name() : __step_Essai + }) + _AttributeMap.update({ + + }) +_module_typeBindings.T_Essai = T_Essai +Namespace.addCategoryObject('typeBinding', 'T_Essai', T_Essai) + + +# Complex type {http://chercheurs.edf.com/logiciels/Essai}T_DefinitionDsFactDsOper with content type ELEMENT_ONLY +class T_DefinitionDsFactDsOper (T_step_Essai): + """Complex type {http://chercheurs.edf.com/logiciels/Essai}T_DefinitionDsFactDsOper with content type ELEMENT_ONLY""" + _TypeDefinition = None + _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY + _Abstract = False + _ExpandedName = pyxb.namespace.ExpandedName(Namespace, 'T_DefinitionDsFactDsOper') + _XSDLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd.xsd', 64, 1) + _ElementMap = T_step_Essai._ElementMap.copy() + _AttributeMap = T_step_Essai._AttributeMap.copy() + # Base type is T_step_Essai + + # Element {http://chercheurs.edf.com/logiciels/Essai}unFact1 uses Python identifier unFact1 + __unFact1 = pyxb.binding.content.ElementDeclaration(pyxb.namespace.ExpandedName(Namespace, 'unFact1'), 'unFact1', '__httpchercheurs_edf_comlogicielsEssai_T_DefinitionDsFactDsOper_httpchercheurs_edf_comlogicielsEssaiunFact1', True, pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd.xsd', 68, 3), ) + + + unFact1 = property(__unFact1.value, __unFact1.set, None, None) + + + # Attribute accasName uses Python identifier accasName + __accasName = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, 'accasName'), 'accasName', '__httpchercheurs_edf_comlogicielsEssai_T_DefinitionDsFactDsOper_accasName', pyxb.binding.datatypes.string) + __accasName._DeclarationLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd.xsd', 70, 2) + __accasName._UseLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd.xsd', 70, 2) + + accasName = property(__accasName.value, __accasName.set, None, None) + + + # Attribute accasType uses Python identifier accasType + __accasType = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, 'accasType'), 'accasType', '__httpchercheurs_edf_comlogicielsEssai_T_DefinitionDsFactDsOper_accasType', pyxb.binding.datatypes.string, fixed=True, unicode_default='ASSD') + __accasType._DeclarationLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd.xsd', 71, 2) + __accasType._UseLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd.xsd', 71, 2) + + accasType = property(__accasType.value, __accasType.set, None, None) + + + # Attribute typeUtilisateur uses Python identifier typeUtilisateur + __typeUtilisateur = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, 'typeUtilisateur'), 'typeUtilisateur', '__httpchercheurs_edf_comlogicielsEssai_T_DefinitionDsFactDsOper_typeUtilisateur', pyxb.binding.datatypes.string, fixed=True, unicode_default='lASSD') + __typeUtilisateur._DeclarationLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd.xsd', 72, 2) + __typeUtilisateur._UseLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd.xsd', 72, 2) + + typeUtilisateur = property(__typeUtilisateur.value, __typeUtilisateur.set, None, None) + + _ElementMap.update({ + __unFact1.name() : __unFact1 + }) + _AttributeMap.update({ + __accasName.name() : __accasName, + __accasType.name() : __accasType, + __typeUtilisateur.name() : __typeUtilisateur + }) +_module_typeBindings.T_DefinitionDsFactDsOper = T_DefinitionDsFactDsOper +Namespace.addCategoryObject('typeBinding', 'T_DefinitionDsFactDsOper', T_DefinitionDsFactDsOper) + + +# Complex type {http://chercheurs.edf.com/logiciels/Essai}T_DefinitionDsFactDsProc with content type ELEMENT_ONLY +class T_DefinitionDsFactDsProc (T_step_Essai): + """Complex type {http://chercheurs.edf.com/logiciels/Essai}T_DefinitionDsFactDsProc with content type ELEMENT_ONLY""" + _TypeDefinition = None + _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY + _Abstract = False + _ExpandedName = pyxb.namespace.ExpandedName(Namespace, 'T_DefinitionDsFactDsProc') + _XSDLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd.xsd', 81, 1) + _ElementMap = T_step_Essai._ElementMap.copy() + _AttributeMap = T_step_Essai._AttributeMap.copy() + # Base type is T_step_Essai + + # Element {http://chercheurs.edf.com/logiciels/Essai}unFact uses Python identifier unFact + __unFact = pyxb.binding.content.ElementDeclaration(pyxb.namespace.ExpandedName(Namespace, 'unFact'), 'unFact', '__httpchercheurs_edf_comlogicielsEssai_T_DefinitionDsFactDsProc_httpchercheurs_edf_comlogicielsEssaiunFact', False, pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd.xsd', 85, 3), ) + + + unFact = property(__unFact.value, __unFact.set, None, None) + + _ElementMap.update({ + __unFact.name() : __unFact + }) + _AttributeMap.update({ + + }) +_module_typeBindings.T_DefinitionDsFactDsProc = T_DefinitionDsFactDsProc +Namespace.addCategoryObject('typeBinding', 'T_DefinitionDsFactDsProc', T_DefinitionDsFactDsProc) + + +# Complex type {http://chercheurs.edf.com/logiciels/Essai}T_DefinitionDsSimpDsOper with content type ELEMENT_ONLY +class T_DefinitionDsSimpDsOper (T_step_Essai): + """Complex type {http://chercheurs.edf.com/logiciels/Essai}T_DefinitionDsSimpDsOper with content type ELEMENT_ONLY""" + _TypeDefinition = None + _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY + _Abstract = False + _ExpandedName = pyxb.namespace.ExpandedName(Namespace, 'T_DefinitionDsSimpDsOper') + _XSDLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd.xsd', 90, 1) + _ElementMap = T_step_Essai._ElementMap.copy() + _AttributeMap = T_step_Essai._AttributeMap.copy() + # Base type is T_step_Essai + + # Element {http://chercheurs.edf.com/logiciels/Essai}creeUserAssd uses Python identifier creeUserAssd + __creeUserAssd = pyxb.binding.content.ElementDeclaration(pyxb.namespace.ExpandedName(Namespace, 'creeUserAssd'), 'creeUserAssd', '__httpchercheurs_edf_comlogicielsEssai_T_DefinitionDsSimpDsOper_httpchercheurs_edf_comlogicielsEssaicreeUserAssd', False, pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd.xsd', 94, 3), ) + + + creeUserAssd = property(__creeUserAssd.value, __creeUserAssd.set, None, None) + + + # Attribute accasName uses Python identifier accasName + __accasName = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, 'accasName'), 'accasName', '__httpchercheurs_edf_comlogicielsEssai_T_DefinitionDsSimpDsOper_accasName', pyxb.binding.datatypes.string) + __accasName._DeclarationLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd.xsd', 96, 2) + __accasName._UseLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd.xsd', 96, 2) + + accasName = property(__accasName.value, __accasName.set, None, None) + + + # Attribute accasType uses Python identifier accasType + __accasType = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, 'accasType'), 'accasType', '__httpchercheurs_edf_comlogicielsEssai_T_DefinitionDsSimpDsOper_accasType', pyxb.binding.datatypes.string, fixed=True, unicode_default='ASSD') + __accasType._DeclarationLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd.xsd', 97, 2) + __accasType._UseLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd.xsd', 97, 2) + + accasType = property(__accasType.value, __accasType.set, None, None) + + + # Attribute typeUtilisateur uses Python identifier typeUtilisateur + __typeUtilisateur = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, 'typeUtilisateur'), 'typeUtilisateur', '__httpchercheurs_edf_comlogicielsEssai_T_DefinitionDsSimpDsOper_typeUtilisateur', pyxb.binding.datatypes.string, fixed=True, unicode_default='lASSD') + __typeUtilisateur._DeclarationLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd.xsd', 98, 2) + __typeUtilisateur._UseLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd.xsd', 98, 2) + + typeUtilisateur = property(__typeUtilisateur.value, __typeUtilisateur.set, None, None) + + _ElementMap.update({ + __creeUserAssd.name() : __creeUserAssd + }) + _AttributeMap.update({ + __accasName.name() : __accasName, + __accasType.name() : __accasType, + __typeUtilisateur.name() : __typeUtilisateur + }) +_module_typeBindings.T_DefinitionDsSimpDsOper = T_DefinitionDsSimpDsOper +Namespace.addCategoryObject('typeBinding', 'T_DefinitionDsSimpDsOper', T_DefinitionDsSimpDsOper) + + +# Complex type {http://chercheurs.edf.com/logiciels/Essai}T_DefinitionDsSimpDsProc with content type ELEMENT_ONLY +class T_DefinitionDsSimpDsProc (T_step_Essai): + """Complex type {http://chercheurs.edf.com/logiciels/Essai}T_DefinitionDsSimpDsProc with content type ELEMENT_ONLY""" + _TypeDefinition = None + _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY + _Abstract = False + _ExpandedName = pyxb.namespace.ExpandedName(Namespace, 'T_DefinitionDsSimpDsProc') + _XSDLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd.xsd', 102, 1) + _ElementMap = T_step_Essai._ElementMap.copy() + _AttributeMap = T_step_Essai._AttributeMap.copy() + # Base type is T_step_Essai + + # Element {http://chercheurs.edf.com/logiciels/Essai}creeUserAssd uses Python identifier creeUserAssd + __creeUserAssd = pyxb.binding.content.ElementDeclaration(pyxb.namespace.ExpandedName(Namespace, 'creeUserAssd'), 'creeUserAssd', '__httpchercheurs_edf_comlogicielsEssai_T_DefinitionDsSimpDsProc_httpchercheurs_edf_comlogicielsEssaicreeUserAssd', False, pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd.xsd', 106, 3), ) + + + creeUserAssd = property(__creeUserAssd.value, __creeUserAssd.set, None, None) + + _ElementMap.update({ + __creeUserAssd.name() : __creeUserAssd + }) + _AttributeMap.update({ + + }) +_module_typeBindings.T_DefinitionDsSimpDsProc = T_DefinitionDsSimpDsProc +Namespace.addCategoryObject('typeBinding', 'T_DefinitionDsSimpDsProc', T_DefinitionDsSimpDsProc) + + +# Complex type {http://chercheurs.edf.com/logiciels/Essai}T_DefinitionDsSimpListe with content type ELEMENT_ONLY +class T_DefinitionDsSimpListe (T_step_Essai): + """Complex type {http://chercheurs.edf.com/logiciels/Essai}T_DefinitionDsSimpListe with content type ELEMENT_ONLY""" + _TypeDefinition = None + _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY + _Abstract = False + _ExpandedName = pyxb.namespace.ExpandedName(Namespace, 'T_DefinitionDsSimpListe') + _XSDLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd.xsd', 111, 1) + _ElementMap = T_step_Essai._ElementMap.copy() + _AttributeMap = T_step_Essai._AttributeMap.copy() + # Base type is T_step_Essai + + # Element {http://chercheurs.edf.com/logiciels/Essai}creeUserAssd uses Python identifier creeUserAssd + __creeUserAssd = pyxb.binding.content.ElementDeclaration(pyxb.namespace.ExpandedName(Namespace, 'creeUserAssd'), 'creeUserAssd', '__httpchercheurs_edf_comlogicielsEssai_T_DefinitionDsSimpListe_httpchercheurs_edf_comlogicielsEssaicreeUserAssd', False, pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd.xsd', 115, 3), ) + + + creeUserAssd = property(__creeUserAssd.value, __creeUserAssd.set, None, None) + + _ElementMap.update({ + __creeUserAssd.name() : __creeUserAssd + }) + _AttributeMap.update({ + + }) +_module_typeBindings.T_DefinitionDsSimpListe = T_DefinitionDsSimpListe +Namespace.addCategoryObject('typeBinding', 'T_DefinitionDsSimpListe', T_DefinitionDsSimpListe) + + +# Complex type {http://chercheurs.edf.com/logiciels/Essai}T_UtiliseEtDefinitDsLeMemeProc with content type ELEMENT_ONLY +class T_UtiliseEtDefinitDsLeMemeProc (T_step_Essai): + """Complex type {http://chercheurs.edf.com/logiciels/Essai}T_UtiliseEtDefinitDsLeMemeProc with content type ELEMENT_ONLY""" + _TypeDefinition = None + _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY + _Abstract = False + _ExpandedName = pyxb.namespace.ExpandedName(Namespace, 'T_UtiliseEtDefinitDsLeMemeProc') + _XSDLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd.xsd', 120, 1) + _ElementMap = T_step_Essai._ElementMap.copy() + _AttributeMap = T_step_Essai._AttributeMap.copy() + # Base type is T_step_Essai + + # Element {http://chercheurs.edf.com/logiciels/Essai}utiliseUserAssd uses Python identifier utiliseUserAssd + __utiliseUserAssd = pyxb.binding.content.ElementDeclaration(pyxb.namespace.ExpandedName(Namespace, 'utiliseUserAssd'), 'utiliseUserAssd', '__httpchercheurs_edf_comlogicielsEssai_T_UtiliseEtDefinitDsLeMemeProc_httpchercheurs_edf_comlogicielsEssaiutiliseUserAssd', False, pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd.xsd', 124, 3), ) + + + utiliseUserAssd = property(__utiliseUserAssd.value, __utiliseUserAssd.set, None, None) + + + # Element {http://chercheurs.edf.com/logiciels/Essai}creeUserAssd uses Python identifier creeUserAssd + __creeUserAssd = pyxb.binding.content.ElementDeclaration(pyxb.namespace.ExpandedName(Namespace, 'creeUserAssd'), 'creeUserAssd', '__httpchercheurs_edf_comlogicielsEssai_T_UtiliseEtDefinitDsLeMemeProc_httpchercheurs_edf_comlogicielsEssaicreeUserAssd', False, pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd.xsd', 125, 3), ) + + + creeUserAssd = property(__creeUserAssd.value, __creeUserAssd.set, None, None) + + _ElementMap.update({ + __utiliseUserAssd.name() : __utiliseUserAssd, + __creeUserAssd.name() : __creeUserAssd + }) + _AttributeMap.update({ + + }) +_module_typeBindings.T_UtiliseEtDefinitDsLeMemeProc = T_UtiliseEtDefinitDsLeMemeProc +Namespace.addCategoryObject('typeBinding', 'T_UtiliseEtDefinitDsLeMemeProc', T_UtiliseEtDefinitDsLeMemeProc) + + +# Complex type {http://chercheurs.edf.com/logiciels/Essai}T_UtiliseUnUserAssD with content type ELEMENT_ONLY +class T_UtiliseUnUserAssD (T_step_Essai): + """Complex type {http://chercheurs.edf.com/logiciels/Essai}T_UtiliseUnUserAssD with content type ELEMENT_ONLY""" + _TypeDefinition = None + _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY + _Abstract = False + _ExpandedName = pyxb.namespace.ExpandedName(Namespace, 'T_UtiliseUnUserAssD') + _XSDLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd.xsd', 130, 1) + _ElementMap = T_step_Essai._ElementMap.copy() + _AttributeMap = T_step_Essai._AttributeMap.copy() + # Base type is T_step_Essai + + # Element {http://chercheurs.edf.com/logiciels/Essai}utiliseUnUserAssd uses Python identifier utiliseUnUserAssd + __utiliseUnUserAssd = pyxb.binding.content.ElementDeclaration(pyxb.namespace.ExpandedName(Namespace, 'utiliseUnUserAssd'), 'utiliseUnUserAssd', '__httpchercheurs_edf_comlogicielsEssai_T_UtiliseUnUserAssD_httpchercheurs_edf_comlogicielsEssaiutiliseUnUserAssd', False, pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd.xsd', 134, 3), ) + + + utiliseUnUserAssd = property(__utiliseUnUserAssd.value, __utiliseUnUserAssd.set, None, None) + + _ElementMap.update({ + __utiliseUnUserAssd.name() : __utiliseUnUserAssd + }) + _AttributeMap.update({ + + }) +_module_typeBindings.T_UtiliseUnUserAssD = T_UtiliseUnUserAssD +Namespace.addCategoryObject('typeBinding', 'T_UtiliseUnUserAssD', T_UtiliseUnUserAssD) + + +step_Essai = pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, 'step_Essai'), T_step_Essai, location=pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd.xsd', 147, 1)) +Namespace.addCategoryObject('elementBinding', step_Essai.name().localName(), step_Essai) + +Essai = pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, 'Essai'), T_Essai, location=pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd.xsd', 148, 1)) +Namespace.addCategoryObject('elementBinding', Essai.name().localName(), Essai) + +DefinitionDsFactDsOper = pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, 'DefinitionDsFactDsOper'), T_DefinitionDsFactDsOper, location=pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd.xsd', 139, 1)) +Namespace.addCategoryObject('elementBinding', DefinitionDsFactDsOper.name().localName(), DefinitionDsFactDsOper) + +DefinitionDsFactDsProc = pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, 'DefinitionDsFactDsProc'), T_DefinitionDsFactDsProc, location=pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd.xsd', 140, 1)) +Namespace.addCategoryObject('elementBinding', DefinitionDsFactDsProc.name().localName(), DefinitionDsFactDsProc) + +DefinitionDsSimpDsOper = pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, 'DefinitionDsSimpDsOper'), T_DefinitionDsSimpDsOper, location=pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd.xsd', 141, 1)) +Namespace.addCategoryObject('elementBinding', DefinitionDsSimpDsOper.name().localName(), DefinitionDsSimpDsOper) + +DefinitionDsSimpDsProc = pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, 'DefinitionDsSimpDsProc'), T_DefinitionDsSimpDsProc, location=pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd.xsd', 142, 1)) +Namespace.addCategoryObject('elementBinding', DefinitionDsSimpDsProc.name().localName(), DefinitionDsSimpDsProc) + +DefinitionDsSimpListe = pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, 'DefinitionDsSimpListe'), T_DefinitionDsSimpListe, location=pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd.xsd', 143, 1)) +Namespace.addCategoryObject('elementBinding', DefinitionDsSimpListe.name().localName(), DefinitionDsSimpListe) + +UtiliseEtDefinitDsLeMemeProc = pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, 'UtiliseEtDefinitDsLeMemeProc'), T_UtiliseEtDefinitDsLeMemeProc, location=pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd.xsd', 144, 1)) +Namespace.addCategoryObject('elementBinding', UtiliseEtDefinitDsLeMemeProc.name().localName(), UtiliseEtDefinitDsLeMemeProc) + +UtiliseUnUserAssD = pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, 'UtiliseUnUserAssD'), T_UtiliseUnUserAssD, location=pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd.xsd', 145, 1)) +Namespace.addCategoryObject('elementBinding', UtiliseUnUserAssD.name().localName(), UtiliseUnUserAssD) + + + +T_unFact1._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, 'creeUserAssd'), T_creeUserAssd, scope=T_unFact1, location=pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd.xsd', 61, 3))) + +def _BuildAutomaton (): + # Remove this helper function from the namespace after it is invoked + global _BuildAutomaton + del _BuildAutomaton + import pyxb.utils.fac as fac + + counters = set() + cc_0 = fac.CounterCondition(min=0, max=1, metadata=pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd.xsd', 61, 3)) + counters.add(cc_0) + states = [] + final_update = set() + final_update.add(fac.UpdateInstruction(cc_0, False)) + symbol = pyxb.binding.content.ElementUse(T_unFact1._UseForTag(pyxb.namespace.ExpandedName(Namespace, 'creeUserAssd')), pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd.xsd', 61, 3)) + st_0 = fac.State(symbol, is_initial=True, final_update=final_update, is_unordered_catenation=False) + states.append(st_0) + transitions = [] + transitions.append(fac.Transition(st_0, [ + fac.UpdateInstruction(cc_0, True) ])) + st_0._set_transitionSet(transitions) + return fac.Automaton(states, counters, True, containing_state=None) +T_unFact1._Automaton = _BuildAutomaton() + + + + +T_unFact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, 'creeUserAssd'), T_creeUserAssd, scope=T_unFact, location=pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd.xsd', 78, 3))) + +def _BuildAutomaton_ (): + # Remove this helper function from the namespace after it is invoked + global _BuildAutomaton_ + del _BuildAutomaton_ + import pyxb.utils.fac as fac + + counters = set() + cc_0 = fac.CounterCondition(min=0, max=1, metadata=pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd.xsd', 78, 3)) + counters.add(cc_0) + states = [] + final_update = set() + final_update.add(fac.UpdateInstruction(cc_0, False)) + symbol = pyxb.binding.content.ElementUse(T_unFact._UseForTag(pyxb.namespace.ExpandedName(Namespace, 'creeUserAssd')), pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd.xsd', 78, 3)) + st_0 = fac.State(symbol, is_initial=True, final_update=final_update, is_unordered_catenation=False) + states.append(st_0) + transitions = [] + transitions.append(fac.Transition(st_0, [ + fac.UpdateInstruction(cc_0, True) ])) + st_0._set_transitionSet(transitions) + return fac.Automaton(states, counters, True, containing_state=None) +T_unFact._Automaton = _BuildAutomaton_() + + + + +T_Essai._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, 'step_Essai'), T_step_Essai, scope=T_Essai, location=pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd.xsd', 147, 1))) + +def _BuildAutomaton_2 (): + # Remove this helper function from the namespace after it is invoked + global _BuildAutomaton_2 + del _BuildAutomaton_2 + import pyxb.utils.fac as fac + + counters = set() + cc_0 = fac.CounterCondition(min=0, max=None, metadata=pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd.xsd', 150, 4)) + counters.add(cc_0) + cc_1 = fac.CounterCondition(min=0, max=1, metadata=pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd.xsd', 151, 3)) + counters.add(cc_1) + states = [] + final_update = set() + final_update.add(fac.UpdateInstruction(cc_0, False)) + final_update.add(fac.UpdateInstruction(cc_1, False)) + symbol = pyxb.binding.content.ElementUse(T_Essai._UseForTag(pyxb.namespace.ExpandedName(Namespace, 'step_Essai')), pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd.xsd', 151, 3)) + st_0 = fac.State(symbol, is_initial=True, final_update=final_update, is_unordered_catenation=False) + states.append(st_0) + transitions = [] + transitions.append(fac.Transition(st_0, [ + fac.UpdateInstruction(cc_0, True), + fac.UpdateInstruction(cc_1, False) ])) + transitions.append(fac.Transition(st_0, [ + fac.UpdateInstruction(cc_1, True) ])) + st_0._set_transitionSet(transitions) + return fac.Automaton(states, counters, True, containing_state=None) +T_Essai._Automaton = _BuildAutomaton_2() + + + + +T_DefinitionDsFactDsOper._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, 'unFact1'), T_unFact1, scope=T_DefinitionDsFactDsOper, location=pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd.xsd', 68, 3))) + +def _BuildAutomaton_3 (): + # Remove this helper function from the namespace after it is invoked + global _BuildAutomaton_3 + del _BuildAutomaton_3 + import pyxb.utils.fac as fac + + counters = set() + cc_0 = fac.CounterCondition(min=0, max=None, metadata=pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd.xsd', 68, 3)) + counters.add(cc_0) + states = [] + final_update = set() + final_update.add(fac.UpdateInstruction(cc_0, False)) + symbol = pyxb.binding.content.ElementUse(T_DefinitionDsFactDsOper._UseForTag(pyxb.namespace.ExpandedName(Namespace, 'unFact1')), pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd.xsd', 68, 3)) + st_0 = fac.State(symbol, is_initial=True, final_update=final_update, is_unordered_catenation=False) + states.append(st_0) + transitions = [] + transitions.append(fac.Transition(st_0, [ + fac.UpdateInstruction(cc_0, True) ])) + st_0._set_transitionSet(transitions) + return fac.Automaton(states, counters, True, containing_state=None) +T_DefinitionDsFactDsOper._Automaton = _BuildAutomaton_3() + + + + +T_DefinitionDsFactDsProc._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, 'unFact'), T_unFact, scope=T_DefinitionDsFactDsProc, location=pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd.xsd', 85, 3))) + +def _BuildAutomaton_4 (): + # Remove this helper function from the namespace after it is invoked + global _BuildAutomaton_4 + del _BuildAutomaton_4 + import pyxb.utils.fac as fac + + counters = set() + cc_0 = fac.CounterCondition(min=0, max=1, metadata=pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd.xsd', 85, 3)) + counters.add(cc_0) + states = [] + final_update = set() + final_update.add(fac.UpdateInstruction(cc_0, False)) + symbol = pyxb.binding.content.ElementUse(T_DefinitionDsFactDsProc._UseForTag(pyxb.namespace.ExpandedName(Namespace, 'unFact')), pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd.xsd', 85, 3)) + st_0 = fac.State(symbol, is_initial=True, final_update=final_update, is_unordered_catenation=False) + states.append(st_0) + transitions = [] + transitions.append(fac.Transition(st_0, [ + fac.UpdateInstruction(cc_0, True) ])) + st_0._set_transitionSet(transitions) + return fac.Automaton(states, counters, True, containing_state=None) +T_DefinitionDsFactDsProc._Automaton = _BuildAutomaton_4() + + + + +T_DefinitionDsSimpDsOper._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, 'creeUserAssd'), T_creeUserAssd_2, scope=T_DefinitionDsSimpDsOper, location=pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd.xsd', 94, 3))) + +def _BuildAutomaton_5 (): + # Remove this helper function from the namespace after it is invoked + global _BuildAutomaton_5 + del _BuildAutomaton_5 + import pyxb.utils.fac as fac + + counters = set() + cc_0 = fac.CounterCondition(min=0, max=1, metadata=pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd.xsd', 94, 3)) + counters.add(cc_0) + states = [] + final_update = set() + final_update.add(fac.UpdateInstruction(cc_0, False)) + symbol = pyxb.binding.content.ElementUse(T_DefinitionDsSimpDsOper._UseForTag(pyxb.namespace.ExpandedName(Namespace, 'creeUserAssd')), pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd.xsd', 94, 3)) + st_0 = fac.State(symbol, is_initial=True, final_update=final_update, is_unordered_catenation=False) + states.append(st_0) + transitions = [] + transitions.append(fac.Transition(st_0, [ + fac.UpdateInstruction(cc_0, True) ])) + st_0._set_transitionSet(transitions) + return fac.Automaton(states, counters, True, containing_state=None) +T_DefinitionDsSimpDsOper._Automaton = _BuildAutomaton_5() + + + + +T_DefinitionDsSimpDsProc._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, 'creeUserAssd'), T_creeUserAssd, scope=T_DefinitionDsSimpDsProc, location=pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd.xsd', 106, 3))) + +def _BuildAutomaton_6 (): + # Remove this helper function from the namespace after it is invoked + global _BuildAutomaton_6 + del _BuildAutomaton_6 + import pyxb.utils.fac as fac + + counters = set() + cc_0 = fac.CounterCondition(min=0, max=1, metadata=pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd.xsd', 106, 3)) + counters.add(cc_0) + states = [] + final_update = set() + final_update.add(fac.UpdateInstruction(cc_0, False)) + symbol = pyxb.binding.content.ElementUse(T_DefinitionDsSimpDsProc._UseForTag(pyxb.namespace.ExpandedName(Namespace, 'creeUserAssd')), pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd.xsd', 106, 3)) + st_0 = fac.State(symbol, is_initial=True, final_update=final_update, is_unordered_catenation=False) + states.append(st_0) + transitions = [] + transitions.append(fac.Transition(st_0, [ + fac.UpdateInstruction(cc_0, True) ])) + st_0._set_transitionSet(transitions) + return fac.Automaton(states, counters, True, containing_state=None) +T_DefinitionDsSimpDsProc._Automaton = _BuildAutomaton_6() + + + + +T_DefinitionDsSimpListe._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, 'creeUserAssd'), T_creeUserAssd_4, scope=T_DefinitionDsSimpListe, location=pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd.xsd', 115, 3))) + +def _BuildAutomaton_7 (): + # Remove this helper function from the namespace after it is invoked + global _BuildAutomaton_7 + del _BuildAutomaton_7 + import pyxb.utils.fac as fac + + counters = set() + cc_0 = fac.CounterCondition(min=0, max=1, metadata=pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd.xsd', 115, 3)) + counters.add(cc_0) + states = [] + final_update = set() + final_update.add(fac.UpdateInstruction(cc_0, False)) + symbol = pyxb.binding.content.ElementUse(T_DefinitionDsSimpListe._UseForTag(pyxb.namespace.ExpandedName(Namespace, 'creeUserAssd')), pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd.xsd', 115, 3)) + st_0 = fac.State(symbol, is_initial=True, final_update=final_update, is_unordered_catenation=False) + states.append(st_0) + transitions = [] + transitions.append(fac.Transition(st_0, [ + fac.UpdateInstruction(cc_0, True) ])) + st_0._set_transitionSet(transitions) + return fac.Automaton(states, counters, True, containing_state=None) +T_DefinitionDsSimpListe._Automaton = _BuildAutomaton_7() + + + + +T_UtiliseEtDefinitDsLeMemeProc._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, 'utiliseUserAssd'), T_utiliseUserAssd, scope=T_UtiliseEtDefinitDsLeMemeProc, location=pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd.xsd', 124, 3))) + +T_UtiliseEtDefinitDsLeMemeProc._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, 'creeUserAssd'), T_creeUserAssd, scope=T_UtiliseEtDefinitDsLeMemeProc, location=pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd.xsd', 125, 3))) + +def _BuildAutomaton_8 (): + # Remove this helper function from the namespace after it is invoked + global _BuildAutomaton_8 + del _BuildAutomaton_8 + import pyxb.utils.fac as fac + + counters = set() + cc_0 = fac.CounterCondition(min=0, max=1, metadata=pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd.xsd', 125, 3)) + counters.add(cc_0) + states = [] + final_update = set() + symbol = pyxb.binding.content.ElementUse(T_UtiliseEtDefinitDsLeMemeProc._UseForTag(pyxb.namespace.ExpandedName(Namespace, 'utiliseUserAssd')), pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd.xsd', 124, 3)) + st_0 = fac.State(symbol, is_initial=True, final_update=final_update, is_unordered_catenation=False) + states.append(st_0) + final_update = set() + final_update.add(fac.UpdateInstruction(cc_0, False)) + symbol = pyxb.binding.content.ElementUse(T_UtiliseEtDefinitDsLeMemeProc._UseForTag(pyxb.namespace.ExpandedName(Namespace, 'creeUserAssd')), pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd.xsd', 125, 3)) + st_1 = fac.State(symbol, is_initial=False, final_update=final_update, is_unordered_catenation=False) + states.append(st_1) + transitions = [] + transitions.append(fac.Transition(st_1, [ + ])) + st_0._set_transitionSet(transitions) + transitions = [] + transitions.append(fac.Transition(st_1, [ + fac.UpdateInstruction(cc_0, True) ])) + st_1._set_transitionSet(transitions) + return fac.Automaton(states, counters, False, containing_state=None) +T_UtiliseEtDefinitDsLeMemeProc._Automaton = _BuildAutomaton_8() + + + + +T_UtiliseUnUserAssD._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, 'utiliseUnUserAssd'), T_utiliseUnUserAssd, scope=T_UtiliseUnUserAssD, location=pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd.xsd', 134, 3))) + +def _BuildAutomaton_9 (): + # Remove this helper function from the namespace after it is invoked + global _BuildAutomaton_9 + del _BuildAutomaton_9 + import pyxb.utils.fac as fac + + counters = set() + states = [] + final_update = set() + symbol = pyxb.binding.content.ElementUse(T_UtiliseUnUserAssD._UseForTag(pyxb.namespace.ExpandedName(Namespace, 'utiliseUnUserAssd')), pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_UserAssd.xsd', 134, 3)) + st_0 = fac.State(symbol, is_initial=True, final_update=final_update, is_unordered_catenation=False) + states.append(st_0) + transitions = [] + st_0._set_transitionSet(transitions) + return fac.Automaton(states, counters, False, containing_state=None) +T_UtiliseUnUserAssD._Automaton = _BuildAutomaton_9() + + +DefinitionDsFactDsOper._setSubstitutionGroup(step_Essai) + +DefinitionDsFactDsProc._setSubstitutionGroup(step_Essai) + +DefinitionDsSimpDsOper._setSubstitutionGroup(step_Essai) + +DefinitionDsSimpDsProc._setSubstitutionGroup(step_Essai) + +DefinitionDsSimpListe._setSubstitutionGroup(step_Essai) + +UtiliseEtDefinitDsLeMemeProc._setSubstitutionGroup(step_Essai) + +UtiliseUnUserAssD._setSubstitutionGroup(step_Essai) diff --git a/CatasDeTests/raw/toto.py b/CatasDeTests/raw/toto.py new file mode 100644 index 00000000..24048f47 --- /dev/null +++ b/CatasDeTests/raw/toto.py @@ -0,0 +1,550 @@ +# ./raw/toto.py +# -*- coding: utf-8 -*- +# PyXB bindings for NM:6edffaeea9d56b1698d1f555fb81b70e6e147421 +# Generated 2020-10-19 15:46:37.580374 by PyXB version 1.2.5 using Python 3.4.2.final.0 +# Namespace http://chercheurs.edf.com/logiciels/Test1 + +from __future__ import unicode_literals +import pyxb +import pyxb.binding +import pyxb.binding.saxer +import io +import pyxb.utils.utility +import pyxb.utils.domutils +import sys +import pyxb.utils.six as _six +# Unique identifier for bindings created at the same time +_GenerationUID = pyxb.utils.utility.UniqueIdentifier('urn:uuid:8258bf5a-1211-11eb-875b-cc3d82d871d8') + +# Version of PyXB used to generate the bindings +_PyXBVersion = '1.2.5' +# Generated bindings are not compatible across PyXB versions +if pyxb.__version__ != _PyXBVersion: + raise pyxb.PyXBVersionError(_PyXBVersion) + +# A holder for module-level binding classes so we can access them from +# inside class definitions where property names may conflict. +_module_typeBindings = pyxb.utils.utility.Object() + +# Import bindings for namespaces imported into schema +import pyxb.binding.datatypes + +# NOTE: All namespace declarations are reserved within the binding +Namespace = pyxb.namespace.NamespaceForURI('http://chercheurs.edf.com/logiciels/Test1', create_if_missing=True) +Namespace.configureCategories(['typeBinding', 'elementBinding']) + +def CreateFromDocument (xml_text, default_namespace=None, location_base=None): + """Parse the given XML and use the document element to create a + Python instance. + + @param xml_text An XML document. This should be data (Python 2 + str or Python 3 bytes), or a text (Python 2 unicode or Python 3 + str) in the L{pyxb._InputEncoding} encoding. + + @keyword default_namespace The L{pyxb.Namespace} instance to use as the + default namespace where there is no default namespace in scope. + If unspecified or C{None}, the namespace of the module containing + this function will be used. + + @keyword location_base: An object to be recorded as the base of all + L{pyxb.utils.utility.Location} instances associated with events and + objects handled by the parser. You might pass the URI from which + the document was obtained. + """ + + if pyxb.XMLStyle_saxer != pyxb._XMLStyle: + dom = pyxb.utils.domutils.StringToDOM(xml_text) + return CreateFromDOM(dom.documentElement, default_namespace=default_namespace) + if default_namespace is None: + default_namespace = Namespace.fallbackNamespace() + saxer = pyxb.binding.saxer.make_parser(fallback_namespace=default_namespace, location_base=location_base) + handler = saxer.getContentHandler() + xmld = xml_text + if isinstance(xmld, _six.text_type): + xmld = xmld.encode(pyxb._InputEncoding) + saxer.parse(io.BytesIO(xmld)) + instance = handler.rootObject() + return instance + +def CreateFromDOM (node, default_namespace=None): + """Create a Python instance from the given DOM node. + The node tag must correspond to an element declaration in this module. + + @deprecated: Forcing use of DOM interface is unnecessary; use L{CreateFromDocument}.""" + if default_namespace is None: + default_namespace = Namespace.fallbackNamespace() + return pyxb.binding.basis.element.AnyCreateFromDOM(node, default_namespace) + + +# Atomic simple type: {http://chercheurs.edf.com/logiciels/Test1}AccasUserAssd +class AccasUserAssd (pyxb.binding.datatypes.string): + + """An atomic simple type.""" + + _ExpandedName = pyxb.namespace.ExpandedName(Namespace, 'AccasUserAssd') + _XSDLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_1.xsd', 7, 1) + _Documentation = None +AccasUserAssd._InitializeFacetMap() +Namespace.addCategoryObject('typeBinding', 'AccasUserAssd', AccasUserAssd) +_module_typeBindings.AccasUserAssd = AccasUserAssd + +# Atomic simple type: {http://chercheurs.edf.com/logiciels/Test1}T_dimension +class T_dimension (pyxb.binding.datatypes.int, pyxb.binding.basis.enumeration_mixin): + + """An atomic simple type.""" + + _ExpandedName = pyxb.namespace.ExpandedName(Namespace, 'T_dimension') + _XSDLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_1.xsd', 19, 1) + _Documentation = None +T_dimension._CF_enumeration = pyxb.binding.facets.CF_enumeration(value_datatype=T_dimension, enum_prefix=None) +T_dimension._CF_enumeration.addEnumeration(unicode_value='1', tag=None) +T_dimension._CF_enumeration.addEnumeration(unicode_value='2', tag=None) +T_dimension._CF_enumeration.addEnumeration(unicode_value='3', tag=None) +T_dimension._InitializeFacetMap(T_dimension._CF_enumeration) +Namespace.addCategoryObject('typeBinding', 'T_dimension', T_dimension) +_module_typeBindings.T_dimension = T_dimension + +# Atomic simple type: [anonymous] +class STD_ANON (pyxb.binding.datatypes.int): + + """An atomic simple type.""" + + _ExpandedName = None + _XSDLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_1.xsd', 30, 5) + _Documentation = None +STD_ANON._InitializeFacetMap() +_module_typeBindings.STD_ANON = STD_ANON + +# Atomic simple type: {http://chercheurs.edf.com/logiciels/Test1}T_meshname_1 +class T_meshname_1 (pyxb.binding.datatypes.string): + + """An atomic simple type.""" + + _ExpandedName = pyxb.namespace.ExpandedName(Namespace, 'T_meshname_1') + _XSDLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_1.xsd', 38, 1) + _Documentation = None +T_meshname_1._InitializeFacetMap() +Namespace.addCategoryObject('typeBinding', 'T_meshname_1', T_meshname_1) +_module_typeBindings.T_meshname_1 = T_meshname_1 + +# Atomic simple type: {http://chercheurs.edf.com/logiciels/Test1}PNEFdico_Test1 +class PNEFdico_Test1 (pyxb.binding.datatypes.string): + + """{'T_meshname': {'_meshname_CreateMesh': 'T_meshname_1'}} + """ + + _ExpandedName = pyxb.namespace.ExpandedName(Namespace, 'PNEFdico_Test1') + _XSDLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_1.xsd', 80, 1) + _Documentation = "{'T_meshname': {'_meshname_CreateMesh': 'T_meshname_1'}}\n\t\t" +PNEFdico_Test1._InitializeFacetMap() +Namespace.addCategoryObject('typeBinding', 'PNEFdico_Test1', PNEFdico_Test1) +_module_typeBindings.PNEFdico_Test1 = PNEFdico_Test1 + +# Atomic simple type: {http://chercheurs.edf.com/logiciels/Test1}MeshU_C +class MeshU_C (AccasUserAssd): + + """An atomic simple type.""" + + _ExpandedName = pyxb.namespace.ExpandedName(Namespace, 'MeshU_C') + _XSDLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_1.xsd', 11, 1) + _Documentation = None +MeshU_C._InitializeFacetMap() +Namespace.addCategoryObject('typeBinding', 'MeshU_C', MeshU_C) +_module_typeBindings.MeshU_C = MeshU_C + +# List simple type: [anonymous] +# superclasses pyxb.binding.datatypes.anySimpleType +class STD_ANON_ (pyxb.binding.basis.STD_list): + + """Simple type that is a list of STD_ANON.""" + + _ExpandedName = None + _XSDLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_1.xsd', 28, 3) + _Documentation = None + + _ItemType = STD_ANON +STD_ANON_._InitializeFacetMap() +_module_typeBindings.STD_ANON_ = STD_ANON_ + +# Atomic simple type: {http://chercheurs.edf.com/logiciels/Test1}T_meshname +class T_meshname (MeshU_C): + + """An atomic simple type.""" + + _ExpandedName = pyxb.namespace.ExpandedName(Namespace, 'T_meshname') + _XSDLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_1.xsd', 15, 1) + _Documentation = None +T_meshname._InitializeFacetMap() +Namespace.addCategoryObject('typeBinding', 'T_meshname', T_meshname) +_module_typeBindings.T_meshname = T_meshname + +# List simple type: {http://chercheurs.edf.com/logiciels/Test1}T_listOfEntities +# superclasses STD_ANON_ +class T_listOfEntities (pyxb.binding.basis.STD_list): + + """Simple type that is a list of STD_ANON.""" + + _ExpandedName = pyxb.namespace.ExpandedName(Namespace, 'T_listOfEntities') + _XSDLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_1.xsd', 26, 1) + _Documentation = None + + _ItemType = STD_ANON +T_listOfEntities._InitializeFacetMap() +Namespace.addCategoryObject('typeBinding', 'T_listOfEntities', T_listOfEntities) +_module_typeBindings.T_listOfEntities = T_listOfEntities + +# Complex type {http://chercheurs.edf.com/logiciels/Test1}T_step_Test1 with content type EMPTY +class T_step_Test1 (pyxb.binding.basis.complexTypeDefinition): + """Complex type {http://chercheurs.edf.com/logiciels/Test1}T_step_Test1 with content type EMPTY""" + _TypeDefinition = None + _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_EMPTY + _Abstract = True + _ExpandedName = pyxb.namespace.ExpandedName(Namespace, 'T_step_Test1') + _XSDLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_1.xsd', 72, 1) + _ElementMap = {} + _AttributeMap = {} + # Base type is pyxb.binding.datatypes.anyType + _ElementMap.update({ + + }) + _AttributeMap.update({ + + }) +_module_typeBindings.T_step_Test1 = T_step_Test1 +Namespace.addCategoryObject('typeBinding', 'T_step_Test1', T_step_Test1) + + +# Complex type {http://chercheurs.edf.com/logiciels/Test1}T_Test1 with content type ELEMENT_ONLY +class T_Test1 (pyxb.binding.basis.complexTypeDefinition): + """Complex type {http://chercheurs.edf.com/logiciels/Test1}T_Test1 with content type ELEMENT_ONLY""" + _TypeDefinition = None + _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY + _Abstract = False + _ExpandedName = pyxb.namespace.ExpandedName(Namespace, 'T_Test1') + _XSDLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_1.xsd', 75, 2) + _ElementMap = {} + _AttributeMap = {} + # Base type is pyxb.binding.datatypes.anyType + + # Element {http://chercheurs.edf.com/logiciels/Test1}step_Test1 uses Python identifier step_Test1 + __step_Test1 = pyxb.binding.content.ElementDeclaration(pyxb.namespace.ExpandedName(Namespace, 'step_Test1'), 'step_Test1', '__httpchercheurs_edf_comlogicielsTest1_T_Test1_httpchercheurs_edf_comlogicielsTest1step_Test1', True, pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_1.xsd', 73, 1), ) + + + step_Test1 = property(__step_Test1.value, __step_Test1.set, None, None) + + _ElementMap.update({ + __step_Test1.name() : __step_Test1 + }) + _AttributeMap.update({ + + }) +_module_typeBindings.T_Test1 = T_Test1 +Namespace.addCategoryObject('typeBinding', 'T_Test1', T_Test1) + + +# Complex type {http://chercheurs.edf.com/logiciels/Test1}T_CreateBoth with content type ELEMENT_ONLY +class T_CreateBoth (T_step_Test1): + """Complex type {http://chercheurs.edf.com/logiciels/Test1}T_CreateBoth with content type ELEMENT_ONLY""" + _TypeDefinition = None + _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY + _Abstract = False + _ExpandedName = pyxb.namespace.ExpandedName(Namespace, 'T_CreateBoth') + _XSDLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_1.xsd', 42, 1) + _ElementMap = T_step_Test1._ElementMap.copy() + _AttributeMap = T_step_Test1._AttributeMap.copy() + # Base type is T_step_Test1 + + # Element {http://chercheurs.edf.com/logiciels/Test1}meshname uses Python identifier meshname + __meshname = pyxb.binding.content.ElementDeclaration(pyxb.namespace.ExpandedName(Namespace, 'meshname'), 'meshname', '__httpchercheurs_edf_comlogicielsTest1_T_CreateBoth_httpchercheurs_edf_comlogicielsTest1meshname', False, pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_1.xsd', 46, 3), ) + + + meshname = property(__meshname.value, __meshname.set, None, None) + + + # Element {http://chercheurs.edf.com/logiciels/Test1}dimension uses Python identifier dimension + __dimension = pyxb.binding.content.ElementDeclaration(pyxb.namespace.ExpandedName(Namespace, 'dimension'), 'dimension', '__httpchercheurs_edf_comlogicielsTest1_T_CreateBoth_httpchercheurs_edf_comlogicielsTest1dimension', False, pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_1.xsd', 47, 3), ) + + + dimension = property(__dimension.value, __dimension.set, None, None) + + + # Element {http://chercheurs.edf.com/logiciels/Test1}listOfEntities uses Python identifier listOfEntities + __listOfEntities = pyxb.binding.content.ElementDeclaration(pyxb.namespace.ExpandedName(Namespace, 'listOfEntities'), 'listOfEntities', '__httpchercheurs_edf_comlogicielsTest1_T_CreateBoth_httpchercheurs_edf_comlogicielsTest1listOfEntities', False, pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_1.xsd', 48, 3), ) + + + listOfEntities = property(__listOfEntities.value, __listOfEntities.set, None, None) + + + # Attribute accasName uses Python identifier accasName + __accasName = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, 'accasName'), 'accasName', '__httpchercheurs_edf_comlogicielsTest1_T_CreateBoth_accasName', pyxb.binding.datatypes.string) + __accasName._DeclarationLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_1.xsd', 50, 2) + __accasName._UseLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_1.xsd', 50, 2) + + accasName = property(__accasName.value, __accasName.set, None, None) + + + # Attribute accasType uses Python identifier accasType + __accasType = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, 'accasType'), 'accasType', '__httpchercheurs_edf_comlogicielsTest1_T_CreateBoth_accasType', pyxb.binding.datatypes.string, fixed=True, unicode_default='ASSD') + __accasType._DeclarationLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_1.xsd', 51, 2) + __accasType._UseLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_1.xsd', 51, 2) + + accasType = property(__accasType.value, __accasType.set, None, None) + + + # Attribute typeUtilisateur uses Python identifier typeUtilisateur + __typeUtilisateur = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, 'typeUtilisateur'), 'typeUtilisateur', '__httpchercheurs_edf_comlogicielsTest1_T_CreateBoth_typeUtilisateur', pyxb.binding.datatypes.string, fixed=True, unicode_default='Mesh') + __typeUtilisateur._DeclarationLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_1.xsd', 52, 2) + __typeUtilisateur._UseLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_1.xsd', 52, 2) + + typeUtilisateur = property(__typeUtilisateur.value, __typeUtilisateur.set, None, None) + + _ElementMap.update({ + __meshname.name() : __meshname, + __dimension.name() : __dimension, + __listOfEntities.name() : __listOfEntities + }) + _AttributeMap.update({ + __accasName.name() : __accasName, + __accasType.name() : __accasType, + __typeUtilisateur.name() : __typeUtilisateur + }) +_module_typeBindings.T_CreateBoth = T_CreateBoth +Namespace.addCategoryObject('typeBinding', 'T_CreateBoth', T_CreateBoth) + + +# Complex type {http://chercheurs.edf.com/logiciels/Test1}T_CreateMesh with content type ELEMENT_ONLY +class T_CreateMesh (T_step_Test1): + """Complex type {http://chercheurs.edf.com/logiciels/Test1}T_CreateMesh with content type ELEMENT_ONLY""" + _TypeDefinition = None + _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY + _Abstract = False + _ExpandedName = pyxb.namespace.ExpandedName(Namespace, 'T_CreateMesh') + _XSDLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_1.xsd', 56, 1) + _ElementMap = T_step_Test1._ElementMap.copy() + _AttributeMap = T_step_Test1._AttributeMap.copy() + # Base type is T_step_Test1 + + # Element {http://chercheurs.edf.com/logiciels/Test1}meshname uses Python identifier meshname + __meshname = pyxb.binding.content.ElementDeclaration(pyxb.namespace.ExpandedName(Namespace, 'meshname'), 'meshname', '__httpchercheurs_edf_comlogicielsTest1_T_CreateMesh_httpchercheurs_edf_comlogicielsTest1meshname', False, pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_1.xsd', 60, 3), ) + + + meshname = property(__meshname.value, __meshname.set, None, None) + + + # Element {http://chercheurs.edf.com/logiciels/Test1}dimension uses Python identifier dimension + __dimension = pyxb.binding.content.ElementDeclaration(pyxb.namespace.ExpandedName(Namespace, 'dimension'), 'dimension', '__httpchercheurs_edf_comlogicielsTest1_T_CreateMesh_httpchercheurs_edf_comlogicielsTest1dimension', False, pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_1.xsd', 61, 3), ) + + + dimension = property(__dimension.value, __dimension.set, None, None) + + + # Element {http://chercheurs.edf.com/logiciels/Test1}listOfEntities uses Python identifier listOfEntities + __listOfEntities = pyxb.binding.content.ElementDeclaration(pyxb.namespace.ExpandedName(Namespace, 'listOfEntities'), 'listOfEntities', '__httpchercheurs_edf_comlogicielsTest1_T_CreateMesh_httpchercheurs_edf_comlogicielsTest1listOfEntities', False, pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_1.xsd', 62, 3), ) + + + listOfEntities = property(__listOfEntities.value, __listOfEntities.set, None, None) + + + # Attribute accasName uses Python identifier accasName + __accasName = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, 'accasName'), 'accasName', '__httpchercheurs_edf_comlogicielsTest1_T_CreateMesh_accasName', pyxb.binding.datatypes.string) + __accasName._DeclarationLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_1.xsd', 64, 2) + __accasName._UseLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_1.xsd', 64, 2) + + accasName = property(__accasName.value, __accasName.set, None, None) + + + # Attribute accasType uses Python identifier accasType + __accasType = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, 'accasType'), 'accasType', '__httpchercheurs_edf_comlogicielsTest1_T_CreateMesh_accasType', pyxb.binding.datatypes.string, fixed=True, unicode_default='ASSD') + __accasType._DeclarationLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_1.xsd', 65, 2) + __accasType._UseLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_1.xsd', 65, 2) + + accasType = property(__accasType.value, __accasType.set, None, None) + + + # Attribute typeUtilisateur uses Python identifier typeUtilisateur + __typeUtilisateur = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, 'typeUtilisateur'), 'typeUtilisateur', '__httpchercheurs_edf_comlogicielsTest1_T_CreateMesh_typeUtilisateur', pyxb.binding.datatypes.string, fixed=True, unicode_default='Mesh') + __typeUtilisateur._DeclarationLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_1.xsd', 66, 2) + __typeUtilisateur._UseLocation = pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_1.xsd', 66, 2) + + typeUtilisateur = property(__typeUtilisateur.value, __typeUtilisateur.set, None, None) + + _ElementMap.update({ + __meshname.name() : __meshname, + __dimension.name() : __dimension, + __listOfEntities.name() : __listOfEntities + }) + _AttributeMap.update({ + __accasName.name() : __accasName, + __accasType.name() : __accasType, + __typeUtilisateur.name() : __typeUtilisateur + }) +_module_typeBindings.T_CreateMesh = T_CreateMesh +Namespace.addCategoryObject('typeBinding', 'T_CreateMesh', T_CreateMesh) + + +step_Test1 = pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, 'step_Test1'), T_step_Test1, location=pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_1.xsd', 73, 1)) +Namespace.addCategoryObject('elementBinding', step_Test1.name().localName(), step_Test1) + +Test1 = pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, 'Test1'), T_Test1, location=pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_1.xsd', 74, 1)) +Namespace.addCategoryObject('elementBinding', Test1.name().localName(), Test1) + +CreateBoth = pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, 'CreateBoth'), T_CreateBoth, location=pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_1.xsd', 70, 1)) +Namespace.addCategoryObject('elementBinding', CreateBoth.name().localName(), CreateBoth) + +CreateMesh = pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, 'CreateMesh'), T_CreateMesh, location=pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_1.xsd', 71, 1)) +Namespace.addCategoryObject('elementBinding', CreateMesh.name().localName(), CreateMesh) + + + +T_Test1._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, 'step_Test1'), T_step_Test1, scope=T_Test1, location=pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_1.xsd', 73, 1))) + +def _BuildAutomaton (): + # Remove this helper function from the namespace after it is invoked + global _BuildAutomaton + del _BuildAutomaton + import pyxb.utils.fac as fac + + counters = set() + cc_0 = fac.CounterCondition(min=0, max=None, metadata=pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_1.xsd', 76, 4)) + counters.add(cc_0) + cc_1 = fac.CounterCondition(min=0, max=1, metadata=pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_1.xsd', 77, 3)) + counters.add(cc_1) + states = [] + final_update = set() + final_update.add(fac.UpdateInstruction(cc_0, False)) + final_update.add(fac.UpdateInstruction(cc_1, False)) + symbol = pyxb.binding.content.ElementUse(T_Test1._UseForTag(pyxb.namespace.ExpandedName(Namespace, 'step_Test1')), pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_1.xsd', 77, 3)) + st_0 = fac.State(symbol, is_initial=True, final_update=final_update, is_unordered_catenation=False) + states.append(st_0) + transitions = [] + transitions.append(fac.Transition(st_0, [ + fac.UpdateInstruction(cc_0, True), + fac.UpdateInstruction(cc_1, False) ])) + transitions.append(fac.Transition(st_0, [ + fac.UpdateInstruction(cc_1, True) ])) + st_0._set_transitionSet(transitions) + return fac.Automaton(states, counters, True, containing_state=None) +T_Test1._Automaton = _BuildAutomaton() + + + + +T_CreateBoth._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, 'meshname'), T_meshname, scope=T_CreateBoth, location=pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_1.xsd', 46, 3))) + +T_CreateBoth._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, 'dimension'), T_dimension, scope=T_CreateBoth, location=pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_1.xsd', 47, 3))) + +T_CreateBoth._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, 'listOfEntities'), T_listOfEntities, scope=T_CreateBoth, location=pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_1.xsd', 48, 3))) + +def _BuildAutomaton_ (): + # Remove this helper function from the namespace after it is invoked + global _BuildAutomaton_ + del _BuildAutomaton_ + import pyxb.utils.fac as fac + + counters = set() + cc_0 = fac.CounterCondition(min=0, max=1, metadata=pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_1.xsd', 46, 3)) + counters.add(cc_0) + cc_1 = fac.CounterCondition(min=0, max=1, metadata=pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_1.xsd', 47, 3)) + counters.add(cc_1) + cc_2 = fac.CounterCondition(min=0, max=1, metadata=pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_1.xsd', 48, 3)) + counters.add(cc_2) + states = [] + final_update = set() + final_update.add(fac.UpdateInstruction(cc_0, False)) + symbol = pyxb.binding.content.ElementUse(T_CreateBoth._UseForTag(pyxb.namespace.ExpandedName(Namespace, 'meshname')), pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_1.xsd', 46, 3)) + st_0 = fac.State(symbol, is_initial=True, final_update=final_update, is_unordered_catenation=False) + states.append(st_0) + final_update = set() + final_update.add(fac.UpdateInstruction(cc_1, False)) + symbol = pyxb.binding.content.ElementUse(T_CreateBoth._UseForTag(pyxb.namespace.ExpandedName(Namespace, 'dimension')), pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_1.xsd', 47, 3)) + st_1 = fac.State(symbol, is_initial=True, final_update=final_update, is_unordered_catenation=False) + states.append(st_1) + final_update = set() + final_update.add(fac.UpdateInstruction(cc_2, False)) + symbol = pyxb.binding.content.ElementUse(T_CreateBoth._UseForTag(pyxb.namespace.ExpandedName(Namespace, 'listOfEntities')), pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_1.xsd', 48, 3)) + st_2 = fac.State(symbol, is_initial=True, final_update=final_update, is_unordered_catenation=False) + states.append(st_2) + transitions = [] + transitions.append(fac.Transition(st_0, [ + fac.UpdateInstruction(cc_0, True) ])) + transitions.append(fac.Transition(st_1, [ + fac.UpdateInstruction(cc_0, False) ])) + transitions.append(fac.Transition(st_2, [ + fac.UpdateInstruction(cc_0, False) ])) + st_0._set_transitionSet(transitions) + transitions = [] + transitions.append(fac.Transition(st_1, [ + fac.UpdateInstruction(cc_1, True) ])) + transitions.append(fac.Transition(st_2, [ + fac.UpdateInstruction(cc_1, False) ])) + st_1._set_transitionSet(transitions) + transitions = [] + transitions.append(fac.Transition(st_2, [ + fac.UpdateInstruction(cc_2, True) ])) + st_2._set_transitionSet(transitions) + return fac.Automaton(states, counters, True, containing_state=None) +T_CreateBoth._Automaton = _BuildAutomaton_() + + + + +T_CreateMesh._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, 'meshname'), T_meshname_1, scope=T_CreateMesh, location=pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_1.xsd', 60, 3))) + +T_CreateMesh._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, 'dimension'), T_dimension, scope=T_CreateMesh, location=pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_1.xsd', 61, 3))) + +T_CreateMesh._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, 'listOfEntities'), T_listOfEntities, scope=T_CreateMesh, location=pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_1.xsd', 62, 3))) + +def _BuildAutomaton_2 (): + # Remove this helper function from the namespace after it is invoked + global _BuildAutomaton_2 + del _BuildAutomaton_2 + import pyxb.utils.fac as fac + + counters = set() + cc_0 = fac.CounterCondition(min=0, max=1, metadata=pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_1.xsd', 60, 3)) + counters.add(cc_0) + cc_1 = fac.CounterCondition(min=0, max=1, metadata=pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_1.xsd', 61, 3)) + counters.add(cc_1) + cc_2 = fac.CounterCondition(min=0, max=1, metadata=pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_1.xsd', 62, 3)) + counters.add(cc_2) + states = [] + final_update = set() + final_update.add(fac.UpdateInstruction(cc_0, False)) + symbol = pyxb.binding.content.ElementUse(T_CreateMesh._UseForTag(pyxb.namespace.ExpandedName(Namespace, 'meshname')), pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_1.xsd', 60, 3)) + st_0 = fac.State(symbol, is_initial=True, final_update=final_update, is_unordered_catenation=False) + states.append(st_0) + final_update = set() + final_update.add(fac.UpdateInstruction(cc_1, False)) + symbol = pyxb.binding.content.ElementUse(T_CreateMesh._UseForTag(pyxb.namespace.ExpandedName(Namespace, 'dimension')), pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_1.xsd', 61, 3)) + st_1 = fac.State(symbol, is_initial=True, final_update=final_update, is_unordered_catenation=False) + states.append(st_1) + final_update = set() + final_update.add(fac.UpdateInstruction(cc_2, False)) + symbol = pyxb.binding.content.ElementUse(T_CreateMesh._UseForTag(pyxb.namespace.ExpandedName(Namespace, 'listOfEntities')), pyxb.utils.utility.Location('/home/A96028/QT5GitEficasTravail/eficas/CatasDeTests/cata_1.xsd', 62, 3)) + st_2 = fac.State(symbol, is_initial=True, final_update=final_update, is_unordered_catenation=False) + states.append(st_2) + transitions = [] + transitions.append(fac.Transition(st_0, [ + fac.UpdateInstruction(cc_0, True) ])) + transitions.append(fac.Transition(st_1, [ + fac.UpdateInstruction(cc_0, False) ])) + transitions.append(fac.Transition(st_2, [ + fac.UpdateInstruction(cc_0, False) ])) + st_0._set_transitionSet(transitions) + transitions = [] + transitions.append(fac.Transition(st_1, [ + fac.UpdateInstruction(cc_1, True) ])) + transitions.append(fac.Transition(st_2, [ + fac.UpdateInstruction(cc_1, False) ])) + st_1._set_transitionSet(transitions) + transitions = [] + transitions.append(fac.Transition(st_2, [ + fac.UpdateInstruction(cc_2, True) ])) + st_2._set_transitionSet(transitions) + return fac.Automaton(states, counters, True, containing_state=None) +T_CreateMesh._Automaton = _BuildAutomaton_2() + + +CreateBoth._setSubstitutionGroup(step_Test1) + +CreateMesh._setSubstitutionGroup(step_Test1) diff --git a/CatasDeTests/ref/cata_Vimmp_genere.xsd b/CatasDeTests/ref/cata_Vimmp_genere.xsd new file mode 100644 index 00000000..9db1d5ab --- /dev/null +++ b/CatasDeTests/ref/cata_Vimmp_genere.xsd @@ -0,0 +1,1104 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/CatasDeTests/ref/cata_gromacs_genere.xsd b/CatasDeTests/ref/cata_gromacs_genere.xsd new file mode 100644 index 00000000..052a3498 --- /dev/null +++ b/CatasDeTests/ref/cata_gromacs_genere.xsd @@ -0,0 +1,373 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Editeur/Eficas_utils.py b/Editeur/Eficas_utils.py index 80951e03..4ed93f31 100644 --- a/Editeur/Eficas_utils.py +++ b/Editeur/Eficas_utils.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Editeur/Objecttreeitem.py b/Editeur/Objecttreeitem.py index b0b6641a..243315ce 100644 --- a/Editeur/Objecttreeitem.py +++ b/Editeur/Objecttreeitem.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Editeur/TroisDPal.py b/Editeur/TroisDPal.py index 5fc0d085..325e83e9 100644 --- a/Editeur/TroisDPal.py +++ b/Editeur/TroisDPal.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Editeur/__init__.py b/Editeur/__init__.py index 266bf453..58d19a98 100644 --- a/Editeur/__init__.py +++ b/Editeur/__init__.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Editeur/analyse_catalogue.py b/Editeur/analyse_catalogue.py index 51f1cf84..60d114b2 100644 --- a/Editeur/analyse_catalogue.py +++ b/Editeur/analyse_catalogue.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Editeur/analyse_catalogue_initial.py b/Editeur/analyse_catalogue_initial.py index 95c8b43f..90e73d6b 100644 --- a/Editeur/analyse_catalogue_initial.py +++ b/Editeur/analyse_catalogue_initial.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Editeur/autre_analyse_cata.py b/Editeur/autre_analyse_cata.py index 0848eb14..9699bcf2 100644 --- a/Editeur/autre_analyse_cata.py +++ b/Editeur/autre_analyse_cata.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Editeur/basestyle.py b/Editeur/basestyle.py index ca7943ad..3cc104a3 100644 --- a/Editeur/basestyle.py +++ b/Editeur/basestyle.py @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Editeur/cata2Xml.py b/Editeur/cata2Xml.py index e5d3dcac..4bf5bb1f 100755 --- a/Editeur/cata2Xml.py +++ b/Editeur/cata2Xml.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Editeur/catadesc.py b/Editeur/catadesc.py index 7f3ffeae..78d112d1 100644 --- a/Editeur/catadesc.py +++ b/Editeur/catadesc.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Editeur/chercheBlocInto.py b/Editeur/chercheBlocInto.py index 40287971..8aaa24ba 100755 --- a/Editeur/chercheBlocInto.py +++ b/Editeur/chercheBlocInto.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Editeur/chercheNbElem.py b/Editeur/chercheNbElem.py index a00f3e14..3dcec604 100755 --- a/Editeur/chercheNbElem.py +++ b/Editeur/chercheNbElem.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Editeur/comploader.py b/Editeur/comploader.py index 5f240ae0..a9470638 100644 --- a/Editeur/comploader.py +++ b/Editeur/comploader.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Editeur/fontes.py b/Editeur/fontes.py index d3f6e8a9..1c2b2439 100644 --- a/Editeur/fontes.py +++ b/Editeur/fontes.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Editeur/import_code.py b/Editeur/import_code.py index 690e02bf..35df462f 100644 --- a/Editeur/import_code.py +++ b/Editeur/import_code.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Editeur/listePatrons.py b/Editeur/listePatrons.py index 2a305736..3caea635 100644 --- a/Editeur/listePatrons.py +++ b/Editeur/listePatrons.py @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Editeur/session.py b/Editeur/session.py index 0fcad780..bd96e83b 100644 --- a/Editeur/session.py +++ b/Editeur/session.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Editeur/styles.py b/Editeur/styles.py index 53f7bafc..3795f534 100644 --- a/Editeur/styles.py +++ b/Editeur/styles.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Editeur/uiinfo.py b/Editeur/uiinfo.py index 4e30351f..789fed33 100644 --- a/Editeur/uiinfo.py +++ b/Editeur/uiinfo.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Efi2Xsd/MCAccasXML.py b/Efi2Xsd/MCAccasXML.py index 9921c1d0..97f4407b 100755 --- a/Efi2Xsd/MCAccasXML.py +++ b/Efi2Xsd/MCAccasXML.py @@ -23,7 +23,7 @@ from Accas import A_ASSD class X_OBJECT: # ------------- - def delObjPyxb(self, debug=True): + def delObjPyxb(self, debug=False): if not self.cata or not self.cata.modeleMetier : return if self.nom == 'Consigne' : return None trouve = False @@ -151,7 +151,7 @@ class X_MCSIMP(X_OBJECT): if debug : print ('fin X_MCSIMP', self.objPyxb, self.nom, self, self.maClasseModeleMetier,self.valeur) - def setValeurObjPyxb(self,newVal, debug=True): + def setValeurObjPyxb(self,newVal, debug=False): if not self.cata or not self.cata.modeleMetier : return if debug : print (' ___________________________ dans setValeurObjPyxb MCSIMP ', self.nom, newVal) if debug : print (' self.perePyxb = ', self.perePyxb.nom) @@ -188,7 +188,7 @@ class X_MCSIMP(X_OBJECT): class X_MCCOMPO(X_OBJECT) : # ------------------------- # - def buildObjPyxb(self,mc_list, debug=True) : + def buildObjPyxb(self,mc_list, debug=False) : if not self.cata or not self.cata.modeleMetier : return print ('X_MCCOMPO', self.nom) self.listArg=[] diff --git a/Efi2Xsd/__init__.py b/Efi2Xsd/__init__.py index df53d551..5b4f0e3b 100644 --- a/Efi2Xsd/__init__.py +++ b/Efi2Xsd/__init__.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2013 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Extensions/__init__.py b/Extensions/__init__.py index e4044aec..5b4f0e3b 100644 --- a/Extensions/__init__.py +++ b/Extensions/__init__.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Extensions/commande_comm.py b/Extensions/commande_comm.py index 31439d93..dd23124b 100644 --- a/Extensions/commande_comm.py +++ b/Extensions/commande_comm.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Extensions/commentaire.py b/Extensions/commentaire.py index 5decbe1f..7108920e 100644 --- a/Extensions/commentaire.py +++ b/Extensions/commentaire.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Extensions/etape_niveau.py b/Extensions/etape_niveau.py index b7a6f003..4351c6d8 100644 --- a/Extensions/etape_niveau.py +++ b/Extensions/etape_niveau.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Extensions/interpreteur_formule.py b/Extensions/interpreteur_formule.py index 9afdbaff..9d17d85e 100644 --- a/Extensions/interpreteur_formule.py +++ b/Extensions/interpreteur_formule.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Extensions/jdc.py b/Extensions/jdc.py index e984c864..7dd76ec2 100644 --- a/Extensions/jdc.py +++ b/Extensions/jdc.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Extensions/jdc_include.py b/Extensions/jdc_include.py index 98467da9..009c305c 100644 --- a/Extensions/jdc_include.py +++ b/Extensions/jdc_include.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Extensions/mcnuplet.py b/Extensions/mcnuplet.py index 1078fb27..76b195c2 100644 --- a/Extensions/mcnuplet.py +++ b/Extensions/mcnuplet.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Extensions/niveau.py b/Extensions/niveau.py index 9ca012e9..504a8881 100644 --- a/Extensions/niveau.py +++ b/Extensions/niveau.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Extensions/nuplet.py b/Extensions/nuplet.py index 465c6f01..0cc524ea 100644 --- a/Extensions/nuplet.py +++ b/Extensions/nuplet.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Extensions/param2.py b/Extensions/param2.py index cc198709..5da28c1b 100644 --- a/Extensions/param2.py +++ b/Extensions/param2.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Extensions/parametre.py b/Extensions/parametre.py index 9f5bb93d..9cdf5bb5 100644 --- a/Extensions/parametre.py +++ b/Extensions/parametre.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Extensions/parametre_eval.py b/Extensions/parametre_eval.py index 4bb03cd6..7118e1b1 100644 --- a/Extensions/parametre_eval.py +++ b/Extensions/parametre_eval.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Extensions/pluginloader.py b/Extensions/pluginloader.py index 49b47bd9..009af7ef 100644 --- a/Extensions/pluginloader.py +++ b/Extensions/pluginloader.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Ihm/CONNECTOR.py b/Ihm/CONNECTOR.py index 5c066074..f0e3f0ef 100644 --- a/Ihm/CONNECTOR.py +++ b/Ihm/CONNECTOR.py @@ -1,5 +1,5 @@ #i -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Ihm/I_ASSD.py b/Ihm/I_ASSD.py index a3359c53..ff896ce8 100644 --- a/Ihm/I_ASSD.py +++ b/Ihm/I_ASSD.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Ihm/I_AVANT.py b/Ihm/I_AVANT.py index c783cb38..84fa108d 100644 --- a/Ihm/I_AVANT.py +++ b/Ihm/I_AVANT.py @@ -1,5 +1,5 @@ # -*- coding: iso-8859-1 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Ihm/I_A_CLASSER.py b/Ihm/I_A_CLASSER.py index 389869c4..d03f800e 100644 --- a/Ihm/I_A_CLASSER.py +++ b/Ihm/I_A_CLASSER.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Ihm/I_ENTITE.py b/Ihm/I_ENTITE.py index f29bda01..8196d771 100644 --- a/Ihm/I_ENTITE.py +++ b/Ihm/I_ENTITE.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Ihm/I_ETAPE.py b/Ihm/I_ETAPE.py index 06fc8935..d97ec4a2 100644 --- a/Ihm/I_ETAPE.py +++ b/Ihm/I_ETAPE.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Ihm/I_EVAL.py b/Ihm/I_EVAL.py index 426c9c88..d99c9d9f 100644 --- a/Ihm/I_EVAL.py +++ b/Ihm/I_EVAL.py @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Ihm/I_EXCLUS.py b/Ihm/I_EXCLUS.py index d1ddee60..81d00322 100644 --- a/Ihm/I_EXCLUS.py +++ b/Ihm/I_EXCLUS.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Ihm/I_FICHIER.py b/Ihm/I_FICHIER.py index 94478178..7b64ce38 100644 --- a/Ihm/I_FICHIER.py +++ b/Ihm/I_FICHIER.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Ihm/I_FONCTION.py b/Ihm/I_FONCTION.py index 9efb621b..2cd1596e 100644 --- a/Ihm/I_FONCTION.py +++ b/Ihm/I_FONCTION.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Ihm/I_FORM_ETAPE.py b/Ihm/I_FORM_ETAPE.py index b97ac8f8..bf52caa3 100644 --- a/Ihm/I_FORM_ETAPE.py +++ b/Ihm/I_FORM_ETAPE.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Ihm/I_JDC.py b/Ihm/I_JDC.py index c0db8261..9071b5a2 100644 --- a/Ihm/I_JDC.py +++ b/Ihm/I_JDC.py @@ -1,5 +1,5 @@ # -*- coding: iso-8859-1 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Ihm/I_JDC_CATA.py b/Ihm/I_JDC_CATA.py index b8de9558..014e7a74 100644 --- a/Ihm/I_JDC_CATA.py +++ b/Ihm/I_JDC_CATA.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Ihm/I_LASSD.py b/Ihm/I_LASSD.py index bdeba371..b4346754 100644 --- a/Ihm/I_LASSD.py +++ b/Ihm/I_LASSD.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Ihm/I_MACRO_ETAPE.py b/Ihm/I_MACRO_ETAPE.py index 2f4771f1..0e29f26c 100644 --- a/Ihm/I_MACRO_ETAPE.py +++ b/Ihm/I_MACRO_ETAPE.py @@ -1,5 +1,5 @@ # -*- coding: iso-8859-1 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 @@ -77,7 +77,7 @@ class MACRO_ETAPE(I_ETAPE.ETAPE): ou leve une exception --> utilisee par ops.POURSUITE et INCLUDE """ - print ("getContexteJdc",self,self.nom, text) + #print ("getContexteJdc",self,self.nom, text) # On recupere l'etape courante step=CONTEXT.getCurrentStep() self.text_included_converted=0 @@ -226,24 +226,15 @@ class MACRO_ETAPE(I_ETAPE.ETAPE): if callable(v):continue self.g_context[k]=param2.Variable(k,v) - print (j) - print (dir(j)) - print (j.currentContext) # On recupere le contexte courant self.currentContext=j.currentContext - print ('kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkmmmmmmmmmmmmmmmmmmmmmm') self.index_etape_courante=j.index_etape_courante - print ('kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkmmmmmmmmmmmmmmmmmmmmmm') self.jdc_aux=j - print ('kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkmmmmmmmmmmmmmmmmmmmmmm') # On retablit l'etape courante step CONTEXT.unsetCurrentStep() - print ('kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkmmmmmmmmmmmmmmmmmmmmmm') CONTEXT.setCurrentStep(step) - print ('kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkmmmmmmmmmmmmmmmmmmmmmm') - print ('kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkmmmmmmmmmmmmmmmmmmmmmm') return j_context def reevalueSdJdc(self): @@ -330,7 +321,7 @@ class MACRO_ETAPE(I_ETAPE.ETAPE): """ Supprime le concept produit sd s'il est produit par l'etape """ - print ('supprimeSdprod de MACRO_ETAPE') + #print ('supprimeSdprod de MACRO_ETAPE') if sd in self.sdprods: self.initModif() self.parent.delSdprod(sd) @@ -626,10 +617,10 @@ class MACRO_ETAPE(I_ETAPE.ETAPE): """ Cette methode sert a craer un contexte en interpratant un texte source Python. """ - print ("makeContexteInclude",fichier) + #print ("makeContexteInclude",fichier) # on recupere le contexte d'un nouveau jdc dans lequel on interprete text contexte = self.getContexteJdc(fichier,text) - print (contexte) + #print (contexte) if contexte == None : raise EficasException("Impossible de construire le jeu de commandes correspondant au fichier") else: @@ -641,7 +632,7 @@ class MACRO_ETAPE(I_ETAPE.ETAPE): # g_context est utilise pour avoir les concepts produits par la macro # contexte_fichier_init est utilise pour avoir les concepts supprimes par la macro self.contexte_fichier_init = contexte - print ("fin makeContexteInclude",fichier) + #print ("fin makeContexteInclude",fichier) def reevalueFichierInitObsolete(self): """Recalcule les concepts produits par le fichier enregistre""" @@ -806,7 +797,6 @@ class MACRO_ETAPE(I_ETAPE.ETAPE): return if type(self.definition.op_init) == types.FunctionType: - print ('mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm dans updateContext') self.definition.op_init(*(self,d)) if self.sd != None :d[self.sd.nom]=self.sd for co in self.sdprods: @@ -985,7 +975,6 @@ class MACRO_ETAPE(I_ETAPE.ETAPE): raise EficasException(" ") if nbVariableOut != 1 : - print((nbVariableOut ,"nbVariableOut")) self.makeIncl2Except(mess=tr("le fichier doit contenir une unique variable de sortie")) raise EficasException(" ") @@ -998,7 +987,6 @@ class MACRO_ETAPE(I_ETAPE.ETAPE): raise EficasException(" ") try: - print((self.fichier_ini ,self.fichier_text)) self.makeContexteInclude(self.fichier_ini ,self.fichier_text) self.old_context_fichier_init=self.contexte_fichier_init self.parent.recordUnit(unite,self) @@ -1065,7 +1053,6 @@ class MACRO_ETAPE(I_ETAPE.ETAPE): Sinon on retourne None. Les concepts produits par l'INCLUDE sont pris en compte par le JDC parent lors du calcul du contexte (appel de ???) """ - print ("makeInclude",fname) # On supprime l'attribut unite qui bloque l'evaluation du source de l'INCLUDE # car on ne s'appuie pas sur lui dans EFICAS mais sur l'attribut fichier_ini # Si unite n'a pas de valeur, l'etape est forcement invalide. On peut retourner None @@ -1099,11 +1086,8 @@ class MACRO_ETAPE(I_ETAPE.ETAPE): raise EficasException(self.fichier_err) try: - print ('iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii') self.makeContexteInclude(self.fichier_ini ,self.fichier_text) - print ('iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii') self.parent.recordUnit(unite,self) - print ('iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii') except: l=traceback.format_exception_only(tr("Fichier invalide %s",sys.exc_info()[1])) if self.jdc.editor: @@ -1123,7 +1107,7 @@ class MACRO_ETAPE(I_ETAPE.ETAPE): self.updateFichierInit(unite) self.fichier_unite=unite if self.fichier_err is not None: raise EficasException(self.fichier_err) - print ('self.g_context', self.g_context) + #print ('self.g_context', self.g_context) #ATTENTION SURCHARGE : cette methode surcharge celle de Noyau (a garder en synchro) diff --git a/Ihm/I_MCBLOC.py b/Ihm/I_MCBLOC.py index 19a2690e..923bb649 100644 --- a/Ihm/I_MCBLOC.py +++ b/Ihm/I_MCBLOC.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Ihm/I_MCCOMPO.py b/Ihm/I_MCCOMPO.py index f856657d..7d764b87 100644 --- a/Ihm/I_MCCOMPO.py +++ b/Ihm/I_MCCOMPO.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Ihm/I_MCFACT.py b/Ihm/I_MCFACT.py index a95eba45..13d272e1 100644 --- a/Ihm/I_MCFACT.py +++ b/Ihm/I_MCFACT.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Ihm/I_MCLIST.py b/Ihm/I_MCLIST.py index 17f5da40..5db4b341 100644 --- a/Ihm/I_MCLIST.py +++ b/Ihm/I_MCLIST.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Ihm/I_MCSIMP.py b/Ihm/I_MCSIMP.py index eef48d84..6eca2a13 100644 --- a/Ihm/I_MCSIMP.py +++ b/Ihm/I_MCSIMP.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Ihm/I_OBJECT.py b/Ihm/I_OBJECT.py index 56b08c19..0c204847 100644 --- a/Ihm/I_OBJECT.py +++ b/Ihm/I_OBJECT.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Ihm/I_PRESENT_ABSENT.py b/Ihm/I_PRESENT_ABSENT.py index b4a43e46..d2bb5b38 100644 --- a/Ihm/I_PRESENT_ABSENT.py +++ b/Ihm/I_PRESENT_ABSENT.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Ihm/I_PRESENT_PRESENT.py b/Ihm/I_PRESENT_PRESENT.py index a6f1ba06..f86d86b4 100644 --- a/Ihm/I_PRESENT_PRESENT.py +++ b/Ihm/I_PRESENT_PRESENT.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Ihm/I_PROC_ETAPE.py b/Ihm/I_PROC_ETAPE.py index 4b46b592..823e6c6c 100644 --- a/Ihm/I_PROC_ETAPE.py +++ b/Ihm/I_PROC_ETAPE.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Ihm/I_REGLE.py b/Ihm/I_REGLE.py index b0f19adc..d2c30f35 100644 --- a/Ihm/I_REGLE.py +++ b/Ihm/I_REGLE.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Ihm/I_UN_PARMI.py b/Ihm/I_UN_PARMI.py index 65812619..c5bbf8a1 100644 --- a/Ihm/I_UN_PARMI.py +++ b/Ihm/I_UN_PARMI.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Ihm/I_VALIDATOR.py b/Ihm/I_VALIDATOR.py index 604feffc..3bcd79ac 100644 --- a/Ihm/I_VALIDATOR.py +++ b/Ihm/I_VALIDATOR.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Ihm/__init__.py b/Ihm/__init__.py index 0553daf2..64162464 100644 --- a/Ihm/__init__.py +++ b/Ihm/__init__.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/InterfaceQT4/__init__.py b/InterfaceQT4/__init__.py index e059172e..57dacc3f 100644 --- a/InterfaceQT4/__init__.py +++ b/InterfaceQT4/__init__.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/InterfaceQT4/aiemonWidgetPlusieursBase.py b/InterfaceQT4/aiemonWidgetPlusieursBase.py index 0e794877..c11d1dc2 100644 --- a/InterfaceQT4/aiemonWidgetPlusieursBase.py +++ b/InterfaceQT4/aiemonWidgetPlusieursBase.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/InterfaceQT4/bizarreEditorDu5aout.py b/InterfaceQT4/bizarreEditorDu5aout.py index bdcbcecd..9ec84ab3 100644 --- a/InterfaceQT4/bizarreEditorDu5aout.py +++ b/InterfaceQT4/bizarreEditorDu5aout.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/InterfaceQT4/browser.py b/InterfaceQT4/browser.py index 64ee7d2d..faa4fc96 100644 --- a/InterfaceQT4/browser.py +++ b/InterfaceQT4/browser.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/InterfaceQT4/compobloc.py b/InterfaceQT4/compobloc.py index a05c21e8..96feead9 100644 --- a/InterfaceQT4/compobloc.py +++ b/InterfaceQT4/compobloc.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/InterfaceQT4/compocomm.py b/InterfaceQT4/compocomm.py index 8c501b79..fbfc5afc 100644 --- a/InterfaceQT4/compocomm.py +++ b/InterfaceQT4/compocomm.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/InterfaceQT4/compocommandecomm.py b/InterfaceQT4/compocommandecomm.py index 41eed95a..068f6a81 100644 --- a/InterfaceQT4/compocommandecomm.py +++ b/InterfaceQT4/compocommandecomm.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/InterfaceQT4/compofact.py b/InterfaceQT4/compofact.py index 57dd1df8..4c9c032f 100644 --- a/InterfaceQT4/compofact.py +++ b/InterfaceQT4/compofact.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/InterfaceQT4/compoformule.py b/InterfaceQT4/compoformule.py index d18af81b..c0b72040 100644 --- a/InterfaceQT4/compoformule.py +++ b/InterfaceQT4/compoformule.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/InterfaceQT4/compojdc.py b/InterfaceQT4/compojdc.py index 87121de4..5f5f7ad5 100644 --- a/InterfaceQT4/compojdc.py +++ b/InterfaceQT4/compojdc.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/InterfaceQT4/compomacro.py b/InterfaceQT4/compomacro.py index 9a1fcbb2..afb748d4 100644 --- a/InterfaceQT4/compomacro.py +++ b/InterfaceQT4/compomacro.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/InterfaceQT4/compomclist.py b/InterfaceQT4/compomclist.py index c37efb07..e8735ea8 100644 --- a/InterfaceQT4/compomclist.py +++ b/InterfaceQT4/compomclist.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/InterfaceQT4/compooper.py b/InterfaceQT4/compooper.py index b8f4aafe..b8aff454 100644 --- a/InterfaceQT4/compooper.py +++ b/InterfaceQT4/compooper.py @@ -1,5 +1,5 @@ #-*- coding: iso-8859-1 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/InterfaceQT4/compoparam.py b/InterfaceQT4/compoparam.py index 74a44238..b9eddf99 100644 --- a/InterfaceQT4/compoparam.py +++ b/InterfaceQT4/compoparam.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/InterfaceQT4/compoproc.py b/InterfaceQT4/compoproc.py index dcbea7f0..35a75c8d 100644 --- a/InterfaceQT4/compoproc.py +++ b/InterfaceQT4/compoproc.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/InterfaceQT4/composimp.py b/InterfaceQT4/composimp.py index c550b15e..7f2318ee 100644 --- a/InterfaceQT4/composimp.py +++ b/InterfaceQT4/composimp.py @@ -1,5 +1,5 @@ # -*- coding: iso-8859-1 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/InterfaceQT4/configuration.py b/InterfaceQT4/configuration.py index 6b4aab48..08b0b2c4 100644 --- a/InterfaceQT4/configuration.py +++ b/InterfaceQT4/configuration.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 @@ -61,11 +61,11 @@ class configBase(object): self.repIni = repIni if self.code == None : self.code='' - if sys.platform[0:5]=="linux" : + #if sys.platform[0:5]=="linux" : #self.rep_user = os.path.join(os.environ['HOME'],'.config/Eficas',self.code) - self.rep_user = os.path.join(os.path.expanduser("~"),'.config/Eficas',self.code) - else : - self.rep_user = os.path.join('C:/','.config/Eficas',self.code) + self.rep_user = os.path.join(os.path.expanduser("~"),'.config/Eficas',self.code) + #else : + # self.rep_user = os.path.join('C:/','.config/Eficas',self.code) self.setValeursParDefaut() @@ -102,11 +102,11 @@ class configBase(object): self.path_doc = os.path.abspath(os.path.join(self.repIni,'..','Doc')) self.exec_acrobat = 'acroread' nomDir="Eficas_"+self.code - if sys.platform[0:5]=="linux" : + #if sys.platform[0:5]=="linux" : #self.savedir = os.path.abspath(os.path.join(os.environ['HOME'],nomDir)) - rep=os.path.join(os.path.expanduser("~"),'.config/Eficas',self.code) - else: - self.savedir = os.path.abspath('C:/') + self.savedir=os.path.join(os.path.expanduser("~"),'.config/Eficas',self.code) + #else: + # self.savedir = os.path.abspath('C:/') self.modeNouvCommande='initial' self.affiche="alpha" self.closeAutreCommande = False diff --git a/InterfaceQT4/editor.pourCIST b/InterfaceQT4/editor.pourCIST deleted file mode 100644 index 7051af09..00000000 --- a/InterfaceQT4/editor.pourCIST +++ /dev/null @@ -1,1967 +0,0 @@ -# -*- 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 -# -from __future__ import absolute_import -from __future__ import print_function -try : - from builtins import str - from builtins import range -except : pass - -import types,sys,os, re -import subprocess -import traceback - -import six -from six.moves import range -from PyQt5.QtWidgets import QWidget, QMessageBox, QFileDialog, QApplication, QSplitter -from PyQt5.QtGui import QPalette -from PyQt5.QtCore import QProcess, QFileInfo, QTimer, Qt, QDir, QSize -import time -import pdb -from datetime import date -from Extensions.i18n import tr - -import traceback - -# Modules Eficas - -import convert, generator -from Editeur import session -from Editeur import comploader -from Editeur import Objecttreeitem -from desBaseWidget import Ui_baseWidget -from InterfaceQT4.monViewTexte import ViewText -from monWidgetCreeParam import MonWidgetCreeParam -from . import browser -from . import readercata - -DictExtensions= {"MAP" : ".map", "TELEMAC" : '.cas'} - - - - -class JDCEditor(Ui_baseWidget,QWidget): -# ----------------------------------------- # - """ - Editeur de jdc - """ - - def __init__ (self,appli,fichier = None, jdc = None, QWParent=None, units = None, include=0 , vm=None): - #----------------------------------------------------------------------------------------------------------# - - QWidget.__init__(self,None) - self.i=0 - self.setupUi(self) - self.inhibeSplitter=0 - self.widgetOptionnel=None - self.fenetreCentraleAffichee=None - self.dejaDansPlieTout=False - self.afficheCommandesPliees = True - self.listeDesListesOuvertes=set() - self.appliEficas = appli - self.appli = appli #---- attendu par IHM - self.vm = vm - self.fichier = fichier - self.jdc = jdc - self.first = True - self.QWParent = QWParent - self.couleur = Qt.black - self.nodeEnCours=None - - if appli != None : - self.salome = self.appliEficas.salome - else : - self.salome=0 - print ("dans JDC pas d appli ????????") - - # ces attributs sont mis a jour par definitCode appelee par newEditor - self.code = self.appliEficas.CONFIGURATION.code - self.initSplitterSizes() - - #self.afficheListesPliees=False - self.afficheListesPliees=True - if self.code == "ASTER" or self.code == "monCode" : self.afficheListesPliees =True - if self.code == 'PSEN_N1' : self.afficheListesPliees = False - - self.mode_nouv_commande=self.appliEficas.CONFIGURATION.mode_nouv_commande - self.closeAutreCommande=self.appliEficas.CONFIGURATION.closeAutreCommande - self.closeFrameRechercheCommande=self.appliEficas.CONFIGURATION.closeFrameRechercheCommande - self.closeArbre=self.appliEficas.CONFIGURATION.closeArbre - self.affiche=self.appliEficas.CONFIGURATION.affiche - self.afficheOptionnelVide=self.appliEficas.CONFIGURATION.afficheOptionnelVide - self.nombreDeBoutonParLigne = self.appliEficas.CONFIGURATION.nombreDeBoutonParLigne - self.dicoImages = self.appliEficas.CONFIGURATION.dicoImages - self.simpleClic = self.appliEficas.CONFIGURATION.simpleClic - #self.taille = self.appliEficas.taille - - #if self.code in ['MAP','CARMELCND','PSEN'] : self.afficheCommandesPliees=False - if self.code in ['MAP','CARMELCND'] : self.afficheCommandesPliees=False - if self.code in ['MAP',]: - self.widgetTree.close() - self.widgetTree=None - if self.closeArbre: self.fermeArbre() - - self.version_code = session.d_env.cata - - - if not hasattr ( self.appliEficas, 'readercata') or self.appliEficas.multi==True: - self.readercata = readercata.READERCATA( self, self.appliEficas ) - self.appliEficas.readercata=self.readercata - self.appliEficas.code=self.code - else : - self.readercata=self.appliEficas.readercata - if self.readercata.fic_cata == None : return #Sortie Salome - self.titre=self.readercata.titre - self.Ordre_Des_Commandes=self.readercata.Ordre_Des_Commandes - self.Classement_Commandes_Ds_Arbre=self.readercata.Classement_Commandes_Ds_Arbre - - self.format = self.appliEficas.format_fichier - - self.dict_reels={} - self.liste_simp_reel=[] - self.ihm="QT" - self.dicoNouveauxMC={} - self.dicoNouveauxFact={} - - nameConf='configuration_'+self.code - configuration=__import__(nameConf) - self.CONFIGURATION = self.appliEficas.CONFIGURATION - self.CONFIGStyle = self.appliEficas.CONFIGStyle - - try: - self.CONFIGURATION.generator_module - _module = __import__(self.CONFIGURATION.generator_module) - info = _module.entryPoint() - generator.plugins.addEntryPoint(info) - except: - pass - - try: - self.CONFIGURATION.convert_module - #print self.CONFIGURATION.convert_module - _module = __import__(self.CONFIGURATION.convert_module) - info = _module.entryPoint() - convert.plugins.addEntryPoint(info) - except : - pass - - self.sb = None - if hasattr(self.appliEficas,"statusBar"): - self.sb = self.appliEficas.statusBar() - - self.fileInfo = None - self.lastModified = 0 - - self.modified = False - self.isReadOnly = False - self.node_selected = [] - self.deplier = True - self.message='' - if self.code in ['Adao','ADAO','MAP'] : self.afficheApresInsert=True - else : self.afficheApresInsert=False - if self.code in ['TELEMAC',] : self.enteteQTree='premier' - else : self.enteteQTree='complet' - if self.code in ['Adao','ADAO','TELEMAC'] : self.affichePlie=True - else : self.affichePlie=False - - self.Commandes_Ordre_Catalogue =self.readercata.Commandes_Ordre_Catalogue - - #------- construction du jdc -------------- - - jdc_item = None - - self.nouveau=0 - if self.fichier is not None: # fichier jdc fourni - self.fileInfo = QFileInfo(self.fichier) - self.fileInfo.setCaching(0) - if jdc==None : - try : - self.jdc = self.readFile(self.fichier) - if self.salome : self.appliEficas.addJdcInSalome( self.fichier) - except : - print ("mauvaise lecture") - else : - self.jdc=jdc - if self.jdc is not None and units is not None: - self.jdc.recorded_units=units - self.jdc.old_recorded_units=units - else: - if not self.jdc: # nouveau jdc - if not include : - self.jdc = self._newJDC(units=units) - else : - self.jdc = self._newJDCInclude(units=units) - self.nouveau=1 - - if self.jdc: - self.jdc.appli = self # a resorber - self.jdc.editor = self - self.jdc.lang = self.appli.langue - self.jdc.aReafficher=False - txt_exception = None - if not jdc: - self.jdc.analyse() - txt_exception = self.jdc.cr.get_mess_exception() - if txt_exception: - self.jdc = None - QApplication.restoreOverrideCursor() - self.affiche_infos(tr("Erreur fatale au chargement de %s",str(fichier)),Qt.red) - if (self.appliEficas.ssIhm == False) : QMessageBox.critical( self, tr("Erreur fatale au chargement d'un fichier"), txt_exception) - else: - comploader.charger_composants("QT") - jdc_item=Objecttreeitem.make_objecttreeitem( self, "nom", self.jdc ) - if (not self.jdc.isvalid()) and (not self.nouveau) and (self.appliEficas.ssIhm == False): - self.viewJdcRapport() - - - - if jdc_item and self.appliEficas.ssIhm==False: - self.tree = browser.JDCTree( jdc_item, self ) - self.appliEficas.construitMenu() - - - ############# - self.adjustSize() - - - #-------------------# Pour execution avec output et error dans le bash - def runPSEN(self): - # #-------------------# - # #if self.modified or self.fichier==None : self.saveFile() - # self.saveFile() - # - # #lancement avec le .bat - # path1 = os.path.abspath(os.path.join(os.path.abspath(__file__), '../','../','PSEN_Eficas','PSEN')) - # WrapperFilePath = os.path.join(path1, 'PSSEWrapper.py') - # import subprocess - # p = subprocess.Popen(['python',WrapperFilePath]) - # (out,err)=p.communicate() - # print out - # print err - - - self.saveFile() - - # lancement avec le .bat - path1 = os.path.abspath(os.path.join(os.path.abspath(__file__), '../', '../', 'PSEN_Eficas', 'PSEN')) - filer = open('temp.txt', 'r') - _path = [] - for line in filer: - _path.append(line) - filer.close() - - - if 'PF_PARAMETERS' in self.Ordre_Des_Commandes: - Python3_path = _path[2].replace('\n', '') - import subprocess - - # execfile - # 'PF_PARAMETERS' in self.readercata.Ordre_Des_Commandes - if 'PF_PARAMETERS' in self.Ordre_Des_Commandes: - WrapperFilePath = os.path.join(path1, 'PFWrapper.py') - p = subprocess.Popen([Python3_path + '/python.exe', WrapperFilePath]) - else: - WrapperFilePath = os.path.join(path1, 'PSSEWrapper.py') - p = subprocess.Popen(['python', WrapperFilePath]) - (out, err) = p.communicate() - print( out) - print( err) - - #-------------------# Pour execution avec output et error dans le bash - def runPSEN_N1(self): - #-------------------# - - self.saveFile() - #cmd = os.path.abspath(os.path.join(os.path.abspath(__file__), '../','../','PSEN_N1','run.py')) - #cmd = "from run import runPSEN_N1; dico="+str(dico) - - #textePython=("python "+ cmd + " "+ str(dico)) - #self._viewTextExecute( textePython,"psen_run",".sh") - - path1 = os.path.abspath(os.path.join(os.path.abspath(__file__), '../','../','ProcessOutputs_Eficas','TreatOutputs')) - sys.path.append(path1) - - if not(self.jdc.isvalid()): - QMessageBox.information( self, tr( "Unvalid JDC"),tr("incorrect keywords will be ignored")) - if generator.plugins.has_key('dicoImbrique'): - self.generator=generator.plugins['dicoImbrique']() - jdc_formate=self.generator.gener(self.jdc) - dico=self.generator.Dico - - ##to delete - fileDico = os.path.join(path1, 'dicoN1.py') #r'C:\Logiciels DER\PSEN_V16\Code\ProcessOutputs_Eficas\TreatOutputs\dicoN1.py' - f = open( str(fileDico), 'wb') - f.write("Dico =" + str(dico) ) - f.close() - - if 'PSSE_path' in dico['CASE_SELECTION']: - from Run import run - #self.appliEficas.close() - run(dico) - elif 'PF_path' in dico['CASE_SELECTION']: - import subprocess - RunPFfile = os.path.join(path1, 'RunPF.py') - Python3_path=dico['CASE_SELECTION']['Python3_path'] - p = subprocess.Popen([Python3_path + '/python.exe', RunPFfile]) - p.wait() - - - #res,txt_exception=run(dico) - #if res : QMessageBox.information( self, tr("fin de script run"), txt_exception) - #else : QMessageBox.critical( self, tr("Erreur fatale script run"), txt_exception) - - - #-------------------# Pour execution avec output et error dans le bash - def process_N1(self): - #-------------------# - - path1 = os.path.abspath(os.path.join(os.path.abspath(__file__), '../','../','ProcessOutputs_Eficas','TreatOutputs')) - sys.path.append(path1) - - - if generator.plugins.has_key('dicoImbrique'): - self.generator=generator.plugins['dicoImbrique']() - jdc_formate=self.generator.gener(self.jdc) - dico=self.get_Dico() #generator.Dico - - - for k in dico['CONTINGENCY_PROCESSING'].keys(): - - if k[0:19] == 'Component_List_For_' or k[0:21] =='Contingency_List_For_' : - newK=k.replace('___',' ') - l="'"+str(newK)+"'" - dico['CONTINGENCY_PROCESSING'][l]=dico['CONTINGENCY_PROCESSING'][k] - del dico['CONTINGENCY_PROCESSING'][k] - - ###to delete - fileDico = os.path.join(path1, 'dicoN1_process.py') - f = open( str(fileDico), 'wb') - f.write("Dico =" + str(dico) ) - f.close() - ### - return dico - - #return self.get_Dico() - - #-------------------# Pour execution avec output et error dans le bash - def process_VP(self): - #-------------------# - if 'dicoImbrique' in generator.plugins: - self.generator=generator.plugins['dicoImbrique']() - jdc_formate=self.generator.gener(self.jdc) - dico=self.get_Dico() #generator.Dico - return dico - - - #--------------------------------# - def ajoutCommentaire(self): - #--------------------------------# - if self.tree.selectedItems()==[] : - QMessageBox.warning( self, tr("Pas de noeud selectionne"),tr("Selectionnez un Noeud \nLe commentaire sera place apres le noeud selectionne")) - return - noeudAvantCommentaire=self.tree.selectedItems()[0] - if noeudAvantCommentaire ==self.tree.racine : - self.tree.racine.append_child("COMMENTAIRE",pos=0) - return - noeudAvantCommentaire.addComment(True) - - - - #--------------------------------# - def _newJDC( self ,units = None): - #--------------------------------# - """ - Initialise un nouveau JDC vierge - """ - self.modified=1 - CONTEXT.unset_current_step() - - texte="" - if self.code == "CARMELCND" : texte=self._newJDCCND() - if self.code == "ZCRACKS" : texte=self._newZCRACKS() - if self.code == "TELEMAC" : texte=self._newTELEMAC() - if self.code == "PSEN" : texte = self._newPSEN() - if self.code == "PSEN_N1" : texte = self._newPSEN_N1() - - if hasattr(self.readercata.cata[0],'TEXTE_NEW_JDC') : texte=self.readercata.cata[0].TEXTE_NEW_JDC - - #if self.code == "CF" : texte = self._new_CF() - # texte=self.newTexteCND - - jdc=self.readercata.cata[0].JdC( procedure =texte, - appli=self, - cata=self.readercata.cata, - cata_ord_dico=self.readercata.cata_ordonne_dico, - rep_mat=self.CONFIGURATION.rep_mat - ) - jdc.lang = self.appli.langue - if units is not None: - jdc.recorded_units=units - jdc.old_recorded_units=units - ## PNPN est ce que la ligne suivante est bien utile ? - if texte == "" :jdc.analyse() - return jdc - - #--------------------------------# - def _newJDCInclude( self ,units = None): - #--------------------------------# - """ - Initialise un nouveau JDC vierge - """ - import Extensions.jdc_include - JdC_aux=Extensions.jdc_include.JdC_include - CONTEXT.unset_current_step() - - jaux=self.readercata.cata[0].JdC( procedure="", - appli=self, - cata=self.readercata.cata, - cata_ord_dico=self.readercata.cata_ordonne_dico, - rep_mat=self.CONFIGURATION.rep_mat, - ) - jaux.analyse() - - J=JdC_aux( procedure="", - appli=self, - cata=self.readercata.cata, - cata_ord_dico=self.readercata.cata_ordonne_dico, - jdc_pere=jaux, - rep_mat=self.CONFIGURATION.rep_mat, - ) - J.analyse() - if units is not None: - J.recorded_units=units - J.old_recorded_units=units - return J - - - #-------------------------------# - def readFile(self, fn): - #--------------------------------# - """ - Public slot to read the text from a file. - @param fn filename to read from (string or QString) - """ - fn = six.text_type(fn) - - # ------------------------------------------------------------------------------------ - # charge le JDC - # ------------------------------------------------------------------------------------ - - jdcName=os.path.basename(fn) - # Il faut convertir le contenu du fichier en fonction du format - if self.appliEficas.format_fichier_in in convert.plugins: - # Le convertisseur existe on l'utilise - #appli = self - p=convert.plugins[self.appliEficas.format_fichier_in]() - p.readfile(fn) - if p.text=="" : self.nouveau=1 - pareil,texteNew=self.verifieCHECKSUM(p.text) - #if texteNew == "" - if pareil == False and (self.appliEficas.ssIhm == False) : - QMessageBox.warning( self, tr("fichier modifie"),tr("Attention! fichier change hors EFICAS")) - p.text=texteNew - memeVersion,texteNew=self.verifieVersionCataDuJDC(p.text) - if memeVersion == 0 : texteNew=self.traduitCatalogue(texteNew) - p.text=texteNew - text=p.convert('exec',self.appliEficas) - if not p.cr.estvide(): - self.affiche_infos("Erreur a la conversion",Qt.red) - else : - self.affiche_infos("Type de fichier non reconnu",Qt.red) - if self.appliEficas.ssIhm == False: - QMessageBox.critical( self, tr("Type de fichier non reconnu"), - tr("EFICAS ne sait pas ouvrir le type de fichier %s" ,self.appliEficas.format_fichier_in)) - return None - - CONTEXT.unset_current_step() - jdc=self.readercata.cata[0].JdC(procedure=text, - appli=self, - cata=self.readercata.cata, - cata_ord_dico=self.readercata.cata_ordonne_dico, - nom=jdcName, - rep_mat=self.CONFIGURATION.rep_mat - ) - # ---------------------------------------------------- - # charge le JDC fin - # ---------------------------------------------------- - self.modified = False - -# qApp.restoreOverrideCursor() - if self.fileInfo!= None : - self.lastModified = self.fileInfo.lastModified() - else : - self.lastModified = 1 - nouveauTitre=self.titre+" "+os.path.basename(self.fichier) - self.appliEficas.setWindowTitle(nouveauTitre) - return jdc - - - #-----------------------# - def get_source(self,file): - #-----------------------# - - # Il faut convertir le contenu du fichier en fonction du format - if self.format in convert.plugins : - # Le convertisseur existe on l'utilise - p=convert.plugins[self.format]() - p.readfile(file) - text=p.convert('execnoparseur') - if not p.cr.estvide(): - self.affiche_infos("Erreur a la conversion",Qt.red) - return text - else: - # Il n'existe pas c'est une erreur - self.affiche_infos("Type de fichier non reconnu",Qt.red) - QMessageBox.critical( self, tr("Type de fichier non reconnu"),tr("EFICAS ne sait pas ouvrir ce type de fichier")) - return None - - #-----------------------------------------------------------------------# - def _viewText(self, txt, caption = "FILE_VIEWER",largeur=1200,hauteur=600): - #--------------------------------------------------------------------# - w = ViewText( self.QWParent,self ,caption,txt,largeur,hauteur) - w.show() - # - - #----------------------------------------------# - def __generateTempFilename(self, prefix, suffix): - #----------------------------------------------# - import tempfile - (fd, filename) = tempfile.mkstemp(prefix=prefix, suffix=suffix) - os.close(fd) - return filename - # - - - #----------------------------------------------# - def _viewTextExecute(self, txt, prefix, suffix): - #----------------------------------------------# - self.w = ViewText( self.QWParent ) - self.w.setWindowTitle( "execution" ) - self.monExe=QProcess(self.w) - pid=self.monExe.pid() - nomFichier = self.__generateTempFilename(prefix, suffix = ".sh") - f=open(nomFichier,'w') - f.write(txt) - f.close() - self.monExe.readyReadStandardOutput.connect( self.readFromStdOut) - self.monExe.readyReadStandardError.connect( self.readFromStdErr) - exe='sh ' + nomFichier - self.monExe.start(exe) - self.monExe.closeWriteChannel() - self.w.exec_() - try: - commande="rm "+ nomFichier - os.system(commande) - except : - pass - - def readFromStdErr(self): - a=self.monExe.readAllStandardError() - self.w.view.append(str(a.data())) - - def readFromStdOut(self) : - a=self.monExe.readAllStandardOutput() - self.w.view.append(str(a.data())) - - def readFromStdErrQT4(self): - a=self.monExe.readAllStandardError() - self.w.view.append(QString.fromUtf8(a.data(),len(a))) ; - - def readFromStdOutQT4(self) : - a=self.monExe.readAllStandardOutput() - self.w.view.append(QString.fromUtf8(a.data(),len(a))) ; - - #-----------------------# - def generDico(self): - #-----------------------# - if 'dico' in generator.plugins: - self.generator=generator.plugins['dico']() - jdc_formate=self.generator.gener(self.jdc) - dico=self.generator.Dico - return dico - - #-----------------------# - def gestionParam(self): - #-----------------------# - w = MonWidgetCreeParam( self) - w.show() - - #-----------------------# - def viewJdcSource(self): - #-----------------------# - if self.fichier == None : return - f=open(self.fichier,'r') - texteSource=f.read() - f.close() - self._viewText(texteSource, "JDC_SOURCE") - - #-----------------------# - def viewJdcPy(self): - #-----------------------# - strSource = str( self.get_text_JDC(self.format) ) - self._viewText(strSource, "JDC_RESULTAT") - - #-----------------------# - def viewJdcRapport(self): - #-----------------------# - strRapport = six.text_type( self.jdc.report() ) - # on ajoute les regles - - self._viewText(strRapport, "JDC_RAPPORT") - - #-----------------------# - def viewJdcRegles(self): - #-----------------------# - if self.tree :self.tree.AppelleBuildLBRegles() - - - #----------------# - def closeIt(self): - #----------------# - """ - Public method called by the viewmanager to finally get rid of us. - """ - if self.jdc: - self.jdc.supprime() - self.close() - - #----------------------------------------------# - def affiche_infos(self,message,couleur=Qt.black): - #----------------------------------------------# - if self.sb: - mapalette=self.sb.palette() - mapalette.setColor( QPalette.WindowText, couleur ) - self.sb.setPalette( mapalette ); - self.sb.showMessage(message,4000) - self.couleur=couleur - - #------------------------------# - def affiche_alerte(self,titre,message): - #------------------------------# - # appele par I_MACRO_ETAPE - QMessageBox.information( self, titre, message) - - #-----------------------------------# - def affiche_commentaire(self,message): - #-----------------------------------# - self.labelCommentaire.setText(message) - QTimer.singleShot(6000, self.rendInvisible) - - #----------------------# - def rendInvisible(self): - #----------------------# - self.labelCommentaire.setText("") - - #-------------------# - def init_modif(self): - #-------------------# - """ - Met l'attribut modified a 'o' : utilise par Eficas pour savoir - si un JDC doit etre sauvegarde avant destruction ou non - """ - self.modified = True - - #---------------------------------------# - def chercheNoeudSelectionne(self,copie=1): - #---------------------------------------# - """ - appele par Cut et Copy pour positionner self.node_selected - """ - self.node_selected=[] - if len(self.tree.selectedItems()) == 0 : return - self.node_selected=self.tree.selectedItems() - - - #---------------------# - def handleSupprimer(self): - #---------------------# - self.chercheNoeudSelectionne() - if len(self.node_selected) == 0 : return - self.QWParent.noeud_a_editer = [] - if self.node_selected[0]==self.tree.racine: return - if len(self.node_selected) == 1 : self.node_selected[0].delete() - else : self.node_selected[0].deleteMultiple(self.node_selected) - - #---------------------# - def handleRechercher(self): - #---------------------# - from .monRecherche import DRecherche - monRechercheDialg=DRecherche(parent=self,fl=0) - monRechercheDialg.show() - - - #--------------------------------# - def handleRechercherDsCatalogue(self): - #-----------------------------# - from .monRechercheCatalogue import DRechercheCatalogue - monRechercheDialg=DRechercheCatalogue(self.QWParent,self) - monRechercheDialg.show() - - #---------------------# - def handleDeplier(self): - #---------------------# - if self.tree == None : return - #self.tree.collapseAll() - if self.deplier : - #print "je plie" - self.tree.expandItem(self.tree.topLevelItem(0)) - self.deplier = False - if self.fenetreCentraleAffichee != None : - if hasattr(self.fenetreCentraleAffichee.node,'plieToutEtReaffiche'): - self.fenetreCentraleAffichee.node.plieToutEtReaffiche() - else: - #print "je deplie" - self.tree.expandItem(self.tree.topLevelItem(0)) - self.deplier = True - if self.fenetreCentraleAffichee != None : - if hasattr(self.fenetreCentraleAffichee.node,'deplieToutEtReaffiche'): - self.fenetreCentraleAffichee.node.deplieToutEtReaffiche() - - #---------------------# - def handleEditCut(self): - #---------------------# - """ - Stocke dans Eficas.noeud_a_editer le noeud a couper - """ - #print "handleEditCut" - self.chercheNoeudSelectionne() - self.QWParent.edit="couper" - self.QWParent.noeud_a_editer = self.node_selected - - #-----------------------# - def handleEditCopy(self): - #-----------------------# - """ - Stocke dans Eficas.noeud_a_editer le noeud a copier - """ - self.chercheNoeudSelectionne() - if len(self.node_selected) == 0 : return - if len(self.node_selected) == 1 : self.node_selected[0].update_node_label_in_blue() - else : self.node_selected[0].update_plusieurs_node_label_in_blue(self.node_selected) - self.QWParent.edit="copier" - self.QWParent.noeud_a_editer = self.node_selected - - #------------------------# - def handleEditPaste(self): - #------------------------# - """ - Lance la copie de l'objet place dans self.QWParent.noeud_a_editer - Ne permet que la copie d'objets de type Commande ou MCF - """ - self.chercheNoeudSelectionne() - if (not(hasattr(self.QWParent,'noeud_a_editer'))) or len(self.QWParent.noeud_a_editer)==0: - QMessageBox.information( self, - tr("Copie impossible"), - tr("Veuillez selectionner un objet a copier")) - return - if len(self.node_selected) != 1 : - QMessageBox.information( self, - tr("Copie impossible"), - tr("Veuillez selectionner un seul objet : la copie se fera apres le noeud selectionne")) - return - noeudOuColler=self.node_selected[0] - - if len(self.QWParent.noeud_a_editer)!=1: - #self.handleEditPasteMultiple() - QMessageBox.information( self, tr("Copie impossible"), tr("Aucun Objet n a ete copie ou coupe")) - return - - noeudACopier=self.QWParent.noeud_a_editer[0] - - if (self.QWParent.edit != "couper"): - #print (noeudOuColler.item.parent.get_child(noeudOuColler.item.nom)) - try: - if noeudOuColler == self.tree.racine : - child=noeudOuColler.doPastePremier(noeudACopier) - else : - child=noeudACopier.doPaste(noeudOuColler,'after') - - if child==None or child==0: - QMessageBox.critical( self,tr( "Copie refusee"),tr('Eficas n a pas reussi a copier l objet')) - self.message = '' - self.affiche_infos("Copie refusee",Qt.red) - if noeudACopier.treeParent.editor != noeudOuColler.treeParent.editor: - try : - nom=noeudACopier.item.sd.nom - child.item.nomme_sd(nom) - except : - pass - return - self.init_modif() - child.select() - except : - traceback.print_exc() - QMessageBox.critical( self,tr( "Copie refusee"),tr('Copie refusee pour ce type d objet')) - self.message = '' - self.affiche_infos("Copie refusee",Qt.red) - return - - # il faut declarer le JDCDisplay_courant modifie - # suppression eventuelle du noeud selectionne - # si possible on renomme l objet comme le noeud couper - - if (self.QWParent.edit == "couper"): - print ('je pass la') - if noeudACopier.treeParent.editor != noeudOuColler.treeParent.editor: - QMessageBox.critical( self, tr("Deplacement refuse"),tr('Deplacement refuse entre 2 fichiers. Seule la copie est autorisee ')) - - #if 1: - try : - # indexNoeudACopier=noeudACopier.treeParent.children.index(noeudACopier) - indexNoeudACopier=self.getTreeIndex(noeudACopier) - noeudACopier.treeParent.item.deplaceEntite(indexNoeudACopier,indexNoeudOuColler,pos) - noeudACopier.treeParent.build_children() - - #else: - except: - pass - self.QWParent.noeud_a_editer=[] - - # on rend la copie a nouveau possible en liberant le flag edit - self.QWParent.edit="copier" - noeudACopier.select() - - #----------------------------------# - def handleDeplaceMultiple(self): - #----------------------------------# - pass - - #----------------------------------# - def handleEditPasteMultiple(self): - #----------------------------------# - - # On ne garde que les niveaux "Etape" - # On insere dans l'ordre du JDC - listeNoeudsACouper=[] - listeIndex=[] - listeChild=[] - listeItem=[] - from InterfaceQT4 import compojdc - noeudOuColler=self.node_selected[0] - if not (isinstance(noeudOuColler.treeParent, compojdc.Node)): - QMessageBox.information( self, - tr("Copie impossible a cet endroit",), - tr("Veuillez selectionner une commande, un parametre, un commentaire ou une macro")) - return - indexNoeudOuColler=noeudOuColler.treeParent.children.index(noeudOuColler) - - for noeud in self.QWParent.noeud_a_editer : - if not (isinstance(noeud.treeParent, compojdc.Node)): continue - indexInTree=noeud.treeParent.children.index(noeud) - indice = 0 - for index in listeIndex: - if index < indexInTree : indice = indice +1 - listeIndex.insert(indice, indexInTree) - listeNoeudsACouper.insert(indice, noeud) - - noeudJdc=noeudOuColler.treeParent - dejaCrees=0 - # on les cree a l'envers parcequ'on ajoute a NoeudOuColler - listeIndex.reverse() - for index in listeIndex: - indexTravail=index - if indexNoeudOuColler < index: - indexTravail=indexTravail+dejaCrees - noeudOuColler=noeudJdc.children[indexNoeudOuColler] - noeud=noeudJdc.children[indexTravail] - child=noeud.doPaste(noeudOuColler) - listeChild.append(child) - dejaCrees=dejaCrees+1 - - self.QWParent.noeud_a_editer = [] - for i in range(len(listeIndex)): - noeud=noeudJdc.children[indexNoeudOuColler+1+i] - self.QWParent.noeud_a_editer.append(noeud) - - listeASupprimer=[] - if self.QWParent.edit !="couper" : return - - for index in listeIndex: - indexTravail=index - if indexNoeudOuColler < index: - indexTravail=indexTravail+(len(listeIndex)) - noeud=noeudJdc.children[indexTravail] - - listeItem.append(noeud.item) - listeASupprimer.append(noeud) - - for i in range(len(listeChild)): - self.tree.item.suppitem(listeItem[i]) - listeChild[i].item.update(listeItem[i]) - - self.QWParent.noeud_a_editer = [] - - - #---------------------# - def getFileName(self): - #---------------------# - return self.fichier - - #---------------------------# - def get_file_variable(self) : - #---------------------------# - titre = tr("Choix d'un fichier XML") - texte = tr("Le fichier contient une commande MODEL\n") - texte = texte+tr('Donnez le nom du fichier XML qui contient la description des variables') - QMessageBox.information( self, titre,tr(texte)) - - fichier = QFileDialog.getOpenFileName(self.appliEficas, - tr('Ouvrir Fichier'), - self.appliEficas.CONFIGURATION.savedir, - tr('Wrapper Files (*.xml);;''All Files (*)')) - return fichier - - #--------------------------------------------------# - def writeFile(self, fn, txt = None,formatLigne="beautifie"): - #--------------------------------------------------# - """ - Public slot to write the text to a file. - - @param fn filename to write to string - @return flag indicating success - """ - - fn = six.text_type(fn) - - if txt == None : - txt = self.get_text_JDC(self.format,formatLigne=formatLigne) - eol = '\n' - if len(txt) >= len(eol): - if txt[-len(eol):] != eol: - txt += eol - else: - txt += eol - txt=self.ajoutVersionCataDsJDC(txt) - checksum=self.get_checksum(txt) - txt=txt+checksum - if self.code=="TELEMAC" : return 1 - try: - f = open(fn, 'w') - f.write(txt) - f.close() - return 1 - except IOError as why: - if (self.appliEficas.ssIhm == False): - QMessageBox.critical(self, tr('Sauvegarde du Fichier'), - tr('Le fichier')+str(fn) + tr('n a pas pu etre sauvegarde : ') + str(why)) - else : - print (why) - return 0 - - #-----------------------------------------------------------# - def get_text_JDC(self,format,pourRun=0,formatLigne="beautifie"): - #-----------------------------------------------------------# - if self.code == "MAP" and not(format in generator.plugins): format = "MAP" - if format in generator.plugins: - - # Le generateur existe on l'utilise - self.generator=generator.plugins[format]() - try : - jdc_formate=self.generator.gener(self.jdc,format=formatLigne,config=self.appliEficas.CONFIGURATION,appli=self.appliEficas) - if pourRun : jdc_formate=self.generator.textePourRun - if self.code == 'TELEMAC' : jdc_formate=self.generator.texteDico - except ValueError as e: - QMessageBox.critical(self, tr("Erreur a la generation"),str(e)) - return - - if not self.generator.cr.estvide(): - self.affiche_infos(tr("Erreur a la generation"),Qt.red) - QMessageBox.critical( self, tr("Erreur a la generation"),tr("EFICAS ne sait pas convertir ce JDC")) - return "" - else: - return jdc_formate - else: - # Il n'existe pas c'est une erreur - self.affiche_infos(tr("Format %s non reconnu" , self.format),Qt.red) - QMessageBox.critical( self, "Format non reconnu" ,tr("EFICAS ne sait pas convertir le JDC selon le format "+ self.format)) - return "" - - #----------------------# - def get_Dico(self): - #---------------------# - if 'dicoImbrique' in generator.plugins: - self.generator=generator.plugins['dicoImbrique']() - jdc_formate=self.generator.gener(self.jdc) - dico=self.generator.Dico - return dico - else : - self.affiche_infos(tr("Format %s non reconnu" , self.format),Qt.red) - QMessageBox.critical( self, "Format non reconnu" ,tr("EFICAS ne sait pas convertir le JDC selon le format "+ self.format)) - return "" - - - #------------# - def run(self): - #------------# - fonction="run"+self.code - #print fonction - if fonction in JDCEditor.__dict__: JDCEditor.__dict__[fonction](self,) - - #------------# - def saveRun(self): - #------------# - fonction="saveRun"+self.code - if fonction in JDCEditor.__dict__: JDCEditor.__dict__[fonction](self,) - - #---------------# - def runMAP(self): - #---------------# - - if not(self.jdc.isvalid()): - QMessageBox.critical( self, tr( "Execution impossible "),tr("le JDC doit etre valide pour une execution MAP")) - return - if len(self.jdc.etapes) != 1 : - QMessageBox.critical( self, tr("Execution impossible "),tr("le JDC doit contenir un et un seul composant")) - return - if self.modified or self.fichier==None : - self.fichierMapInput = self.__generateTempFilename(prefix = "map_run", suffix = ".map") - texte=self.get_text_JDC("MAP") - self.writeFile( self.fichierMapInput, txt = texte) - else : - self.fichierMapInput=self.fichier - composant=self.jdc.etapes[0].nom.lower()[0:-5] - - - # :TRICKY: to determine if a component requires SALOME, loads the component from Eficas catalog - # then instantiate corresponding class and call getUseSalome() method - try: - from mapengine.spec import factory - mapComponent = factory.new(composant)[0] - - command = "map" - if mapComponent.getUseSalome(): - command += " -r sappli" - textePython=(command + " run -n "+composant +" -i "+self.fichierMapInput) - - #textePython="ls -l" - self._viewTextExecute( textePython,"map_run",".sh") - #try: - # commande="rm "+self.fichierMapInput - # os.system(commande) - #except : - # pass - except Exception as e: - print((traceback.print_exc())) - - #-------------------# - def runZCRACKS(self): - #-------------------# - if not(self.jdc.isvalid()): - QMessageBox.critical( self, tr( "Execution impossible "),tr("le JDC doit etre valide pour une execution ")) - return - if self.modified or self.fichier==None : - #if 1: - self.fichierZcracksInput = self.__generateTempFilename(prefix = "zcracks_run", suffix = ".z7p") - texte=self.get_text_JDC("ZCRACKS",pourRun=1) - self.writeFile( self.fichierZcracksInput, txt = texte) - else : - self.fichierZcracksInput=self.fichier - try : - #commande ="Zrun -zp " - commande="more " - textePython=(commande + self.fichierZcracksInput) - self._viewTextExecute( textePython,"run_zcracks",".sh") - except Exception as e: - print((traceback.print_exc())) - - #-------------------# - def runCARMELCND(self): - #-------------------# - #if not(self.jdc.isvalid()): - # QMessageBox.critical( self, tr( "Execution impossible "),tr("le JDC doit etre valide pour une execution ")) - # return - if self.modified or self.fichier==None : - QMessageBox.critical( self, tr( "Execution impossible "),tr("Sauvegarder SVP avant l'execution ")) - return - if not hasattr(self,'generator'): texte=self.get_text_JDC(self.format) - from PrepareRunCarmel import prepareRunCarmel - fichierGenerique=os.path.basename(self.fichier).split(".")[0] - repMed=os.path.dirname(self.fichier) - repExeCarmel=self.generator.get_repExeCarmel() - textePython=prepareRunCarmel(repExeCarmel,repMed,fichierGenerique) - nomFichier = self.__generateTempFilename("carmel_run", suffix = ".sh") - f=open(nomFichier,'w') - f.write(textePython) - f.close() - commande="xterm -e sh "+nomFichier +"\n" - os.system(commande) - - #-------------------# - def runCarmelCS(self): - #-------------------# - try : - commande="runSession pilotyacsCS.py" - os.system(commande) - except Exception as e: - print((traceback.print_exc())) - - #-----------------------------------------------------# - def determineNomFichier(self,path,extension): - #-----------------------------------------------------# - if self.appli.code in DictExtensions: - chaine1=DictExtensions[self.appli.code]+" (*."+DictExtensions[self.appli.code]+");;" - extensions= tr(chaine1+ "All Files (*)") - else : - extensions= tr("JDC (*.comm);;" "All Files (*)") - - if self.appli.code == "MAP" : - extensions = extensions + ";; Run (*.input);;" - - fn = QFileDialog.getSaveFileName( self, - tr("sauvegarde"), path, - extensions,None, - QFileDialog.DontConfirmOverwrite) - if fn == None : return (0, None) - fn=fn[0] - if fn=='': return (0, None) - - ext = QFileInfo(fn).suffix() - if ext == '': fn+=extension - - if QFileInfo(fn).exists(): - msgBox = QMessageBox(self) - msgBox.setWindowTitle(tr("Sauvegarde du Fichier")) - msgBox.setText(tr("Le fichier %s existe deja.", six.text_type(fn))) - msgBox.addButton(tr("&Ecraser"),0) - msgBox.addButton(tr("&Abandonner"),1) - abort=msgBox.exec_() - if abort == 1 : return (0, "") - return (1,fn) - - #-----------------# - def saveRunMAP(self): - #-----------------# - extension=".input" - if not(self.jdc.isvalid()): - QMessageBox.critical( self, tr( "Sauvegarde de l'input impossible "), - tr("Un JdC valide est necessaire pour creer un .input") - ) - return - try : - composant=self.jdc.etapes[0].nom.lower()[0:-5] - except : - QMessageBox.critical( self, tr( "Sauvegarde de l'input impossible "), - tr("Choix du composant obligatoire") - ) - return - if hasattr(self.CONFIGURATION, "savedir"): path=self.CONFIGURATION.savedir - else : path='C:/' - - monNomFichier="" - if self.fichier is not None and self.fichier != "" : - maBase=str(QFileInfo(self.fichier).baseName())+".input" - monPath=str(QFileInfo(self.fichier).absolutePath()) - monNomFichier=os.path.join(monPath,maBase) - elif hasattr(self,'monNomFichierInput'): - monNomFichier=self.monNomFichierInput - - - monDialog=QFileDialog(self.appliEficas) - monDialog.setDirectory (path) - monDialog.setWindowTitle ("Save") - - for c in monDialog.children(): - if isinstance(c,QDialogButtonBox): - for b in c.children(): - if isinstance(b,QPushButton): - avant=b.text() - if avant=="&Open": b.setText("Save") - mesFiltres= "input Map (*.input);;All Files (*)" - monDialog.setNameFilters(mesFiltres) - if monNomFichier!="" : monDialog.selectFile(monNomFichier) - BOk=monDialog.exec_() - if BOk==0: return - fn=str(monDialog.selectedFiles()[0]) - if fn == "" or fn == None : return - if not fn.endswith(".input"): - fn += ".input" - self.monNomFichierInput=fn - - if not hasattr(self, 'fichierMapInput') or not self.fichierMapInput or not os.path.exists(self.fichierMapInput): - self.fichierMapInput = self.__generateTempFilename(prefix = "map_run", suffix = ".map") - texte=self.get_text_JDC("MAP") - self.writeFile( self.fichierMapInput, txt = texte) - - cmd = ("map gen -t dat -n " + composant + " -i " + self.fichierMapInput + " -o " + fn) - p = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE) - (output, err) = p.communicate() - - - #-----------------# - def saveRunPSEN(self): - #-----------------# - print( "saveRunPSEN") - self.saveFile() - return - - - #-----------------------------------------# - def cherche_Groupes(self): - #-----------------------------------------# - listeMA,listeNO=self.get_text_JDC("GroupMA") - return listeMA,listeNO - - #-----------------------------------------# - def cherche_Dico(self): - #-----------------------------------------# - dicoCourant={} - format = self.appliEficas.format_fichier - if format in generator.plugins: - # Le generateur existe on l'utilise - self.generator=generator.plugins[format]() - jdc_formate=self.generator.gener(self.jdc,format='beautifie',config=self.appliEficas.CONFIGURATION) - dicoCourant=self.generator.dico - return dicoCourant - - - - #-----------------------------------------# - def handleAjoutGroup(self,listeGroup): - #-----------------------------------------# - try : - #if 1: - from ajoutGroupe import handleAjoutGroupFiltre - #print listeGroup - handleAjoutGroupFiltre(self,listeGroup) - #print "apres handleAjoutGroupFiltre" - except : - #else : - pass - - #-----------------------------------------------------------------# - def saveFileLegerAs(self, fileName = None) : - #-----------------------------------------------------------------# - if fileName != None : - self.fichier = fileName - return self.saveFileLeger() - return self.saveFileLeger() - - #-----------------------------------------------------------------# - def saveFileLeger(self, path = None, saveas= 0,formatLigne="beautifie"): - #-----------------------------------------------------------------# - extension='.casR' - fn = self.fichier - #saveas=True # Pour forcer le nom - self.generator=generator.plugins[self.format]() - if self.fichier is None or saveas: - if path is None: path=self.CONFIGURATION.savedir - bOK, fn=self.determineNomFichier(path,extension) - if bOK == 0 : return (0, None) - if fn == None : return (0, None) - if fn== '' : return (0, None) - - ulfile = os.path.abspath(six.text_type(fn)) - self.appliEficas.CONFIGURATION.savedir=os.path.split(ulfile)[0] - fn = six.text_type(QDir.toNativeSeparators(fn)) - - self.fichier = os.path.splitext(fn)[0]+extension - - if hasattr(self.generator, "writeLeger"): - self.generator.writeLeger(self.fichier,self.jdc,config=self.appliEficas.CONFIGURATION,appli=self.appliEficas) - - if self.salome : self.appliEficas.addJdcInSalome( self.fichier) - - self.modified = 0 - nouveauTitre=self.titre+" "+str(os.path.basename(self.fichier)) - self.appliEficas.setWindowTitle(nouveauTitre) - return (1, self.fichier) - - #-----------------------------------------------------------------# - def saveFile(self, path = None, saveas= 0,formatLigne="beautifie"): - #-----------------------------------------------------------------# - """ - Public slot to save the text to a file. - - @param path directory to save the file in (string or QString) - @return tuple of two values (boolean, string) giving a success indicator and - the name of the saved file - """ - - self.modified=1 - if not self.modified and not saveas: - return (0, None) # do nothing if text wasn't changed - - if self.appli.code in DictExtensions : - extension=DictExtensions[self.appli.code] - else : - extension='.comm' - - newName = None - fn = self.fichier - if self.fichier is None or saveas: - if path is None: path=self.CONFIGURATION.savedir - bOK, fn=self.determineNomFichier(path,extension) - if bOK == 0 : return (0, None) - if fn == None : return (0, None) - if fn== '' : return (0, None) - - ulfile = os.path.abspath(six.text_type(fn)) - self.appliEficas.CONFIGURATION.savedir=os.path.split(ulfile)[0] - fn = six.text_type(QDir.toNativeSeparators(fn)) - newName = fn - - - if not (self.writeFile(fn,formatLigne=formatLigne)): return (0, None) - self.fichier = fn - self.modified = False - if self.fileInfo is None or saveas: - self.fileInfo = QFileInfo(self.fichier) - self.fileInfo.setCaching(0) - self.lastModified = self.fileInfo.lastModified() - if newName is not None: - self.appliEficas.addToRecentList(newName) - self.tree.racine.item.getObject().nom=os.path.basename(newName) - self.tree.racine.update_node_label() - - if self.jdc.isvalid() != 0 and hasattr(self.generator, "writeDefault"): - self.generator.writeDefault(fn) - elif self.code=="TELEMAC" and hasattr(self.generator, "writeDefault"): - self.generator.writeDefault(fn) - - if self.salome : - self.appliEficas.addJdcInSalome( self.fichier) - self.modified = 0 - nouveauTitre=self.titre+" "+str(os.path.basename(self.fichier)) - self.appliEficas.setWindowTitle(nouveauTitre) - - return (1, self.fichier) -# - - #----------------------------------------------# - def sauveLigneFile(self): - #----------------------------------------------# - self.modified=1 - return self.saveFile(formatLigne="Ligne") - - - #----------------------------------------------# - def saveFileAs(self, path = None,fileName=None): - #----------------------------------------------# - """ - Public slot to save a file with a new name. - - @param path directory to save the file in (string or QString) - @return tuple of two values (boolean, string) giving a success indicator and - the name of the saved file - """ - if fileName != None : - self.fichier = fileName - return self.saveFile() - return self.saveFile(path,1,"beautifie") - - - - #---------------------------------------------# - def get_file(self,unite=None,fic_origine = ''): - #---------------------------------------------# - # appele par I_JDC - ulfile = None - jdcText = "" - - titre = "" - - if unite : - titre = tr("Choix unite %d ", unite) - texte = tr("Le fichier %s contient une commande INCLUDE \n", str(fic_origine)) +"\n" - texte = texte+ tr("Donnez le nom du fichier correspondant a l unite logique ") + repr(unite) - labeltexte = tr('Fichier pour unite ') + repr( unite) - else: - titre = tr("Choix d'un fichier de poursuite") - texte = tr("Le fichier %s contient une commande POURSUITE\n", fic_origine) - texte = texte+tr('Donnez le nom du fichier dont vous \n voulez faire une poursuite') - - QMessageBox.information( self, titre,texte) - fn = QFileDialog.getOpenFileName(self.appliEficas, - titre, - self.appliEficas.CONFIGURATION.savedir) - - # ce retour est impose par le get_file d'I_JDC - if fn== '' : return None," " - if not fn : return (0, " ") - fn=fn[0] - - ulfile = os.path.abspath(six.text_type(fn)) - self.appliEficas.CONFIGURATION.savedir=os.path.split(ulfile)[0] - - # On utilise le convertisseur defini par format_fichier - source=self.get_source(ulfile) - if source: - # On a reussia convertir le fichier self.ulfile - jdcText = source - else: - # Une erreur a ete rencontree - jdcText = '' - return ulfile, jdcText - - #-----------------------------------# - def updateJdc(self, itemApres,texte): - #------------------------------------# - # ajoute une etape de JdC a partir d un texte - monItem=itemApres - etape=monItem.item.object - CONTEXT.set_current_step(etape) - etape.build_includeInclude(texte) - self.tree.racine.build_children() - - #-----------------------------------# - def updateJdcEtape(self, itemApres,texte): - #------------------------------------# - # ajoute une etape de JdC a partir d un texte - monItem=itemApres - etape=monItem.item.object - CONTEXT.set_current_step(etape) - try : - ok=etape.build_includeEtape(texte) - except : - ok=0 - if not ok : - QMessageBox.information( self, - tr("Import texte"), - tr("Impossible d importer le texte")) - self.tree.racine.build_children() - return ok - - - - - - - #----------------------------------------------# - def ajoutMCFact(self,etape,MCFils,listeAvant=()): - #----------------------------------------------# - # dans le JDC - print ('ajoutMCFact') - ouChercher=etape - print (ouChercher) - for mot in listeAvant : - ouChercher=ouChercher.get_child(mot,restreint="oui") - print (mot) - print (ouChercher) - monMC=etape.get_child(ouChercher,restreint="oui") - if monMC== None : monMC= ouChercher.addentite(MCFils) - monMC.isvalid() - - #-------------------------------------# - def getValeur(self,nomEtape,MCFils,listeAvant=()): - #-------------------------------------# - # dans le JDC - - ouChercher=None - for e in self.jdc.etapes: - if e.nom == nomEtape : ouChercher=e; break - if ouChercher==None : return None - for mot in listeAvant : - ouChercher=ouChercher.get_child(mot,restreint="oui") - #print (mot, ouChercher) - if ouChercher==None : return None - monMC=ouChercher.get_child(MCFils,restreint="oui") - if monMC== None : return None - return monMC.valeur - - #-----------------------------------------------------------# - def setValeur(self,nomEtape,MCFils,valeur,listeAvant=()): - #--------------------------------------------------------# - # dans le JDC - - ouChercher=None - for e in self.jdc.etapes: - if e.nom == nomEtape : ouChercher=e; break - if ouChercher==None : return None - for mot in listeAvant : - ouChercher=ouChercher.get_child(mot,restreint="oui") - #print (mot, ouChercher) - if ouChercher==None : return None - monMC=ouChercher.get_child(MCFils,restreint="oui") - monMC.set_valeur(valeur) - monMC.isvalid() - - - #-------------------------------------# - def deleteEtape(self,etape): - #-------------------------------------# - self.jdc.suppentite(etape) - - #-------------------------------------# - def deleteMC(self,etape,MCFils,listeAvant=()): - #-------------------------------------# - ouChercher=etape - for mot in listeAvant : - ouChercher=ouChercher.get_child(mot,restreint="oui") - monMC=ouChercher.get_child(MCFils,restreint="oui") - if monMC != None : ouChercher.suppentite(monMC) - ouChercher.state='changed' - ouChercher.isvalid() - - #-------------------------------------# - def ajoutMC(self,etape,MCFils,valeurs,listeAvant=()): - #-------------------------------------# - print('debut ajoutMC') - ouChercher=etape - for mot in listeAvant : - ouChercher=ouChercher.get_child(mot,restreint="oui") - monMC=etape.get_child(ouChercher,restreint="oui") - print( monMC) - if monMC== None : monMC= ouChercher.addentite(MCFils) - monMC.valeur=valeurs - monMC.val=valeurs - monMC.state='changed' - monMC.isvalid() - print(monMC) - - - #-----------------------------------------------------------# - def changeIntoMC(self,etape,MCFils,valeurs, listeAvant=()): - #-----------------------------------------------------------# - ouChercher=etape - for mot in listeAvant : - ouChercher=ouChercher.get_child(mot,restreint="oui") - if ouChercher ==None : print( 'SOUCI'); return - monMC=ouChercher.get_child(MCFils,restreint="oui") - if monMC== None : monMC= ouChercher.addentite(MCFils) - monMC.definition.into=valeurs - monMC.state='changed' - monMC.isvalid() - - #-------------------------------------# - def changeIntoDefMC(self,etape,listeMC,valeurs): - #-------------------------------------# - definitionEtape=getattr(self.jdc.cata[0],etape) - ouChercher=definitionEtape - if len(listeMC) > 1 : - for mc in listeMC[0:-1]: - mcfact=ouChercher.entites[mc] - ouChercher=mcfact - - mcAccas=ouChercher.entites[listeMC[-1]] - mcAccas.into=valeurs - - #-------------------------------------------------------------# - def deleteDefinitionMC(self,etape,listeAvant,nomDuMC): - #-------------------------------------------------------------# - #print 'in deleteDefinitionMC', etape,listeAvant,nomDuMC - definitionEtape=getattr(self.jdc.cata[0],etape) - ouChercher=definitionEtape - for k in listeAvant : - ouChercher=ouChercher.entites[k] - MCADetruire=ouChercher.entites[nomDuMC] - ouChercher.ordre_mc.remove(nomDuMC) - del ouChercher.entites[nomDuMC] - del self.dicoNouveauxMC[nomDuMC] - - - #-------------------------------------------------------------# - def ajoutDefinitionMC(self,etape,listeAvant,nomDuMC,typ,**args): - #-------------------------------------------------------------# - print('debut ajoutDefinitionMC') - definitionEtape=getattr(self.jdc.cata[0],etape) - ouChercher=definitionEtape - for k in listeAvant : - ouChercher=ouChercher.entites[k] - from Accas import A_SIMP - Nouveau=A_SIMP.SIMP(typ,**args) - Nouveau.pere=ouChercher - Nouveau.nom=nomDuMC - Nouveau.ordre_mc=[] - ouChercher.entites[nomDuMC]=Nouveau - ouChercher.ordre_mc.append(nomDuMC) - self.dicoNouveauxMC[nomDuMC]=('ajoutDefinitionMC',etape,listeAvant,nomDuMC,typ,args) - print( self.dicoNouveauxMC) - print('fin ajoutDefinitionMC') - - #----------------------------------------------------# - def changeIntoMCandSet(self,etape,MCFils,into,valeurs): - #----------------------------------------------------# - monMC=etape.get_child(MCFils,restreint="oui") - if monMC== None : monMC= etape.addentite(MCFils) - monMC.definition.into=into - monMC.valeur=valeurs - monMC.val=valeurs - monMC.state='changed' - monMC.isvalid() - - - - - #-------------------------------------------------------------------# - def reCalculeValiditeMCApresChgtInto(self,nomEtape,MCFils,listeAvant=()): - #-------------------------------------------------------------------# - # dans le JDC - for e in self.jdc.etapes: - if e.nom == nomEtape : ouChercher=e; break - - for mot in listeAvant : - try : - ouChercher=ouChercher.get_child(mot,restreint="oui") - # Le mot clef n est pas la - except : return 0 - try : - monMC=ouChercher.get_child(MCFils,restreint="oui") - # Le mot clef n est pas la - except : return 0 - if monMC == None : return 0 - - if hasattr(monMC.definition,'into') : - if type(monMC.definition.into) ==types.FunctionType : maListeDeValeur=monMC.definition.into() - else : maListeDeValeur=monMC.definition.into - else : - return 0 - - monMC.state='changed' - return 1 - - #-------------------------------------# - def changeDefautDefMC(self,nomEtape,listeMC,valeurs): - #-------------------------------------# - # dans le MDD - - #if isinstance (etape, str): - # for e in self.jdc.etapes: - # if e.nom == etape : etape=e; break - #if etape == None : return - definitionEtape=getattr(self.jdc.cata[0],nomEtape) - ouChercher=definitionEtape - if len(listeMC) > 1 : - - for mc in listeMC[0:-1]: - mcfact=ouChercher.entites[mc] - ouChercher=mcfact - - mcAccas=ouChercher.entites[listeMC[-1]] - mcAccas.defaut=valeurs - return 1 - - - - - #---------------------------------------------------------------------# - def ajoutDefinitionMCFact(self,nomEtape,listeAvant,nomDuMC,listeMC,**args): - #---------------------------------------------------------------------# - # dans le MDD - print ('ajoutDefinitionMCFact', nomDuMC) - definitionEtape=getattr(self.jdc.cata[0],nomEtape) - ouChercher=definitionEtape - for k in listeAvant : - ouChercher=ouChercher.entites[k] - from Accas import A_SIMP - for mc in listeMC : - nomMC=mc[0] - typMC=mc[1] - argsMC=mc[2] - nouveauMC=A_SIMP.SIMP(typMC,**argsMC) - nouveauMC.nom=nomMC - args[nomMC]=nouveauMC - from Accas import A_FACT - nouveauFact=A_FACT.FACT(**args) - nouveauFact.pere=ouChercher - nouveauFact.nom=nomDuMC - from Editeur.autre_analyse_cata import traite_entite - traite_entite(nouveauFact,[]) - ouChercher.entites[nomDuMC]=nouveauFact - ouChercher.ordre_mc.append(nomDuMC) - self.dicoNouveauxFact[nomDuMC]=('ajoutDefinitionMC',nomEtape,listeAvant,nomDuMC,listeMC,args) - #print self.dicoNouveauxMC - - - - #-------------------------------------# - def ajoutVersionCataDsJDC(self,txt): - #-------------------------------------# - if not hasattr(self.readercata.cata[0],'VERSION_CATALOGUE'): return txt - ligneVersion="#VERSION_CATALOGUE:"+self.readercata.cata[0].VERSION_CATALOGUE+":FIN VERSION_CATALOGUE\n" - texte=txt+ligneVersion - return texte - - #-------------------------------------# - def verifieVersionCataDuJDC(self,text): - #-------------------------------------# - memeVersion=False - indexDeb=text.find("#VERSION_CATALOGUE:") - indexFin=text.find(":FIN VERSION_CATALOGUE") - if indexDeb < 0 : - self.versionCataDuJDC="sans" - textJDC=text - else : - self.versionCataDuJDC=text[indexDeb+19:indexFin] - textJDC=text[0:indexDeb]+text[indexFin+23:-1] - - self.versionCata="sans" - if hasattr(self.readercata.cata[0],'VERSION_CATALOGUE'): self.versionCata=self.readercata.cata[0].VERSION_CATALOGUE - - if self.versionCata==self.versionCataDuJDC : memeVersion=True - return memeVersion,textJDC - - #-------------------------------# - def traduitCatalogue(self,texte): - #-------------------------------# - nomTraducteur="traduit"+self.readercata.code+self.versionCataDuJDC+"To"+self.versionCata - sys.path.append(os.path.abspath(os.path.join(os.path.dirname(os.path.abspath(__file__)),"../Traducteur"))) - try : - traducteur=__import__(nomTraducteur) - monTraducteur=traducteur.MonTraducteur(texte) - nouveauTexte=monTraducteur.traduit() - return nouveauTexte - except : - return texte - - - #------------------------------# - def verifieCHECKSUM(self,text): - #------------------------------# - indexDeb=text.find("#CHECKSUM:") - if indexDeb < 0 : - return 1, text - indexFin=text.find(":FIN CHECKSUM") - checkAvant=text[indexDeb:indexFin+13] - textJDC=text[0:indexDeb]+text[indexFin+13:-1] - checksum=self.get_checksum(textJDC) - pareil=(checkAvant==checksum) - return pareil, textJDC - - #---------------------------# - def get_checksum(self,texte): - #---------------------------# - newtexte=texte.replace('"','\\"') - commande='echo "'+newtexte+'"|md5sum' - a=os.popen(commande) - checksum=a.read() - a.close() - ligne="#CHECKSUM:"+checksum[0:-1]+":FIN CHECKSUM" - return ligne - - - #---------------------------# - def _new_CF(self): - #---------------------------# - texte="CONDUITE_FORCEE();" - return texte - - - #---------------------------# - def _newTELEMAC(self): - #---------------------------# - #texte="INITIALIZATION();BOUNDARY_CONDITIONS();GENERAL_PARAMETERS();PHYSICAL_PARAMETERS();NUMERICAL_PARAMETERS();" - texte="COMPUTATION_ENVIRONMENT();HYDRO();GENERAL_PARAMETERS();NUMERICAL_PARAMETERS()" - #texte="TRACERS();" - return texte - - #---------------------------# - def _newPSEN(self): - #---------------------------# - if 'PF_PARAMETERS' in self.Ordre_Des_Commandes: - texte = "DIRECTORY() ;PF_PARAMETERS() ; SIMULATION() ; sansnom=DISTRIBUTION() ; sansnom=DISTRIBUTION() ; CORRELATION() ;" - else: - texte = "DIRECTORY() ; PSSE_PARAMETERS() ; SIMULATION() ; sansnom=DISTRIBUTION() ; sansnom=DISTRIBUTION() ; CORRELATION() ;" - # texte="" - return texte - - #---------------------------# - def _newPSEN_N1(self): - #---------------------------# - texte="CASE_SELECTION();N_PROCESSING_OPTIONS();CONTINGENCY_OPTIONS();CONTINGENCY_SELECTION();\nCONTINGENCY_PROCESSING(); " - #texte="CONTINGENCY_SELECTION();\nCONTINGENCY_PROCESSING(); " - return texte - - #---------------------------# - - #---------------------------# - def _newZCRACKS(self): - #---------------------------# - texte="MAILLAGES();REMESHING();" - return texte - - #---------------------------# - def _newJDCCND(self): - #---------------------------# - extensions=tr('Fichiers Med (*.med);;''Tous les Fichiers (*)') - - #if self.salome == 0 : - QMessageBox.information( self, - tr("Fichier Med"), - tr("Veuillez selectionner un fichier Med")) - QSfichier = QFileDialog.getOpenFileName(self.appliEficas, - caption='Fichier Med', - filter=extensions) - QSfichier=QSfichier[0] - self.fichierMED=QSfichier - from acquiertGroupes import getGroupes - erreur,self.listeGroupes,self.nomMaillage,self.dicoCoord=getGroupes(self.fichierMED) - if erreur != "" : print ("a traiter") - texteComm="COMMENTAIRE(u'Cree - fichier : "+self.fichierMED +" - Nom Maillage : "+self.nomMaillage+"');\nPARAMETRES()\n" - texteSources="" - texteCond="" - texteNoCond="" - texteVcut="" - texteZs="" - for groupe in self.listeGroupes : - if groupe[0:8]=='CURRENT_': - texteSources +=groupe[8:]+"=SOURCE(" - texteSources +="VecteurDirecteur=(1.0,2.0,3.0,),);\n" - if groupe[0:5]=='COND_': texteCond +=groupe[5:]+"=CONDUCTEUR();\n" - if groupe[0:7]=='NOCOND_': texteNoCond +=groupe[7:]+"=NOCOND();\n" - if groupe[0:5]=='VCUT_': texteVcut +='V_'+groupe[5:]+"=VCUT();\n" - if groupe[0:3]=='ZS_': texteZs +=groupe[3:]+"=ZS();\n" - texte=texteComm+texteSources+texteCond+texteNoCond+texteVcut+texteZs - self.newTexteCND=texte - self.modified=1 - return texte - - - #---------------------------# - def BoutonFileSelected(self): - #---------------------------# - - QSfichier=self.openfile.selectedFiles()[0] - self.fichierMED=str(QSfichier) - from acquiertGroupes import getGroupes - erreur,self.listeGroupes,self.nomMaillage=getGroupes(self.fichierMED) - if erreur != "" : print ("a traiter") - - #----------------------------- - def BoutonSalomePressed(self): - #---------------------------- - Msg,self.listeGroupes=self.appliEficas.ChercheGrpMailleInSalome() - self.fichierMED="A_partir_de_SMESH" - self.nomMaillage="A_partir_de_SMESH" - self.openfile.close() - - - #----------------------------------------- - def initSplitterSizes(self, nbWidget=3): - #----------------------------------------- - #print ("je passe ds initSplitterSizes", nbWidget) - - if self.code in [ 'Adao', 'ADAO', ] : self.splitterSizes3=[1,1550,150] - elif self.code in [ 'MAP'] : self.splitterSizes3=[700,300] - else : self.splitterSizes3=[150,1000,300] - - if self.code in [ 'Adao', 'ADAO', ] : self.splitterSizes2=[5,1500] - else : self.splitterSizes2=[300,1000] - - - - #----------------------------------------- - def restoreSplitterSizes(self,nbWidget=3): - #---------------------------------------- - - #traceback.print_stack() - #print ("je passe ds restoreSplitterSizes") - if not(hasattr(self,'splitter')) : return - if nbWidget==2 : newSizes=self.splitterSizes2 - if nbWidget==3 : newSizes=self.splitterSizes3 - #self.inhibeSplitter = 1 - self.splitter.setSizes(newSizes) - #self.inhibeSplitter = 0 - QApplication.processEvents() - # seule la fentetre du milieu est necessaire - self.splitter.widget(1).resizeEvent=self.saveSplitterSizes - - #----------------------------------------- - def saveSplitterSizes(self,event): - #----------------------------------------- - #print ("je passe ds saveSplitterSizes") - if self.inhibeSplitter : return - if self.widgetOptionnel == None : self.splitterSizes2 = self.splitter.sizes()[0:2] - else : self.splitterSizes3 = self.splitter.sizes()[0:3] - - #------------------------ - def fermeOptionnel(self): - #------------------------ - if self.widgetOptionnel == None : return - - self.inhibeSplitter=1 - self.widgetOptionnel.setParent(None) - self.widgetOptionnel.close() - self.widgetOptionnel.deleteLater() - self.widgetOptionnel=None - self.inhibeSplitter=0 - self.restoreSplitterSizes(2) - - #------------------------ - def ajoutOptionnel(self): - #------------------------ - #if len(self.splitterSizes) == 2 : self.splitterSizes.append(self.oldSizeWidgetOptionnel) - #else : self.splitterSizes[2] = self.oldSizeWidgetOptionnel # ceinture pour les close bizarres - #self.splitterSizes[1] = self.splitterSizes[1] - self.splitterSizes[2] - - self.restoreSplitterSizes(3) - - - #------------------------ - def fermeArbre(self): - #------------------------ - #print (self.widgetTree) - self.oldWidgetTree=self.widgetTree - self.widgetTree.hide() - #self.widgetTree=None - - #------------------------ - def ouvreArbre(self): - #------------------------ - #print ('je passe la') - #print (self.widgetTree) - #self.widgetTree=self.oldWidgetTree - self.widgetTree.show() - #self.restoreSplitterSizes(3) - - #----------------------------- - def getTreeIndex(self,noeud): - #---------------------------- - indexNoeud=-1 - if noeud in noeud.treeParent.children : - indexNoeud=noeud.treeParent.children.index(noeud) - else : - if hasattr(noeud,'vraiParent') : - noeudVrai = noeud - noeudVraiParent = noeud.vraiParent - while noeudVraiParent != noeud.treeParent and hasattr(noeudVraiParent,'vraiParent') : - noeudVrai = noeudVraiParent - noeudVraiParent = noeudVraiParent.vraiParent - pass - if noeudVraiParent == noeud.treeParent : - indexNoeud=noeud.treeParent.children.index(noeudVrai) - pass - pass - pass - return indexNoeud - -if __name__ == "__main__": - self.code='ASTER' - name='prefs_'+prefs.code - prefsCode=__import__(name) - - - if hasattr(prefsCode,'encoding'): - # Hack pour changer le codage par defaut des strings - import sys - reload(sys) - sys.setdefaultencoding(prefs.encoding) - del sys.setdefaultencoding - # Fin hack - -# code=options.code -# - app = QApplication(sys.argv) - mw = JDCEditor(None,'azAster.comm') - app.setMainWidget(mw) - app.connect(app, SIGNAL("lastWindowClosed()"), app, SLOT("quit()")) - mw.show() - - res = app.exec_loop() - sys.exit(res) diff --git a/InterfaceQT4/editor.py b/InterfaceQT4/editor.py index e9ab3864..e3259a91 100755 --- a/InterfaceQT4/editor.py +++ b/InterfaceQT4/editor.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/InterfaceQT4/editorJuillet.py b/InterfaceQT4/editorJuillet.py deleted file mode 100755 index 616587c1..00000000 --- a/InterfaceQT4/editorJuillet.py +++ /dev/null @@ -1,1249 +0,0 @@ -# -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 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 __future__ import absolute_import -from __future__ import print_function -try : - from builtins import str - from builtins import range -except : pass - -import types,sys,os, re -import subprocess -import traceback -import six - -from monCodeMeteoAppelRun import Profil_Neutre - - -from PyQt5.QtWidgets import QWidget, QMessageBox, QFileDialog, QApplication, QSplitter, QLabel -from PyQt5.QtGui import QPalette -from PyQt5.QtCore import QProcess, QFileInfo, QTimer, Qt, QDir, QSize - -import traceback - -# Modules Eficas -from Extensions.i18n import tr - -from Editeur import session -from Editeur import comploader -from Editeur import Objecttreeitem -from InterfaceQT4 import browser - -from desBaseWidget import Ui_baseWidget -from InterfaceQT4.monViewTexte import ViewText -from monWidgetCreeParam import MonWidgetCreeParam - -DictExtensions= {"MAP" : ".map", "TELEMAC" : '.cas'} -debug = False - - -from InterfaceQT4.editorSsIhm import JDCEditorSsIhm - - -class JDCEditor(JDCEditorSsIhm,Ui_baseWidget,QWidget): -# ----------------------------------------- # - """ - Editeur de jdc - """ - -# ---------------------------------------- -# Methodes faisant appel a ssIhm -# ---------------------------------------- - - def __init__ (self,appli,fichier = None, jdc=None, QWParent=None, units = None, include=0): - #------------------------------------------------------------------------------------------ - - - QWidget.__init__(self,None) - self.setupUi(self) - - self.inhibeSplitter=0 - self.widgetOptionnel=None - self.fenetreCentraleAffichee=None - self.dejaDansPlieTout=False - self.listeDesListesOuvertes=set() - self.afficheListesPliees=True - if appli!=None and hasattr(appli,"statusBar"): self.sb = appli.statusBar() - else : self.sb = None - self.QWParent=QWParent - - JDCEditorSsIhm. __init__ (self,appli,fichier, jdc,units,include) - - # Particularites IHM : met la fenetre a jour - - self.initSplitterSizes() - if self.code == "ASTER" or self.code == "monCode" : self.afficheListesPliees =True - if self.code == 'PSEN_N1' : self.afficheListesPliees = False - - #self.affiche=self.appliEficas.maConfiguration.affiche - - if self.code in ['MAP','CARMELCND','PSEN'] : self.maConfiguration.afficheCommandesPliees=False - if self.code in ['MAP',]: self.fermeArbre() - # self.widgetTree.close() - # self.widgetTree=None - - if self.maConfiguration.closeArbre: self.fermeArbre() - if self.maConfiguration.boutonDsMenuBar : self.appliEficas.remplitIconesCommandes() - - self.version_code = session.d_env.cata - - self.format = self.appliEficas.format_fichier - - self.node_selected = [] - self.deplier = True - self.message='' - self.afficheApresInsert=False - if self.maConfiguration.closeArbre : self.afficheApresInsert=True - if self.code in ['Adao','ADAO','MAP'] : self.afficheApresInsert=True - if self.code in ['TELEMAC',] : self.enteteQTree='premier' - else : self.enteteQTree='complet' - if self.code in ['Adao','ADAO','TELEMAC'] : self.affichePlie=True - else : self.affichePlie=False - - self.Commandes_Ordre_Catalogue =self.readercata.Commandes_Ordre_Catalogue - - if self.appliEficas.readercata.demandeCatalogue==True : - nomFichierTranslation='translatorFichier'+'_'+str(self.appliEficas.readercata.versionCode) - if hasattr(self.appliEficas.maConfiguration,nomFichierTranslation) : - translatorFichier=getattr(self.appliEficas.maConfiguration,nomFichierTranslation) - from Extensions import localisation - localisation.localise(None,self.appliEficas.langue,translatorFichier=translatorFichier) - - - if self.jdc_item and self.appliEficas.ssIhm==False : - self.tree = browser.JDCTree( self.jdc_item, self ) - self.appliEficas.construitMenu() - - self.adjustSize() - - - #-------------------------------# - def readFile(self, fn): - #--------------------------------# - """ - Public slot to read the text from a file. - @param fn filename to read from (string or QString) - """ - - jdc=JDCEditorSsIhm.readFile(self, fn) - - # Particularites IHM : met le titre de la fenetre a jour -# qApp.restoreOverrideCursor() - if self.fileInfo!= None : self.lastModified = self.fileInfo.lastModified() - nouveauTitre=self.titre+" "+os.path.basename(self.fichier) - self.appliEficas.setWindowTitle(nouveauTitre) - - return jdc - -# --------------------------------------------- -# Methodes Inchangees -# --------------------------------------------- -# _newJDC -# _newJDCInclude -# __generateTempFilename -# getSource -# generDico -# viewJdcSource -# viewJdcPy -# viewJdcRapport -# getFileName -# initModif -# writeFile -# getTextJDC -# verifieChecksum -# getChecksum -# getDico -# chercheGroupes -# chercheDico -# saveFileLegerAs - -# --------------------------------------------- -# Methodes Surchargees -# --------------------------------------------- - - #-----------------------------------------------------------------------# - def _viewText(self, txt, caption = "FILE_VIEWER",largeur=1200,hauteur=600): - #--------------------------------------------------------------------# - w = ViewText( self.QWParent,self ,caption,txt,largeur,hauteur) - w.show() - - #--------------------------------# - def informe(self,titre,txt,critique=True): - #--------------------------------# - if critique : - self.afficheInfos(tr(txt),Qt.red) - QMessageBox.critical( self, tr(titre), tr(txt)) - else : - QMessageBox.warning( self, tr(titre),tr(txt)) - - #--------------------------------# - def ajoutCommentaire(self): - #--------------------------------# - if self.tree.selectedItems()==[] : - QMessageBox.warning( self, tr("Pas de noeud selectionne"),tr("Selectionnez un Noeud \nLe commentaire sera place apres le noeud selectionne")) - return - noeudAvantCommentaire=self.tree.selectedItems()[0] - if noeudAvantCommentaire ==self.tree.racine : - self.tree.racine.appendChild("COMMENTAIRE",pos=0) - return - noeudAvantCommentaire.addComment(True) - - - #----------------------------------------------# - def _viewTextExecute(self, txt, prefix, suffix): - #----------------------------------------------# - self.w = ViewText( self.QWParent ) - self.w.setWindowTitle( "execution" ) - self.monExe=QProcess(self.w) - pid=self.monExe.pid() - nomFichier = self.__generateTempFilename(prefix, suffix = ".sh") - f=open(nomFichier,'w') - f.write(txt) - f.close() - self.monExe.readyReadStandardOutput.connect( self.readFromStdOut) - self.monExe.readyReadStandardError.connect( self.readFromStdErr) - exe='sh ' + nomFichier - self.monExe.start(exe) - self.monExe.closeWriteChannel() - self.w.exec_() - try: - commande="rm "+ nomFichier - os.system(commande) - except : - pass - - def readFromStdErr(self): - a=self.monExe.readAllStandardError() - self.w.view.append(str(a.data())) - - def readFromStdOut(self) : - a=self.monExe.readAllStandardOutput() - self.w.view.append(str(a.data())) - - - #-----------------------# - def gestionParam(self): - #-----------------------# - w = MonWidgetCreeParam( self) - w.show() - - - #----------------# - def closeIt(self): - #----------------# - """ - Public method called by the viewmanager to finally get rid of us. - """ - if self.jdc: self.jdc.supprime() - self.close() - - #----------------------------------------------# - def afficheInfos(self,message,couleur=Qt.black): - #----------------------------------------------# - if couleur=='red' : couleur = Qt.red - if self.sb: - mapalette=self.sb.palette() - mapalette.setColor( QPalette.WindowText, couleur ) - self.sb.setPalette( mapalette ); - self.sb.showMessage(message,4000) - self.couleur=couleur - - #------------------------------# - def afficheAlerte(self,titre,message): - #------------------------------# - # appele par I_MACRO_ETAPE - QMessageBox.information( self, titre, message) - - #-----------------------------------# - def afficheCommentaire(self,message): - #-----------------------------------# - self.labelCommentaire.setText(message) - QTimer.singleShot(6000, self.rendInvisible) - - #----------------------# - def rendInvisible(self): - #----------------------# - self.labelCommentaire.setText("") - - #---------------------------------------# - def chercheNoeudSelectionne(self,copie=1): - #---------------------------------------# - """ - appele par Cut et Copy pour positionner self.node_selected - """ - self.node_selected=[] - if len(self.tree.selectedItems()) == 0 : return - self.node_selected=self.tree.selectedItems() - - - #---------------------# - def handleSupprimer(self): - #---------------------# - self.chercheNoeudSelectionne() - if len(self.node_selected) == 0 : return - self.QWParent.noeud_a_editer = [] - if self.node_selected[0]==self.tree.racine: return - if len(self.node_selected) == 1 : self.node_selected[0].delete() - else : self.node_selected[0].deleteMultiple(self.node_selected) - - #---------------------# - def handleRechercher(self): - #---------------------# - from .monRecherche import DRecherche - monRechercheDialg=DRecherche(parent=self,fl=0) - monRechercheDialg.show() - - - #--------------------------------# - def handleRechercherDsCatalogue(self): - #-----------------------------# - from .monRechercheCatalogue import DRechercheCatalogue - monRechercheDialg=DRechercheCatalogue(self.QWParent,self) - monRechercheDialg.show() - - #---------------------# - def handleDeplier(self): - #---------------------# - if self.tree == None : return - #self.tree.collapseAll() - if self.deplier : - #print "je plie" - self.tree.expandItem(self.tree.topLevelItem(0)) - self.deplier = False - if self.fenetreCentraleAffichee != None : - if hasattr(self.fenetreCentraleAffichee.node,'plieToutEtReaffiche'): - self.fenetreCentraleAffichee.node.plieToutEtReaffiche() - else: - #print "je deplie" - self.tree.expandItem(self.tree.topLevelItem(0)) - self.deplier = True - if self.fenetreCentraleAffichee != None : - if hasattr(self.fenetreCentraleAffichee.node,'deplieToutEtReaffiche'): - self.fenetreCentraleAffichee.node.deplieToutEtReaffiche() - - #---------------------# - def handleEditCut(self): - #---------------------# - """ - Stocke dans Eficas.noeud_a_editer le noeud a couper - """ - #print "handleEditCut" - self.chercheNoeudSelectionne() - self.QWParent.edit="couper" - self.QWParent.noeud_a_editer = self.node_selected - - #-----------------------# - def handleEditCopy(self): - #-----------------------# - """ - Stocke dans Eficas.noeud_a_editer le noeud a copier - """ - self.chercheNoeudSelectionne() - if len(self.node_selected) == 0 : return - if len(self.node_selected) == 1 : self.node_selected[0].updateNodeLabelInBlue() - else : self.node_selected[0].updatePlusieursNodeLabelInBlue(self.node_selected) - self.QWParent.edit="copier" - self.QWParent.noeud_a_editer = self.node_selected - - #------------------------# - def handleEditPaste(self): - #------------------------# - """ - Lance la copie de l'objet place dans self.QWParent.noeud_a_editer - Ne permet que la copie d'objets de type Commande ou MCF - """ - self.chercheNoeudSelectionne() - if (not(hasattr(self.QWParent,'noeud_a_editer'))) or len(self.QWParent.noeud_a_editer)==0: - QMessageBox.information( self, - tr("Copie impossible"), - tr("Veuillez selectionner un objet a copier")) - return - if len(self.node_selected) != 1 : - QMessageBox.information( self, - tr("Copie impossible"), - tr("Veuillez selectionner un seul objet : la copie se fera apres le noeud selectionne")) - return - noeudOuColler=self.node_selected[0] - - if len(self.QWParent.noeud_a_editer)!=1: - #self.handleEditPasteMultiple() - QMessageBox.information( self, tr("Copie impossible"), tr("Aucun Objet n a ete copie ou coupe")) - return - - noeudACopier=self.QWParent.noeud_a_editer[0] - - if (self.QWParent.edit != "couper"): - #print (noeudOuColler.item.parent.getChild(noeudOuColler.item.nom)) - try: - if noeudOuColler == self.tree.racine : - child=noeudOuColler.doPastePremier(noeudACopier) - else : - child=noeudACopier.doPaste(noeudOuColler,'after') - - if child==None or child==0: - QMessageBox.critical( self,tr( "Copie refusee"),tr('Eficas n a pas reussi a copier l objet')) - self.message = '' - self.afficheInfos("Copie refusee",Qt.red) - if noeudACopier.treeParent.editor != noeudOuColler.treeParent.editor: - try : - nom=noeudACopier.item.sd.nom - child.item.nommeSd(nom) - except : - pass - return - self.initModif() - child.select() - except : - traceback.print_exc() - QMessageBox.critical( self,tr( "Copie refusee"),tr('Copie refusee pour ce type d objet')) - self.message = '' - self.afficheInfos("Copie refusee",Qt.red) - return - - # il faut declarer le JDCDisplay_courant modifie - # suppression eventuelle du noeud selectionne - # si possible on renomme l objet comme le noeud couper - - if (self.QWParent.edit == "couper"): - print ('je pass la') - if noeudACopier.treeParent.editor != noeudOuColler.treeParent.editor: - QMessageBox.critical( self, tr("Deplacement refuse"),tr('Deplacement refuse entre 2 fichiers. Seule la copie est autorisee ')) - - #if 1: - try : - # indexNoeudACopier=noeudACopier.treeParent.children.index(noeudACopier) - indexNoeudACopier=self.getTreeIndex(noeudACopier) - noeudACopier.treeParent.item.deplaceEntite(indexNoeudACopier,indexNoeudOuColler,pos) - noeudACopier.treeParent.buildChildren() - - #else: - except: - pass - self.QWParent.noeud_a_editer=[] - - # on rend la copie a nouveau possible en liberant le flag edit - self.QWParent.edit="copier" - noeudACopier.select() - - #----------------------------------# - def handleDeplaceMultiple(self): - #----------------------------------# - pass - - #----------------------------------# - def handleEditPasteMultiple(self): - #----------------------------------# - - # On ne garde que les niveaux "Etape" - # On insere dans l'ordre du JDC - listeNoeudsACouper=[] - listeIndex=[] - listeChild=[] - listeItem=[] - from InterfaceQT4 import compojdc - noeudOuColler=self.node_selected[0] - if not (isinstance(noeudOuColler.treeParent, compojdc.Node)): - QMessageBox.information( self, - tr("Copie impossible a cet endroit",), - tr("Veuillez selectionner une commande, un parametre, un commentaire ou une macro")) - return - indexNoeudOuColler=noeudOuColler.treeParent.children.index(noeudOuColler) - - for noeud in self.QWParent.noeud_a_editer : - if not (isinstance(noeud.treeParent, compojdc.Node)): continue - indexInTree=noeud.treeParent.children.index(noeud) - indice = 0 - for index in listeIndex: - if index < indexInTree : indice = indice +1 - listeIndex.insert(indice, indexInTree) - listeNoeudsACouper.insert(indice, noeud) - - noeudJdc=noeudOuColler.treeParent - dejaCrees=0 - # on les cree a l'envers parcequ'on ajoute a NoeudOuColler - listeIndex.reverse() - for index in listeIndex: - indexTravail=index - if indexNoeudOuColler < index: - indexTravail=indexTravail+dejaCrees - noeudOuColler=noeudJdc.children[indexNoeudOuColler] - noeud=noeudJdc.children[indexTravail] - child=noeud.doPaste(noeudOuColler) - listeChild.append(child) - dejaCrees=dejaCrees+1 - - self.QWParent.noeud_a_editer = [] - for i in range(len(listeIndex)): - noeud=noeudJdc.children[indexNoeudOuColler+1+i] - self.QWParent.noeud_a_editer.append(noeud) - - listeASupprimer=[] - if self.QWParent.edit !="couper" : return - - for index in listeIndex: - indexTravail=index - if indexNoeudOuColler < index: - indexTravail=indexTravail+(len(listeIndex)) - noeud=noeudJdc.children[indexTravail] - - listeItem.append(noeud.item) - listeASupprimer.append(noeud) - - for i in range(len(listeChild)): - self.tree.item.suppItem(listeItem[i]) - listeChild[i].item.update(listeItem[i]) - - self.QWParent.noeud_a_editer = [] - - #----------------------------------# - def handleAjoutEtape(self,nomEtape): - #----------------------------------# - self.chercheNoeudSelectionne() - if len(self.node_selected) == 0 or self.node_selected[0] == self.tree.racine : - nodeOuAjouter=self.tree.racine - nouveau=nodeOuAjouter.appendChild(nomEtape,pos='first') - else : - nodeOuAjouter=self.node_selected[0] - if nodeOuAjouter != self.tree.racine : - while nodeOuAjouter.treeParent != self.tree.racine: - print (nodeOuAjouter) - nodeOuAjouter=nodeOuAjouter.treeParent - print (nodeOuAjouter.parent == self.tree.racine) - nouveau=nodeOuAjouter.appendBrother(nomEtape) - try : - self.node_selected[0].setSelected(False) - except : pass - nouveau.setSelected(True) - nouveau.affichePanneau() - - - #---------------------------# - def getFileVariable(self) : - #---------------------------# - titre = tr("Choix d'un fichier XML") - texte = tr("Le fichier contient une commande MODEL\n") - texte = texte+tr('Donnez le nom du fichier XML qui contient la description des variables') - QMessageBox.information( self, titre,tr(texte)) - - fichier = QFileDialog.getOpenFileName(self.appliEficas, - tr('Ouvrir Fichier'), - self.appliEficas.maConfiguration.savedir, - tr('Wrapper Files (*.xml);;''All Files (*)')) - return fichier - - #------------# - def run(self): - #------------# - fonction="run"+self.code - #print fonction - if fonction in JDCEditor.__dict__: JDCEditor.__dict__[fonction](self,) - - #------------# - def saveRun(self): - #------------# - fonction="saveRun"+self.code - if fonction in JDCEditor.__dict__: JDCEditor.__dict__[fonction](self,) - - -# --------------------------------------------- -# Methodes Non Crees dans ssIHM -# --------------------------------------------- - - #---------------# - def runMAP(self): - #---------------# - - if not(self.jdc.isValid()): - QMessageBox.critical( self, tr( "Execution impossible "),tr("le JDC doit etre valide pour une execution MAP")) - return - if len(self.jdc.etapes) != 1 : - QMessageBox.critical( self, tr("Execution impossible "),tr("le JDC doit contenir un et un seul composant")) - return - if self.modified or self.fichier==None : - self.fichierMapInput = self.__generateTempFilename(prefix = "map_run", suffix = ".map") - texte=self.getTextJDC("MAP") - self.writeFile( self.fichierMapInput, txt = texte) - else : - self.fichierMapInput=self.fichier - composant=self.jdc.etapes[0].nom.lower()[0:-5] - - - # :TRICKY: to determine if a component requires SALOME, loads the component from Eficas catalog - # then instantiate corresponding class and call getUseSalome() method - try: - from mapengine.spec import factory - mapComponent = factory.new(composant)[0] - - command = "map" - if mapComponent.getUseSalome(): - command += " -r sappli" - textePython=(command + " run -n "+composant +" -i "+self.fichierMapInput) - - #textePython="ls -l" - self._viewTextExecute( textePython,"map_run",".sh") - #try: - # commande="rm "+self.fichierMapInput - # os.system(commande) - #except : - # pass - except Exception as e: - print((traceback.print_exc())) - - #-------------------# - def runZCRACKS(self): - #-------------------# - if not(self.jdc.isValid()): - QMessageBox.critical( self, tr( "Execution impossible "),tr("le JDC doit etre valide pour une execution ")) - return - if self.modified or self.fichier==None : - #if 1: - self.fichierZcracksInput = self.__generateTempFilename(prefix = "zcracks_run", suffix = ".z7p") - texte=self.getTextJDC("ZCRACKS",pourRun=1) - self.writeFile( self.fichierZcracksInput, txt = texte) - else : - self.fichierZcracksInput=self.fichier - try : - #commande ="Zrun -zp " - commande="more " - textePython=(commande + self.fichierZcracksInput) - self._viewTextExecute( textePython,"run_zcracks",".sh") - except Exception as e: - print((traceback.print_exc())) - - #-------------------# - def runCARMELCND(self): - #-------------------# - #if not(self.jdc.isValid()): - # QMessageBox.critical( self, tr( "Execution impossible "),tr("le JDC doit etre valide pour une execution ")) - # return - if self.modified or self.fichier==None : - QMessageBox.critical( self, tr( "Execution impossible "),tr("Sauvegarder SVP avant l'execution ")) - return - if not hasattr(self,'generator'): texte=self.getTextJDC(self.format) - from PrepareRunCarmel import prepareRunCarmel - fichierGenerique=os.path.basename(self.fichier).split(".")[0] - repMed=os.path.dirname(self.fichier) - repExeCarmel=self.generator.get_repExeCarmel() - textePython=prepareRunCarmel(repExeCarmel,repMed,fichierGenerique) - nomFichier = self.__generateTempFilename("carmel_run", suffix = ".sh") - f=open(nomFichier,'w') - f.write(textePython) - f.close() - commande="xterm -e sh "+nomFichier +"\n" - os.system(commande) - - #-------------------# - def runCarmelCS(self): - #-------------------# - try : - commande="runSession pilotyacsCS.py" - os.system(commande) - except Exception as e: - print((traceback.print_exc())) - - #-----------------------------------------------------# - def determineNomFichier(self,path,extension): - #-----------------------------------------------------# - if self.appli.code in DictExtensions: - chaine1=DictExtensions[self.appli.code]+" (*."+DictExtensions[self.appli.code]+");;" - extensions= tr(chaine1+ "All Files (*)") - else : - extensions= tr("JDC (*.comm);;" "All Files (*)") - - if self.appli.code == "MAP" : - extensions = extensions + ";; Run (*.input);;" - - fn = QFileDialog.getSaveFileName( self, - tr("sauvegarde"), path, - extensions,None, - QFileDialog.DontConfirmOverwrite) - if fn == None : return (0, None) - fn=fn[0] - if fn=='': return (0, None) - - ext = QFileInfo(fn).suffix() - if ext == '': fn+=extension - - if QFileInfo(fn).exists(): - msgBox = QMessageBox(self) - msgBox.setWindowTitle(tr("Sauvegarde du Fichier")) - msgBox.setText(tr("Le fichier %s existe deja.", six.text_type(fn))) - msgBox.addButton(tr("&Ecraser"),0) - msgBox.addButton(tr("&Abandonner"),1) - abort=msgBox.exec_() - if abort == 1 : return (0, "") - return (1,fn) - - #-----------------# - def saveRunMAP(self): - #-----------------# - extension=".input" - if not(self.jdc.isValid()): - QMessageBox.critical( self, tr( "Sauvegarde de l'input impossible "), - tr("Un JdC valide est necessaire pour creer un .input") - ) - return - try : - composant=self.jdc.etapes[0].nom.lower()[0:-5] - except : - QMessageBox.critical( self, tr( "Sauvegarde de l'input impossible "), - tr("Choix du composant obligatoire") - ) - return - if hasattr(self.maConfiguration, "savedir"): path=self.maConfiguration.savedir - else : path='C:/' - - monNomFichier="" - if self.fichier is not None and self.fichier != "" : - maBase=str(QFileInfo(self.fichier).baseName())+".input" - monPath=str(QFileInfo(self.fichier).absolutePath()) - monNomFichier=os.path.join(monPath,maBase) - elif hasattr(self,'monNomFichierInput'): - monNomFichier=self.monNomFichierInput - - - monDialog=QFileDialog(self.appliEficas) - monDialog.setDirectory (path) - monDialog.setWindowTitle ("Save") - - for c in monDialog.children(): - if isinstance(c,QDialogButtonBox): - for b in c.children(): - if isinstance(b,QPushButton): - avant=b.text() - if avant=="&Open": b.setText("Save") - mesFiltres= "input Map (*.input);;All Files (*)" - monDialog.setNameFilters(mesFiltres) - if monNomFichier!="" : monDialog.selectFile(monNomFichier) - BOk=monDialog.exec_() - if BOk==0: return - fn=str(monDialog.selectedFiles()[0]) - if fn == "" or fn == None : return - if not fn.endswith(".input"): - fn += ".input" - self.monNomFichierInput=fn - - if not hasattr(self, 'fichierMapInput') or not self.fichierMapInput or not os.path.exists(self.fichierMapInput): - self.fichierMapInput = self.__generateTempFilename(prefix = "map_run", suffix = ".map") - texte=self.getTextJDC("MAP") - self.writeFile( self.fichierMapInput, txt = texte) - - cmd = ("map gen -t dat -n " + composant + " -i " + self.fichierMapInput + " -o " + fn) - p = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE) - (output, err) = p.communicate() - - - #-----------------# - def saveRunPSEN(self): - #-----------------# - #print ("saveRunPSEN") - self.saveFile() - - - - #-----------------------------------------# - def handleAjoutGroup(self,listeGroup): - #-----------------------------------------# - try : - #if 1: - from ajoutGroupe import handleAjoutGroupFiltre - #print listeGroup - handleAjoutGroupFiltre(self,listeGroup) - #print "apres handleAjoutGroupFiltre" - except : - #else : - pass - - - #-----------------------------------------------------------------# - def saveCompleteFile(self, path = None, saveas= 0,formatLigne="beautifie"): - #-----------------------------------------------------------------# - extension='.casR' - fn = self.fichierComplet - #saveas=True # Pour forcer le nom - self.generator=self.maConfiguration.mesGenerators.plugins[self.format]() - if self.fichierComplet is None or saveas: - if path is None: path=self.maConfiguration.savedir - bOK, fn=self.determineNomFichier(path,extension) - if bOK == 0 : return (0, None) - if fn == None : return (0, None) - if fn== '' : return (0, None) - - ulfile = os.path.abspath(six.text_type(fn)) - self.appliEficas.maConfiguration.savedir=os.path.split(ulfile)[0] - fn = six.text_type(QDir.toNativeSeparators(fn)) - - self.fichierComplet = os.path.splitext(fn)[0]+extension - - if hasattr(self.generator, "writeComplet"): - self.generator.writeComplet(self.fichierComplet,self.jdc,config=self.appliEficas.maConfiguration,appli=self.appliEficas) - - if self.salome : self.appliEficas.addJdcInSalome( self.fichierComplet) - - self.modified = 0 - nouveauTitre=self.titre+" "+str(os.path.basename(self.fichierComplet)) - self.appliEficas.setWindowTitle(nouveauTitre) - return (1, self.fichierComplet) - - #-----------------------------------------------------------------# - def saveFile(self, path = None, saveas= 0,formatLigne="beautifie"): - #-----------------------------------------------------------------# - """ - Public slot to save the text to a file. - - @param path directory to save the file in (string or QString) - @return tuple of two values (boolean, string) giving a success indicator and - the name of the saved file - """ - - self.modified=1 - if not self.modified and not saveas: - return (0, None) # do nothing if text wasn't changed - - if self.appli.code in DictExtensions : - extension=DictExtensions[self.appli.code] - else : - extension='.comm' - - newName = None - fn = self.fichier - if self.fichier is None or saveas: - if path is None: path=self.maConfiguration.savedir - bOK, fn=self.determineNomFichier(path,extension) - if bOK == 0 : return (0, None) - if fn == None : return (0, None) - if fn== '' : return (0, None) - - ulfile = os.path.abspath(six.text_type(fn)) - self.appliEficas.maConfiguration.savedir=os.path.split(ulfile)[0] - fn = six.text_type(QDir.toNativeSeparators(fn)) - newName = fn - - - if not (self.writeFile(fn,formatLigne=formatLigne)): return (0, None) - self.fichier = fn - self.modified = False - if self.fileInfo is None or saveas: - self.fileInfo = QFileInfo(self.fichier) - self.fileInfo.setCaching(0) - self.lastModified = self.fileInfo.lastModified() - if newName is not None: - self.appliEficas.addToRecentList(newName) - self.tree.racine.item.getObject().nom=os.path.basename(newName) - self.tree.racine.updateNodeLabel() - - self.jdc.toXml() - - if self.jdc.isValid() != 0 and hasattr(self.generator, "writeDefault"): - #if hasattr(self.generator, "writeDefault"): - self.generator.writeDefault(fn) - elif self.code=="TELEMAC" and hasattr(self.generator, "writeDefault"): - msgBox = QMessageBox(None) - msgBox.setWindowTitle(tr("Fichier .cas invalide / incomplet")) - msgBox.setText(tr("Le fichier .cas est invalide / incomplet")) - msgBox.addButton(tr("&Sauvegarder"),1) - msgBox.addButton(tr("&Quitter sans sauvegarder"),0) - msgBox.addButton(tr("&Annuler"),2) - res=msgBox.exec_() - if res == 0 : - self.generator.writeDefault(fn) - return (1, self.fichier) - if res == 2 : return (0, None) - if self.appliEficas.salome : self.appliEficas.close() - else : sys.exit(1) - - if self.salome : - self.appliEficas.addJdcInSalome( self.fichier) - self.modified = 0 - nouveauTitre=self.titre+" "+str(os.path.basename(self.fichier)) - self.appliEficas.setWindowTitle(nouveauTitre) - - return (1, self.fichier) -# - - #----------------------------------------------# - def sauveLigneFile(self): - #----------------------------------------------# - self.modified=1 - return self.saveFile(formatLigne="Ligne") - - - #----------------------------------------------# - def saveFileAs(self, path = None,fileName=None): - #----------------------------------------------# - """ - Public slot to save a file with a new name. - - @param path directory to save the file in (string or QString) - @return tuple of two values (boolean, string) giving a success indicator and - the name of the saved file - """ - if fileName != None : - self.fichier = fileName - return self.saveFile() - return self.saveFile(path,1,"beautifie") - - - - #---------------------------------------------# - def getFile(self,unite=None,fic_origine = ''): - #---------------------------------------------# - # appele par I_JDC - ulfile = None - jdcText = "" - - titre = "" - - if unite : - titre = tr("Choix unite %d ", unite) - texte = tr("Le fichier %s contient une commande INCLUDE \n", str(fic_origine)) +"\n" - texte = texte+ tr("Donnez le nom du fichier correspondant a l unite logique ") + repr(unite) - labeltexte = tr('Fichier pour unite ') + repr( unite) - else: - titre = tr("Choix d'un fichier de poursuite") - texte = tr("Le fichier %s contient une commande POURSUITE\n", fic_origine) - texte = texte+tr('Donnez le nom du fichier dont vous \n voulez faire une poursuite') - - QMessageBox.information( self, titre,texte) - fn = QFileDialog.getOpenFileName(self.appliEficas, - titre, - self.appliEficas.maConfiguration.savedir) - - # ce retour est impose par le getFile d'I_JDC - if fn== '' : return None," " - if not fn : return (0, " ") - fn=fn[0] - - ulfile = os.path.abspath(six.text_type(fn)) - self.appliEficas.maConfiguration.savedir=os.path.split(ulfile)[0] - - # On utilise le convertisseur defini par format_fichier - source=self.getSource(ulfile) - if source: - # On a reussia convertir le fichier self.ulfile - jdcText = source - else: - # Une erreur a ete rencontree - jdcText = '' - return ulfile, jdcText - - #-----------------------------------# - def updateJdc(self, etape,texte): - #------------------------------------# - # ajoute une etape de JdC a partir d un texte - CONTEXT.setCurrentStep(etape) - etape.buildIncludeEtape(texte) - self.tree.racine.buildChildren() - - #-----------------------------------# - def updateJdcEtape(self, itemApres,texte): - #------------------------------------# - # ajoute une etape de JdC a partir d un texte - monItem=itemApres - etape=monItem.item.object - - CONTEXT.setCurrentStep(etape) - try : - ok=etape.buildIncludeEtape(texte) - except : - ok=0 - if not ok : - QMessageBox.information( self, - tr("Import texte"), - tr("Impossible d importer le texte")) - self.tree.racine.buildChildren() - return ok - - #-------------------------------------------# - def updateJdcAfterEtape(self, etape,texte): - #--------------------------------------------# - # ajoute une etape de JdC a partir d un texte - CONTEXT.setCurrentStep(etape) - try : - ok=etape.buildIncludeEtape(texte,doitEtreValide=0) - except : - ok=0 - if not ok : - QMessageBox.information( self, - tr("Import texte"), - tr("Impossible d importer le texte")) - self.tree.racine.buildChildren() - return ok - - - #-------------------------------------# - def deleteEtape(self,etape): - #-------------------------------------# - # dans le JDC - self.jdc.suppEntite(etape) - - #-------------------------------------# - def deleteMC(self,etape,MCFils,listeAvant=()): - #-------------------------------------# - # dans le JDC - ouChercher=etape - for mot in listeAvant : - ouChercher=ouChercher.getChild(mot,restreint="oui") - monMC=ouChercher.getChild(MCFils,restreint="oui") - if monMC != None : ouChercher.suppEntite(monMC) - ouChercher.state='changed' - ouChercher.isValid() - - #-------------------------------------# - def ajoutMC(self,etape,MCFils,valeurs,listeAvant=()): - #-------------------------------------# - # dans le JDC - ouChercher=etape - for mot in listeAvant : - ouChercher=ouChercher.getChild(mot,restreint="oui") - monMC=etape.getChild(ouChercher,restreint="oui") - if monMC== None : monMC= ouChercher.addEntite(MCFils) - monMC.valeur=valeurs - monMC.val=valeurs - monMC.state='changed' - monMC.isValid() - - #----------------------------------------------# - def ajoutMCFact(self,etape,MCFils,listeAvant=()): - #----------------------------------------------# - # dans le JDC - print ('ajoutMCFact') - ouChercher=etape - print (ouChercher) - for mot in listeAvant : - ouChercher=ouChercher.getChild(mot,restreint="oui") - print (mot) - print (ouChercher) - monMC=etape.getChild(ouChercher,restreint="oui") - if monMC== None : monMC= ouChercher.addEntite(MCFils) - monMC.isValid() - - - #----------------------------------------- - def initSplitterSizes(self, nbWidget=3): - #----------------------------------------- - #print ("je passe ds initSplitterSizes", nbWidget) - - if self.code in [ 'Adao', 'ADAO','MAP' ] : self.splitterSizes3=[1,1550,150] - #elif self.code in [ 'MAP'] : self.splitterSizes3=[700,300] - else : self.splitterSizes3=[150,1000,300] - - if self.code in [ 'Adao', 'ADAO','MAP' ] : self.splitterSizes2=[5,1500] - else : self.splitterSizes2=[300,1000] - - - #----------------------------------------- - def restoreSplitterSizes(self,nbWidget=3): - #---------------------------------------- - - #traceback.print_stack() - #print ("je passe ds restoreSplitterSizes") - if not(hasattr(self,'splitter')) : return - if nbWidget==2 : newSizes=self.splitterSizes2 - if nbWidget==3 : newSizes=self.splitterSizes3 - #self.inhibeSplitter = 1 - self.splitter.setSizes(newSizes) - #self.inhibeSplitter = 0 - QApplication.processEvents() - # seule la fentetre du milieu est necessaire - self.splitter.widget(1).resizeEvent=self.saveSplitterSizes - - #----------------------------------------- - def saveSplitterSizes(self,event): - #----------------------------------------- - #print ("je passe ds saveSplitterSizes") - if self.inhibeSplitter : return - if self.widgetOptionnel == None : self.splitterSizes2 = self.splitter.sizes()[0:2] - else : self.splitterSizes3 = self.splitter.sizes()[0:3] - - #------------------------ - def fermeOptionnel(self): - #------------------------ - if self.widgetOptionnel == None : return - - self.inhibeSplitter=1 - self.widgetOptionnel.setParent(None) - self.widgetOptionnel.close() - self.widgetOptionnel.deleteLater() - self.widgetOptionnel=None - self.inhibeSplitter=0 - self.restoreSplitterSizes(2) - - #------------------------ - def ajoutOptionnel(self): - #------------------------ - #if len(self.splitterSizes) == 2 : self.splitterSizes.append(self.oldSizeWidgetOptionnel) - #else : self.splitterSizes[2] = self.oldSizeWidgetOptionnel # ceinture pour les close bizarres - #self.splitterSizes[1] = self.splitterSizes[1] - self.splitterSizes[2] - - self.restoreSplitterSizes(3) - - - #------------------------ - def fermeArbre(self): - #------------------------ - #print (self.widgetTree) - self.oldWidgetTree=self.widgetTree - self.widgetTree.hide() - #self.widgetTree=None - - #------------------------ - def ouvreArbre(self): - #------------------------ - #print ('je passe la') - #print (self.widgetTree) - #self.widgetTree=self.oldWidgetTree - self.widgetTree.show() - #self.restoreSplitterSizes(3) - - #----------------------- - def getEtapeCourante(self) : - #----------------------- - print (self.tree.selectedItems()) - if len(self.tree.selectedItems()) != 1 : return None - etape=self.tree.selectedItems()[0].item.object.getEtape() - return etape - #----------------------------- - def getTreeIndex(self,noeud): - #---------------------------- - indexNoeud=-1 - if noeud in noeud.treeParent.children : - indexNoeud=noeud.treeParent.children.index(noeud) - else : - if hasattr(noeud,'vraiParent') : - noeudVrai = noeud - noeudVraiParent = noeud.vraiParent - while noeudVraiParent != noeud.treeParent and hasattr(noeudVraiParent,'vraiParent') : - noeudVrai = noeudVraiParent - noeudVraiParent = noeudVraiParent.vraiParent - pass - if noeudVraiParent == noeud.treeParent : - indexNoeud=noeud.treeParent.children.index(noeudVrai) - pass - pass - pass - return indexNoeud - - #-------------------# - def runMeteo(self): - #-------------------# - - if not(self.jdc.isValid()): - QMessageBox.critical( self, tr( "Execution impossible "),tr("le JDC doit etre valide pour une execution Meteo")) - return - strSource = str( self.getTextJDC(self.format) ) - code = compile(strSource, strSource, 'exec') - exec(code, globals(), {}) - - - - #-------------------# Pour execution avec output et error dans le bash - def runPSEN(self): - #-------------------# - - #if self.modified or self.fichier==None : self.saveFile() - self.saveFile() - - #lancement avec le .bat - path1 = os.path.abspath(os.path.join(os.path.abspath(__file__), '../','../','PSEN_Eficas','PSEN')) - WrapperFilePath = os.path.join(path1, 'PSSEWrapper.py') - import subprocess - p = subprocess.Popen(['python',WrapperFilePath]) - (out,err)=p.communicate() - print (out) - print (err) - - #-------------------# Pour execution avec output et error dans le bash - def runPSEN_N1(self): - #-------------------# - - - self.saveFile() - path1 = os.path.abspath(os.path.join(os.path.abspath(__file__), '../','../','ProcessOutputs_Eficas','TreatOutputs')) - sys.path.append(path1) - - if not(self.jdc.isValid()): - QMessageBox.information( self, tr( "Unvalid JDC"),tr("incorrect keywords will be ignored")) - if 'dicoImbrique' in generator.plugins: - self.generator=generator.plugins['dicoImbrique']() - jdc_formate=self.generator.gener(self.jdc) - dico=self.generator.Dico - - ###to delete - #fileDico = r'C:\Logiciels DER\PSEN_V16\Code\ProcessOutputs_Eficas\TreatOutputs\dicoN1.py' - fileDico = os.path.join(path1, 'dicoN1.py') #r'C:\Logiciels DER\PSEN_V16\Code\ProcessOutputs_Eficas\TreatOutputs\dicoN1.py' - f = open( str(fileDico), 'w') - f.write("Dico =" + str(dico) ) - f.close() - ### - - - print ('in runPSEN_N1', dico) - print (dico) - from Run import run - run(dico) - #res,txt_exception=run(dico) - #if res : QMessageBox.information( self, tr("fin de script run"), txt_exception) - #else : QMessageBox.critical( self, tr("Erreur fatale script run"), txt_exception) - - #-------------------# Pour execution avec output et error dans le bash - def process_N1(self): - #-------------------# - - path1 = os.path.abspath(os.path.join(os.path.abspath(__file__), '../','../','ProcessOutputs_Eficas','TreatOutputs')) - sys.path.append(path1) - - - if 'dicoImbrique' in generator.plugins: - self.generator=generator.plugins['dicoImbrique']() - jdc_formate=self.generator.gener(self.jdc) - dico=self.getDico() #generator.Dico - - - for k in dico['CONTINGENCY_PROCESSING']: - #print (k) - if k[0:19] == 'Component_List_For_' or k[0:21] =='Contingency_List_For_' : - newK=k.replace('__',' ') - l="'"+str(newK)+"'" - dico['CONTINGENCY_PROCESSING'][l]=dico['CONTINGENCY_PROCESSING'][k] - del dico['CONTINGENCY_PROCESSING'][k] - - ###to delete - fileDico = os.path.join(path1, 'dicoN1_process.py') - f = open( str(fileDico), 'w') - f.write("Dico =" + str(dico) ) - f.close() - ### - return dico - - #return self.getDico() - - #-------------------# Pour execution avec output et error dans le bash - def process_VP(self): - #-------------------# - if 'dicoImbrique' in generator.plugins: - self.generator=generator.plugins['dicoImbrique']() - jdc_formate=self.generator.gener(self.jdc) - dico=self.getDico() #generator.Dico - return dico - - -if __name__ == "__main__": - print ('in main') diff --git a/InterfaceQT4/editorSsIhm.py b/InterfaceQT4/editorSsIhm.py index d6f8b9d4..af334d7f 100755 --- a/InterfaceQT4/editorSsIhm.py +++ b/InterfaceQT4/editorSsIhm.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2013 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/InterfaceQT4/eficas_go.py b/InterfaceQT4/eficas_go.py index 763af011..1f7828ce 100755 --- a/InterfaceQT4/eficas_go.py +++ b/InterfaceQT4/eficas_go.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 @@ -192,7 +192,7 @@ def lanceEficas_ssIhm(code=None,fichier=None,ssCode=None,version=None,debug=Fals print ('deprecated') from Editeur import session options=session.parse(sys.argv) - if version!=None and options.version == None : options.version=version + if version!=None and options.version == None : options.version=version if fichier == None : fichier=options.comm[0] if code == None : code=options.code diff --git a/InterfaceQT4/feuille.py b/InterfaceQT4/feuille.py index 41dc13fa..aa6f6e09 100644 --- a/InterfaceQT4/feuille.py +++ b/InterfaceQT4/feuille.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/InterfaceQT4/gereIcones.py b/InterfaceQT4/gereIcones.py index 26ba38f4..d8a18c5b 100644 --- a/InterfaceQT4/gereIcones.py +++ b/InterfaceQT4/gereIcones.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/InterfaceQT4/gereListe.py b/InterfaceQT4/gereListe.py index 95add18b..3e96a736 100644 --- a/InterfaceQT4/gereListe.py +++ b/InterfaceQT4/gereListe.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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,7 +22,6 @@ from __future__ import absolute_import try : from builtins import str - from builtins import range from builtins import object except : pass @@ -30,7 +29,7 @@ import types,os import traceback -from PyQt5.QtWidgets import QLineEdit, QLabel, QFileDialog +from PyQt5.QtWidgets import QLineEdit, QLabel, QFileDialog, QMessageBox from PyQt5.QtCore import QEvent, Qt, QTimer from PyQt5.QtGui import QIcon, QPalette @@ -101,6 +100,7 @@ class LECustom(QLineEdit): def getValeur(self): #return self.text() + self.litValeur() return self.valeur def setValeur(self,valeur): diff --git a/InterfaceQT4/gereListeAvril11.py b/InterfaceQT4/gereListeAvril11.py index 44e191e9..e86b2dde 100644 --- a/InterfaceQT4/gereListeAvril11.py +++ b/InterfaceQT4/gereListeAvril11.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/InterfaceQT4/gereRegles.py b/InterfaceQT4/gereRegles.py index e84486b9..fb5f802b 100644 --- a/InterfaceQT4/gereRegles.py +++ b/InterfaceQT4/gereRegles.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/InterfaceQT4/gereTraduction.py b/InterfaceQT4/gereTraduction.py index 9bca1b37..0e9673d4 100644 --- a/InterfaceQT4/gereTraduction.py +++ b/InterfaceQT4/gereTraduction.py @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/InterfaceQT4/getVersion.py b/InterfaceQT4/getVersion.py index cc7765ec..83322cfb 100644 --- a/InterfaceQT4/getVersion.py +++ b/InterfaceQT4/getVersion.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/InterfaceQT4/groupe.py b/InterfaceQT4/groupe.py index e7d20873..0fe113f9 100644 --- a/InterfaceQT4/groupe.py +++ b/InterfaceQT4/groupe.py @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/InterfaceQT4/monBoutonValide.py b/InterfaceQT4/monBoutonValide.py index 78864707..724df9b4 100644 --- a/InterfaceQT4/monBoutonValide.py +++ b/InterfaceQT4/monBoutonValide.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/InterfaceQT4/monChoixCata.py b/InterfaceQT4/monChoixCata.py index 8ecd647d..a66db090 100644 --- a/InterfaceQT4/monChoixCata.py +++ b/InterfaceQT4/monChoixCata.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/InterfaceQT4/monChoixCode.py b/InterfaceQT4/monChoixCode.py index a5a2ddcc..89b58ed5 100644 --- a/InterfaceQT4/monChoixCode.py +++ b/InterfaceQT4/monChoixCode.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2013 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/InterfaceQT4/monChoixCommande.py b/InterfaceQT4/monChoixCommande.py index 990fc1c0..bd0d8dbb 100644 --- a/InterfaceQT4/monChoixCommande.py +++ b/InterfaceQT4/monChoixCommande.py @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/InterfaceQT4/monChoixLangue.py b/InterfaceQT4/monChoixLangue.py index decc00be..59c497e7 100644 --- a/InterfaceQT4/monChoixLangue.py +++ b/InterfaceQT4/monChoixLangue.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/InterfaceQT4/monFonctionPanel.py b/InterfaceQT4/monFonctionPanel.py index 93dd4102..3bf95fe4 100644 --- a/InterfaceQT4/monFonctionPanel.py +++ b/InterfaceQT4/monFonctionPanel.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/InterfaceQT4/monGroupeOptionnel.py b/InterfaceQT4/monGroupeOptionnel.py index 7b17edba..cd64f1e5 100644 --- a/InterfaceQT4/monGroupeOptionnel.py +++ b/InterfaceQT4/monGroupeOptionnel.py @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/InterfaceQT4/monLabelClic.py b/InterfaceQT4/monLabelClic.py index af472949..90f30c9e 100644 --- a/InterfaceQT4/monLabelClic.py +++ b/InterfaceQT4/monLabelClic.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/InterfaceQT4/monLayoutBouton.py b/InterfaceQT4/monLayoutBouton.py index 49a431a4..1a9471bd 100644 --- a/InterfaceQT4/monLayoutBouton.py +++ b/InterfaceQT4/monLayoutBouton.py @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/InterfaceQT4/monRecherche.py b/InterfaceQT4/monRecherche.py index 16fdfaf3..dd73054d 100644 --- a/InterfaceQT4/monRecherche.py +++ b/InterfaceQT4/monRecherche.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/InterfaceQT4/monRechercheCatalogue.py b/InterfaceQT4/monRechercheCatalogue.py index 589964a3..b8b57cdd 100644 --- a/InterfaceQT4/monRechercheCatalogue.py +++ b/InterfaceQT4/monRechercheCatalogue.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/InterfaceQT4/monSelectVal.py b/InterfaceQT4/monSelectVal.py index 415f5948..0683c679 100644 --- a/InterfaceQT4/monSelectVal.py +++ b/InterfaceQT4/monSelectVal.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/InterfaceQT4/monViewRegles.py b/InterfaceQT4/monViewRegles.py index c096c8f5..a144a682 100644 --- a/InterfaceQT4/monViewRegles.py +++ b/InterfaceQT4/monViewRegles.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/InterfaceQT4/monViewTexte.py b/InterfaceQT4/monViewTexte.py index c57813ab..3a82aff1 100644 --- a/InterfaceQT4/monViewTexte.py +++ b/InterfaceQT4/monViewTexte.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/InterfaceQT4/monVisu.py b/InterfaceQT4/monVisu.py index 68257209..12c90690 100644 --- a/InterfaceQT4/monVisu.py +++ b/InterfaceQT4/monVisu.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/InterfaceQT4/monWidget4a6RadioButton.py b/InterfaceQT4/monWidget4a6RadioButton.py index 3025049b..175dc9a0 100644 --- a/InterfaceQT4/monWidget4a6RadioButton.py +++ b/InterfaceQT4/monWidget4a6RadioButton.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/InterfaceQT4/monWidget4a6RadioButtonSD.py b/InterfaceQT4/monWidget4a6RadioButtonSD.py index 86f198ed..8f75e5d9 100644 --- a/InterfaceQT4/monWidget4a6RadioButtonSD.py +++ b/InterfaceQT4/monWidget4a6RadioButtonSD.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/InterfaceQT4/monWidgetBloc.py b/InterfaceQT4/monWidgetBloc.py index 1f656d4f..eeef908b 100644 --- a/InterfaceQT4/monWidgetBloc.py +++ b/InterfaceQT4/monWidgetBloc.py @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/InterfaceQT4/monWidgetCB.py b/InterfaceQT4/monWidgetCB.py index 3e12bb6b..5c7bc817 100644 --- a/InterfaceQT4/monWidgetCB.py +++ b/InterfaceQT4/monWidgetCB.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2020 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/InterfaceQT4/monWidgetCBIntoSug.py b/InterfaceQT4/monWidgetCBIntoSug.py index 8075451d..f924e962 100644 --- a/InterfaceQT4/monWidgetCBIntoSug.py +++ b/InterfaceQT4/monWidgetCBIntoSug.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2020 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/InterfaceQT4/monWidgetCBSD.py b/InterfaceQT4/monWidgetCBSD.py index 929e7426..d914d1bf 100644 --- a/InterfaceQT4/monWidgetCBSD.py +++ b/InterfaceQT4/monWidgetCBSD.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/InterfaceQT4/monWidgetCommande.py b/InterfaceQT4/monWidgetCommande.py index 54ab0e55..08381df4 100644 --- a/InterfaceQT4/monWidgetCommande.py +++ b/InterfaceQT4/monWidgetCommande.py @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/InterfaceQT4/monWidgetCommandeDeplie1Niveau.py b/InterfaceQT4/monWidgetCommandeDeplie1Niveau.py index c03a17c1..ee7b1b2b 100644 --- a/InterfaceQT4/monWidgetCommandeDeplie1Niveau.py +++ b/InterfaceQT4/monWidgetCommandeDeplie1Niveau.py @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/InterfaceQT4/monWidgetCommentaire.py b/InterfaceQT4/monWidgetCommentaire.py index 8ff4e317..dd71cc7b 100644 --- a/InterfaceQT4/monWidgetCommentaire.py +++ b/InterfaceQT4/monWidgetCommentaire.py @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/InterfaceQT4/monWidgetCreeParam.py b/InterfaceQT4/monWidgetCreeParam.py index d53025c1..28834ebc 100644 --- a/InterfaceQT4/monWidgetCreeParam.py +++ b/InterfaceQT4/monWidgetCreeParam.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/InterfaceQT4/monWidgetCreeUserAssd.py b/InterfaceQT4/monWidgetCreeUserAssd.py index ba6cd4b9..7ce1b64f 100644 --- a/InterfaceQT4/monWidgetCreeUserAssd.py +++ b/InterfaceQT4/monWidgetCreeUserAssd.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2020 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/InterfaceQT4/monWidgetDate.py b/InterfaceQT4/monWidgetDate.py index dd5964dd..f6d723f4 100644 --- a/InterfaceQT4/monWidgetDate.py +++ b/InterfaceQT4/monWidgetDate.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/InterfaceQT4/monWidgetFact.py b/InterfaceQT4/monWidgetFact.py index c6758b39..37add2fe 100644 --- a/InterfaceQT4/monWidgetFact.py +++ b/InterfaceQT4/monWidgetFact.py @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/InterfaceQT4/monWidgetFactPlie.py b/InterfaceQT4/monWidgetFactPlie.py index e479f312..2e39daf8 100644 --- a/InterfaceQT4/monWidgetFactPlie.py +++ b/InterfaceQT4/monWidgetFactPlie.py @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/InterfaceQT4/monWidgetFormule.py b/InterfaceQT4/monWidgetFormule.py index f1add2f1..b7aba8bd 100644 --- a/InterfaceQT4/monWidgetFormule.py +++ b/InterfaceQT4/monWidgetFormule.py @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/InterfaceQT4/monWidgetHeure.py b/InterfaceQT4/monWidgetHeure.py index 8587fb12..d3e1444c 100644 --- a/InterfaceQT4/monWidgetHeure.py +++ b/InterfaceQT4/monWidgetHeure.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/InterfaceQT4/monWidgetInactif.py b/InterfaceQT4/monWidgetInactif.py index db3657af..f3608e96 100644 --- a/InterfaceQT4/monWidgetInactif.py +++ b/InterfaceQT4/monWidgetInactif.py @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/InterfaceQT4/monWidgetInfo.py b/InterfaceQT4/monWidgetInfo.py index 0bfc2dd5..e05d2d03 100644 --- a/InterfaceQT4/monWidgetInfo.py +++ b/InterfaceQT4/monWidgetInfo.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/InterfaceQT4/monWidgetIntoSug.py b/InterfaceQT4/monWidgetIntoSug.py index 42c72358..bf451cd5 100644 --- a/InterfaceQT4/monWidgetIntoSug.py +++ b/InterfaceQT4/monWidgetIntoSug.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/InterfaceQT4/monWidgetMatrice.py b/InterfaceQT4/monWidgetMatrice.py index 843da9aa..248c6e14 100644 --- a/InterfaceQT4/monWidgetMatrice.py +++ b/InterfaceQT4/monWidgetMatrice.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/InterfaceQT4/monWidgetNiveauFact.py b/InterfaceQT4/monWidgetNiveauFact.py index b3a7f27f..2cfb072b 100644 --- a/InterfaceQT4/monWidgetNiveauFact.py +++ b/InterfaceQT4/monWidgetNiveauFact.py @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/InterfaceQT4/monWidgetOptionnel.py b/InterfaceQT4/monWidgetOptionnel.py index c698206a..7282da41 100644 --- a/InterfaceQT4/monWidgetOptionnel.py +++ b/InterfaceQT4/monWidgetOptionnel.py @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/InterfaceQT4/monWidgetParam.py b/InterfaceQT4/monWidgetParam.py index cb799fe5..71c3bed9 100644 --- a/InterfaceQT4/monWidgetParam.py +++ b/InterfaceQT4/monWidgetParam.py @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/InterfaceQT4/monWidgetPlusieursASSDIntoOrdonne.py b/InterfaceQT4/monWidgetPlusieursASSDIntoOrdonne.py index 172a5cf6..8b2c462f 100644 --- a/InterfaceQT4/monWidgetPlusieursASSDIntoOrdonne.py +++ b/InterfaceQT4/monWidgetPlusieursASSDIntoOrdonne.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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,7 +21,6 @@ from __future__ import absolute_import try : from builtins import str - from builtins import range except : pass import types,os,sys @@ -31,6 +30,7 @@ from Extensions.i18n import tr from .monWidgetPlusieursIntoOrdonne import MonWidgetPlusieursIntoOrdonne from .politiquesValidation import PolitiquePlusieurs +from six.moves import range from PyQt5.QtWidgets import QScrollBar @@ -52,14 +52,10 @@ class MonWidgetPlusieursASSDIntoOrdonne (MonWidgetPlusieursIntoOrdonne): if len(self.listeAAfficher) == 0 : self.ajoutLE(0) return + - if len(self.listeAAfficher)*30 > 400 : self.setMinimumHeight(400) - else : - if self.monSimpDef.min > len(self.listeAAfficher) : self.setMinimumHeight(self.monSimpDef.min*30+30) - if self.monSimpDef.max > len(self.listeAAfficher) : self.setMinimumHeight(180) - else : self.setMinimumHeight(len(self.listeAAfficher)*30+30) - self.adjustSize() - + if len(self.listeAAfficher)*20 > 400 : self.setMinimumHeight(400) + else : self.setMinimumHeight(len(self.listeAAfficher)*30) self.politique=PolitiquePlusieurs(self.node,self.editor) for i in range(1,len(self.listeAAfficher)+1): self.ajoutLE(i) for i in range(len(self.listeAAfficher)): diff --git a/InterfaceQT4/monWidgetPlusieursBase.py b/InterfaceQT4/monWidgetPlusieursBase.py index 3fd6d90c..35c0bf48 100644 --- a/InterfaceQT4/monWidgetPlusieursBase.py +++ b/InterfaceQT4/monWidgetPlusieursBase.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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,12 +21,12 @@ from __future__ import absolute_import try : from builtins import str - from builtins import range from builtins import object except : pass import types,os,sys +from six.moves import range from PyQt5.QtGui import QIcon from PyQt5.QtWidgets import QApplication, QMessageBox, QScrollArea from PyQt5.QtCore import QTimer, QSize, Qt @@ -42,101 +42,98 @@ from InterfaceQT4.gereListe import GereListe from InterfaceQT4.gereListe import GerePlie from InterfaceQT4.gereListe import LECustom -dicoLongueur = {2:90,3:100,4:123,5:145,6:160,float('inf'):200} -hauteurMaxFenetre = 200 -nbMinimumDeQLineEdit=7 +dicoLongueur={2:95,3:125,4:154,5:183,6:210,float('inf'):210} +hauteurMax=253 class MonWidgetPlusieursBase (Ui_WidgetPlusieursBase,Feuille,GereListe,GerePlie): def __init__(self,node,monSimpDef,nom,objSimp,parentQt,commande): - #print ('MonWidgetPlusieursBase', nom) - self.inFocusOutEvent = False - self.changeUnLineEdit = False - self.nomLine = "lineEditVal" - self.inInit = True # pour l affichage quand on cree le lineEdit - self.indexDernierLabel = 0 - self.numLineEditEnCours = 0 - self.changeUnLineEdit = None - self.listeAffichageWidget = [] - self.dictLE = {} - self.politique = PolitiquePlusieurs(node,parentQt) + #print "MonWidgetPlusieursBase", nom + self.inFocusOutEvent=False + self.nomLine="lineEditVal" + self.inInit=True + self.indexDernierLabel=0 + self.numLineEditEnCours=0 + self.listeAffichageWidget=[] Feuille.__init__(self,node,monSimpDef,nom,objSimp,parentQt,commande) GereListe.__init__(self) self.gereIconePlier() self.BSelectFichier.clicked.connect(self.selectInFile) if sys.platform[0:5]!="linux": - repIcon = self.node.editor.appliEficas.repIcon - fichierUp = os.path.join(repIcon, 'arrow_up.png') - iconUp = QIcon(fichierUp) - self.RBHaut.setIcon(iconUp) + repIcon=self.node.editor.appliEficas.repIcon + fichier=os.path.join(repIcon, 'arrow_up.png') + icon = QIcon(fichier) + self.RBHaut.setIcon(icon) self.RBHaut.setIconSize(QSize(32, 32)) - fichierDown = os.path.join(repIcon, 'arrow_down.png') - iconDown = QIcon(fichierDown) - self.RBBas.setIcon(iconArrowDown) - fichierExp = os.path.join(repIcon, 'file-explorer.png') - iconExp = QIcon(fichierExp) - self.BSelectFichier.setIcon(iconExp) + fichier2=os.path.join(repIcon, 'arrow_down.png') + icon2 = QIcon(fichier2) + self.RBBas.setIcon(icon2) + fichier3=os.path.join(repIcon, 'file-explorer.png') + icon3 = QIcon(fichier2) + self.BSelectFichier.setIcon(icon3) self.BSelectFichier.setIconSize(QSize(32, 32)) + icon=QIcon(self.repIcon+"/MoinsBleu.png") + self.RBMoins.setIcon(icon) + icon=QIcon(self.repIcon+"/PlusBleu.png") + self.RBPlus.setIcon(icon) + icon=QIcon(self.repIcon+"/verre-loupe-icone-6087-64.png") + self.RBVoisListe.setIcon(icon) - iconMoins = QIcon (self.repIcon+"/MoinsBleu.png") - self.RBMoins.setIcon(iconMoins) - iconPlus = QIcon(self.repIcon+"/PlusBleu.png") - self.RBPlus.setIcon(iconPlus) - iconLoupe =QIcon(self.repIcon+"/verre-loupe-icone-6087-64.png") - self.RBVoisListe.setIcon(iconLoupe) - - - self.vScrollBar = self.scrollArea.verticalScrollBar() - - if self.monSimpDef.max < 7 : - hauteurMax = dicoLongueur[self.monSimpDef.max] - self.RBVoisListe.close() - self.RBMoins.close() - self.RBPlus.close() - aConstruire = self.monSimpDef.max - else : - hauteurMax = hauteurMaxFenetre - aConstruire = nbMinimumDeQLineEdit - self.setMinimumHeight(hauteurMax) - for i in range(1,aConstruire): self.ajoutLineEdit() + self.listeValeursCourantes=self.node.item.getListeValeurs() + if self.monSimpDef.max != "**" and self.monSimpDef.max < 7: + hauteurMax=dicoLongueur[self.monSimpDef.max] + else : + hauteurMax=220 + # if self.monSimpDef.max == self.monSimpDef.min : self.setMaximumHeight(hauteur) + self.resize(self.width(),hauteurMax) + self.setMinimumHeight(hauteurMax) + self.finCommentaireListe() self.parentQt.commandesLayout.insertWidget(-1,self) - self.maCommande.listeAffichageWidget.append(self.lineEditVal1) - self.AAfficher = self.lineEditVal1 - self.inInit = False + self.AAfficher=self.lineEditVal1 + self.inInit=False # PNPN a completer __ si tuple le type des tuples sinon le tuple - self.finCommentaireListe() self.monCommentaireLabel.setText(self.finCommentaireListe()) self.scrollArea.leaveEvent = self.leaveEventScrollArea - def setValeurs(self): - # uniquement appele a l initialisation. - # les lineEdit ont deja ete crees + self.vScrollBar = self.scrollArea.verticalScrollBar() + self.politique=PolitiquePlusieurs(self.node,self.editor) + # construction du min de valeur a entrer + if self.monSimpDef.max == "**" : aConstruire=7 + elif self.monSimpDef.max == float('inf'): aConstruire=7 + else : aConstruire=self.monSimpDef.max + + for i in range(1,aConstruire): + self.ajoutLineEdit() + QApplication.processEvents() + self.scrollArea.ensureWidgetVisible(self.lineEditVal1) self.listeValeursCourantes=self.node.item.getListeValeurs() index=1 for valeur in self.listeValeursCourantes : - val = self.politique.getValeurTexte(valeur) - nomLineEdit = "lineEditVal"+str(index) + val=self.politique.getValeurTexte(valeur) + nomLineEdit="lineEditVal"+str(index) if hasattr(self,nomLineEdit) : - courant = getattr(self,nomLineEdit) + courant=getattr(self,nomLineEdit) if 'R' in self.objSimp.definition.type and str(val) != repr(val) : courant.setText(repr(val)) - else : courant.setText(str(val)) + else : courant.setText(str(val)) else : self.ajoutLineEdit(val) index=index+1 + # ajout d'une ligne vide ou affichage commentaire if self.indexDernierLabel < self.monSimpDef.max : self.ajoutLineEdit() + else : self.scrollArea.setToolTip('nb max de valeurs atteint') + #self.adjustSize() + #self.vScrollBar.triggerAction(QScrollBar.SliderToMinimum) def ajoutLineEdit(self,valeur=None,): - #print ('ajoutLineEdit, monWidgetPlusieursBase', self.indexDernierLabel) self.indexDernierLabel=self.indexDernierLabel+1 nomLineEdit="lineEditVal"+str(self.indexDernierLabel) if hasattr(self,nomLineEdit) : - #print ('ajoutLineEdit, monWidgetPlusieursBase', self.indexDernierLabel) self.indexDernierLabel=self.indexDernierLabel-1 return nouveauLE = LECustom(self.scrollArea,self,self.indexDernierLabel) @@ -145,21 +142,15 @@ class MonWidgetPlusieursBase (Ui_WidgetPlusieursBase,Feuille,GereListe,GerePlie) if self.indexDernierLabel % 2 == 1 : nouveauLE.setStyleSheet("background:rgb(210,210,210)") else : nouveauLE.setStyleSheet("background:rgb(235,235,235)") nouveauLE.setFrame(False) - # fait dans le init pour pouvoir passer le numero du LE mai 20 - #nouveauLE.returnPressed.connect(self.changeValeur) + nouveauLE.returnPressed.connect(self.changeValeur) setattr(self,nomLineEdit,nouveauLE) self.listeAffichageWidget.append(nouveauLE) self.etablitOrdre() - if valeur != None : - nouveauLE.setText(str(valeur)) - self.dictLE[self.indexDernierLabel] = valeur - else : - self.dictLE[self.indexDernierLabel] = None + if valeur != None : nouveauLE.setText(str(valeur)) # deux lignes pour que le ensureVisible fonctionne self.estVisible=nouveauLE if self.inInit==False :QTimer.singleShot(1, self.rendVisibleLigne) - #print ('ajoutLineEdit, monWidgetPlusieursBase', self.indexDernierLabel) def etablitOrdre(self): i=0 @@ -170,7 +161,6 @@ class MonWidgetPlusieursBase (Ui_WidgetPlusieursBase,Feuille,GereListe,GerePlie) # si on boucle on perd l'ordre - def rendVisibleLigne(self): QApplication.processEvents() self.estVisible.setFocus() @@ -181,8 +171,6 @@ class MonWidgetPlusieursBase (Ui_WidgetPlusieursBase,Feuille,GereListe,GerePlie) return self.finCommentaireListe() def ajout1Valeur(self,valeur=None): - #import traceback - #traceback.print_stack() if valeur == None : return liste,validite=SaisieValeur.TraiteLEValeur(self,str(valeur)) if validite == 0 : return @@ -208,26 +196,30 @@ class MonWidgetPlusieursBase (Ui_WidgetPlusieursBase,Feuille,GereListe,GerePlie) def ajoutNValeur(self,liste): #---------------------------- # attention quand on charge par un fichier, on ne peut pas se contenter d ajouter N fois 1 valeur - # car alors le temps de verification devient prohibitif reconstructution et verification a + # car alors le temps de verification devient prohibitif reconstructu=ion et verification a # chaque valeur. d ou l ajout de ajoutNTuple a politique plusieurs listeFormatee=list(liste) min,max=self.node.item.getMinMax() - if self.objSimp.valeur == None : listeComplete = listeFormatee - else : listeComplete = self.objSimp.valeur + listeFormatee + if self.objSimp.valeur == None : listeComplete=listeFormatee + else : listeComplete =self.objSimp.valeur + listeFormatee if len(listeComplete) > max : texte=tr("Nombre maximum de valeurs ")+str(max)+tr(" atteint") self.editor.afficheInfos(texte,Qt.red) return - validite,comm,comm2 = self.politique.ajoutNTuple(listeComplete) + validite,comm,comm2,listeRetour= self.politique.ajoutNTuple(listeComplete) if not validite : - self.editor.afficheInfos(comm2,Qt.red) + self.editor.affiche_infos(texte,Qt.red) return + # on calcule le dernier lineedit rempli avant de changer la valeur + if self.objSimp.valeur != None : indexDernierRempli=len(self.objSimp.valeur) + else : indexDernierRempli=0 + self.politique.recordValeur(listeComplete) indexDernierRempli=0 @@ -242,22 +234,35 @@ class MonWidgetPlusieursBase (Ui_WidgetPlusieursBase,Feuille,GereListe,GerePlie) indexDernierRempli = indexDernierRempli + 1 - def changeValeur(self,changeDePlace=True,oblige=False,numero=None): - #print ('monWidgetPlusieursBase changeValeur') - self.changeUnLineEdit = False + def changeValeur(self,changeDePlace=True,oblige=False): donneFocus=None derniereValeur=None self.listeValeursCourantes = [] fin=self.indexDernierLabel + for i in range (1, fin): + nomLineEdit="lineEditVal"+str(i) + courant=getattr(self,nomLineEdit) + valeur=courant.text() + lval=valeur.split(',') + if len (lval) > 1 : + msgBox=QMessageBox() + msgBox.setText("separator ',' ") + msgBox.setInformativeText("Do you want to enter " + str (lval) + "?") + msgBox.setStandardButtons( QMessageBox.Ok | QMessageBox.Cancel) + msgBox.setDefaultButton(QMessageBox.Ok) + ret = msgBox.exec_() + if ret != 1024 : + courant.setText("") + return + courant.setText(lval[0]) + self.ajoutNValeur(lval[1:]) + self.listeValeursCourantes = [] for i in range (1, self.indexDernierLabel+1): nomLineEdit="lineEditVal"+str(i) courant=getattr(self,nomLineEdit) valeur=courant.text() if valeur != None and valeur != "" : - # c est ce qui est long mais permet d avoir - # une bonne connaissance des erreurs - # et de traiter le changede place commentaire=self.ajout1Valeur(valeur) if (commentaire != None ): self.editor.afficheInfos(commentaire,Qt.red) @@ -284,19 +289,14 @@ class MonWidgetPlusieursBase (Ui_WidgetPlusieursBase,Feuille,GereListe,GerePlie) self.editor.afficheInfos(tr('nb min de valeurs : ')+str( self.monSimpDef.min)) if len(self.listeValeursCourantes) < min and oblige==True: return if len(self.listeValeursCourantes) > max : return - self.node.item.setValeur(self.listeValeursCourantes) - #print (self.listeValeursCourantes) + retour=self.node.item.setValeur(self.listeValeursCourantes) if len(self.listeValeursCourantes) == self.monSimpDef.max : self.editor.afficheInfos(tr('nb max de valeurs atteint')) self.setValide() self.reaffiche() - def leaveEventScrollArea(self,event): - #print ('monWidgetPlusBase leaveEventScrollArea', self.changeUnLineEdit) - if self.changeUnLineEdit : self.changeValeur(changeDePlace=False) - QScrollArea.leaveEvent(self.scrollArea,event) - - - + self.changeValeur(changeDePlace=False) + QScrollArea.leaveEvent(self.scrollArea,event) +# Avertissement quand on quitte le widget diff --git a/InterfaceQT4/monWidgetPlusieursInto.py b/InterfaceQT4/monWidgetPlusieursInto.py index f54ec53d..8040c914 100644 --- a/InterfaceQT4/monWidgetPlusieursInto.py +++ b/InterfaceQT4/monWidgetPlusieursInto.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 @@ -175,7 +175,7 @@ class MonWidgetPlusieursInto (Ui_WidgetPlusieursInto,Feuille,GerePlie,GereListe) self.listeCB.append(nouveauCB) nouveauCB.setText("") if index % 2 == 1 : nouveauCB.setStyleSheet("background:rgb(210,210,210)") - else : nouveauCB.setStyleSheet("background:rgb(240,240,240)") + else : nouveauCB.setStyleSheet("background:rgb(240,240,240)") self.vScrollBar.triggerAction(QScrollBar.SliderToMaximum) nouveauCB.setFocus() setattr(self,nomCB,nouveauCB) @@ -200,7 +200,8 @@ class MonWidgetPlusieursInto (Ui_WidgetPlusieursInto,Feuille,GerePlie,GereListe) - def changeValeur(self,changeDePlace=False,oblige=True, numero=None): + def changeValeur(self): + #def changeValeur(self,changeDePlace=False,oblige=True, numero=None): #print ('changeValeur') if self.inhibe == True: return if hasattr(self,'LEFiltre') :self.noircirResultatFiltre() diff --git a/InterfaceQT4/monWidgetPlusieursIntoOrdonne.py b/InterfaceQT4/monWidgetPlusieursIntoOrdonne.py index 06bc5753..0d3186a6 100644 --- a/InterfaceQT4/monWidgetPlusieursIntoOrdonne.py +++ b/InterfaceQT4/monWidgetPlusieursIntoOrdonne.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 @@ -64,6 +64,7 @@ class MonWidgetPlusieursIntoOrdonne (Ui_WidgetPlusieursIntoOrdonne, Feuille,Gere self.prepareListeResultat() if len(self.listeAAfficher) < 20 : self.frameRecherche2.close() if len(self.listeAAfficher) < 20 : self.frameRecherche.close() + self.adjustSize() if sys.platform[0:5]!="linux": repIcon=self.node.editor.appliEficas.repIcon fichier=os.path.join(repIcon, 'arrow_up.png') @@ -107,12 +108,8 @@ class MonWidgetPlusieursIntoOrdonne (Ui_WidgetPlusieursIntoOrdonne, Feuille,Gere self.ajoutLE(0) return self.filtreListe() - if len(self.listeAAfficher)*30 > 400 : self.setMinimumHeight(400) - else : - if self.monSimpDef.min > len(self.listeAAfficher) : self.setMinimumHeight(self.monSimpDef.min*30+30) - if self.monSimpDef.max > len(self.listeAAfficher) : self.setMinimumHeight(180) - else : self.setMinimumHeight(len(self.listeAAfficher)*30+30) - self.adjustSize() + if len(self.listeAAfficher)*20 > 400 : self.setMinimumHeight(400) + else : self.setMinimumHeight(len(self.listeAAfficher)*30) self.politique=PolitiquePlusieurs(self.node,self.editor) for i in range(1,len(self.listeAAfficher)+1): self.ajoutLE(i) @@ -259,7 +256,8 @@ class MonWidgetPlusieursIntoOrdonne (Ui_WidgetPlusieursIntoOrdonne, Feuille,Gere self.changeValeur() self.setValeurs(first=False) - def changeValeur(self,changeDePlace=False,oblige=False, numero=None): + def changeValeur(self,changeDePlace=False,oblige=False): +#def changeValeur(self,changeDePlace=False,oblige=False, numero=None): #PN les 2 arg sont pour que la signature de ma fonction soit identique a monWidgetPlusieursBase listeVal=[] for i in range(1,self.indexDernierLabel+1): diff --git a/InterfaceQT4/monWidgetPlusieursPlie.py b/InterfaceQT4/monWidgetPlusieursPlie.py index 389e5111..382d812c 100644 --- a/InterfaceQT4/monWidgetPlusieursPlie.py +++ b/InterfaceQT4/monWidgetPlusieursPlie.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/InterfaceQT4/monWidgetPlusieursTuple.py b/InterfaceQT4/monWidgetPlusieursTuple.py index c1c2d0ed..7a84e501 100644 --- a/InterfaceQT4/monWidgetPlusieursTuple.py +++ b/InterfaceQT4/monWidgetPlusieursTuple.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/InterfaceQT4/monWidgetPlusieursTuple2.py b/InterfaceQT4/monWidgetPlusieursTuple2.py index 564e388d..3c48b18a 100644 --- a/InterfaceQT4/monWidgetPlusieursTuple2.py +++ b/InterfaceQT4/monWidgetPlusieursTuple2.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/InterfaceQT4/monWidgetPlusieursTuple3.py b/InterfaceQT4/monWidgetPlusieursTuple3.py index 9b4b29c5..5c39773c 100644 --- a/InterfaceQT4/monWidgetPlusieursTuple3.py +++ b/InterfaceQT4/monWidgetPlusieursTuple3.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/InterfaceQT4/monWidgetPlusieursTupleAvril11.py b/InterfaceQT4/monWidgetPlusieursTupleAvril11.py index df8ceb2c..83980518 100644 --- a/InterfaceQT4/monWidgetPlusieursTupleAvril11.py +++ b/InterfaceQT4/monWidgetPlusieursTupleAvril11.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/InterfaceQT4/monWidgetPlusieursTupleN.py b/InterfaceQT4/monWidgetPlusieursTupleN.py index 7b0dbb43..42551488 100644 --- a/InterfaceQT4/monWidgetPlusieursTupleN.py +++ b/InterfaceQT4/monWidgetPlusieursTupleN.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/InterfaceQT4/monWidgetRadioButton.py b/InterfaceQT4/monWidgetRadioButton.py index 569e56be..c2cef59e 100644 --- a/InterfaceQT4/monWidgetRadioButton.py +++ b/InterfaceQT4/monWidgetRadioButton.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/InterfaceQT4/monWidgetSDCOInto.py b/InterfaceQT4/monWidgetSDCOInto.py index e5c6de93..691d2713 100644 --- a/InterfaceQT4/monWidgetSDCOInto.py +++ b/InterfaceQT4/monWidgetSDCOInto.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/InterfaceQT4/monWidgetSimpBase.py b/InterfaceQT4/monWidgetSimpBase.py index d1252feb..d916017e 100644 --- a/InterfaceQT4/monWidgetSimpBase.py +++ b/InterfaceQT4/monWidgetSimpBase.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/InterfaceQT4/monWidgetSimpBool.py b/InterfaceQT4/monWidgetSimpBool.py index 53a60983..8bf811ad 100644 --- a/InterfaceQT4/monWidgetSimpBool.py +++ b/InterfaceQT4/monWidgetSimpBool.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/InterfaceQT4/monWidgetSimpComplexe.py b/InterfaceQT4/monWidgetSimpComplexe.py index 5239a2d6..157cf161 100644 --- a/InterfaceQT4/monWidgetSimpComplexe.py +++ b/InterfaceQT4/monWidgetSimpComplexe.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/InterfaceQT4/monWidgetSimpFichier.py b/InterfaceQT4/monWidgetSimpFichier.py index 80970e1c..943e1221 100644 --- a/InterfaceQT4/monWidgetSimpFichier.py +++ b/InterfaceQT4/monWidgetSimpFichier.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/InterfaceQT4/monWidgetSimpSalome.py b/InterfaceQT4/monWidgetSimpSalome.py index af575fd9..cca59c0e 100644 --- a/InterfaceQT4/monWidgetSimpSalome.py +++ b/InterfaceQT4/monWidgetSimpSalome.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/InterfaceQT4/monWidgetSimpTuple.py b/InterfaceQT4/monWidgetSimpTuple.py index 792df7d9..7f43db8c 100644 --- a/InterfaceQT4/monWidgetSimpTuple.py +++ b/InterfaceQT4/monWidgetSimpTuple.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/InterfaceQT4/monWidgetSimpTuple2.py b/InterfaceQT4/monWidgetSimpTuple2.py index 0d74bcaf..e9cae253 100644 --- a/InterfaceQT4/monWidgetSimpTuple2.py +++ b/InterfaceQT4/monWidgetSimpTuple2.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/InterfaceQT4/monWidgetSimpTuple3.py b/InterfaceQT4/monWidgetSimpTuple3.py index e805c2b0..e7fcf977 100644 --- a/InterfaceQT4/monWidgetSimpTuple3.py +++ b/InterfaceQT4/monWidgetSimpTuple3.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/InterfaceQT4/monWidgetSimpTupleN.py b/InterfaceQT4/monWidgetSimpTupleN.py index 10eb8092..57341057 100644 --- a/InterfaceQT4/monWidgetSimpTupleN.py +++ b/InterfaceQT4/monWidgetSimpTupleN.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/InterfaceQT4/monWidgetSimpTxt.py b/InterfaceQT4/monWidgetSimpTxt.py index ca0cb7fe..d377322f 100644 --- a/InterfaceQT4/monWidgetSimpTxt.py +++ b/InterfaceQT4/monWidgetSimpTxt.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/InterfaceQT4/monWidgetTableau.py b/InterfaceQT4/monWidgetTableau.py index 5a0bc061..317bf64f 100644 --- a/InterfaceQT4/monWidgetTableau.py +++ b/InterfaceQT4/monWidgetTableau.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/InterfaceQT4/monWidgetUniqueSDCO.py b/InterfaceQT4/monWidgetUniqueSDCO.py index 3d733331..95d6f75e 100644 --- a/InterfaceQT4/monWidgetUniqueSDCO.py +++ b/InterfaceQT4/monWidgetUniqueSDCO.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/InterfaceQT4/monWidgetVide.py b/InterfaceQT4/monWidgetVide.py index 1fb2e720..0225473d 100644 --- a/InterfaceQT4/monWidgetVide.py +++ b/InterfaceQT4/monWidgetVide.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/InterfaceQT4/politiquesValidation.py b/InterfaceQT4/politiquesValidation.py index 83c2dab7..78628531 100644 --- a/InterfaceQT4/politiquesValidation.py +++ b/InterfaceQT4/politiquesValidation.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/InterfaceQT4/qtEficas.py b/InterfaceQT4/qtEficas.py index 779a9bb5..477b11b4 100755 --- a/InterfaceQT4/qtEficas.py +++ b/InterfaceQT4/qtEficas.py @@ -1,5 +1,6 @@ -# -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +#!/usr/bin/env python +# -*- coding: iso-8859-1 -*- +# Copyright (C) 2007-2021 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,32 +19,1005 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -import logging -import os -logger=logging.getLogger() - -def initialise(flog=None): - if flog == None : - #MonHome=os.environ['HOME'] - MonHome=os.path.expanduser("~") - MaDir=MonHome+"/Eficas_install" - try : - os.mkdir(MaDir) - except : +from __future__ import absolute_import +from __future__ import print_function +try : + from builtins import str +except : pass + +import os, sys + + +from PyQt5.QtWidgets import QApplication, QMainWindow, QGridLayout, QBoxLayout, QMenu, QAction, QMessageBox +from PyQt5.QtGui import QIcon +from PyQt5.QtCore import Qt, QSize + + +from Editeur import session +from myMain import Ui_Eficas +from InterfaceQT4.viewManager import MyViewManager +from InterfaceQT4.qtEficasSsIhm import AppliSsIhm + +from Extensions.i18n import tr +from Extensions.eficas_exception import EficasException +from Extensions import param2 + + +class Appli(AppliSsIhm,Ui_Eficas,QMainWindow): + """ + Class implementing the main user interface. + """ + def __init__(self,code=None,salome=1,parent=None, multi=False,langue='fr',ssIhm=False, labelCode=None): + """ + Constructor + """ + if ssIhm == True : + print ('mauvaise utilisation de la classe Appli. Utiliser AppliSsIm SVP') + exit() + + AppliSsIhm.__init__(self,code,salome,parent,multi=multi,langue=langue,ssIhm=True, labelCode=labelCode) + QMainWindow.__init__(self,parent) + Ui_Eficas.__init__(self) + + self.ssIhm=False + self.multi=multi + self.demande=multi # voir PSEN + + + if self.multi == False : + self.definitCode(code,None) + if code==None: return + else : + self.definitCode(code,None) + if code==None: return + print ('il faut trouver le chemin du code') + return + + self.suiteTelemac=False + if hasattr (self, 'maConfiguration') : + if self.maConfiguration.demandeLangue : + from InterfaceQT4.monChoixLangue import MonChoixLangue + widgetLangue = MonChoixLangue(self) + ret=widgetLangue.exec_() + self.suiteTelemac=self.maConfiguration.suiteTelemac + + + if not self.salome and hasattr (self, 'maConfiguration') and hasattr(self.maConfiguration,'lang') : self.langue=self.maConfiguration.lang + from Extensions import localisation + app=QApplication + if hasattr (self, 'maConfiguration') : localisation.localise(None,self.langue,translatorFichier=self.maConfiguration.translatorFichier) + self.setupUi(self) + + #if parent != None : self.parentCentralWidget = parent.centralWidget() + #else : self.parentCentralWidget = None + + if not self.salome : + if hasattr (self, 'maConfiguration') and hasattr(self.maConfiguration,'taille') : self.taille=self.maConfiguration.taille + else : self.taille=1700 + + self.resize(self.taille,self.height()) + + + icon = QIcon(self.repIcon+"/parametres.png") + self.actionParametres.setIcon(icon) + if hasattr (self, 'maConfiguration') and self.maConfiguration.boutonDsMenuBar : + self.frameEntete.setMaximumSize(QSize(16777215,100)) + self.frameEntete.setMinimumSize(QSize(0,100)) + if hasattr (self, 'maConfiguration') and self.maConfiguration.enleverActionStructures : + self.enleverActionsStructures() + if hasattr (self, 'maConfiguration') and self.maConfiguration.enleverParametres : + self.enleverParametres() + if hasattr (self, 'maConfiguration') and self.maConfiguration.enleverSupprimer : + self.enleverSupprimer() + + + self.myQtab.removeTab(0) + self.blEnteteGlob = QBoxLayout(2,self.frameEntete) + self.blEnteteGlob.setSpacing(0) + self.blEnteteGlob.setContentsMargins(0,0,0,0) + + self.blEntete = QBoxLayout(0) + self.blEntete.insertWidget(0,self.toolBar) + self.blEntete.insertWidget(0,self.menubar) + self.blEnteteGlob.insertLayout(0,self.blEntete) + + + + if hasattr (self, 'maConfiguration') and self.maConfiguration.boutonDsMenuBar : + self.blEnteteCommmande = QBoxLayout(0) + self.blEnteteCommmande.insertWidget(0,self.toolBarCommande) + self.toolBarCommande.setIconSize(QSize(96,96)) + self.blEnteteGlob.insertLayout(-1,self.blEnteteCommmande) + else : + self.toolBarCommande.close() + + + if hasattr (self, 'maConfiguration') and self.maConfiguration.closeEntete==True and self.salome: self.closeEntete() + + eficas_root_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) + + self.viewmanager = MyViewManager(self) + self.recentMenu=QMenu(tr('&Recents')) + #self.menuFichier.insertMenu(self.actionOuvrir,self.recentMenu) + + # actionARemplacer ne sert que pour l insert Menu + self.menuFichier.insertMenu(self.actionARemplacer ,self.recentMenu) + self.menuFichier.removeAction(self.actionARemplacer) + self.connecterSignaux() + self.toolBar.addSeparator() + + + if self.code != None : self.construitMenu() + + self.setWindowTitle(self.VERSION_EFICAS) + try : + #if 1 : + #print ('attention try devient if 1') + self.ouvreFichiers() + except EficasException as exc: + #except: + print ("je suis dans le except") + if self.salome == 0 : exit() + + #self.adjustSize() + + def closeEntete(self): + self.menuBar().close() + self.toolBar.close() + self.frameEntete.close() + + def definitCode(self,code,ssCode) : + self.code=code + self.ssCode=ssCode + if self.code==None : + self.cleanPath() + from InterfaceQT4.monChoixCode import MonChoixCode + widgetChoix = MonChoixCode(self) + ret=widgetChoix.exec_() + #widgetChoix.show() + if self.code == None:return # pour le cancel de la fenetre choix code + AppliSsIhm.definitCode(self,self.code,ssCode) + + #PN --> pb d exception qui font planter salome + # plus supporte en python 3 + #app=QApplication + #if hasattr(prefsCode,'encoding'): + # import sys + # reload(sys) + # sys.setdefaultencoding(prefsCode.encoding) + + def construitMenu(self): + self.initPatrons() + self.initRecents() + self.initAides() + for intituleMenu in ("menuTraduction","menuOptions","menuMesh","menuExecution","menuN1"): + if hasattr(self,intituleMenu): + menu=getattr(self,intituleMenu) + menu.setAttribute(Qt.WA_DeleteOnClose) + menu.close() + delattr(self,intituleMenu) + for intituleAction in ("actionExecution","actionSaveRun"): + if hasattr(self,intituleAction): + action=getattr(self,intituleAction) + self.toolBar.removeAction(action) + if self.code.upper() in Appli.__dict__: + Appli.__dict__[self.code.upper()](self,) + if self.suiteTelemac : self.lookSuiteTelemac() + self.metMenuAJourUtilisateurs() + if hasattr (self, 'maConfiguration') and self.maConfiguration.ajoutExecution : + self.ajoutExecution() + + def initAides(self): + #print "je passe la" + repAide=os.path.dirname(os.path.abspath(__file__)) + fileName='index.html' + self.docPath=repAide+"/../Aide" + if hasattr(self,'maConfiguration') and hasattr(self.maConfiguration,'docPath') : self.docPath=self.maConfiguration.docPath + if hasattr(self,'maConfiguration') and hasattr(self.maConfiguration,'fileName'):fileName=self.maConfiguration.fileName + self.fileDoc=os.path.join(self.docPath,fileName) + self.actionCode.setText(tr("Aide specifique ")+str(self.code)) + if not os.path.isfile(self.fileDoc) : + self.fileDoc="" + self.docPath="" + self.actionCode.setEnabled(False) + return + + self.actionCode.setEnabled(True) + self.menuAide.addAction(self.actionCode) + + def newN1(self): + ssCode=None + code="PSEN_N1" + self.cleanPath() + dirCode=os.path.abspath(os.path.join(os.path.abspath(__file__),'../..',"ProcessOutputs_Eficas")) + sys.path.insert(0,dirCode) + self.code=code + self.definitCode(code,ssCode) + self.initRecents() + self.multi=True + self.demande=False + self.fileNew() + + def newPSEN(self): + ssCode=None + code="PSEN" + self.cleanPath() + dirCode=os.path.abspath(os.path.join(os.path.abspath(__file__),'../..',code)) + sys.path.insert(0,dirCode) + self.code=code + self.definitCode(code,ssCode) + self.multi=True + self.demande=False + self.fileNew() + + def ajoutN1(self): + return + self.menuN1 = self.menubar.addMenu(tr("Process Output")) + self.actionN1 = QAction(self) + self.actionN1.setText(tr("Process Output")) + self.menuN1.addAction(self.actionN1) + self.actionN1.triggered.connect(self.newN1) + + + if hasattr(self,'actionOpenProcess'):return + + self.actionOpenProcess = QAction(self) + self.actionOpenProcess.setText(tr("Open Process_Output File")) + self.menuN1.addAction(self.actionOpenProcess) + self.actionOpenProcess.triggered.connect(self.openProcess) + + def ajoutExecution(self): + self.menuExecution = self.menubar.addMenu(tr("&Run")) + self.actionExecution = QAction(self) + if sys.platform[0:5]=="linux": + icon6 = QIcon(self.repIcon+"/roue.png") + self.actionExecution.setIcon(icon6) + else : + self.actionExecution.setText(tr("Run")) + self.actionExecution.setObjectName("actionExecution") + self.menuExecution.addAction(self.actionExecution) + if not(self.actionExecution in self.toolBar.actions()): + self.toolBar.addAction(self.actionExecution) + self.actionExecution.setText(tr("Run")) + self.actionExecution.triggered.connect(self.run) + + def ajoutSauveExecution(self): + self.actionSaveRun = QAction(self) + icon7 = QIcon(self.repIcon+"/export_MAP.png") + self.actionSaveRun.setIcon(icon7) + self.actionSaveRun.setObjectName("actionSaveRun") + self.menuExecution.addAction(self.actionSaveRun) + if not(self.actionSaveRun in self.toolBar.actions()): + self.toolBar.addAction(self.actionSaveRun) + self.actionSaveRun.setText(tr("Save Run")) + self.actionSaveRun.triggered.connect(self.saveRun) + + def griserActionsStructures(self): + self.actionCouper.setEnabled(False) + self.actionColler.setEnabled(False) + self.actionCopier.setEnabled(False) + self.actionSupprimer.setEnabled(False) + + def enleverActionsStructures(self): + self.toolBar.removeAction(self.actionCopier) + self.toolBar.removeAction(self.actionColler) + self.toolBar.removeAction(self.actionCouper) + self.menuEdition.removeAction(self.actionCouper) + self.menuEdition.removeAction(self.actionCopier) + self.menuEdition.removeAction(self.actionColler) + + + def enleverParametres(self): + self.toolBar.removeAction(self.actionParametres) + self.menuJdC.removeAction(self.actionParametres) + + def enleverSupprimer(self): + self.toolBar.removeAction(self.actionSupprimer) + + def enlevernewInclude(self): + self.actionNouvel_Include.setVisible(False) + + def enleverRechercherDsCatalogue(self): + self.actionRechercherDsCatalogue.setVisible(False) + + def connectRechercherDsCatalogue(self): + if hasattr(self,'rechercherDejaLa') : return + self.rechercherDejaLa=True + self.actionRechercherDsCatalogue.triggered.connect(self.handleRechercherDsCatalogue) + + def ajoutSortieComplete(self): + if hasattr(self,'actionSortieComplete') : return + self.actionSortieComplete = QAction(self) + self.actionSortieComplete.setText(tr("Sortie Complete")) + self.menuFichier.insertAction(self.actionEnregistrer_sous,self.actionSortieComplete) + self.actionSortieComplete.triggered.connect(self.handleSortieComplete) + + + def MT(self): + self.enlevernewInclude() + self.toolBar.addSeparator() + + + def ZCRACKS(self): + self.enlevernewInclude() + self.toolBar.addSeparator() + self.ajoutExecution() + + self.menuOptions = self.menubar.addMenu("menuOptions") + self.menuOptions.addAction(self.actionParametres_Eficas) + self.menuOptions.setTitle(tr("Options")) + + def ADAO(self): + self.enleverActionsStructures() + self.enlevernewInclude() + + def ASTER(self) : + self.menuTraduction = self.menubar.addMenu("menuTraduction") + self.menuTraduction.addAction(self.actionTraduitV11V12) + self.menuTraduction.addAction(self.actionTraduitV10V11) + self.menuTraduction.addAction(self.actionTraduitV9V10) + self.menuTraduction.setTitle(tr("Traduction")) + + self.menuFichier.addAction(self.actionSauveLigne) + + self.menuOptions = self.menubar.addMenu("menuOptions") + self.menuOptions.addAction(self.actionParametres_Eficas) + self.menuOptions.addAction(self.actionLecteur_Pdf) + self.menuOptions.setTitle(tr("Options")) + + def CARMEL3D(self): + #if self.salome == 0 : return + self.enlevernewInclude() + self.menuMesh = self.menubar.addMenu(tr("Gestion Maillage")) + self.menuMesh.setObjectName("Mesh") + self.menuMesh.addAction(self.actionChercheGrpMaille) + #self.griserActionsStructures() + + def CARMELCND(self): + self.enlevernewInclude() + self.enleverRechercherDsCatalogue() + self.ajoutExecution() + self.ajoutSauveExecution() + self.griserActionsStructures() + + def MAP(self): + self.enlevernewInclude() + self.toolBar.addSeparator() + self.ajoutExecution() + self.ajoutSauveExecution() + self.menuOptions = self.menubar.addMenu("menuOptions") + self.menuOptions.addAction(self.actionParametres_Eficas) + self.menuOptions.setTitle(tr("Options")) + + def MAPIDENTIFICATION(self): + self.enlevernewInclude() + self.enleverSupprimer() + #self.ajoutExecution() + self.enleverRechercherDsCatalogue() + self.enleverActionsStructures() + self.enleverParametres() + + def PSEN(self): + try : self.action_Nouveau.triggered.disconnect(self.fileNew) + except : pass + try : self.action_Nouveau.triggered.disconnect(self.newPSEN) + except : pass + + self.action_Nouveau.triggered.connect(self.newPSEN) + self.enleverActionsStructures() + self.enleverParametres() + self.enleverRechercherDsCatalogue() + self.enlevernewInclude() + self.ajoutExecution() + self.ajoutN1() + self.ajoutHelpPSEN() + self.ajoutIcones() + + def PSEN_N1(self): + self.enleverActionsStructures() + self.enleverParametres() + self.enleverRechercherDsCatalogue() + self.enlevernewInclude() + self.ajoutExecution() + self.ajoutIcones() + + def TELEMAC(self): + self.enleverActionsStructures() + self.enlevernewInclude() + self.connectRechercherDsCatalogue() + self.ajoutSortieComplete() + + def lookSuiteTelemac(self): + self.enleverActionsStructures() + self.enlevernewInclude() + self.enleverParametres() + self.enleverSupprimer() + self.enleverRechercherDsCatalogue() + + def ajoutHelpPSEN(self): + self.actionParametres_Eficas.setText('Help PSEN') + self.actionParametres_Eficas.triggered.connect(self.aidePSEN) + + + + def ChercheGrpMesh(self): + Msg,listeGroup=self.ChercheGrpMeshInSalome() + if Msg == None : + self.viewmanager.handleAjoutGroup(listeGroup) + else : + print ("il faut gerer les erreurs") + + def ChercheGrpMaille(self): + # Normalement la variable self.salome permet de savoir si on est ou non dans Salome + try: + Msg,listeGroup=self.ChercheGrpMailleInSalome() # recherche dans Salome + #Msg = None; listeGroup = None # recherche manuelle, i.e., sans Salome si ligne precedente commentee + except: + raise ValueError('Salome non ouvert') + if Msg == None : + self.viewmanager.handleAjoutGroup(listeGroup) + else : + print ("il faut gerer les erreurs") + + + def ChercheGrp(self): + #Msg,listeGroup=self.ChercheGrpMailleInSalome() + #if Msg == None : + # self.viewmanager.handleAjoutGroup(listeGroup) + #else : + #print "il faut gerer " + pass + + + def ajoutIcones(self) : + # Pour pallier les soucis de repertoire d icone + #print self.repIcon + icon = QIcon(self.repIcon+"/new_file.png") + self.action_Nouveau.setIcon(icon) + icon1 = QIcon(self.repIcon+"/ouvrir.png") + self.actionOuvrir.setIcon(icon1) + icon2 = QIcon(self.repIcon+"/save.png") + self.actionEnregistrer.setIcon(icon2) + icon6 = QIcon(self.repIcon+"/delete.png") + self.actionSupprimer.setIcon(icon6) + icon7 = QIcon(self.repIcon+"/roue.png") + self.actionExecution.setIcon(icon7) + + + + + def connecterSignauxQT4(self) : + self.connect(self.recentMenu,SIGNAL('aboutToShow()'),self.handleShowRecentMenu) + + self.connect(self.action_Nouveau,SIGNAL("triggered()"),self.fileNew) + self.connect(self.actionNouvel_Include,SIGNAL("triggered()"),self.newInclude) + self.connect(self.actionOuvrir,SIGNAL("triggered()"),self.fileOpen) + self.connect(self.actionEnregistrer,SIGNAL("triggered()"),self.fileSave) + self.connect(self.actionEnregistrer_sous,SIGNAL("triggered()"),self.fileSaveAs) + self.connect(self.actionFermer,SIGNAL("triggered()"),self.fileClose) + self.connect(self.actionFermer_tout,SIGNAL("triggered()"),self.fileCloseAll) + self.connect(self.actionQuitter,SIGNAL("triggered()"),self.fileExit) + + self.connect(self.actionEficas,SIGNAL("triggered()"),self.aidePPal) + self.connect(self.actionVersion,SIGNAL("triggered()"),self.version) + self.connect(self.actionParametres,SIGNAL("triggered()"),self.gestionParam) + + self.connect(self.actionCouper,SIGNAL("triggered()"),self.editCut) + self.connect(self.actionCopier,SIGNAL("triggered()"),self.editCopy) + self.connect(self.actionColler,SIGNAL("triggered()"),self.editPaste) + self.connect(self.actionSupprimer,SIGNAL("triggered()"),self.supprimer) + self.connect(self.actionRechercher,SIGNAL("triggered()"),self.rechercher) + self.connect(self.actionDeplier_replier,SIGNAL("triggered()"),self.handleDeplier) + + self.connect(self.actionRapport_de_Validation,SIGNAL("triggered()"),self.jdcRapport) + self.connect(self.actionRegles_du_JdC,SIGNAL("triggered()"),self.jdcRegles) + self.connect(self.actionFichier_Source,SIGNAL("triggered()"),self.jdcFichierSource) + self.connect(self.actionFichier_Resultat,SIGNAL("triggered()"),self.visuJdcPy) + + + + + # Pour Aster + self.actionTraduitV9V10 = QAction(self) + self.actionTraduitV9V10.setObjectName("actionTraduitV9V10") + self.actionTraduitV9V10.setText(tr("TraduitV9V10")) + self.actionTraduitV10V11 = QAction(self) + self.actionTraduitV10V11.setObjectName("actionTraduitV10V11") + self.actionTraduitV10V11.setText(tr("TraduitV10V11")) + self.actionTraduitV11V12 = QAction(self) + self.actionTraduitV11V12.setObjectName("actionTraduitV11V12") + self.actionTraduitV11V12.setText(tr("TraduitV11V12")) + self.actionSauveLigne = QAction(self) + self.actionSauveLigne.setText(tr("Sauve Format Ligne")) + + #self.connect(self.actionParametres_Eficas,SIGNAL("triggered()"),self.optionEditeur) + self.connect(self.actionLecteur_Pdf,SIGNAL("triggered()"),self.optionPdf) + self.connect(self.actionTraduitV9V10,SIGNAL("triggered()"),self.traductionV9V10) + self.connect(self.actionTraduitV10V11,SIGNAL("triggered()"),self.traductionV10V11) + self.connect(self.actionTraduitV11V12,SIGNAL("triggered()"),self.traductionV11V12) + self.connect(self.actionSauveLigne,SIGNAL("triggered()"),self.sauveLigne) + + + # Pour Carmel + self.actionChercheGrpMaille = QAction(self) + self.actionChercheGrpMaille.setText(tr("Acquiert groupe mailles")) + self.connect(self.actionChercheGrpMaille,SIGNAL("triggered()"),self.ChercheGrpMaille) + + # Pour CarmelCND + self.actionChercheGrp = QAction(self) + self.actionChercheGrp.setText(tr("Acquisition Groupe Maille")) + self.connect(self.actionChercheGrp,SIGNAL("triggered()"),self.ChercheGrp) + + # Pour Aide + self.actionCode = QAction(self) + self.actionCode.setText(tr("Specificites Maille")) + self.connect(self.actionCode,SIGNAL("triggered()"),self.aideCode) + + def connecterSignaux(self) : + + self.recentMenu.aboutToShow.connect(self.handleShowRecentMenu) + self.action_Nouveau.triggered.connect(self.fileNew) + self.actionNouvel_Include.triggered.connect(self.newInclude) + self.actionOuvrir.triggered.connect(self.fileOpen) + self.actionEnregistrer.triggered.connect(self.fileSave) + self.actionEnregistrer_sous.triggered.connect(self.fileSaveAs) + self.actionFermer.triggered.connect(self.fileClose) + self.actionFermer_tout.triggered.connect(self.fileCloseAll) + self.actionQuitter.triggered.connect(self.fileExit) + + self.actionEficas.triggered.connect(self.aidePPal) + self.actionVersion.triggered.connect(self.version) + self.actionParametres.triggered.connect(self.gestionParam) + self.actionCommentaire.triggered.connect(self.ajoutCommentaire) + + self.actionCouper.triggered.connect(self.editCut) + self.actionCopier.triggered.connect(self.editCopy) + self.actionColler.triggered.connect(self.editPaste) + self.actionSupprimer.triggered.connect(self.supprimer) + self.actionRechercher.triggered.connect(self.rechercher) + self.actionDeplier_replier.triggered.connect(self.handleDeplier) + + self.actionRapport_de_Validation.triggered.connect(self.jdcRapport) + self.actionRegles_du_JdC.triggered.connect(self.jdcRegles) + self.actionFichier_Source.triggered.connect(self.jdcFichierSource) + self.actionFichier_Resultat.triggered.connect(self.visuJdcPy) + self.actionAfficher_l_Arbre.triggered.connect(self.ouvreArbre) + self.actionCacher_l_Arbre.triggered.connect(self.fermeArbre) + + + # Pour Aster + self.actionTraduitV9V10 = QAction(self) + self.actionTraduitV9V10.setObjectName("actionTraduitV9V10") + self.actionTraduitV9V10.setText(tr("TraduitV9V10")) + self.actionTraduitV10V11 = QAction(self) + self.actionTraduitV10V11.setObjectName("actionTraduitV10V11") + self.actionTraduitV10V11.setText(tr("TraduitV10V11")) + self.actionTraduitV11V12 = QAction(self) + self.actionTraduitV11V12.setObjectName("actionTraduitV11V12") + self.actionTraduitV11V12.setText(tr("TraduitV11V12")) + self.actionSauveLigne = QAction(self) + self.actionSauveLigne.setText(tr("Sauve Format Ligne")) + + #self.actionParametres_Eficas.triggered.connect(self.optionEditeur) + self.actionTraduitV9V10.triggered.connect(self.traductionV9V10) + self.actionTraduitV10V11.triggered.connect(self.traductionV10V11) + self.actionTraduitV11V12.triggered.connect(self.traductionV11V12) + self.actionSauveLigne.triggered.connect(self.sauveLigne) + + # Pour Carmel + self.actionChercheGrpMaille = QAction(self) + self.actionChercheGrpMaille.setText(tr("Acquiert Groupe Maille")) + + # Pour CarmelCND + self.actionChercheGrp = QAction(self) + self.actionChercheGrp.setText(tr("Accquisition Groupe Maille")) + self.actionChercheGrp.triggered.connect(self.ChercheGrp) + + # Pour Aide + self.actionCode = QAction(self) + self.actionCode.setText(tr("Specificites Maille")) + self.actionCode.triggered.connect(self.aideCode) + + + def handleDeplier(self): + self.viewmanager.handleDeplier() + + def ajoutCommentaire(self): + self.viewmanager.ajoutCommentaire() + + def ouvreFichiers(self) : + # Ouverture des fichiers de commandes donnes sur la ligne de commande + cwd=os.getcwd() + self.dir=cwd + for study in session.d_env.studies: + os.chdir(cwd) + d=session.getUnit(study,self) + self.viewmanager.handleOpen(fichier=study["comm"],units=d) + + + def getSource(self,file): + # appele par Editeur/session.py + import convert + p=convert.plugins['python']() + p.readfile(file) + texte=p.convert('execnoparseur') + return texte + + def initPatrons(self) : + # Mise a jour du menu des fichiers recemment ouverts + from Editeur import listePatrons + if not(self.code in listePatrons.sous_menus) : + if hasattr(self,"menuPatrons"): + self.menuPatrons.setAttribute(Qt.WA_DeleteOnClose) + self.menuPatrons.close() + delattr(self,"menuPatrons") + return + if (not hasattr(self,"menuPatrons")): + self.menuPatrons = QMenu(self.menubar) + self.menuPatrons.setObjectName("menuPatrons") + self.menubar.addAction(self.menuPatrons.menuAction()) + self.menuPatrons.setTitle(tr("Patrons")) + else : + self.menuPatrons.clear() + self.listePatrons = listePatrons.listePatrons(self.code) + idx = 0 + for nomSsMenu in self.listePatrons.liste: + ssmenu=self.menuPatrons.addMenu(nomSsMenu) + for fichier in self.listePatrons.liste[nomSsMenu]: + id = ssmenu.addAction(fichier) + self.ficPatrons[id]=fichier + self.id.triggered.connect(self.handleOpenPatrons) + # self.Patrons.setItemParameter(id,idx) + idx=idx+1 + + def initRecents(self): + self.recent = [] + try : + #if sys.platform[0:5]=="linux" : + #rep=os.path.join(os.environ['HOME'],'.config/Eficas',self.code) + rep=os.path.join(os.path.expanduser("~"),'.config/Eficas',self.code) + #else : + # rep=os.path.join('C:/','.config/Eficas',self.code) + monFichier=rep+"/listefichiers_"+self.code + index=0 + f=open(monFichier) + while ( index < 9) : + ligne=f.readline() + if ligne != "" : + l=(ligne.split("\n"))[0] + self.recent.append(l) + index=index+1 + except : + pass + + try : f.close() + except : pass + + def addToRecentList(self, fn): + while fn in self.recent: self.recent.remove(fn) + self.recent.insert(0,fn) + if len(self.recent) > 9: + self.recent = self.recent[:9] + + + def addToRecentListQT4(self, fn): + """ + Public slot to add a filename to the list of recently opened files. + + @param fn name of the file to be added + """ + self.recent.removeAll(fn) + self.recent.prepend(fn) + if len(self.recent) > 9: + self.recent = self.recent[:9] + index=0 + self.sauveRecents() + + def sauveRecents(self) : + try : + rep=self.maConfiguration.rep_user + monFichier=rep+"/listefichiers_"+self.code + except : + return + try : + f=open(monFichier,'w') + if len(self.recent) == 0 : return + index=0 + while ( index < len(self.recent)): + ligne=str(self.recent[index])+"\n" + f.write(ligne) + index=index+1 + except : pass - try : - os.listdir(MaDir) - flog=MaDir+"/convert.log" - except : - flog='/tmp/convert.log' - - hdlr=logging.FileHandler(flog,'w') - formatter = logging.Formatter('%(levelname)s: %(message)s') - hdlr.setFormatter(formatter) - logger.addHandler(hdlr) - logger.setLevel(logging.INFO) - return hdlr - - -def ferme (hdlr) : - logger.removeHandler(hdlr) + try : + f.close() + except : + pass + + + + def traductionV11V12(self): + from .gereTraduction import traduction + traduction(self.maConfiguration.repIni,self.viewmanager,"V11V12") + + def traductionV10V11(self): + from .gereTraduction import traduction + traduction(self.maConfiguration.repIni,self.viewmanager,"V10V11") + + def traductionV9V10(self): + from .gereTraduction import traduction + traduction(self.maConfiguration.repIni,self.viewmanager,"V9V10") + + def version(self) : + from .monVisu import DVisu + titre = tr("version ") + monVisuDialg=DVisu(parent=self,fl=0) + monVisuDialg.setWindowTitle(titre) + if self.code != None : monVisuDialg.TB.setText(self.VERSION_EFICAS +tr(" pour ") + self.code) + else : monVisuDialg.TB.setText(self.VERSION_EFICAS ) + monVisuDialg.adjustSize() + monVisuDialg.show() + + def aidePPal(self) : + repAide=os.path.dirname(os.path.abspath(__file__)) + maD=os.path.join( repAide,'..','Doc') + try : + indexAide=os.path.join(maD,'index.html') + if sys.platform[0:5]=="linux" : cmd="xdg-open "+indexAide + else : cmd="start "+indexAide + os.system(cmd) + except: + QMessageBox.warning( self,tr( "Aide Indisponible"),tr( "l'aide n est pas installee ")) + + def aidePSEN(self) : + repAide=os.path.dirname(os.path.abspath(__file__)) + maD=os.path.join( repAide,'..','Doc') + try : + indexAide=os.path.join(maD,'index.html') + if sys.platform[0:5]=="linux" : cmd="xdg-open "+indexAide + else : cmd="start "+indexAide + os.system(cmd) + except: + QMessageBox.warning( self,tr( "Aide Indisponible"),tr( "l'aide n est pas installee ")) + + def aideCode(self) : + if self.code==None : return + try : + #if 1 : + if sys.platform[0:5]=="linux" : cmd="xdg-open "+self.fileDoc + else : cmd="start "+self.fileDoc + os.system(cmd) + except: + #else: + QMessageBox.warning( self,tr( "Aide Indisponible"),tr( "l'aide n est pas installee ")) + + + def optionEditeur(self) : + try : + name='monOptions_'+self.code + except : + QMessageBox.critical( self,tr( "Parametrage"),tr( "Veuillez d abord choisir un code")) + return + try : + #if 1: + optionCode=__import__(name) + except : + #else : + QMessageBox.critical( self, tr("Parametrage"), tr("Pas de possibilite de personnalisation de la configuration ")) + return + monOption=optionCode.Options(parent=self,modal = 0 ,configuration=self.maConfiguration) + monOption.show() + + def optionPdf(self) : + from monOptionsPdf import OptionPdf + monOption=OptionPdf(parent=self,modal = 0 ,configuration=self.maConfiguration) + monOption.show() + + def handleSortieComplete(self): + return self.viewmanager.saveCompleteCurrentEditor() + + def handleShowRecentMenu(self): + """ + Private method to set up recent files menu. + """ + self.recentMenu.clear() + + for rp in self.recent: + id = self.recentMenu.addAction(rp) + self.ficRecents[id]=rp + id.triggered.connect(self.handleOpenRecent) + self.recentMenu.addSeparator() + self.recentMenu.addAction(tr('&Effacer'), self.handleClearRecent) + + def handleOpenPatrons(self): + idx=self.sender() + fichier=self.repIni+"/../Editeur/Patrons/"+self.code+"/"+self.ficPatrons[idx] + self.viewmanager.handleOpen(fichier=fichier, patron = 1) + + def handleOpenRecent(self): + idx=self.sender() + fichier=self.ficRecents[idx] + self.viewmanager.handleOpen(fichier=fichier, patron =0 ) + + def handleClearRecent(self): + self.recent = QStringList() + self.sauveRecents() + + def handleRechercherDsCatalogue(self): + if not self.viewmanager : return + self.viewmanager.handleRechercherDsCatalogue() + + def fileNew(self): + try: + self.viewmanager.newEditor() + except EficasException as exc: + msg = str(exc) + if msg != "": QMessageBox.warning(self, tr(u"Erreur"), msg) + + def openProcess(self): + ssCode=None + code="PSEN_N1" + self.cleanPath() + dirCode=os.path.abspath(os.path.join(os.path.abspath(__file__),'../..',"ProcessOutputs_Eficas")) + sys.path.insert(0,dirCode) + self.code=code + self.definitCode(code,ssCode) + self.multi=True + self.demande=False + self.initRecents() + self.fileOpen() + + + def fileOpen(self): + try: + self.viewmanager.handleOpen() + except EficasException as exc: + msg = str(exc) + if msg != "": + QMessageBox.warning(self, tr(u"Erreur"), msg) + + def sauveLigne(self): + return self.viewmanager.sauveLigneCurrentEditor() + + def fileSave(self): + return self.viewmanager.saveCurrentEditor() + + def fileSaveAs(self): + return self.viewmanager.saveAsCurrentEditor() + + def fileClose(self): + self.viewmanager.handleClose(texte='&Fermer') + + def fileCloseAll(self): + self.viewmanager.handleCloseAll(texte='&Fermer') + + def fileExit(self): + # On peut sortir sur Abort + res=self.viewmanager.handleCloseAll() + if (res != 2) : + self.close() + return res + + def editCopy(self): + self.viewmanager.handleEditCopy() + + def editCut(self): + self.viewmanager.handleEditCut() + + def editPaste(self): + self.viewmanager.handleEditPaste() + + def rechercher(self): + self.viewmanager.handleRechercher() + + def run(self): + self.viewmanager.run() + + def saveRun(self): + self.viewmanager.saveRun() + + + def supprimer(self): + self.viewmanager.handleSupprimer() + + def jdcFichierSource(self): + self.viewmanager.handleViewJdcFichierSource() + + def jdcRapport(self): + self.viewmanager.handleViewJdcRapport() + + def jdcRegles(self): + self.viewmanager.handleViewJdcRegles() + + def gestionParam(self): + self.viewmanager.handleGestionParam() + + def visuJdcPy(self): + self.viewmanager.handleViewJdcPy() + + def ouvreArbre(self): + self.viewmanager.ouvreArbre() + + def fermeArbre(self): + self.viewmanager.fermeArbre() + + def newInclude(self): + self.viewmanager.newIncludeEditor() + + def cleanPath(self): + for pathCode in self.ListePathCode: + try: + aEnlever=os.path.abspath(os.path.join(os.path.dirname(__file__),'..',pathCode)) + sys.path.remove(aEnlever) + except : + pass + for pathCode in self.listeAEnlever: + try: + sys.path.remove(aEnlever) + except : + pass + + + def closeEvent(self,event): + res=self.fileExit() + if res==2 : event.ignore() + + + def remplitIconesCommandes(self): + if self.maConfiguration.boutonDsMenuBar == False : return + if not hasattr(self, 'readercata') : return + from monLayoutBouton import MonLayoutBouton + if hasattr(self,'monLayoutBoutonRempli') : return + self.monLayoutBoutonRempli=MonLayoutBouton(self) + + def handleAjoutEtape(self,nomEtape): + self.viewmanager.handleAjoutEtape(nomEtape) + + def metMenuAJourUtilisateurs(self): + self.lesFonctionsUtilisateurs={} + if self.code not in self.mesScripts : return + if not hasattr(self.mesScripts[self.code],'dict_menu') : return + for monMenu in iter(self.mesScripts[self.code].dict_menu.items()) : + titre,lesFonctions= monMenu + self.menuOptions = self.menubar.addMenu("menuOptions") + self.menuOptions.setTitle(tr(titre)) + for elt in lesFonctions : + laFonctionUtilisateur, label, lesArguments = elt + action = QAction(self) + action.setText(label) + #action.triggered.connect(self.appelleFonctionUtilisateur) + self.menuOptions.addAction(action) + self.lesFonctionsUtilisateurs[action]=(laFonctionUtilisateur, lesArguments) + self.menuOptions.triggered.connect(self.handleFonctionUtilisateur) + + + def handleFonctionUtilisateur(self,action) : + (laFonctionUtilisateur, lesArguments)=self.lesFonctionsUtilisateurs[action] + self.viewmanager.handleFonctionUtilisateur(laFonctionUtilisateur, lesArguments) + +if __name__=='__main__': + + # Modules Eficas + rep=os.path.abspath(os.path.join(os.path.dirname(os.path.abspath(__file__),'..','Adao'))) + sys.path.append(rep) + from Adao import prefs + from Adao import prefs_Adao + + from Editeur import import_code + from Editeur import session + + # Analyse des arguments de la ligne de commande + options=session.parse(sys.argv) + code=options.code + + + app = QApplication(sys.argv) + #app.setMainWidget(mw) (qt3) + Eficas=Appli() + Eficas.show() + + #mw.ouvreFichiers() + #mw.show() + + res=app.exec_() + sys.exit(res) diff --git a/InterfaceQT4/qtEficasSsIhm.py b/InterfaceQT4/qtEficasSsIhm.py index d7896621..f2fb2245 100755 --- a/InterfaceQT4/qtEficasSsIhm.py +++ b/InterfaceQT4/qtEficasSsIhm.py @@ -1,5 +1,5 @@ # -*- coding: iso-8859-1 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/InterfaceQT4/qtEficas_with_log.py b/InterfaceQT4/qtEficas_with_log.py index 2eb78021..f52e7e35 100644 --- a/InterfaceQT4/qtEficas_with_log.py +++ b/InterfaceQT4/qtEficas_with_log.py @@ -1,5 +1,5 @@ # -*- coding: iso-8859-1 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/InterfaceQT4/qtSaisie.py b/InterfaceQT4/qtSaisie.py index f6f227a7..16cfd6e7 100644 --- a/InterfaceQT4/qtSaisie.py +++ b/InterfaceQT4/qtSaisie.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/InterfaceQT4/readercata.py b/InterfaceQT4/readercata.py index 2d6a8718..c4faa8fb 100644 --- a/InterfaceQT4/readercata.py +++ b/InterfaceQT4/readercata.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/InterfaceQT4/readercataXML.py b/InterfaceQT4/readercataXML.py index 9282b622..a3ab5c34 100644 --- a/InterfaceQT4/readercataXML.py +++ b/InterfaceQT4/readercataXML.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2013 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/InterfaceQT4/ssIhm.py b/InterfaceQT4/ssIhm.py index 7f55db0b..1d0cbafc 100644 --- a/InterfaceQT4/ssIhm.py +++ b/InterfaceQT4/ssIhm.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/InterfaceQT4/typeNode.py b/InterfaceQT4/typeNode.py index f9e2e944..9068a0aa 100644 --- a/InterfaceQT4/typeNode.py +++ b/InterfaceQT4/typeNode.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/InterfaceQT4/viewManager.py b/InterfaceQT4/viewManager.py index 78955b0a..f415a757 100644 --- a/InterfaceQT4/viewManager.py +++ b/InterfaceQT4/viewManager.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/InterfaceQT4/viewManagerSsIhm.py b/InterfaceQT4/viewManagerSsIhm.py index a588c792..916ccdfa 100644 --- a/InterfaceQT4/viewManagerSsIhm.py +++ b/InterfaceQT4/viewManagerSsIhm.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/MAP/configuration_MAP.py b/MAP/configuration_MAP.py index 6c997677..7a28aefc 100644 --- a/MAP/configuration_MAP.py +++ b/MAP/configuration_MAP.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2013 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/MAP/prefs.py b/MAP/prefs.py index 549c9696..f1df4a02 100644 --- a/MAP/prefs.py +++ b/MAP/prefs.py @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2013 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/MAP/prefs_MAP.py b/MAP/prefs_MAP.py index f134bd1d..ef62c204 100644 --- a/MAP/prefs_MAP.py +++ b/MAP/prefs_MAP.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2013 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/MAP/qtEficas_map.py b/MAP/qtEficas_map.py index e02b8c74..aa4bb0ec 100755 --- a/MAP/qtEficas_map.py +++ b/MAP/qtEficas_map.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (C) 2007-2013 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/MAP/style.py b/MAP/style.py index d5961788..36b4b200 100644 --- a/MAP/style.py +++ b/MAP/style.py @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2013 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/MT/prefs.py b/MT/prefs.py index 7f8d8fa1..14b8c020 100644 --- a/MT/prefs.py +++ b/MT/prefs.py @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2012 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/MT/qtEficasMT.py b/MT/qtEficasMT.py index 3fa63c87..4576464e 100755 --- a/MT/qtEficasMT.py +++ b/MT/qtEficasMT.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (C) 2007-2013 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/EssaiInit/Cata_MED_FAM.xml b/Med/Cata_MED_FAM.xml similarity index 100% rename from EssaiInit/Cata_MED_FAM.xml rename to Med/Cata_MED_FAM.xml diff --git a/EssaiInit/Cata_MED_FAM.xml.mini b/Med/Cata_MED_FAM.xml.mini similarity index 100% rename from EssaiInit/Cata_MED_FAM.xml.mini rename to Med/Cata_MED_FAM.xml.mini diff --git a/EssaiInit/Cata_MED_FAM.xml.origin b/Med/Cata_MED_FAM.xml.origin similarity index 100% rename from EssaiInit/Cata_MED_FAM.xml.origin rename to Med/Cata_MED_FAM.xml.origin diff --git a/EssaiInit/README.txt b/Med/README.txt similarity index 100% rename from EssaiInit/README.txt rename to Med/README.txt diff --git a/EssaiInit/aide1 b/Med/aide1 similarity index 100% rename from EssaiInit/aide1 rename to Med/aide1 diff --git a/EssaiInit/efficas.py b/Med/efficas.py similarity index 100% rename from EssaiInit/efficas.py rename to Med/efficas.py diff --git a/EssaiInit/model.xsd b/Med/model.xsd similarity index 100% rename from EssaiInit/model.xsd rename to Med/model.xsd diff --git a/PSEN_Eficas/PSEN/__init__.py b/Med/raw/__init__.py old mode 100755 new mode 100644 similarity index 100% rename from PSEN_Eficas/PSEN/__init__.py rename to Med/raw/__init__.py diff --git a/EssaiInit/raw/efficas.py b/Med/raw/efficas.py similarity index 100% rename from EssaiInit/raw/efficas.py rename to Med/raw/efficas.py diff --git a/EssaiInit/readerEfficas.py b/Med/readerEfficas.py similarity index 100% rename from EssaiInit/readerEfficas.py rename to Med/readerEfficas.py diff --git a/Noyau/N_ASSD.py b/Noyau/N_ASSD.py index 801df350..1ac832fc 100644 --- a/Noyau/N_ASSD.py +++ b/Noyau/N_ASSD.py @@ -1,5 +1,5 @@ # coding=utf-8 -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 @@ -105,11 +105,6 @@ class ASSD(object): def setName(self, nom): """Positionne le nom de self """ - print ('uuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuu') - print ('uuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuu') - print ('uuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuu') - print ('uuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuu') - print ('uuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuu') self.nom = nom def isTypCO(self): @@ -238,10 +233,8 @@ class ASSD(object): aTraiter=(self.etape,) while len(listeAttributs) > 0 : attribut=listeAttributs.pop(0) - print ("attribut", attribut) nvListe=[] for mc in aTraiter : - print (mc) try : resultat=mc.getMocle(attribut) if isinstance(resultat,MCList): diff --git a/Noyau/N_BLOC.py b/Noyau/N_BLOC.py index 73d9835f..255b94fa 100644 --- a/Noyau/N_BLOC.py +++ b/Noyau/N_BLOC.py @@ -1,5 +1,5 @@ # coding=utf-8 -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Noyau/N_CO.py b/Noyau/N_CO.py index 998922e6..4f189595 100644 --- a/Noyau/N_CO.py +++ b/Noyau/N_CO.py @@ -1,5 +1,5 @@ # coding=utf-8 -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Noyau/N_CONVERT.py b/Noyau/N_CONVERT.py index b900ade1..2560cadc 100644 --- a/Noyau/N_CONVERT.py +++ b/Noyau/N_CONVERT.py @@ -1,5 +1,5 @@ # coding=utf-8 -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Noyau/N_CR.py b/Noyau/N_CR.py index 95aa455a..858f29b4 100644 --- a/Noyau/N_CR.py +++ b/Noyau/N_CR.py @@ -1,5 +1,5 @@ # coding=utf-8 -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Noyau/N_ETAPE.py b/Noyau/N_ETAPE.py index 3e2da2db..2e6e4db9 100644 --- a/Noyau/N_ETAPE.py +++ b/Noyau/N_ETAPE.py @@ -1,5 +1,5 @@ # coding=utf-8 -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Noyau/N_FACT.py b/Noyau/N_FACT.py index 90753390..a6108272 100644 --- a/Noyau/N_FACT.py +++ b/Noyau/N_FACT.py @@ -1,5 +1,5 @@ # coding=utf-8 -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Noyau/N_FONCTION.py b/Noyau/N_FONCTION.py index 2638cccd..72fe2969 100644 --- a/Noyau/N_FONCTION.py +++ b/Noyau/N_FONCTION.py @@ -1,5 +1,5 @@ # coding=utf-8 -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Noyau/N_FORM.py b/Noyau/N_FORM.py index 0521db73..9ec437dc 100644 --- a/Noyau/N_FORM.py +++ b/Noyau/N_FORM.py @@ -1,5 +1,5 @@ # coding=utf-8 -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Noyau/N_FORM_ETAPE.py b/Noyau/N_FORM_ETAPE.py index 4b6aad4f..ec62c461 100644 --- a/Noyau/N_FORM_ETAPE.py +++ b/Noyau/N_FORM_ETAPE.py @@ -1,5 +1,5 @@ # coding=utf-8 -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Noyau/N_GEOM.py b/Noyau/N_GEOM.py index 816fd422..5f0cec66 100644 --- a/Noyau/N_GEOM.py +++ b/Noyau/N_GEOM.py @@ -1,5 +1,5 @@ # coding=utf-8 -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Noyau/N_JDC.py b/Noyau/N_JDC.py index 22d565c0..b12f002b 100644 --- a/Noyau/N_JDC.py +++ b/Noyau/N_JDC.py @@ -1,5 +1,5 @@ # coding=utf-8 -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Noyau/N_JDC_CATA.py b/Noyau/N_JDC_CATA.py index 9ff694e4..7f9368ab 100644 --- a/Noyau/N_JDC_CATA.py +++ b/Noyau/N_JDC_CATA.py @@ -1,5 +1,5 @@ # coding=utf-8 -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Noyau/N_LASSD.py b/Noyau/N_LASSD.py index 31669567..a4840a51 100644 --- a/Noyau/N_LASSD.py +++ b/Noyau/N_LASSD.py @@ -1,5 +1,5 @@ # -*- coding: iso-8859-1 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Noyau/N_MACRO.py b/Noyau/N_MACRO.py index e7069e03..c15a70e6 100644 --- a/Noyau/N_MACRO.py +++ b/Noyau/N_MACRO.py @@ -1,5 +1,5 @@ # coding=utf-8 -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Noyau/N_MACRO_ETAPE.py b/Noyau/N_MACRO_ETAPE.py index 4fda6801..619b9676 100644 --- a/Noyau/N_MACRO_ETAPE.py +++ b/Noyau/N_MACRO_ETAPE.py @@ -1,5 +1,5 @@ # coding=utf-8 -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Noyau/N_MCBLOC.py b/Noyau/N_MCBLOC.py index a0305414..007eac77 100644 --- a/Noyau/N_MCBLOC.py +++ b/Noyau/N_MCBLOC.py @@ -1,5 +1,5 @@ # coding=utf-8 -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Noyau/N_MCCOMPO.py b/Noyau/N_MCCOMPO.py index 15f27b9a..88ed885b 100644 --- a/Noyau/N_MCCOMPO.py +++ b/Noyau/N_MCCOMPO.py @@ -1,5 +1,5 @@ # coding=utf-8 -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Noyau/N_MCFACT.py b/Noyau/N_MCFACT.py index 3974cdb6..1b2bcd94 100644 --- a/Noyau/N_MCFACT.py +++ b/Noyau/N_MCFACT.py @@ -1,5 +1,5 @@ # coding=utf-8 -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Noyau/N_MCLIST.py b/Noyau/N_MCLIST.py index 5d693ed9..edf97d33 100644 --- a/Noyau/N_MCLIST.py +++ b/Noyau/N_MCLIST.py @@ -1,5 +1,5 @@ # coding=utf-8 -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Noyau/N_MCSIMP.py b/Noyau/N_MCSIMP.py index 92d007eb..979bddae 100644 --- a/Noyau/N_MCSIMP.py +++ b/Noyau/N_MCSIMP.py @@ -1,5 +1,5 @@ # coding=utf-8 -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Noyau/N_OBJECT.py b/Noyau/N_OBJECT.py index 45891db4..d7f829df 100644 --- a/Noyau/N_OBJECT.py +++ b/Noyau/N_OBJECT.py @@ -1,5 +1,5 @@ ## coding=utf-8 -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Noyau/N_OPER.py b/Noyau/N_OPER.py index 22263f3c..512b1218 100644 --- a/Noyau/N_OPER.py +++ b/Noyau/N_OPER.py @@ -1,5 +1,5 @@ # coding=utf-8 -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Noyau/N_OPS.py b/Noyau/N_OPS.py index d835a6a4..9ff0efdd 100644 --- a/Noyau/N_OPS.py +++ b/Noyau/N_OPS.py @@ -1,5 +1,5 @@ # coding=utf-8 -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Noyau/N_PROC.py b/Noyau/N_PROC.py index 97c120df..8e6a0993 100644 --- a/Noyau/N_PROC.py +++ b/Noyau/N_PROC.py @@ -1,5 +1,5 @@ # coding=utf-8 -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Noyau/N_PROC_ETAPE.py b/Noyau/N_PROC_ETAPE.py index 7611d57b..fde2ac79 100644 --- a/Noyau/N_PROC_ETAPE.py +++ b/Noyau/N_PROC_ETAPE.py @@ -1,5 +1,5 @@ # coding=utf-8 -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Noyau/N_REGLE.py b/Noyau/N_REGLE.py index 4f09b7f6..ff0fd8be 100644 --- a/Noyau/N_REGLE.py +++ b/Noyau/N_REGLE.py @@ -1,5 +1,5 @@ # coding=utf-8 -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Noyau/N_SENSIBILITE.py b/Noyau/N_SENSIBILITE.py index bd6fbd5e..8ba50089 100644 --- a/Noyau/N_SENSIBILITE.py +++ b/Noyau/N_SENSIBILITE.py @@ -1,5 +1,5 @@ # -*- coding: iso-8859-1 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Noyau/N_SIMP.py b/Noyau/N_SIMP.py index 40b8452d..34e22b20 100644 --- a/Noyau/N_SIMP.py +++ b/Noyau/N_SIMP.py @@ -1,5 +1,5 @@ # coding=utf-8 -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Noyau/N_UserASSD.py b/Noyau/N_UserASSD.py index 6ed18126..a20f046f 100644 --- a/Noyau/N_UserASSD.py +++ b/Noyau/N_UserASSD.py @@ -1,5 +1,5 @@ # coding=utf-8 -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Noyau/N_VALIDATOR.py b/Noyau/N_VALIDATOR.py index df36f26b..b49decfc 100644 --- a/Noyau/N_VALIDATOR.py +++ b/Noyau/N_VALIDATOR.py @@ -1,5 +1,5 @@ # coding=utf-8 -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Noyau/N__F.py b/Noyau/N__F.py index 95527da7..122719d2 100644 --- a/Noyau/N__F.py +++ b/Noyau/N__F.py @@ -1,5 +1,5 @@ # coding=utf-8 -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Noyau/N_types.py b/Noyau/N_types.py index fdc0af77..d6e889e3 100644 --- a/Noyau/N_types.py +++ b/Noyau/N_types.py @@ -1,5 +1,5 @@ # coding=utf-8 -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Noyau/N_utils.py b/Noyau/N_utils.py index c5be200c..21e928fd 100644 --- a/Noyau/N_utils.py +++ b/Noyau/N_utils.py @@ -1,5 +1,5 @@ # coding=utf-8 -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Noyau/nommage.py b/Noyau/nommage.py index 5966f9fd..a636018e 100644 --- a/Noyau/nommage.py +++ b/Noyau/nommage.py @@ -1,5 +1,5 @@ # coding=utf-8 -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Noyau/strfunc.py b/Noyau/strfunc.py index 1cb1f51d..b4565567 100644 --- a/Noyau/strfunc.py +++ b/Noyau/strfunc.py @@ -1,5 +1,5 @@ # coding=utf-8 -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/OldCodes/Aster/__init__.py b/OldCodes/Aster/__init__.py index 8ed65e16..5b4f0e3b 100644 --- a/OldCodes/Aster/__init__.py +++ b/OldCodes/Aster/__init__.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2012 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/OldCodes/Aster/configuration_ASTER.py b/OldCodes/Aster/configuration_ASTER.py index 4851738f..20e2f595 100644 --- a/OldCodes/Aster/configuration_ASTER.py +++ b/OldCodes/Aster/configuration_ASTER.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2012 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/OldCodes/Aster/prefs.py b/OldCodes/Aster/prefs.py index b4663f8f..8210a6b0 100644 --- a/OldCodes/Aster/prefs.py +++ b/OldCodes/Aster/prefs.py @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2012 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/OldCodes/Aster/prefs_ASTER.py b/OldCodes/Aster/prefs_ASTER.py index f9aa732c..8e5c51e4 100644 --- a/OldCodes/Aster/prefs_ASTER.py +++ b/OldCodes/Aster/prefs_ASTER.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2012 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/OldCodes/Aster/properties.py b/OldCodes/Aster/properties.py index 3e8be170..fe6ffb0d 100644 --- a/OldCodes/Aster/properties.py +++ b/OldCodes/Aster/properties.py @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2012 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/OldCodes/Aster/qtEficas_aster.py b/OldCodes/Aster/qtEficas_aster.py index f49b9bcb..336afdff 100755 --- a/OldCodes/Aster/qtEficas_aster.py +++ b/OldCodes/Aster/qtEficas_aster.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (C) 2007-2012 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/OldCodes/Aster/qtGroup.py b/OldCodes/Aster/qtGroup.py index 308eda6b..af68952c 100755 --- a/OldCodes/Aster/qtGroup.py +++ b/OldCodes/Aster/qtGroup.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (C) 2007-2012 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/OldCodes/Aster/style.py b/OldCodes/Aster/style.py index 7ee50545..316b4d1f 100644 --- a/OldCodes/Aster/style.py +++ b/OldCodes/Aster/style.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2012 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Carmel3D/CMakeLists.txt b/OldCodes/Carmel3D/CMakeLists.txt similarity index 100% rename from Carmel3D/CMakeLists.txt rename to OldCodes/Carmel3D/CMakeLists.txt diff --git a/Carmel3D/Carmel3D_Cata_V0.py b/OldCodes/Carmel3D/Carmel3D_Cata_V0.py similarity index 99% rename from Carmel3D/Carmel3D_Cata_V0.py rename to OldCodes/Carmel3D/Carmel3D_Cata_V0.py index 6fe6de90..4e05a02d 100644 --- a/Carmel3D/Carmel3D_Cata_V0.py +++ b/OldCodes/Carmel3D/Carmel3D_Cata_V0.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -------------------------------------------------- -# Copyright (C) 2007-2013 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Carmel3D/Carmel3D_Cata_frequentiel_V0.py b/OldCodes/Carmel3D/Carmel3D_Cata_frequentiel_V0.py similarity index 98% rename from Carmel3D/Carmel3D_Cata_frequentiel_V0.py rename to OldCodes/Carmel3D/Carmel3D_Cata_frequentiel_V0.py index a90c5626..1a3c84c0 100755 --- a/Carmel3D/Carmel3D_Cata_frequentiel_V0.py +++ b/OldCodes/Carmel3D/Carmel3D_Cata_frequentiel_V0.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -------------------------------------------------- -# Copyright (C) 2007-2013 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Carmel3D/Carmel3D_Cata_frequentiel_V1.py b/OldCodes/Carmel3D/Carmel3D_Cata_frequentiel_V1.py similarity index 99% rename from Carmel3D/Carmel3D_Cata_frequentiel_V1.py rename to OldCodes/Carmel3D/Carmel3D_Cata_frequentiel_V1.py index b70bb964..8edc6a82 100644 --- a/Carmel3D/Carmel3D_Cata_frequentiel_V1.py +++ b/OldCodes/Carmel3D/Carmel3D_Cata_frequentiel_V1.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -------------------------------------------------- -# Copyright (C) 2007-2013 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Carmel3D/E24 b/OldCodes/Carmel3D/E24 similarity index 100% rename from Carmel3D/E24 rename to OldCodes/Carmel3D/E24 diff --git a/Carmel3D/FEV1000 b/OldCodes/Carmel3D/FEV1000 similarity index 100% rename from Carmel3D/FEV1000 rename to OldCodes/Carmel3D/FEV1000 diff --git a/Carmel3D/FEV470 b/OldCodes/Carmel3D/FEV470 similarity index 100% rename from Carmel3D/FEV470 rename to OldCodes/Carmel3D/FEV470 diff --git a/Carmel3D/FEV600 b/OldCodes/Carmel3D/FEV600 similarity index 100% rename from Carmel3D/FEV600 rename to OldCodes/Carmel3D/FEV600 diff --git a/Carmel3D/FEV800 b/OldCodes/Carmel3D/FEV800 similarity index 100% rename from Carmel3D/FEV800 rename to OldCodes/Carmel3D/FEV800 diff --git a/Carmel3D/HA600 b/OldCodes/Carmel3D/HA600 similarity index 100% rename from Carmel3D/HA600 rename to OldCodes/Carmel3D/HA600 diff --git a/Carmel3D/M600_65 b/OldCodes/Carmel3D/M600_65 similarity index 100% rename from Carmel3D/M600_65 rename to OldCodes/Carmel3D/M600_65 diff --git a/Carmel3D/M6X2ISO1 b/OldCodes/Carmel3D/M6X2ISO1 similarity index 100% rename from Carmel3D/M6X2ISO1 rename to OldCodes/Carmel3D/M6X2ISO1 diff --git a/Carmel3D/M6X_epsilon.mater b/OldCodes/Carmel3D/M6X_epsilon.mater similarity index 100% rename from Carmel3D/M6X_epsilon.mater rename to OldCodes/Carmel3D/M6X_epsilon.mater diff --git a/Carmel3D/M6X_homog_mu.mater b/OldCodes/Carmel3D/M6X_homog_mu.mater similarity index 100% rename from Carmel3D/M6X_homog_mu.mater rename to OldCodes/Carmel3D/M6X_homog_mu.mater diff --git a/Carmel3D/M6X_homog_sigma.mater b/OldCodes/Carmel3D/M6X_homog_sigma.mater similarity index 100% rename from Carmel3D/M6X_homog_sigma.mater rename to OldCodes/Carmel3D/M6X_homog_sigma.mater diff --git a/Carmel3D/M6X_lineaire_mu.mater b/OldCodes/Carmel3D/M6X_lineaire_mu.mater similarity index 100% rename from Carmel3D/M6X_lineaire_mu.mater rename to OldCodes/Carmel3D/M6X_lineaire_mu.mater diff --git a/Carmel3D/M6X_lineaire_sigma.mater b/OldCodes/Carmel3D/M6X_lineaire_sigma.mater similarity index 100% rename from Carmel3D/M6X_lineaire_sigma.mater rename to OldCodes/Carmel3D/M6X_lineaire_sigma.mater diff --git a/Carmel3D/M6X_mu.mater b/OldCodes/Carmel3D/M6X_mu.mater similarity index 100% rename from Carmel3D/M6X_mu.mater rename to OldCodes/Carmel3D/M6X_mu.mater diff --git a/Carmel3D/__init__.py b/OldCodes/Carmel3D/__init__.py similarity index 100% rename from Carmel3D/__init__.py rename to OldCodes/Carmel3D/__init__.py diff --git a/Carmel3D/ajoutGroupe.py b/OldCodes/Carmel3D/ajoutGroupe.py similarity index 100% rename from Carmel3D/ajoutGroupe.py rename to OldCodes/Carmel3D/ajoutGroupe.py diff --git a/Carmel3D/configuration_CARMEL3D.py b/OldCodes/Carmel3D/configuration_CARMEL3D.py similarity index 94% rename from Carmel3D/configuration_CARMEL3D.py rename to OldCodes/Carmel3D/configuration_CARMEL3D.py index e5597115..9077185f 100644 --- a/Carmel3D/configuration_CARMEL3D.py +++ b/OldCodes/Carmel3D/configuration_CARMEL3D.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2013 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Carmel3D/materiaux/ACIER_TEAM13 b/OldCodes/Carmel3D/materiaux/ACIER_TEAM13 similarity index 100% rename from Carmel3D/materiaux/ACIER_TEAM13 rename to OldCodes/Carmel3D/materiaux/ACIER_TEAM13 diff --git a/Carmel3D/materiaux/CMakeLists.txt b/OldCodes/Carmel3D/materiaux/CMakeLists.txt similarity index 100% rename from Carmel3D/materiaux/CMakeLists.txt rename to OldCodes/Carmel3D/materiaux/CMakeLists.txt diff --git a/Carmel3D/materiaux/E24 b/OldCodes/Carmel3D/materiaux/E24 similarity index 100% rename from Carmel3D/materiaux/E24 rename to OldCodes/Carmel3D/materiaux/E24 diff --git a/Carmel3D/materiaux/FEV1000 b/OldCodes/Carmel3D/materiaux/FEV1000 similarity index 100% rename from Carmel3D/materiaux/FEV1000 rename to OldCodes/Carmel3D/materiaux/FEV1000 diff --git a/Carmel3D/materiaux/FEV470 b/OldCodes/Carmel3D/materiaux/FEV470 similarity index 100% rename from Carmel3D/materiaux/FEV470 rename to OldCodes/Carmel3D/materiaux/FEV470 diff --git a/Carmel3D/materiaux/FEV600 b/OldCodes/Carmel3D/materiaux/FEV600 similarity index 100% rename from Carmel3D/materiaux/FEV600 rename to OldCodes/Carmel3D/materiaux/FEV600 diff --git a/Carmel3D/materiaux/FEV800 b/OldCodes/Carmel3D/materiaux/FEV800 similarity index 100% rename from Carmel3D/materiaux/FEV800 rename to OldCodes/Carmel3D/materiaux/FEV800 diff --git a/Carmel3D/materiaux/HA600 b/OldCodes/Carmel3D/materiaux/HA600 similarity index 100% rename from Carmel3D/materiaux/HA600 rename to OldCodes/Carmel3D/materiaux/HA600 diff --git a/Carmel3D/materiaux/M600_65 b/OldCodes/Carmel3D/materiaux/M600_65 similarity index 100% rename from Carmel3D/materiaux/M600_65 rename to OldCodes/Carmel3D/materiaux/M600_65 diff --git a/Carmel3D/materiaux/M6X2ISO1 b/OldCodes/Carmel3D/materiaux/M6X2ISO1 similarity index 100% rename from Carmel3D/materiaux/M6X2ISO1 rename to OldCodes/Carmel3D/materiaux/M6X2ISO1 diff --git a/Carmel3D/materiaux/M6X_epsilon.mater b/OldCodes/Carmel3D/materiaux/M6X_epsilon.mater similarity index 100% rename from Carmel3D/materiaux/M6X_epsilon.mater rename to OldCodes/Carmel3D/materiaux/M6X_epsilon.mater diff --git a/Carmel3D/materiaux/M6X_homogene_mu.mater b/OldCodes/Carmel3D/materiaux/M6X_homogene_mu.mater similarity index 100% rename from Carmel3D/materiaux/M6X_homogene_mu.mater rename to OldCodes/Carmel3D/materiaux/M6X_homogene_mu.mater diff --git a/Carmel3D/materiaux/M6X_homogene_sigma.mater b/OldCodes/Carmel3D/materiaux/M6X_homogene_sigma.mater similarity index 100% rename from Carmel3D/materiaux/M6X_homogene_sigma.mater rename to OldCodes/Carmel3D/materiaux/M6X_homogene_sigma.mater diff --git a/Carmel3D/materiaux/M6X_lineaire_mu.mater b/OldCodes/Carmel3D/materiaux/M6X_lineaire_mu.mater similarity index 100% rename from Carmel3D/materiaux/M6X_lineaire_mu.mater rename to OldCodes/Carmel3D/materiaux/M6X_lineaire_mu.mater diff --git a/Carmel3D/materiaux/M6X_lineaire_sigma.mater b/OldCodes/Carmel3D/materiaux/M6X_lineaire_sigma.mater similarity index 100% rename from Carmel3D/materiaux/M6X_lineaire_sigma.mater rename to OldCodes/Carmel3D/materiaux/M6X_lineaire_sigma.mater diff --git a/Carmel3D/materiaux/M6X_mu.mater b/OldCodes/Carmel3D/materiaux/M6X_mu.mater similarity index 100% rename from Carmel3D/materiaux/M6X_mu.mater rename to OldCodes/Carmel3D/materiaux/M6X_mu.mater diff --git a/Carmel3D/materiaux/M6X_sigma.mater b/OldCodes/Carmel3D/materiaux/M6X_sigma.mater similarity index 100% rename from Carmel3D/materiaux/M6X_sigma.mater rename to OldCodes/Carmel3D/materiaux/M6X_sigma.mater diff --git a/Carmel3D/materiaux/materiaux.comm b/OldCodes/Carmel3D/materiaux/materiaux.comm similarity index 100% rename from Carmel3D/materiaux/materiaux.comm rename to OldCodes/Carmel3D/materiaux/materiaux.comm diff --git a/Carmel3D/opsCarmel.py b/OldCodes/Carmel3D/opsCarmel.py similarity index 97% rename from Carmel3D/opsCarmel.py rename to OldCodes/Carmel3D/opsCarmel.py index 8270d474..82bbf1fd 100644 --- a/Carmel3D/opsCarmel.py +++ b/OldCodes/Carmel3D/opsCarmel.py @@ -1,5 +1,5 @@ # -*- coding: iso-8859-1 -*- -# Copyright (C) 2007-2013 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Carmel3D/prefs.py b/OldCodes/Carmel3D/prefs.py similarity index 96% rename from Carmel3D/prefs.py rename to OldCodes/Carmel3D/prefs.py index a69b761b..720230dd 100644 --- a/Carmel3D/prefs.py +++ b/OldCodes/Carmel3D/prefs.py @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2013 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Carmel3D/prefs_CARMEL3D.py b/OldCodes/Carmel3D/prefs_CARMEL3D.py similarity index 97% rename from Carmel3D/prefs_CARMEL3D.py rename to OldCodes/Carmel3D/prefs_CARMEL3D.py index 41e26ee1..e61693e1 100644 --- a/Carmel3D/prefs_CARMEL3D.py +++ b/OldCodes/Carmel3D/prefs_CARMEL3D.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2013 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Carmel3D/properties.py b/OldCodes/Carmel3D/properties.py similarity index 100% rename from Carmel3D/properties.py rename to OldCodes/Carmel3D/properties.py diff --git a/Carmel3D/qtEficas_Carmel3D.py b/OldCodes/Carmel3D/qtEficas_Carmel3D.py similarity index 96% rename from Carmel3D/qtEficas_Carmel3D.py rename to OldCodes/Carmel3D/qtEficas_Carmel3D.py index d38a9984..d20a93f0 100755 --- a/Carmel3D/qtEficas_Carmel3D.py +++ b/OldCodes/Carmel3D/qtEficas_Carmel3D.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (C) 2007-2013 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Carmel3D/style.py b/OldCodes/Carmel3D/style.py similarity index 100% rename from Carmel3D/style.py rename to OldCodes/Carmel3D/style.py diff --git a/OldCodes/CarmelCND/prefs.py b/OldCodes/CarmelCND/prefs.py index cfd8503b..2dbeff03 100644 --- a/OldCodes/CarmelCND/prefs.py +++ b/OldCodes/CarmelCND/prefs.py @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2012 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/OldCodes/CarmelCND/qtEficas_CarmelCND.py b/OldCodes/CarmelCND/qtEficas_CarmelCND.py index f49b9bcb..336afdff 100755 --- a/OldCodes/CarmelCND/qtEficas_CarmelCND.py +++ b/OldCodes/CarmelCND/qtEficas_CarmelCND.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (C) 2007-2012 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/OldCodes/CarmelCS/prefs.py b/OldCodes/CarmelCS/prefs.py index 2692b028..7b609b2a 100644 --- a/OldCodes/CarmelCS/prefs.py +++ b/OldCodes/CarmelCS/prefs.py @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2012 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/OldCodes/CarmelCS/qtEficas_CarmelCS.py b/OldCodes/CarmelCS/qtEficas_CarmelCS.py index b1254f2c..7f9a6e2c 100755 --- a/OldCodes/CarmelCS/qtEficas_CarmelCS.py +++ b/OldCodes/CarmelCS/qtEficas_CarmelCS.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (C) 2007-2012 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/OldCodes/MED/CataAZ.py b/OldCodes/MED/CataAZ.py new file mode 100755 index 00000000..b6e6494e --- /dev/null +++ b/OldCodes/MED/CataAZ.py @@ -0,0 +1,210 @@ +# coding: utf-8 +import types +from Accas import * + +class grno(GEOM): + """ + Classe servant à définir le nom d'un groupe de noeuds dans le fichier de commande + En clair : un chaine de longueur 24. + """ + def __convert__(cls,valeur): + """ + Fonction de verification de la longueur de la chaine + """ + if isinstance(valeur, (str,unicode)) and len(valeur.strip()) <= 24: + return valeur.strip() + raise ValueError(_(u'On attend une chaine de caractères (de longueur <= 24).')) + __convert__ = classmethod(__convert__) + +class grma(GEOM): + """ + Classe servant à définir le nom d'un groupe de mailles dans le fichier de commande + En clair : un chaine de longueur 24. + """ + def __convert__(cls,valeur): + """ + Fonction de verification de la longueur de la chaine + """ + if isinstance(valeur, (str,unicode)) and len(valeur.strip()) <= 24: + return valeur.strip() + raise ValueError(_(u'On attend une chaine de caractères (de longueur <= 24).')) + __convert__ = classmethod(__convert__) + + +class Tuple: + def __init__(self,ntuple): + self.ntuple=ntuple + + def __convert__(self,valeur): + if type(valeur) == types.StringType: return None + if len(valeur) != self.ntuple: return None + return valeur + + def info(self): + return "Tuple de %s elements" % self.ntuple + + __repr__=info + __str__=info + +class ObjetUtilisateur(ASSD): pass + + +JdC = JDC_CATA(code='PATTERNS', + execmodul=None, + ) + + +EXAMPLE = PROC (nom = 'EXAMPLE', + op=None, + + TITRE = SIMP(statut ='o', typ = 'TXM', defaut = 'Mon Etude',), + TITRE2 = SIMP(statut ='f', typ = 'TXM', ), +) +CREEOBJET = OPER (nom="CREEOBJET", + op=None, + sd_prod=ObjetUtilisateur, + UIinfo={"groupes":("Group1",)}, + + TITLE = SIMP(statut ='o', typ = 'TXM', defaut = '',), + RB1 = SIMP(statut ='o', typ = 'I', into = [1,2,3],), + RB2 = SIMP(statut ='o', typ = 'I', into = [1,2,3,4,5,6,],), + CB = SIMP(statut ='o', typ = 'I', into = [1,2,3,4,5,6,7,8,9],), + MBool = SIMP(statut ='o', typ = bool,), + MFile = SIMP(statut ='o', typ = ('Fichier','All Files (*)')), + MDir = SIMP(statut ='o', typ = 'Repertoire'), + Reel1 = SIMP(statut ='o', typ = 'R'), + Compl = SIMP(statut ='o', typ = 'C'), + Tuple2 = SIMP(statut ='o', typ = Tuple(2), validators=VerifTypeTuple(('R','R'))), + Tuple3 = SIMP(statut ='o', typ = Tuple(3), validators=VerifTypeTuple(('R','R','R'))), + InSalome = SIMP(statut ='o', typ = SalomeEntry), + + LTITLE = SIMP(statut ='o', typ = 'TXM', max='**', defaut = '',), + LRB2 = SIMP(statut ='o', typ = 'I', max = '**', into = [1,2,3,4,5,6,],), + LCB = SIMP(statut ='o', typ = 'I', max = '**', homo="SansOrdreNiDoublon", into = [1,2,3,4,5,6,7,8,9],), + LReel1 = SIMP(statut ='o', typ = 'R', max = "**"), + LCompl = SIMP(statut ='o', typ = 'C', max = "**"), + LTuple2 = SIMP(statut ='o', typ = Tuple(2), validators=VerifTypeTuple(('R','R')), max = "**"), + LTuple3 = SIMP(statut ='o', typ = Tuple(3), validators=VerifTypeTuple(('R','R','R')), max = "**"), + LInSalome = SIMP(statut ='o', typ = SalomeEntry, max="**"), + + LREEL = SIMP(statut ='f', typ = 'R', max='**', defaut = '',), +) + +UTILISEOBJET = PROC (nom="UTILISEOBJET", + op=None, + UIinfo={"groupes":("Group1",)}, + Obj = SIMP (statut ='o', typ = ObjetUtilisateur,) +) + +ESSAI_FACT=OPER(nom="ESSAI_FACT", + sd_prod=ObjetUtilisateur, + op=None, + fr="Affectation de caractéristiques à des éléments de structure", + regles = (AU_MOINS_UN('Poutre','Barre'), + EXCLUS('Discret','Discret_2D'),), + Info = SIMP(statut='f',typ='I', defaut= 1 ,into=(1,2) ), + Verif = SIMP(statut='f',typ='TXM',validators=NoRepeat(),max='**',into=("Maille","Noeud") ), +# +# ============================================================================== + Poutre = FACT(statut= 'f',max= '**', + Section = SIMP(statut= 'o',typ= 'TXM' ,into= ("GENERALE","RECTANGLE","CERCLE") ), + + b_generale = BLOC(condition = " Section == 'GENERALE'", + regles = (UN_PARMI('Maille','GroupeMailles'),), + Maille = SIMP(statut= 'f',typ= 'TXM' ,validators= NoRepeat(),max= '**'), + GroupeMailles = SIMP(statut= 'f',typ= grma,validators= NoRepeat(),max= '**'), + + Vari = SIMP(statut= 'f',typ= 'TXM',into= ("CONSTANT","HOMOTHETIQUE"),defaut= "CONSTANT"), + + b_constant = BLOC(condition = "Vari == 'CONSTANT'", + regles = (PRESENT_ABSENT('Table','Cara'), + PRESENT_PRESENT('Table','Nom'), + PRESENT_PRESENT('Cara','Valeur'),), + Table = SIMP(statut= 'f',typ='TXM'), + Nom = SIMP(statut= 'f',typ= 'TXM'), + Cara = SIMP(statut= 'o',typ= 'TXM',min= 4 ,max= 5, + fr= "A,IY,IZ,JX sont des paramètres obligatoires", + validators= [NoRepeat(), Compulsory(['A','IY','IZ','JX'])], + into= ("A","IY","IZ","AY","AZ","EY","EZ","JX","RY","RZ","RT","JG","IYR2","IZR2","AI") ), + Valeur = SIMP(statut= 'f',typ= 'R',min= 4 ,max= 15), + ), + ), + b_rectangle = BLOC(condition = "Section == 'RECTANGLE'", + regles = (UN_PARMI('Maille','GroupeMailles'),), + Maille = SIMP(statut= 'f',typ= 'TXM' ,validators= NoRepeat(),max= '**'), + GroupeMailles = SIMP(statut= 'f',typ= grma,validators= NoRepeat(),max= '**'), + Vari = SIMP(statut= 'f',typ= 'TXM',into= ("CONSTANT","HOMOTHETIQUE","AFFINE"),defaut= "CONSTANT"), + b_constant = BLOC(condition = "Vari == 'CONSTANT'", + Cara = SIMP(statut= 'o',typ= 'TXM',min= 1 ,max= 4, + validators = [NoRepeat(), + OrVal( [AndVal( [Compulsory(['H']),Absent(['HY','HZ','EPY','EPZ'])] ), + AndVal( [Compulsory(['HY','HZ']),Together(['EPY','EPZ']),Absent(['H','EP'])] )] )], + into= ("H","EP", "HY","HZ","EPY","EPZ"),), + Valeur = SIMP(statut= 'o',typ= 'R',min= 1 ,max= 4), + ), + + Metrique = SIMP(statut= 'f',typ= 'TXM',defaut= "NON",into= ("OUI","NON") ), + Fcx = SIMP(statut= 'f',typ= 'R'), + Tuyau = SIMP(statut= 'f',typ= 'I',val_max= 10,defaut= 3), + ), + ), +# +# ============================================================================== + Barre = FACT(statut='f',max='**', + regles = (UN_PARMI('Maille','GroupeMailles'),), + Maille = SIMP(statut='f',typ='TXM' ,validators=NoRepeat(),max='**'), + GroupeMailles = SIMP(statut='f',typ=grma,validators=NoRepeat(),max='**'), + Section = SIMP(statut='o',typ='TXM',into=("GENERALE","RECTANGLE","CERCLE") ), + b_generale = BLOC(condition = "Section=='GENERALE'", + regles = (PRESENT_ABSENT('Table','Cara'), + PRESENT_PRESENT('Table','Nom'), + PRESENT_PRESENT('Cara','Valeur')), + Table = SIMP(statut='f',typ='TXM'), + Nom = SIMP(statut='f',typ='TXM',validators=LongStr(1,24) ), + Cara = SIMP(statut='f',typ='TXM',into=("A",) ), + Valeur = SIMP(statut='f',typ='R',min=1,max=1 ), + ), + b_rectangle = BLOC(condition = "Section=='RECTANGLE'", + Cara = SIMP(statut='o',typ='TXM', min=1, max=4, + validators = [NoRepeat(), + OrVal( [AndVal( [Compulsory(['H']),Absent(['HY','HZ','EPY','EPZ'])] ), + AndVal( [Compulsory(['HY','HZ']),Together(['EPY','EPZ']),Absent(['H','EP'])] )] )], + into=("H","EP","HZ","HY","EPY","EPZ"), ), + Valeur = SIMP(statut='o',typ='R',min=1,max=4 ), ), + b_cercle = BLOC(condition = "Section=='CERCLE'", + Cara = SIMP(statut='o',typ='TXM',validators=[NoRepeat(),Compulsory(['R'])],min=1,max=2,into=("R","EP") ), + Valeur = SIMP(statut='o',typ='R',min=1,max=2 ), ), + ), +# +# ============================================================================== + Discret = FACT(statut='f',max='**', + REPERE = SIMP(statut='f',typ='TXM',into=("LOCAL","GLOBAL") ), + AMOR_HYST = SIMP(statut='f',typ='R' ), + SYME = SIMP(statut='f',typ='TXM',defaut="OUI",into=("OUI","NON"),), + b_SYME_OUI = BLOC(condition="SYME=='OUI'", + fr="SYMETRIQUE: Affectation de matrices de rigidité, de masse ou d'amortissement à des mailles ou noeuds", + Cara = SIMP(statut='o',typ='TXM',validators=NoRepeat(),max=1,defaut="None", + into = ("K_T_D_N", "K_T_D_L", "K_TR_D_N", "K_TR_D_L", "K_T_N", "K_T_L", "K_TR_N", "K_TR_L", + "M_T_D_N", "M_T_D_L", "M_TR_D_N", "M_TR_D_L", "M_T_N", "M_T_L", "M_TR_N", "M_TR_L", + "A_T_D_N", "A_T_D_L", "A_TR_D_N", "A_TR_D_L", "A_T_N", "A_T_L", "A_TR_N", "A_TR_L",),), + # Affection des caractéristiques de RIGIDITE/AMORTISSEMENT/MASSE + b_AK_T_D_N = BLOC(condition = "((Cara=='K_T_D_N')or(Cara=='A_T_D_N'))", + fr = "Noeud: 3 valeurs (triangulaire supérieure par colonne)", + regles = (UN_PARMI('Maille','GroupeMailles','Noeud','GROUP_NO'),), + Noeud = SIMP(statut='f',typ='TXM' ,validators=NoRepeat(),max='**'), + GROUP_NO = SIMP(statut='f',typ=grno,validators=NoRepeat(),max='**'), + Maille = SIMP(statut='f',typ='TXM' ,validators=NoRepeat(),max='**'), + GroupeMailles = SIMP(statut='f',typ=grma,validators=NoRepeat(),homo='SansOrdreNiDoublon',max='**'), + Valeur = SIMP(statut='o',typ='R',min=3 ,max=3 ),), + ), + ), +# +# ============================================================================== + Discret_2D = FACT(statut='f',max='**', + REPERE = SIMP(statut='f',typ='TXM',into=("LOCAL","GLOBAL") ), + AMOR_HYST = SIMP(statut='f',typ='R' ), + SYME = SIMP(statut='f',typ='TXM',defaut="OUI",into=("OUI","NON"),), + ), +) + + diff --git a/OldCodes/MED/Elementary_Lists_52996_Cata.py b/OldCodes/MED/Elementary_Lists_52996_Cata.py new file mode 100644 index 00000000..f3cc11c8 --- /dev/null +++ b/OldCodes/MED/Elementary_Lists_52996_Cata.py @@ -0,0 +1,86 @@ +# coding: utf-8 + +from Accas import * + +#class myMesh(ASSD): pass +class myModel(ASSD): pass + +JdC = JDC_CATA(code='PATTERNS', + execmodul=None, + regles=(#AU_PLUS_UN('DEBUT', 'POURSUITE'), + AU_PLUS_UN('ALL_LISTS'), + #AU_PLUS_UN('FIN'), + A_CLASSER(('DEBUT', 'POURSUITE'), 'FIN') + ) +) + +class grma(): + def __convert__(cls,valeur): + if isinstance(valeur, (str,unicode)) and len(valeur.strip()) <= 24 : #and ("item" in (valeur.strip())) + return valeur.strip() + raise ValueError("Name length does not contain \"test\" and is longer than allowed, 24") + __convert__ = classmethod(__convert__) + +def mySeveral(suffix,num): + out=list() + for i in range(1,num+1): + out.append(suffix+str(i).zfill(2)) + return out + +switch_facultatif=True #change 'o' to 'f' of some widgets in the loop +#empty_defauts=True + +def myBloc(num): + myNum=str(num).zfill(2) + list_item_body="Item_"+myNum+"_" + defauts0=["","",True,"'phenomena_"+myNum+"'",mySeveral(list_item_body,2)] #presence of default values + defauts_mask=[False,False,True,True,True] #switch off defaults of some types + defauts=list() + for id0 in range(len(defauts0)): + if defauts_mask[id0]: + item=", defaut="+str(defauts0[id0]) + else: + item="" + defauts.append(item) + #print defauts + + opt=['o','o','o','o','o'] #initial default obligation of items in FACT groups + #make different widgets optional, one by one: + myLen=len(opt) + if switch_facultatif: + make_f=(num)%myLen + opt[make_f]='f' + #print opt + #if empty_defauts: + # clean_defaut=num%myLen + + myString="BLOC(condition=\"MESH==\'mesh_"+myNum+"'\""+defauts[0]+", AFFE=FACT(statut='"+opt[1]+"'"+defauts[1]+", ALL=SIMP(statut='"+opt[2]+"', typ=bool,ang='ALL "+myNum+" help EN'"+defauts[2]+"),PHENOMENA=SIMP(statut='"+opt[3]+"',typ='TXM',into=mySeveral('phenomena_',"+str(num)+")"+defauts[3]+"), MODELISATION=SIMP(statut='"+opt[4]+"',typ='TXM', min=2,max='**',into=mySeveral('"+list_item_body+"',"+str(num*4)+")"+defauts[4]+", ang='Input "+myNum+" list EN', fr='Input "+myNum+" list FR'),),)" + print myString + return eval(myString) + +ALL_LISTS=OPER(nom="ALL_LISTS",op=18,sd_prod=myModel, + UIinfo={"groupes":("Group1",)}, + ang="Model mesh definition EN", + reentrant='n', + #regles=(AU_MOINS_UN('LIST_O_CHECKTEXT','LIST_F_CHECKTEXT','LIST_O_ANY','LIST_F_ANY')), + + #LIST_O_NOREPEAT_CHECKTEXT=SIMP(statut='o',typ=grma,validators=NoRepeat(),min=3, max='**'), + #LIST_F_NOREPEAT_CHECKTEXT=SIMP(statut='f',typ=grma,validators=NoRepeat(),min=3, max='**'), + #LIST_F_REPEAT_CHECKTEXT=SIMP(statut='f',typ=grma,min=3, max='**'), + #LIST_O_REPEAT_CHECKTEXT=SIMP(statut='o',typ=grma,min=3, max='**'), + + #LIST_F_NOREPEAT_ANYTEXT=SIMP(statut='f',typ='TXM',validators=NoRepeat(),min=3, max='**'), + #LIST_O_NOREPEAT_ANYTEXT=SIMP(statut='o',typ='TXM',min=3,validators=NoRepeat(), max='**'), + #LIST_O_REPEAT_ANYTEXT=SIMP(statut='o',typ='TXM',min=3, max='**'), + #LIST_F_REPEAT_ANYTEXT=SIMP(statut='f',typ='TXM',min=3, max='**'), + + #LIST_O_NOREPEAT_CHECKTEXT_ADD=SIMP(statut='o',typ=grma,validators=NoRepeat(), into=("item01","text01","item02","text02","item03","text03",), min=3, max='**'), + #LIST_F_REPEAT_ANYTEXT_ADD=SIMP(statut='f',typ=grma,validators=NoRepeat(), into=("item01","text01","item02","text02","item03","text03",), min=3, max='**'), + + LIST_O_NOREPEAT_CHECKTEXT_ADD_NODEFAUT=SIMP(statut='o',typ=grma,validators=NoRepeat(), into=("item01","text01","item02","text02","item03","text03","item04","text04",), min=3, max='**'), + #LIST_O_NOREPEAT_CHECKTEXT_ADD_DEFAUT=SIMP(statut='o',typ=grma,validators=NoRepeat(), into=("item01","text01","item02","text02","item03","text03",), defaut=('item01','item02','item03'), min=3, max='**'), +) + +Classement_Commandes_Ds_Arbre=('DEBUT','MESH_TYPES','ALL_LISTS','FIN') + +Ordre_Des_Commandes = ('DEBUT','MESH_TYPES','ALL_LISTS','FIN') diff --git a/OldCodes/MED/Elementary_Lists_53000_Cata.py b/OldCodes/MED/Elementary_Lists_53000_Cata.py new file mode 100644 index 00000000..0dbba473 --- /dev/null +++ b/OldCodes/MED/Elementary_Lists_53000_Cata.py @@ -0,0 +1,52 @@ +# coding: utf-8 +from Accas import * + +#class myMesh(ASSD): pass +class myModel(ASSD): pass + +JdC = JDC_CATA(code='PATTERNS', + execmodul=None, + regles=(#AU_PLUS_UN('DEBUT', 'POURSUITE'), + AU_PLUS_UN('ALL_LISTS'), + #AU_PLUS_UN('FIN'), + A_CLASSER(('DEBUT', 'POURSUITE'), 'FIN') + ) +) + + +ALL_LISTS=OPER(nom="ALL_LISTS",op=18,sd_prod=myModel, + UIinfo={"groupes":("Group1",)}, + ang="Model mesh definition EN", + reentrant='n', + LIST_O_NOREPEAT_CHECKTEXT_ADD_DEFAUT=SIMP(statut='o',typ="TXM",validators=NoRepeat(), + into=("item01","text01","item02","text02","item03","text03","item04","text04","item05","text05",), + defaut=('item01','item02','item03'), + homo="SansOrdreNiDoublon", + min=3, max='**'), + + #regles=(AU_MOINS_UN('LIST_O_CHECKTEXT','LIST_F_CHECKTEXT','LIST_O_ANY','LIST_F_ANY')), + + #LIST_O_NOREPEAT_CHECKTEXT=SIMP(statut='o',typ=grma,validators=NoRepeat(),min=3, max='**'), + #LIST_F_NOREPEAT_CHECKTEXT=SIMP(statut='f',typ=grma,validators=NoRepeat(),min=3, max='**'), + #LIST_F_REPEAT_CHECKTEXT=SIMP(statut='f',typ=grma,min=3, max='**'), + #LIST_O_REPEAT_CHECKTEXT=SIMP(statut='o',typ=grma,min=3, max='**'), + + #LIST_F_NOREPEAT_ANYTEXT=SIMP(statut='f',typ='TXM',validators=NoRepeat(),min=3, max='**'), + #LIST_O_NOREPEAT_ANYTEXT=SIMP(statut='o',typ='TXM',min=3,validators=NoRepeat(), max='**'), + #LIST_O_REPEAT_ANYTEXT=SIMP(statut='o',typ='TXM',min=3, max='**'), + #LIST_F_REPEAT_ANYTEXT=SIMP(statut='f',typ='TXM',min=3, max='**'), + + #LIST_O_NOREPEAT_CHECKTEXT_ADD=SIMP(statut='o',typ=grma,validators=NoRepeat(), into=("item01","text01","item02","text02","item03","text03",), min=3, max='**'), + #LIST_F_REPEAT_ANYTEXT_ADD=SIMP(statut='f',typ=grma,validators=NoRepeat(), into=("item01","text01","item02","text02","item03","text03",), min=3, max='**'), + + #LIST_O_NOREPEAT_CHECKTEXT_ADD_NODEFAUT=SIMP(statut='o',typ=grma,validators=NoRepeat(), into=("item01","text01","item02","text02","item03","text03","item04","text04",), min=3, max='**'), + + + #LIST_O_SANSORDRENODOUBLON_CHECKTEXT_DEFAUT=SIMP(statut='o',typ=grma,homo="SansOrdreNiDoublon", into=("item01","text01","item02","text02","item03","text03",), defaut=('item01','item02','item03'), min=3, max='**'), +) + + + +Classement_Commandes_Ds_Arbre=('DEBUT','MESH_TYPES','ALL_LISTS','FIN') + +Ordre_Des_Commandes = ('DEBUT','MESH_TYPES','ALL_LISTS','FIN') diff --git a/OldCodes/MED/Elementary_Lists_53013_Cata.py b/OldCodes/MED/Elementary_Lists_53013_Cata.py new file mode 100644 index 00000000..cf371ff2 --- /dev/null +++ b/OldCodes/MED/Elementary_Lists_53013_Cata.py @@ -0,0 +1,59 @@ +# coding: utf-8 +from Accas import * + +class myModel(ASSD): pass + +JdC = JDC_CATA(code='PATTERNS', + execmodul=None, + regles=(#AU_PLUS_UN('DEBUT', 'POURSUITE'), + AU_PLUS_UN('ALL_LISTS'), + #AU_PLUS_UN('FIN'), + A_CLASSER(('DEBUT', 'POURSUITE'), 'FIN') + ) +) + +class grma(): + def __convert__(cls,valeur): + if isinstance(valeur, (str,unicode)) and len(valeur.strip()) <= 12 and ("item" in (valeur.strip()).lower()): # + return valeur.strip() + raise ValueError("Name length does not contain \"test\" and is longer than allowed, 12") + __convert__ = classmethod(__convert__) + +def mySeveral(suffix,num): + out=list() + for i in range(1,num+1): + out.append(suffix+str(i).zfill(2)) + return out + +ALL_LISTS=OPER(nom="ALL_LISTS",op=18,sd_prod=myModel, + UIinfo={"groupes":("Group1",)}, + fr="All lists definition FR", + ang="All lists definition EN", + reentrant='n', + #regles=(AU_MOINS_UN('LIST_O_CHECKTEXT','LIST_F_CHECKTEXT','LIST_O_ANY','LIST_F_ANY')), + + L1_LIST_O_NOREPEAT_CHECKTEXT=SIMP(statut='o',typ=grma,validators=NoRepeat(),min=3, max='**', ang='Obligatory, No Repetitions, checked text, EN'), + L2_LIST_F_NOREPEAT_CHECKTEXT=SIMP(statut='f',typ=grma,validators=NoRepeat(),min=3, max='**', ang='Optional, No Repetitions, checked text, EN'), + L3_LIST_F_REPEAT_CHECKTEXT=SIMP(statut='f',typ=grma,min=3, max='**',ang='Optional, Allowed Repetitions, checked text, EN'), + L4_LIST_O_REPEAT_CHECKTEXT=SIMP(statut='o',typ=grma,min=3, max='**',ang='Obligatory, Allowed Repetitions, checked text, EN'), + + L5_LIST_F_NOREPEAT_ANYTEXT=SIMP(statut='f',typ='TXM',validators=NoRepeat(),min=3, max='**',ang='Optional, No Repetitions, any text, EN'), + L6_LIST_O_NOREPEAT_ANYTEXT=SIMP(statut='o',typ='TXM',min=3,validators=NoRepeat(), max='**',ang='Obligatory, No Repetitions, any text, EN'), + L7_LIST_O_REPEAT_ANYTEXT=SIMP(statut='o',typ='TXM',min=3, max='**',ang='Obligatory, Allowed Repetitions, any text, EN'), + L8_LIST_F_REPEAT_ANYTEXT=SIMP(statut='f',typ='TXM',min=3, max='**',ang='Optional, Allowed Repetitions, any text, EN'), + + L9_LIST_O_NOREPEAT_CHECKTEXT_ADD=SIMP(statut='o',typ=grma,validators=NoRepeat(), into=("item01","text01","item02","text02","item03","text03",), min=3, max='**',ang='With spare list, Obligatory, No Repetitions, checked text, EN',), + L10_LIST_F_REPEAT_ANYTEXT_ADD=SIMP(statut='f',typ='TXM', into=("item01","text01","item02","text02","item03","text03",), min=3, max='**',ang='With spare list, Optional, Allowed Repetitions, any text, EN'), + L11_LIST_O_REPEAT_CHECKTEXT_ADD_NODEFAUT=SIMP(statut='o',typ=grma, into=("item01","text01","item02","text02","item03","text03","item04","text04"),ang='With spare list, obligatory, No Repetitions, checked text, no default values, EN', min=3, max='**'), + L12_LIST_O_NOREPEAT_CHECKTEXT_ADD_DEFAUT=SIMP(statut='o',typ=grma,validators=NoRepeat(), into=("item01","text01","item02","text02","item03","text03","item04","text04","item05","text05",), defaut=('item01','item02','item03'), min=3, max='**',ang='With spare list, Obligatory, No Repetitions, checked text, with default values EN'), + + L13_LIST_F_SANSORDRENODOUBLON_ANYTEXT_NODEFAUT=SIMP(statut='f',typ='TXM',homo="SansOrdreNiDoublon", into=("item01","text01","item02","text02","item03","text03",), min=3, max='**',ang='With check boxes, Optional, any text, no defaults, EN'), + L14_LIST_O_SANSORDRENODOUBLON_CHECKTEXT_NODEFAUT=SIMP(statut='o',typ=grma,homo="SansOrdreNiDoublon", into=("item01","text01","item02","text02","item03","text03",), min=3, max='**',ang='With check boxes, Obligatory, checked text, EN'), + L15_LIST_O_SANSORDRENODOUBLON_CHECKTEXT_DEFAUT=SIMP(statut='o',typ=grma,homo="SansOrdreNiDoublon", into=("item01","text01","item02","text02","item03","text03","item02","text02","item01","text01",), defaut=('item01','item02','item03'), min=3, max='**', ang='With check boxes, Obligatory, checked text, with default values, EN'), +) + + + +Classement_Commandes_Ds_Arbre=('DEBUT','MESH_TYPES','ALL_LISTS','FIN') + +Ordre_Des_Commandes = ('DEBUT','MESH_TYPES','ALL_LISTS','FIN') diff --git a/OldCodes/MED/Elementary_Lists_53036_Cata.py b/OldCodes/MED/Elementary_Lists_53036_Cata.py new file mode 100644 index 00000000..5cdc0faa --- /dev/null +++ b/OldCodes/MED/Elementary_Lists_53036_Cata.py @@ -0,0 +1,59 @@ +# coding: utf-8 +from Accas import * + +class myModel(ASSD): pass + +JdC = JDC_CATA(code='PATTERNS', + execmodul=None, + regles=(#AU_PLUS_UN('DEBUT', 'POURSUITE'), + AU_PLUS_UN('ALL_LISTS'), + #AU_PLUS_UN('FIN'), + A_CLASSER(('DEBUT', 'POURSUITE'), 'FIN') + ) +) + +class grma(): + def __convert__(cls,valeur): + if isinstance(valeur, (str,unicode)) and len(valeur.strip()) <= 12 and ("item" in (valeur.strip()).lower()): # + return valeur.strip() + raise ValueError("Name length does not contain \"item\" and is longer than allowed, 12") + __convert__ = classmethod(__convert__) + +def mySeveral(suffix,num): + out=list() + for i in range(1,num+1): + out.append(suffix+str(i).zfill(2)) + return out + +ALL_LISTS=OPER(nom="ALL_LISTS",op=18,sd_prod=myModel, + UIinfo={"groupes":("Group1",)}, + fr="All lists definition FR", + ang="All lists definition EN", + reentrant='n', + #regles=(AU_MOINS_UN('LIST_O_CHECKTEXT','LIST_F_CHECKTEXT','LIST_O_ANY','LIST_F_ANY')), + + L1_LIST_O_NOREPEAT_CHECKTEXT=SIMP(statut='o',typ=grma,validators=NoRepeat(),min=3, max='**', ang='Obligatory, No Repetitions, checked text, EN'), + L2_LIST_F_NOREPEAT_CHECKTEXT=SIMP(statut='f',typ=grma,validators=NoRepeat(),min=3, max='**', ang='Optional, No Repetitions, checked text, EN'), + L3_LIST_F_REPEAT_CHECKTEXT=SIMP(statut='f',typ=grma,min=3, max='**',ang='Optional, Allowed Repetitions, checked text, EN'), + L4_LIST_O_REPEAT_CHECKTEXT=SIMP(statut='o',typ=grma,min=3, max='**',ang='Obligatory, Allowed Repetitions, checked text, EN'), + + L5_LIST_F_NOREPEAT_ANYTEXT=SIMP(statut='f',typ='TXM',validators=NoRepeat(),min=3, max='**',ang='Optional, No Repetitions, any text, EN'), + L6_LIST_O_NOREPEAT_ANYTEXT=SIMP(statut='o',typ='TXM',min=3,validators=NoRepeat(), max='**',ang='Obligatory, No Repetitions, any text, EN'), + L7_LIST_O_REPEAT_ANYTEXT=SIMP(statut='o',typ='TXM',min=3, max='**',ang='Obligatory, Allowed Repetitions, any text, EN'), + L8_LIST_F_REPEAT_ANYTEXT=SIMP(statut='f',typ='TXM',min=3, max='**',ang='Optional, Allowed Repetitions, any text, EN'), + + L9_LIST_O_NOREPEAT_CHECKTEXT_ADD=SIMP(statut='o',typ=grma,validators=NoRepeat(), into=("item01","text01","item02","text02","item03","text03",), min=3, max='**',ang='With spare list, Obligatory, No Repetitions, checked text, EN',), + L10_LIST_F_REPEAT_ANYTEXT_ADD=SIMP(statut='f',typ='TXM', into=("item01","text01","item02","text02","item03","text03",), min=3, max='**',ang='With spare list, Optional, Allowed Repetitions, any text, EN'), + L11_LIST_O_REPEAT_CHECKTEXT_ADD_NODEFAUT=SIMP(statut='o',typ=grma, into=("item01","text01","item02","text02","item03","text03","item04","text04"),ang='With spare list, obligatory, No Repetitions, checked text, no default values, EN', min=3, max='**'), + L12_LIST_O_NOREPEAT_CHECKTEXT_ADD_DEFAUT=SIMP(statut='o',typ=grma,validators=NoRepeat(), into=("item01","text01","item02","text02","item03","text03","item04","text04","item05","text05",), defaut=('item01','item02','item03'), min=3, max='**',ang='With spare list, Obligatory, No Repetitions, checked text, with default values EN'), + + L13_LIST_F_SANSORDRENODOUBLON_ANYTEXT_NODEFAUT=SIMP(statut='f',typ='TXM',homo="SansOrdreNiDoublon", into=("item01","text01","item02","text02","item03","text03",), min=3, max='**',ang='With check boxes, Optional, any text, no defaults, EN'), + L14_LIST_O_SANSORDRENODOUBLON_CHECKTEXT_NODEFAUT=SIMP(statut='o',typ=grma,homo="SansOrdreNiDoublon", into=("item01","text01","item02","text02","item03","text03",), min=3, max='**',ang='With check boxes, Obligatory, checked text, EN'), + L15_LIST_O_SANSORDRENODOUBLON_CHECKTEXT_NOREPEAT_DEFAUT=SIMP(statut='o',typ=grma,homo="SansOrdreNiDoublon", into=("item01","text01","item02","text02","item03","text03","item03","text03","item02","text02","item01","text01",), defaut=('item01','item02','item03'), min=3, max='**', ang='With check boxes, Obligatory, checked text, with default values, EN'), #validators=NoRepeat(), +) + + + +Classement_Commandes_Ds_Arbre=('DEBUT','MESH_TYPES','ALL_LISTS','FIN') + +Ordre_Des_Commandes = ('DEBUT','MESH_TYPES','ALL_LISTS','FIN') diff --git a/OldCodes/MED/Elementary_Lists_Cata.py b/OldCodes/MED/Elementary_Lists_Cata.py new file mode 100755 index 00000000..92d20b35 --- /dev/null +++ b/OldCodes/MED/Elementary_Lists_Cata.py @@ -0,0 +1,59 @@ +# coding: utf-8 +from Accas import * + +class myModel(ASSD): pass + +JdC = JDC_CATA(code='PATTERNS', + execmodul=None, + regles=(#AU_PLUS_UN('DEBUT', 'POURSUITE'), + AU_PLUS_UN('ALL_LISTS'), + #AU_PLUS_UN('FIN'), + A_CLASSER(('DEBUT', 'POURSUITE'), 'FIN') + ) +) + +class grma(): + def __convert__(cls,valeur): + if isinstance(valeur, (str,unicode)) and len(valeur.strip()) <= 12 and ("item" in (valeur.strip()).lower()): # + return valeur.strip() + raise ValueError("Name length does not contain \"test\" and is longer than allowed, 12") + __convert__ = classmethod(__convert__) + +def mySeveral(suffix,num): + out=list() + for i in range(1,num+1): + out.append(suffix+str(i).zfill(2)) + return out + +ALL_LISTS=OPER(nom="ALL_LISTS",op=18,sd_prod=myModel, + UIinfo={"groupes":("Group1",)}, + fr="All lists definition FR", + ang="All lists definition EN", + reentrant='n', + #regles=(AU_MOINS_UN('LIST_O_CHECKTEXT','LIST_F_CHECKTEXT','LIST_O_ANY','LIST_F_ANY')), + + L1_LIST_O_NOREPEAT_CHECKTEXT=SIMP(statut='o',typ=grma,validators=NoRepeat(),min=3, max='**', ang='Obligatory, No Repetitions, checked text, EN'), + L2_LIST_F_NOREPEAT_CHECKTEXT=SIMP(statut='f',typ=grma,validators=NoRepeat(),min=3, max='**', ang='Optional, No Repetitions, checked text, EN'), + L3_LIST_F_REPEAT_CHECKTEXT=SIMP(statut='f',typ=grma,min=3, max='**',ang='Optional, Allowed Repetitions, checked text, EN'), + L4_LIST_O_REPEAT_CHECKTEXT=SIMP(statut='o',typ=grma,min=3, max='**',ang='Obligatory, Allowed Repetitions, checked text, EN'), + + L5_LIST_F_NOREPEAT_ANYTEXT=SIMP(statut='f',typ='TXM',validators=NoRepeat(),min=3, max='**',ang='Optional, No Repetitions, any text, EN'), + L6_LIST_O_NOREPEAT_ANYTEXT=SIMP(statut='o',typ='TXM',min=3,validators=NoRepeat(), max='**',ang='Obligatory, No Repetitions, any text, EN'), + L7_LIST_O_REPEAT_ANYTEXT=SIMP(statut='o',typ='TXM',min=3, max='**',ang='Obligatory, Allowed Repetitions, any text, EN'), + L8_LIST_F_REPEAT_ANYTEXT=SIMP(statut='f',typ='TXM',min=3, max='**',ang='Optional, Allowed Repetitions, any text, EN'), + + L9_LIST_O_NOREPEAT_CHECKTEXT_ADD=SIMP(statut='o',typ=grma,validators=NoRepeat(), into=("item01","text01","item02","text02","item03","text03",), min=3, max='**',ang='With spare list, Obligatory, No Repetitions, checked text, EN',), + L10_LIST_F_REPEAT_ANYTEXT_ADD=SIMP(statut='f',typ='TXM', into=("item01","text01","item02","text02","item03","text03",), min=3, max='**',ang='With spare list, Optional, Allowed Repetitions, any text, EN'), + L11_LIST_O_REPEAT_CHECKTEXT_ADD_NODEFAUT=SIMP(statut='o',typ=grma, into=("item01","text01","item02","text02","item03","text03","item04","text04"),ang='With spare list, obligatory, No Repetitions, checked text, no default values, EN', min=3, max='**'), + L12_LIST_O_NOREPEAT_CHECKTEXT_ADD_DEFAUT=SIMP(statut='o',typ=grma,validators=NoRepeat(), into=("item01","text01","item02","text02","item03","text03","item04","text04","item05","text05",), defaut=('item01','item02','item03'), min=3, max='**',ang='With spare list, Obligatory, No Repetitions, checked text, with default values EN'), + + L13_LIST_F_SANSORDRENODOUBLON_ANYTEXT_NODEFAUT=SIMP(statut='f',typ='TXM',homo="SansOrdreNiDoublon", into=("item01","text01","item02","text02","item03","text03",), min=3, max='**',ang='With check boxes, Optional, any text, no defaults, EN'), + L14_LIST_O_SANSORDRENODOUBLON_CHECKTEXT_NODEFAUT=SIMP(statut='o',typ=grma,homo="SansOrdreNiDoublon", into=("item01","text01","item02","text02","item03","text03",), min=3, max='**',ang='With check boxes, Obligatory, checked text, EN'), + L15_LIST_O_SANSORDRENODOUBLON_CHECKTEXT_DEFAUT=SIMP(statut='o',typ=grma,homo="SansOrdreNiDoublon", into=("item01","text01","item02","text02","item03","text03",), defaut=('item01','item02','item03'), min=3, max='**', ang='With check boxes, Obligatory, checked text, with default values, EN'), +) + + + +Classement_Commandes_Ds_Arbre=('DEBUT','MESH_TYPES','ALL_LISTS','FIN') + +Ordre_Des_Commandes = ('DEBUT','MESH_TYPES','ALL_LISTS','FIN') diff --git a/monCode/Global_Condition_Cata.py b/OldCodes/MED/Global_Condition_Cata.py similarity index 100% rename from monCode/Global_Condition_Cata.py rename to OldCodes/MED/Global_Condition_Cata.py diff --git a/OldCodes/MED/Many_Concepts_52983_Cata.py b/OldCodes/MED/Many_Concepts_52983_Cata.py new file mode 100644 index 00000000..70f099ac --- /dev/null +++ b/OldCodes/MED/Many_Concepts_52983_Cata.py @@ -0,0 +1,39 @@ +# coding: utf-8 + +from Accas import * + +#class myMesh(ASSD): pass +class myModel(ASSD): pass + +JdC = JDC_CATA(code='PATTERNS', + execmodul=None, + regles=(UN_PARMI('DEBUT', 'POURSUITE'), + AU_MOINS_UN('FIN'), + A_CLASSER(('DEBUT', 'POURSUITE'), 'FIN'))) + +DEBUT=PROC(nom="DEBUT", op=68, repetable='n', UIinfo={"groupes":("Group1",)}, ang="Debut Eng help", + PAR_LOT=SIMP(ang="Debut Par Lot help En",statut='o',typ=bool, defaut=True), +) +AFFE_MODELE=OPER(nom="AFFE_MODELE",op=None,sd_prod=myModel, + UIinfo={"groupes":("Group1",)}, + ang="Model mesh definition EN", + MESH=SIMP(statut='o',typ='TXM',into=("mesh_01","mesh_02","mesh_03","mesh_04",) , defaut="mesh_01"), + #reentrant='n', + #regles=(AU_MOINS_UN('AFFE','AFFE_SOUS_STRUC'),UN_PARMI('MAILLAGE','GRILLE')), + + + block_mesh_01=BLOC(condition="MESH=='mesh_01'", + AFFE=FACT(statut='o', + ALL=SIMP(statut='o', typ=bool,ang='ALL 01 help EN', defaut=True), + PHENOMENA=SIMP(statut='o',typ='TXM',into=('phenomena_01','phenomena_02',), defaut='phenomena_01'), + #MODELISATION=SIMP(statut='o',typ='TXM', min=2,max='**', into=("mesh_01","mesh_02","mesh_03","mesh_04",) ,ang='Input 01 list EN', fr='Input 01 list FR'), + MODELISATION=SIMP(statut='o',typ='TXM', min=2,max='**', into=('Item_01_01','Item_01_02',) ,ang='Input 01 list EN', fr='Input 01 list FR'), + ), + ), +) +FIN=PROC(nom="FIN",op=9999,repetable='n',ang="Finish help EN",UIinfo={"groupes":("Group1",)}, + FORMAT_HDF =SIMP(ang="Save HDF EN",statut='f',typ='TXM',defaut="NON",into=("OUI","NON",) ), +) + +Classement_Commandes_Ds_Arbre=('DEBUT','MESH','AFFE_MODELE','FIN') +Ordre_Des_Commandes = ('DEBUT','MESH','AFFE_MODELE','FIN') diff --git a/OldCodes/MED/Many_Concepts_52988_Cata.py b/OldCodes/MED/Many_Concepts_52988_Cata.py new file mode 100644 index 00000000..52d4f10f --- /dev/null +++ b/OldCodes/MED/Many_Concepts_52988_Cata.py @@ -0,0 +1,76 @@ +# coding: utf-8 + +from Accas import * + +class myMesh(ASSD): pass +class myModel(ASSD): pass + +JdC = JDC_CATA(code='PATTERNS', + execmodul=None, + regles=(AU_PLUS_UN('DEBUT', 'POURSUITE'), + AU_PLUS_UN('AFFE_MODELE'), + AU_PLUS_UN('FIN'), + A_CLASSER(('DEBUT', 'POURSUITE'), 'FIN'))) + +def mySeveral(suffix,num): + out=list() + for i in range(1,num+1): + out.append(suffix+str(i).zfill(2)) + return out + +switch_facultatif=True #change 'o' to 'f' of some widgets in the loop +empty_defauts=True + +def myBloc(num): + myNum=str(num).zfill(2) + list_item_body="Item_"+myNum+"_" + defauts0=["","",True,"'phenomena_"+myNum+"'",mySeveral(list_item_body,2)] #presence of default values + defauts_mask=[False,False,True,True,True] #switch off defaults of some types + defauts=list() + for id0 in range(len(defauts0)): + if defauts_mask[id0]: + item=", defaut="+str(defauts0[id0]) + else: + item="" + defauts.append(item) + #print defauts + + opt=['o','o','o','o','o'] #initial default obligation of items in FACT groups + #make some widgets optional: + myLen=len(opt) + if switch_facultatif: + make_f=(num)%myLen + opt[make_f]='f' + #print opt + if empty_defauts: + clean_defaut=num%myLen + + myString="BLOC(condition=\"MESH==\'mesh_"+myNum+"'\""+defauts[0]+", AFFE=FACT(statut='"+opt[1]+"'"+defauts[1]+", ALL=SIMP(statut='"+opt[2]+"', typ=bool,ang='ALL "+myNum+" help EN'"+defauts[2]+"),PHENOMENA=SIMP(statut='"+opt[3]+"',typ='TXM',into=mySeveral('phenomena_',"+str(num)+")"+defauts[3]+"), MODELISATION=SIMP(statut='"+opt[4]+"',typ='TXM', min=2,max='**',into=mySeveral('"+list_item_body+"',"+str(num*4)+")"+defauts[4]+", ang='Input "+myNum+" list EN', fr='Input "+myNum+" list FR'),),)" + print myString + return eval(myString) + +DEBUT=PROC(nom="DEBUT", op=10, repetable='n', UIinfo={"groupes":("Group1",)}, ang="Debut Eng help", + PAR_LOT=SIMP(ang="Debut Par Lot help En",statut='o',typ=bool, defaut=True), +); + +AFFE_MODELE=OPER(nom="AFFE_MODELE",op=18,sd_prod=myModel, + UIinfo={"groupes":("Group1",)}, + ang="Model mesh definition EN", + reentrant='n', + regles=(AU_MOINS_UN('APPROVED')), + MESH=SIMP(statut='o',typ='TXM',into=mySeveral("mesh_",4) ,defaut="mesh_01"), + APPROVED=SIMP(statut="o", typ=bool), + block_mesh_01=myBloc(1), + block_mesh_02=myBloc(2), + block_mesh_03=myBloc(3), + block_mesh_04=myBloc(4), +) + + +FIN=PROC(nom="FIN",op=9999,repetable='n',ang="Finish help EN",UIinfo={"groupes":("Group1",)}, + FORMAT_HDF =SIMP(ang="Save HDF EN",statut='f',typ='TXM',defaut="NON",into=("OUI","NON",) ), +); + +Classement_Commandes_Ds_Arbre=('DEBUT','MESH_TYPES','AFFE_MODELE','FIN') + +Ordre_Des_Commandes = ('DEBUT','MESH_TYPES','AFFE_MODELE','FIN') diff --git a/OldCodes/MED/Many_Concepts_52989_Cata.py b/OldCodes/MED/Many_Concepts_52989_Cata.py new file mode 100644 index 00000000..930d9e89 --- /dev/null +++ b/OldCodes/MED/Many_Concepts_52989_Cata.py @@ -0,0 +1,77 @@ +# coding: utf-8 + +from Accas import * + +#class myMesh(ASSD): pass +class myModel(ASSD): pass + +JdC = JDC_CATA(code='PATTERNS', + execmodul=None, + regles=(AU_PLUS_UN('DEBUT', 'POURSUITE'), + AU_PLUS_UN('AFFE_MODELE'), + AU_PLUS_UN('FIN'), + A_CLASSER(('DEBUT', 'POURSUITE'), 'FIN'))) + +def mySeveral(suffix,num): + out=list() + for i in range(1,num+1): + out.append(suffix+str(i).zfill(2)) + return out + +switch_facultatif=True #change 'o' to 'f' of some widgets in the loop +#empty_defauts=True + +def myBloc(num): + myNum=str(num).zfill(2) + list_item_body="Item_"+myNum+"_" + defauts0=["","",True,"'phenomena_"+myNum+"'",mySeveral(list_item_body,2)] #presence of default values + defauts_mask=[False,False,True,True,True] #switch off defaults of some types + defauts=list() + for id0 in range(len(defauts0)): + if defauts_mask[id0]: + item=", defaut="+str(defauts0[id0]) + else: + item="" + defauts.append(item) + #print defauts + + opt=['o','o','o','o','o'] #initial default obligation of items in FACT groups + #make different widgets optional, one by one: + myLen=len(opt) + if switch_facultatif: + make_f=(num)%myLen + opt[make_f]='f' + #print opt + #if empty_defauts: + # clean_defaut=num%myLen + + myString="BLOC(condition=\"MESH==\'mesh_"+myNum+"'\""+defauts[0]+", AFFE=FACT(statut='"+opt[1]+"'"+defauts[1]+", ALL=SIMP(statut='"+opt[2]+"', typ=bool,ang='ALL "+myNum+" help EN'"+defauts[2]+"),PHENOMENA=SIMP(statut='"+opt[3]+"',typ='TXM',into=mySeveral('phenomena_',"+str(num)+")"+defauts[3]+"), MODELISATION=SIMP(statut='"+opt[4]+"',typ='TXM', min=2,max='**',into=mySeveral('"+list_item_body+"',"+str(num*4)+")"+defauts[4]+", ang='Input "+myNum+" list EN', fr='Input "+myNum+" list FR'),),)" + print myString + return eval(myString) + +DEBUT=PROC(nom="DEBUT", op=10, repetable='n', UIinfo={"groupes":("Group1",)}, ang="Debut Eng help", + PAR_LOT=SIMP(ang="Debut Par Lot help En",statut='o',typ=bool, defaut=True), +); + +AFFE_MODELE=OPER(nom="AFFE_MODELE",op=18,sd_prod=myModel, + UIinfo={"groupes":("Group1",)}, + ang="Model mesh definition EN", + reentrant='n', + regles=(AU_MOINS_UN('APPROVED')), + MESH=SIMP(statut='o',typ='TXM',into=mySeveral("mesh_",4) ,defaut="mesh_01"), + APPROVED=SIMP(statut="f", typ=bool), # presence of this item will validate the whole group + PAR_LOT=SIMP(ang="Debut Par Lot help En",statut='o',typ='I', defaut=True), + block_mesh_01=myBloc(1), + block_mesh_02=myBloc(2), + block_mesh_03=myBloc(3), + block_mesh_04=myBloc(4), +) + + +FIN=PROC(nom="FIN",op=9999,repetable='n',ang="Finish help EN",UIinfo={"groupes":("Group1",)}, + FORMAT_HDF =SIMP(ang="Save HDF EN",statut='f',typ='TXM',defaut="NON",into=("OUI","NON",) ), +); + +Classement_Commandes_Ds_Arbre=('DEBUT','MESH_TYPES','AFFE_MODELE','FIN') + +Ordre_Des_Commandes = ('DEBUT','MESH_TYPES','AFFE_MODELE','FIN') diff --git a/monCode/Many_Concepts_52992_Cata.py b/OldCodes/MED/Many_Concepts_52992_Cata.py similarity index 100% rename from monCode/Many_Concepts_52992_Cata.py rename to OldCodes/MED/Many_Concepts_52992_Cata.py diff --git a/monCode/Matrix_Cata.py b/OldCodes/MED/Matrix_Cata.py similarity index 100% rename from monCode/Matrix_Cata.py rename to OldCodes/MED/Matrix_Cata.py diff --git a/OldCodes/MED/Nested_Cond_52945_Cata.py b/OldCodes/MED/Nested_Cond_52945_Cata.py new file mode 100644 index 00000000..9d3b119d --- /dev/null +++ b/OldCodes/MED/Nested_Cond_52945_Cata.py @@ -0,0 +1,61 @@ +# coding: utf-8 + +from Accas import * + +class loi(): pass + +JdC = JDC_CATA (code = 'PATTERNS', + execmodul = None, + ) +use_and=False #switch off second condition about MAX_ROWS while it does not work for blocks greater than 2 +def cond2(myMax=False): + if use_and: + if myMax: + out= " and MAX_ROWS>="+str(myMax) + else: + out="" + else: + out="" + print out + return out + +PROC_01 = PROC(nom = "PROC_01",op = None, ang="Help for PROC_01 EN", + MAX_ROWS=SIMP(statut='o',typ='I',val_min=1,val_max=8, defaut=8), + PROCGROUP1=SIMP(statut='o',typ='TXM',into=("1A","2A","add new row",)), + wideblock1=BLOC(condition='PROCGROUP1=="add new row"'+cond2(1), + PROCGROUP2=SIMP(statut='o',typ='TXM',into=("1A","add new row","3A",)), + wideblock2=BLOC(condition='PROCGROUP2=="add new row"'+cond2(2), + PROCGROUP3=SIMP(statut='o',typ='TXM',into=("1","2","add new row",)), + PROCGROUP689=SIMP(statut='o',typ='TXM',), + wideblock3=BLOC(condition='PROCGROUP3=="add new row"'+cond2(3), + PROCGROUP4=SIMP(statut='o',typ='TXM',into=("1","add new row","3",)), + wideblock4=BLOC(condition='PROCGROUP4=="add new row"'+cond2(4), + PROCGROUP5=SIMP(statut='o',typ='TXM',into=("add new row","2","3",)), + wideblock5=BLOC(condition='PROCGROUP5=="add new row"'+cond2(5), + PROCGROUP6=SIMP(statut='o',typ='TXM',into=("1","2","add new row",)), + wideblock6=BLOC(condition='PROCGROUP6=="add new row"'+cond2(6), + PROCGROUP7=SIMP(statut='o',typ='TXM',into=("1","add new row","3",)), + wideblock7=BLOC(condition='PROCGROUP7=="add new row"'+cond2(7), + PROCGROUP8=SIMP(statut='o',typ='TXM',into=("add new row","2","3",)), + wideblock8=BLOC(condition='PROCGROUP8=="add new row"'+cond2(8), + ) + ) + ) + ) + ) + ) + ) + ) +) + +#LEV1 = OPER( nom = "LEV1", +# sd_prod=loi, +# op=68, +# fr='LEV1 FR', +# Boolean01=SIMP( statut = 'o',typ = bool, defaut=True, fr = 'Bool mandatory FR', ang = 'Bool mandatory EN'), +# SelectedItem=SIMP(statut = 'o',typ = 'TXM', into=["01_01","01_02","01_03","01_04"], fr="FR"), +#) + +Classement_Commandes_Ds_Arbre=('PROC_01',) + +Ordre_Des_Commandes = ('PROC_01',) diff --git a/OldCodes/MED/Nested_Cond_52946_Cata.py b/OldCodes/MED/Nested_Cond_52946_Cata.py new file mode 100644 index 00000000..fef5edf0 --- /dev/null +++ b/OldCodes/MED/Nested_Cond_52946_Cata.py @@ -0,0 +1,62 @@ +# coding: utf-8 + +from Accas import * + +class loi(): pass + +JdC = JDC_CATA (code = 'PATTERNS', + execmodul = None, + ) +use_and=True #switch off second condition about MAX_ROWS while it does not work for blocks greater than 2 +def cond2(myMax=False): + if use_and: + if myMax: + out= " and MAX_ROWS>="+str(myMax) + else: + out="" + else: + out="" + print out + return out + +PROC_01 = PROC(nom = "PROC_01",op = None, ang="Help for PROC_01 EN", + MAX_ROWS=SIMP(statut='o',typ='I',val_min=1,val_max=8, defaut=8), + PROCGROUP1=SIMP(statut='o',typ='TXM',into=("1","2","add new row",)), + wideblock1=BLOC(condition='PROCGROUP1=="add new row"'+cond2(1), + PROCGROUP2=SIMP(statut='o',typ='TXM',into=("1","add new row","3",)), + #wideblock2=BLOC(condition='PROCGROUP2=="add new row"', + wideblock2=BLOC(condition='MAX_ROWS == 8', + #wideblock2=BLOC(condition='PROCGROUP2=="add new row" and (MAX_ROWS > 2)', + PROCGROUP3=SIMP(statut='o',typ='TXM',into=("1","2","add new row",)), + wideblock3=BLOC(condition='PROCGROUP3=="add new row"'+cond2(3), + PROCGROUP4=SIMP(statut='o',typ='TXM',into=("1","add new row","3",)), + wideblock4=BLOC(condition='PROCGROUP4=="add new row"'+cond2(4), + PROCGROUP5=SIMP(statut='o',typ='TXM',into=("add new row","2","3",)), + wideblock5=BLOC(condition='PROCGROUP5=="add new row"'+cond2(5), + PROCGROUP6=SIMP(statut='o',typ='TXM',into=("1","2","add new row",)), + wideblock6=BLOC(condition='PROCGROUP6=="add new row"'+cond2(6), + PROCGROUP7=SIMP(statut='o',typ='TXM',into=("1","add new row","3",)), + wideblock7=BLOC(condition='PROCGROUP7=="add new row"'+cond2(7), + PROCGROUP8=SIMP(statut='o',typ='TXM',into=("add new row","2","3",)), + wideblock8=BLOC(condition='PROCGROUP8=="add new row"'+cond2(8), + ) + ) + ) + ) + ) + ) + ) + ) +) + +#LEV1 = OPER( nom = "LEV1", +# sd_prod=loi, +# op=68, +# fr='LEV1 FR', +# Boolean01=SIMP( statut = 'o',typ = bool, defaut=True, fr = 'Bool mandatory FR', ang = 'Bool mandatory EN'), +# SelectedItem=SIMP(statut = 'o',typ = 'TXM', into=["01_01","01_02","01_03","01_04"], fr="FR"), +#) + +Classement_Commandes_Ds_Arbre=('PROC_01',) + +Ordre_Des_Commandes = ('PROC_01',) diff --git a/OldCodes/MED/Nested_Cond_52947_Cata.py b/OldCodes/MED/Nested_Cond_52947_Cata.py new file mode 100644 index 00000000..bf3be39e --- /dev/null +++ b/OldCodes/MED/Nested_Cond_52947_Cata.py @@ -0,0 +1,17 @@ +# coding: utf-8 + +from Accas import * + +class loi(): pass + +JdC = JDC_CATA (code = 'PATTERNS', + execmodul = None, + ) + +PROC_01 = PROC(nom = "PROC_01",op = None, ang="Help for PROC_01 EN", + PROCGROUP1=SIMP(statut='o',typ='TXM',into=("a1","a2","a3",)), +) + +Classement_Commandes_Ds_Arbre=('PROC_01',) + +Ordre_Des_Commandes = ('PROC_01',) diff --git a/OldCodes/MED/Nested_Cond_52948_Cata.py b/OldCodes/MED/Nested_Cond_52948_Cata.py new file mode 100644 index 00000000..81f216f8 --- /dev/null +++ b/OldCodes/MED/Nested_Cond_52948_Cata.py @@ -0,0 +1,21 @@ +# coding: utf-8 + +from Accas import * + +class loi(ASSD): pass + +JdC = JDC_CATA (code = 'PATTERNS', + execmodul = None, + ) + +PER_01 = OPER( nom = "PER_01", + sd_prod=loi, + op=68, + fr='LEV1 FR', + Boolean01=SIMP( statut = 'o',typ = bool, defaut=True, fr = 'Bool mandatory FR', ang = 'Bool mandatory EN'), + SelectedItem=SIMP(statut = 'o',typ = 'TXM', into=["01_01","01_02","01_03","01_04"], fr="FR"), +) + +#Classement_Commandes_Ds_Arbre=('OPER_01',) + +#Ordre_Des_Commandes = ('OPER_01',) diff --git a/OldCodes/MED/Nested_Cond_52949_Cata.py b/OldCodes/MED/Nested_Cond_52949_Cata.py new file mode 100644 index 00000000..d09011a3 --- /dev/null +++ b/OldCodes/MED/Nested_Cond_52949_Cata.py @@ -0,0 +1,19 @@ +# coding: utf-8 + +from Accas import * + +JdC = JDC_CATA (code = 'PATTERNS', + execmodul = None, + ) + +PROC_01 = PROC(nom = "PROC_01",op = None, ang="Help for PROC_01 EN", + MAX_ROWS=SIMP(statut='o',typ='I',val_min=1,val_max=8, defaut=8), + PROCGROUP1=SIMP(statut='o',typ='TXM',into=("1","2","add new row",)), + wideblock1=BLOC(condition='PROCGROUP1 in "add new row"', + PROCGROUP2=SIMP(statut='o',typ='TXM',into=("1","add new row","3",)), + ) +) + +Classement_Commandes_Ds_Arbre=('PROC_01',) + +Ordre_Des_Commandes = ('PROC_01',) diff --git a/OldCodes/MED/Nested_Cond_52952_Cata.py b/OldCodes/MED/Nested_Cond_52952_Cata.py new file mode 100644 index 00000000..47a8d7c5 --- /dev/null +++ b/OldCodes/MED/Nested_Cond_52952_Cata.py @@ -0,0 +1,60 @@ +# coding: utf-8 + +from Accas import * + +class loi(): pass + +JdC = JDC_CATA (code = 'PATTERNS', + execmodul = None, + ) +use_and=False #switch off second condition about MAX_ROWS while it does not work for blocks greater than 2 +def cond2(myMax=False): + if use_and: + if myMax: + out= " and MAX_ROWS>="+str(myMax) + else: + out="" + else: + out="" + #print out + return out + +PROC_01 = PROC(nom = "PROC_01",op = None, ang="Help for PROC_01 EN", + MAX_ROWS=SIMP(statut='o',typ='I',val_min=1,val_max=8, defaut=8), + PROCGROUP1=SIMP(statut='o',typ='TXM',into=("1","2","add new row",)), + wideblock1=BLOC(condition='PROCGROUP1=="add new row"'+cond2(1), + PROCGROUP2=SIMP(statut='o',typ='TXM',into=("1","add new row","3",)), + wideblock2=BLOC(condition='PROCGROUP2=="add new row"'+cond2(2), + PROCGROUP3=SIMP(statut='o',typ='TXM',into=("1","2","add new row",)), + wideblock3=BLOC(condition='PROCGROUP3=="add new row"'+cond2(3), + PROCGROUP4=SIMP(statut='o',typ='TXM',into=("1","add new row","3",)), + wideblock4=BLOC(condition='PROCGROUP4=="add new row"'+cond2(4), + PROCGROUP5=SIMP(statut='o',typ='TXM',into=("add new row","2","3",)), + wideblock5=BLOC(condition='PROCGROUP5=="add new row"'+cond2(5), + PROCGROUP6=SIMP(statut='o',typ='TXM',into=("1","2","add new row",)), + wideblock6=BLOC(condition='PROCGROUP6=="add new row"'+cond2(6), + PROCGROUP7=SIMP(statut='o',typ='TXM',into=("1","add new row","3",)), + wideblock7=BLOC(condition='PROCGROUP7=="add new row"'+cond2(7), + PROCGROUP8=SIMP(statut='o',typ='TXM',into=("add new row","2","3",)), + wideblock8=BLOC(condition='PROCGROUP8=="add new row"'+cond2(8), + ) + ) + ) + ) + ) + ) + ) + ) +) + +#LEV1 = OPER( nom = "LEV1", +# sd_prod=loi, +# op=68, +# fr='LEV1 FR', +# Boolean01=SIMP( statut = 'o',typ = bool, defaut=True, fr = 'Bool mandatory FR', ang = 'Bool mandatory EN'), +# SelectedItem=SIMP(statut = 'o',typ = 'TXM', into=["01_01","01_02","01_03","01_04"], fr="FR"), +#) + +Classement_Commandes_Ds_Arbre=('PROC_01',) + +Ordre_Des_Commandes = ('PROC_01',) diff --git a/OldCodes/MED/Separate_Blocks_52958_Cata.py b/OldCodes/MED/Separate_Blocks_52958_Cata.py new file mode 100644 index 00000000..1327a3fb --- /dev/null +++ b/OldCodes/MED/Separate_Blocks_52958_Cata.py @@ -0,0 +1,29 @@ +# coding: utf-8 + +from Accas import * + +JdC = JDC_CATA (code = 'PATTERNS', + execmodul = None, + ) +def several(suffix,num): + out=list() + for i in range(1,num+1): + out.append(suffix+str(i).zfill(2)) + return out + +NUMERICAL_PARAMETERS=PROC(nom = "NUMERICAL_PARAMETERS", op=None, ang="Help for NUMERICAL_PARAMETERS, English version", + #Equations=SIMP(statut = 'o',typ = 'TXM',into=("EF","VF","BS"),defaut="EF"), + Solver_definition=FACT(statut = 'o', + Solver = SIMP(statut = 'o',typ = 'TXM', into=several("Solver_",12), defaut="Solver_06"), + ) +) +PASCALE=PROC(nom = "PASCALE", op=None, ang="Help for NUMERICAL_PARAMETERS, English version", + Equations=SIMP(statut = 'o',typ = 'TXM',into=("EF","VF","BS"),defaut="EF"), + Solver_definition=FACT(statut = 'o', + Solver = SIMP(statut = 'o',typ = 'TXM', into=several("Solver_",12), defaut="Solver_06"), + ) +) + +Classement_Commandes_Ds_Arbre=('NUMERICAL_PARAMETERS',) + +Ordre_Des_Commandes = ('NUMERICAL_PARAMETERS',) diff --git a/OldCodes/MED/Separate_Blocks_52963_Cata.py b/OldCodes/MED/Separate_Blocks_52963_Cata.py new file mode 100644 index 00000000..c115196f --- /dev/null +++ b/OldCodes/MED/Separate_Blocks_52963_Cata.py @@ -0,0 +1,40 @@ +# coding: utf-8 + +from Accas import * + +JdC = JDC_CATA (code = 'PATTERNS', + execmodul = None, + ) +def mySeveral(suffix,num): + out=list() + for i in range(1,num+1): + out.append(suffix+str(i).zfill(2)) + return out + +def myFact(num): + myNum=str(num).zfill(2) + list_item_body="Item_"+myNum+"_" + myString="FACT(statut = 'f', List_"+myNum+" = SIMP(statut = 'o',typ = 'TXM', into=mySeveral('"+list_item_body+"',12), defaut='"+list_item_body+myNum+"'),Real_"+myNum+" = SIMP(statut = 'o',typ = 'R', defaut = "+str(num/100.)+", ang='Real "+myNum+" help EN'),Integer_"+myNum+" = SIMP(statut = 'o',typ = 'I', defaut = "+str(100+num)+",ang='Max_Iter "+myNum+" help EN'))" + print myString + return eval(myString) + + +PROC_01=PROC(nom = "PROC_01", op=None, ang="Help for PROC_01, English version",fr="Help for PROC_01, French version", docu="", + Radio_01=SIMP(statut = 'f',typ = 'TXM',into=("EF","VF","BS"),defaut="EF"), + FACT_01=myFact(1), + FACT_02=myFact(2), + FACT_03=myFact(3), + FACT_04=myFact(4), + FACT_05=myFact(5), + FACT_06=myFact(6), + FACT_07=myFact(7), + FACT_08=myFact(8), + FACT_09=myFact(9), + FACT_10=myFact(10), + FACT_11=myFact(11), + FACT_12=myFact(12), +) + +Classement_Commandes_Ds_Arbre=('PROC_01',) + +Ordre_Des_Commandes = ('PROC_01',) diff --git a/OldCodes/MED/Separate_Blocks_52966_Cata.py b/OldCodes/MED/Separate_Blocks_52966_Cata.py new file mode 100644 index 00000000..baef1eb1 --- /dev/null +++ b/OldCodes/MED/Separate_Blocks_52966_Cata.py @@ -0,0 +1,48 @@ +# coding: utf-8 + +from Accas import * + +JdC = JDC_CATA (code = 'PATTERNS', + execmodul = None, + ) +def mySeveral(suffix,num): + out=list() + for i in range(1,num+1): + out.append(suffix+str(i).zfill(2)) + return out + +switch_facultatif=False #change 'o' to 'f' of some widgets in the loop + +def myFact(num): + opt=['o','f','o','o'] + if switch_facultatif: + myLen=len(opt) + make_f=(num-1)%myLen + opt[make_f]='f' + #print opt + myNum=str(num).zfill(2) + list_item_body="Item_"+myNum+"_" + myString="FACT(statut = '"+opt[0]+"', List_"+myNum+" = SIMP(statut = '"+opt[1]+"',typ = 'TXM', into=mySeveral('"+list_item_body+"',12), defaut='"+list_item_body+myNum+"'),Real_"+myNum+" = SIMP(statut = '"+opt[2]+"',typ = 'R', defaut = "+str(num/100.)+", ang='Real "+myNum+" help EN'),Integer_"+myNum+" = SIMP(statut = '"+opt[3]+"',typ = 'I', defaut = "+str(100+num)+",ang='Max_Iter "+myNum+" help EN'))" + print myString + return eval(myString) + + +PROC_01=PROC(nom = "PROC_01", op=None, ang="Help for PROC_01, English version",fr="Help for PROC_01, French version", docu="", + Radio_01=SIMP(statut = 'o',typ = 'TXM',into=("EF","VF","BS"),defaut="EF"), + FACT_01=myFact(1), + FACT_02=myFact(2), + FACT_03=myFact(3), + FACT_04=myFact(4), + FACT_05=myFact(5), + FACT_06=myFact(6), + FACT_07=myFact(7), + FACT_08=myFact(8), + FACT_09=myFact(9), + FACT_10=myFact(10), + FACT_11=myFact(11), + FACT_12=myFact(12), +) + +Classement_Commandes_Ds_Arbre=('PROC_01',) + +Ordre_Des_Commandes = ('PROC_01',) diff --git a/OldCodes/MED/Separate_Blocks_52972_Cata.py b/OldCodes/MED/Separate_Blocks_52972_Cata.py new file mode 100644 index 00000000..88927e49 --- /dev/null +++ b/OldCodes/MED/Separate_Blocks_52972_Cata.py @@ -0,0 +1,66 @@ +# coding: utf-8 + +from Accas import * + +JdC = JDC_CATA (code = 'PATTERNS', + execmodul = None, + ) +def mySeveral(suffix,num): + out=list() + for i in range(1,num+1): + out.append(suffix+str(i).zfill(2)) + return out + +switch_facultatif=True #change 'o' to 'f' of some widgets in the loop +empty_defauts=True + +def myFact(num): + myNum=str(num).zfill(2) + list_item_body="Item_"+myNum+"_" + + defauts0=["","'"+list_item_body+myNum+"'", str(num/100.), str(100+num), "'Text_"+myNum+"'" ] #presence of default values + defauts_mask=[False,True,True,False,True] #switch off defaults of some types + defauts=list() + for id0 in range(len(defauts0)): + if defauts_mask[id0]: + item=", defaut="+defauts0[id0] + else: + item="" + defauts.append(item) + print defauts + + opt=['o','o','o','o','o'] #initial default obligation of items in FACT groups + #make some widgets optional: + myLen=len(opt) + if switch_facultatif: + make_f=(num)%myLen + opt[make_f]='f' + #print opt + if empty_defauts: + clean_defaut=num%myLen + + + myString="FACT(statut = '"+opt[0]+"', List_"+myNum+" = SIMP(statut = '"+opt[1]+"',typ = 'TXM', into=mySeveral('"+list_item_body+"',12)"+defauts[1]+"),Real_"+myNum+" = SIMP(statut = '"+opt[2]+"',typ = 'R'"+defauts[2]+", ang='Real "+myNum+" help EN'),Integer_"+myNum+" = SIMP(statut = '"+opt[3]+"',typ = 'I'"+defauts[3]+",ang='Integer "+myNum+" help EN'),Text_"+myNum+" = SIMP(statut = '"+opt[4]+"',typ = 'TXM'"+defauts[4]+",ang='Text "+myNum+" help EN'))" + print myString + return eval(myString) + + +PROC_01=PROC(nom = "PROC_01", op=None, ang="Help for PROC_01, English version",fr="Help for PROC_01, French version", docu="", + Radio_01=SIMP(statut = 'o',typ = 'TXM',into=("EF","VF","BS"),defaut="EF"), + FACT_01=myFact(1), + FACT_02=myFact(2), + FACT_03=myFact(3), + FACT_04=myFact(4), + FACT_05=myFact(5), + #FACT_06=myFact(6), + #FACT_07=myFact(7), + #FACT_08=myFact(8), + #FACT_09=myFact(9), + #FACT_10=myFact(10), + #FACT_11=myFact(11), + #FACT_12=myFact(12), +) + +Classement_Commandes_Ds_Arbre=('PROC_01',) + +Ordre_Des_Commandes = ('PROC_01',) diff --git a/OldCodes/MED/Separate_Blocks_52975_Cata.py b/OldCodes/MED/Separate_Blocks_52975_Cata.py new file mode 100644 index 00000000..88927e49 --- /dev/null +++ b/OldCodes/MED/Separate_Blocks_52975_Cata.py @@ -0,0 +1,66 @@ +# coding: utf-8 + +from Accas import * + +JdC = JDC_CATA (code = 'PATTERNS', + execmodul = None, + ) +def mySeveral(suffix,num): + out=list() + for i in range(1,num+1): + out.append(suffix+str(i).zfill(2)) + return out + +switch_facultatif=True #change 'o' to 'f' of some widgets in the loop +empty_defauts=True + +def myFact(num): + myNum=str(num).zfill(2) + list_item_body="Item_"+myNum+"_" + + defauts0=["","'"+list_item_body+myNum+"'", str(num/100.), str(100+num), "'Text_"+myNum+"'" ] #presence of default values + defauts_mask=[False,True,True,False,True] #switch off defaults of some types + defauts=list() + for id0 in range(len(defauts0)): + if defauts_mask[id0]: + item=", defaut="+defauts0[id0] + else: + item="" + defauts.append(item) + print defauts + + opt=['o','o','o','o','o'] #initial default obligation of items in FACT groups + #make some widgets optional: + myLen=len(opt) + if switch_facultatif: + make_f=(num)%myLen + opt[make_f]='f' + #print opt + if empty_defauts: + clean_defaut=num%myLen + + + myString="FACT(statut = '"+opt[0]+"', List_"+myNum+" = SIMP(statut = '"+opt[1]+"',typ = 'TXM', into=mySeveral('"+list_item_body+"',12)"+defauts[1]+"),Real_"+myNum+" = SIMP(statut = '"+opt[2]+"',typ = 'R'"+defauts[2]+", ang='Real "+myNum+" help EN'),Integer_"+myNum+" = SIMP(statut = '"+opt[3]+"',typ = 'I'"+defauts[3]+",ang='Integer "+myNum+" help EN'),Text_"+myNum+" = SIMP(statut = '"+opt[4]+"',typ = 'TXM'"+defauts[4]+",ang='Text "+myNum+" help EN'))" + print myString + return eval(myString) + + +PROC_01=PROC(nom = "PROC_01", op=None, ang="Help for PROC_01, English version",fr="Help for PROC_01, French version", docu="", + Radio_01=SIMP(statut = 'o',typ = 'TXM',into=("EF","VF","BS"),defaut="EF"), + FACT_01=myFact(1), + FACT_02=myFact(2), + FACT_03=myFact(3), + FACT_04=myFact(4), + FACT_05=myFact(5), + #FACT_06=myFact(6), + #FACT_07=myFact(7), + #FACT_08=myFact(8), + #FACT_09=myFact(9), + #FACT_10=myFact(10), + #FACT_11=myFact(11), + #FACT_12=myFact(12), +) + +Classement_Commandes_Ds_Arbre=('PROC_01',) + +Ordre_Des_Commandes = ('PROC_01',) diff --git a/OldCodes/MED/a b/OldCodes/MED/a new file mode 100644 index 00000000..0018d1d5 --- /dev/null +++ b/OldCodes/MED/a @@ -0,0 +1,110 @@ +ESSAI_FACT=OPER(nom="ESSAI_FACT", + sd_prod=ObjetUtilisateur, + op=None, + fr=tr("Affectation de caractéristiques à des éléments de structure"), + regles = (AU_MOINS_UN('Poutre','Barre'), + EXCLUS('Discret','Discret_2D'),), + Info = SIMP(statut='f',typ='I', defaut= 1 ,into=(1,2) ), + Verif = SIMP(statut='f',typ='TXM',validators=NoRepeat(),max='**',into=("Maille","Noeud") ), +# +# ============================================================================== + Poutre = FACT(statut= 'f',max= '**', + Section = SIMP(statut= 'o',typ= 'TXM' ,into= ("GENERALE","RECTANGLE","CERCLE") ), + + b_generale = BLOC(condition = " Section == 'GENERALE'", + regles = (UN_PARMI('Maille','GroupeMailles'),), + Maille = SIMP(statut= 'f',typ= ma ,validators= NoRepeat(),max= '**'), + GroupeMailles = SIMP(statut= 'f',typ= grma,validators= NoRepeat(),max= '**'), + + Vari = SIMP(statut= 'f',typ= 'TXM',into= ("CONSTANT","HOMOTHETIQUE"),defaut= "CONSTANT"), + + b_constant = BLOC(condition = "Vari == 'CONSTANT'", + regles = (PRESENT_ABSENT('Table','Cara'), + PRESENT_PRESENT('Table','Nom'), + PRESENT_PRESENT('Cara','Valeur'),), + Table = SIMP(statut= 'f',typ='TXM'), + Nom = SIMP(statut= 'f',typ= 'TXM'), + Cara = SIMP(statut= 'o',typ= 'TXM',min= 4 ,max= 5, + fr= tr("A,IY,IZ,JX sont des paramètres obligatoires"), + validators= [NoRepeat(), Compulsory(['A','IY','IZ','JX'])], + into= ("A","IY","IZ","AY","AZ","EY","EZ","JX","RY","RZ","RT","JG","IYR2","IZR2","AI") ), + Valeur = SIMP(statut= 'f',typ= 'R',min= 4 ,max= 15), + ), + ), + b_rectangle = BLOC(condition = "Section == 'RECTANGLE'", + regles = (UN_PARMI('Maille','GroupeMailles'),), + Maille = SIMP(statut= 'f',typ= ma ,validators= NoRepeat(),max= '**'), + GroupeMailles = SIMP(statut= 'f',typ= grma,validators= NoRepeat(),max= '**'), + Vari = SIMP(statut= 'f',typ= 'TXM',into= ("CONSTANT","HOMOTHETIQUE","AFFINE"),defaut= "CONSTANT"), + b_constant = BLOC(condition = "Vari == 'CONSTANT'", + Cara = SIMP(statut= 'o',typ= 'TXM',min= 1 ,max= 4, + validators = [NoRepeat(), + OrVal( [AndVal( [Compulsory(['H']),Absent(['HY','HZ','EPY','EPZ'])] ), + AndVal( [Compulsory(['HY','HZ']),Together(['EPY','EPZ']),Absent(['H','EP'])] )] )], + into= ("H","EP", "HY","HZ","EPY","EPZ"),), + Valeur = SIMP(statut= 'o',typ= 'R',min= 1 ,max= 4), + ), + + Metrique = SIMP(statut= 'f',typ= 'TXM',defaut= "NON",into= ("OUI","NON") ), + Fcx = SIMP(statut= 'f',typ= 'R'), + Tuyau = SIMP(statut= 'f',typ= 'I',val_max= 10,defaut= 3), + ), + ), +# +# ============================================================================== + Barre = FACT(statut='f',max='**', + regles = (UN_PARMI('Maille','GroupeMailles'),), + Maille = SIMP(statut='f',typ=ma ,validators=NoRepeat(),max='**'), + GroupeMailles = SIMP(statut='f',typ=grma,validators=NoRepeat(),max='**'), + Section = SIMP(statut='o',typ='TXM',into=("GENERALE","RECTANGLE","CERCLE") ), + b_generale = BLOC(condition = "Section=='GENERALE'", + regles = (PRESENT_ABSENT('Table','Cara'), + PRESENT_PRESENT('Table','Nom'), + PRESENT_PRESENT('Cara','Valeur')), + Table = SIMP(statut='f',typ=table_sdaster), + Nom = SIMP(statut='f',typ='TXM',validators=LongStr(1,24) ), + Cara = SIMP(statut='f',typ='TXM',into=("A",) ), + Valeur = SIMP(statut='f',typ='R',min=1,max=1 ), + ), + b_rectangle = BLOC(condition = "Section=='RECTANGLE'", + Cara = SIMP(statut='o',typ='TXM', min=1, max=4, + validators = [NoRepeat(), + OrVal( [AndVal( [Compulsory(['H']),Absent(['HY','HZ','EPY','EPZ'])] ), + AndVal( [Compulsory(['HY','HZ']),Together(['EPY','EPZ']),Absent(['H','EP'])] )] )], + into=("H","EP","HZ","HY","EPY","EPZ"), ), + Valeur = SIMP(statut='o',typ='R',min=1,max=4 ), ), + b_cercle = BLOC(condition = "Section=='CERCLE'", + Cara = SIMP(statut='o',typ='TXM',validators=[NoRepeat(),Compulsory(['R'])],min=1,max=2,into=("R","EP") ), + Valeur = SIMP(statut='o',typ='R',min=1,max=2 ), ), + ), +# +# ============================================================================== + Discret = FACT(statut='f',max='**', + REPERE = SIMP(statut='f',typ='TXM',into=("LOCAL","GLOBAL") ), + AMOR_HYST = SIMP(statut='f',typ='R' ), + SYME = SIMP(statut='f',typ='TXM',defaut="OUI",into=("OUI","NON"),), + b_SYME_OUI = BLOC(condition="SYME=='OUI'", + fr=tr("SYMETRIQUE: Affectation de matrices de rigidité, de masse ou d'amortissement à des mailles ou noeuds"), + Cara = SIMP(statut='o',typ='TXM',validators=NoRepeat(),max=1,defaut="None", + into = ("K_T_D_N", "K_T_D_L", "K_TR_D_N", "K_TR_D_L", "K_T_N", "K_T_L", "K_TR_N", "K_TR_L", + "M_T_D_N", "M_T_D_L", "M_TR_D_N", "M_TR_D_L", "M_T_N", "M_T_L", "M_TR_N", "M_TR_L", + "A_T_D_N", "A_T_D_L", "A_TR_D_N", "A_TR_D_L", "A_T_N", "A_T_L", "A_TR_N", "A_TR_L",),), + # Affection des caractéristiques de RIGIDITE/AMORTISSEMENT/MASSE + b_AK_T_D_N = BLOC(condition = "((Cara=='K_T_D_N')or(Cara=='A_T_D_N'))", + fr = tr("Noeud: 3 valeurs (triangulaire supérieure par colonne)"), + regles = (UN_PARMI('Maille','GroupeMailles','Noeud','GROUP_NO'),), + Noeud = SIMP(statut='f',typ=no ,validators=NoRepeat(),max='**'), + GROUP_NO = SIMP(statut='f',typ=grno,validators=NoRepeat(),max='**'), + Maille = SIMP(statut='f',typ=ma ,validators=NoRepeat(),max='**'), + GroupeMailles = SIMP(statut='f',typ=grma,validators=NoRepeat(),homo='SansOrdreNiDoublon',max='**'), + Valeur = SIMP(statut='o',typ='R',min=3 ,max=3 ),), + ), + ), +# +# ============================================================================== + Discret_2D = FACT(statut='f',max='**', + REPERE = SIMP(statut='f',typ='TXM',into=("LOCAL","GLOBAL") ), + AMOR_HYST = SIMP(statut='f',typ='R' ), + SYME = SIMP(statut='f',typ='TXM',defaut="OUI",into=("OUI","NON"),), + ), +) diff --git a/OldCodes/MED/cata_diapo.py b/OldCodes/MED/cata_diapo.py new file mode 100644 index 00000000..0c5268ef --- /dev/null +++ b/OldCodes/MED/cata_diapo.py @@ -0,0 +1,48 @@ +# coding: utf-8 + +from Accas import * +class Tuple: + def __init__(self,ntuple): + self.ntuple=ntuple + + def __convert__(self,valeur): + import types + if type(valeur) == types.StringType: + return None + if len(valeur) != self.ntuple: + return None + return valeur + + def info(self): + return "Tuple de %s elements" % self.ntuple + + __repr__=info + __str__=info + + + +class forme ( ASSD ) : pass + +JdC = JDC_CATA (code = 'MED', + execmodul = None, + ) + +FORME_GEOMETRIQUE=OPER(nom='FORME_GEOMETRIQUE',sd_prod =forme ,op=None, + Forme=SIMP(statut="o",typ='TXM',into=[ 'carre', 'cercle', 'triangle' ],defaut='carre'), + bloc_pour_Carre = BLOC (condition = "Forme=='carre'", + Cote=SIMP(statut="o",typ='I'), ) , # fin bloc_pour_carre + bloc_pour_cercle = BLOC (condition ="Forme=='cercle'", + rayon=SIMP(statut="o",typ='I'), ) , # fin bloc_pour_cercle + + DE_NOMBREUSES_WIDGETS= FACT(statut="o", + Stop_Criteria = SIMP(statut = 'o',typ = Tuple(3),validators = VerifTypeTuple(('R','R','R'))), + Fichier_Med = SIMP( statut = 'o', typ = ('Fichier', 'Med Files (*.med);;All Files (*)',),), + ListeDeChoixPlusGrande=SIMP(statut="o",typ='TXM',into=['a','b,','c','d','e','f','g','h'], + homo="SansOrdreNiDoublon",), + Un_Parametre_Facultatif=SIMP(statut="f",typ='TXM') + + ), + Couleur=SIMP(statut = 'f',typ='TXM'), + Matiere=SIMP(statut = 'f',typ='TXM'), +); + diff --git a/OldCodes/MED/cata_med.py b/OldCodes/MED/cata_med.py new file mode 100644 index 00000000..4640f81e --- /dev/null +++ b/OldCodes/MED/cata_med.py @@ -0,0 +1,29 @@ +# coding: utf-8 + +from Accas import * + +JdC = JDC_CATA (code = 'MED', + execmodul = None, + ) +FAS=PROC(nom='FAS',op=None, + FAMILY_MESH_NAME_REF = FACT(statut='o', max='**', + + NAME=SIMP(statut="o",typ='TXM'), + ELEM=FACT(statut="f", max="**", + NUM=SIMP(statut="o",typ='TXM',), + NAME=SIMP(statut="o",typ='TXM',), + ATT=FACT(statut="f", + NBR=SIMP(statut="o", max=1 , typ = 'I'), + DES=SIMP(statut="o", max="**", typ = 'TXM'), + IDE=SIMP(statut="o", max="**", typ = 'I'), + VAL=SIMP(statut="o", max="**", typ = 'I'), + ), + GRO=FACT(statut="f", + NBR=SIMP(statut="o", max=1 , typ = 'I'), + NOM=SIMP(statut="o", max="**", typ='TXM'), + ), + ), + ), +); + + diff --git a/PSEN_Eficas/configuration_PSEN.py b/OldCodes/MED/configuration_MED.py old mode 100755 new mode 100644 similarity index 100% rename from PSEN_Eficas/configuration_PSEN.py rename to OldCodes/MED/configuration_MED.py diff --git a/OldCodes/MED/images/essaiAster.png b/OldCodes/MED/images/essaiAster.png new file mode 100644 index 0000000000000000000000000000000000000000..d01c5de8247a040c043bd9a33dc6499ab4993d54 GIT binary patch literal 11576 zcmV-8EyvP{P)00004b3#c}2nYxW zdZgXgFbngSdJ^%n907*naRCt^$ zyT`6=S$3xPO~1@`$6gb0!(^l<$Sev}6(CeYJ-wXXMi5Zy2@(WB4V4HclPo49!`-;< zxb2pkUX7Elu;%*5_}viy<$wNPYyS^#&=@!jJpR+4x%~AP-2c-D)Fiq7AHODFDat&0s-Hx&nxT_613ZDM=A1FD|>~_rifm~)@{O4ccb{kHAeot%^ec$u=fBl49 zX6$cv*k4^xuPn}Pk(1}+|NY;HA3VE%ct!i-hW-Ec7xLMow++=TsI5S)S3LfBN8>eZ z?p39;4XUFY&re-p71m=A11E8e2uu=ptfs-ERaD6OUjuX3&Vb3 zRW18Z9|+Tc=?z*Li^+oF^hkYoge;hTIuJgc5gLkwS|Qxufe*;G(!9QetwqQdad#w# zi1CKu@R8Ma%hmtzcktPY@qA!BX5_fA|9($eMlOHx1ie z@nKJUEl|4_dwoq68YCp|NlC&qbNcB6^JyYEi$K#~@9?pp{b{ECdBNX3Q1>4D`5GGq zemr2d8lfsyXy#KUl*;vQzeaC+YS$uD<@9ty#7bEvHdiam>kaAJ;I=(x87aez5nxaR zCy6%^VJpkw2M^g_@@K;exxj(d?{&e z*2t#8kkRqs$WbMl7B>IzHKh}rzkP>RhIYHAkPsn|eWu;CbicepUGDIC;_%&D=I>6p zrboR{tiHa$51BA~OscHbSA2^9%s2)#n)b7X%~v-_*Kz#uXS4))%8(ORfAa!g6U9r) zL!gF?U0W{x<^|(BfSeRvg?Sv&!jY$pe${gE zx38%Jp8oX%dGB#AI>ItzTSL|@b~4=mBkZmluewWJv)( zCJy5hX;=^n?9S4@>T%aA(jb}s{gLJF!0qq9Wb_m9dP07zn$`5VH_wiKrYzJH820;FNsFsrvdFNb(@e_VhqgRePVq3MAP)# z{P(Ys*A8)4dGXDcq^6=uCVZNSj|<(UWA*p1FxwU9_eaiu`ozmWyg;uF`yV~W)RwFQ?d>(&Utf`G;O<}E z(b7<#X38n??sQ`2$eaKCpSbw?n!o(lMw-j?%RVk?}DjLLtUT90zovAXEjb zVKIc`Bjp$g#WOAoo!d|w1*(!0#PdKEhVk>8*VBFZ5^XACIbf|u^%o=&sY%fm%hSK!v$?)Pt_`4?hEz3z}} z&H3G#$A9`rzv+=%!DqkvEv0Xm_ak@z{E@ymC9E7>|j=AAe+edE)E; z>9>6N#~;zJ*T|+Lq)LnxqZPw(PZ%e{{Rv&Q#TS826RpiGCa9%(FU ztkiQsmO>sf-EKwqhfCD9BNk056{Q7-{R#2tk^78Rj?GsW*tRFBgkA6GZU#zPSUw#o zIpU0F^Z6F{)dl6&A#`CmjpS2c`L{=kNZ9K)1aA?i!seo<|7L}Lvtf08$@y_${`7>I zGq3*B7pTuJQN1J&h4O=9dvSxA1k1Y*e6XJG_pd0mVU7z*cf@h#^ywqRyZ87*Bm|FE zy2n++G6lp_VEp;Om?mz%{2bL-5}Bw3&a4RgiTLvoKQ5Fg>3?&J+iVd{hYp2#PK?Jh z>n)uAaz{x4b)zxA+Jbe+Qn0&*@Tp;bdxZ1CbUd^BV$169UZ7rXm}90af#uzvbabI_~9jvwyvA0Oy{bxr+zOX)3bvu1vLB>95tE#2o^+UA0X z`*%Ft4}9~tf54|1KPLR!C*~i1ARh;0qu5+EXc4C84G;zM{gJqT;QD6A>KC68+J+P& zjcTc{*Qgjd|MZEj-?9Gtm)LJMnC*sC1TjubZ;!YliKjF55OKFH{U2^Ht2L#Jq`5MG zI52#-r_LGONY*dbw6CwIYm07Mj2}7t`yS>Ai6opCRFI6{ABg7}D=f{6h9U}O2^-l6A$={B_6 zo+_X=1|8-j=fgc}lnmegOf3Ta;u3w?lLcf1%4!OQ$NNXDYFK~0Mg8&;b<-h)VK_aK z-yKm3!aTqTRE50R(Z7005{BvSj``n@EZ={GC16%7x?eV|-dsZKIKJJpoJORu5GH!F z;&?ydmxU}q&Xv_|kG*Y)!0GJ)v2`qe`9yvUH0ze}eouJ&@%it57!U~Jm}#~eRp9ui z_oy0Jty|{r4;;-0*4LNJ!+>4)gt*XbJ4QL8ZPQ?8K|CI)=S08V(cEs))*vJ#VJNAR zrbtbd_3b6>TI701(Sj;9a*4z~as9WiIDY$y>ND-_1@-fe5H<6DPkK9%ejYK&QEw#M zzk7*&^8$>Zo@T;BVE*Zz-4|O-l}vXdWWn~gFHl=eS|YpKE21rY`uDf=W<~s%@b?)L z8s?{nUZ9pp*$u3}UcmyxyMZMyT>bhhE`Ifz@qW+rX^;JsP&W(S&3F|#KRjSo4yi4o zXf&e2EC@f$q&cB`!D%^>4uKP#_w|bI>l;MBW)3GpnqXY8L*@LZ6Ec7%v-|1| zn?GEzhzRq-=ogyRn)S^k{x2t%yP3XS(S6l2J`KbS_VtS0?_SVeUb7rVhEIQ{xmlra z*R<;``o#)kE$ME+>W(@~T(4RE?wV%XuoTJobU>RbVO*$bK^n#C7h7_Z(J>*?h^+!q zGqaztYeWCl1w|`z4wP}k|9ph#QP(SSESwJ$LTl0-DL+3F=Ri7))D&sIYFPdL0()_R z+-;Z-BjNtY=}!-wKRl2JkM10HquKoOCCyhGg0%<_$B&P+7Ye5>PlrsM1>Mb-%imog zUab+wN648h6YZ;)_z;O&BPGPA!1Vsez(^F&^hEWR@xz(*7c176mpmNru(BiP#P)WF zHrX;i4&)5(O-KLbB|#*l$b{hxIF`E;)A7W`=eLNBK`F_3f5g8%QbWMCmgP8-PKos0 zOdT@ag=PQK6GCLrk?v*B_U~WOy?jLonf-@*^2ambhexI#9#9jsn+?q`R&0KEgSH(( zMbdm?`t}L`>BwsL0)Lt*KQB1zurC_ai%VGdtalyb`3^BD#$`rU$@FfI5}E1lh(F(< z#TwH!WE~j~nW8;2vtw?AQ@ zAUsX9!ccaG_D#?3_n&bV9yQJQyA$y)Q|7?U?_Z-D$J5&fRLY25OUVt>@kqDsDALfb zUvf@Q#P?75k0bNJBieXS_EP@gI?I`Sgf=nM9Dd$wQh&_vKq z(0zSP`^^iYSeW)l(iFJ)@{;|-BO*bwS!3T^Qk6rBOmo#^R+1tl*?aQ)f%I-9o=2?G zbgMPxg<$=M*KA+EVvHU!2hJbwi0@D6M-UFyuNp*J<6f-Dt3oCdKMd4UM&ycdmHwAE z=$9L6%(&2?UUoE}tthi&|Cc@Ha*J@4ie&ii6Z4-RXp)3;LbjFeWsB=Oa-(UlEbJV1 z-I9Vw-71E62l6}5k{61}s36c`nc4j6CE^!bYHwhU`2B)WigAoIG-P1_$-JD{h%Jj> z7>{Rkh!i1MzCYuC9!c{=e{%&?+!r0||L_^j%?&<844UEn&z%1BfKw~F&pK9LUNW3d zs3;Le5RNll14>Jj(Ug$r-)zyhYo_RFie(rN*j8g!mKZWN1javpz`kgC`tA{)X4IkJ z;q{IOm{Q>{T@>U>(95SmusAL3}S|@Bjn8DJ^6g3 zd>U9gOaJwT)o*V(E(5*2AWRdrB$O4Lp9bQ%P`swSUSqc#k}QP%%<OJxiR&b(M#j5|dc>hFrzo0^*-}T6yBaRDAr)fX` zlC;$rY3SCHav#W3pucLVMse9&V|RZE(eYig3zoarf~MX>(-lI=GyIr|A!47xX{rbo3Bc@o6? zGhvIwC7|t`Q?~wbM zJdCvM3j3F?C`mFBIRuvFo^l>> zZbiS_QJh2BhGjkwhMDv<5RVhfj}cPBylU8OF5pU2UtUsmLnKg(pc+FAnOFm*NQ5a+ z3LpOXp6&I9^2xJ&I#E#cFIUjPm>0Bl*3D#|od~H~Lbxo#XcO4-sVoc<5peceV z5+Qlw*|Y!tBQ|Q35R{*fOz#6CD)1U1V0nyiil7zI34-#BWn_ER^YP!`VowSyG}1jY zULP~rC(hq}Wc>M#m%n^N{mh|t)|5CB?nknRJPw%F;9hmejiK9h6saJ2)Ty#0k4zHN zIJm7Cx1}h^a|EBrqi4E5Ql18sku2j0{m?Uidt#YpR0jDNsa9f)!QM2qU)@5lm=0&+ zA(G-5672u^2W+-vT{!K}w5mrhndLZOl|dJ%GEuX@Z92lVAXBD9g`bZUd1gM$Xe)Rh z_c#fvM11m8DM+6(dVRuLNqj%xY)8-q*C@pQ`M>1E zB7`7?nR*WRX`tC{P*NjWMX805GIhW3^p|_gl&DXcWq3eogL5kof_(IZus|);5HOu$ z^Xes`1%10_9vA%KfGn0QJpO4y&jqAFDMLwuLPaP+cV(!yVy}8~BZ%if6$RldLS%#y zRCr%SJ3w)fgSuji^?rK9c5nV@5o)f0C_<13yOuuWv zDSRq`poTy=Pvnmabydg)Osf$>QI4G;W2TCj30o zON9>$(m9qIS-t7WPY3czlIB4F;(}x<6@eKR{11=lED-G#%lU}D7x-l%JtcH48NIeB z*RXEa6j2by5Mv;ZN33&9;~oB}sSIQKqOF}J`eDo-pvDYo;%Pmz{^u-ER z;6fxH55y&4n-v$I-4fzV924oh&<&YdEKVres}*+JLfhhNWOZ?YSO&sy#0^kYMeKT# zX^~1H5a`C@r!x7HAm#;sSa7A%UThhc8K~5qK`Mi}UZKPeF+9=C z3#$oqe{%^9Y%Y72F_OZoDsTYSmDb!dOihCiIQQrh@J)$ytoQkB3V2}NPenmL|O zCS%tLyp70< zmWwYxXAu>ILDWP|1z|K&uGxP&uxSj=HTXG_D73o`!^Z>jIdbv4&k0J=thSV}0D@FJ z{%~g5Cz>mb>oy2&D8Vz|A0bB+pp-;!4IPHsSh7$+p=lh;l*vjlemJpmn&x6h96gO{ z5LD(kqShT!OURIgK*tK{oRCJ6=Y{@ag$HCUoc9NulT>L5lc$!%>GX*j6BnN~(Df*- z$>)f!4&5}2(;3@sNK_QCoIK0nh;0li26D;xalxM_@~|NKhW=(vSPCU1loLdMLNzUf zM9m8#CDL#}Z(gy~fXyH(xV0oEi^Wil!PbOoG-$^(1(cOUAL&fP)K2JRAqD3B37z3Q z&Zz3>O-B`Ax*qKu$B%dDwsp*pBg3bWcITMq1*J60G$4IuUIOi<#W;tSE$MKgNMO|? zn>8gbe>If~U=Ts$(}-FB7I_5BF$1*j%WOs2{zGGMO6~NA85SgI6Sct zS5%`=RpZYd|Kmq?zqmzG0f9^kU6lnnV4b9dgfId>FQjR~nijXRlulukCFX>{BB zjZ9(UJe(=}85+&-e#R<`q%!M0RXMa)%x|9%fBMt=8m2RK27IOhMR-=*jwB_fZSdht znG?;rr^-kbl012qk0;V&z-%P$vn@h8tP*5VsYVmY2oEyBxPQQE_dFjg#88+X_ZSK_ z3S?@irxT(y=uWfvNSFglnrN3wdhn!Ds5RqUM;NDP$3JIsnW$OO>_{N+XPBSpxAqvk5Ee3^6707}@{$gdw3-H6SY0Lg&^j`!i*V2n$BF%u`@K zdb-OMLP~Og$V{CR!!RR_!mb+T`8h_N9v&!XO-(b6aU`GdANR-wL@oGIXk3e*7KBr{ zbwfCgNF7?3g> z0mD3dy6c9LEwb}uQ@{yStJu8QF-!)3cP8DupX_%)GNJuSF zralY5lSj^i`Lv)qjj9T<2$&N_NNTFoV`K^w<(NsICX8;eeTztiBfYp{85VS_k+mgHktt1xjYGb^Kuw+~6v9hZwnH{8ZqpLyK)aR1Au>&8 z3~P`A*$ZeTHcM1nX}1mIF;QoMKPFmZiCLhvW?l-@-HG;gLv|5#B6S5FbV5mskrix( zu0ghjQvd2)2~9ZPLs2L;q!Os-08=KUjKwfLobl1Kx>(~b*Hl-qyERf(s!NE*((P7+ zn2GZY)uJyQUIvU=lWWBE7HJe^@dO``)}deYgp^Rq;-3cMvS2gJejtg8>pE=KR9RW3 z8NrBhmI~B5qE`la*^v#TF;V=CrC}N;Ry&K<4TOZMP)eqx#IPK=ym^fl+ELO-4v+#A zA5lnzlUUv0&5W=Xr9sq8I0VW$B4tK)2H7@<5NKVC+(_h&Mo2|88K*nC^);$BoX6*F z5@SM`j4}@0cI0tpIeCmWgu_7e3zUjmHDoHqDu@LESQL*RKeFytRIiwC6RqwDAz`cI zG>wSkLf5oZ3U!r9V!<^#P=XXALJIO+kwt(hbYJe!y#^&vo#Wbl4x&YC1X4M2j>xJB zerEA!T)##3ky;{Z-Jv^8o-_D>FJ~INr7D4Xv7)~;B=12zi%x$CXt$=SN)eXh-4W*$ zN@h@yMWF;wDFJ*!Dc;9wO)>B?LwC6;%t? zK4(g%Q3zcr$CczB&^+#$uzYf zDI}3;I*W2Gp=NBfgt(yFhFk)A4WiCJe`o)Q4utaMr%!?Qi`MqPep*XB;`p{ChsF=YY|1FWC9dvnW?EV zo)7r*ObL-RSL)F5 zf$@I8S`Erk{KRVA;0H+@0;@L|C<4Jjq6fQzdh zKYOI33q*;za1_6w zqGn1*WaE%Rf}J_;PxNh1c;^ugtTE)0P~QI=+5i9yzDYzuR5fC>qNa*%9m;Bwl1QO3 z($Z`jpg~<%bmwS9MfN?b5{W)iY9W`%%7AHlG6Rv8-Zl6d5VJ?r1;0piu?kTVML^aP z6)UxjsG^7%LV(l5fpYdp1;R(-;XpVBYS2_6@xuW#S9E8YbtFeH!r)?pny6)>bseJD zoK6eMO4@Y;8%w+DDFn_>Cqya8V%S~uR3)$%TiTl~^p)Nud`L*2s6l`#sLKu^6Ezod zOqjk!wiaa+XhBtqkUUbhm|!3zrt`$&GtmdEaY$3iji9OuLJ($22@xH#N5o7z3=k?I z&XhS*Nb@_0Zj6(tSL&N7yf ztN(C~u#z!)j8T-fVY}`SA07zj0g)xTy+A04B0=9ntLcnEj*%D!ih{oDi3zMI#5ALF zp~#BT4q+rER#Gk~`P^8aj}vtas34if6U0ik4Yg^&NwTig7%9WV{4}BK6c8C?uB03g zSs-%2T8nH8LR-w0CM+%edX0~PJcHB;=`7h)HtrQQdP2@rD^bd@q(E~i$)liY6(uFw zrXdPJMbkHzq#O~}G8=_?u_JU6Cl$3=a`p%ow38@fh*KelfG`dv3qB-Nb{w9LAZBc9 zi6v8%z(~RH;Y_KLB4^gSE$Plvh6TA6IB5_TlBjgXfUo4~j4p~849oiyS{a4xG}=mB z%`9U;Z7fo0RHL2`Fhs!>LGa+miQ+57jN56j4W)I@G#^2#g-k_efpQw5X8dU+oEL2G zD7zLZDxp?r97shLpw}CW$SmiHc=t$NCf1ibaInmt&W;29`Wh)I!s?EXzc# zaR1#qRyS+5U%x;#&w;wEg;+piNX3(YOdt#fK?KHVmdb372 zL5$CuuAUR3(?|zNN~4!D4f+3m$xk?EL2%ZLQ$(k)-7&0LS{192$p87D8r;)gLy6X*W1naMMtZ%MB!w~M!RikSv&jEQUh@7cm zq3RBaq9%`@JWZ>S(vo7PV{>QNMmBDfs~K5 zs=+u1N-!Tiga3fsZ4jMAC`~>mtg+7zB_N4{w1$`!Ix7U3I4201X*y6tp`0T3;*r+% z#8^o&ph6%onS999BEU(;W}-F%w{CG)E%vgdmQ1-%WL2=69b#ChenM9t2{{5FNw~PSSRkkTcBB*Qq&VYL>X(u}lZT`9vN(DI}Che0Un4 z)vyGoJKS2ZzkAE&)hiAUcMu|07D7yvCL$EL)fygW`nKor>4*mAhX+c{SZPUqA%(GoHX^Gb5d2E+1*yj$t{F#(-26d1FvY zQA&aw(MltAWwq;w(@6jIj_Sbb_8Aqjpx2h#7%CMXGtwyB$}oO-N7sLWiWOZY&tl9~ z@RnRFsyt`H)hVRVKtsq8BOtembRH3Pjcy&XwTL8;J5Py$aC*LimlBk&wA&R+Y>?M2 ztuhQxClHn9(h@>p|L(|It?+Z^#nmmtVPL!6a^4?lR++xGiLF~X+~CoAJ3$`puObbpFTXJ zAxr^Q0*OJl4JH&)oRO(PR!NeTN`#W1#i3ESZO5`?Twidaq3S}c1$VI~$3hJSi6T|c zDNPU)-Fii^&|KYOT8(TZ|9=T*mK(=*M8UXo4PDJ9Dd`Qi3>e=3dJGr_{PE;L5+(Lf zU3KU5NADpMh=Yuiq{MH3exa<9_P;AQi$BaXV>o<%rMKmA(&+_tJLBFhKmPNL{XG%} z4Nb5N#1e^@$b1?JCrc`k+m9>OgRO>(y3u@Nd%JPJ-#C6eQM%CjLm6?lW6MY{mF?>t z>oivJ*h&51IBHJhQV7eDS_~eLWZ2T3mNytIO?lMXxc~PjdEPJ~&{C!KLU;;vsrY#$ zZ9@GPskswpu->AV2|Wh760D!8sgQew(bKGE_%t)U45U4w%n@QGZjn!a{Xou%^7lsl z_eRur(I)o;X^~8t;^paA>yoD`Gd)X{7Z|T{rUe&h$JojDcJdRWvO{>idSIMiGtq z%Yk8jp#)7Uf_gR>o$$_*Q^Gihh(?VX)jNY%beV|z9c*Lx_=E~0)(>=PDM2`_m#Y7a?W%C=K}lfN+Alu|I=v3`G}xlT--Jtq9FzQ6~@yEv5KKD^!lhrAHp+DD&fN`xn|}oE(mLbofqrk~d&P7`Z3V46YBPx5 z@#9P~LQEAuX!fO1?&k4gvGzu_w#+<;LypLbw~Uc2t+Cm&!f{=1)ibI3iwC(ncL(*2H@PSgdpz7dq6?-jAYXz9VDoW}z(uME#4k~>tWG1IPZ zoG%+)3`z>JC8TQN?MgkU$D0+eaI;3)8P!+JU|D0v4gm=jV*`4zm_w#lL7g|46bE_2 z(CJBY{o{sxU8qw>L@@rq^f!-xUQui2`o}lY_ee_{>;29&zToOW>KA%dw0>ti&0ODi zMrYZ+T#&UQWNf{4_O~nU^%*-^#=}5=8Hw)~h!$Z-n~`$a>AImj9NhRQgd6BVLE_Hs z%SPIE+BDG7r0a!VD|ToG$rZO32$n2@b{^e5-+92+c!%IMIl~9HK>zyzSr1!6sZ)e7jFVsIB zQIkgng9#d1#oB-kmZSu6LO2*wsVs+Add_IwY5D=DW|%qrF2uK;55o~{8n!{d?`;1P qLN3%HkZNQa9ZEoK!5, 'IDE': , 'DES': , 'VAL': , 'statut': 'f'} +() +{'max': 1, 'typ': 'I', 'statut': 'o'} +() +{'max': '**', 'typ': 'TXM', 'statut': 'o'} +() +{'NOM': , 'NBR': , 'statut': 'f'} +() +{'NAME': , 'statut': 'f', 'max': '**', 'ATT': , 'NUM': , 'GRO': } +() +{'NAME': , 'ELEM': , 'statut': 'o'} +() +{'nom': 'FAS', 'FAMILY_MESH_NAME_REF': , 'op': None} +]0;A96028@dsp0780471: ~/QT5GitEficasTravail/eficas/monCodeA96028@dsp0780471:~/QT5GitEficasTravail/eficas/monCode$ exit + +Script terminé sur mar. 29 nov. 2016 15:37:13 CET diff --git a/OldCodes/Openturns_Study/OpenTURNS_Cata_Study_V8.py b/OldCodes/Openturns_Study/OpenTURNS_Cata_Study_V8.py index 9e43e543..948554c8 100644 --- a/OldCodes/Openturns_Study/OpenTURNS_Cata_Study_V8.py +++ b/OldCodes/Openturns_Study/OpenTURNS_Cata_Study_V8.py @@ -1,5 +1,5 @@ # -*- coding: iso-8859-1 -*- -# Copyright (C) 2007-2013 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/OldCodes/Openturns_Study/configuration_OPENTURNS_STUDY.py b/OldCodes/Openturns_Study/configuration_OPENTURNS_STUDY.py index 64d0b05e..9bc506fd 100644 --- a/OldCodes/Openturns_Study/configuration_OPENTURNS_STUDY.py +++ b/OldCodes/Openturns_Study/configuration_OPENTURNS_STUDY.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2013 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/OldCodes/Openturns_Study/opsOT.py b/OldCodes/Openturns_Study/opsOT.py index ed023cdb..dfeee514 100644 --- a/OldCodes/Openturns_Study/opsOT.py +++ b/OldCodes/Openturns_Study/opsOT.py @@ -1,5 +1,5 @@ # -*- coding: iso-8859-1 -*- -# Copyright (C) 2007-2013 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/OldCodes/Openturns_Study/prefs.py b/OldCodes/Openturns_Study/prefs.py index f83b0a29..1db9360c 100644 --- a/OldCodes/Openturns_Study/prefs.py +++ b/OldCodes/Openturns_Study/prefs.py @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2013 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/OldCodes/Openturns_Study/qtEficas_openturns_study.py b/OldCodes/Openturns_Study/qtEficas_openturns_study.py index abf2d5ab..a88c1232 100755 --- a/OldCodes/Openturns_Study/qtEficas_openturns_study.py +++ b/OldCodes/Openturns_Study/qtEficas_openturns_study.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (C) 2007-2013 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/OldCodes/Openturns_Wrapper/OpenTURNS_Cata_Wrapper_V4.py b/OldCodes/Openturns_Wrapper/OpenTURNS_Cata_Wrapper_V4.py index 651d5b82..ab094581 100644 --- a/OldCodes/Openturns_Wrapper/OpenTURNS_Cata_Wrapper_V4.py +++ b/OldCodes/Openturns_Wrapper/OpenTURNS_Cata_Wrapper_V4.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2013 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/OldCodes/Openturns_Wrapper/configuration_OPENTURNS_WRAPPER.py b/OldCodes/Openturns_Wrapper/configuration_OPENTURNS_WRAPPER.py index 64d0b05e..9bc506fd 100644 --- a/OldCodes/Openturns_Wrapper/configuration_OPENTURNS_WRAPPER.py +++ b/OldCodes/Openturns_Wrapper/configuration_OPENTURNS_WRAPPER.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2013 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/OldCodes/Openturns_Wrapper/prefs.py b/OldCodes/Openturns_Wrapper/prefs.py index 10b557d2..544236d0 100644 --- a/OldCodes/Openturns_Wrapper/prefs.py +++ b/OldCodes/Openturns_Wrapper/prefs.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2013 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/PSEN_Eficas/ExtractGeneratorLoadLineandTransfoDico.py b/OldCodes/PSEN_Eficas/ExtractGeneratorLoadLineandTransfoDico.py similarity index 100% rename from PSEN_Eficas/ExtractGeneratorLoadLineandTransfoDico.py rename to OldCodes/PSEN_Eficas/ExtractGeneratorLoadLineandTransfoDico.py diff --git a/PSEN_Eficas/ExtractGeneratorandLoadList.py b/OldCodes/PSEN_Eficas/ExtractGeneratorandLoadList.py similarity index 100% rename from PSEN_Eficas/ExtractGeneratorandLoadList.py rename to OldCodes/PSEN_Eficas/ExtractGeneratorandLoadList.py diff --git a/PSEN_Eficas/PSEN/PSEN_GUI.py b/OldCodes/PSEN_Eficas/PSEN/PSEN_GUI.py similarity index 100% rename from PSEN_Eficas/PSEN/PSEN_GUI.py rename to OldCodes/PSEN_Eficas/PSEN/PSEN_GUI.py diff --git a/PSEN_Eficas/PSEN/PSSEWrapper.py b/OldCodes/PSEN_Eficas/PSEN/PSSEWrapper.py similarity index 100% rename from PSEN_Eficas/PSEN/PSSEWrapper.py rename to OldCodes/PSEN_Eficas/PSEN/PSSEWrapper.py diff --git a/boundary_conditions/__init__.py b/OldCodes/PSEN_Eficas/PSEN/__init__.py old mode 100644 new mode 100755 similarity index 100% rename from boundary_conditions/__init__.py rename to OldCodes/PSEN_Eficas/PSEN/__init__.py diff --git a/PSEN_Eficas/PSEN/exploit2.ows b/OldCodes/PSEN_Eficas/PSEN/exploit2.ows similarity index 100% rename from PSEN_Eficas/PSEN/exploit2.ows rename to OldCodes/PSEN_Eficas/PSEN/exploit2.ows diff --git a/PSEN_Eficas/PSEN/support_functions.py b/OldCodes/PSEN_Eficas/PSEN/support_functions.py similarity index 100% rename from PSEN_Eficas/PSEN/support_functions.py rename to OldCodes/PSEN_Eficas/PSEN/support_functions.py diff --git a/PSEN_Eficas/PSEN_Cata.py b/OldCodes/PSEN_Eficas/PSEN_Cata.py similarity index 99% rename from PSEN_Eficas/PSEN_Cata.py rename to OldCodes/PSEN_Eficas/PSEN_Cata.py index d74d7e4a..19f1ffef 100644 --- a/PSEN_Eficas/PSEN_Cata.py +++ b/OldCodes/PSEN_Eficas/PSEN_Cata.py @@ -1,5 +1,5 @@ # -*- coding: iso-8859-1 -*- -# Copyright (C) 2007-2013 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/OldCodes/PSEN_Eficas/configuration_PSEN.py b/OldCodes/PSEN_Eficas/configuration_PSEN.py new file mode 100755 index 00000000..4ab64b85 --- /dev/null +++ b/OldCodes/PSEN_Eficas/configuration_PSEN.py @@ -0,0 +1,43 @@ +# -*- 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. +# +# 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. +# +# +# ====================================================================== +""" + Ce module sert pour charger les paramètres de configuration d'EFICAS +""" +# Modules Python +from InterfaceQT4 import configuration +import os + + +class CONFIG(configuration.CONFIG_BASE): + + #----------------------------------- + def __init__(self,appli,repIni): + #----------------------------------- + + self.labels_user=['catalogues','lang'] + self.labels_eficas=['lang','rep_cata','catalogues'] + + configuration.CONFIG_BASE.__init__(self,appli,'.Eficas_monCode') + + +def make_config(appli,rep): + return CONFIG(appli,rep) + diff --git a/PSEN_Eficas/mesScripts.py b/OldCodes/PSEN_Eficas/mesScripts.py similarity index 100% rename from PSEN_Eficas/mesScripts.py rename to OldCodes/PSEN_Eficas/mesScripts.py diff --git a/PSEN_Eficas/mesScripts_PSEN.py b/OldCodes/PSEN_Eficas/mesScripts_PSEN.py similarity index 100% rename from PSEN_Eficas/mesScripts_PSEN.py rename to OldCodes/PSEN_Eficas/mesScripts_PSEN.py diff --git a/PSEN_Eficas/opsPSEN.py b/OldCodes/PSEN_Eficas/opsPSEN.py similarity index 99% rename from PSEN_Eficas/opsPSEN.py rename to OldCodes/PSEN_Eficas/opsPSEN.py index 09c331f4..f1e19fe7 100755 --- a/PSEN_Eficas/opsPSEN.py +++ b/OldCodes/PSEN_Eficas/opsPSEN.py @@ -1,5 +1,5 @@ # -*- coding: iso-8859-1 -*- -# Copyright (C) 2007-2013 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/PSEN_Eficas/prefs.py b/OldCodes/PSEN_Eficas/prefs.py similarity index 96% rename from PSEN_Eficas/prefs.py rename to OldCodes/PSEN_Eficas/prefs.py index c19b171d..c9a624a9 100755 --- a/PSEN_Eficas/prefs.py +++ b/OldCodes/PSEN_Eficas/prefs.py @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2012 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/PSEN_Eficas/prefs_PSEN.py b/OldCodes/PSEN_Eficas/prefs_PSEN.py similarity index 100% rename from PSEN_Eficas/prefs_PSEN.py rename to OldCodes/PSEN_Eficas/prefs_PSEN.py diff --git a/ProcessOutputs_Eficas/properties.py b/OldCodes/PSEN_Eficas/properties.py old mode 100644 new mode 100755 similarity index 100% rename from ProcessOutputs_Eficas/properties.py rename to OldCodes/PSEN_Eficas/properties.py diff --git a/PSEN_Eficas/qtEficas_PSEN.py b/OldCodes/PSEN_Eficas/qtEficas_PSEN.py similarity index 96% rename from PSEN_Eficas/qtEficas_PSEN.py rename to OldCodes/PSEN_Eficas/qtEficas_PSEN.py index 94598c5f..2dc71ab3 100755 --- a/PSEN_Eficas/qtEficas_PSEN.py +++ b/OldCodes/PSEN_Eficas/qtEficas_PSEN.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (C) 2007-2012 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/OldCodes/PSEN_N1/PSEN_Cata_N1.py b/OldCodes/PSEN_N1/PSEN_Cata_N1.py index 6d926367..d25b464f 100644 --- a/OldCodes/PSEN_N1/PSEN_Cata_N1.py +++ b/OldCodes/PSEN_N1/PSEN_Cata_N1.py @@ -1,5 +1,5 @@ # -*- coding: iso-8859-1 -*- -# Copyright (C) 2007-2013 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/OldCodes/PSEN_N1/opsPSEN_N1.py b/OldCodes/PSEN_N1/opsPSEN_N1.py index 9ea600a6..9a36e235 100644 --- a/OldCodes/PSEN_N1/opsPSEN_N1.py +++ b/OldCodes/PSEN_N1/opsPSEN_N1.py @@ -1,5 +1,5 @@ # -*- coding: iso-8859-1 -*- -# Copyright (C) 2007-2013 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/OldCodes/PSEN_N1/prefs.py b/OldCodes/PSEN_N1/prefs.py index 647d0ae9..58beb3b1 100644 --- a/OldCodes/PSEN_N1/prefs.py +++ b/OldCodes/PSEN_N1/prefs.py @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2012 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/OldCodes/PSEN_N1/qtEficas_PSEN_N1.py b/OldCodes/PSEN_N1/qtEficas_PSEN_N1.py index 6863fe03..c3b3c899 100755 --- a/OldCodes/PSEN_N1/qtEficas_PSEN_N1.py +++ b/OldCodes/PSEN_N1/qtEficas_PSEN_N1.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (C) 2007-2012 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/ProcessOutputs_Eficas/EssaiMulti.py b/OldCodes/ProcessOutputs_Eficas/EssaiMulti.py similarity index 100% rename from ProcessOutputs_Eficas/EssaiMulti.py rename to OldCodes/ProcessOutputs_Eficas/EssaiMulti.py diff --git a/ProcessOutputs_Eficas/ExtractGeneratorLoadLineandTransfoDico.py b/OldCodes/ProcessOutputs_Eficas/ExtractGeneratorLoadLineandTransfoDico.py similarity index 100% rename from ProcessOutputs_Eficas/ExtractGeneratorLoadLineandTransfoDico.py rename to OldCodes/ProcessOutputs_Eficas/ExtractGeneratorLoadLineandTransfoDico.py diff --git a/ProcessOutputs_Eficas/ExtractGeneratorLoadLineandTransfoDicoProcess.py b/OldCodes/ProcessOutputs_Eficas/ExtractGeneratorLoadLineandTransfoDicoProcess.py similarity index 100% rename from ProcessOutputs_Eficas/ExtractGeneratorLoadLineandTransfoDicoProcess.py rename to OldCodes/ProcessOutputs_Eficas/ExtractGeneratorLoadLineandTransfoDicoProcess.py diff --git a/ProcessOutputs_Eficas/PSEN_Cata_N1.py b/OldCodes/ProcessOutputs_Eficas/PSEN_Cata_N1.py similarity index 99% rename from ProcessOutputs_Eficas/PSEN_Cata_N1.py rename to OldCodes/ProcessOutputs_Eficas/PSEN_Cata_N1.py index 92d795f4..b05aea0e 100644 --- a/ProcessOutputs_Eficas/PSEN_Cata_N1.py +++ b/OldCodes/ProcessOutputs_Eficas/PSEN_Cata_N1.py @@ -1,5 +1,5 @@ # -*- coding: iso-8859-1 -*- -# Copyright (C) 2007-2013 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/ProcessOutputs_Eficas/PSEN_Cata_N1.py.ok b/OldCodes/ProcessOutputs_Eficas/PSEN_Cata_N1.py.ok similarity index 100% rename from ProcessOutputs_Eficas/PSEN_Cata_N1.py.ok rename to OldCodes/ProcessOutputs_Eficas/PSEN_Cata_N1.py.ok diff --git a/ProcessOutputs_Eficas/ProcessOutputs_Cata.py b/OldCodes/ProcessOutputs_Eficas/ProcessOutputs_Cata.py similarity index 99% rename from ProcessOutputs_Eficas/ProcessOutputs_Cata.py rename to OldCodes/ProcessOutputs_Eficas/ProcessOutputs_Cata.py index 70144662..253232f6 100644 --- a/ProcessOutputs_Eficas/ProcessOutputs_Cata.py +++ b/OldCodes/ProcessOutputs_Eficas/ProcessOutputs_Cata.py @@ -1,5 +1,5 @@ # -*- coding: iso-8859-1 -*- -# Copyright (C) 2007-2013 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/ProcessOutputs_Eficas/configuration_PSEN_N1.py b/OldCodes/ProcessOutputs_Eficas/configuration_PSEN_N1.py similarity index 100% rename from ProcessOutputs_Eficas/configuration_PSEN_N1.py rename to OldCodes/ProcessOutputs_Eficas/configuration_PSEN_N1.py diff --git a/ProcessOutputs_Eficas/mesScripts_PSEN_N1.py b/OldCodes/ProcessOutputs_Eficas/mesScripts_PSEN_N1.py similarity index 100% rename from ProcessOutputs_Eficas/mesScripts_PSEN_N1.py rename to OldCodes/ProcessOutputs_Eficas/mesScripts_PSEN_N1.py diff --git a/ProcessOutputs_Eficas/opsPSEN_N1.py b/OldCodes/ProcessOutputs_Eficas/opsPSEN_N1.py similarity index 99% rename from ProcessOutputs_Eficas/opsPSEN_N1.py rename to OldCodes/ProcessOutputs_Eficas/opsPSEN_N1.py index 9554556b..dd0ec57d 100644 --- a/ProcessOutputs_Eficas/opsPSEN_N1.py +++ b/OldCodes/ProcessOutputs_Eficas/opsPSEN_N1.py @@ -1,6 +1,6 @@ # -*- coding: iso-8859-1 -*- -# Copyright (C) 2007-2013 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/ProcessOutputs_Eficas/prefs.py b/OldCodes/ProcessOutputs_Eficas/prefs.py similarity index 96% rename from ProcessOutputs_Eficas/prefs.py rename to OldCodes/ProcessOutputs_Eficas/prefs.py index 647d0ae9..58beb3b1 100644 --- a/ProcessOutputs_Eficas/prefs.py +++ b/OldCodes/ProcessOutputs_Eficas/prefs.py @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2012 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/ProcessOutputs_Eficas/prefs_PSEN_N1.py b/OldCodes/ProcessOutputs_Eficas/prefs_PSEN_N1.py similarity index 100% rename from ProcessOutputs_Eficas/prefs_PSEN_N1.py rename to OldCodes/ProcessOutputs_Eficas/prefs_PSEN_N1.py diff --git a/SPECA/properties.py b/OldCodes/ProcessOutputs_Eficas/properties.py similarity index 100% rename from SPECA/properties.py rename to OldCodes/ProcessOutputs_Eficas/properties.py diff --git a/ProcessOutputs_Eficas/qtEficas_PSEN_N1.py b/OldCodes/ProcessOutputs_Eficas/qtEficas_PSEN_N1.py similarity index 97% rename from ProcessOutputs_Eficas/qtEficas_PSEN_N1.py rename to OldCodes/ProcessOutputs_Eficas/qtEficas_PSEN_N1.py index 948867b5..fea22342 100755 --- a/ProcessOutputs_Eficas/qtEficas_PSEN_N1.py +++ b/OldCodes/ProcessOutputs_Eficas/qtEficas_PSEN_N1.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (C) 2007-2012 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/SPECA/SPECA_Cata_V1.py b/OldCodes/SPECA/SPECA_Cata_V1.py similarity index 100% rename from SPECA/SPECA_Cata_V1.py rename to OldCodes/SPECA/SPECA_Cata_V1.py diff --git a/SPECA/SPECA_Cata_V2016.py b/OldCodes/SPECA/SPECA_Cata_V2016.py similarity index 100% rename from SPECA/SPECA_Cata_V2016.py rename to OldCodes/SPECA/SPECA_Cata_V2016.py diff --git a/SPECA/SPECA_Cata_V2_00.py b/OldCodes/SPECA/SPECA_Cata_V2_00.py similarity index 100% rename from SPECA/SPECA_Cata_V2_00.py rename to OldCodes/SPECA/SPECA_Cata_V2_00.py diff --git a/SPECA/configuration_SPECA.py b/OldCodes/SPECA/configuration_SPECA.py similarity index 100% rename from SPECA/configuration_SPECA.py rename to OldCodes/SPECA/configuration_SPECA.py diff --git a/SPECA/prefs.py b/OldCodes/SPECA/prefs.py similarity index 100% rename from SPECA/prefs.py rename to OldCodes/SPECA/prefs.py diff --git a/SPECA/prefs_SPECA.py b/OldCodes/SPECA/prefs_SPECA.py similarity index 100% rename from SPECA/prefs_SPECA.py rename to OldCodes/SPECA/prefs_SPECA.py diff --git a/monCode/properties.py b/OldCodes/SPECA/properties.py similarity index 100% rename from monCode/properties.py rename to OldCodes/SPECA/properties.py diff --git a/SPECA/qtEficasSPECA.py b/OldCodes/SPECA/qtEficasSPECA.py similarity index 96% rename from SPECA/qtEficasSPECA.py rename to OldCodes/SPECA/qtEficasSPECA.py index e02b8c74..aa4bb0ec 100755 --- a/SPECA/qtEficasSPECA.py +++ b/OldCodes/SPECA/qtEficasSPECA.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (C) 2007-2013 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/OldCodes/Sep/SEP_Cata_V1_4.py b/OldCodes/Sep/SEP_Cata_V1_4.py index 462b8c6d..13b4bac6 100644 --- a/OldCodes/Sep/SEP_Cata_V1_4.py +++ b/OldCodes/Sep/SEP_Cata_V1_4.py @@ -1,5 +1,5 @@ ## -*- coding: utf-8 -*- -# Copyright (C) 2007-2012 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/OldCodes/Sep/__init__.py b/OldCodes/Sep/__init__.py index 8ed65e16..5b4f0e3b 100644 --- a/OldCodes/Sep/__init__.py +++ b/OldCodes/Sep/__init__.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2012 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/OldCodes/Sep/configuration_SEP.py b/OldCodes/Sep/configuration_SEP.py index 4c7fcae7..f9901549 100644 --- a/OldCodes/Sep/configuration_SEP.py +++ b/OldCodes/Sep/configuration_SEP.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2012 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/OldCodes/Sep/prefs.py b/OldCodes/Sep/prefs.py index f91e53af..f16320e0 100644 --- a/OldCodes/Sep/prefs.py +++ b/OldCodes/Sep/prefs.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2012 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/OldCodes/Sep/prefs_SEP.py b/OldCodes/Sep/prefs_SEP.py index 66a112fb..742a89d1 100644 --- a/OldCodes/Sep/prefs_SEP.py +++ b/OldCodes/Sep/prefs_SEP.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2012 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/OldCodes/Sep/qtEficas_SEP.py b/OldCodes/Sep/qtEficas_SEP.py index 741a2e49..fb82fabb 100755 --- a/OldCodes/Sep/qtEficas_SEP.py +++ b/OldCodes/Sep/qtEficas_SEP.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -# Copyright (C) 2007-2012 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/OldCodes/ZCracks/prefs.py b/OldCodes/ZCracks/prefs.py index d7a65711..5252a94c 100644 --- a/OldCodes/ZCracks/prefs.py +++ b/OldCodes/ZCracks/prefs.py @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2012 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/OldCodes/ZCracks/qtEficas_ZCracks.py b/OldCodes/ZCracks/qtEficas_ZCracks.py index b1254f2c..7f9a6e2c 100755 --- a/OldCodes/ZCracks/qtEficas_ZCracks.py +++ b/OldCodes/ZCracks/qtEficas_ZCracks.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (C) 2007-2012 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/boundary_conditions/CMakeLists.txt b/OldCodes/boundary_conditions/CMakeLists.txt similarity index 100% rename from boundary_conditions/CMakeLists.txt rename to OldCodes/boundary_conditions/CMakeLists.txt diff --git a/mascaret/__init__.py b/OldCodes/boundary_conditions/__init__.py similarity index 100% rename from mascaret/__init__.py rename to OldCodes/boundary_conditions/__init__.py diff --git a/boundary_conditions/appli.py b/OldCodes/boundary_conditions/appli.py similarity index 100% rename from boundary_conditions/appli.py rename to OldCodes/boundary_conditions/appli.py diff --git a/boundary_conditions/boundary_conditions_cata.py b/OldCodes/boundary_conditions/boundary_conditions_cata.py similarity index 100% rename from boundary_conditions/boundary_conditions_cata.py rename to OldCodes/boundary_conditions/boundary_conditions_cata.py diff --git a/boundary_conditions/configuration_boundary_conditions.py b/OldCodes/boundary_conditions/configuration_boundary_conditions.py similarity index 100% rename from boundary_conditions/configuration_boundary_conditions.py rename to OldCodes/boundary_conditions/configuration_boundary_conditions.py diff --git a/boundary_conditions/generator_boundary_conditions.py b/OldCodes/boundary_conditions/generator_boundary_conditions.py similarity index 100% rename from boundary_conditions/generator_boundary_conditions.py rename to OldCodes/boundary_conditions/generator_boundary_conditions.py diff --git a/boundary_conditions/prefs.py b/OldCodes/boundary_conditions/prefs.py similarity index 100% rename from boundary_conditions/prefs.py rename to OldCodes/boundary_conditions/prefs.py diff --git a/boundary_conditions/prefs_boundary_conditions.py b/OldCodes/boundary_conditions/prefs_boundary_conditions.py similarity index 100% rename from boundary_conditions/prefs_boundary_conditions.py rename to OldCodes/boundary_conditions/prefs_boundary_conditions.py diff --git a/OldCodes/ts/prefs.py b/OldCodes/ts/prefs.py index 87710926..33c6a627 100644 --- a/OldCodes/ts/prefs.py +++ b/OldCodes/ts/prefs.py @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2012 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Telemac/__init__.py b/Telemac/__init__.py index df53d551..5b4f0e3b 100644 --- a/Telemac/__init__.py +++ b/Telemac/__init__.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2013 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Telemac/aideAuxConvertisseurs.py b/Telemac/aideAuxConvertisseurs.py index a00a8f27..1959e19f 100644 --- a/Telemac/aideAuxConvertisseurs.py +++ b/Telemac/aideAuxConvertisseurs.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2013 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/mascaret/CMakeLists.txt b/Telemac/mascaret/CMakeLists.txt similarity index 100% rename from mascaret/CMakeLists.txt rename to Telemac/mascaret/CMakeLists.txt diff --git a/Telemac/mascaret/__init__.py b/Telemac/mascaret/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/mascaret/appli.py b/Telemac/mascaret/appli.py similarity index 98% rename from mascaret/appli.py rename to Telemac/mascaret/appli.py index 1fd13263..754a7192 100644 --- a/mascaret/appli.py +++ b/Telemac/mascaret/appli.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# Copyright (C) 2012-2013 EDF +# Copyright (C) 2012-2021 EDF # # This file is part of SALOME HYDRO module. # diff --git a/mascaret/configuration_mascaret.py b/Telemac/mascaret/configuration_mascaret.py similarity index 97% rename from mascaret/configuration_mascaret.py rename to Telemac/mascaret/configuration_mascaret.py index 7695ed41..08fd6d9a 100644 --- a/mascaret/configuration_mascaret.py +++ b/Telemac/mascaret/configuration_mascaret.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# Copyright (C) 2012-2013 EDF +# Copyright (C) 2012-2021 EDF # # This file is part of SALOME HYDRO module. # diff --git a/mascaret/mascaret_V7_cata.py b/Telemac/mascaret/mascaret_V7_cata.py similarity index 100% rename from mascaret/mascaret_V7_cata.py rename to Telemac/mascaret/mascaret_V7_cata.py diff --git a/mascaret/prefs.py b/Telemac/mascaret/prefs.py similarity index 100% rename from mascaret/prefs.py rename to Telemac/mascaret/prefs.py diff --git a/mascaret/prefs_mascaret.py b/Telemac/mascaret/prefs_mascaret.py similarity index 96% rename from mascaret/prefs_mascaret.py rename to Telemac/mascaret/prefs_mascaret.py index ed30a092..2586f5f8 100644 --- a/mascaret/prefs_mascaret.py +++ b/Telemac/mascaret/prefs_mascaret.py @@ -1,4 +1,4 @@ -# Copyright (C) 2012-2013 EDF +# Copyright (C) 2012-2021 EDF # # This file is part of SALOME HYDRO module. # diff --git a/Telemac/prefs.py b/Telemac/prefs.py index f1db1e19..ca9d5417 100644 --- a/Telemac/prefs.py +++ b/Telemac/prefs.py @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2012 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Telemac/qtEficas_Telemac.py b/Telemac/qtEficas_Telemac.py index c140518c..ddae9fc4 100755 --- a/Telemac/qtEficas_Telemac.py +++ b/Telemac/qtEficas_Telemac.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (C) 2007-2012 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Tests/EficasEngineTest.py b/Tests/EficasEngineTest.py index 1718c601..bdd7cc45 100644 --- a/Tests/EficasEngineTest.py +++ b/Tests/EficasEngineTest.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (C) 2007-2012 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Tests/HTMLTestRunner.py b/Tests/HTMLTestRunner.py deleted file mode 100644 index 0439bf48..00000000 --- a/Tests/HTMLTestRunner.py +++ /dev/null @@ -1,824 +0,0 @@ -""" -A TestRunner for use with the Python unit testing framework. It -generates a HTML report to show the result at a glance. - -The simplest way to use this is to invoke its main method. E.g. - - import unittest - import HTMLTestRunner - - ... define your tests ... - - if __name__ == '__main__': - HTMLTestRunner.main() - - -For more customization options, instantiates a HTMLTestRunner object. -HTMLTestRunner is a counterpart to unittest's TextTestRunner. E.g. - - # output to a file - fp = file('my_report.html', 'wb') - runner = HTMLTestRunner.HTMLTestRunner( - stream=fp, - title='My unit test', - description='This demonstrates the report output by HTMLTestRunner.' - ) - - # Use an external stylesheet. - # See the Template_mixin class for more customizable options - runner.STYLESHEET_TMPL = '' - - # run the test - runner.run(my_test_suite) - - ------------------------------------------------------------------------- -Copyright (c) 2004-2007, Wai Yip Tung -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - -* Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. -* Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. -* Neither the name Wai Yip Tung nor the names of its contributors may be - used to endorse or promote products derived from this software without - specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS -IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED -TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A -PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER -OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -""" - -# URL: http://tungwaiyip.info/software/HTMLTestRunner.html - -__author__ = "Wai Yip Tung" -__version__ = "0.8.2" - - -""" -Change History - -Version 0.8.2 -* Show output inline instead of popup window (Viorel Lupu). - -Version in 0.8.1 -* Validated XHTML (Wolfgang Borgert). -* Added description of test classes and test cases. - -Version in 0.8.0 -* Define Template_mixin class for customization. -* Workaround a IE 6 bug that it does not treat - -%(heading)s -%(report)s -%(ending)s - - - -""" - # variables: (title, generator, stylesheet, heading, report, ending) - - - # ------------------------------------------------------------------------ - # Stylesheet - # - # alternatively use a for external style sheet, e.g. - # - - STYLESHEET_TMPL = """ - -""" - - - - # ------------------------------------------------------------------------ - # Heading - # - - HEADING_TMPL = """
-

%(title)s

-%(parameters)s -

%(description)s

-
- -""" # variables: (title, parameters, description) - - HEADING_ATTRIBUTE_TMPL = """

%(name)s: %(value)s

-""" # variables: (name, value) - - - - # ------------------------------------------------------------------------ - # Report - # - - REPORT_TMPL = """ -

Show -Summary -Failed -All -

- -------- - - - - - - - - -%(test_list)s - - - - - - - - -
Test Group/Test caseCountPassFailErrorView
Total%(count)s%(Pass)s%(fail)s%(error)s 
-""" # variables: (test_list, count, Pass, fail, error) - - REPORT_CLASS_TMPL = r""" - - %(desc)s - %(count)s - %(Pass)s - %(fail)s - %(error)s - Detail - -""" # variables: (style, desc, count, Pass, fail, error, cid) - - - REPORT_TEST_WITH_OUTPUT_TMPL = r""" - -
%(desc)s
- - - - - %(status)s - - - - - - -""" # variables: (tid, Class, style, desc, status) - - - REPORT_TEST_NO_OUTPUT_TMPL = r""" - -
%(desc)s
- %(status)s - -""" # variables: (tid, Class, style, desc, status) - - - REPORT_TEST_OUTPUT_TMPL = r""" -%(id)s: %(output)s -""" # variables: (id, output) - - - - # ------------------------------------------------------------------------ - # ENDING - # - - ENDING_TMPL = """
 
""" - -# -------------------- The end of the Template class ------------------- - - -TestResult = unittest.TestResult - -class _TestResult(TestResult): - # note: _TestResult is a pure representation of results. - # It lacks the output and reporting ability compares to unittest._TextTestResult. - - def __init__(self, verbosity=1): - TestResult.__init__(self) - self.stdout0 = None - self.stderr0 = None - self.success_count = 0 - self.failure_count = 0 - self.error_count = 0 - self.verbosity = verbosity - - # result is a list of result in 4 tuple - # ( - # result code (0: success; 1: fail; 2: error), - # TestCase object, - # Test output (byte string), - # stack trace, - # ) - self.result = [] - - - def startTest(self, test): - TestResult.startTest(self, test) - # just one buffer for both stdout and stderr - self.outputBuffer = StringIO.StringIO() - stdout_redirector.fp = self.outputBuffer - stderr_redirector.fp = self.outputBuffer - self.stdout0 = sys.stdout - self.stderr0 = sys.stderr - sys.stdout = stdout_redirector - sys.stderr = stderr_redirector - - - def complete_output(self): - """ - Disconnect output redirection and return buffer. - Safe to call multiple times. - """ - if self.stdout0: - sys.stdout = self.stdout0 - sys.stderr = self.stderr0 - self.stdout0 = None - self.stderr0 = None - return self.outputBuffer.getvalue() - - - def stopTest(self, test): - # Usually one of addSuccess, addError or addFailure would have been called. - # But there are some path in unittest that would bypass this. - # We must disconnect stdout in stopTest(), which is guaranteed to be called. - self.complete_output() - - - def addSuccess(self, test): - self.success_count += 1 - TestResult.addSuccess(self, test) - output = self.complete_output() - self.result.append((0, test, output, '')) - if self.verbosity > 1: - sys.stderr.write('ok ') - sys.stderr.write(str(test)) - sys.stderr.write('\n') - else: - sys.stderr.write('.') - - def addError(self, test, err): - self.error_count += 1 - TestResult.addError(self, test, err) - _, _exc_str = self.errors[-1] - output = self.complete_output() - self.result.append((2, test, output, _exc_str)) - if self.verbosity > 1: - sys.stderr.write('E ') - sys.stderr.write(str(test)) - sys.stderr.write('\n') - else: - sys.stderr.write('E') - - def addFailure(self, test, err): - self.failure_count += 1 - TestResult.addFailure(self, test, err) - _, _exc_str = self.failures[-1] - output = self.complete_output() - self.result.append((1, test, output, _exc_str)) - if self.verbosity > 1: - sys.stderr.write('F ') - sys.stderr.write(str(test)) - sys.stderr.write('\n') - else: - sys.stderr.write('F') - - -class HTMLTestRunner(Template_mixin): - """ - """ - def __init__(self, stream=sys.stdout, verbosity=1, title=None, description=None): - self.stream = stream - self.verbosity = verbosity - if title is None: - self.title = self.DEFAULT_TITLE - else: - self.title = title - if description is None: - self.description = self.DEFAULT_DESCRIPTION - else: - self.description = description - - self.startTime = datetime.datetime.now() - - - def run(self, test): - "Run the given test case or test suite." - result = _TestResult(self.verbosity) - test(result) - self.stopTime = datetime.datetime.now() - self.generateReport(test, result) - print >>sys.stderr, '\nTime Elapsed: %s' % (self.stopTime-self.startTime) - return result - - - def sortResult(self, result_list): - # unittest does not seems to run in any particular order. - # Here at least we want to group them together by class. - rmap = {} - classes = [] - for n,t,o,e in result_list: - cls = t.__class__ - if not rmap.has_key(cls): - rmap[cls] = [] - classes.append(cls) - rmap[cls].append((n,t,o,e)) - r = [(cls, rmap[cls]) for cls in classes] - return r - - - def getReportAttributes(self, result): - """ - Return report attributes as a list of (name, value). - Override this to add custom attributes. - """ - startTime = str(self.startTime)[:19] - duration = str(self.stopTime - self.startTime) - status = [] - if result.success_count: status.append('Pass %s' % result.success_count) - if result.failure_count: status.append('Failure %s' % result.failure_count) - if result.error_count: status.append('Error %s' % result.error_count ) - if status: - status = ' '.join(status) - else: - status = 'none' - return [ - ('Start Time', startTime), - ('Duration', duration), - ('Status', status), - ] - - - def generateReport(self, test, result): - report_attrs = self.getReportAttributes(result) - generator = 'HTMLTestRunner %s' % __version__ - stylesheet = self._generate_stylesheet() - heading = self._generate_heading(report_attrs) - report = self._generate_report(result) - ending = self._generate_ending() - output = self.HTML_TMPL % dict( - title = saxutils.escape(self.title), - generator = generator, - stylesheet = stylesheet, - heading = heading, - report = report, - ending = ending, - ) - self.stream.write(output.encode('utf8')) - - - def _generate_stylesheet(self): - return self.STYLESHEET_TMPL - - - def _generate_heading(self, report_attrs): - a_lines = [] - for name, value in report_attrs: - line = self.HEADING_ATTRIBUTE_TMPL % dict( - name = saxutils.escape(name), - value = saxutils.escape(value), - ) - a_lines.append(line) - heading = self.HEADING_TMPL % dict( - title = saxutils.escape(self.title), - parameters = ''.join(a_lines), - description = saxutils.escape(self.description), - ) - return heading - - - def _generate_report(self, result): - rows = [] - sortedResult = self.sortResult(result.result) - for cid, (cls, cls_results) in enumerate(sortedResult): - # subtotal for a class - np = nf = ne = 0 - for n,t,o,e in cls_results: - if n == 0: np += 1 - elif n == 1: nf += 1 - else: ne += 1 - - # format class description - if cls.__module__ == "__main__": - name = cls.__name__ - else: - name = "%s.%s" % (cls.__module__, cls.__name__) - doc = cls.__doc__ and cls.__doc__.split("\n")[0] or "" - desc = doc and '%s: %s' % (name, doc) or name - - row = self.REPORT_CLASS_TMPL % dict( - style = ne > 0 and 'errorClass' or nf > 0 and 'failClass' or 'passClass', - desc = desc, - count = np+nf+ne, - Pass = np, - fail = nf, - error = ne, - cid = 'c%s' % (cid+1), - ) - rows.append(row) - - for tid, (n,t,o,e) in enumerate(cls_results): - self._generate_report_test(rows, cid, tid, n, t, o, e) - - report = self.REPORT_TMPL % dict( - test_list = ''.join(rows), - count = str(result.success_count+result.failure_count+result.error_count), - Pass = str(result.success_count), - fail = str(result.failure_count), - error = str(result.error_count), - ) - return report - - - def _generate_report_test(self, rows, cid, tid, n, t, o, e): - # e.g. 'pt1.1', 'ft1.1', etc - has_output = bool(o or e) - tid = (n == 0 and 'p' or 'f') + 't%s.%s' % (cid+1,tid+1) - name = t.id().split('.')[-1] - doc = t.shortDescription() or "" - desc = doc and ('%s: %s' % (name, doc)) or name - tmpl = has_output and self.REPORT_TEST_WITH_OUTPUT_TMPL or self.REPORT_TEST_NO_OUTPUT_TMPL - - # o and e should be byte string because they are collected from stdout and stderr? - if isinstance(o,str): - # TODO: some problem with 'string_escape': it escape \n and mess up formating - # uo = unicode(o.encode('string_escape')) - uo = o.decode('latin-1') - else: - uo = o - if isinstance(e,str): - # TODO: some problem with 'string_escape': it escape \n and mess up formating - # ue = unicode(e.encode('string_escape')) - ue = e.decode('latin-1') - else: - ue = e - - script = self.REPORT_TEST_OUTPUT_TMPL % dict( - id = tid, - output = saxutils.escape(uo+ue), - ) - - row = tmpl % dict( - tid = tid, - Class = (n == 0 and 'hiddenRow' or 'none'), - style = n == 2 and 'errorCase' or (n == 1 and 'failCase' or 'none'), - desc = desc, - script = script, - status = self.STATUS[n], - ) - rows.append(row) - if not has_output: - return - - def _generate_ending(self): - return self.ENDING_TMPL - - -############################################################################## -# Facilities for running tests from the command line -############################################################################## - -# Note: Reuse unittest.TestProgram to launch test. In the future we may -# build our own launcher to support more specific command line -# parameters like test title, CSS, etc. -class TestProgram(unittest.TestProgram): - """ - A variation of the unittest.TestProgram. Please refer to the base - class for command line parameters. - """ - def runTests(self): - # Pick HTMLTestRunner as the default test runner. - # base class's testRunner parameter is not useful because it means - # we have to instantiate HTMLTestRunner before we know self.verbosity. - if self.testRunner is None: - self.testRunner = HTMLTestRunner(verbosity=self.verbosity) - unittest.TestProgram.runTests(self) - -main = TestProgram - -############################################################################## -# Executing this module from the command line -############################################################################## - -if __name__ == "__main__": - main(module=None) diff --git a/Traducteur/__init__.py b/Traducteur/__init__.py index e4044aec..5b4f0e3b 100644 --- a/Traducteur/__init__.py +++ b/Traducteur/__init__.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Traducteur/calcG.py b/Traducteur/calcG.py index 0fb34d91..b31fad10 100644 --- a/Traducteur/calcG.py +++ b/Traducteur/calcG.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Traducteur/changeValeur.py b/Traducteur/changeValeur.py index f9130016..22d1bf91 100644 --- a/Traducteur/changeValeur.py +++ b/Traducteur/changeValeur.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Traducteur/dictErreurs.py b/Traducteur/dictErreurs.py index 1f057c3e..e15e4e5e 100644 --- a/Traducteur/dictErreurs.py +++ b/Traducteur/dictErreurs.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Traducteur/inseremocle.py b/Traducteur/inseremocle.py index 98448b99..1745d487 100644 --- a/Traducteur/inseremocle.py +++ b/Traducteur/inseremocle.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Traducteur/load.py b/Traducteur/load.py index 2375e805..850c2c0c 100644 --- a/Traducteur/load.py +++ b/Traducteur/load.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Traducteur/log.py b/Traducteur/log.py index 15b0f9c1..cd1b62e0 100644 --- a/Traducteur/log.py +++ b/Traducteur/log.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Traducteur/mocles.py b/Traducteur/mocles.py index 08b2c765..17387062 100644 --- a/Traducteur/mocles.py +++ b/Traducteur/mocles.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Traducteur/movemocle.py b/Traducteur/movemocle.py index d75ae999..9c67ff9b 100644 --- a/Traducteur/movemocle.py +++ b/Traducteur/movemocle.py @@ -1,5 +1,5 @@ # -*- coding: iso-8859-1 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Traducteur/parseur.py b/Traducteur/parseur.py index e715f2a9..7c8e8830 100644 --- a/Traducteur/parseur.py +++ b/Traducteur/parseur.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Traducteur/regles.py b/Traducteur/regles.py index dd11ff29..829649b5 100644 --- a/Traducteur/regles.py +++ b/Traducteur/regles.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Traducteur/removemocle.py b/Traducteur/removemocle.py index f9da5345..98152fbc 100644 --- a/Traducteur/removemocle.py +++ b/Traducteur/removemocle.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Traducteur/renamemocle.py b/Traducteur/renamemocle.py index 188a24a6..1ef63624 100644 --- a/Traducteur/renamemocle.py +++ b/Traducteur/renamemocle.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Traducteur/traduitV10V11.py b/Traducteur/traduitV10V11.py index aeb62ea8..2ceec81b 100755 --- a/Traducteur/traduitV10V11.py +++ b/Traducteur/traduitV10V11.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Traducteur/traduitV11V12.py b/Traducteur/traduitV11V12.py index 37212deb..47df1bfe 100755 --- a/Traducteur/traduitV11V12.py +++ b/Traducteur/traduitV11V12.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Traducteur/traduitV7V8.py b/Traducteur/traduitV7V8.py index 5f3b6888..f8303044 100644 --- a/Traducteur/traduitV7V8.py +++ b/Traducteur/traduitV7V8.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Traducteur/traduitV8V9.py b/Traducteur/traduitV8V9.py index 224e781b..96b4fd0a 100644 --- a/Traducteur/traduitV8V9.py +++ b/Traducteur/traduitV8V9.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Traducteur/traduitV9V10.py b/Traducteur/traduitV9V10.py index 45570a61..8dadf504 100755 --- a/Traducteur/traduitV9V10.py +++ b/Traducteur/traduitV9V10.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Traducteur/utils.py b/Traducteur/utils.py index 9ab9601c..a8cea6c3 100644 --- a/Traducteur/utils.py +++ b/Traducteur/utils.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Traducteur/visiteur.py b/Traducteur/visiteur.py index b58fcba9..d3f9c5a3 100644 --- a/Traducteur/visiteur.py +++ b/Traducteur/visiteur.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/Validation/__init__.py b/Validation/__init__.py index 7b9eef3b..5e849d28 100644 --- a/Validation/__init__.py +++ b/Validation/__init__.py @@ -1,5 +1,5 @@ # -*- coding: iso-8859-1 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/VirtualPolymer/prefs.py b/VirtualPolymer/prefs.py index 6554d133..0b82747e 100644 --- a/VirtualPolymer/prefs.py +++ b/VirtualPolymer/prefs.py @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2012 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/VirtualPolymer/qtEficasVP.py b/VirtualPolymer/qtEficasVP.py index 00ced3c4..604bebab 100755 --- a/VirtualPolymer/qtEficasVP.py +++ b/VirtualPolymer/qtEficasVP.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (C) 2007-2013 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/convert/__init__.py b/convert/__init__.py index 04ceb33d..77806067 100644 --- a/convert/__init__.py +++ b/convert/__init__.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/convert/autre_parseur.py b/convert/autre_parseur.py index aaa4377c..983c868f 100644 --- a/convert/autre_parseur.py +++ b/convert/autre_parseur.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/convert/convert_TELEMAC.py b/convert/convert_TELEMAC.py index b77b3639..9862ff09 100644 --- a/convert/convert_TELEMAC.py +++ b/convert/convert_TELEMAC.py @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/convert/convert_XML.py b/convert/convert_XML.py index 6fed1817..68e226ba 100644 --- a/convert/convert_XML.py +++ b/convert/convert_XML.py @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/convert/convert_dico.py b/convert/convert_dico.py index 0e8e7675..3cda9313 100644 --- a/convert/convert_dico.py +++ b/convert/convert_dico.py @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/convert/convert_map.py b/convert/convert_map.py index c4bad148..61dd60f0 100644 --- a/convert/convert_map.py +++ b/convert/convert_map.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/convert/convert_pyth.py b/convert/convert_pyth.py index 9a73c09c..86b09147 100644 --- a/convert/convert_pyth.py +++ b/convert/convert_pyth.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/convert/convert_python.py b/convert/convert_python.py index 510721e9..49344ca7 100644 --- a/convert/convert_python.py +++ b/convert/convert_python.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/convert/old/convert_openturns_study.py b/convert/old/convert_openturns_study.py index e0a17f96..59207522 100644 --- a/convert/old/convert_openturns_study.py +++ b/convert/old/convert_openturns_study.py @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/convert/old/convert_openturns_wrapper.py b/convert/old/convert_openturns_wrapper.py index ce2cc3d8..d6a0b1d3 100644 --- a/convert/old/convert_openturns_wrapper.py +++ b/convert/old/convert_openturns_wrapper.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/convert/parseur_python.py b/convert/parseur_python.py index c577c58e..699f3706 100644 --- a/convert/parseur_python.py +++ b/convert/parseur_python.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/generator/Formatage.py b/generator/Formatage.py index eb57e461..4b0b4d77 100644 --- a/generator/Formatage.py +++ b/generator/Formatage.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/generator/__init__.py b/generator/__init__.py index 9d4cb7f0..2de31104 100644 --- a/generator/__init__.py +++ b/generator/__init__.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/generator/generator_GroupMA.py b/generator/generator_GroupMA.py index f10704fe..2a2db80c 100644 --- a/generator/generator_GroupMA.py +++ b/generator/generator_GroupMA.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/generator/generator_PSEN.py b/generator/generator_PSEN.py index 93ee4bc5..0b940daa 100755 --- a/generator/generator_PSEN.py +++ b/generator/generator_PSEN.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/generator/generator_ProcessOutputs.py b/generator/generator_ProcessOutputs.py index efce52f0..fe84bce4 100755 --- a/generator/generator_ProcessOutputs.py +++ b/generator/generator_ProcessOutputs.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/generator/generator_TELEMAC.py b/generator/generator_TELEMAC.py index 6935d537..0250fe21 100644 --- a/generator/generator_TELEMAC.py +++ b/generator/generator_TELEMAC.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2013 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/generator/generator_XML.py b/generator/generator_XML.py index b8e0f3c7..78119fec 100644 --- a/generator/generator_XML.py +++ b/generator/generator_XML.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/generator/generator_aplat.py b/generator/generator_aplat.py index 6eaff182..857f5388 100644 --- a/generator/generator_aplat.py +++ b/generator/generator_aplat.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/generator/generator_dico.py b/generator/generator_dico.py index 91c69c23..5de01796 100644 --- a/generator/generator_dico.py +++ b/generator/generator_dico.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/generator/generator_dicoImbrique.py b/generator/generator_dicoImbrique.py index d5d845cf..3346a164 100644 --- a/generator/generator_dicoImbrique.py +++ b/generator/generator_dicoImbrique.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/generator/generator_map.py b/generator/generator_map.py index 97e7edd0..d66d49d7 100644 --- a/generator/generator_map.py +++ b/generator/generator_map.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/generator/generator_mapVP.py b/generator/generator_mapVP.py index a6c766a5..84098a55 100644 --- a/generator/generator_mapVP.py +++ b/generator/generator_mapVP.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2019 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/generator/generator_modification.py b/generator/generator_modification.py index d309d52a..dbdf22e7 100644 --- a/generator/generator_modification.py +++ b/generator/generator_modification.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/generator/generator_python.py b/generator/generator_python.py index ad8359a3..a07f128f 100644 --- a/generator/generator_python.py +++ b/generator/generator_python.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/generator/generator_vers3DSalome.py b/generator/generator_vers3DSalome.py index 9f405a45..bd54a5be 100644 --- a/generator/generator_vers3DSalome.py +++ b/generator/generator_vers3DSalome.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/generator/oldCodes/DefautASTER.py b/generator/oldCodes/DefautASTER.py index 7a120f32..d2c02a36 100644 --- a/generator/oldCodes/DefautASTER.py +++ b/generator/oldCodes/DefautASTER.py @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2013 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/generator/oldCodes/OpenturnsBase.py b/generator/oldCodes/OpenturnsBase.py index 465c6f8d..1c3a2d25 100644 --- a/generator/oldCodes/OpenturnsBase.py +++ b/generator/oldCodes/OpenturnsBase.py @@ -1,5 +1,5 @@ # -*- coding: iso-8859-1 -*- -# Copyright (C) 2007-2013 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/generator/oldCodes/OpenturnsSTD.py b/generator/oldCodes/OpenturnsSTD.py index f27c2c16..88c63af4 100644 --- a/generator/oldCodes/OpenturnsSTD.py +++ b/generator/oldCodes/OpenturnsSTD.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2013 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/generator/oldCodes/OpenturnsXML.py b/generator/oldCodes/OpenturnsXML.py index 860508de..084e0aa2 100644 --- a/generator/oldCodes/OpenturnsXML.py +++ b/generator/oldCodes/OpenturnsXML.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2013 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/generator/oldCodes/generator_CARMEL3D.py b/generator/oldCodes/generator_CARMEL3D.py index 595623d4..717d73bd 100644 --- a/generator/oldCodes/generator_CARMEL3D.py +++ b/generator/oldCodes/generator_CARMEL3D.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/generator/oldCodes/generator_CARMEL3D_temporel.py b/generator/oldCodes/generator_CARMEL3D_temporel.py index 05a3d85f..5747e815 100644 --- a/generator/oldCodes/generator_CARMEL3D_temporel.py +++ b/generator/oldCodes/generator_CARMEL3D_temporel.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/generator/oldCodes/generator_CARMELCND.py b/generator/oldCodes/generator_CARMELCND.py index 9561c7ba..752bb175 100755 --- a/generator/oldCodes/generator_CARMELCND.py +++ b/generator/oldCodes/generator_CARMELCND.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/generator/oldCodes/generator_CARMELCS.py b/generator/oldCodes/generator_CARMELCS.py index 4e4a2fca..26aaf2fb 100644 --- a/generator/oldCodes/generator_CARMELCS.py +++ b/generator/oldCodes/generator_CARMELCS.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/generator/oldCodes/generator_SEP.py b/generator/oldCodes/generator_SEP.py index 9dd9e09a..d2bf995a 100644 --- a/generator/oldCodes/generator_SEP.py +++ b/generator/oldCodes/generator_SEP.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2013 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/generator/oldCodes/generator_ZCracks.py b/generator/oldCodes/generator_ZCracks.py index b8c57f12..780e0b3a 100644 --- a/generator/oldCodes/generator_ZCracks.py +++ b/generator/oldCodes/generator_ZCracks.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/generator/oldCodes/generator_asterv5.py b/generator/oldCodes/generator_asterv5.py index cdde4e28..f5f2c447 100644 --- a/generator/oldCodes/generator_asterv5.py +++ b/generator/oldCodes/generator_asterv5.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2013 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/generator/oldCodes/generator_cuve2dg.py b/generator/oldCodes/generator_cuve2dg.py index f7c97fc3..4666fa4f 100644 --- a/generator/oldCodes/generator_cuve2dg.py +++ b/generator/oldCodes/generator_cuve2dg.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2013 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/generator/oldCodes/generator_file_from_template.py b/generator/oldCodes/generator_file_from_template.py index 40bc55b7..a73e8464 100644 --- a/generator/oldCodes/generator_file_from_template.py +++ b/generator/oldCodes/generator_file_from_template.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/generator/oldCodes/generator_homard.py b/generator/oldCodes/generator_homard.py index 0f1958cc..e78628f8 100644 --- a/generator/oldCodes/generator_homard.py +++ b/generator/oldCodes/generator_homard.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2013 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/generator/oldCodes/generator_ini.py b/generator/oldCodes/generator_ini.py index f1a60a9d..11cf9d65 100644 --- a/generator/oldCodes/generator_ini.py +++ b/generator/oldCodes/generator_ini.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/generator/oldCodes/generator_openturns.py b/generator/oldCodes/generator_openturns.py index 2f4b3716..70e258c9 100644 --- a/generator/oldCodes/generator_openturns.py +++ b/generator/oldCodes/generator_openturns.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2013 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/generator/oldCodes/generator_openturns_study.py b/generator/oldCodes/generator_openturns_study.py index e603d902..a2146e22 100644 --- a/generator/oldCodes/generator_openturns_study.py +++ b/generator/oldCodes/generator_openturns_study.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2013 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/generator/oldCodes/generator_openturns_wrapper.py b/generator/oldCodes/generator_openturns_wrapper.py index bca30dc5..ab93e965 100644 --- a/generator/oldCodes/generator_openturns_wrapper.py +++ b/generator/oldCodes/generator_openturns_wrapper.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2013 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/generator/oldCodes/generator_pyth.py b/generator/oldCodes/generator_pyth.py index 6a231111..86b83543 100644 --- a/generator/oldCodes/generator_pyth.py +++ b/generator/oldCodes/generator_pyth.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/generator/oldCodes/generator_python6.py b/generator/oldCodes/generator_python6.py index 0c51b249..a554bc2a 100644 --- a/generator/oldCodes/generator_python6.py +++ b/generator/oldCodes/generator_python6.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/generator/oldCodes/oldGenerator_CARMEL3D_frequentiel.py b/generator/oldCodes/oldGenerator_CARMEL3D_frequentiel.py index 2bc21cae..d7a1dd03 100755 --- a/generator/oldCodes/oldGenerator_CARMEL3D_frequentiel.py +++ b/generator/oldCodes/oldGenerator_CARMEL3D_frequentiel.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D +# Copyright (C) 2007-2021 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 diff --git a/monCode/prefs_monCode.py b/monCode/prefs_monCode.py deleted file mode 100644 index 819a4085..00000000 --- a/monCode/prefs_monCode.py +++ /dev/null @@ -1,69 +0,0 @@ -# -*- 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. -# -# 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='en' - -# Codage des strings qui accepte les accents (en remplacement de 'ascii') -encoding='iso-8859-1' -docPath=repIni -fileName="docMonCode.png" -image=1 - -# -catalogues=( - ('monCode','53038',os.path.join(repIni,'Matrix_Cata.py'),'dico','python'), - ('monCode','53036',os.path.join(repIni,'Elementary_Lists_53036_Cata.py'),'dico','python'), - ('monCode','53033',os.path.join(repIni,'Tuples_Cata.py'),'dico','python'), - ('monCode','53031',os.path.join(repIni,'Tuples_Cata.py'),'dico','python'), - ('monCode','53030',os.path.join(repIni,'Tuples_Cata.py'),'dico','python'), - ('monCode','53020',os.path.join(repIni,'Nested_Cond_52945_Cata.py'),'dico','python'), - ('monCode','53013',os.path.join(repIni,'Elementary_Lists_53013_Cata.py'),'dico','python'), - ('monCode','53000',os.path.join(repIni,'Elementary_Lists_53030_Cata.py'),'dico','python'), - ('monCode','52996',os.path.join(repIni,'Elementary_Lists_52996_Cata.py'),'dico','python'), - ('monCode','52992',os.path.join(repIni,'Many_Concepts_52992_Cata.py'),'dico','python'), - ('monCode','52989',os.path.join(repIni,'Many_Concepts_52989_Cata.py'),'dico','python'), - ('monCode','52988',os.path.join(repIni,'Many_Concepts_52988_Cata.py'),'dico','python'), - ('monCode','52985',os.path.join(repIni,'fin_52985_Cata.py'),'dico','python'), - ('monCode','52983',os.path.join(repIni,'Many_Concepts_52983_Cata.py'),'dico','python'), - ('monCode','52975',os.path.join(repIni,'Separate_Blocks_52975_Cata.py'),'dico','python'), - ('monCode','52972',os.path.join(repIni,'Separate_Blocks_52972_Cata.py'),'dico','python'), - ('monCode','52958',os.path.join(repIni,'Separate_Blocks_52958_Cata.py'),'dico','python'), - ('monCode','52952',os.path.join(repIni,'Nested_Cond_52952_Cata.py'),'dico','python'), - ('monCode','52949',os.path.join(repIni,'Nested_Cond_52949_Cata.py'),'dico','python'), - ('monCode','52947',os.path.join(repIni,'Nested_Cond_52947_Cata.py'),'dico','python'), - ('monCode','52946',os.path.join(repIni,'Nested_Cond_52946_Cata.py'),'dico','python'), - ('monCode','52945',os.path.join(repIni,'Nested_Cond_52945_Cata.py'),'dico','python'), - ('monCode','Global',os.path.join(repIni,'Global_Condition_Cata.py'),'dico','python'), -# resolu ('monCode','52948',os.path.join(repIni,'Nested_Cond_52948_Cata.py'),'dico','python'), -# pb d afffichage des optionnels ('monCode','52963',os.path.join(repIni,'Separate_Blocks_52963_Cata.py'),'dico','python'), -# pb d afffichage des optionnels ('monCode','52966',os.path.join(repIni,'Separate_Blocks_52966_Cata.py'),'dico','python'), - -# ('monCode','test',os.path.join(repIni,'monCode_Cata1.py'),'dico','python'), -) -- 2.39.2