Mise à jour modèle Efficas v9, Bool -> bool et typeAttendu en nomTypeAttendu

diff --git a/Efi2Xsd/ModeleEficas/Model Efficas (1.1)  v9.xsd b/Efi2Xsd/ModeleEficas/Model Efficas (1.1)  v9.xsd
index 724f6ae6280a99a958cc2cd0845a26d46cfc3008..eabfae5a273e9c02a3fa30964622e3b378c19da7 100755 (executable)
--- a/Efi2Xsd/ModeleEficas/Model Efficas (1.1)  v9.xsd
+++ b/Efi2Xsd/ModeleEficas/Model Efficas (1.1)  v9.xsd
@@ -18,8 +18,8 @@
        </xs:element>\r
        <xs:element name="validators" type="T_validators"/>\r
        <xs:element name="plageValeur" type="T_plageValeur"/>\r
-       <xs:element name="typeAttendu" type="T_name"/>\r
-       <xs:element name="classeUtilisateurName" type="T_classeUtilisateurName" abstract="true" substitutionGroup="typeAttendu"/>\r
+       <xs:element name="nomTypeAttendu" type="T_name"/>\r
+       <xs:element name="classeUtilisateurName" type="T_classeUtilisateurName" abstract="true" substitutionGroup="nomTypeAttendu"/>\r
        <xs:element name="SIMP" type="T_SIMP"/>\r
        <xs:element name="portee" type="T_portee" default="None"/>\r
        <xs:element name="condition" type="T_fonctionUtilisateur"/>\r
@@ -323,7 +323,7 @@
                        <xs:element ref="valeurDef" minOccurs="0"/>\r
                        <xs:element ref="valeurSugg" minOccurs="0"/>\r
                        <xs:element ref="plageValeur" minOccurs="0"/>\r
-                       <xs:element ref="typeAttendu"/>\r
+                       <xs:element ref="nomTypeAttendu"/>\r
                        <xs:element ref="validators" minOccurs="0"/>\r
                </xs:sequence>\r
                <xs:attribute ref="nom" use="required"/>\r
@@ -437,11 +437,11 @@
                        <xs:enumeration value="VerifTypeTuple"/>\r
                </xs:restriction>\r
        </xs:simpleType>\r
-       <xs:simpleType name="T_Bool">\r
+       <xs:simpleType name="T_bool">\r
                <xs:restriction base="xs:boolean"/>\r
        </xs:simpleType>\r
-       <xs:simpleType name="T_list_Bool">\r
-               <xs:list itemType="T_Bool"/>\r
+       <xs:simpleType name="T_list_bool">\r
+               <xs:list itemType="T_bool"/>\r
        </xs:simpleType>\r
        <xs:simpleType name="T_I">\r
                <xs:restriction base="xs:int"/>\r
@@ -487,7 +487,7 @@
                        <xs:enumeration value="I"/>\r
                        <xs:enumeration value="R"/>\r
                        <xs:enumeration value="C"/>\r
-                       <xs:enumeration value="Bool"/>\r
+                       <xs:enumeration value="bool"/>\r
                        <xs:enumeration value="grma"/>\r
                        <xs:enumeration value="grno"/>\r
                        <xs:enumeration value="SalomeEntry"/>\r
@@ -536,7 +536,7 @@
                </xs:list>\r
        </xs:simpleType>\r
        <xs:simpleType name="T_simple">\r
-               <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"/>\r
+               <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"/>\r
        </xs:simpleType>\r
        <!--    <xs:complexType name="T_TXM"/>-->\r
        <!--    <xs:simpleType name="T_simple">\r
@@ -547,7 +547,7 @@
                        <xs:enumeration value="I"/>\r
                        <xs:enumeration value="R"/>\r
                        <xs:enumeration value="C"/>\r
-                       <xs:enumeration value="Bool"/>\r
+                       <xs:enumeration value="bool"/>\r
                        <xs:enumeration value="grma"/>\r
                        <xs:enumeration value="grno"/>\r
                        <xs:enumeration value="SalomeEntry"/>\r

diff --git a/mascaret/cata-mascaret-v1.0.xml b/mascaret/cata-mascaret-v1.0.xml
index 6e72049d2a6a3ff0fe3c1581e6a2becd408351c8..1def4baa150b5477b08238979f2512559432b6e3 100755 (executable)
--- a/mascaret/cata-mascaret-v1.0.xml
+++ b/mascaret/cata-mascaret-v1.0.xml
@@ -7,31 +7,31 @@
                                <efficas:valeurDef>\r
                                        <efficas:typesimple>false</efficas:typesimple>\r
                                </efficas:valeurDef>\r
-                               <typeAttendu>Bool</typeAttendu>\r
+                               <nomTypeAttendu>bool</nomTypeAttendu>\r
                        </efficas:SIMP>\r
                        <efficas:SIMP efficas:nom="ctlLois" efficas:statut="o">\r
                                <efficas:valeurDef>\r
                                        <efficas:typesimple>true</efficas:typesimple>\r
                                </efficas:valeurDef>\r
-                               <typeAttendu>Bool</typeAttendu>\r
+                               <nomTypeAttendu>bool</nomTypeAttendu>\r
                        </efficas:SIMP>\r
                        <efficas:SIMP efficas:nom="ctlWaterline" efficas:statut="o">\r
                                <efficas:valeurDef>\r
                                        <efficas:typesimple>true</efficas:typesimple>\r
                                </efficas:valeurDef>\r
-                               <typeAttendu>Bool</typeAttendu>\r
+                               <nomTypeAttendu>bool</nomTypeAttendu>\r
                        </efficas:SIMP>\r
                        <efficas:SIMP efficas:nom="sauvegardeLigneIni" efficas:statut="o">\r
                                <efficas:valeurDef>\r
                                        <efficas:typesimple>true</efficas:typesimple>\r
                                </efficas:valeurDef>\r
