From 2a86169103202198a6489799f4fbf880045f0c21 Mon Sep 17 00:00:00 2001
From: Eric Fayolle <eric.fayolle@edf.fr>
Date: Thu, 8 Mar 2018 13:58:13 +0100
Subject: [PATCH] =?utf8?q?Mise=20=C3=A0=20jour=20mod=C3=A8le=20Efficas=20v?=
 =?utf8?q?9,=20Bool=20->=20bool=20et=20typeAttendu=20en=20nomTypeAttendu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../ModeleEficas/Model Efficas (1.1)  v9.xsd  |  18 +-
 mascaret/cata-mascaret-v1.0.xml               | 190 +++++++++---------
 mascaret/configuration_mascaret.py            |  89 ++++----
 mascaret/prefs_mascaret.py                    |   2 +-
 mascaret/qtEficas_mascaret.py                 |  33 +++
 5 files changed, 181 insertions(+), 151 deletions(-)
 create mode 100755 mascaret/qtEficas_mascaret.py

diff --git a/Efi2Xsd/ModeleEficas/Model Efficas (1.1)  v9.xsd b/Efi2Xsd/ModeleEficas/Model Efficas (1.1)  v9.xsd
index 724f6ae6..eabfae5a 100755
--- a/Efi2Xsd/ModeleEficas/Model Efficas (1.1)  v9.xsd	
+++ b/Efi2Xsd/ModeleEficas/Model Efficas (1.1)  v9.xsd	
@@ -18,8 +18,8 @@
 	</xs:element>
 	<xs:element name="validators" type="T_validators"/>
 	<xs:element name="plageValeur" type="T_plageValeur"/>
-	<xs:element name="typeAttendu" type="T_name"/>
-	<xs:element name="classeUtilisateurName" type="T_classeUtilisateurName" abstract="true" substitutionGroup="typeAttendu"/>
+	<xs:element name="nomTypeAttendu" type="T_name"/>
+	<xs:element name="classeUtilisateurName" type="T_classeUtilisateurName" abstract="true" substitutionGroup="nomTypeAttendu"/>
 	<xs:element name="SIMP" type="T_SIMP"/>
 	<xs:element name="portee" type="T_portee" default="None"/>
 	<xs:element name="condition" type="T_fonctionUtilisateur"/>
@@ -323,7 +323,7 @@
 			<xs:element ref="valeurDef" minOccurs="0"/>
 			<xs:element ref="valeurSugg" minOccurs="0"/>
 			<xs:element ref="plageValeur" minOccurs="0"/>
-			<xs:element ref="typeAttendu"/>
+			<xs:element ref="nomTypeAttendu"/>
 			<xs:element ref="validators" minOccurs="0"/>
 		</xs:sequence>
 		<xs:attribute ref="nom" use="required"/>
@@ -437,11 +437,11 @@
 			<xs:enumeration value="VerifTypeTuple"/>
 		</xs:restriction>
 	</xs:simpleType>
-	<xs:simpleType name="T_Bool">
+	<xs:simpleType name="T_bool">
 		<xs:restriction base="xs:boolean"/>
 	</xs:simpleType>
-	<xs:simpleType name="T_list_Bool">
-		<xs:list itemType="T_Bool"/>
+	<xs:simpleType name="T_list_bool">
+		<xs:list itemType="T_bool"/>
 	</xs:simpleType>
 	<xs:simpleType name="T_I">
 		<xs:restriction base="xs:int"/>
@@ -487,7 +487,7 @@
 			<xs:enumeration value="I"/>
 			<xs:enumeration value="R"/>
 			<xs:enumeration value="C"/>
-			<xs:enumeration value="Bool"/>
+			<xs:enumeration value="bool"/>
 			<xs:enumeration value="grma"/>
 			<xs:enumeration value="grno"/>
 			<xs:enumeration value="SalomeEntry"/>
@@ -536,7 +536,7 @@
 		</xs:list>
 	</xs:simpleType>
 	<xs:simpleType name="T_simple">
-		<xs:union memberTypes="T_I T_list_I T_R T_list_R T_C T_list_C T_TXM T_list_TXM T_Bool T_list_Bool T_Repertoire"/>
+		<xs:union memberTypes="T_I T_list_I T_R T_list_R T_C T_list_C T_TXM T_list_TXM T_bool T_list_bool T_Repertoire"/>
 	</xs:simpleType>
 	<!--	<xs:complexType name="T_TXM"/>-->
 	<!--	<xs:simpleType name="T_simple">
@@ -547,7 +547,7 @@
 			<xs:enumeration value="I"/>
 			<xs:enumeration value="R"/>
 			<xs:enumeration value="C"/>
-			<xs:enumeration value="Bool"/>
+			<xs:enumeration value="bool"/>
 			<xs:enumeration value="grma"/>
 			<xs:enumeration value="grno"/>
 			<xs:enumeration value="SalomeEntry"/>
diff --git a/mascaret/cata-mascaret-v1.0.xml b/mascaret/cata-mascaret-v1.0.xml
index 6e72049d..1def4baa 100755
--- a/mascaret/cata-mascaret-v1.0.xml
+++ b/mascaret/cata-mascaret-v1.0.xml
@@ -7,31 +7,31 @@
 				<efficas:valeurDef>
 					<efficas:typesimple>false</efficas:typesimple>
 				</efficas:valeurDef>
-				<typeAttendu>Bool</typeAttendu>
+				<nomTypeAttendu>bool</nomTypeAttendu>
 			</efficas:SIMP>
 			<efficas:SIMP efficas:nom="ctlLois" efficas:statut="o">
 				<efficas:valeurDef>
 					<efficas:typesimple>true</efficas:typesimple>
 				</efficas:valeurDef>
