Externalisation de types internes...

diff --git a/Atmo/modele_atmo_test1.py b/Atmo/modele_atmo_test1.py
index 1b1390ba47fd842e7721ae3a825551e86d0cd42a..b4540d3c6d6b5cc135e5990ea9072c29754f8510 100644 (file)
--- a/Atmo/modele_atmo_test1.py
+++ b/Atmo/modele_atmo_test1.py
@@ -3,10 +3,12 @@ import raw.atmo_test1 as mdm
 my_Wind_Speed=mdm.T_Wind_Speed(0)
 my_Value=mdm.T_Value(0)
 my_Unit=mdm.T_Unit(0)
-my_B_enter_mesure=mdm.T_B_enter_mesure(my_Wind_Speed,my_Value,my_Unit)
+my_Mesure=mdm.T_Mesure(my_Value,my_Unit)
+my_B_enter_mesure=mdm.T_B_enter_mesure(my_Wind_Speed,my_Mesure)
 my_Wind_Speed1=mdm.T_Wind_Speed1(1)
 my_Value1=mdm.T_Value1(1)
 my_Unit1=mdm.T_Unit1(1)
+my_Mesure1=mdm.T_Mesure1(my_Value1,my_Unit1)
 
-my_Wind=mdm.T_Wind(my_Wind_Speed1,my_Value1,my_Unit1,my_B_enter_mesure)
+my_Wind=mdm.T_Wind(my_Wind_Speed1,my_Mesure1,my_B_enter_mesure)
 my_Atmos=mdm.Atmos(my_Wind)

diff --git a/Atmo/modele_atmo_test1.xsd b/Atmo/modele_atmo_test1.xsd
index a44c12f7b766c43b6f7b4fe7e5054b4d7ed01424..b765f8d053a3c8918d5336ee27337e3cfab8355d 100755 (executable)
--- a/Atmo/modele_atmo_test1.xsd
+++ b/Atmo/modele_atmo_test1.xsd
@@ -30,23 +30,32 @@
                        <element name="Wind" type="atmos:T_Wind" minOccurs="1" maxOccurs="1"/>
                </sequence>
        </complexType>
-       <complexType name="T_Wind">
-               <sequence>
-                       <element name="Wind_Speed1" type="atmos:T_Wind_Speed1"/>
+
+    <complexType name="T_Mesure1">
                        <sequence>
                                <element name="Value1" type="atmos:T_Value1"/>
                                <element name="Unit1" type="atmos:T_Unit1"/>
-                       </sequence>
+                       </sequence>    
+    </complexType>
+    <complexType name="T_Mesure">
+                       <sequence>
+                               <element name="Value" type="atmos:T_Value"/>
+                               <element name="Unit" type="atmos:T_Unit"/>
+                       </sequence>    
+    </complexType>
+    
+       <complexType name="T_Wind">
+               <sequence>
+                       <element name="Wind_Speed1" type="atmos:T_Wind_Speed1"/>
+                       <element name="Mesure1" type="atmos:T_Mesure1"/>
+
                        <element name="B_enter_mesure" type="atmos:T_B_enter_mesure" minOccurs="0" maxOccurs="1"/>
                </sequence>
        </complexType>
        <complexType name="T_B_enter_mesure">
                <sequence>
                        <element name="Wind_Speed" type="atmos:T_Wind_Speed"/>
-                       <sequence>
-                               <element name="Value" type="atmos:T_Value"/>
-                               <element name="Unit" type="atmos:T_Unit"/>
-                       </sequence>
+                       <element name="Mesure" type="atmos:T_Mesure"/>
                </sequence>
        </complexType>
        <element name="Atmos" type="atmos:T_Atmos"/>