-                               <typeAttendu>Bool</typeAttendu>\r
+                               <nomTypeAttendu>bool</nomTypeAttendu>\r
                        </efficas:SIMP>\r
                        <efficas:SIMP efficas:nom="impressionResultats" efficas:statut="o">\r
                                <efficas:valeurDef>\r
                                        <efficas:typesimple>true</efficas:typesimple>\r
                                </efficas:valeurDef>\r
-                               <typeAttendu>Bool</typeAttendu>\r
+                               <nomTypeAttendu>bool</nomTypeAttendu>\r
                        </efficas:SIMP>\r
                </PROC>\r
                <PROC xmlns:efficas="http://chercheurs.edf.com/logiciels/efficas" efficas:nom="parametresCtlKS">\r
@@ -45,40 +45,40 @@
                                                <efficas:typesimple>Z</efficas:typesimple>      <efficas:typesimple>Q</efficas:typesimple>                                              \r
                                        </efficas:into>\r
                                        </efficas:plageValeur>\r
-                                       <typeAttendu>TXM</typeAttendu>\r
+                                       <nomTypeAttendu>TXM</nomTypeAttendu>\r
                                </SIMP>\r
                                <efficas:SIMP efficas:nom="perturbationLitMin" efficas:statut="o">\r
                                    <efficas:valeurDef><efficas:typesimple>1</efficas:typesimple></efficas:valeurDef>\r
-                                       <typeAttendu>R</typeAttendu>\r
+                                       <nomTypeAttendu>R</nomTypeAttendu>\r
                                </efficas:SIMP>\r
                                <efficas:SIMP efficas:nom="perturbationLitMaj" efficas:statut="o">\r
                                    <efficas:valeurDef><efficas:typesimple>1</efficas:typesimple></efficas:valeurDef>\r
-                                       <typeAttendu>R</typeAttendu>\r
+                                       <nomTypeAttendu>R</nomTypeAttendu>\r
                                </efficas:SIMP>\r
                                <efficas:SIMP efficas:nom="seuilRejetMisfitKS" efficas:statut="o">\r
                                    <efficas:valeurDef><efficas:typesimple>20000</efficas:typesimple></efficas:valeurDef>\r
-                                       <typeAttendu>R</typeAttendu>\r
+                                       <nomTypeAttendu>R</nomTypeAttendu>\r
                                </efficas:SIMP>\r
                                <efficas:SIMP efficas:nom="impressionKS" efficas:statut="o">\r
                                    <efficas:valeurDef><efficas:typesimple>false</efficas:typesimple></efficas:valeurDef>\r
-                                       <typeAttendu>Bool</typeAttendu>\r
+                                       <nomTypeAttendu>bool</nomTypeAttendu>\r
                                </efficas:SIMP>\r
                                <efficas:SIMP efficas:nom="iterationsSigmaKS" efficas:statut="f">\r
-                                       <typeAttendu>R</typeAttendu>\r
+                                       <nomTypeAttendu>R</nomTypeAttendu>\r
                                </efficas:SIMP>\r
                        </FACT>\r
                        <FACT efficas:nom="tempsCtlKS" efficas:statut="o">\r
                                        <SIMP efficas:nom="tempsDebutCtlKS" efficas:statut="o">\r
-                                               <typeAttendu>R</typeAttendu>\r
+                                               <nomTypeAttendu>R</nomTypeAttendu>\r
                                        </SIMP>\r
                                <efficas:SIMP efficas:nom="tempsFinCtlKS" efficas:statut="o">\r
-                                           <typeAttendu>R</typeAttendu>\r
+                                           <nomTypeAttendu>R</nomTypeAttendu>\r
                                        </efficas:SIMP>\r
                                <efficas:SIMP efficas:nom="frequenceObsCtlKS" efficas:statut="o">\r
-                                           <typeAttendu>R</typeAttendu>\r
+                                           <nomTypeAttendu>R</nomTypeAttendu>\r
                                        </efficas:SIMP>\r
                                <efficas:SIMP efficas:nom="dureeCtlKS" efficas:statut="f">\r
-                                           <typeAttendu>R</typeAttendu>\r
+                                           <nomTypeAttendu>R</nomTypeAttendu>\r
                                        </efficas:SIMP>\r
                        </FACT>\r
                        <efficas:FACT efficas:nom="zonesKS" efficas:statut="o">\r
@@ -86,36 +86,36 @@
                                     <efficas:doc efficas:ang="Utiliser le modèle étendu d'Eficas pour projeter NUM en attribut"/>\r
                     <efficas:FACT efficas:nom="ctlLitMin" efficas:statut="f">\r
                       <efficas:SIMP efficas:nom="activation" efficas:statut="f">\r
-                                               <typeAttendu>Bool</typeAttendu>\r
+                                               <nomTypeAttendu>bool</nomTypeAttendu>\r
                                        </efficas:SIMP>\r
                       <efficas:SIMP efficas:nom="ecartType" efficas:statut="o">\r
-                                               <typeAttendu>R</typeAttendu>\r
+                                               <nomTypeAttendu>R</nomTypeAttendu>\r
                                        </efficas:SIMP>\r
                       <efficas:SIMP efficas:nom="valMinKS" efficas:statut="o">\r
-                                               <typeAttendu>R</typeAttendu>\r
+                                               <nomTypeAttendu>R</nomTypeAttendu>\r
                                        </efficas:SIMP>\r
                       <efficas:SIMP efficas:nom="valMaxKS" efficas:statut="o">\r
