From 27366246369eb3b01933628ffb225116b6158af8 Mon Sep 17 00:00:00 2001
From: scorpio810
 <scorpio810@r995  scorpio810  2010-05-20 11:17:04 +0200 (jeu. 20 mai 2010)>
Date: Fri, 11 Jun 2010 16:07:25 +0000
Subject: [PATCH] Minors changes

git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/branches/0.3@1043 bfdf4180-ca20-0410-9c96-a3a8aa849046
---
 .../plc/schneider/ABE7-H16R11.elmt            | 22 ++++++++++++++++---
 .../plc/schneider/ABE7-R16S210-1.elmt         | 16 +++++++-------
 .../plc/schneider/ABE7-R16S210-2.elmt         | 14 ++++++------
 3 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/elements/automatisme/plc/schneider/ABE7-H16R11.elmt b/elements/automatisme/plc/schneider/ABE7-H16R11.elmt
index 5137b36ac..84fb33ff9 100644
--- a/elements/automatisme/plc/schneider/ABE7-H16R11.elmt
+++ b/elements/automatisme/plc/schneider/ABE7-H16R11.elmt
@@ -6,10 +6,26 @@
     </names>
     <informations>SIEMENS S7-300 (digital inputs)</informations>
     <description>
-        <circle x="-1" y="-10" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="2"/>
-        <polygon x4="0" antialias="false" style="line-style:dotted;line-weight:normal;filling:none;color:black" closed="false" y1="-19" x1="20" y2="-9" x2="20" y3="-9" x3="0" y4="-9"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dotted;line-weight:normal;filling:none;color:black" y1="-19" x1="0" y2="36" x2="0"/>
+        <input x="852" y="-5" size="6" rotate="true" text="%I1.15"/>
+        <input x="806" y="-5" size="6" rotate="true" text="%I1.14"/>
+        <input x="556" y="-5" size="6" rotate="true" text="%I1.9"/>
+        <input x="305" y="-5" size="6" rotate="true" text="%I1.4"/>
+        <input x="256" y="-5" size="6" rotate="true" text="%I1.3"/>
+        <input x="206" y="-5" size="6" rotate="true" text="%I1.2"/>
+        <input x="155" y="-5" size="6" rotate="true" text="%I1.1"/>
         <rect width="916" x="-10" y="-30" antialias="false" height="80" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <input x="757" y="-5" size="6" rotate="true" text="%I1.13"/>
+        <input x="507" y="-5" size="6" rotate="true" text="%I1.8"/>
+        <input x="104" y="-5" size="6" rotate="true" text="%I1.0"/>
+        <input x="707" y="-5" size="6" rotate="true" text="%I1.12"/>
+        <input x="457" y="-5" size="6" rotate="true" text="%I1.7"/>
+        <circle x="-1" y="-10" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="2"/>
+        <input x="656" y="-5" size="6" rotate="true" text="%I1.11"/>
+        <input x="406" y="-5" size="6" rotate="true" text="%I1.6"/>
+        <polygon x4="0" antialias="false" style="line-style:dotted;line-weight:normal;filling:none;color:black" closed="false" y1="-19" x1="20" y2="-9" x2="20" y3="-9" x3="0" y4="-9"/>
+        <input x="604" y="-4.55" size="6" rotate="true" text="%I1.10"/>
+        <input x="356" y="-5.45" size="6" rotate="true" text="%I1.5"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dotted;line-weight:normal;filling:none;color:black" y1="-19" x1="0" y2="36" x2="0"/>
         <polygon x4="70" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="49" x1="-10" y2="37" x2="-10" y3="37" x3="70" y4="49"/>
         <text x="-3" y="-21" size="5" text="1"/>
         <polygon x4="70" y5="-30" x5="70" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-29" x1="-10" y2="-19" x2="-10" y3="-19" x3="70" y4="-30"/>
diff --git a/elements/automatisme/plc/schneider/ABE7-R16S210-1.elmt b/elements/automatisme/plc/schneider/ABE7-R16S210-1.elmt
index 1e0b967d5..e9866a51a 100644
--- a/elements/automatisme/plc/schneider/ABE7-R16S210-1.elmt
+++ b/elements/automatisme/plc/schneider/ABE7-R16S210-1.elmt
@@ -6,6 +6,7 @@
     </names>
     <informations>SIEMENS S7-300 (digital inputs)</informations>
     <description>