-				<typeAttendu>Bool</typeAttendu>
+				<nomTypeAttendu>bool</nomTypeAttendu>
 			</efficas:SIMP>
 			<efficas:SIMP efficas:nom="ctlWaterline" efficas:statut="o">
 				<efficas:valeurDef>
 					<efficas:typesimple>true</efficas:typesimple>
 				</efficas:valeurDef>
-				<typeAttendu>Bool</typeAttendu>
+				<nomTypeAttendu>bool</nomTypeAttendu>
 			</efficas:SIMP>
 			<efficas:SIMP efficas:nom="sauvegardeLigneIni" efficas:statut="o">
 				<efficas:valeurDef>
 					<efficas:typesimple>true</efficas:typesimple>
 				</efficas:valeurDef>
-				<typeAttendu>Bool</typeAttendu>
+				<nomTypeAttendu>bool</nomTypeAttendu>
 			</efficas:SIMP>
 			<efficas:SIMP efficas:nom="impressionResultats" efficas:statut="o">
 				<efficas:valeurDef>
 					<efficas:typesimple>true</efficas:typesimple>
 				</efficas:valeurDef>
-				<typeAttendu>Bool</typeAttendu>
+				<nomTypeAttendu>bool</nomTypeAttendu>
 			</efficas:SIMP>
 		</PROC>
 		<PROC xmlns:efficas="http://chercheurs.edf.com/logiciels/efficas" efficas:nom="parametresCtlKS">
@@ -45,40 +45,40 @@
 						<efficas:typesimple>Z</efficas:typesimple>	<efficas:typesimple>Q</efficas:typesimple>						
 					</efficas:into>
 					</efficas:plageValeur>
-					<typeAttendu>TXM</typeAttendu>
+					<nomTypeAttendu>TXM</nomTypeAttendu>
 				</SIMP>
 				<efficas:SIMP efficas:nom="perturbationLitMin" efficas:statut="o">
 				    <efficas:valeurDef><efficas:typesimple>1</efficas:typesimple></efficas:valeurDef>
-					<typeAttendu>R</typeAttendu>
+					<nomTypeAttendu>R</nomTypeAttendu>
 				</efficas:SIMP>
 				<efficas:SIMP efficas:nom="perturbationLitMaj" efficas:statut="o">
 				    <efficas:valeurDef><efficas:typesimple>1</efficas:typesimple></efficas:valeurDef>
-					<typeAttendu>R</typeAttendu>
+					<nomTypeAttendu>R</nomTypeAttendu>
 				</efficas:SIMP>
 				<efficas:SIMP efficas:nom="seuilRejetMisfitKS" efficas:statut="o">
 				    <efficas:valeurDef><efficas:typesimple>20000</efficas:typesimple></efficas:valeurDef>
-					<typeAttendu>R</typeAttendu>
+					<nomTypeAttendu>R</nomTypeAttendu>
 				</efficas:SIMP>
 				<efficas:SIMP efficas:nom="impressionKS" efficas:statut="o">
 				    <efficas:valeurDef><efficas:typesimple>false</efficas:typesimple></efficas:valeurDef>
-					<typeAttendu>Bool</typeAttendu>
+					<nomTypeAttendu>bool</nomTypeAttendu>
 				</efficas:SIMP>
 				<efficas:SIMP efficas:nom="iterationsSigmaKS" efficas:statut="f">
-					<typeAttendu>R</typeAttendu>
+					<nomTypeAttendu>R</nomTypeAttendu>
 				</efficas:SIMP>
 			</FACT>
 			<FACT efficas:nom="tempsCtlKS" efficas:statut="o">
 					<SIMP efficas:nom="tempsDebutCtlKS" efficas:statut="o">
-						<typeAttendu>R</typeAttendu>
+						<nomTypeAttendu>R</nomTypeAttendu>
 					</SIMP>
 			        <efficas:SIMP efficas:nom="tempsFinCtlKS" efficas:statut="o">
-					    <typeAttendu>R</typeAttendu>
+					    <nomTypeAttendu>R</nomTypeAttendu>
 					</efficas:SIMP>
 			        <efficas:SIMP efficas:nom="frequenceObsCtlKS" efficas:statut="o">
-					    <typeAttendu>R</typeAttendu>
+					    <nomTypeAttendu>R</nomTypeAttendu>
 					</efficas:SIMP>
 			        <efficas:SIMP efficas:nom="dureeCtlKS" efficas:statut="f">
-					    <typeAttendu>R</typeAttendu>
+					    <nomTypeAttendu>R</nomTypeAttendu>
 					</efficas:SIMP>
 			</FACT>
 			<efficas:FACT efficas:nom="zonesKS" efficas:statut="o">
@@ -86,36 +86,36 @@
 				     <efficas:doc efficas:ang="Utiliser le modèle étendu d'Eficas pour projeter NUM en attribut"/>
                     <efficas:FACT efficas:nom="ctlLitMin" efficas:statut="f">
                       <efficas:SIMP efficas:nom="activation" efficas:statut="f">
-						<typeAttendu>Bool</typeAttendu>
+						<nomTypeAttendu>bool</nomTypeAttendu>
 					</efficas:SIMP>
                       <efficas:SIMP efficas:nom="ecartType" efficas:statut="o">
-						<typeAttendu>R</typeAttendu>
+						<nomTypeAttendu>R</nomTypeAttendu>
 					</efficas:SIMP>
                       <efficas:SIMP efficas:nom="valMinKS" efficas:statut="o">