-                                               <typeAttendu>R</typeAttendu>\r
+                                               <nomTypeAttendu>R</nomTypeAttendu>\r
                                        </efficas:SIMP>\r
                     </efficas:FACT>\r
                     <efficas:FACT efficas:nom="ctlLitMax" efficas:statut="f">\r
                       <efficas:SIMP efficas:nom="activation" efficas:statut="f">\r
-                                               <typeAttendu>Bool</typeAttendu>\r
+                                               <nomTypeAttendu>bool</nomTypeAttendu>\r
                                        </efficas:SIMP>\r
                       <efficas:SIMP efficas:nom="ecartType" efficas:statut="o">\r
-                                               <typeAttendu>R</typeAttendu>\r
+                                               <nomTypeAttendu>R</nomTypeAttendu>\r
                                        </efficas:SIMP>\r
                       <efficas:SIMP efficas:nom="valMinKS" efficas:statut="o">\r
-                                               <typeAttendu>R</typeAttendu>\r
+                                               <nomTypeAttendu>R</nomTypeAttendu>\r
                                        </efficas:SIMP>\r
                       <efficas:SIMP efficas:nom="valMaxKS" efficas:statut="o">\r
-                                               <typeAttendu>R</typeAttendu>\r
+                                               <nomTypeAttendu>R</nomTypeAttendu>\r
                                        </efficas:SIMP>\r
                     </efficas:FACT>\r
                     <efficas:FACT efficas:nom="stationsObsKS" efficas:statut="o" >\r
                         <efficas:SIMP efficas:nom="cdStationHydro" efficas:statut="f" efficas:minOccurences="0" efficas:maxOccurences="1">\r
                            <efficas:doc efficas:ang="choix dans la projection : soit une sequence d'éléments soit une liste de type simple (Modèle Eficas Etendu)"/>\r
-                                               <typeAttendu>TXM</typeAttendu>\r
+                                               <nomTypeAttendu>TXM</nomTypeAttendu>\r
                                                </efficas:SIMP>\r
                                    </efficas:FACT>\r
                                </efficas:FACT>\r
@@ -126,84 +126,84 @@
                <efficas:SIMP efficas:nom="grandeurObserveeLois" efficas:statut="o">\r
                        <efficas:valeurDef><efficas:typesimple>Z</efficas:typesimple></efficas:valeurDef>\r
                    <efficas:plageValeur><efficas:into><efficas:typesimple>Z</efficas:typesimple><efficas:typesimple>Q</efficas:typesimple></efficas:into></efficas:plageValeur>\r
-                       <typeAttendu>TXM</typeAttendu>\r
+                       <nomTypeAttendu>TXM</nomTypeAttendu>\r
                </efficas:SIMP>\r
                <efficas:FACT efficas:nom="perturbationsLois" efficas:statut="o">\r
                        <efficas:FACT efficas:nom="perturbationsCote" efficas:statut="o">\r
-                         <efficas:SIMP efficas:nom="perturbationA" efficas:statut="o"> <typeAttendu>R</typeAttendu>  </efficas:SIMP>\r
-                         <efficas:SIMP efficas:nom="perturbationB" efficas:statut="o"> <typeAttendu>R</typeAttendu>  </efficas:SIMP>\r
-                         <efficas:SIMP efficas:nom="perturbationC" efficas:statut="o"> <typeAttendu>R</typeAttendu>  </efficas:SIMP>\r
+                         <efficas:SIMP efficas:nom="perturbationA" efficas:statut="o"> <nomTypeAttendu>R</nomTypeAttendu>  </efficas:SIMP>\r
+                         <efficas:SIMP efficas:nom="perturbationB" efficas:statut="o"> <nomTypeAttendu>R</nomTypeAttendu>  </efficas:SIMP>\r
+                         <efficas:SIMP efficas:nom="perturbationC" efficas:statut="o"> <nomTypeAttendu>R</nomTypeAttendu>  </efficas:SIMP>\r
                        </efficas:FACT>\r
                        \r
                        <efficas:FACT efficas:nom="perturbationsDebit" efficas:statut="o">\r
-                         <efficas:SIMP efficas:nom="perturbationA" efficas:statut="o"> <typeAttendu>R</typeAttendu>  </efficas:SIMP>\r
-                         <efficas:SIMP efficas:nom="perturbationB" efficas:statut="o"> <typeAttendu>R</typeAttendu>  </efficas:SIMP>\r
-                         <efficas:SIMP efficas:nom="perturbationC" efficas:statut="o"> <typeAttendu>R</typeAttendu>  </efficas:SIMP>\r
+                         <efficas:SIMP efficas:nom="perturbationA" efficas:statut="o"> <nomTypeAttendu>R</nomTypeAttendu>  </efficas:SIMP>\r
+                         <efficas:SIMP efficas:nom="perturbationB" efficas:statut="o"> <nomTypeAttendu>R</nomTypeAttendu>  </efficas:SIMP>\r
+                         <efficas:SIMP efficas:nom="perturbationC" efficas:statut="o"> <nomTypeAttendu>R</nomTypeAttendu>  </efficas:SIMP>\r
                        </efficas:FACT>\r
 \r
                        <efficas:FACT efficas:nom="perturbationsDebitLineique" efficas:statut="o">\r
