From c71ede3403e4754c772733cba396b73b56693494 Mon Sep 17 00:00:00 2001
From: xavierqet
 <xavierqet@r9  xavierqet  2006-10-30 20:28:16 +0100 (lun. 30 oct. 2006)>
Date: Thu, 22 Feb 2007 20:18:58 +0000
Subject: [PATCH] Lifting des moteurs et transformateurs

git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@64 bfdf4180-ca20-0410-9c96-a3a8aa849046
---
 elements/moteurs/mcc.elmt                  | 35 ++++++++++------------
 elements/moteurs/moteur_alt3.elmt          | 15 ++++------
 elements/moteurs/moteur_alt6.elmt          | 23 +++++---------
 elements/transformateurs/transfo_mono.elmt | 24 +++++++--------
 elements/transformateurs/transfo_tri.elmt  | 24 +++++++--------
 5 files changed, 49 insertions(+), 72 deletions(-)

diff --git a/elements/moteurs/mcc.elmt b/elements/moteurs/mcc.elmt
index 868378efa..e86739b7c 100644
--- a/elements/moteurs/mcc.elmt
+++ b/elements/moteurs/mcc.elmt
@@ -5,27 +5,24 @@
 		<name lang="en">Direct-current motor</name>
 	</names>
 	<description>
-		<!--Rotor-->
-		<circle x="-20"  y="-20"  diameter="40"        antialias="true" style="filling:white;"/>
-		<!--Balait inférieur-->
-		<line  x1="-14" y1="-25" x2="-14" y2="-14"  antialias="false" />
-		<line  x1="14"  y1="-25" x2="14"  y2="-14"  antialias="false" />
-		<line  x1="14"  y1="-25" x2="-14"  y2="-25" antialias="false" />
-		<!--Fil inférieur-->
-		<line  x1="0"   y1="-40" x2="0"   y2="-25"  antialias="false" />
-		<!--Balait supérieur-->
-		<line  x1="-14" y1="25" x2="-14" y2="14"  antialias="false" />
-		<line  x1="14"  y1="25" x2="14"  y2="14"  antialias="false" />
-		<line  x1="14"  y1="25" x2="-14"  y2="25" antialias="false" />
+		<!--Balai inferieur-->
+		<line x1="-14" y1="-25" x2="-14" y2="-14" antialias="false" />
+		<line x1="14"  y1="-25" x2="14"  y2="-14" antialias="false" />
+		<line x1="14"  y1="-25" x2="-14" y2="-25" antialias="false" />
+		<!--Fil inferieur-->
+		<line x1="0"   y1="-40" x2="0"   y2="-25" antialias="false" />
+		<!--Balai superieur-->
+		<line x1="-14" y1="25"  x2="-14" y2="14"  antialias="false" />
+		<line x1="14"  y1="25"  x2="14"  y2="14"  antialias="false" />
+		<line x1="14"  y1="25"  x2="-14" y2="25"  antialias="false" />
 		<!--Fil superieur-->
-		<line  x1="0"   y1="40" x2="0"   y2="25"    antialias="false" />
+		<line x1="0"   y1="40"  x2="0"   y2="25"  antialias="false" />
+		<!--Rotor-->
+		<circle x="-20"  y="-20"  diameter="40"   antialias="true" style="filling:white;"/>
 		<!--Lettre M-->
-		<line  x1="-10" y1="-10" x2="-10" y2="10"  antialias="false" />
-		<line  x1="-10" y1="-10" x2="0"   y2="0"   antialias="true" />
-		<line  x1="0"   y1="0"   x2="10"  y2="-10" antialias="true" />
-		<line  x1="10"  y1="-10" x2="10"  y2="10"  antialias="false" />
+		<text x="-13.5" y="12" size="24" text="M" />
 		<!--Bornes-->