-						<typeAttendu>R</typeAttendu>
+						<nomTypeAttendu>R</nomTypeAttendu>
 					</efficas:SIMP>
                       <efficas:SIMP efficas:nom="valMaxKS" efficas:statut="o">
-						<typeAttendu>R</typeAttendu>
+						<nomTypeAttendu>R</nomTypeAttendu>
 					</efficas:SIMP>
                     </efficas:FACT>
                     <efficas:FACT efficas:nom="ctlLitMax" efficas:statut="f">
                       <efficas:SIMP efficas:nom="activation" efficas:statut="f">
-						<typeAttendu>Bool</typeAttendu>
+						<nomTypeAttendu>bool</nomTypeAttendu>
 					</efficas:SIMP>
                       <efficas:SIMP efficas:nom="ecartType" efficas:statut="o">
-						<typeAttendu>R</typeAttendu>
+						<nomTypeAttendu>R</nomTypeAttendu>
 					</efficas:SIMP>
                       <efficas:SIMP efficas:nom="valMinKS" efficas:statut="o">
-						<typeAttendu>R</typeAttendu>
+						<nomTypeAttendu>R</nomTypeAttendu>
 					</efficas:SIMP>
                       <efficas:SIMP efficas:nom="valMaxKS" efficas:statut="o">
-						<typeAttendu>R</typeAttendu>
+						<nomTypeAttendu>R</nomTypeAttendu>
 					</efficas:SIMP>
                     </efficas:FACT>
                     <efficas:FACT efficas:nom="stationsObsKS" efficas:statut="o" >
                         <efficas:SIMP efficas:nom="cdStationHydro" efficas:statut="f" efficas:minOccurences="0" efficas:maxOccurences="1">
                            <efficas:doc efficas:ang="choix dans la projection : soit une sequence d'éléments soit une liste de type simple (Modèle Eficas Etendu)"/>
-    						<typeAttendu>TXM</typeAttendu>
+    						<nomTypeAttendu>TXM</nomTypeAttendu>
 						</efficas:SIMP>
  				    </efficas:FACT>
 				</efficas:FACT>
@@ -126,84 +126,84 @@
 		<efficas:SIMP efficas:nom="grandeurObserveeLois" efficas:statut="o">
 			<efficas:valeurDef><efficas:typesimple>Z</efficas:typesimple></efficas:valeurDef>
 		    <efficas:plageValeur><efficas:into><efficas:typesimple>Z</efficas:typesimple><efficas:typesimple>Q</efficas:typesimple></efficas:into></efficas:plageValeur>
-			<typeAttendu>TXM</typeAttendu>
+			<nomTypeAttendu>TXM</nomTypeAttendu>
 		</efficas:SIMP>
 		<efficas:FACT efficas:nom="perturbationsLois" efficas:statut="o">
 			<efficas:FACT efficas:nom="perturbationsCote" efficas:statut="o">
-			  <efficas:SIMP efficas:nom="perturbationA" efficas:statut="o">	<typeAttendu>R</typeAttendu>  </efficas:SIMP>
-			  <efficas:SIMP efficas:nom="perturbationB" efficas:statut="o">	<typeAttendu>R</typeAttendu>  </efficas:SIMP>
-			  <efficas:SIMP efficas:nom="perturbationC" efficas:statut="o">	<typeAttendu>R</typeAttendu>  </efficas:SIMP>
+			  <efficas:SIMP efficas:nom="perturbationA" efficas:statut="o">	<nomTypeAttendu>R</nomTypeAttendu>  </efficas:SIMP>
+			  <efficas:SIMP efficas:nom="perturbationB" efficas:statut="o">	<nomTypeAttendu>R</nomTypeAttendu>  </efficas:SIMP>
+			  <efficas:SIMP efficas:nom="perturbationC" efficas:statut="o">	<nomTypeAttendu>R</nomTypeAttendu>  </efficas:SIMP>
 			</efficas:FACT>
 			
 			<efficas:FACT efficas:nom="perturbationsDebit" efficas:statut="o">
-			  <efficas:SIMP efficas:nom="perturbationA" efficas:statut="o">	<typeAttendu>R</typeAttendu>  </efficas:SIMP>
-			  <efficas:SIMP efficas:nom="perturbationB" efficas:statut="o">	<typeAttendu>R</typeAttendu>  </efficas:SIMP>
-			  <efficas:SIMP efficas:nom="perturbationC" efficas:statut="o">	<typeAttendu>R</typeAttendu>  </efficas:SIMP>
+			  <efficas:SIMP efficas:nom="perturbationA" efficas:statut="o">	<nomTypeAttendu>R</nomTypeAttendu>  </efficas:SIMP>
+			  <efficas:SIMP efficas:nom="perturbationB" efficas:statut="o">	<nomTypeAttendu>R</nomTypeAttendu>  </efficas:SIMP>
+			  <efficas:SIMP efficas:nom="perturbationC" efficas:statut="o">	<nomTypeAttendu>R</nomTypeAttendu>  </efficas:SIMP>
 			</efficas:FACT>
 
 			<efficas:FACT efficas:nom="perturbationsDebitLineique" efficas:statut="o">
