From: Eric Fayolle <eric.fayolle@edf.fr>
Date: Fri, 30 Mar 2018 15:14:19 +0000 (+0200)
Subject: Externalisation de types internes...
X-Git-Tag: V8_5_0rc2a2~9
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=6c059a5738db8d8c0a7b79433163b2fcbfd22e82;p=modules%2Feficas.git

Externalisation de types internes...
---

diff --git a/Atmo/modele_atmo_test1.py b/Atmo/modele_atmo_test1.py
index 1b1390ba..b4540d3c 100644
--- 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 a44c12f7..b765f8d0 100755
--- 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"/>