-		<terminal  orientation="n"   x="0"    y="-40"  />
-		<terminal  orientation="s"   x="0"    y="40"   />
+		<terminal orientation="n" x="0" y="-40" />
+		<terminal orientation="s" x="0" y="40"  />
 	</description>
 </definition>
diff --git a/elements/moteurs/moteur_alt3.elmt b/elements/moteurs/moteur_alt3.elmt
index 6aa8558b7..fff9371bd 100644
--- a/elements/moteurs/moteur_alt3.elmt
+++ b/elements/moteurs/moteur_alt3.elmt
@@ -5,20 +5,15 @@
 		<name lang="en">Three-phase induction motor</name>
 	</names>
 	<description>
-		<circle x="-20"  y="-20"  diameter="40"        antialias="true" style="filling:white;"/>
 		<!--U-->
-		<line  x1="-20" y1="-40" x2="-20" y2="-20" antialias="false" />
-		<line  x1="-20" y1="-20" x2="-14" y2="-14" antialias="true" />
+		<polygon x1="-20" y1="-40" x2="-20" y2="-20" x3="-14" y3="-14" antialias="false" closed="false" />
 		<!--V-->
-		<line  x1="0"   y1="-40" x2="0"   y2="-20" antialias="false" />
+		<line x1="0"   y1="-40" x2="0"   y2="-20" antialias="false" />
 		<!--W-->
-		<line  x1="20"  y1="-40" x2="20"  y2="-20" antialias="false" />
-		<line  x1="20"  y1="-20" x2="14"  y2="-14" antialias="true" />
+		<polygon x1="20"  y1="-40" x2="20"  y2="-20" x3="14"  y3="-14" antialias="false" closed="false" />
+		<circle x="-20" y="-20"  diameter="40"     antialias="true" style="filling:white;"/>
 		<!--Lettre M-->
-		<line  x1="-10" y1="-10" x2="-10" y2="10"  antialias="false" />
-		<line  x1="-10" y1="-10" x2="0"   y2="0"   antialias="true" />
-		<line  x1="0"   y1="0"   x2="10"  y2="-10" antialias="true" />
-		<line  x1="10"  y1="-10" x2="10"  y2="10"  antialias="false" />
+		<text x="-13.5" y="12" size="24" text="M" />
 		<!--Bornes-->
 		<terminal  orientation="n"   x="-20"  y="-40"  />
 		<terminal  orientation="n"   x="0"    y="-40"  />
diff --git a/elements/moteurs/moteur_alt6.elmt b/elements/moteurs/moteur_alt6.elmt
index 569f7c635..cc8e3083d 100644
--- a/elements/moteurs/moteur_alt6.elmt
+++ b/elements/moteurs/moteur_alt6.elmt
@@ -5,33 +5,26 @@
 		<name lang="en">Three-phase induction motor (not coupled)</name>
 	</names>
 	<description>
-		<circle x="-20"  y="-20"  diameter="40"        antialias="true" style="filling:white;"/>
 		<!--U1-->
-		<line  x1="-20" y1="-40" x2="-20" y2="-20" antialias="false" />
-		<line  x1="-20" y1="-20" x2="-14" y2="-14" antialias="true" />
+		<polygon  x1="-20" y1="-40" x2="-20" y2="-20" x3="-14" y3="-14" antialias="false" closed="false" />
 		<!--V1-->
 		<line  x1="0"   y1="-40" x2="0"   y2="-20" antialias="false" />
 		<!--W1-->
-		<line  x1="20"  y1="-40" x2="20"  y2="-20" antialias="false" />
-		<line  x1="20"  y1="-20" x2="14"  y2="-14" antialias="true" />
+		<polygon  x1="20"  y1="-40" x2="20"  y2="-20" x3="14"  y3="-14" antialias="false" closed="false" />
 		<!--U2-->
-		<line  x1="-20" y1="40" x2="-20" y2="20" antialias="false" />
-		<line  x1="-20" y1="20" x2="-14" y2="14" antialias="true" />
+		<polygon  x1="-20" y1="40" x2="-20" y2="20" x3="-14" y3="14" antialias="false" closed="false" />
 		<!--V2-->
 		<line  x1="0"   y1="40" x2="0"   y2="20" antialias="false" />
 		<!--W2-->