-			  <efficas:SIMP efficas:nom="perturbationA" efficas:statut="o">	<typeAttendu>R</typeAttendu>  </efficas:SIMP>
-			  <efficas:SIMP efficas:nom="perturbationB" efficas:statut="o">	<typeAttendu>R</typeAttendu>  </efficas:SIMP>
-			  <efficas:SIMP efficas:nom="perturbationC" efficas:statut="o">	<typeAttendu>R</typeAttendu>  </efficas:SIMP>
+			  <efficas:SIMP efficas:nom="perturbationA" efficas:statut="o">	<nomTypeAttendu>R</nomTypeAttendu>  </efficas:SIMP>
+			  <efficas:SIMP efficas:nom="perturbationB" efficas:statut="o">	<nomTypeAttendu>R</nomTypeAttendu>  </efficas:SIMP>
+			  <efficas:SIMP efficas:nom="perturbationC" efficas:statut="o">	<nomTypeAttendu>R</nomTypeAttendu>  </efficas:SIMP>
 			</efficas:FACT>
 			
 			<efficas:SIMP efficas:nom="seuilRejetMisfitLois" efficas:statut="o">
-				<typeAttendu>R</typeAttendu>
+				<nomTypeAttendu>R</nomTypeAttendu>
 			</efficas:SIMP>
 			
 			<efficas:SIMP efficas:nom="impressionLois" efficas:statut="o">
-				<typeAttendu>Bool</typeAttendu>
+				<nomTypeAttendu>bool</nomTypeAttendu>
 			</efficas:SIMP>
 			
 			<efficas:SIMP efficas:nom="iterationsSigmaLois">
-				<typeAttendu>I</typeAttendu>
+				<nomTypeAttendu>I</nomTypeAttendu>
 			</efficas:SIMP>
 		</efficas:FACT> 
 		
 		<efficas:FACT efficas:nom="tempsCtlLois" efficas:statut="o">
-			  <efficas:SIMP efficas:nom="tempsDebutCtlLois" efficas:statut="o">	<typeAttendu>R</typeAttendu>  </efficas:SIMP>
-			  <efficas:SIMP efficas:nom="tempsFinCtlLois" efficas:statut="o">	<typeAttendu>R</typeAttendu>  </efficas:SIMP>
-			  <efficas:SIMP efficas:nom="frequenceObsCtlLois" efficas:statut="o">	<typeAttendu>R</typeAttendu>  </efficas:SIMP>
-			  <efficas:SIMP efficas:nom="dureeCtlLois" efficas:statut="f">	<typeAttendu>I</typeAttendu>  </efficas:SIMP>
+			  <efficas:SIMP efficas:nom="tempsDebutCtlLois" efficas:statut="o">	<nomTypeAttendu>R</nomTypeAttendu>  </efficas:SIMP>
+			  <efficas:SIMP efficas:nom="tempsFinCtlLois" efficas:statut="o">	<nomTypeAttendu>R</nomTypeAttendu>  </efficas:SIMP>
+			  <efficas:SIMP efficas:nom="frequenceObsCtlLois" efficas:statut="o">	<nomTypeAttendu>R</nomTypeAttendu>  </efficas:SIMP>
+			  <efficas:SIMP efficas:nom="dureeCtlLois" efficas:statut="f">	<nomTypeAttendu>I</nomTypeAttendu>  </efficas:SIMP>
 		</efficas:FACT>
 		
 		<efficas:FACT efficas:nom="loiCtl" efficas:statut="f" efficas:minOccurences="0" efficas:maxOccurences="-1">
-             <efficas:SIMP efficas:nom="cdStationHydro" efficas:statut="o"><typeAttendu>TXM</typeAttendu></efficas:SIMP>
+             <efficas:SIMP efficas:nom="cdStationHydro" efficas:statut="o"><nomTypeAttendu>TXM</nomTypeAttendu></efficas:SIMP>
              <efficas:FACT efficas:nom="ctlA">
                       <efficas:SIMP efficas:nom="activation" efficas:statut="f">
-						<typeAttendu>Bool</typeAttendu>
+						<nomTypeAttendu>bool</nomTypeAttendu>
 					</efficas:SIMP>
                       <efficas:SIMP efficas:nom="ecartType" efficas:statut="o">
-						<typeAttendu>R</typeAttendu>
+						<nomTypeAttendu>R</nomTypeAttendu>
 					</efficas:SIMP>
 			</efficas:FACT>
              <efficas:FACT efficas:nom="ctlB">
                       <efficas:SIMP efficas:nom="activation" efficas:statut="f">
-						<typeAttendu>Bool</typeAttendu>
+						<nomTypeAttendu>bool</nomTypeAttendu>
 					</efficas:SIMP>
                       <efficas:SIMP efficas:nom="ecartType" efficas:statut="o">
-						<typeAttendu>R</typeAttendu>
+						<nomTypeAttendu>R</nomTypeAttendu>
 					</efficas:SIMP>
 			</efficas:FACT>
              <efficas:FACT efficas:nom="ctlC">
                       <efficas:SIMP efficas:nom="activation" efficas:statut="f">
-						<typeAttendu>Bool</typeAttendu>
+						<nomTypeAttendu>bool</nomTypeAttendu>
 					</efficas:SIMP>
                       <efficas:SIMP efficas:nom="ecartType" efficas:statut="o">
-						<typeAttendu>R</typeAttendu>
+						<nomTypeAttendu>R</nomTypeAttendu>
 					</efficas:SIMP>
 			</efficas:FACT>
 			
 			<efficas:FACT efficas:nom="stationsObsLois" efficas:statut="o" >
                         <efficas:SIMP efficas:nom="cdStationHydro" efficas:statut="f" efficas:minOccurences="0" efficas:maxOccurences="1">
                            <efficas:doc efficas:ang="choix dans la projection : soit une sequence d'éléments soit une liste de type simple (Modèle Eficas Etendu)"/>
-    						<typeAttendu>TXM</typeAttendu>
+    						<nomTypeAttendu>TXM</nomTypeAttendu>
 						</efficas:SIMP>
  			</efficas:FACT>
 
