3 files changed, 75 insertions, 146 deletions

diff --git a/french/eficas/Makefile b/french/eficas/Makefile
index 8d58221fa5c1..585cf2849a2c 100644
--- a/french/eficas/Makefile
+++ b/french/eficas/Makefile
@@ -7,9 +7,8 @@
 
 PORTNAME=	eficas
 DISTVERSIONPREFIX=	full-src-
-DISTVERSION=	1.17.0-1
+DISTVERSION=	2.0.3-1
 DISTVERSIONSUFFIX=	.noarch
-PORTREVISION=	1
 CATEGORIES=	french cad
 MASTER_SITES=	http://www.code-aster.org/V2/UPLOAD/DOC/Telechargement/
 DISTNAME=	aster-${DISTVERSIONPREFIX}${ASTER_DISTVERSION}${DISTVERSIONSUFFIX}
@@ -17,13 +16,13 @@ DISTNAME=	aster-${DISTVERSIONPREFIX}${ASTER_DISTVERSION}${DISTVERSIONSUFFIX}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	ASter Command FIle Editor
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/Pmw:${PORTSDIR}/x11-toolkits/py-Pmw		\
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/Pmw:${PORTSDIR}/x11-toolkits/py-Pmw	\
 		${PYTHON_SITELIBDIR}/mx:${PORTSDIR}/lang/py-mx-base		\