-		<line  x1="20"  y1="40" x2="20"  y2="20" antialias="false" />
-		<line  x1="20"  y1="20" x2="14"  y2="14" antialias="true" />
+		<polygon  x1="20"  y1="40" x2="20"  y2="20" x3="14"  y3="14" antialias="false" closed="false" />
+		<circle x="-20"  y="-20"  diameter="40"  antialias="true" style="filling:white;"/>
 		<!--Lettre M-->
-		<line  x1="-10" y1="-10" x2="-10" y2="10"  antialias="false" />
-		<line  x1="-10" y1="-10" x2="0"   y2="0"   antialias="true" />
-		<line  x1="0"   y1="0"   x2="10"  y2="-10" antialias="true" />
-		<line  x1="10"  y1="-10" x2="10"  y2="10"  antialias="false" />
-		<!--Bornes Supérieurs-->
+		<text x="-13.5" y="12" size="24" text="M" />
+		<!--Bornes Superieures-->
 		<terminal  orientation="n"   x="-20"  y="-40"  />
 		<terminal  orientation="n"   x="0"    y="-40"  />
 		<terminal  orientation="n"   x="20"   y="-40"  />
-		<!--Bornes Inférieurs-->
+		<!--Bornes Inferieures-->
 		<terminal  orientation="s"   x="-20"  y="40"  />
 		<terminal  orientation="s"   x="0"    y="40"  />
 		<terminal  orientation="s"   x="20"   y="40"  />
diff --git a/elements/transformateurs/transfo_mono.elmt b/elements/transformateurs/transfo_mono.elmt
index f39c1144c..c18fdb3c1 100644
--- a/elements/transformateurs/transfo_mono.elmt
+++ b/elements/transformateurs/transfo_mono.elmt
@@ -5,26 +5,22 @@
 		<name lang="en">One-phase transformer</name>
 	</names>
 	<description>
-		<!--Transforateur-->
-		<circle x="-20"  y="-20"  diameter="40"        antialias="true" style="line-weight:none;filling:white;" />
-		<circle x="-20"  y="0"   diameter="40"        antialias="true" style="filling:white;" />
-		<circle x="-20" y="-20"  diameter="40"        antialias="true" />
 		<!--Phase 1-->
-		<line  x1="-20" y1="-40" x2="-20" y2="-20" antialias="false" />
-		<line  x1="-20" y1="-20" x2="-14" y2="-14" antialias="true" />
+		<polygon x1="-20"  y1="-40" x2="-20" y2="-20" x3="-14" y3="-14" antialias="false" closed="false" />
 		<!--Neutre 1-->
-		<line  x1="20"  y1="-40" x2="20"  y2="-20" antialias="false" />
-		<line  x1="20"  y1="-20" x2="14"  y2="-14" antialias="true" />
+		<polygon  x1="20"  y1="-40" x2="20"  y2="-20" x3="14"  y3="-14" antialias="false" closed="false" />
 		<!--Phase 2-->
-		<line  x1="-20" y1="60" x2="-20" y2="40" antialias="false" />
-		<line  x1="-20" y1="40" x2="-14" y2="34" antialias="true" />
+		<polygon  x1="-20" y1="60"  x2="-20" y2="40"  x3="-14" y3="34"  antialias="false" closed="false" />
 		<!--Neutre 2-->