-            <efficas:SIMP efficas:nom="valeurMin" efficas:statut="o"> <typeAttendu>R</typeAttendu> </efficas:SIMP>
-            <efficas:SIMP efficas:nom="valeurMax" efficas:statut="o"> <typeAttendu>R</typeAttendu> </efficas:SIMP>
-            <efficas:SIMP efficas:nom="constanteApresTBase" efficas:statut="o"> <typeAttendu>Bool</typeAttendu> </efficas:SIMP>
+            <efficas:SIMP efficas:nom="valeurMin" efficas:statut="o"> <nomTypeAttendu>R</nomTypeAttendu> </efficas:SIMP>
+            <efficas:SIMP efficas:nom="valeurMax" efficas:statut="o"> <nomTypeAttendu>R</nomTypeAttendu> </efficas:SIMP>
+            <efficas:SIMP efficas:nom="constanteApresTBase" efficas:statut="o"> <nomTypeAttendu>bool</nomTypeAttendu> </efficas:SIMP>
 		</efficas:FACT> 
 		</efficas:FACT>
 		</PROC>
@@ -212,22 +212,22 @@
 			  <efficas:SIMP efficas:nom="grandeurObserveeWaterline" efficas:statut="o">
  			     <valeurDef><typesimple>Z</typesimple></valeurDef>
                  <efficas:plageValeur><efficas:into><efficas:typesimple>Z</efficas:typesimple><efficas:typesimple>Q</efficas:typesimple></efficas:into></efficas:plageValeur>			  
-			  	 <typeAttendu>TXM</typeAttendu>
+			  	 <nomTypeAttendu>TXM</nomTypeAttendu>
 			   </efficas:SIMP>
-			  <efficas:SIMP efficas:nom="seuilRejetMisfitWaterline" efficas:statut="o">	            <typeAttendu>R</typeAttendu>  </efficas:SIMP>
-			  <efficas:SIMP efficas:nom="correctionSystematiqueWaterline" efficas:statut="o">	<typeAttendu>Bool</typeAttendu>  </efficas:SIMP>
+			  <efficas:SIMP efficas:nom="seuilRejetMisfitWaterline" efficas:statut="o">	            <nomTypeAttendu>R</nomTypeAttendu>  </efficas:SIMP>
+			  <efficas:SIMP efficas:nom="correctionSystematiqueWaterline" efficas:statut="o">	<nomTypeAttendu>bool</nomTypeAttendu>  </efficas:SIMP>
 		    </FACT>
 
 
 			<FACT efficas:nom="Waterline" efficas:statut="o">
 					<SIMP efficas:nom="tempsFinCorrection" efficas:statut="o">
-						<typeAttendu>R</typeAttendu>
+						<nomTypeAttendu>R</nomTypeAttendu>
 					</SIMP>
 			        <efficas:SIMP efficas:nom="frequenceCorrection" efficas:statut="o">
-					    <typeAttendu>R</typeAttendu>
+					    <nomTypeAttendu>R</nomTypeAttendu>
 					</efficas:SIMP>
 			        <efficas:SIMP efficas:nom="tempsDebutMoyenneIncrements" efficas:statut="o">
-					    <typeAttendu>R</typeAttendu>
+					    <nomTypeAttendu>R</nomTypeAttendu>
 					</efficas:SIMP>
 			</FACT>
 
@@ -237,34 +237,34 @@
                     <efficas:FACT efficas:nom="stationsObsWaterline" efficas:statut="o" >
                         <efficas:SIMP efficas:nom="cdStationHydro" efficas:statut="f" efficas:minOccurences="0" efficas:maxOccurences="1">
                            <efficas:doc efficas:ang="choix dans la projection : soit une sequence d'éléments soit une liste de type simple (Modèle Eficas Etendu)"/>
-    						<typeAttendu>TXM</typeAttendu>
+    						<nomTypeAttendu>TXM</nomTypeAttendu>
 						</efficas:SIMP>
  				    </efficas:FACT>
 
 					<efficas:FACT efficas:nom="ecartTypeAvantCtl" efficas:statut="o">
-					  <efficas:SIMP efficas:nom="ecartTypeErrEbaucheZ" efficas:statut="o">	<typeAttendu>R</typeAttendu>  </efficas:SIMP>
-					  <efficas:SIMP efficas:nom="ecartTypeErrEbaucheQ" efficas:statut="o">	<typeAttendu>R</typeAttendu>  </efficas:SIMP>
+					  <efficas:SIMP efficas:nom="ecartTypeErrEbaucheZ" efficas:statut="o">	<nomTypeAttendu>R</nomTypeAttendu>  </efficas:SIMP>
+					  <efficas:SIMP efficas:nom="ecartTypeErrEbaucheQ" efficas:statut="o">	<nomTypeAttendu>R</nomTypeAttendu>  </efficas:SIMP>
 					</efficas:FACT>
 	
 					<efficas:FACT efficas:nom="ecartTypeApresCtl" efficas:statut="o">
-					  <efficas:SIMP efficas:nom="ecartTypeErrEbaucheZ" efficas:statut="o">	<typeAttendu>R</typeAttendu>  </efficas:SIMP>
-					  <efficas:SIMP efficas:nom="ecartTypeErrEbaucheQ" efficas:statut="o">	<typeAttendu>R</typeAttendu>  </efficas:SIMP>
+					  <efficas:SIMP efficas:nom="ecartTypeErrEbaucheZ" efficas:statut="o">	<nomTypeAttendu>R</nomTypeAttendu>  </efficas:SIMP>
+					  <efficas:SIMP efficas:nom="ecartTypeErrEbaucheQ" efficas:statut="o">	<nomTypeAttendu>R</nomTypeAttendu>  </efficas:SIMP>
 					</efficas:FACT>
 	
 					<efficas:FACT efficas:nom="longueursPorteeZ" efficas:statut="o">