-		${PYNUMERIC}							\
+		${PYNUMPY}							\
 		${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter
 
-ASTER_VER=	10.1.0
-ASTER_DISTVERSION=	${ASTER_VER}-4
+ASTER_VER=	10.2.0
+ASTER_DISTVERSION=	${ASTER_VER}-1
 EXTRACT_WRKSRC=	${WRKDIR}/aster-${DISTVERSIONPREFIX}${ASTER_VER}/SRC
 
 USE_PYTHON=	yes
@@ -50,10 +49,9 @@ RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:${PORTSDIR}/x11-toolkits/py-qt
 SUB_FILES+=	qtEficas
 .endif
 
-ENV2PYTHON=	Misc/Cyclops.py Aster/eficas_aster.py convert/Parserv5/Translate.py	\
-		Traducteur/traduitV8V9.py Traducteur/traduitV7V8.py Aster/test_eficas.py\
-		Aster/qtEficas_aster.py generator/OpenturnsSTD.py	\
-		generator/generator_openturns_study.py generator/generator_openturns_wrapper.py
+ENV2PYTHON=	Misc/Cyclops.py Aster/eficas_aster.py Aster/qtEficas_aster.py	\
+		Aster/qtGroup.py Traducteur/traduitV8V9.py			\
+		Traducteur/traduitV7V8.py convert/Parserv5/Translate.py
 FIXSHTK=	bureau.py cataediteur.py panels.py
 FIXSHQT4=	typeNode.py
 FIXBASH=	cataSTA9/Macro/macr_ecre_calc_ops.py cataSTA10/Macro/macr_ecre_calc_ops.py
@@ -87,6 +85,7 @@ pre-configure:
 do-install:
 	${MKDIR} ${EFICASDIR}
 	${CP} -R ${WRKSRC}/* ${EFICASDIR}
+	${FIND} ${EFICASDIR} -name CMakeFiles -delete
 	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${EFICASDIR}
 	@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${EFICASDIR}
 	${INSTALL_SCRIPT} ${WRKDIR}/eficas ${PREFIX}/bin
diff --git a/french/eficas/distinfo b/french/eficas/distinfo
index 74854df498b7..da93a363feb7 100644
--- a/french/eficas/distinfo
+++ b/french/eficas/distinfo
@@ -1,3 +1,3 @@
-MD5 (aster-full-src-10.1.0-4.noarch.tar.gz) = 49fe55a0a46491124c16965a2db59c5e
-SHA256 (aster-full-src-10.1.0-4.noarch.tar.gz) = c72f82abadb627925cbc5cbf9909f969e4c60f29325a62d78664eb03a860468a
-SIZE (aster-full-src-10.1.0-4.noarch.tar.gz) = 163690307
+MD5 (aster-full-src-10.2.0-1.noarch.tar.gz) = b2ba78c4d41d40933a98e21f16f3ec3d
+SHA256 (aster-full-src-10.2.0-1.noarch.tar.gz) = 99fe143121ffde6089335163902a75805ba61fe559c3176846db1452491b5d48
+SIZE (aster-full-src-10.2.0-1.noarch.tar.gz) = 181662707
diff --git a/french/eficas/pkg-plist b/french/eficas/pkg-plist
index c972aae592bf..097d2fd25d3b 100644
--- a/french/eficas/pkg-plist
+++ b/french/eficas/pkg-plist
@@ -9,13 +9,6 @@ bin/qtEficas
 %%EFICASDIR%%/AIDE/aide_objets.py
 %%EFICASDIR%%/AIDE/aide_objets.pyc
 %%EFICASDIR%%/AIDE/aide_objets.pyo
-%%EFICASDIR%%/AIDE/fichiers/INSTALL
-%%EFICASDIR%%/AIDE/fichiers/INSTALL.txt
-%%EFICASDIR%%/AIDE/fichiers/NEWS
-%%EFICASDIR%%/AIDE/fichiers/NEWS.txt
-%%EFICASDIR%%/AIDE/fichiers/faqs.txt
-%%EFICASDIR%%/AIDE/fichiers/includes.txt
-%%EFICASDIR%%/AIDE/fichiers/index.html
 %%EFICASDIR%%/AIDE/index_aide.py
 %%EFICASDIR%%/AIDE/index_aide.pyc
 %%EFICASDIR%%/AIDE/index_aide.pyo
@@ -154,6 +147,9 @@ bin/qtEficas
 %%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/calc_fonction_ops.py
 %%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/calc_fonction_ops.pyc
 %%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/calc_fonction_ops.pyo
+%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/calc_miss_ops.py
+%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/calc_miss_ops.pyc
+%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/calc_miss_ops.pyo
 %%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/calc_modal_ops.py
 %%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/calc_modal_ops.pyc
 %%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/calc_modal_ops.pyo
@@ -175,12 +171,18 @@ bin/qtEficas
 %%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/defi_cable_bp_ops.py
 %%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/defi_cable_bp_ops.pyc
 %%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/defi_cable_bp_ops.pyo
+%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/defi_fonc_elec_ops.py
+%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/defi_fonc_elec_ops.pyc
+%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/defi_fonc_elec_ops.pyo
 %%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/defi_inte_spec_ops.py
 %%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/defi_inte_spec_ops.pyc
 %%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/defi_inte_spec_ops.pyo
 %%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/defi_part_feti_ops.py
 %%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/defi_part_feti_ops.pyc
 %%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/defi_part_feti_ops.pyo
+%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/defi_sol_miss_ops.py
+%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/defi_sol_miss_ops.pyc
+%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/defi_sol_miss_ops.pyo
 %%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/dyna_iss_vari_ops.py
 %%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/dyna_iss_vari_ops.pyc
 %%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/dyna_iss_vari_ops.pyo
@@ -202,6 +204,9 @@ bin/qtEficas
 %%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/impr_diag_campbell_ops.py
 %%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/impr_diag_campbell_ops.pyc
 %%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/impr_diag_campbell_ops.pyo
+%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/impr_diag_campbell_utils.py
+%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/impr_diag_campbell_utils.pyc
+%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/impr_diag_campbell_utils.pyo
 %%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/impr_fonction_ops.py
 %%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/impr_fonction_ops.pyc
 %%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/impr_fonction_ops.pyo
@@ -289,9 +294,15 @@ bin/qtEficas
 %%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/observation_ops.py
 %%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/observation_ops.pyc
 %%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/observation_ops.pyo
+%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/post_coque_ops.py
+%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/post_coque_ops.pyc
+%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/post_coque_ops.pyo
 %%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/post_dyna_alea_ops.py
 %%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/post_dyna_alea_ops.pyc
 %%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/post_dyna_alea_ops.pyo
+%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/post_endo_fiss_ops.py
+%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/post_endo_fiss_ops.pyc
+%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/post_endo_fiss_ops.pyo
 %%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/post_gp_ops.py
 %%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/post_gp_ops.pyc
 %%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/post_gp_ops.pyo
@@ -316,12 +327,18 @@ bin/qtEficas
 %%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/reca_controles.py
 %%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/reca_controles.pyc
 %%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/reca_controles.pyo
+%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/reca_evol.py
+%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/reca_evol.pyc
+%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/reca_evol.pyo
 %%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/reca_graphique.py
 %%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/reca_graphique.pyc
 %%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/reca_graphique.pyo
 %%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/reca_interp.py
 %%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/reca_interp.pyc
 %%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/reca_interp.pyo
+%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/reca_mac.py
+%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/reca_mac.pyc
+%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/reca_mac.pyo
 %%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/reca_message.py
 %%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/reca_message.pyc
 %%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/reca_message.pyo
@@ -394,6 +411,9 @@ bin/qtEficas
 %%EFICASDIR%%/Aster/Cata/cataSTA10/SD/co_compor.py
 %%EFICASDIR%%/Aster/Cata/cataSTA10/SD/co_compor.pyc
 %%EFICASDIR%%/Aster/Cata/cataSTA10/SD/co_compor.pyo
+%%EFICASDIR%%/Aster/Cata/cataSTA10/SD/co_contact.py
+%%EFICASDIR%%/Aster/Cata/cataSTA10/SD/co_contact.pyc
+%%EFICASDIR%%/Aster/Cata/cataSTA10/SD/co_contact.pyo
 %%EFICASDIR%%/Aster/Cata/cataSTA10/SD/co_courbe.py
 %%EFICASDIR%%/Aster/Cata/cataSTA10/SD/co_courbe.pyc
 %%EFICASDIR%%/Aster/Cata/cataSTA10/SD/co_courbe.pyo
@@ -541,9 +561,6 @@ bin/qtEficas
 %%EFICASDIR%%/Aster/Cata/cataSTA10/SD/sd_char_cine.py
 %%EFICASDIR%%/Aster/Cata/cataSTA10/SD/sd_char_cine.pyc
 %%EFICASDIR%%/Aster/Cata/cataSTA10/SD/sd_char_cine.pyo
-%%EFICASDIR%%/Aster/Cata/cataSTA10/SD/sd_char_contact.py
-%%EFICASDIR%%/Aster/Cata/cataSTA10/SD/sd_char_contact.pyc
-%%EFICASDIR%%/Aster/Cata/cataSTA10/SD/sd_char_contact.pyo
 %%EFICASDIR%%/Aster/Cata/cataSTA10/SD/sd_char_meca.py
 %%EFICASDIR%%/Aster/Cata/cataSTA10/SD/sd_char_meca.pyc
 %%EFICASDIR%%/Aster/Cata/cataSTA10/SD/sd_char_meca.pyo
@@ -556,6 +573,12 @@ bin/qtEficas
 %%EFICASDIR%%/Aster/Cata/cataSTA10/SD/sd_compor.py
 %%EFICASDIR%%/Aster/Cata/cataSTA10/SD/sd_compor.pyc
 %%EFICASDIR%%/Aster/Cata/cataSTA10/SD/sd_compor.pyo
+%%EFICASDIR%%/Aster/Cata/cataSTA10/SD/sd_contact.py
+%%EFICASDIR%%/Aster/Cata/cataSTA10/SD/sd_contact.pyc
+%%EFICASDIR%%/Aster/Cata/cataSTA10/SD/sd_contact.pyo
+%%EFICASDIR%%/Aster/Cata/cataSTA10/SD/sd_corresp_2_mailla.py
+%%EFICASDIR%%/Aster/Cata/cataSTA10/SD/sd_corresp_2_mailla.pyc
+%%EFICASDIR%%/Aster/Cata/cataSTA10/SD/sd_corresp_2_mailla.pyo
 %%EFICASDIR%%/Aster/Cata/cataSTA10/SD/sd_courbe.py
 %%EFICASDIR%%/Aster/Cata/cataSTA10/SD/sd_courbe.pyc
 %%EFICASDIR%%/Aster/Cata/cataSTA10/SD/sd_courbe.pyo
@@ -1032,6 +1055,9 @@ bin/qtEficas
 %%EFICASDIR%%/Aster/Cata/cataSTA9/Macro/defi_cable_bp_ops.py
 %%EFICASDIR%%/Aster/Cata/cataSTA9/Macro/defi_cable_bp_ops.pyc
 %%EFICASDIR%%/Aster/Cata/cataSTA9/Macro/defi_cable_bp_ops.pyo
+%%EFICASDIR%%/Aster/Cata/cataSTA9/Macro/defi_fonc_elec_ops.py
+%%EFICASDIR%%/Aster/Cata/cataSTA9/Macro/defi_fonc_elec_ops.pyc
+%%EFICASDIR%%/Aster/Cata/cataSTA9/Macro/defi_fonc_elec_ops.pyo
 %%EFICASDIR%%/Aster/Cata/cataSTA9/Macro/defi_inte_spec_ops.py
 %%EFICASDIR%%/Aster/Cata/cataSTA9/Macro/defi_inte_spec_ops.pyc
 %%EFICASDIR%%/Aster/Cata/cataSTA9/Macro/defi_inte_spec_ops.pyo
@@ -1660,13 +1686,10 @@ bin/qtEficas
 %%EFICASDIR%%/Aster/Cata/cataSTA9/ops.py
 %%EFICASDIR%%/Aster/Cata/cataSTA9/ops.pyc
 %%EFICASDIR%%/Aster/Cata/cataSTA9/ops.pyo
-%%EFICASDIR%%/Aster/Cata/cataSTA9c_clefs_docu
+%%EFICASDIR%%/Aster/LICENSE.TERMS
 %%EFICASDIR%%/Aster/__init__.py
 %%EFICASDIR%%/Aster/__init__.pyc
 %%EFICASDIR%%/Aster/__init__.pyo
-%%EFICASDIR%%/Aster/aster.py
-%%EFICASDIR%%/Aster/aster.pyc
-%%EFICASDIR%%/Aster/aster.pyo
 %%EFICASDIR%%/Aster/configuration_ASTER.py
 %%EFICASDIR%%/Aster/configuration_ASTER.pyc
 %%EFICASDIR%%/Aster/configuration_ASTER.pyo
@@ -1687,12 +1710,12 @@ bin/qtEficas
 %%EFICASDIR%%/Aster/qtEficas_aster.py
 %%EFICASDIR%%/Aster/qtEficas_aster.pyc
 %%EFICASDIR%%/Aster/qtEficas_aster.pyo
+%%EFICASDIR%%/Aster/qtGroup.py
+%%EFICASDIR%%/Aster/qtGroup.pyc
+%%EFICASDIR%%/Aster/qtGroup.pyo
 %%EFICASDIR%%/Aster/style.py
 %%EFICASDIR%%/Aster/style.pyc
 %%EFICASDIR%%/Aster/style.pyo
-%%EFICASDIR%%/Aster/test_eficas.py
-%%EFICASDIR%%/Aster/test_eficas.pyc
-%%EFICASDIR%%/Aster/test_eficas.pyo
 %%EFICASDIR%%/Editeur/Objecttreeitem.py
 %%EFICASDIR%%/Editeur/Objecttreeitem.pyc
 %%EFICASDIR%%/Editeur/Objecttreeitem.pyo
@@ -1757,6 +1780,7 @@ bin/qtEficas
 %%EFICASDIR%%/Editeur/icons/Sep.gif
 %%EFICASDIR%%/Editeur/icons/Zoom24.gif
 %%EFICASDIR%%/Editeur/icons/Zoom24.png
+%%EFICASDIR%%/Editeur/icons/application.gif
 %%EFICASDIR%%/Editeur/icons/arrow_left.gif
 %%EFICASDIR%%/Editeur/icons/arrow_left.png
 %%EFICASDIR%%/Editeur/icons/arrow_right.gif
@@ -1799,11 +1823,12 @@ bin/qtEficas
 %%EFICASDIR%%/Editeur/icons/ast-yellow-square.png
 %%EFICASDIR%%/Editeur/icons/ast-yellow-text.gif
 %%EFICASDIR%%/Editeur/icons/ast-yellow-text.png
+%%EFICASDIR%%/Editeur/icons/block_node.png
 %%EFICASDIR%%/Editeur/icons/code_aster.gif
 %%EFICASDIR%%/Editeur/icons/code_descartes.gif
 %%EFICASDIR%%/Editeur/icons/code_saturne.gif
+%%EFICASDIR%%/Editeur/icons/compute.png
 %%EFICASDIR%%/Editeur/icons/empty.png
-%%EFICASDIR%%/Editeur/icons/image240.png
 %%EFICASDIR%%/Editeur/icons/logo_edf.gif
 %%EFICASDIR%%/Editeur/icons/minusnode.gif
 %%EFICASDIR%%/Editeur/icons/minusnode.png
@@ -1869,7 +1894,6 @@ bin/qtEficas
 %%EFICASDIR%%/Extensions/pluginloader.py
 %%EFICASDIR%%/Extensions/pluginloader.pyc
 %%EFICASDIR%%/Extensions/pluginloader.pyo
-%%EFICASDIR%%/INSTALL
 %%EFICASDIR%%/Ihm/CONNECTOR.py
 %%EFICASDIR%%/Ihm/CONNECTOR.pyc
 %%EFICASDIR%%/Ihm/CONNECTOR.pyo
@@ -2056,15 +2080,6 @@ bin/qtEficas
 %%EFICASDIR%%/InterfaceQT4/monOptions_ASTER.py
 %%EFICASDIR%%/InterfaceQT4/monOptions_ASTER.pyc
 %%EFICASDIR%%/InterfaceQT4/monOptions_ASTER.pyo
-%%EFICASDIR%%/InterfaceQT4/monOptions_CUVE2DG.py
-%%EFICASDIR%%/InterfaceQT4/monOptions_CUVE2DG.pyc
-%%EFICASDIR%%/InterfaceQT4/monOptions_CUVE2DG.pyo
-%%EFICASDIR%%/InterfaceQT4/monOptions_OPENTURNS_STUDY.py
-%%EFICASDIR%%/InterfaceQT4/monOptions_OPENTURNS_STUDY.pyc
-%%EFICASDIR%%/InterfaceQT4/monOptions_OPENTURNS_STUDY.pyo
-%%EFICASDIR%%/InterfaceQT4/monOptions_OPENTURNS_WRAPPER.py
-%%EFICASDIR%%/InterfaceQT4/monOptions_OPENTURNS_WRAPPER.pyc
-%%EFICASDIR%%/InterfaceQT4/monOptions_OPENTURNS_WRAPPER.pyo
 %%EFICASDIR%%/InterfaceQT4/monParamPanel.py
 %%EFICASDIR%%/InterfaceQT4/monParamPanel.pyc
 %%EFICASDIR%%/InterfaceQT4/monParamPanel.pyo
@@ -2338,7 +2353,6 @@ bin/qtEficas
 %%EFICASDIR%%/InterfaceTK/widgets.py
 %%EFICASDIR%%/InterfaceTK/widgets.pyc
 %%EFICASDIR%%/InterfaceTK/widgets.pyo
-%%EFICASDIR%%/LICENSE.TERMS
 %%EFICASDIR%%/Misc/Cyclops.py
 %%EFICASDIR%%/Misc/Cyclops.pyc
 %%EFICASDIR%%/Misc/Cyclops.pyo
@@ -2357,10 +2371,12 @@ bin/qtEficas
 %%EFICASDIR%%/Misc/traced.py
 %%EFICASDIR%%/Misc/traced.pyc
 %%EFICASDIR%%/Misc/traced.pyo
-%%EFICASDIR%%/NEWS
 %%EFICASDIR%%/Noyau/N_ASSD.py
 %%EFICASDIR%%/Noyau/N_ASSD.pyc
 %%EFICASDIR%%/Noyau/N_ASSD.pyo
+%%EFICASDIR%%/Noyau/N_ASSD_NonAster.py
+%%EFICASDIR%%/Noyau/N_ASSD_NonAster.pyc
+%%EFICASDIR%%/Noyau/N_ASSD_NonAster.pyo
 %%EFICASDIR%%/Noyau/N_BLOC.py
 %%EFICASDIR%%/Noyau/N_BLOC.pyc
 %%EFICASDIR%%/Noyau/N_BLOC.pyo
@@ -2403,6 +2419,9 @@ bin/qtEficas
 %%EFICASDIR%%/Noyau/N_JDC_CATA.py
 %%EFICASDIR%%/Noyau/N_JDC_CATA.pyc
 %%EFICASDIR%%/Noyau/N_JDC_CATA.pyo
+%%EFICASDIR%%/Noyau/N_LASSD.py
+%%EFICASDIR%%/Noyau/N_LASSD.pyc
+%%EFICASDIR%%/Noyau/N_LASSD.pyo
 %%EFICASDIR%%/Noyau/N_MACRO.py
 %%EFICASDIR%%/Noyau/N_MACRO.pyc
 %%EFICASDIR%%/Noyau/N_MACRO.pyo
@@ -2451,6 +2470,9 @@ bin/qtEficas
 %%EFICASDIR%%/Noyau/N__F.py
 %%EFICASDIR%%/Noyau/N__F.pyc
 %%EFICASDIR%%/Noyau/N__F.pyo
+%%EFICASDIR%%/Noyau/N_types.py
+%%EFICASDIR%%/Noyau/N_types.pyc
+%%EFICASDIR%%/Noyau/N_types.pyo
 %%EFICASDIR%%/Noyau/N_utils.py
 %%EFICASDIR%%/Noyau/N_utils.pyc
 %%EFICASDIR%%/Noyau/N_utils.pyo
@@ -2547,132 +2569,102 @@ bin/qtEficas
 %%EFICASDIR%%/UiQT4/OptionsCuve.py
 %%EFICASDIR%%/UiQT4/OptionsCuve.pyc
 %%EFICASDIR%%/UiQT4/OptionsCuve.pyo
-%%EFICASDIR%%/UiQT4/OptionsCuve.ui
 %%EFICASDIR%%/UiQT4/OptionsEditeur.py
 %%EFICASDIR%%/UiQT4/OptionsEditeur.pyc
 %%EFICASDIR%%/UiQT4/OptionsEditeur.pyo
-%%EFICASDIR%%/UiQT4/OptionsEditeur.ui
 %%EFICASDIR%%/UiQT4/OptionsOT.py
 %%EFICASDIR%%/UiQT4/OptionsOT.pyc
 %%EFICASDIR%%/UiQT4/OptionsOT.pyo
-%%EFICASDIR%%/UiQT4/OptionsOT.ui
 %%EFICASDIR%%/UiQT4/OptionsPdf.py
 %%EFICASDIR%%/UiQT4/OptionsPdf.pyc
 %%EFICASDIR%%/UiQT4/OptionsPdf.pyo
-%%EFICASDIR%%/UiQT4/OptionsPdf.ui
 %%EFICASDIR%%/UiQT4/aideQT.py
 %%EFICASDIR%%/UiQT4/aideQT.pyc
 %%EFICASDIR%%/UiQT4/aideQT.pyo
-%%EFICASDIR%%/UiQT4/aideQT.ui
 %%EFICASDIR%%/UiQT4/desChoixCata.py
 %%EFICASDIR%%/UiQT4/desChoixCata.pyc
 %%EFICASDIR%%/UiQT4/desChoixCata.pyo
-%%EFICASDIR%%/UiQT4/desChoixCata.ui
+%%EFICASDIR%%/UiQT4/desChoixMap.py
+%%EFICASDIR%%/UiQT4/desChoixMap.pyc
+%%EFICASDIR%%/UiQT4/desChoixMap.pyo
 %%EFICASDIR%%/UiQT4/desCommande.py
 %%EFICASDIR%%/UiQT4/desCommande.pyc
 %%EFICASDIR%%/UiQT4/desCommande.pyo
-%%EFICASDIR%%/UiQT4/desCommande.ui
 %%EFICASDIR%%/UiQT4/desCommentaire.py
 %%EFICASDIR%%/UiQT4/desCommentaire.pyc
 %%EFICASDIR%%/UiQT4/desCommentaire.pyo
-%%EFICASDIR%%/UiQT4/desCommentaire.ui
 %%EFICASDIR%%/UiQT4/desError.py
 %%EFICASDIR%%/UiQT4/desError.pyc
 %%EFICASDIR%%/UiQT4/desError.pyo
-%%EFICASDIR%%/UiQT4/desError.ui
 %%EFICASDIR%%/UiQT4/desFormule.py
 %%EFICASDIR%%/UiQT4/desFormule.pyc
 %%EFICASDIR%%/UiQT4/desFormule.pyo
-%%EFICASDIR%%/UiQT4/desFormule.ui
 %%EFICASDIR%%/UiQT4/desInactif.py
 %%EFICASDIR%%/UiQT4/desInactif.pyc
 %%EFICASDIR%%/UiQT4/desInactif.pyo
-%%EFICASDIR%%/UiQT4/desInactif.ui
 %%EFICASDIR%%/UiQT4/desInclude.py
 %%EFICASDIR%%/UiQT4/desInclude.pyc
 %%EFICASDIR%%/UiQT4/desInclude.pyo
-%%EFICASDIR%%/UiQT4/desInclude.ui
 %%EFICASDIR%%/UiQT4/desListeParam.py
 %%EFICASDIR%%/UiQT4/desListeParam.pyc
 %%EFICASDIR%%/UiQT4/desListeParam.pyo
-%%EFICASDIR%%/UiQT4/desListeParam.ui
 %%EFICASDIR%%/UiQT4/desMCFact.py
 %%EFICASDIR%%/UiQT4/desMCFact.pyc
 %%EFICASDIR%%/UiQT4/desMCFact.pyo
-%%EFICASDIR%%/UiQT4/desMCFact.ui
 %%EFICASDIR%%/UiQT4/desMCListAjout.py
 %%EFICASDIR%%/UiQT4/desMCListAjout.pyc
 %%EFICASDIR%%/UiQT4/desMCListAjout.pyo
-%%EFICASDIR%%/UiQT4/desMCListAjout.ui
 %%EFICASDIR%%/UiQT4/desMatrice.py
 %%EFICASDIR%%/UiQT4/desMatrice.pyc
 %%EFICASDIR%%/UiQT4/desMatrice.pyo
-%%EFICASDIR%%/UiQT4/desMatrice.ui
 %%EFICASDIR%%/UiQT4/desParam.py
 %%EFICASDIR%%/UiQT4/desParam.pyc
 %%EFICASDIR%%/UiQT4/desParam.pyo
-%%EFICASDIR%%/UiQT4/desParam.ui
 %%EFICASDIR%%/UiQT4/desPixmap.py
 %%EFICASDIR%%/UiQT4/desPixmap.pyc
 %%EFICASDIR%%/UiQT4/desPixmap.pyo
-%%EFICASDIR%%/UiQT4/desPixmap.ui
 %%EFICASDIR%%/UiQT4/desPlusieursBase.py
 %%EFICASDIR%%/UiQT4/desPlusieursBase.pyc
 %%EFICASDIR%%/UiQT4/desPlusieursBase.pyo
-%%EFICASDIR%%/UiQT4/desPlusieursBase.ui
 %%EFICASDIR%%/UiQT4/desPlusieursInto.py
 %%EFICASDIR%%/UiQT4/desPlusieursInto.pyc
 %%EFICASDIR%%/UiQT4/desPlusieursInto.pyo
-%%EFICASDIR%%/UiQT4/desPlusieursInto.ui
 %%EFICASDIR%%/UiQT4/desPoursuite.py
 %%EFICASDIR%%/UiQT4/desPoursuite.pyc
 %%EFICASDIR%%/UiQT4/desPoursuite.pyo
-%%EFICASDIR%%/UiQT4/desPoursuite.ui
 %%EFICASDIR%%/UiQT4/desRacine.py
 %%EFICASDIR%%/UiQT4/desRacine.pyc
 %%EFICASDIR%%/UiQT4/desRacine.pyo
-%%EFICASDIR%%/UiQT4/desRacine.ui
 %%EFICASDIR%%/UiQT4/desSelectVal.py
 %%EFICASDIR%%/UiQT4/desSelectVal.pyc
 %%EFICASDIR%%/UiQT4/desSelectVal.pyo
-%%EFICASDIR%%/UiQT4/desSelectVal.ui
 %%EFICASDIR%%/UiQT4/desUniqueASSD.py
 %%EFICASDIR%%/UiQT4/desUniqueASSD.pyc
 %%EFICASDIR%%/UiQT4/desUniqueASSD.pyo
-%%EFICASDIR%%/UiQT4/desUniqueASSD.ui
 %%EFICASDIR%%/UiQT4/desUniqueBase.py
 %%EFICASDIR%%/UiQT4/desUniqueBase.pyc
 %%EFICASDIR%%/UiQT4/desUniqueBase.pyo
-%%EFICASDIR%%/UiQT4/desUniqueBase.ui
 %%EFICASDIR%%/UiQT4/desUniqueComp.py
 %%EFICASDIR%%/UiQT4/desUniqueComp.pyc
 %%EFICASDIR%%/UiQT4/desUniqueComp.pyo
-%%EFICASDIR%%/UiQT4/desUniqueComp.ui
 %%EFICASDIR%%/UiQT4/desUniqueInto.py
 %%EFICASDIR%%/UiQT4/desUniqueInto.pyc
 %%EFICASDIR%%/UiQT4/desUniqueInto.pyo
-%%EFICASDIR%%/UiQT4/desUniqueInto.ui
 %%EFICASDIR%%/UiQT4/desUniqueSDCO.py
 %%EFICASDIR%%/UiQT4/desUniqueSDCO.pyc
 %%EFICASDIR%%/UiQT4/desUniqueSDCO.pyo
-%%EFICASDIR%%/UiQT4/desUniqueSDCO.ui
 %%EFICASDIR%%/UiQT4/desUniqueSDCOInto.py
 %%EFICASDIR%%/UiQT4/desUniqueSDCOInto.pyc
 %%EFICASDIR%%/UiQT4/desUniqueSDCOInto.pyo
-%%EFICASDIR%%/UiQT4/desUniqueSDCOInto.ui
 %%EFICASDIR%%/UiQT4/desViewTexte.py
 %%EFICASDIR%%/UiQT4/desViewTexte.pyc
 %%EFICASDIR%%/UiQT4/desViewTexte.pyo
-%%EFICASDIR%%/UiQT4/desViewTexte.ui
 %%EFICASDIR%%/UiQT4/desVisu.py
 %%EFICASDIR%%/UiQT4/desVisu.pyc
 %%EFICASDIR%%/UiQT4/desVisu.pyo
-%%EFICASDIR%%/UiQT4/desVisu.ui
-%%EFICASDIR%%/UiQT4/makefile
 %%EFICASDIR%%/UiQT4/myMain.py
 %%EFICASDIR%%/UiQT4/myMain.pyc
 %%EFICASDIR%%/UiQT4/myMain.pyo
-%%EFICASDIR%%/UiQT4/myMain.ui
 %%EFICASDIR%%/Validation/V_AU_MOINS_UN.py
 %%EFICASDIR%%/Validation/V_AU_MOINS_UN.pyc
 %%EFICASDIR%%/Validation/V_AU_MOINS_UN.pyo
@@ -2727,6 +2719,7 @@ bin/qtEficas
 %%EFICASDIR%%/Validation/__init__.py
 %%EFICASDIR%%/Validation/__init__.pyc
 %%EFICASDIR%%/Validation/__init__.pyo
+%%EFICASDIR%%/convert/Parserv5/README
 %%EFICASDIR%%/convert/Parserv5/Translate.py
 %%EFICASDIR%%/convert/Parserv5/Translate.pyc
 %%EFICASDIR%%/convert/Parserv5/Translate.pyo
@@ -2739,108 +2732,46 @@ bin/qtEficas
 %%EFICASDIR%%/convert/Parserv5/tables.py
 %%EFICASDIR%%/convert/Parserv5/tables.pyc
 %%EFICASDIR%%/convert/Parserv5/tables.pyo
+%%EFICASDIR%%/convert/Parserv5/tables.tag
 %%EFICASDIR%%/convert/__init__.py
 %%EFICASDIR%%/convert/__init__.pyc
 %%EFICASDIR%%/convert/__init__.pyo
-%%EFICASDIR%%/convert/autre_parseur.py
-%%EFICASDIR%%/convert/autre_parseur.pyc
-%%EFICASDIR%%/convert/autre_parseur.pyo
-%%EFICASDIR%%/convert/convert_SEP.py
-%%EFICASDIR%%/convert/convert_SEP.pyc
-%%EFICASDIR%%/convert/convert_SEP.pyo
 %%EFICASDIR%%/convert/convert_asterv5.py
 %%EFICASDIR%%/convert/convert_asterv5.pyc
 %%EFICASDIR%%/convert/convert_asterv5.pyo
-%%EFICASDIR%%/convert/convert_cuve2dg.py
-%%EFICASDIR%%/convert/convert_cuve2dg.pyc
-%%EFICASDIR%%/convert/convert_cuve2dg.pyo
-%%EFICASDIR%%/convert/convert_homard.py
-%%EFICASDIR%%/convert/convert_homard.pyc
-%%EFICASDIR%%/convert/convert_homard.pyo
-%%EFICASDIR%%/convert/convert_ini.py
-%%EFICASDIR%%/convert/convert_ini.pyc
-%%EFICASDIR%%/convert/convert_ini.pyo
-%%EFICASDIR%%/convert/convert_openturns_study.py
-%%EFICASDIR%%/convert/convert_openturns_study.pyc
-%%EFICASDIR%%/convert/convert_openturns_study.pyo
-%%EFICASDIR%%/convert/convert_openturns_wrapper.py
-%%EFICASDIR%%/convert/convert_openturns_wrapper.pyc
-%%EFICASDIR%%/convert/convert_openturns_wrapper.pyo
-%%EFICASDIR%%/convert/convert_pyth.py
-%%EFICASDIR%%/convert/convert_pyth.pyc
-%%EFICASDIR%%/convert/convert_pyth.pyo
+%%EFICASDIR%%/convert/convert_file_from_template.py
+%%EFICASDIR%%/convert/convert_file_from_template.pyc
+%%EFICASDIR%%/convert/convert_file_from_template.pyo
 %%EFICASDIR%%/convert/convert_python.py
 %%EFICASDIR%%/convert/convert_python.pyc
 %%EFICASDIR%%/convert/convert_python.pyo
-%%EFICASDIR%%/convert/convert_python6.py
-%%EFICASDIR%%/convert/convert_python6.pyc
-%%EFICASDIR%%/convert/convert_python6.pyo
 %%EFICASDIR%%/convert/parseur_python.py
 %%EFICASDIR%%/convert/parseur_python.pyc
 %%EFICASDIR%%/convert/parseur_python.pyo
-%%EFICASDIR%%/generator/DefautASTER.py
-%%EFICASDIR%%/generator/DefautASTER.pyc
-%%EFICASDIR%%/generator/DefautASTER.pyo
 %%EFICASDIR%%/generator/Formatage.py
 %%EFICASDIR%%/generator/Formatage.pyc
 %%EFICASDIR%%/generator/Formatage.pyo
-%%EFICASDIR%%/generator/OpenturnsBase.py
-%%EFICASDIR%%/generator/OpenturnsBase.pyc
-%%EFICASDIR%%/generator/OpenturnsBase.pyo
-%%EFICASDIR%%/generator/OpenturnsSTD.py
-%%EFICASDIR%%/generator/OpenturnsSTD.pyc
-%%EFICASDIR%%/generator/OpenturnsSTD.pyo
-%%EFICASDIR%%/generator/OpenturnsXML.py
-%%EFICASDIR%%/generator/OpenturnsXML.pyc
-%%EFICASDIR%%/generator/OpenturnsXML.pyo
 %%EFICASDIR%%/generator/__init__.py
 %%EFICASDIR%%/generator/__init__.pyc
 %%EFICASDIR%%/generator/__init__.pyo
 %%EFICASDIR%%/generator/generator_GroupMA.py
 %%EFICASDIR%%/generator/generator_GroupMA.pyc
 %%EFICASDIR%%/generator/generator_GroupMA.pyo
-%%EFICASDIR%%/generator/generator_SEP.py
-%%EFICASDIR%%/generator/generator_SEP.pyc
-%%EFICASDIR%%/generator/generator_SEP.pyo
 %%EFICASDIR%%/generator/generator_aplat.py
 %%EFICASDIR%%/generator/generator_aplat.pyc
 %%EFICASDIR%%/generator/generator_aplat.pyo
 %%EFICASDIR%%/generator/generator_asterv5.py
 %%EFICASDIR%%/generator/generator_asterv5.pyc
 %%EFICASDIR%%/generator/generator_asterv5.pyo
-%%EFICASDIR%%/generator/generator_cuve2dg.py
-%%EFICASDIR%%/generator/generator_cuve2dg.pyc
-%%EFICASDIR%%/generator/generator_cuve2dg.pyo
-%%EFICASDIR%%/generator/generator_homard.py
-%%EFICASDIR%%/generator/generator_homard.pyc
-%%EFICASDIR%%/generator/generator_homard.pyo
-%%EFICASDIR%%/generator/generator_ini.py
-%%EFICASDIR%%/generator/generator_ini.pyc
-%%EFICASDIR%%/generator/generator_ini.pyo
-%%EFICASDIR%%/generator/generator_openturns.py
-%%EFICASDIR%%/generator/generator_openturns.pyc
-%%EFICASDIR%%/generator/generator_openturns.pyo
-%%EFICASDIR%%/generator/generator_openturns_study.py
-%%EFICASDIR%%/generator/generator_openturns_study.pyc
-%%EFICASDIR%%/generator/generator_openturns_study.pyo
-%%EFICASDIR%%/generator/generator_openturns_wrapper.py
-%%EFICASDIR%%/generator/generator_openturns_wrapper.pyc
-%%EFICASDIR%%/generator/generator_openturns_wrapper.pyo
-%%EFICASDIR%%/generator/generator_pyth.py
-%%EFICASDIR%%/generator/generator_pyth.pyc
-%%EFICASDIR%%/generator/generator_pyth.pyo
+%%EFICASDIR%%/generator/generator_file_from_template.py
+%%EFICASDIR%%/generator/generator_file_from_template.pyc
+%%EFICASDIR%%/generator/generator_file_from_template.pyo
 %%EFICASDIR%%/generator/generator_python.py
 %%EFICASDIR%%/generator/generator_python.pyc
 %%EFICASDIR%%/generator/generator_python.pyo
-%%EFICASDIR%%/generator/generator_python6.py
-%%EFICASDIR%%/generator/generator_python6.pyc
-%%EFICASDIR%%/generator/generator_python6.pyo
 %%EFICASDIR%%/generator/generator_vers3DSalome.py
 %%EFICASDIR%%/generator/generator_vers3DSalome.pyc
 %%EFICASDIR%%/generator/generator_vers3DSalome.pyo
-%%EFICASDIR%%/generator/tube.py
-%%EFICASDIR%%/generator/tube.pyc
-%%EFICASDIR%%/generator/tube.pyo
 @dirrm %%EFICASDIR%%/generator
 @dirrm %%EFICASDIR%%/convert/Parserv5
 @dirrm %%EFICASDIR%%/convert
@@ -2879,7 +2810,6 @@ bin/qtEficas
 @dirrm %%EFICASDIR%%/Aide/fichiers_ASTER
 @dirrm %%EFICASDIR%%/Aide
 @dirrm %%EFICASDIR%%/Accas
-@dirrm %%EFICASDIR%%/AIDE/fichiers
 @dirrm %%EFICASDIR%%/AIDE
 @dirrm %%EFICASDIR%%
 @dirrmtry apps