-		<line  x1="20"  y1="60" x2="20"  y2="40" antialias="false" />
-		<line  x1="20"  y1="40" x2="14"  y2="34" antialias="true" />
-		<!--Bornes supérieurs-->
+		<polygon  x1="20"  y1="60"  x2="20"  y2="40"  x3="14"  y3="34"  antialias="false" closed="false" />
+		<!--Transforateur-->
+		<circle x="-20" y="-20" diameter="40" antialias="true" style="line-weight:none;filling:white;" />
+		<circle x="-20" y="0"   diameter="40" antialias="true" style="filling:white;" />
+		<circle x="-20" y="-20" diameter="40" antialias="true" />
+		<!--Bornes superieures-->
 		<terminal  orientation="n"   x="-20"  y="-40"  />
 		<terminal  orientation="n"   x="20"   y="-40"  />
-		<!--Bornes inférieurs-->
+		<!--Bornes inferieures-->
 		<terminal  orientation="s"   x="-20"  y="60"  />
 		<terminal  orientation="s"   x="20"   y="60"  />
 	</description>
diff --git a/elements/transformateurs/transfo_tri.elmt b/elements/transformateurs/transfo_tri.elmt
index c049012c7..72d346cf4 100644
--- a/elements/transformateurs/transfo_tri.elmt
+++ b/elements/transformateurs/transfo_tri.elmt
@@ -5,31 +5,27 @@
 		<name lang="en">Three-phase transformer</name>
 	</names>
 	<description>
-		<!--Transformateur-->
-		<circle x="-20"  y="-20"  diameter="40"        antialias="true" style="line-weight:none;filling:white;" />
-		<circle x="-20"  y="0"    diameter="40"        antialias="true" style="filling:white;" />
-		<circle x="-20"  y="-20"  diameter="40"        antialias="true" />
 		<!--U1-->
-		<line  x1="-20" y1="-40" x2="-20" y2="-20" antialias="false" />
-		<line  x1="-20" y1="-20" x2="-14" y2="-14" antialias="true" />
+		<polygon x1="-20" y1="-40" x2="-20" y2="-20" x3="-14" y3="-14" closed="false" antialias="false" />
 		<!--V1-->
 		<line  x1="0"   y1="-40" x2="0"   y2="-20" antialias="false"  style="line-style:dashed;" />
 		<!--W1-->
-		<line  x1="20"  y1="-40" x2="20"  y2="-20" antialias="false" />
-		<line  x1="20"  y1="-20" x2="14"  y2="-14" antialias="true" />
+		<polygon x1="20" y1="-40" x2="20" y2="-20" x3="14" y3="-14" closed="false" antialias="false" />
 		<!--U2-->
-		<line  x1="-20" y1="60" x2="-20" y2="40" antialias="false" />
-		<line  x1="-20" y1="40" x2="-14" y2="34" antialias="true" />
+		<polygon x1="-20" y1="60" x2="-20" y2="40" x3="-14" y3="34" closed="false" antialias="false" />
 		<!--V2-->
 		<line  x1="0"   y1="60" x2="0"   y2="40" antialias="false" />
 		<!--W2-->
-		<line  x1="20"  y1="60" x2="20"  y2="40" antialias="false" />
-		<line  x1="20"  y1="40" x2="14"  y2="34" antialias="true" />
-		<!--Bornes supérieurs-->
+		<polygon x1="20" y1="60" x2="20" y2="40" x3="14" y3="34" closed="false" antialias="false" />
+		<!--Transformateur-->
+		<circle x="-20"  y="-20"  diameter="40" antialias="true" style="line-weight:none;filling:white;" />
+		<circle x="-20"  y="0"    diameter="40" antialias="true" style="filling:white;" />
+		<circle x="-20"  y="-20"  diameter="40" antialias="true" />
+		<!--Bornes superieures-->
 		<terminal  orientation="n"   x="-20"  y="-40"  />
 		<terminal  orientation="n"   x="0"    y="-40"  />
 		<terminal  orientation="n"   x="20"   y="-40"  />
-		<!--Bornes inférieurs-->
+		<!--Bornes inferieures-->
 		<terminal  orientation="s"   x="-20"  y="60"  />
 		<terminal  orientation="s"   x="0"    y="60"  />
 		<terminal  orientation="s"   x="20"   y="60"  />