-					  <efficas:SIMP efficas:nom="longueurPorteeAmont" efficas:statut="o">	<typeAttendu>R</typeAttendu>  </efficas:SIMP>
-					  <efficas:SIMP efficas:nom="longueurPorteeAval" efficas:statut="o">	<typeAttendu>R</typeAttendu>  </efficas:SIMP>
+					  <efficas:SIMP efficas:nom="longueurPorteeAmont" efficas:statut="o">	<nomTypeAttendu>R</nomTypeAttendu>  </efficas:SIMP>
+					  <efficas:SIMP efficas:nom="longueurPorteeAval" efficas:statut="o">	<nomTypeAttendu>R</nomTypeAttendu>  </efficas:SIMP>
 					</efficas:FACT>
 	
 					<efficas:FACT efficas:nom="longueursPorteeQ" efficas:statut="o">
-					  <efficas:SIMP efficas:nom="longueurPorteeAmont" efficas:statut="o">	<typeAttendu>R</typeAttendu>  </efficas:SIMP>
-					  <efficas:SIMP efficas:nom="longueurPorteeAval" efficas:statut="o">	<typeAttendu>R</typeAttendu>  </efficas:SIMP>
+					  <efficas:SIMP efficas:nom="longueurPorteeAmont" efficas:statut="o">	<nomTypeAttendu>R</nomTypeAttendu>  </efficas:SIMP>
+					  <efficas:SIMP efficas:nom="longueurPorteeAval" efficas:statut="o">	<nomTypeAttendu>R</nomTypeAttendu>  </efficas:SIMP>
 					</efficas:FACT>
 	
 					<efficas:FACT efficas:nom="courbeTarage" efficas:statut="o">
-						  <efficas:SIMP efficas:nom="coefficientA" efficas:statut="o">	<typeAttendu>R</typeAttendu>  </efficas:SIMP>
-						  <efficas:SIMP efficas:nom="coefficientR" efficas:statut="o">	<typeAttendu>R</typeAttendu>  </efficas:SIMP>
-						  <efficas:SIMP efficas:nom="coefficientB" efficas:statut="o">	<typeAttendu>R</typeAttendu>  </efficas:SIMP>
+						  <efficas:SIMP efficas:nom="coefficientA" efficas:statut="o">	<nomTypeAttendu>R</nomTypeAttendu>  </efficas:SIMP>
+						  <efficas:SIMP efficas:nom="coefficientR" efficas:statut="o">	<nomTypeAttendu>R</nomTypeAttendu>  </efficas:SIMP>
+						  <efficas:SIMP efficas:nom="coefficientB" efficas:statut="o">	<nomTypeAttendu>R</nomTypeAttendu>  </efficas:SIMP>
 					</efficas:FACT>
 	
 				</FACT>
@@ -275,34 +275,34 @@
 		<PROC efficas:nom="parametresObservations">
 
 			<efficas:FACT efficas:nom="parametresGenerauxObservations" efficas:statut="o">
-				  <efficas:SIMP efficas:nom="prefixeFichierObs" efficas:statut="o">	<typeAttendu>Repertoire</typeAttendu>  </efficas:SIMP>
-				  <efficas:SIMP efficas:nom="pasDeTempsFichierObs" efficas:statut="o">	<typeAttendu>R</typeAttendu>  </efficas:SIMP>
-				  <efficas:SIMP efficas:nom="tailleFenetreLissageObs" efficas:statut="o">	<typeAttendu>R</typeAttendu>  </efficas:SIMP>
+				  <efficas:SIMP efficas:nom="prefixeFichierObs" efficas:statut="o">	<nomTypeAttendu>Repertoire</nomTypeAttendu>  </efficas:SIMP>
+				  <efficas:SIMP efficas:nom="pasDeTempsFichierObs" efficas:statut="o">	<nomTypeAttendu>R</nomTypeAttendu>  </efficas:SIMP>
+				  <efficas:SIMP efficas:nom="tailleFenetreLissageObs" efficas:statut="o">	<nomTypeAttendu>R</nomTypeAttendu>  </efficas:SIMP>
 			</efficas:FACT>
 
 			<efficas:FACT efficas:nom="stationsObs" efficas:statut="o" >
 				<efficas:FACT efficas:nom="stationObs" efficas:statut="o" >
                         <efficas:SIMP efficas:nom="cdStationHydro" efficas:statut="f" efficas:minOccurences="0" efficas:maxOccurences="1">
                            <efficas:doc efficas:ang="choix dans la projection : soit une sequence d'éléments soit une liste de type simple (Modèle Eficas Etendu)"/>
-    						<typeAttendu>TXM</typeAttendu>
+    						<nomTypeAttendu>TXM</nomTypeAttendu>
 						</efficas:SIMP>