-                         <efficas:SIMP efficas:nom="perturbationA" efficas:statut="o"> <typeAttendu>R</typeAttendu>  </efficas:SIMP>\r
-                         <efficas:SIMP efficas:nom="perturbationB" efficas:statut="o"> <typeAttendu>R</typeAttendu>  </efficas:SIMP>\r
-                         <efficas:SIMP efficas:nom="perturbationC" efficas:statut="o"> <typeAttendu>R</typeAttendu>  </efficas:SIMP>\r
+                         <efficas:SIMP efficas:nom="perturbationA" efficas:statut="o"> <nomTypeAttendu>R</nomTypeAttendu>  </efficas:SIMP>\r
+                         <efficas:SIMP efficas:nom="perturbationB" efficas:statut="o"> <nomTypeAttendu>R</nomTypeAttendu>  </efficas:SIMP>\r
+                         <efficas:SIMP efficas:nom="perturbationC" efficas:statut="o"> <nomTypeAttendu>R</nomTypeAttendu>  </efficas:SIMP>\r
                        </efficas:FACT>\r
                        \r
                        <efficas:SIMP efficas:nom="seuilRejetMisfitLois" efficas:statut="o">\r
-                               <typeAttendu>R</typeAttendu>\r
+                               <nomTypeAttendu>R</nomTypeAttendu>\r
                        </efficas:SIMP>\r
                        \r
                        <efficas:SIMP efficas:nom="impressionLois" efficas:statut="o">\r
-                               <typeAttendu>Bool</typeAttendu>\r
+                               <nomTypeAttendu>bool</nomTypeAttendu>\r
                        </efficas:SIMP>\r
                        \r
                        <efficas:SIMP efficas:nom="iterationsSigmaLois">\r
-                               <typeAttendu>I</typeAttendu>\r
+                               <nomTypeAttendu>I</nomTypeAttendu>\r
                        </efficas:SIMP>\r
                </efficas:FACT> \r
                \r
                <efficas:FACT efficas:nom="tempsCtlLois" efficas:statut="o">\r
-                         <efficas:SIMP efficas:nom="tempsDebutCtlLois" efficas:statut="o">     <typeAttendu>R</typeAttendu>  </efficas:SIMP>\r
-                         <efficas:SIMP efficas:nom="tempsFinCtlLois" efficas:statut="o">       <typeAttendu>R</typeAttendu>  </efficas:SIMP>\r
-                         <efficas:SIMP efficas:nom="frequenceObsCtlLois" efficas:statut="o">   <typeAttendu>R</typeAttendu>  </efficas:SIMP>\r
-                         <efficas:SIMP efficas:nom="dureeCtlLois" efficas:statut="f">  <typeAttendu>I</typeAttendu>  </efficas:SIMP>\r
+                         <efficas:SIMP efficas:nom="tempsDebutCtlLois" efficas:statut="o">     <nomTypeAttendu>R</nomTypeAttendu>  </efficas:SIMP>\r
+                         <efficas:SIMP efficas:nom="tempsFinCtlLois" efficas:statut="o">       <nomTypeAttendu>R</nomTypeAttendu>  </efficas:SIMP>\r
+                         <efficas:SIMP efficas:nom="frequenceObsCtlLois" efficas:statut="o">   <nomTypeAttendu>R</nomTypeAttendu>  </efficas:SIMP>\r
+                         <efficas:SIMP efficas:nom="dureeCtlLois" efficas:statut="f">  <nomTypeAttendu>I</nomTypeAttendu>  </efficas:SIMP>\r
                </efficas:FACT>\r
                \r
                <efficas:FACT efficas:nom="loiCtl" efficas:statut="f" efficas:minOccurences="0" efficas:maxOccurences="-1">\r
-             <efficas:SIMP efficas:nom="cdStationHydro" efficas:statut="o"><typeAttendu>TXM</typeAttendu></efficas:SIMP>\r
+             <efficas:SIMP efficas:nom="cdStationHydro" efficas:statut="o"><nomTypeAttendu>TXM</nomTypeAttendu></efficas:SIMP>\r
              <efficas:FACT efficas:nom="ctlA">\r
                       <efficas:SIMP efficas:nom="activation" efficas:statut="f">\r
-                                               <typeAttendu>Bool</typeAttendu>\r
+                                               <nomTypeAttendu>bool</nomTypeAttendu>\r
                                        </efficas:SIMP>\r
                       <efficas:SIMP efficas:nom="ecartType" efficas:statut="o">\r
-                                               <typeAttendu>R</typeAttendu>\r
+                                               <nomTypeAttendu>R</nomTypeAttendu>\r
                                        </efficas:SIMP>\r
                        </efficas:FACT>\r
              <efficas:FACT efficas:nom="ctlB">\r
                       <efficas:SIMP efficas:nom="activation" efficas:statut="f">\r
-                                               <typeAttendu>Bool</typeAttendu>\r
+                                               <nomTypeAttendu>bool</nomTypeAttendu>\r
                                        </efficas:SIMP>\r
                       <efficas:SIMP efficas:nom="ecartType" efficas:statut="o">\r
-                                               <typeAttendu>R</typeAttendu>\r
+                                               <nomTypeAttendu>R</nomTypeAttendu>\r
                                        </efficas:SIMP>\r
                        </efficas:FACT>\r
              <efficas:FACT efficas:nom="ctlC">\r
                       <efficas:SIMP efficas:nom="activation" efficas:statut="f">\r
-                                               <typeAttendu>Bool</typeAttendu>\r
+                                               <nomTypeAttendu>bool</nomTypeAttendu>\r
                                        </efficas:SIMP>\r
                       <efficas:SIMP efficas:nom="ecartType" efficas:statut="o">\r
-                                               <typeAttendu>R</typeAttendu>\r
+                                               <nomTypeAttendu>R</nomTypeAttendu>\r
                                        </efficas:SIMP>\r
                        </efficas:FACT>\r
                        \r
                        <efficas:FACT efficas:nom="stationsObsLois" efficas:statut="o" >\r
                         <efficas:SIMP efficas:nom="cdStationHydro" efficas:statut="f" efficas:minOccurences="0" efficas:maxOccurences="1">\r
                            <efficas:doc efficas:ang="choix dans la projection : soit une sequence d'éléments soit une liste de type simple (Modèle Eficas Etendu)"/>\r