+        <polygon x4="884" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-38" x1="801" y2="-38" x2="-13" y3="53" x3="-13" y4="53"/>
         <input x="70.5" y="49" size="5" rotation="270" rotate="true" text="4"/>
         <input x="49.5" y="49" size="5" rotation="270" rotate="true" text="3"/>
         <input x="29.5" y="49" size="5" rotation="270" rotate="true" text="2"/>
@@ -19,9 +20,8 @@
         <circle x="45.528" y="-24.4721" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="8.94427"/>
         <circle x="25.528" y="-24.4721" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="8.94427"/>
         <circle x="5.528" y="-24.4721" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="8.94427"/>
-        <polygon x4="883" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-35" x1="800" y2="-35" x2="-14" y3="56" x3="-14" y4="56"/>
         <circle x="45.528" y="45.5279" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="8.94427"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:dotted;line-weight:normal;filling:none;color:black" y1="56" x1="882" y2="-35" x2="800"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:dotted;line-weight:normal;filling:none;color:black" y1="53" x1="883" y2="-38" x2="801"/>
         <circle x="25.528" y="45.5279" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="8.94427"/>
         <input x="112.5" y="45" size="5" rotation="270" rotate="true" text="200"/>
         <circle x="5.528" y="45.5279" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="8.94427"/>
@@ -59,19 +59,19 @@
         <circle x="485.528" y="44.5279" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="8.94427"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="10" x1="720" y2="10" x2="730" y3="51" x3="730"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="10" x1="640" y2="10" x2="650" y3="51" x3="650"/>
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="10" x1="561" y2="10" x2="571" y3="51" x3="571"/>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="10" x1="560" y2="10" x2="570" y3="51" x3="570"/>
         <polygon x4="719" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="52" x1="680" y2="10" x2="680" y3="10" x3="700" y4="15"/>
         <polygon x4="639" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="52" x1="600" y2="10" x2="600" y3="10" x3="620" y4="15"/>
-        <polygon x4="560" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="52" x1="521" y2="10" x2="521" y3="10" x3="541" y4="15"/>
+        <polygon x4="559" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="52" x1="520" y2="10" x2="520" y3="10" x3="540" y4="15"/>
         <circle x="675.528" y="44.5279" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="8.94427"/>
         <circle x="595.528" y="44.5279" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="8.94427"/>
-        <circle x="516.528" y="44.5279" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="8.94427"/>
+        <circle x="515.528" y="44.5279" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="8.94427"/>
         <input x="723.5" y="45" size="5" rotation="270" rotate="true" text="107"/>
         <input x="643.5" y="45" size="5" rotation="270" rotate="true" text="106"/>
         <input x="564.5" y="45" size="5" rotation="270" rotate="true" text="105"/>
         <circle x="725.528" y="44.5279" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="8.94427"/>
         <circle x="645.528" y="44.5279" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="8.94427"/>
-        <circle x="566.528" y="44.5279" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="8.94427"/>
+        <circle x="565.528" y="44.5279" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="8.94427"/>
         <input x="379" y="-20.5" size="9" rotate="true" text="ABE7-R16S210"/>
         <terminal x="120" y="54" orientation="s"/>
         <terminal x="170" y="54" orientation="s"/>
@@ -83,8 +83,8 @@
         <terminal x="410" y="54" orientation="s"/>
         <terminal x="440" y="54" orientation="s"/>
         <terminal x="490" y="54" orientation="s"/>
-        <terminal x="521" y="54" orientation="s"/>
-        <terminal x="571" y="54" orientation="s"/>
+        <terminal x="520" y="54" orientation="s"/>
+        <terminal x="570" y="54" orientation="s"/>
         <terminal x="600" y="54" orientation="s"/>
         <terminal x="650" y="54" orientation="s"/>
         <terminal x="680" y="54" orientation="s"/>