-					  <efficas:SIMP efficas:nom="lbStationHydro" efficas:statut="f">	<typeAttendu>TXM</typeAttendu>  </efficas:SIMP>
-					  <efficas:SIMP efficas:nom="brancheStation" efficas:statut="o">	<typeAttendu>I</typeAttendu>  </efficas:SIMP>
-					  <efficas:SIMP efficas:nom="abscisseStation" efficas:statut="o">	<typeAttendu>R</typeAttendu>  </efficas:SIMP>
-					  <efficas:SIMP efficas:nom="decalageStation" efficas:statut="o">	<typeAttendu>R</typeAttendu>  </efficas:SIMP>
+					  <efficas:SIMP efficas:nom="lbStationHydro" efficas:statut="f">	<nomTypeAttendu>TXM</nomTypeAttendu>  </efficas:SIMP>
+					  <efficas:SIMP efficas:nom="brancheStation" efficas:statut="o">	<nomTypeAttendu>I</nomTypeAttendu>  </efficas:SIMP>
+					  <efficas:SIMP efficas:nom="abscisseStation" efficas:statut="o">	<nomTypeAttendu>R</nomTypeAttendu>  </efficas:SIMP>
+					  <efficas:SIMP efficas:nom="decalageStation" efficas:statut="o">	<nomTypeAttendu>R</nomTypeAttendu>  </efficas:SIMP>
 
-  					  <efficas:SIMP efficas:nom="ecartTypeErrObsZ" efficas:statut="o">	<typeAttendu>R</typeAttendu>  </efficas:SIMP>
-					  <efficas:SIMP efficas:nom="ecartTypeErrObsQ" efficas:statut="o">	<typeAttendu>R</typeAttendu>  </efficas:SIMP>
-					  <efficas:SIMP efficas:nom="seuilRejetObsZ" efficas:statut="o">	<typeAttendu>R</typeAttendu>  </efficas:SIMP>
-					  <efficas:SIMP efficas:nom="seuilRejetObsQ" efficas:statut="o">	<typeAttendu>R</typeAttendu>  </efficas:SIMP>
+  					  <efficas:SIMP efficas:nom="ecartTypeErrObsZ" efficas:statut="o">	<nomTypeAttendu>R</nomTypeAttendu>  </efficas:SIMP>
+					  <efficas:SIMP efficas:nom="ecartTypeErrObsQ" efficas:statut="o">	<nomTypeAttendu>R</nomTypeAttendu>  </efficas:SIMP>
+					  <efficas:SIMP efficas:nom="seuilRejetObsZ" efficas:statut="o">	<nomTypeAttendu>R</nomTypeAttendu>  </efficas:SIMP>
+					  <efficas:SIMP efficas:nom="seuilRejetObsQ" efficas:statut="o">	<nomTypeAttendu>R</nomTypeAttendu>  </efficas:SIMP>
 				</efficas:FACT>
  			</efficas:FACT>
 			
 		</PROC>
 		
 		<PROC efficas:nom="parametresSauvegardeLigneIni">
-			  <efficas:SIMP efficas:nom="tempsSauvegardeLigneIni" efficas:statut="o">	<typeAttendu>R</typeAttendu>  </efficas:SIMP>
-			  <efficas:SIMP efficas:nom="cheminSauvegardeLigneIni" efficas:statut="o">	<typeAttendu>Repertoire</typeAttendu>  </efficas:SIMP>
+			  <efficas:SIMP efficas:nom="tempsSauvegardeLigneIni" efficas:statut="o">	<nomTypeAttendu>R</nomTypeAttendu>  </efficas:SIMP>
+			  <efficas:SIMP efficas:nom="cheminSauvegardeLigneIni" efficas:statut="o">	<nomTypeAttendu>Repertoire</nomTypeAttendu>  </efficas:SIMP>
 		</PROC>
 		
 		<PROC efficas:nom="parametresImpressionResultats">
@@ -311,21 +311,21 @@
 				<efficas:FACT efficas:nom="stationRes" efficas:statut="o" >
                         <efficas:SIMP efficas:nom="cdStationHydro" efficas:statut="f" efficas:minOccurences="0" efficas:maxOccurences="1">
                            <efficas:doc efficas:ang="choix dans la projection : soit une sequence d'éléments soit une liste de type simple (Modèle Eficas Etendu)"/>
-    						<typeAttendu>TXM</typeAttendu>
+    						<nomTypeAttendu>TXM</nomTypeAttendu>
 						</efficas:SIMP>
-					  <efficas:SIMP efficas:nom="lbStationHydro" efficas:statut="f">	<typeAttendu>TXM</typeAttendu>  </efficas:SIMP>
-					  <efficas:SIMP efficas:nom="brancheStation" efficas:statut="o">	<typeAttendu>I</typeAttendu>  </efficas:SIMP>
-					  <efficas:SIMP efficas:nom="abscisseStation" efficas:statut="o">	<typeAttendu>R</typeAttendu>  </efficas:SIMP>
-					  <efficas:SIMP efficas:nom="decalageStation" efficas:statut="o">	<typeAttendu>R</typeAttendu>  </efficas:SIMP>
-  					  <efficas:SIMP efficas:nom="sectionStRes" efficas:statut="o">	<typeAttendu>I</typeAttendu>  </efficas:SIMP>
+					  <efficas:SIMP efficas:nom="lbStationHydro" efficas:statut="f">	<nomTypeAttendu>TXM</nomTypeAttendu>  </efficas:SIMP>
+					  <efficas:SIMP efficas:nom="brancheStation" efficas:statut="o">	<nomTypeAttendu>I</nomTypeAttendu>  </efficas:SIMP>
+					  <efficas:SIMP efficas:nom="abscisseStation" efficas:statut="o">	<nomTypeAttendu>R</nomTypeAttendu>  </efficas:SIMP>
+					  <efficas:SIMP efficas:nom="decalageStation" efficas:statut="o">	<nomTypeAttendu>R</nomTypeAttendu>  </efficas:SIMP>
+  					  <efficas:SIMP efficas:nom="sectionStRes" efficas:statut="o">	<nomTypeAttendu>I</nomTypeAttendu>  </efficas:SIMP>
 				</efficas:FACT>
  			</efficas:FACT>
 