-                                               <typeAttendu>TXM</typeAttendu>\r
+                                               <nomTypeAttendu>TXM</nomTypeAttendu>\r
                                                </efficas:SIMP>\r
                        </efficas:FACT>\r
 \r
-            <efficas:SIMP efficas:nom="valeurMin" efficas:statut="o"> <typeAttendu>R</typeAttendu> </efficas:SIMP>\r
-            <efficas:SIMP efficas:nom="valeurMax" efficas:statut="o"> <typeAttendu>R</typeAttendu> </efficas:SIMP>\r
-            <efficas:SIMP efficas:nom="constanteApresTBase" efficas:statut="o"> <typeAttendu>Bool</typeAttendu> </efficas:SIMP>\r
+            <efficas:SIMP efficas:nom="valeurMin" efficas:statut="o"> <nomTypeAttendu>R</nomTypeAttendu> </efficas:SIMP>\r
+            <efficas:SIMP efficas:nom="valeurMax" efficas:statut="o"> <nomTypeAttendu>R</nomTypeAttendu> </efficas:SIMP>\r
+            <efficas:SIMP efficas:nom="constanteApresTBase" efficas:statut="o"> <nomTypeAttendu>bool</nomTypeAttendu> </efficas:SIMP>\r
                </efficas:FACT> \r
                </efficas:FACT>\r
                </PROC>\r
@@ -212,22 +212,22 @@
                          <efficas:SIMP efficas:nom="grandeurObserveeWaterline" efficas:statut="o">\r
                             <valeurDef><typesimple>Z</typesimple></valeurDef>\r
                  <efficas:plageValeur><efficas:into><efficas:typesimple>Z</efficas:typesimple><efficas:typesimple>Q</efficas:typesimple></efficas:into></efficas:plageValeur>                    \r
-                                <typeAttendu>TXM</typeAttendu>\r
+                                <nomTypeAttendu>TXM</nomTypeAttendu>\r
                           </efficas:SIMP>\r
-                         <efficas:SIMP efficas:nom="seuilRejetMisfitWaterline" efficas:statut="o">                 <typeAttendu>R</typeAttendu>  </efficas:SIMP>\r
-                         <efficas:SIMP efficas:nom="correctionSystematiqueWaterline" efficas:statut="o">       <typeAttendu>Bool</typeAttendu>  </efficas:SIMP>\r
+                         <efficas:SIMP efficas:nom="seuilRejetMisfitWaterline" efficas:statut="o">                 <nomTypeAttendu>R</nomTypeAttendu>  </efficas:SIMP>\r
+                         <efficas:SIMP efficas:nom="correctionSystematiqueWaterline" efficas:statut="o">       <nomTypeAttendu>bool</nomTypeAttendu>  </efficas:SIMP>\r
                    </FACT>\r
 \r
 \r
                        <FACT efficas:nom="Waterline" efficas:statut="o">\r
                                        <SIMP efficas:nom="tempsFinCorrection" efficas:statut="o">\r
-                                               <typeAttendu>R</typeAttendu>\r
+                                               <nomTypeAttendu>R</nomTypeAttendu>\r
                                        </SIMP>\r
                                <efficas:SIMP efficas:nom="frequenceCorrection" efficas:statut="o">\r
-                                           <typeAttendu>R</typeAttendu>\r
+                                           <nomTypeAttendu>R</nomTypeAttendu>\r
                                        </efficas:SIMP>\r
                                <efficas:SIMP efficas:nom="tempsDebutMoyenneIncrements" efficas:statut="o">\r
-                                           <typeAttendu>R</typeAttendu>\r
+                                           <nomTypeAttendu>R</nomTypeAttendu>\r
                                        </efficas:SIMP>\r
                        </FACT>\r
 \r
@@ -237,34 +237,34 @@
                     <efficas:FACT efficas:nom="stationsObsWaterline" efficas:statut="o" >\r
                         <efficas:SIMP efficas:nom="cdStationHydro" efficas:statut="f" efficas:minOccurences="0" efficas:maxOccurences="1">\r
                            <efficas:doc efficas:ang="choix dans la projection : soit une sequence d'éléments soit une liste de type simple (Modèle Eficas Etendu)"/>\r
-                                               <typeAttendu>TXM</typeAttendu>\r
+                                               <nomTypeAttendu>TXM</nomTypeAttendu>\r
                                                </efficas:SIMP>\r
                                    </efficas:FACT>\r
 \r
                                        <efficas:FACT efficas:nom="ecartTypeAvantCtl" efficas:statut="o">\r
-                                         <efficas:SIMP efficas:nom="ecartTypeErrEbaucheZ" efficas:statut="o">  <typeAttendu>R</typeAttendu>  </efficas:SIMP>\r
-                                         <efficas:SIMP efficas:nom="ecartTypeErrEbaucheQ" efficas:statut="o">  <typeAttendu>R</typeAttendu>  </efficas:SIMP>\r
+                                         <efficas:SIMP efficas:nom="ecartTypeErrEbaucheZ" efficas:statut="o">  <nomTypeAttendu>R</nomTypeAttendu>  </efficas:SIMP>\r
+                                         <efficas:SIMP efficas:nom="ecartTypeErrEbaucheQ" efficas:statut="o">  <nomTypeAttendu>R</nomTypeAttendu>  </efficas:SIMP>\r
                                        </efficas:FACT>\r
        \r
                                        <efficas:FACT efficas:nom="ecartTypeApresCtl" efficas:statut="o">\r