diff --git a/elements/automatisme/plc/schneider/ABE7-R16S210-2.elmt b/elements/automatisme/plc/schneider/ABE7-R16S210-2.elmt
index 5430b86b8..e85e6b683 100644
--- a/elements/automatisme/plc/schneider/ABE7-R16S210-2.elmt
+++ b/elements/automatisme/plc/schneider/ABE7-R16S210-2.elmt
@@ -6,8 +6,8 @@
     </names>
     <informations>SIEMENS S7-300 (digital inputs)</informations>
     <description>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:dotted;line-weight:normal;filling:none;color:black" y1="-35" x1="-1" y2="55" x2="77"/>
         <polygon x4="77" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-35" x1="-1" y2="-35" x2="879" y3="54" x3="879" y4="54"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:dotted;line-weight:normal;filling:none;color:black" y1="-35" x1="-1" y2="55" x2="77"/>
         <input x="112.5" y="45" size="5" rotation="270" rotate="true" text="208"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="10" x1="160" y2="10" x2="170" y3="51" x3="170"/>
         <polygon x4="159" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="52" x1="120" y2="10" x2="120" y3="10" x3="140" y4="15"/>
@@ -21,7 +21,7 @@
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="10" x1="480" y2="10" x2="490" y3="51" x3="490"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="10" x1="400" y2="10" x2="410" y3="51" x3="410"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="10" x1="320" y2="10" x2="330" y3="51" x3="330"/>
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="10" x1="241" y2="10" x2="251" y3="51" x3="251"/>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="10" x1="240" y2="10" x2="250" y3="51" x3="250"/>
         <polygon x4="479" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="52" x1="440" y2="10" x2="440" y3="10" x3="460" y4="15"/>
         <polygon x4="399" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="52" x1="360" y2="10" x2="360" y3="10" x3="380" y4="15"/>
         <polygon x4="319" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="52" x1="280" y2="10" x2="280" y3="10" x3="300" y4="15"/>
@@ -37,7 +37,7 @@
         <input x="592.5" y="45" size="5" rotation="270" rotate="true" text="214"/>
         <circle x="405.528" y="44.5279" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="8.94427"/>
         <circle x="325.528" y="44.5279" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="8.94427"/>
-        <circle x="246.528" y="44.5279" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="8.94427"/>
+        <circle x="245.528" y="44.5279" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="8.94427"/>
         <input x="513.5" y="45" size="5" rotation="270" rotate="true" text="213"/>
         <input x="483.5" y="45" size="5" rotation="270" rotate="true" text="112"/>
         <circle x="485.528" y="44.5279" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="8.94427"/>
@@ -46,10 +46,10 @@
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="10" x1="561" y2="10" x2="571" y3="51" x3="571"/>
         <polygon x4="719" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="52" x1="680" y2="10" x2="680" y3="10" x3="700" y4="15"/>
         <polygon x4="639" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="52" x1="600" y2="10" x2="600" y3="10" x3="620" y4="15"/>
-        <polygon x4="560" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="52" x1="521" y2="10" x2="521" y3="10" x3="541" y4="15"/>
+        <polygon x4="559" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="52" x1="520" y2="10" x2="520" y3="10" x3="540" y4="15"/>
         <circle x="675.528" y="44.5279" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="8.94427"/>
         <circle x="595.528" y="44.5279" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="8.94427"/>
-        <circle x="516.528" y="44.5279" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="8.94427"/>
+        <circle x="515.528" y="44.5279" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="8.94427"/>
         <input x="723.5" y="45" size="5" rotation="270" rotate="true" text="115"/>
         <input x="643.5" y="45" size="5" rotation="270" rotate="true" text="114"/>
         <input x="564.5" y="45" size="5" rotation="270" rotate="true" text="113"/>
@@ -60,14 +60,14 @@
         <terminal x="120" y="54" orientation="s"/>
         <terminal x="170" y="54" orientation="s"/>
         <terminal x="201" y="54" orientation="s"/>
-        <terminal x="251" y="54" orientation="s"/>
+        <terminal x="250" y="54" orientation="s"/>
         <terminal x="280" y="54" orientation="s"/>
         <terminal x="330" y="54" orientation="s"/>
         <terminal x="360" y="54" orientation="s"/>
         <terminal x="410" y="54" orientation="s"/>
         <terminal x="440" y="54" orientation="s"/>
         <terminal x="490" y="54" orientation="s"/>
-        <terminal x="521" y="54" orientation="s"/>
+        <terminal x="520" y="54" orientation="s"/>
         <terminal x="571" y="54" orientation="s"/>
         <terminal x="600" y="54" orientation="s"/>
         <terminal x="650" y="54" orientation="s"/>