-			  <efficas:SIMP efficas:nom="nbMaxEcheances" efficas:statut="o">	<typeAttendu>I</typeAttendu>  </efficas:SIMP>
-			  <efficas:SIMP efficas:nom="echeance" efficas:statut="o" efficas:minOccurences="0" efficas:maxOccurences="-1">	<typeAttendu>I</typeAttendu>  </efficas:SIMP>
-			  <efficas:SIMP efficas:nom="echeancePassee" efficas:statut="o">	<typeAttendu>I</typeAttendu>  </efficas:SIMP>
-			  <efficas:SIMP efficas:nom="nrStationTracerObsAbcMn" efficas:statut="o">	<typeAttendu>I</typeAttendu>  </efficas:SIMP>
-			  <efficas:SIMP efficas:nom="fichierIncrements" efficas:statut="o">	<typeAttendu>Fichier</typeAttendu>  </efficas:SIMP>
+			  <efficas:SIMP efficas:nom="nbMaxEcheances" efficas:statut="o">	<nomTypeAttendu>I</nomTypeAttendu>  </efficas:SIMP>
+			  <efficas:SIMP efficas:nom="echeance" efficas:statut="o" efficas:minOccurences="0" efficas:maxOccurences="-1">	<nomTypeAttendu>I</nomTypeAttendu>  </efficas:SIMP>
+			  <efficas:SIMP efficas:nom="echeancePassee" efficas:statut="o">	<nomTypeAttendu>I</nomTypeAttendu>  </efficas:SIMP>
+			  <efficas:SIMP efficas:nom="nrStationTracerObsAbcMn" efficas:statut="o">	<nomTypeAttendu>I</nomTypeAttendu>  </efficas:SIMP>
+			  <efficas:SIMP efficas:nom="fichierIncrements" efficas:statut="o">	<nomTypeAttendu>Fichier</nomTypeAttendu>  </efficas:SIMP>
 
 
 
diff --git a/mascaret/configuration_mascaret.py b/mascaret/configuration_mascaret.py
index 7695ed41..a38d1691 100644
--- a/mascaret/configuration_mascaret.py
+++ b/mascaret/configuration_mascaret.py
@@ -1,46 +1,43 @@
-# -*- coding: utf-8 -*-
-#
-#  Copyright (C) 2012-2013 EDF
-#
-#  This file is part of SALOME HYDRO module.
-#
-#  SALOME HYDRO module is free software: you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation, either version 3 of the License, or
-#  (at your option) any later version.
-#
-#  SALOME HYDRO module is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with SALOME HYDRO module.  If not, see <http://www.gnu.org/licenses/>.
-
-import os
-
-from Editeur.catadesc import CatalogDescription
-from InterfaceQT4.configuration import CONFIG_BASE
-
-class CONFIG(CONFIG_BASE):
-
-    def __init__(self, appli, repIni):
-        """
-        This class stores the configuration parameters for Eficas
-        """
-        CONFIG_BASE.__init__(self, appli, repIni)
-
-        # Configuration parameters
-        self.savedir    = os.getenv("HOME")
-        self.catalogues = (CatalogDescription("mascaret_V7",
-                                              os.path.join(repIni, "mascaret_V7_cata.py")),)
-        self.lang = 'fr'
-
-    def save_params(self):
-        pass
-
-def make_config(appli, rep):
-    return CONFIG(appli, rep)
-
-def make_config_style(appli, rep):
-    return None
+# -*- 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.
+#
+#
+# ======================================================================
+"""
+    Ce module sert pour charger les paramètres de configuration d'EFICAS
+"""
+# Modules Python
+from InterfaceQT4 import configuration
+import os
+
+
+class CONFIG(configuration.configBase):
+
+  #-----------------------------------
+  def __init__(self,appli,repIni):
+  #-----------------------------------
+
+      self.labels_user=['catalogues','lang','force_langue']
+      self.labels_eficas=['lang','rep_cata','catalogues']
+
+      configuration.configBase.__init__(self,appli,'.Eficas_monCode')
+
+
+def make_config(appli,rep):
+    return CONFIG(appli,rep)
+
diff --git a/mascaret/prefs_mascaret.py b/mascaret/prefs_mascaret.py
index a2c5523d..c90e011c 100644
--- a/mascaret/prefs_mascaret.py
+++ b/mascaret/prefs_mascaret.py
@@ -27,5 +27,5 @@ closeCopier=True
 
 typeDeCata='XML'
 catalogues=(
-   ('mascaret','mascaret',os.path.join(repIni,'mascaret-1.0.xml'),'python','python'),
+   ('mascaret','mascaret',os.path.join(repIni,'cata-mascaret-v1.0.xml'),'python','python'),
 )
diff --git a/mascaret/qtEficas_mascaret.py b/mascaret/qtEficas_mascaret.py
new file mode 100755
index 00000000..c140518c
--- /dev/null
+++ b/mascaret/qtEficas_mascaret.py
@@ -0,0 +1,33 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# Copyright (C) 2007-2012   EDF R&D
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+"""
+   Ce module sert a lancer EFICAS configure pour Code_Aster
+"""
+# Modules Python
+# Modules Eficas
+
+from __future__ import absolute_import
+import sys,os
+sys.path.append(os.path.join(os.path.abspath(os.path.dirname(__file__)),'..'))
+
+import prefs
+from InterfaceQT4 import eficas_go
+eficas_go.lanceEficas(code=prefs.code)
-- 
2.39.2