-                                         <efficas:SIMP efficas:nom="ecartTypeErrEbaucheZ" efficas:statut="o">  <typeAttendu>R</typeAttendu>  </efficas:SIMP>\r
-                                         <efficas:SIMP efficas:nom="ecartTypeErrEbaucheQ" efficas:statut="o">  <typeAttendu>R</typeAttendu>  </efficas:SIMP>\r
+                                         <efficas:SIMP efficas:nom="ecartTypeErrEbaucheZ" efficas:statut="o">  <nomTypeAttendu>R</nomTypeAttendu>  </efficas:SIMP>\r
+                                         <efficas:SIMP efficas:nom="ecartTypeErrEbaucheQ" efficas:statut="o">  <nomTypeAttendu>R</nomTypeAttendu>  </efficas:SIMP>\r
                                        </efficas:FACT>\r
        \r
                                        <efficas:FACT efficas:nom="longueursPorteeZ" efficas:statut="o">\r
-                                         <efficas:SIMP efficas:nom="longueurPorteeAmont" efficas:statut="o">   <typeAttendu>R</typeAttendu>  </efficas:SIMP>\r
-                                         <efficas:SIMP efficas:nom="longueurPorteeAval" efficas:statut="o">    <typeAttendu>R</typeAttendu>  </efficas:SIMP>\r
+                                         <efficas:SIMP efficas:nom="longueurPorteeAmont" efficas:statut="o">   <nomTypeAttendu>R</nomTypeAttendu>  </efficas:SIMP>\r
+                                         <efficas:SIMP efficas:nom="longueurPorteeAval" efficas:statut="o">    <nomTypeAttendu>R</nomTypeAttendu>  </efficas:SIMP>\r
                                        </efficas:FACT>\r
        \r
                                        <efficas:FACT efficas:nom="longueursPorteeQ" efficas:statut="o">\r
-                                         <efficas:SIMP efficas:nom="longueurPorteeAmont" efficas:statut="o">   <typeAttendu>R</typeAttendu>  </efficas:SIMP>\r
-                                         <efficas:SIMP efficas:nom="longueurPorteeAval" efficas:statut="o">    <typeAttendu>R</typeAttendu>  </efficas:SIMP>\r
+                                         <efficas:SIMP efficas:nom="longueurPorteeAmont" efficas:statut="o">   <nomTypeAttendu>R</nomTypeAttendu>  </efficas:SIMP>\r
+                                         <efficas:SIMP efficas:nom="longueurPorteeAval" efficas:statut="o">    <nomTypeAttendu>R</nomTypeAttendu>  </efficas:SIMP>\r
                                        </efficas:FACT>\r
        \r
                                        <efficas:FACT efficas:nom="courbeTarage" efficas:statut="o">\r
-                                                 <efficas:SIMP efficas:nom="coefficientA" efficas:statut="o">  <typeAttendu>R</typeAttendu>  </efficas:SIMP>\r
-                                                 <efficas:SIMP efficas:nom="coefficientR" efficas:statut="o">  <typeAttendu>R</typeAttendu>  </efficas:SIMP>\r
-                                                 <efficas:SIMP efficas:nom="coefficientB" efficas:statut="o">  <typeAttendu>R</typeAttendu>  </efficas:SIMP>\r
+                                                 <efficas:SIMP efficas:nom="coefficientA" efficas:statut="o">  <nomTypeAttendu>R</nomTypeAttendu>  </efficas:SIMP>\r
+                                                 <efficas:SIMP efficas:nom="coefficientR" efficas:statut="o">  <nomTypeAttendu>R</nomTypeAttendu>  </efficas:SIMP>\r
+                                                 <efficas:SIMP efficas:nom="coefficientB" efficas:statut="o">  <nomTypeAttendu>R</nomTypeAttendu>  </efficas:SIMP>\r
                                        </efficas:FACT>\r
        \r
                                </FACT>\r
@@ -275,34 +275,34 @@
                <PROC efficas:nom="parametresObservations">\r
 \r
                        <efficas:FACT efficas:nom="parametresGenerauxObservations" efficas:statut="o">\r
-                                 <efficas:SIMP efficas:nom="prefixeFichierObs" efficas:statut="o">     <typeAttendu>Repertoire</typeAttendu>  </efficas:SIMP>\r
-                                 <efficas:SIMP efficas:nom="pasDeTempsFichierObs" efficas:statut="o">  <typeAttendu>R</typeAttendu>  </efficas:SIMP>\r
-                                 <efficas:SIMP efficas:nom="tailleFenetreLissageObs" efficas:statut="o">       <typeAttendu>R</typeAttendu>  </efficas:SIMP>\r
+                                 <efficas:SIMP efficas:nom="prefixeFichierObs" efficas:statut="o">     <nomTypeAttendu>Repertoire</nomTypeAttendu>  </efficas:SIMP>\r
+                                 <efficas:SIMP efficas:nom="pasDeTempsFichierObs" efficas:statut="o">  <nomTypeAttendu>R</nomTypeAttendu>  </efficas:SIMP>\r
+                                 <efficas:SIMP efficas:nom="tailleFenetreLissageObs" efficas:statut="o">       <nomTypeAttendu>R</nomTypeAttendu>  </efficas:SIMP>\r
                        </efficas:FACT>\r
 \r
                        <efficas:FACT efficas:nom="stationsObs" efficas:statut="o" >\r
                                <efficas:FACT efficas:nom="stationObs" efficas:statut="o" >\r
                         <efficas:SIMP efficas:nom="cdStationHydro" efficas:statut="f" efficas:minOccurences="0" efficas:maxOccurences="1">\r
                            <efficas:doc efficas:ang="choix dans la projection : soit une sequence d'éléments soit une liste de type simple (Modèle Eficas Etendu)"/>\r
-                                               <typeAttendu>TXM</typeAttendu>\r
+                                               <nomTypeAttendu>TXM</nomTypeAttendu>\r
                                                </efficas:SIMP>\r
-                                         <efficas:SIMP efficas:nom="lbStationHydro" efficas:statut="f">        <typeAttendu>TXM</typeAttendu>  </efficas:SIMP>\r
-                                         <efficas:SIMP efficas:nom="brancheStation" efficas:statut="o">        <typeAttendu>I</typeAttendu>  </efficas:SIMP>\r
-                                         <efficas:SIMP efficas:nom="abscisseStation" efficas:statut="o">       <typeAttendu>R</typeAttendu>  </efficas:SIMP>\r
-                                         <efficas:SIMP efficas:nom="decalageStation" efficas:statut="o">       <typeAttendu>R</typeAttendu>  </efficas:SIMP>\r
+                                         <efficas:SIMP efficas:nom="lbStationHydro" efficas:statut="f">        <nomTypeAttendu>TXM</nomTypeAttendu>  </efficas:SIMP>\r
+                                         <efficas:SIMP efficas:nom="brancheStation" efficas:statut="o">        <nomTypeAttendu>I</nomTypeAttendu>  </efficas:SIMP>\r
+                                         <efficas:SIMP efficas:nom="abscisseStation" efficas:statut="o">       <nomTypeAttendu>R</nomTypeAttendu>  </efficas:SIMP>\r
+                                         <efficas:SIMP efficas:nom="decalageStation" efficas:statut="o">       <nomTypeAttendu>R</nomTypeAttendu>  </efficas:SIMP>\r
 \r
-                                         <efficas:SIMP efficas:nom="ecartTypeErrObsZ" efficas:statut="o">      <typeAttendu>R</typeAttendu>  </efficas:SIMP>\r
-                                         <efficas:SIMP efficas:nom="ecartTypeErrObsQ" efficas:statut="o">      <typeAttendu>R</typeAttendu>  </efficas:SIMP>\r
-                                         <efficas:SIMP efficas:nom="seuilRejetObsZ" efficas:statut="o">        <typeAttendu>R</typeAttendu>  </efficas:SIMP>\r
-                                         <efficas:SIMP efficas:nom="seuilRejetObsQ" efficas:statut="o">        <typeAttendu>R</typeAttendu>  </efficas:SIMP>\r
+                                         <efficas:SIMP efficas:nom="ecartTypeErrObsZ" efficas:statut="o">      <nomTypeAttendu>R</nomTypeAttendu>  </efficas:SIMP>\r
+                                         <efficas:SIMP efficas:nom="ecartTypeErrObsQ" efficas:statut="o">      <nomTypeAttendu>R</nomTypeAttendu>  </efficas:SIMP>\r
+                                         <efficas:SIMP efficas:nom="seuilRejetObsZ" efficas:statut="o">        <nomTypeAttendu>R</nomTypeAttendu>  </efficas:SIMP>\r
+                                         <efficas:SIMP efficas:nom="seuilRejetObsQ" efficas:statut="o">        <nomTypeAttendu>R</nomTypeAttendu>  </efficas:SIMP>\r
                                </efficas:FACT>\r
                        </efficas:FACT>\r
                        \r
                </PROC>\r
                \r
                <PROC efficas:nom="parametresSauvegardeLigneIni">\r
-                         <efficas:SIMP efficas:nom="tempsSauvegardeLigneIni" efficas:statut="o">       <typeAttendu>R</typeAttendu>  </efficas:SIMP>\r
-                         <efficas:SIMP efficas:nom="cheminSauvegardeLigneIni" efficas:statut="o">      <typeAttendu>Repertoire</typeAttendu>  </efficas:SIMP>\r
+                         <efficas:SIMP efficas:nom="tempsSauvegardeLigneIni" efficas:statut="o">       <nomTypeAttendu>R</nomTypeAttendu>  </efficas:SIMP>\r
+                         <efficas:SIMP efficas:nom="cheminSauvegardeLigneIni" efficas:statut="o">      <nomTypeAttendu>Repertoire</nomTypeAttendu>  </efficas:SIMP>\r
                </PROC>\r
                \r
                <PROC efficas:nom="parametresImpressionResultats">\r
@@ -311,21 +311,21 @@
                                <efficas:FACT efficas:nom="stationRes" efficas:statut="o" >\r
                         <efficas:SIMP efficas:nom="cdStationHydro" efficas:statut="f" efficas:minOccurences="0" efficas:maxOccurences="1">\r
                            <efficas:doc efficas:ang="choix dans la projection : soit une sequence d'éléments soit une liste de type simple (Modèle Eficas Etendu)"/>\r
-                                               <typeAttendu>TXM</typeAttendu>\r
+                                               <nomTypeAttendu>TXM</nomTypeAttendu>\r
                                                </efficas:SIMP>\r
-                                         <efficas:SIMP efficas:nom="lbStationHydro" efficas:statut="f">        <typeAttendu>TXM</typeAttendu>  </efficas:SIMP>\r
-                                         <efficas:SIMP efficas:nom="brancheStation" efficas:statut="o">        <typeAttendu>I</typeAttendu>  </efficas:SIMP>\r
-                                         <efficas:SIMP efficas:nom="abscisseStation" efficas:statut="o">       <typeAttendu>R</typeAttendu>  </efficas:SIMP>\r
-                                         <efficas:SIMP efficas:nom="decalageStation" efficas:statut="o">       <typeAttendu>R</typeAttendu>  </efficas:SIMP>\r
-                                         <efficas:SIMP efficas:nom="sectionStRes" efficas:statut="o">  <typeAttendu>I</typeAttendu>  </efficas:SIMP>\r
+                                         <efficas:SIMP efficas:nom="lbStationHydro" efficas:statut="f">        <nomTypeAttendu>TXM</nomTypeAttendu>  </efficas:SIMP>\r
+                                         <efficas:SIMP efficas:nom="brancheStation" efficas:statut="o">        <nomTypeAttendu>I</nomTypeAttendu>  </efficas:SIMP>\r
+                                         <efficas:SIMP efficas:nom="abscisseStation" efficas:statut="o">       <nomTypeAttendu>R</nomTypeAttendu>  </efficas:SIMP>\r
+                                         <efficas:SIMP efficas:nom="decalageStation" efficas:statut="o">       <nomTypeAttendu>R</nomTypeAttendu>  </efficas:SIMP>\r
+                                         <efficas:SIMP efficas:nom="sectionStRes" efficas:statut="o">  <nomTypeAttendu>I</nomTypeAttendu>  </efficas:SIMP>\r
                                </efficas:FACT>\r
                        </efficas:FACT>\r
 \r
-                         <efficas:SIMP efficas:nom="nbMaxEcheances" efficas:statut="o">        <typeAttendu>I</typeAttendu>  </efficas:SIMP>\r
-                         <efficas:SIMP efficas:nom="echeance" efficas:statut="o" efficas:minOccurences="0" efficas:maxOccurences="-1"> <typeAttendu>I</typeAttendu>  </efficas:SIMP>\r
-                         <efficas:SIMP efficas:nom="echeancePassee" efficas:statut="o">        <typeAttendu>I</typeAttendu>  </efficas:SIMP>\r
-                         <efficas:SIMP efficas:nom="nrStationTracerObsAbcMn" efficas:statut="o">       <typeAttendu>I</typeAttendu>  </efficas:SIMP>\r
-                         <efficas:SIMP efficas:nom="fichierIncrements" efficas:statut="o">     <typeAttendu>Fichier</typeAttendu>  </efficas:SIMP>\r
+                         <efficas:SIMP efficas:nom="nbMaxEcheances" efficas:statut="o">        <nomTypeAttendu>I</nomTypeAttendu>  </efficas:SIMP>\r
+                         <efficas:SIMP efficas:nom="echeance" efficas:statut="o" efficas:minOccurences="0" efficas:maxOccurences="-1"> <nomTypeAttendu>I</nomTypeAttendu>  </efficas:SIMP>\r
+                         <efficas:SIMP efficas:nom="echeancePassee" efficas:statut="o">        <nomTypeAttendu>I</nomTypeAttendu>  </efficas:SIMP>\r
+                         <efficas:SIMP efficas:nom="nrStationTracerObsAbcMn" efficas:statut="o">       <nomTypeAttendu>I</nomTypeAttendu>  </efficas:SIMP>\r
+                         <efficas:SIMP efficas:nom="fichierIncrements" efficas:statut="o">     <nomTypeAttendu>Fichier</nomTypeAttendu>  </efficas:SIMP>\r
 \r
 \r
 \r

diff --git a/mascaret/configuration_mascaret.py b/mascaret/configuration_mascaret.py
index 7695ed4162d67bf3c6936242e79195e034355fe9..a38d1691491a78d17344de3b9883e619a2edd7bd 100644 (file)
--- 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 -*-\r
+#            maConfiguration MANAGEMENT OF EDF VERSION\r
+# ======================================================================\r
+# COPYRIGHT (C) 1991 - 2002  EDF R&D                  WWW.CODE-ASTER.ORG\r
+# THIS PROGRAM IS FREE SOFTWARE; YOU CAN REDISTRIBUTE IT AND/OR MODIFY\r
+# IT UNDER THE TERMS OF THE GNU GENERAL PUBLIC LICENSE AS PUBLISHED BY\r
+# THE FREE SOFTWARE FOUNDATION; EITHER VERSION 2 OF THE LICENSE, OR\r
+# (AT YOUR OPTION) ANY LATER VERSION.\r
+#\r
+# THIS PROGRAM IS DISTRIBUTED IN THE HOPE THAT IT WILL BE USEFUL, BUT\r
+# WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF\r
+# MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. SEE THE GNU\r
+# GENERAL PUBLIC LICENSE FOR MORE DETAILS.\r
+#\r
+# YOU SHOULD HAVE RECEIVED A COPY OF THE GNU GENERAL PUBLIC LICENSE\r
+# ALONG WITH THIS PROGRAM; IF NOT, WRITE TO EDF R&D CODE_ASTER,\r
+#    1 AVENUE DU GENERAL DE GAULLE, 92141 CLAMART CEDEX, FRANCE.\r
+#\r
+#\r
+# ======================================================================\r
+"""\r
+    Ce module sert pour charger les paramètres de configuration d'EFICAS\r
+"""\r
+# Modules Python\r
+from InterfaceQT4 import configuration\r
+import os\r
+\r
+\r
+class CONFIG(configuration.configBase):\r
+\r
+  #-----------------------------------\r
+  def __init__(self,appli,repIni):\r
+  #-----------------------------------\r
+\r
+      self.labels_user=['catalogues','lang','force_langue']\r
+      self.labels_eficas=['lang','rep_cata','catalogues']\r
+\r
+      configuration.configBase.__init__(self,appli,'.Eficas_monCode')\r
+\r
+\r
+def make_config(appli,rep):\r
+    return CONFIG(appli,rep)\r
+\r

diff --git a/mascaret/prefs_mascaret.py b/mascaret/prefs_mascaret.py
index a2c5523daa8df23d558979fdc9a394276f6a1fd0..c90e011ca03fdb61ddfff46b19fc617b8df61d16 100644 (file)
--- 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 (executable)
index 0000000..c140518
--- /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)