[qet] [1664] merge ezza "solar symbols" working directory

[ Thread Index | Date Index | More lists.tuxfamily.org/qet Archives ]


Revision: 1664
Author:   scorpio810
Date:     2012-04-17 16:34:41 +0200 (Tue, 17 Apr 2012)
Log Message:
-----------
merge ezza "solar symbols" working directory 

Modified Paths:
--------------
    branches/0.3/elements/energie/solaire/ballon_echangeur/ballon_demi_strat.elmt
    branches/0.3/elements/energie/solaire/ballon_echangeur/ballon_stock1000l.elmt
    branches/0.3/elements/energie/solaire/ballon_echangeur/echangeur_plaque.elmt
    branches/0.3/elements/energie/solaire/ballon_echangeur/sksw-0.elmt
    branches/0.3/elements/energie/solaire/eau_sanitaire/eau_ville.elmt
    branches/0.3/elements/energie/solaire/eau_sanitaire/rechauffeur_ecs.elmt

Added Paths:
-----------
    branches/0.3/elements/energie/solaire/ballon_echangeur/ballon_01.elmt
    branches/0.3/elements/energie/solaire/ballon_echangeur/ballon_02.elmt
    branches/0.3/elements/energie/solaire/ballon_echangeur/ballon_combine_01.elmt
    branches/0.3/elements/energie/solaire/ballon_echangeur/ballon_combiner_ecs_01.elmt
    branches/0.3/elements/energie/solaire/ballon_echangeur/ballon_ecs_elec.elmt
    branches/0.3/elements/energie/solaire/ballon_echangeur/ballon_ecs_horizon_01.elmt
    branches/0.3/elements/energie/solaire/ballon_echangeur/ballon_strat_ecs.elmt
    branches/0.3/elements/energie/solaire/ballon_echangeur/mur_chauffant_01.elmt
    branches/0.3/elements/energie/solaire/ballon_echangeur/plancher_chauffant_01.elmt
    branches/0.3/elements/energie/solaire/ballon_echangeur/radiateur_01.elmt
    branches/0.3/elements/energie/solaire/base_distrib/ballon_combiner_ecs.elmt
    branches/0.3/elements/energie/solaire/base_distrib/ballon_double_enveloppe.elmt
    branches/0.3/elements/energie/solaire/base_distrib/bouteille_echang_plaque.elmt
    branches/0.3/elements/energie/solaire/eau_sanitaire/cumuls_elec_01.elmt
    branches/0.3/elements/energie/solaire/eau_sanitaire/cumulus_elec_2.elmt
    branches/0.3/elements/energie/solaire/eau_sanitaire/disconnecteur_01d.elmt
    branches/0.3/elements/energie/solaire/eau_sanitaire/disconnecteur_01g.elmt
    branches/0.3/elements/energie/solaire/eau_sanitaire/electro-vanne3v.elmt
    branches/0.3/elements/energie/solaire/eau_sanitaire/electro_vanne2v_01.elmt
    branches/0.3/elements/energie/solaire/eau_sanitaire/mitigeur_melangeur_01.elmt
    branches/0.3/elements/energie/solaire/eau_sanitaire/mitigeur_melangeur_02.elmt
    branches/0.3/elements/energie/solaire/eau_sanitaire/mitigeur_melangeur_03.elmt
    branches/0.3/elements/energie/solaire/eau_sanitaire/rechauff_ecs_doublenveloppe.elmt
    branches/0.3/elements/energie/solaire/eau_sanitaire/rechauff_ecs_plaques.elmt
    branches/0.3/elements/energie/solaire/eau_sanitaire/rechauff_ecs_tubulaire.elmt
    branches/0.3/elements/energie/solaire/eau_sanitaire/robinet_melangeur_01.elmt
    branches/0.3/elements/energie/solaire/eau_sanitaire/robinet_puisage_01.elmt
    branches/0.3/elements/energie/solaire/eau_sanitaire/robinet_tournant_boulle_01.elmt
    branches/0.3/elements/energie/solaire/expansion_soupape/
    branches/0.3/elements/energie/solaire/expansion_soupape/bouteille_guy_delsol.elmt
    branches/0.3/elements/energie/solaire/expansion_soupape/event_01.elmt
    branches/0.3/elements/energie/solaire/expansion_soupape/groupe_securite_01d.elmt
    branches/0.3/elements/energie/solaire/expansion_soupape/groupe_securite_01g.elmt
    branches/0.3/elements/energie/solaire/expansion_soupape/manometre_01.elmt
    branches/0.3/elements/energie/solaire/expansion_soupape/purgeur.elmt
    branches/0.3/elements/energie/solaire/expansion_soupape/qet_directory
    branches/0.3/elements/energie/solaire/expansion_soupape/soupape_01d.elmt
    branches/0.3/elements/energie/solaire/expansion_soupape/soupape_01g.elmt
    branches/0.3/elements/energie/solaire/expansion_soupape/termovar.elmt
    branches/0.3/elements/energie/solaire/expansion_soupape/thermometre_rond_01.elmt
    branches/0.3/elements/energie/solaire/expansion_soupape/thermometre_vertical_01.elmt
    branches/0.3/elements/energie/solaire/expansion_soupape/vanne_diferentielle_01d.elmt
    branches/0.3/elements/energie/solaire/expansion_soupape/vanne_diferentielle_03.elmt
    branches/0.3/elements/energie/solaire/expansion_soupape/vanne_diferentielle_1g.elmt
    branches/0.3/elements/energie/solaire/expansion_soupape/vanne_diferentielle_3d.elmt
    branches/0.3/elements/energie/solaire/expansion_soupape/vanne_diferentielle_3g.elmt
    branches/0.3/elements/energie/solaire/expansion_soupape/vanne_recyclage_thermostatique_01g.elmt
    branches/0.3/elements/energie/solaire/expansion_soupape/vase_chauffage_01.elmt
    branches/0.3/elements/energie/solaire/expansion_soupape/vase_chauffage_02.elmt
    branches/0.3/elements/energie/solaire/expansion_soupape/vase_chauffage_03.elmt
    branches/0.3/elements/energie/solaire/expansion_soupape/vase_chauffage_ouvert_01.elmt
    branches/0.3/elements/energie/solaire/expansion_soupape/vase_chauffage_ouvert_02.elmt
    branches/0.3/elements/energie/solaire/expansion_soupape/vidange.elmt
    branches/0.3/elements/energie/solaire/pompe/
    branches/0.3/elements/energie/solaire/pompe/circulateur_reversible_01.elmt
    branches/0.3/elements/energie/solaire/pompe/circulateur_sanitaire_01.elmt
    branches/0.3/elements/energie/solaire/pompe/circulateur_sanitaire_clapet_01.elmt
    branches/0.3/elements/energie/solaire/pompe/debimetre_helice_01.elmt
    branches/0.3/elements/energie/solaire/pompe/module_hydraulique_01.elmt
    branches/0.3/elements/energie/solaire/pompe/module_hydraulique_02.elmt
    branches/0.3/elements/energie/solaire/pompe/pompe_01.elmt
    branches/0.3/elements/energie/solaire/pompe/pompe_clapet_01.elmt
    branches/0.3/elements/energie/solaire/pompe/qet_directory
    branches/0.3/elements/energie/solaire/productions/
    branches/0.3/elements/energie/solaire/productions/cap_thersolaire.elmt
    branches/0.3/elements/energie/solaire/productions/capteur_tubes_01.elmt
    branches/0.3/elements/energie/solaire/productions/chaudiere_bois_01.elmt
    branches/0.3/elements/energie/solaire/productions/poele_01.elmt
    branches/0.3/elements/energie/solaire/productions/qet_directory
    branches/0.3/elements/energie/solaire/signaletiques/diametre_01.elmt
    branches/0.3/elements/energie/solaire/signaletiques/entre_ef_ecs.elmt
    branches/0.3/elements/energie/solaire/signaletiques/fleche_3voies_01.elmt
    branches/0.3/elements/energie/solaire/signaletiques/fleche_3voies_02.elmt
    branches/0.3/elements/energie/solaire/signaletiques/fleche_3voies_03.elmt
    branches/0.3/elements/energie/solaire/signaletiques/fleche_3voies_04.elmt
    branches/0.3/elements/energie/solaire/signaletiques/lien_folio_01.elmt
    branches/0.3/elements/energie/solaire/signaletiques/lien_folio_02.elmt
    branches/0.3/elements/energie/solaire/signaletiques/percement.elmt
    branches/0.3/elements/energie/solaire/signaletiques/percement_murale_01.elmt
    branches/0.3/elements/energie/solaire/signaletiques/percement_plancher_01.elmt
    branches/0.3/elements/energie/solaire/signaletiques/sortie_ecs.elmt
    branches/0.3/elements/energie/solaire/signaletiques/vanne_3v_secteur.elmt
    branches/0.3/elements/energie/solaire/testsymboles/
    branches/0.3/elements/energie/solaire/testsymboles/ballon_central.elmt
    branches/0.3/elements/energie/solaire/testsymboles/clap_b.elmt
    branches/0.3/elements/energie/solaire/testsymboles/clapbat.elmt
    branches/0.3/elements/energie/solaire/testsymboles/clapboulle.elmt
    branches/0.3/elements/energie/solaire/testsymboles/clapdiode.elmt
    branches/0.3/elements/energie/solaire/testsymboles/clapet_a.elmt
    branches/0.3/elements/energie/solaire/testsymboles/claptriang.elmt
    branches/0.3/elements/energie/solaire/testsymboles/lement_inconnue.elmt
    branches/0.3/elements/energie/solaire/testsymboles/oeuf.elmt
    branches/0.3/elements/energie/solaire/testsymboles/qet_directory
    branches/0.3/elements/energie/solaire/testsymboles/rechauff_ecs.elmt
    branches/0.3/elements/energie/solaire/testsymboles/test_text.elmt
    branches/0.3/elements/energie/solaire/vanne/clapet_01.elmt
    branches/0.3/elements/energie/solaire/vanne/clapet_02.elmt
    branches/0.3/elements/energie/solaire/vanne/clapet_03.elmt
    branches/0.3/elements/energie/solaire/vanne/filtre_01.elmt
    branches/0.3/elements/energie/solaire/vanne/soupape_capteur_01.elmt
    branches/0.3/elements/energie/solaire/vanne/soupape_thermique_01.elmt
    branches/0.3/elements/energie/solaire/vanne/te_reglage_couder_01d.elmt
    branches/0.3/elements/energie/solaire/vanne/te_reglage_couder_01g.elmt
    branches/0.3/elements/energie/solaire/vanne/te_reglage_droit_01.elmt
    branches/0.3/elements/energie/solaire/vanne/vanne2voies_01.elmt
    branches/0.3/elements/energie/solaire/vanne/vanne3voies_01.elmt
    branches/0.3/elements/energie/solaire/vanne/vanne_01.elmt
    branches/0.3/elements/energie/solaire/vanne/vanne_3v_a_secteur_01.elmt
    branches/0.3/elements/energie/solaire/vanne/vanne_equilibrage_debimetre_01.elmt
    branches/0.3/elements/energie/solaire/vanne/vanne_equilibrage_ta_01.elmt

Added: branches/0.3/elements/energie/solaire/ballon_echangeur/ballon_01.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/ballon_echangeur/ballon_01.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/ballon_echangeur/ballon_01.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,41 @@
+<definition width="150" version="0.3" hotspot_x="75" hotspot_y="120" height="260" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">ballon version 1</name>
+    </names>
+    <informations></informations>
+    <description>
+        <rect width="120" x="-58.125" y="-93.25" antialias="true" height="201" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <arc width="120" x="-58" y="-111.5" antialias="true" height="36" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
+        <circle x="-51.5" y="88.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="3"/>
+        <circle x="-1.5" y="118.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="3"/>
+        <circle x="-1.5" y="-111.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="3"/>
+        <circle x="-51.5" y="-81.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="3"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="triangle" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-75" x1="53" y2="-75" x2="59"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="triangle" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-55" x1="53" y2="-55" x2="59"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="triangle" end2="triangle" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-14" x1="53" y2="-14" x2="59"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="triangle" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="6" x1="53" y2="6" x2="59"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="triangle" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="26" x1="53" y2="26" x2="59"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="triangle" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="86" x1="53" y2="86" x2="59"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="triangle" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="105" x1="59" y2="105" x2="53"/>
+        <polygon x4="-30" y5="20" x5="46" antialias="false" style="line-style:dotted;line-weight:normal;filling:none;color:black" closed="false" y1="80" x1="46" y2="70" x2="-30" y3="50" x3="30" y4="30"/>
+        <polygon x4="-30" y5="0" x5="46" y6="0" x6="46" antialias="true" style="line-style:dotted;line-weight:normal;filling:none;color:black" closed="false" y1="-60" x1="46" y2="-50" x2="-30" y3="-30" x3="30" y4="-10"/>
+        <circle x="46.125" y="-84" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7.5"/>
+        <circle x="46.25" y="-3.75" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7.5"/>
+        <circle x="46.25" y="16.25" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7.5"/>
+        <circle x="46.125" y="-64" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7.5"/>
+        <circle x="46.25" y="-23.75" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7.5"/>
+        <input x="-55" y="6" size="7" rotate="true" text="  Ballon&#xa;Echangeurs"/>
+        <circle x="46.25" y="76.25" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7.5"/>
+        <polygon x4="41.875" y5="120.75" x5="41.875" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="115.75" x1="56.875" y2="130.75" x2="56.875" y3="130.75" x3="41.875" y4="120.75"/>
+        <polygon x4="-38.125" y5="120.75" x5="-38.125" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="115.75" x1="-53.125" y2="130.75" x2="-53.125" y3="130.75" x3="-38.125" y4="120.75"/>
+        <arc width="120" x="-58.125" y="89.25" antialias="true" height="36" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
+        <circle x="46.25" y="96.25" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7.5"/>
+        <terminal x="50" y="100" orientation="e"/>
+        <terminal x="50" y="0" orientation="e"/>
+        <terminal x="50" y="80" orientation="e"/>
+        <terminal x="50" y="20" orientation="e"/>
+        <terminal x="50" y="-80" orientation="e"/>
+        <terminal x="50" y="-60" orientation="e"/>
+        <terminal x="50" y="-20" orientation="e"/>
+    </description>
+</definition>

Added: branches/0.3/elements/energie/solaire/ballon_echangeur/ballon_02.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/ballon_echangeur/ballon_02.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/ballon_echangeur/ballon_02.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,41 @@
+<definition width="150" version="0.3" hotspot_x="75" hotspot_y="120" height="260" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">ballon version 2</name>
+    </names>
+    <informations></informations>
+    <description>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="triangle" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="105" x1="-57" y2="105" x2="-51"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="triangle" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="28" x1="-55" y2="28" x2="-49"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="triangle" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-53" x1="-56" y2="-53" x2="-50"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="triangle" end2="triangle" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-13" x1="-55" y2="-13" x2="-49"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="triangle" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="7" x1="-56" y2="7" x2="-50"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="triangle" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="86" x1="-55" y2="86" x2="-49"/>
+        <rect width="120" x="-58" y="-94" antialias="true" height="201" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="triangle" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-74" x1="-56" y2="-74" x2="-50"/>
+        <circle x="-1.5" y="118.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="3"/>
+        <circle x="-1.5" y="-111.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="3"/>
+        <circle x="48.5" y="89.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="3"/>
+        <circle x="49.5" y="-81.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="3"/>
+        <polygon x4="30" y5="80" x5="-46" antialias="true" style="line-style:dotted;line-weight:normal;filling:none;color:black" closed="false" y1="20" x1="-46" y2="30" x2="30" y3="50" x3="-31" y4="70"/>
+        <polygon x4="30" y5="0" x5="-47" y6="0" x6="-46" antialias="true" style="line-style:dotted;line-weight:normal;filling:none;color:black" closed="false" y1="-60" x1="-46" y2="-50" x2="29" y3="-30" x3="-30" y4="-11"/>
+        <arc width="120" x="-58" y="-112.5" antialias="true" height="36" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
+        <circle x="-53.75" y="-83.75" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7.5"/>
+        <circle x="-53.875" y="-4" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7.5"/>
+        <circle x="-53.75" y="16.25" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7.5"/>
+        <circle x="-53.75" y="-63.75" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7.5"/>
+        <circle x="-53.75" y="-23.75" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7.5"/>
+        <input x="-2" y="9" size="7" rotate="true" text="  Ballon&#xa;Echangeurs"/>
+        <circle x="-53.75" y="76.25" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7.5"/>
+        <polygon x4="41.875" y5="120.75" x5="41.875" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="115.75" x1="56.875" y2="130.75" x2="56.875" y3="130.75" x3="41.875" y4="120.75"/>
+        <polygon x4="-38.125" y5="120.75" x5="-38.125" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="115.75" x1="-53.125" y2="130.75" x2="-53.125" y3="130.75" x3="-38.125" y4="120.75"/>
+        <arc width="120" x="-58.125" y="89.25" antialias="true" height="36" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
+        <circle x="-53.75" y="96.25" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7.5"/>
+        <terminal x="-50" y="100" orientation="w"/>
+        <terminal x="-50" y="0" orientation="w"/>
+        <terminal x="-50" y="80" orientation="w"/>
+        <terminal x="-50" y="20" orientation="w"/>
+        <terminal x="-50" y="-80" orientation="w"/>
+        <terminal x="-50" y="-60" orientation="w"/>
+        <terminal x="-50" y="-20" orientation="w"/>
+    </description>
+</definition>

Added: branches/0.3/elements/energie/solaire/ballon_echangeur/ballon_combine_01.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/ballon_echangeur/ballon_combine_01.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/ballon_echangeur/ballon_combine_01.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,95 @@
+<definition width="150" version="0.3" hotspot_x="75" hotspot_y="75" height="260" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">Ballon Combiné 1000L</name>
+    </names>
+    <informations></informations>
+    <description>
+        <arc width="120" x="-60" y="133.5" antialias="true" height="36" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
+        <arc width="120" x="-60" y="-67.5" antialias="true" height="36" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
+        <rect width="2" x="-11" y="-60" antialias="false" height="30" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect width="2" x="9" y="-60" antialias="false" height="100" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="23" x1="-24" y2="23" x2="-17"/>
+        <circle x="-53.75" y="46.25" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7.5"/>
+        <circle x="8" y="-62" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="46.25" y="46.25" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7.5"/>
+        <circle x="46.25" y="136.25" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7.5"/>
+        <rect width="120" x="-60" y="-50" antialias="false" height="201" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="24" x1="25" y2="24" x2="17"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="51" x1="-15" y2="28" x2="-15"/>
+        <arc width="4" x="15" y="24" antialias="true" height="9" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-90"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="50" x1="15" y2="27" x2="15"/>
+        <arc width="4" x="-19" y="23" antialias="true" height="9" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-90"/>
+        <arc width="10" x="-30" y="16" antialias="true" height="7" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-90"/>
+        <arc width="10" x="20" y="17" antialias="true" height="7" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
+        <arc width="30" x="-15" y="46" antialias="true" height="9" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-34" x1="-30" y2="20" x2="-30"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-34" x1="30" y2="20" x2="30"/>
+        <arc width="60" x="-30" y="-42.5" antialias="true" height="16" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="58" x1="-49" y2="58" x2="39"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="62" x1="-49" y2="62" x2="2"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="68" x1="-13" y2="68" x2="39"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="78" x1="-13" y2="78" x2="39"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="88" x1="-12" y2="88" x2="40"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="98" x1="-12" y2="98" x2="40"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="108" x1="-13" y2="108" x2="39"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="118" x1="-12" y2="118" x2="40"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="128" x1="-50" y2="118" x2="40"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="132" x1="-49" y2="122" x2="40"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="128" x1="40" y2="128" x2="-14"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="72" x1="-49" y2="72" x2="3"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="82" x1="-49" y2="82" x2="3"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="92" x1="-49" y2="92" x2="3"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="102" x1="-49" y2="102" x2="3"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="112" x1="-50" y2="112" x2="2"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="122" x1="-49" y2="122" x2="3"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="132" x1="-49" y2="132" x2="3"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="88" x1="-50" y2="78" x2="40"/>
+        <arc width="4" x="-51.5" y="128" antialias="true" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180"/>
+        <arc width="4" x="-51.5" y="118" antialias="true" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="82" x1="-49" y2="72" x2="40"/>
+        <arc width="4" x="-51.5" y="108" antialias="true" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180"/>
+        <arc width="4" x="-51.5" y="98" antialias="true" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="78" x1="-50" y2="68" x2="40"/>
+        <arc width="4" x="-51.5" y="88" antialias="true" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="72" x1="-49" y2="62" x2="40"/>
+        <arc width="4" x="-51.5" y="78" antialias="true" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180"/>
+        <arc width="4" x="-51.5" y="68" antialias="true" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="68" x1="-50" y2="58" x2="40"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="98" x1="-50" y2="88" x2="40"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="108" x1="-50" y2="98" x2="40"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="118" x1="-50" y2="108" x2="40"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="92" x1="-49" y2="82" x2="40"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="102" x1="-49" y2="92" x2="40"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="112" x1="-49" y2="102" x2="40"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="122" x1="-49" y2="112" x2="40"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="138" x1="-50" y2="128" x2="40"/>
+        <arc width="4" x="38.5" y="58" antialias="true" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
+        <arc width="4" x="38.5" y="68" antialias="true" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
+        <arc width="4" x="38.5" y="78" antialias="true" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
+        <arc width="4" x="38.5" y="88" antialias="true" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
+        <arc width="4" x="38.5" y="98" antialias="true" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
+        <arc width="4" x="38.5" y="108" antialias="true" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
+        <arc width="4" x="38.5" y="118" antialias="true" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="142" x1="-49" y2="132" x2="40"/>
+        <arc width="4" x="38.5" y="128" antialias="true" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
+        <polygon x4="2" y5="170" x5="2" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="170" x1="-2" y2="173" x2="-2" y3="173" x3="2" y4="170"/>
+        <input x="12" y="44" size="6" rotate="true" text="  Ballon&#xa;Combiné&#xa;  1000L"/>
+        <circle x="-53.75" y="-43.75" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7.5"/>
+        <circle x="-12" y="-62" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <polygon x4="40" y5="164" x5="40" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="159" x1="55" y2="174" x2="55" y3="174" x3="40" y4="164"/>
+        <polygon x4="-40" y5="164" x5="-40" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="159" x1="-55" y2="174" x2="-55" y3="174" x3="-40" y4="164"/>
+        <circle x="46.25" y="-43.75" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7.5"/>
+        <circle x="-52" y="138" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="-52" y="58" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <terminal x="-50" y="-40" orientation="w"/>
+        <terminal x="-50" y="140" orientation="w"/>
+        <terminal x="10" y="-60" orientation="n"/>
+        <terminal x="0" y="173" orientation="s"/>
+        <terminal x="50" y="50" orientation="e"/>
+        <terminal x="50" y="-40" orientation="e"/>
+        <terminal x="50" y="140" orientation="e"/>
+        <terminal x="-50" y="60" orientation="w"/>
+        <terminal x="-50" y="50" orientation="w"/>
+        <terminal x="-10" y="-60" orientation="n"/>
+    </description>
+</definition>

Added: branches/0.3/elements/energie/solaire/ballon_echangeur/ballon_combiner_ecs_01.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/ballon_echangeur/ballon_combiner_ecs_01.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/ballon_echangeur/ballon_combiner_ecs_01.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,36 @@
+<definition width="120" version="0.3" hotspot_x="60" hotspot_y="100" height="200" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">Ballon Combinée ECS</name>
+    </names>
+    <informations></informations>
+    <description>
+        <polygon y29="-50" x23="-30" x24="30" x25="-30" style="line-style:normal;line-weight:normal;filling:none;color:black" x26="30" x27="-30" x1="20" x28="30" x2="20" x29="-30" x3="-30" y30="-52" x4="30" y31="-54" x5="-30" y32="-56" x6="30" y33="-58" x7="-30" y34="-60" x8="30" y35="-62" x9="-30" y36="-64" x30="30" y37="-66" x31="-30" y38="-68" x32="30" y39="-70" x33="-30" x34="30" x35="-30" x36="30" x37="-30" y1="-90" x38="30" y2="20" x39="-30" y3="10" y40="-72" y4="6" y41="-74" y5="0" y42="-90" y6="-4" y43="-90" y7="-6" y8="-8" y9="-10" x40="30" x41="-20" x42="-20" x43="-20" antialias="true" closed="false" y10="-12" y11="-14" y12="-16" y13="-18" y14="-20" y15="-22" y16="-24" x10="30" y17="-26" x11="-30" y18="-28" x12="30" y19="-30" x13="-30" x14="30" x15="-30" x16="30" x17="-30" x18="30" x19="-30" y20="-32" y21="-34" y22="-36" y23="-38" y24="-40" y25="-42" y26="-44" x20="30" y27="-46" x21="-30" y28="-48" x22="30"/>
+        <rect width="90" x="-45" y="-65" antialias="true" height="133" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <arc width="90" x="-45" y="52" antialias="true" height="33" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
+        <input x="-20" y="75.5" size="9" rotate="true" text="500L"/>
+        <text x="-35" y="95" size="7" text="Ballon type SKS"/>
+        <polygon x4="40" y5="76" x5="40" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="76" x1="-40" y2="87" x2="-40" y3="87" x3="40" y4="76"/>
+        <rect width="4" x="18" y="-92" antialias="false" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect width="4" x="-22" y="-92" antialias="false" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <circle x="-42.5" y="-62.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-26" x2="-26" x3="-30" x4="-30" antialias="false" x5="30" x6="30" x7="26" x8="26" x9="26" closed="false" y1="-79" y2="-86" y3="-86" y4="-88" y5="-88" y6="-86" y7="-86" y8="-79" y9="-79"/>
+        <arc width="90" x="-45" y="-82" antialias="true" height="33" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
+        <circle x="37.5" y="-22.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <circle x="37.5" y="37.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <circle x="37.5" y="57.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <circle x="37.5" y="-52.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <circle x="-42.5" y="-32.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <circle x="-42.5" y="27.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <circle x="-42.5" y="57.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <terminal x="-40" y="-60" orientation="w"/>
+        <terminal x="-40" y="-30" orientation="w"/>
+        <terminal x="-40" y="30" orientation="w"/>
+        <terminal x="-40" y="60" orientation="w"/>
+        <terminal x="-20" y="-90" orientation="n"/>
+        <terminal x="20" y="-90" orientation="n"/>
+        <terminal x="40" y="-50" orientation="e"/>
+        <terminal x="40" y="-20" orientation="e"/>
+        <terminal x="40" y="40" orientation="e"/>
+        <terminal x="40" y="60" orientation="e"/>
+    </description>
+</definition>

Modified: branches/0.3/elements/energie/solaire/ballon_echangeur/ballon_demi_strat.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/ballon_echangeur/ballon_demi_strat.elmt	2012-04-17 05:43:08 UTC (rev 1663)
+++ branches/0.3/elements/energie/solaire/ballon_echangeur/ballon_demi_strat.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -4,37 +4,33 @@
         <name lang="fr">ballon 1000L chicane et strat</name>
         <name lang="cs">Vrstvový zásobník 1000L</name>
         <name lang="pl">Zasobnik warstwowy 1000L</name>
-    </names>
+     </names>
     <informations></informations>
     <description>
-        <rect width="20" x="-10" y="-1" antialias="false" height="100" style="line-style:dotted;line-weight:normal;filling:none;color:black"/>
+        <input x="-25" y="73.5" size="9" rotate="true" text="2000L"/>
+        <rect width="16" x="-8" y="-116" antialias="false" height="232" style="line-style:dotted;line-weight:normal;filling:none;color:black"/>
+        <input x="16" y="53" size="7" rotation="-90" rotate="true" text="Stockage / Destockage"/>
         <arc width="120" x="-60" y="-117.5" antialias="true" height="36" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-100" x1="60" y2="101" x2="60"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-10" y2="0" x2="9"/>
+        <rect width="4" x="-2" y="-115" antialias="false" height="110" style="line-style:dotted;line-weight:thin;filling:none;color:black"/>
+        <circle x="48" y="98" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <rect width="4" x="-2" y="5" antialias="false" height="110" style="line-style:dotted;line-weight:thin;filling:none;color:black"/>
+        <arc width="120" x="-60" y="82" antialias="true" height="36" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-100" x1="60" y2="101" x2="60"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-99" x1="-60" y2="101" x2="-60"/>
-        <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="100" x1="-60" y2="100" x2="60"/>
-        <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="-70" x1="-60" y2="-70" x2="59"/>
-        <polygon x4="20" y5="-116" x5="20" antialias="false" style="line-style:dotted;line-weight:normal;filling:none;color:black" closed="false" y1="-116" x1="-20" y2="-100" x2="-20" y3="-100" x3="20" y4="-116"/>
-        <circle x="-2.75" y="77.25" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5.5"/>
-        <circle x="-2.75" y="17.25" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5.5"/>
-        <circle x="-2.75" y="-92.75" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5.5"/>
-        <input x="-37" y="-36" size="7" rotate="true" text="       Ballon&#xa;Stratificateur &#xa;     Stockage&#xa;       1000L"/>
-        <circle x="-3.75" y="-112.75" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7.5"/>
-        <circle x="-43" y="-2" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
-        <circle x="-2.75" y="-82.75" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5.5"/>
-        <polygon x4="40" y5="114" x5="40" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="109" x1="55" y2="124" x2="55" y3="124" x3="40" y4="114"/>
-        <polygon x4="-40" y5="114" x5="-40" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="109" x1="-55" y2="124" x2="-55" y3="124" x3="-40" y4="114"/>
-        <arc width="120" x="-60" y="83" antialias="true" height="36" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
-        <circle x="-3.75" y="106.25" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7.5"/>
-        <circle x="-42" y="108" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
-        <circle x="-42" y="-92" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
-        <terminal x="-40" y="-90" orientation="w"/>
-        <terminal x="0" y="-80" orientation="e"/>
+        <circle x="-2.75" y="-112.75" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5.5"/>
+        <input x="-17" y="56" size="7" rotation="-90" rotate="true" text="Ballon Stratificateur"/>
+        <circle x="48" y="-102" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="-2.75" y="107.25" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5.5"/>
+        <polygon x4="40" y5="114" x5="40" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="109" x1="55" y2="124" x2="55" y3="124" x3="40" y4="114"/>
+        <polygon x4="-40" y5="114" x5="-40" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="109" x1="-55" y2="124" x2="-55" y3="124" x3="-40" y4="114"/>
+        <circle x="48" y="28" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="48" y="-32" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <terminal x="50" y="-30" orientation="e"/>
         <terminal x="0" y="110" orientation="s"/>
-        <terminal x="0" y="-109" orientation="n"/>
-        <terminal x="0" y="80" orientation="e"/>
-        <terminal x="-1" y="-90" orientation="e"/>
-        <terminal x="-1" y="20" orientation="e"/>
-        <terminal x="-41" y="0" orientation="w"/>
-        <terminal x="-40" y="110" orientation="w"/>
+        <terminal x="0" y="-110" orientation="n"/>
+        <terminal x="50" y="30" orientation="e"/>
+        <terminal x="50" y="-100" orientation="e"/>
+        <terminal x="50" y="100" orientation="e"/>
     </description>
 </definition>

Added: branches/0.3/elements/energie/solaire/ballon_echangeur/ballon_ecs_elec.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/ballon_echangeur/ballon_ecs_elec.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/ballon_echangeur/ballon_ecs_elec.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,20 @@
+<definition width="120" version="0.3" hotspot_x="60" hotspot_y="90" height="180" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">ballon ECS electrique</name>
+    </names>
+    <informations/>
+    <description>
+        <text x="-37" y="-24" size="9" text="Ballon&#xa; ECS"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" x2="-10" x3="9" x4="-10" antialias="false" x5="10" x6="-10" x7="10" x8="-11" x9="10" closed="false" y1="82" y10="30" y2="70" y11="30" y3="65" y4="60" y12="30" y5="56" x10="-10" y6="50" x11="2" y7="45" x12="2" y8="40" y9="35"/>
+        <rect width="11" x="41" y="10" antialias="false" height="1" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect width="1" x="-31" y="60" antialias="false" height="25" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect width="1" x="29" y="-80" antialias="false" height="20" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-60" x1="50" y2="70" x2="50"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-59" x1="-50" y2="70" x2="-50"/>
+        <arc width="100" x="-50" y="57.5" antialias="true" height="25" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
+        <arc width="100" x="-50" y="-72.5" antialias="true" height="25" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
+        <terminal x="-31" y="84" orientation="s"/>
+        <terminal x="29" y="-80" orientation="n"/>
+        <terminal x="51" y="10" orientation="e"/>
+    </description>
+</definition>

Added: branches/0.3/elements/energie/solaire/ballon_echangeur/ballon_ecs_horizon_01.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/ballon_echangeur/ballon_ecs_horizon_01.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/ballon_echangeur/ballon_ecs_horizon_01.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,20 @@
+<definition width="230" version="0.3" hotspot_x="125" hotspot_y="75" height="160" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">Ballon ECS horizontal</name>
+    </names>
+    <informations></informations>
+    <description>
+        <polygon x4="84" y5="-18" x5="84" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-22" x1="83" y2="-22" x2="90" y3="-18" x3="90" y4="-18"/>
+        <polygon x4="84" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="42" x1="83" y2="42" x2="90" y3="38" x3="90" y4="38"/>
+        <rect width="4" x="58" y="60" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect width="4" x="-92" y="-50" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect width="165" x="-94" y="-40" antialias="true" height="100" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <input x="-60" y="11" size="7" rotate="true" text="Ballon ECS"/>
+        <arc width="28" x="58" y="-40" antialias="true" height="100" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
+        <arc width="28" x="-108" y="-40" antialias="true" height="100" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180"/>
+        <terminal x="-90" y="-50" orientation="n"/>
+        <terminal x="60" y="70" orientation="s"/>
+        <terminal x="90" y="-20" orientation="e"/>
+        <terminal x="90" y="40" orientation="e"/>
+    </description>
+</definition>

Modified: branches/0.3/elements/energie/solaire/ballon_echangeur/ballon_stock1000l.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/ballon_echangeur/ballon_stock1000l.elmt	2012-04-17 05:43:08 UTC (rev 1663)
+++ branches/0.3/elements/energie/solaire/ballon_echangeur/ballon_stock1000l.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -1,5 +1,5 @@
 <definition width="150" version="0.3" hotspot_x="75" hotspot_y="65" height="260" type="element" orientation="ndny">
-    <names>
+    <names>        
         <name lang="en">Storage tank 1000L</name>
         <name lang="fr">Ballon Stockage 1000L</name>
         <name lang="cs">Zásobník 1000L</name>
@@ -7,25 +7,37 @@
     </names>
     <informations></informations>
     <description>
-        <rect width="120" x="-60" y="-39" antialias="false" height="201" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <input x="-55" y="36.5" size="7" rotate="true" text="  Ballon&#xa;Stockage&#xa;  1000L"/>
-        <circle x="-63.75" y="-33.75" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7.5"/>
-        <circle x="38" y="-12" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
-        <circle x="-2.75" y="175.25" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5.5"/>
-        <circle x="-2.75" y="-53.75" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5.5"/>
-        <polygon x4="40" y5="174" x5="40" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="169" x1="55" y2="184" x2="55" y3="184" x3="40" y4="174"/>
-        <polygon x4="-40" y5="174" x5="-40" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="169" x1="-55" y2="184" x2="-55" y3="184" x3="-40" y4="174"/>
-        <arc width="120" x="-60" y="142.5" antialias="true" height="36" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
-        <arc width="120" x="-60" y="-57.5" antialias="true" height="36" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
-        <circle x="-63.75" y="146.25" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7.5"/>
-        <circle x="38" y="128" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
-        <circle x="38" y="58" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
-        <terminal x="-60" y="-30" orientation="w"/>
-        <terminal x="-60" y="150" orientation="w"/>
-        <terminal x="0" y="-51" orientation="n"/>
-        <terminal x="0" y="178" orientation="s"/>
-        <terminal x="40" y="-10" orientation="e"/>
-        <terminal x="40" y="60" orientation="e"/>
-        <terminal x="40" y="130" orientation="e"/>
+        <circle x="-53.75" y="16.25" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7.5"/>
+        <rect width="120" x="-60" y="-40" antialias="false" height="201" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <arc width="120" x="-60" y="143.5" antialias="true" height="36" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
+        <circle x="46.25" y="-33.75" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7.5"/>
+        <circle x="46.25" y="96.25" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7.5"/>
+        <circle x="-53.75" y="96.25" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7.5"/>
+        <circle x="46.25" y="16.25" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7.5"/>
+        <circle x="46.25" y="146.25" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7.5"/>
+        <polygon x4="2" y5="180" x5="2" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="180" x1="-2" y2="183" x2="-2" y3="183" x3="2" y4="180"/>
+        <arc width="120" x="-60" y="-58" antialias="true" height="36" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
+        <input x="-31" y="29" size="7" rotate="true" text="  Ballon&#xa;Stockage&#xa;  1000L"/>
+        <circle x="-53.75" y="-33.75" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7.5"/>
+        <circle x="-2" y="-12" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="-2.75" y="-52.75" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5.5"/>
+        <polygon x4="40" y5="174" x5="40" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="169" x1="55" y2="184" x2="55" y3="184" x3="40" y4="174"/>
+        <polygon x4="-40" y5="174" x5="-40" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="169" x1="-55" y2="184" x2="-55" y3="184" x3="-40" y4="174"/>
+        <circle x="-53.75" y="146.25" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7.5"/>
+        <circle x="-2" y="128" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="-2" y="58" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <terminal x="-50" y="-30" orientation="w"/>
+        <terminal x="-50" y="150" orientation="w"/>
+        <terminal x="0" y="-50" orientation="n"/>
+        <terminal x="0" y="183" orientation="s"/>
+        <terminal x="0" y="-10" orientation="e"/>
+        <terminal x="0" y="60" orientation="e"/>
+        <terminal x="0" y="130" orientation="e"/>
+        <terminal x="50" y="150" orientation="e"/>
+        <terminal x="50" y="-30" orientation="e"/>
+        <terminal x="50" y="20" orientation="e"/>
+        <terminal x="50" y="100" orientation="e"/>
+        <terminal x="-50" y="20" orientation="w"/>
+        <terminal x="-50" y="100" orientation="w"/>
     </description>
 </definition>

Added: branches/0.3/elements/energie/solaire/ballon_echangeur/ballon_strat_ecs.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/ballon_echangeur/ballon_strat_ecs.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/ballon_echangeur/ballon_strat_ecs.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,117 @@
+<definition width="150" version="0.3" hotspot_x="75" hotspot_y="75" height="260" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">Ballon Stratification ECS</name>
+    </names>
+    <informations></informations>
+    <description>
+        <polygon antialias="false" style="line-style:dotted;line-weight:normal;filling:none;color:black" closed="false" y1="155" x1="-59" y2="155" x2="-20" y3="168" x3="-20"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="72" x1="46" y2="65" x2="42"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="66" x1="38" y2="71" x2="41"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="43" x1="42" y2="60" x2="42"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="44" x1="38" y2="60" x2="38"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="20" x1="42" y2="37" x2="42"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="21" x1="38" y2="38" x2="38"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="72" x1="-13" y2="72" x2="45"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="76" x1="-43" y2="76" x2="45"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="50" x1="-29" y2="60" x2="41"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="51" x1="-44" y2="62" x2="31"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="76" x1="-44" y2="64" x2="46"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="72" x1="-45" y2="60" x2="46"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="38" x1="45" y2="27" x2="-28"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="39" x1="32" y2="29" x2="-43"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="51" x1="-43" y2="42" x2="44"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="47" x1="-43" y2="38" x2="45"/>
+        <arc width="4" x="-46.5" y="72" antialias="true" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180"/>
+        <arc width="4" x="-45.5" y="47" antialias="true" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180"/>
+        <arc width="4" x="43.5" y="72" antialias="true" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
+        <arc width="4" x="44.5" y="60" antialias="true" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
+        <input x="12" y="98" size="7" rotate="true" text="800L"/>
+        <input x="-53" y="117" size="7" rotation="-90" rotate="true" text="Ballon Strati. et Ecs"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-42" x1="-60" y2="152" x2="-60"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-60" x1="-38" y2="-46" x2="-41"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-60" x1="-42" y2="-44" x2="-45"/>
+        <circle x="48" y="-52" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="48" y="48" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-43" x1="60" y2="151" x2="60"/>
+        <arc width="120" x="-60" y="-60.5" antialias="true" height="36" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-31" x1="-43" y2="-41" x2="46"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-35" x1="-44" y2="-45" x2="46"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-45" x1="42" y2="-59" x2="42"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-45" x1="38" y2="-59" x2="38"/>
+        <arc width="4" x="-45.5" y="-45" antialias="true" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="51" x1="-6" y2="51" x2="7"/>
+        <rect width="13" x="-6" y="-60" antialias="false" height="229" style="line-style:dotted;line-weight:normal;filling:none;color:black"/>
+        <rect width="4" x="-2" y="70" antialias="false" height="99" style="line-style:dotted;line-weight:thin;filling:none;color:black"/>
+        <rect width="4" x="-2" y="-60" antialias="false" height="108" style="line-style:dotted;line-weight:thin;filling:none;color:black"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="42" y2="15" x2="42"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="42" y2="4" x2="42"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="42" y2="-6" x2="42"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="42" y2="-16" x2="42"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="42" y2="-26" x2="42"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-40" x1="42" y2="-36" x2="42"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="38" y2="15" x2="38"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="38" y2="4" x2="38"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="38" y2="-5" x2="38"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="38" y2="-16" x2="38"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="38" y2="-26" x2="38"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-40" x1="38" y2="-35" x2="38"/>
+        <arc width="120" x="-60" y="133.5" antialias="true" height="36" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
+        <circle x="-33.75" y="156.25" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7.5"/>
+        <circle x="38" y="-62" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="-3.75" y="165.25" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7.5"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-45" x1="-43" y2="-45" x2="45"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-41" x1="-43" y2="-41" x2="8"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-35" x1="-7" y2="-35" x2="45"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-25" x1="-7" y2="-25" x2="45"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-15" x1="-6" y2="-15" x2="46"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5" x1="-6" y2="-5" x2="46"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="-7" y2="5" x2="45"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="15" x1="-6" y2="15" x2="46"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="25" x1="-44" y2="15" x2="46"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="29" x1="-43" y2="19" x2="46"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-31" x1="-43" y2="-31" x2="9"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-21" x1="-43" y2="-21" x2="9"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="-43" y2="-11" x2="9"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-1" x1="-43" y2="-1" x2="9"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="9" x1="-44" y2="9" x2="8"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="19" x1="-43" y2="19" x2="9"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-15" x1="-44" y2="-25" x2="46"/>
+        <arc width="4" x="-45.5" y="25" antialias="true" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180"/>
+        <arc width="4" x="-45.5" y="15" antialias="true" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-21" x1="-43" y2="-31" x2="46"/>
+        <arc width="4" x="-45.5" y="5" antialias="true" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180"/>
+        <arc width="4" x="-45.5" y="-5" antialias="true" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-25" x1="-44" y2="-35" x2="46"/>
+        <arc width="4" x="-45.5" y="-15" antialias="true" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180"/>
+        <arc width="4" x="-45.5" y="-25" antialias="true" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180"/>
+        <arc width="4" x="-45.5" y="-35" antialias="true" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5" x1="-44" y2="-15" x2="46"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="-44" y2="-5" x2="46"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="15" x1="-44" y2="5" x2="46"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="-43" y2="-21" x2="46"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-1" x1="-43" y2="-11" x2="46"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="9" x1="-43" y2="-1" x2="46"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="19" x1="-43" y2="9" x2="46"/>
+        <arc width="4" x="44.5" y="-45" antialias="true" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
+        <arc width="4" x="44.5" y="-35" antialias="true" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
+        <arc width="4" x="44.5" y="-25" antialias="true" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
+        <arc width="4" x="44.5" y="-15" antialias="true" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
+        <arc width="4" x="44.5" y="-5" antialias="true" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
+        <arc width="4" x="44.5" y="5" antialias="true" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
+        <arc width="4" x="44.5" y="15" antialias="true" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
+        <arc width="4" x="43.5" y="38" antialias="true" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
+        <circle x="-42" y="-62" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <polygon x4="40" y5="164" x5="40" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="159" x1="55" y2="174" x2="55" y3="174" x3="40" y4="164"/>
+        <polygon x4="-40" y5="164" x5="-40" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="159" x1="-55" y2="174" x2="-55" y3="174" x3="-40" y4="164"/>
+        <circle x="-3.75" y="-63.75" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7.5"/>
+        <circle x="48" y="148" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <terminal x="50" y="150" orientation="e"/>
+        <terminal x="-40" y="-60" orientation="n"/>
+        <terminal x="0" y="170" orientation="s"/>
+        <terminal x="50" y="50" orientation="e"/>
+        <terminal x="50" y="-50" orientation="e"/>
+        <terminal x="-30" y="160" orientation="w"/>
+        <terminal x="0" y="-60" orientation="n"/>
+        <terminal x="40" y="-60" orientation="n"/>
+    </description>
+</definition>

Modified: branches/0.3/elements/energie/solaire/ballon_echangeur/echangeur_plaque.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/ballon_echangeur/echangeur_plaque.elmt	2012-04-17 05:43:08 UTC (rev 1663)
+++ branches/0.3/elements/energie/solaire/ballon_echangeur/echangeur_plaque.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -1,4 +1,4 @@
-<definition width="50" version="0.3" hotspot_x="25" hotspot_y="50" height="100" type="element" orientation="ndny">
+<definition width="60" version="0.3" hotspot_x="30" hotspot_y="70" height="120" type="element" orientation="ndny">
     <names>
         <name lang="en">Plate heat exchanger</name>
         <name lang="fr">Echangeur à Plaques</name>
@@ -7,19 +7,21 @@
     </names>
     <informations></informations>
     <description>
-        <text x="17" y="13" size="4" rotation="-90" text="Secondaire"/>
-        <text x="-14" y="9" size="4" rotation="-90" text="Primaire"/>
-        <text x="-16" y="-39" size="6" text="Plaques"/>
-        <rect width="40" x="-20" y="-36" antialias="true" height="71" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <circle x="18.75" y="28.75" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="2.5"/>
-        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="20" x2="10" x3="-5" x4="10" antialias="true" x5="-5" x6="10" x7="-5" x8="10" x9="20" closed="false" y1="-30" y2="-30" y10="30" y3="-20" y4="-10" y5="0" x10="20" y6="10" y7="20" y8="30" y9="30"/>
-        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-20" x2="5" x3="-10" x4="5" antialias="true" x5="-10" x6="5" x7="-10" x8="5" x9="-20" closed="false" y1="-30" y2="-30" y10="30" y3="-20" y4="-10" y5="0" x10="-20" y6="10" y7="20" y8="30" y9="30"/>
-        <circle x="-21.25" y="28.75" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="2.5"/>
-        <circle x="18.75" y="-31.25" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="2.5"/>
-        <circle x="-21.25" y="-31.25" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="2.5"/>
-        <terminal x="-20" y="-30" orientation="w"/>
-        <terminal x="-20" y="30" orientation="w"/>
-        <terminal x="20" y="-30" orientation="e"/>
-        <terminal x="20" y="30" orientation="e"/>
+        <rect width="26" x="-13" y="-35" antialias="false" height="70" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="12" x2="10" x3="-5" x4="10" antialias="true" x5="-5" x6="10" x7="-5" x8="10" x9="12" closed="false" y1="-30" y10="30" y2="-30" y3="-20" y4="-10" y5="0" x10="10" y6="10" y7="20" y8="30" y9="30"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-12" x2="5" x3="-10" x4="5" antialias="true" x5="-10" x6="5" x7="-10" x8="5" x9="-12" closed="false" y1="-30" y10="30" y2="-30" y3="-20" y4="-10" y5="0" x10="-12" y6="10" y7="20" y8="30" y9="30"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="simple" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-16" x1="10" y2="4" x2="10"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="simple" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-8" x1="-10" y2="12" x2="-10"/>
+        <input x="-23" y="-51" size="7" rotate="true" text="Plaques"/>
+        <text x="20" y="13" size="4" rotation="-90" text="Secondaire"/>
+        <text x="-15" y="9" size="4" rotation="-90" text="Primaire"/>
+        <circle x="11.75" y="28.75" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="2.5"/>
+        <circle x="-15.25" y="28.75" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="2.5"/>
+        <circle x="11.75" y="-31.25" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="2.5"/>
+        <circle x="-14.25" y="-31.25" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="2.5"/>
+        <terminal x="-13" y="-30" orientation="w"/>
+        <terminal x="-14" y="30" orientation="w"/>
+        <terminal x="13" y="-30" orientation="e"/>
+        <terminal x="13" y="30" orientation="e"/>
     </description>
 </definition>

Added: branches/0.3/elements/energie/solaire/ballon_echangeur/mur_chauffant_01.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/ballon_echangeur/mur_chauffant_01.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/ballon_echangeur/mur_chauffant_01.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,30 @@
+<definition width="120" version="0.3" hotspot_x="60" hotspot_y="50" height="100" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">Mur Chauffant</name>
+    </names>
+    <informations></informations>
+    <description>
+        <input x="-34" y="37" size="6" rotate="true" text="mur chauffant N°"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="40" x1="-40" y2="33" x2="-40"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-37" x1="-50" y2="40" x2="-50"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30" x1="50" y2="30" x2="-36"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="20" x1="50" y2="20" x2="-39"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="50" y2="10" x2="-40"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="50" y2="0" x2="-39"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="50" y2="-10" x2="-40"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="50" y2="-20" x2="-40"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="50" y2="-30" x2="-40"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-40" x1="50" y2="-40" x2="-47"/>
+        <arc width="6" x="-50" y="-40" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-90"/>
+        <arc width="10" x="45" y="-40" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
+        <arc width="6" x="-40" y="30" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-90"/>
+        <arc width="10" x="-45" y="10" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180"/>
+        <arc width="10" x="-45" y="-10" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180"/>
+        <arc width="10" x="45" y="20" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
+        <arc width="10" x="45" y="0" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
+        <arc width="10" x="45" y="-20" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
+        <arc width="10" x="-45" y="-30" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180"/>
+        <terminal x="-50" y="40" orientation="s"/>
+        <terminal x="-40" y="40" orientation="s"/>
+    </description>
+</definition>

Added: branches/0.3/elements/energie/solaire/ballon_echangeur/plancher_chauffant_01.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/ballon_echangeur/plancher_chauffant_01.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/ballon_echangeur/plancher_chauffant_01.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,48 @@
+<definition width="120" version="0.3" hotspot_x="60" hotspot_y="50" height="100" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">Plancher Chauffant</name>
+    </names>
+    <informations></informations>
+    <description>
+        <input x="-16" y="36" size="6" text="Plancher  N°"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="3" x1="6" y2="6" x2="6"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="9" y2="10" x2="16"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-7" y2="0" x2="2"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="17" x1="-10" y2="3" x2="-10"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-7" x1="20" y2="6" x2="20"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="20" x1="27" y2="20" x2="-6"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-17" x1="30" y2="17" x2="30"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-6" x1="-20" y2="27" x2="-20"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30" x1="36" y2="30" x2="-16"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="-16" y2="-10" x2="16"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="-27" y2="-20" x2="26"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="37" x1="-30" y2="-16" x2="-30"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="40" x1="47" y2="40" x2="-26"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-27" x1="40" y2="27" x2="40"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="37" x1="50" y2="-36" x2="50"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="36" y2="-30" x2="-37"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="40" x1="-40" y2="-26" x2="-40"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-40" x1="-47" y2="-40" x2="46"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="40" x1="-50" y2="-37" x2="-50"/>
+        <arc width="6" x="0" y="0" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-90"/>
+        <arc width="6" x="6" y="4" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-90"/>
+        <arc width="6" x="-10" y="0" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-90"/>
+        <arc width="6" x="-10" y="14" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-90"/>
+        <arc width="6" x="14" y="4" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
+        <arc width="6" x="24" y="14" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
+        <arc width="6" x="24" y="-20" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-90"/>
+        <arc width="6" x="14" y="-10" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-90"/>
+        <arc width="6" x="-20" y="-10" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-90"/>
+        <arc width="6" x="-30" y="-20" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-90"/>
+        <arc width="6" x="-20" y="24" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-90"/>
+        <arc width="6" x="-30" y="34" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-90"/>
+        <arc width="6" x="34" y="24" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
+        <arc width="6" x="44" y="34" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
+        <arc width="6" x="34" y="-30" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-90"/>
+        <arc width="6" x="44" y="-40" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-90"/>
+        <arc width="6" x="-50" y="-40" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-90"/>
+        <arc width="6" x="-40" y="-30" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-90"/>
+        <terminal x="-50" y="40" orientation="s"/>
+        <terminal x="-40" y="40" orientation="s"/>
+    </description>
+</definition>

Added: branches/0.3/elements/energie/solaire/ballon_echangeur/radiateur_01.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/ballon_echangeur/radiateur_01.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/ballon_echangeur/radiateur_01.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,63 @@
+<definition width="140" version="0.3" hotspot_x="40" hotspot_y="20" height="100" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">Radiateur Acier</name>
+    </names>
+    <informations></informations>
+    <description>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="2" x1="-19" y2="2" x2="-17"/>
+        <arc width="4" x="48" y="-7.5" antialias="true" height="84" style="line-style:normal;line-weight:normal;filling:none;color:black" start="50" angle="-103"/>
+        <arc width="4" x="85" y="-7.5" antialias="true" height="84" style="line-style:normal;line-weight:normal;filling:none;color:black" start="50" angle="-103"/>
+        <arc width="4" x="83" y="-6.5" antialias="true" height="84" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-130" angle="-101"/>
+        <arc width="4" x="74" y="-7.5" antialias="true" height="84" style="line-style:normal;line-weight:normal;filling:none;color:black" start="50" angle="-103"/>
+        <arc width="4" x="19" y="-6.5" antialias="true" height="84" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-130" angle="-101"/>
+        <arc width="4" x="-4" y="-7.5" antialias="true" height="84" style="line-style:normal;line-weight:normal;filling:none;color:black" start="50" angle="-103"/>
+        <arc width="4" x="-7" y="-6.5" antialias="true" height="84" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-130" angle="-101"/>
+        <arc width="4" x="-18" y="-6.5" antialias="true" height="84" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-130" angle="-101"/>
+        <polygon x4="-7" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="2" x1="-13" y2="3" x2="-10" y3="2" x3="-7" y4="2"/>
+        <polygon x4="83" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="2" x1="77" y2="3" x2="80" y3="2" x3="83" y4="2"/>
+        <polygon x4="71" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="2" x1="65" y2="3" x2="68" y3="2" x3="71" y4="2"/>
+        <polygon x4="58" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="2" x1="52" y2="3" x2="55" y3="2" x3="58" y4="2"/>
+        <polygon x4="45" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="2" x1="39" y2="3" x2="42" y3="2" x3="45" y4="2"/>
+        <polygon x4="32" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="2" x1="26" y2="3" x2="29" y3="2" x3="32" y4="2"/>
+        <polygon x4="19" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="2" x1="13" y2="3" x2="16" y3="2" x3="19" y4="2"/>
+        <polygon x4="6" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="2" x1="0" y2="3" x2="3" y3="2" x3="6" y4="2"/>
+        <polygon antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="68" x1="65" y2="67" x2="68" y3="68" x3="71"/>
+        <arc width="4" x="71" y="-6.5" antialias="true" height="84" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-130" angle="-101"/>
+        <polygon antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="68" x1="-13" y2="67" x2="-10" y3="68" x3="-7"/>
+        <polygon antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="68" x1="77" y2="67" x2="80" y3="68" x3="83"/>
+        <polygon antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="68" x1="52" y2="67" x2="55" y3="68" x3="58"/>
+        <polygon antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="68" x1="39" y2="67" x2="42" y3="68" x3="45"/>
+        <polygon antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="68" x1="26" y2="67" x2="29" y3="68" x3="32"/>
+        <polygon antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="68" x1="13" y2="67" x2="16" y3="68" x3="19"/>
+        <polygon antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="68" x1="0" y2="67" x2="3" y3="68" x3="6"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="0" x1="-14" y2="0" x2="86"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="70" x1="-18" y2="70" x2="83"/>
+        <rect width="2" x="89" y="69" antialias="false" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <circle x="-21" y="-1" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="2"/>
+        <circle x="-21.4142" y="-1.41421" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="2.82843"/>
+        <circle x="-22.8284" y="-2.82843" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="5.65685"/>
+        <circle x="-23.6056" y="-3.60555" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="7.2111"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dotted;line-weight:thin;filling:none;color:black" y1="12" x1="-16" y2="58" x2="-16"/>
+        <polygon x4="91" y5="68" x5="91" y6="68" x6="90" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="68" x1="-17" y2="68" x2="-19" y3="72" x3="-19" y4="72"/>
+        <polygon x4="90" y5="2" x5="90" y6="2" x6="89" y7="2" x7="89" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="2" x1="-19" y2="2" x2="-20" y3="-2" x3="-20" y4="-2"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dotted;line-weight:thin;filling:none;color:black" y1="12" x1="73" y2="58" x2="73"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dotted;line-weight:thin;filling:none;color:black" y1="12" x1="85" y2="58" x2="85"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dotted;line-weight:thin;filling:none;color:black" y1="13" x1="61" y2="59" x2="61"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dotted;line-weight:thin;filling:none;color:black" y1="12" x1="35.5" y2="58" x2="35.5"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dotted;line-weight:thin;filling:none;color:black" y1="14" x1="48" y2="60" x2="48"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dotted;line-weight:thin;filling:none;color:black" y1="12" x1="21.5" y2="58" x2="21.5"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dotted;line-weight:thin;filling:none;color:black" y1="13" x1="9" y2="59" x2="9"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dotted;line-weight:thin;filling:none;color:black" y1="12" x1="-4" y2="58" x2="-4"/>
+        <arc width="4" x="-16" y="-7.5" antialias="true" height="84" style="line-style:normal;line-weight:normal;filling:none;color:black" start="50" angle="-103"/>
+        <arc width="4" x="61" y="-7.5" antialias="true" height="84" style="line-style:normal;line-weight:normal;filling:none;color:black" start="50" angle="-103"/>
+        <arc width="4" x="35" y="-7.5" antialias="true" height="84" style="line-style:normal;line-weight:normal;filling:none;color:black" start="50" angle="-103"/>
+        <arc width="4" x="22" y="-7.5" antialias="true" height="84" style="line-style:normal;line-weight:normal;filling:none;color:black" start="50" angle="-103"/>
+        <arc width="4" x="9" y="-7.5" antialias="true" height="84" style="line-style:normal;line-weight:normal;filling:none;color:black" start="50" angle="-103"/>
+        <arc width="4" x="58" y="-6.5" antialias="true" height="84" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-130" angle="-101"/>
+        <arc width="4" x="45" y="-6.5" antialias="true" height="84" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-130" angle="-101"/>
+        <arc width="4" x="32" y="-6.5" antialias="true" height="84" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-130" angle="-101"/>
+        <arc width="4" x="6" y="-6.5" antialias="true" height="84" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-130" angle="-101"/>
+        <terminal x="-20" y="0" orientation="w"/>
+        <terminal x="90" y="70" orientation="e"/>
+    </description>
+</definition>

Modified: branches/0.3/elements/energie/solaire/ballon_echangeur/sksw-0.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/ballon_echangeur/sksw-0.elmt	2012-04-17 05:43:08 UTC (rev 1663)
+++ branches/0.3/elements/energie/solaire/ballon_echangeur/sksw-0.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -1,5 +1,5 @@
 <definition width="120" version="0.3" hotspot_x="60" hotspot_y="100" height="200" type="element" orientation="dyyy">
-    <names>
+    <names>        
         <name lang="en">tank cobinned sksw ecs</name>
         <name lang="fr">ballon combinée sksw ecs</name>
         <name lang="cs">Kombinovaný zásobník SKSW ECS</name>
@@ -9,7 +9,7 @@
     <description>
         <text x="-25" y="94" size="7" text="Ballon SKS"/>
         <polygon x4="40" y5="72" x5="40" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="72" x1="-40" y2="83" x2="-40" y3="83" x3="40" y4="72"/>
-        <polygon y29="-56" x23="-25" x24="24" x25="-25" style="line-style:normal;line-weight:normal;filling:none;color:black" x26="24" x27="-25" x1="20" x28="24" x2="20" x29="-25" x3="-26" y30="-57" x4="25" y31="-59" x5="-26" y32="-60" x6="25" y33="-62" x7="-26" x8="24" y34="-63" x9="-26" y35="-65" x30="24" y36="-66" x31="-25" y37="-68" x32="23" y38="-70" x33="-25" y39="-72" x34="24" x35="-25" x36="24" y1="-95" x37="-25" y2="50" x38="24" y3="50" x39="-25" y4="40" y40="-73" y5="30" y41="-75" y6="20" y42="-76" y7="10" y43="-78" y8="0" y44="-79" y9="-10" y45="-81" x40="23" y46="-82" x41="-25" y47="-84" x42="23" y48="-95" x43="-25" y49="-95" x44="23" antialias="true" x45="-25" x46="23" x47="-20" x48="-20" x49="-20" closed="false" y10="-20" y11="-24" y12="-28" y13="-30" y14="-32" y15="-34" y16="-36" x10="24" y17="-38" x11="-25" y18="-39" x12="24" y19="-41" x13="-25" x14="24" x15="-25" x16="24" x17="-25" x18="24" x19="-25" y20="-42" y21="-44" y22="-45" y23="-47" y24="-48" y25="-50" y26="-51" x20="24" y27="-53" x21="-25" y28="-54" x22="24"/>
+        <polygon y29="-56" x23="-25" x24="24" x25="-25" style="line-style:normal;line-weight:normal;filling:none;color:black" x26="24" x27="-25" x1="20" x28="24" x2="20" x29="-25" x3="-26" y30="-57" x4="25" y31="-59" x5="-26" y32="-60" x6="25" y33="-62" x7="-26" y34="-63" x8="24" y35="-65" x9="-26" y36="-66" x30="24" y37="-68" x31="-25" y38="-70" x32="23" y39="-72" x33="-25" x34="24" x35="-25" x36="24" x37="-25" y1="-95" x38="24" y2="50" x39="-25" y3="50" y40="-73" y4="40" y41="-75" y5="30" y42="-76" y6="20" y43="-78" y7="10" y44="-79" y8="0" y45="-81" y9="-10" y46="-82" x40="23" y47="-84" x41="-25" y48="-95" x42="23" y49="-95" x43="-25" x44="23" antialias="true" x45="-25" x46="23" x47="-20" x48="-20" x49="-20" closed="false" y10="-20" y11="-24" y12="-28" y13="-30" y14="-32" y15="-34" y16="-36" x10="24" y17="-38" x11="-25" y18="-39" x12="24" y19="-41" x13="-25" x14="24" x15="-25" x16="24" x17="-25" x18="24" x19="-25" y20="-42" y21="-44" y22="-45" y23="-47" y24="-48" y25="-50" y26="-51" x20="24" y27="-53" x21="-25" y28="-54" x22="24"/>
         <rect width="4" x="18" y="-96" antialias="false" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
         <rect width="4" x="-22" y="-96" antialias="false" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
         <rect width="10" x="-42" y="-15" antialias="false" height="79" style="line-style:dotted;line-weight:normal;filling:none;color:black"/>
@@ -19,21 +19,21 @@
         <arc width="90" x="-45" y="48" antialias="true" height="33" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
         <arc width="90" x="-45" y="-86" antialias="true" height="33" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
         <circle x="34.5" y="-12.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
-        <circle x="34.5" y="27.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <circle x="34.5" y="22.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
         <circle x="34.5" y="57.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
         <circle x="34.5" y="-62.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
         <circle x="-39.5" y="-12.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
-        <circle x="-39.5" y="27.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <circle x="-39.5" y="22.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
         <circle x="-39.5" y="57.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
         <terminal x="-37" y="-60" orientation="w"/>
         <terminal x="-37" y="-10" orientation="w"/>
-        <terminal x="-37" y="30" orientation="w"/>
+        <terminal x="-37" y="25" orientation="w"/>
         <terminal x="-37" y="60" orientation="w"/>
         <terminal x="-20" y="-94" orientation="n"/>
         <terminal x="20" y="-94" orientation="n"/>
         <terminal x="37" y="-60" orientation="e"/>
         <terminal x="37" y="-10" orientation="e"/>
-        <terminal x="37" y="30" orientation="e"/>
+        <terminal x="37" y="25" orientation="e"/>
         <terminal x="37" y="60" orientation="e"/>
     </description>
 </definition>

Added: branches/0.3/elements/energie/solaire/base_distrib/ballon_combiner_ecs.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/base_distrib/ballon_combiner_ecs.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/base_distrib/ballon_combiner_ecs.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,25 @@
+<definition width="100" version="0.3" hotspot_x="50" hotspot_y="40" height="80" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">1B ballon et combiner ECS</name>
+    </names>
+    <informations></informations>
+    <description>
+        <ellipse width="22" x="-11" y="-26" antialias="true" height="30" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <text x="-43" y="-18.7" size="9" text="1B"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="triangle" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5.7" x1="29" y2="-5.7" x2="6"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="triangle" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-21.7" x1="29" y2="-21.7" x2="6"/>
+        <polygon x4="24" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="26.3" x1="24" y2="23.3" x2="27" y3="29.3" x3="27" y4="26.3"/>
+        <polygon x4="-29" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="26" x1="-29" y2="23" x2="-26" y3="29" x3="-26" y4="26"/>
+        <circle x="22" y="22.3" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="8"/>
+        <circle x="-31" y="22" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="8"/>
+        <rect width="32" x="-16" y="-27.7" antialias="false" height="59" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="23" x2="43" x3="33" x4="43" antialias="true" x5="33" x6="43" x7="23" x8="23" closed="false" y1="6.3" y2="6.3" y3="11.3" y4="16.3" y5="21.3" y6="26.3" y7="26.3" y8="26.3"/>
+        <text x="-36" y="17" size="4" text="solaire"/>
+        <text x="18" y="18.3" size="4" text="chauff."/>
+        <text x="25" y="-11.7" size="4" text="ECS"/>
+        <text x="-13" y="-31" size="4" text="ballon"/>
+        <polygon x4="-43" y5="21" x5="-33" y6="26" x6="-43" y7="26" x7="-23" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="6" x1="-23" y2="6" x2="-43" y3="11" x3="-33" y4="16"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-23" x2="-3" x3="-13" x4="-3" antialias="true" x5="-13" x6="-3" x7="-23" x8="-23" closed="false" y1="6" y2="6" y3="11" y4="16" y5="21" y6="26" y7="26" y8="26"/>
+        <polygon x4="3" y5="21.3" x5="13" y6="26.3" x6="3" y7="26.3" x7="23" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="6.3" x1="23" y2="6.3" x2="3" y3="11.3" x3="13" y4="16.3"/>
+    </description>
+</definition>

Added: branches/0.3/elements/energie/solaire/base_distrib/ballon_double_enveloppe.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/base_distrib/ballon_double_enveloppe.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/base_distrib/ballon_double_enveloppe.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,22 @@
+<definition width="100" version="0.3" hotspot_x="50" hotspot_y="40" height="80" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">C ballon double enveloppe</name>
+    </names>
+    <informations></informations>
+    <description>
+        <text x="-39" y="-18" size="9" text="C"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="5" x2="42" x3="42" x4="38" antialias="false" x5="45" x6="39" x7="44" x8="38" x9="42" closed="false" y1="-22" y10="24" y2="-22" y11="24" y3="-10" y4="-6" y5="-2" x10="42" y6="3" x11="2" y7="6" y8="10" y9="13"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="7" x2="30" x3="30" x4="24" antialias="false" x5="34" x6="25" x7="30" x8="30" x9="7" closed="false" y1="-15" y10="20" y2="-15" y3="-5" y4="0" y5="5" x10="7" y6="10" y7="15" y8="20" y9="20"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-14" x2="-19" x3="-19" x4="19" antialias="false" x5="19" x6="19" x7="14" x8="14" closed="false" y1="-10" y2="-10" y3="31" y4="31" y5="-10" y6="-10" y7="-10" y8="-10"/>
+        <ellipse width="28" x="-14" y="-29.5" antialias="true" height="58" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <polygon x4="33" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="24" x1="33" y2="21" x2="36" y3="27" x3="36" y4="24"/>
+        <polygon x4="-26" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="20" x1="-26" y2="17" x2="-23" y3="23" x3="-23" y4="20"/>
+        <circle x="31" y="20" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="8"/>
+        <circle x="-28" y="16" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="8"/>
+        <text x="-49" y="6" size="4" text="solaire"/>
+        <text x="31" y="17" size="4" text="chauff."/>
+        <text x="25" y="-6" size="4" text="ECS"/>
+        <text x="-7" y="-7" size="4" text="ballon"/>
+        <polygon x4="-37" y5="15" x5="-27" y6="20" x6="-37" y7="20" x7="-17" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="0" x1="-17" y2="0" x2="-37" y3="5" x3="-27" y4="10"/>
+    </description>
+</definition>

Added: branches/0.3/elements/energie/solaire/base_distrib/bouteille_echang_plaque.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/base_distrib/bouteille_echang_plaque.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/base_distrib/bouteille_echang_plaque.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,33 @@
+<definition width="120" version="0.3" hotspot_x="55" hotspot_y="40" height="80" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">1F echangeur à plaques</name>
+    </names>
+    <informations></informations>
+    <description>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-39" x2="-45" x3="-45" x4="-50" antialias="false" x5="-40" x6="-50" x7="-44" x8="-44" x9="-30" closed="false" y1="14" y10="-11" y2="14" y3="10" y4="5" y5="0" x10="-30" y6="-5" y7="-8" y8="-11" y9="-11"/>
+        <rect width="12" x="-23" y="-9" antialias="false" height="21" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
+        <polygon x4="-14" y5="-8" x5="-20" y6="-11" x6="-20" y7="-11" x7="-30" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="14" x1="-30" y2="14" x2="-20" y3="10" x3="-20" y4="2"/>
+        <polygon x4="-20" y5="-8" x5="-14" y6="-11" x6="-14" y7="-11" x7="0" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="15" x1="0" y2="15" x2="-14" y3="10" x3="-14" y4="1"/>
+        <text x="-31" y="23" size="4" text="échang.&#xa;plaques"/>
+        <polygon x4="-9" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="15" x1="-9" y2="12" x2="-6" y3="18" x3="-6" y4="15"/>
+        <circle x="-11" y="11" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="8"/>
+        <text x="-42" y="-21" size="9" text="1F"/>
+        <text x="37" y="-22.8" size="4" text="stock"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="triangle" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="31.2" x1="54" y2="31.2" x2="47"/>
+        <polygon x4="46" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="18.2" x1="15" y2="31.2" x2="15" y3="31.2" x3="46" y4="31.2"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="triangle" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-28.8" x1="47" y2="-28.8" x2="55"/>
+        <polygon antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-16.8" x1="16" y2="-28.8" x2="16" y3="-28.8" x3="47"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="28" x2="57" x3="57" x4="61" antialias="false" x5="54" x6="60" x7="54" x8="59" x9="54" closed="false" y1="-15.8" y10="10.2" y2="-15.8" y11="19.2" y3="-8.8" y4="-5.8" y12="19.2" y5="-3.8" x10="57" y13="19.2" y6="-0.8" x11="57" y7="1.2" x12="28" y8="4.2" x13="29" y9="7.2"/>
+        <rect width="32" x="-2" y="-18.8" antialias="false" height="12" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <polygon x4="40" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="19.2" x1="40" y2="16.2" x2="43" y3="22.2" x3="43" y4="19.2"/>
+        <polygon x4="-37" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="14" x1="-37" y2="11" x2="-34" y3="17" x3="-34" y4="14"/>
+        <circle x="38" y="15.2" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="8"/>
+        <circle x="-39" y="10" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="8"/>
+        <rect width="32" x="-2" y="9.2" antialias="false" height="12" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <text x="-43" y="-3" size="4" text="solaire"/>
+        <text x="53" y="10.2" size="4" rotation="-90" text="chauff."/>
+        <text x="27" y="3.2" size="4" text="ECS"/>
+        <text x="-6" y="-22.8" size="4" text="bouteille"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="28" x2="48" x3="38" x4="48" antialias="true" x5="38" x6="48" x7="28" x8="28" closed="false" y1="-8.8" y2="-8.8" y3="-3.8" y4="1.2" y5="6.2" y6="11.2" y7="11.2" y8="11.2"/>
+    </description>
+</definition>

Added: branches/0.3/elements/energie/solaire/eau_sanitaire/cumuls_elec_01.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/eau_sanitaire/cumuls_elec_01.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/eau_sanitaire/cumuls_elec_01.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,26 @@
+<definition width="60" version="0.3" hotspot_x="30" hotspot_y="50" height="100" type="element" orientation="ndny">
+    <names>
+        <name lang="fr">Ballon electrique ECS "droite"</name>
+        <name lang="en">Tank electrical ECS</name>
+        <name lang="cs">Elektrická jímka ECS</name>
+        <name lang="pl">Zbiornik elektryczny CWU</name>
+    </names>
+    <informations></informations>
+    <description>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-40" x1="25" y2="37" x2="25"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-40" x1="-25" y2="37" x2="-25"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-36" x1="20" y2="40" x2="20"/>
+        <text x="15" y="14" size="6" rotation="-90" text="Ballon ECS"/>
+        <arc width="50" x="-25" y="31" antialias="true" height="12" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
+        <circle x="-21.25" y="38.75" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="2.5"/>
+        <circle x="-21.25" y="-1.25" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="2.5"/>
+        <circle x="18.75" y="38.75" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="2.5"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="3" x2="-3" x3="3" x4="-3" antialias="true" x5="3" x6="-3" x7="3" x8="-3" x9="3" closed="false" y1="18" y10="32" y2="20" y11="33" y3="21" y4="23" y12="35" y5="24" x10="-3" y13="36" y6="26" x11="3" y14="38" y7="27" x12="-3" y15="39" y8="29" x13="3" y16="40" y9="30" x14="-3" y17="40" x15="3" x16="0" x17="0"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="31" x1="-20" y2="40" x2="-20"/>
+        <arc width="50" x="-25" y="-46" antialias="true" height="12" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
+        <rect width="12" x="-6" y="40" antialias="false" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <terminal x="-20" y="0" orientation="w"/>
+        <terminal x="-20" y="40" orientation="s"/>
+        <terminal x="20" y="40" orientation="s"/>
+    </description>
+</definition>

Added: branches/0.3/elements/energie/solaire/eau_sanitaire/cumulus_elec_2.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/eau_sanitaire/cumulus_elec_2.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/eau_sanitaire/cumulus_elec_2.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,26 @@
+<definition width="60" version="0.3" hotspot_x="30" hotspot_y="50" height="100" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">Ballon electrique ECS "gauche"</name>
+        <name lang="en">Tank electrical ECS</name>
+        <name lang="cs">Elektrická jímka ECS</name>
+        <name lang="pl">Zbiornik elektryczny CWU</name>
+    </names>
+    <informations></informations>
+    <description>
+        <text x="-7" y="14" size="6" rotation="-90" text="Ballon ECS"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-40" x1="25" y2="36" x2="25"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-40" x1="-25" y2="37" x2="-25"/>
+        <arc width="50" x="-25" y="31" antialias="true" height="12" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
+        <circle x="-21.25" y="38.75" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="2.5"/>
+        <circle x="18.75" y="-1.25" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="2.5"/>
+        <circle x="18.75" y="38.75" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="2.5"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="3" x2="-3" x3="3" x4="-3" antialias="true" x5="3" x6="-3" x7="3" x8="-3" x9="3" closed="false" y1="17" y10="31" y2="19" y11="32" y3="20" y4="22" y12="34" y5="23" x10="-3" y13="35" y6="25" x11="3" y14="37" y7="26" x12="-3" y15="38" y8="28" x13="3" y16="39" y9="29" x14="-3" y17="39" x15="3" x16="0" x17="0"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="31" x1="20" y2="40" x2="20"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-40" x1="-20" y2="40" x2="-20"/>
+        <arc width="50" x="-25" y="-47" antialias="true" height="12" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
+        <rect width="12" x="-6" y="40" antialias="false" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <terminal x="20" y="0" orientation="e"/>
+        <terminal x="-20" y="40" orientation="s"/>
+        <terminal x="20" y="40" orientation="s"/>
+    </description>
+</definition>

Added: branches/0.3/elements/energie/solaire/eau_sanitaire/disconnecteur_01d.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/eau_sanitaire/disconnecteur_01d.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/eau_sanitaire/disconnecteur_01d.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,25 @@
+<definition width="60" version="0.3" hotspot_x="30" hotspot_y="20" height="40" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">Disconnecteur "droite"</name>
+        <name lang="en">Backflow</name>
+        <name lang="cs">Zpětný tok</name>
+        <name lang="pl">Zawór odcinający powrót CWU</name>
+    </names>
+    <informations></informations>
+    <description>
+        <line length1="1.5" length2="1.5" antialias="false" end1="simple" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-8" x1="-3" y2="-8" x2="4"/>
+        <rect width="40" x="-20" y="-10" antialias="false" height="20" style="line-style:dotted;line-weight:thin;filling:none;color:black"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-20" y2="0" x2="-17"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="0" y2="1" x2="0"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-7" x1="-6" y2="7" x2="-6"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="20" y2="0" x2="16"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-7" x1="17" y2="7" x2="17"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-5" y2="0" x2="5"/>
+        <polygon x4="-17" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-7" x1="-17" y2="7" x2="-17" y3="0" x3="-6" y4="-7"/>
+        <text x="-18" y="-12" size="4" text="disconnecteur"/>
+        <polygon x4="6" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-7" x1="6" y2="7" x2="6" y3="0" x3="17" y4="-7"/>
+        <terminal x="20" y="0" orientation="e"/>
+        <terminal x="-20" y="0" orientation="w"/>
+        <terminal x="0" y="10" orientation="s"/>
+    </description>
+</definition>

Added: branches/0.3/elements/energie/solaire/eau_sanitaire/disconnecteur_01g.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/eau_sanitaire/disconnecteur_01g.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/eau_sanitaire/disconnecteur_01g.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,25 @@
+<definition width="60" version="0.3" hotspot_x="30" hotspot_y="20" height="40" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">Disconnecteur "gauche"</name>
+        <name lang="en">Backflow</name>
+        <name lang="cs">Zpětný tok</name>
+        <name lang="pl">Zawór odcinający powrót CWU</name>
+    </names>
+    <informations></informations>
+    <description>
+        <rect width="40" x="-20" y="-10" antialias="false" height="20" style="line-style:dotted;line-weight:thin;filling:none;color:black"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="simple" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-8" x1="-4" y2="-8" x2="3"/>
+        <polygon x4="6" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="6" y2="-7" x2="17" y3="7" x3="17" y4="0"/>
+        <polygon x4="-17" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-17" y2="-7" x2="-6" y3="7" x3="-6" y4="0"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-20" y2="0" x2="-17"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="0" y2="1" x2="0"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-7" x1="-17" y2="7" x2="-17"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="20" y2="0" x2="16"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-7" x1="6" y2="7" x2="6"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-5" y2="0" x2="5"/>
+        <text x="-18" y="-12" size="4" text="disconnecteur"/>
+        <terminal x="20" y="0" orientation="e"/>
+        <terminal x="-20" y="0" orientation="w"/>
+        <terminal x="0" y="10" orientation="s"/>
+    </description>
+</definition>

Modified: branches/0.3/elements/energie/solaire/eau_sanitaire/eau_ville.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/eau_sanitaire/eau_ville.elmt	2012-04-17 05:43:08 UTC (rev 1663)
+++ branches/0.3/elements/energie/solaire/eau_sanitaire/eau_ville.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -7,10 +7,10 @@
     </names>
     <informations></informations>
     <description>
-        <polygon x4="1" y5="0" x5="1" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="0" x1="1" y2="-7" x2="10" y3="7" x3="10" y4="0"/>
-        <text x="-7" y="7" size="5" text="E.F."/>
-        <circle x="-6.5" y="-0.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="1"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="1" y2="0" x2="-6"/>
-        <terminal x="-6" y="0" orientation="w"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-6" y2="0" x2="-10"/>
+        <polygon x4="4" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5" x1="4" y2="5" x2="4" y3="0" x3="-6" y4="-5"/>
+        <text x="11" y="5" size="5" rotation="-90" text="E.F."/>
+        <circle x="-10.5" y="-0.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="1"/>
+        <terminal x="-10" y="0" orientation="w"/>
     </description>
 </definition>

Added: branches/0.3/elements/energie/solaire/eau_sanitaire/electro-vanne3v.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/eau_sanitaire/electro-vanne3v.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/eau_sanitaire/electro-vanne3v.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,16 @@
+<definition width="20" version="0.3" hotspot_x="10" hotspot_y="20" height="30" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">Electro-vanne 3V "sanitaire"</name>
+    </names>
+    <informations>24v et anti-bélier </informations>
+    <description>
+        <polygon x4="1" y5="-7" x5="1" y6="-7" x6="3" antialias="false" style="line-style:normal;line-weight:thin;filling:none;color:black" closed="false" y1="-7" x1="-3" y2="-7" x2="-1" y3="-9" x3="-1" y4="-9"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5" x1="0" y2="0" x2="0"/>
+        <rect width="8" x="-4" y="-11" antialias="false" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <polygon x4="0" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="0" y2="8" x2="-4" y3="8" x3="4" y4="0"/>
+        <polygon x4="0" y5="-4" x5="8" y6="4" x6="8" y7="0" x7="0" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="0" y2="-4" x2="-8" y3="4" x3="-8" y4="0"/>
+        <terminal x="-8" y="0" orientation="w"/>
+        <terminal x="8" y="0" orientation="e"/>
+        <terminal x="0" y="8" orientation="s"/>
+    </description>
+</definition>

Added: branches/0.3/elements/energie/solaire/eau_sanitaire/electro_vanne2v_01.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/eau_sanitaire/electro_vanne2v_01.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/eau_sanitaire/electro_vanne2v_01.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,14 @@
+<definition width="20" version="0.3" hotspot_x="10" hotspot_y="20" height="30" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">Electro-vanne 2V "sanitaire"</name>
+    </names>
+    <informations></informations>
+    <description>
+        <polygon x4="1" y5="-7" x5="1" y6="-7" x6="3" antialias="false" style="line-style:normal;line-weight:thin;filling:none;color:black" closed="false" y1="-7" x1="-3" y2="-7" x2="-1" y3="-9" x3="-1" y4="-9"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5" x1="0" y2="0" x2="0"/>
+        <rect width="8" x="-4" y="-11" antialias="false" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <polygon x4="0" y5="-4" x5="8" y6="4" x6="8" y7="0" x7="0" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="0" y2="-4" x2="-8" y3="4" x3="-8" y4="0"/>
+        <terminal x="-8" y="0" orientation="w"/>
+        <terminal x="8" y="0" orientation="e"/>
+    </description>
+</definition>

Added: branches/0.3/elements/energie/solaire/eau_sanitaire/mitigeur_melangeur_01.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/eau_sanitaire/mitigeur_melangeur_01.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/eau_sanitaire/mitigeur_melangeur_01.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,28 @@
+<definition width="40" version="0.3" hotspot_x="20" hotspot_y="30" height="50" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">Mitigeur01 ECS</name>
+    </names>
+    <informations></informations>
+    <description>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-8" x2="-8" x3="-10" x4="-10" antialias="true" x5="10" x6="10" x7="8" x8="8" closed="false" y1="-5" y2="-11" y3="-11" y4="-19" y5="-19" y6="-11" y7="-11" y8="-5"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-17" x1="0" y2="-13" x2="0"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-17" x1="-2" y2="-13" x2="-2"/>
+        <text x="-10" y="-21" size="4" text="Mitigeur"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-17" x1="2" y2="-13" x2="2"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-17" x1="4" y2="-13" x2="4"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-17" x1="8" y2="-13" x2="8"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-17" x1="6" y2="-13" x2="6"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-17" x1="-8" y2="-13" x2="-8"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-17" x1="-6" y2="-13" x2="-6"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-17" x1="-4" y2="-13" x2="-4"/>
+        <input x="-9" y="-7.5" size="5" rotate="true" text="°C"/>
+        <polygon y21="13" x15="13" y22="13" x16="10" x17="10" x18="4" x19="4" x20="5" x21="5" x22="0" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" x2="-5" x3="-5" x4="-4" x5="-4" x6="-10" x7="-10" x8="-13" x9="-13" y1="13" y2="13" y3="10" y4="10" y5="4" y6="4" y7="5" y8="5" y10="-5" y9="-5" y11="-4" y12="-4" y13="-5" y14="-5" y15="5" y16="5" y17="4" y18="4" y19="10" x10="-10" x11="-10" x12="10" antialias="true" x13="10" x14="13" y20="10"/>
+        <polygon x4="0" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="7" x1="0" y2="5" x2="-2" y3="5" x3="2" y4="7"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="7" y2="0" x2="4"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-8" y2="0" x2="-4"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-2" x1="-6" y2="2" x2="-6"/>
+        <terminal x="-13" y="0" orientation="w"/>
+        <terminal x="13" y="0" orientation="e"/>
+        <terminal x="0" y="13" orientation="s"/>
+    </description>
+</definition>

Added: branches/0.3/elements/energie/solaire/eau_sanitaire/mitigeur_melangeur_02.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/eau_sanitaire/mitigeur_melangeur_02.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/eau_sanitaire/mitigeur_melangeur_02.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,26 @@
+<definition width="40" version="0.3" hotspot_x="20" hotspot_y="15" height="30" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">Mitigeur02 ECS</name>
+    </names>
+    <informations></informations>
+    <description>
+        <rect width="20" x="-14" y="-5" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <input x="-14" y="-1.5" size="2" rotate="true" text="Mitigeur"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-1" y2="0" x2="1"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-1" x1="-10" y2="1" x2="-10"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-11" y2="0" x2="-9"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="3" x1="7" y2="3" x2="10"/>
+        <rect width="4" x="-2" y="5" antialias="false" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect width="2" x="-16" y="-2" antialias="false" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="16" y2="5" x2="7"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5" x1="16" y2="-5" x2="7"/>
+        <arc width="3" x="14.5" y="-5" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-3" x1="7" y2="-3" x2="10"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-1" x1="7" y2="-1" x2="10"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="1" x1="7" y2="1" x2="10"/>
+        <rect width="4" x="-12" y="5" antialias="false" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <terminal x="0" y="7" orientation="s"/>
+        <terminal x="-10" y="7" orientation="s"/>
+        <terminal x="-16" y="0" orientation="w"/>
+    </description>
+</definition>

Added: branches/0.3/elements/energie/solaire/eau_sanitaire/mitigeur_melangeur_03.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/eau_sanitaire/mitigeur_melangeur_03.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/eau_sanitaire/mitigeur_melangeur_03.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,34 @@
+<definition width="40" version="0.3" hotspot_x="20" hotspot_y="40" height="60" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">Mitigeur 03 ECS</name>
+    </names>
+    <informations></informations>
+    <description>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="10" x1="-3" y2="10" x2="3"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-3" x1="10" y2="3" x2="10"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-3" x1="-10" y2="3" x2="-10"/>
+        <polygon y21="12" x15="12" y22="12" x16="10" y23="12" x17="10" x18="3" x19="3" x20="4" x21="4" x22="0" x23="0" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" x2="-4" x3="-4" x4="-3" x5="-3" x6="-10" x7="-10" x8="-12" x9="-12" y1="12" y2="12" y3="10" y4="10" y5="3" y6="3" y7="4" y8="4" y10="-4" y9="-4" y11="-3" y12="-3" y13="-4" y14="-4" y15="4" y16="4" y17="3" y18="3" y19="10" x10="-10" x11="-10" x12="10" antialias="true" x13="10" x14="12" y20="10"/>
+        <polygon x4="7" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="7" y2="-2" x2="5" y3="2" x3="5" y4="0"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="6" x1="-1" y2="6" x2="1"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-6" y2="0" x2="-4"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-1" x1="-5" y2="1" x2="-5"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-18" x1="7" y2="-12" x2="7"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-18" x1="-7" y2="-12" x2="-7"/>
+        <arc width="14" x="-7" y="-19.5" antialias="true" height="3" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
+        <rect width="14" x="-7" y="-11" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-16" x1="5" y2="-12" x2="5"/>
+        <text x="-11" y="-24" size="4" text="Mitigeur"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-16" x1="3" y2="-12" x2="3"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-16" x1="1" y2="-12" x2="1"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-16" x1="-3" y2="-12" x2="-3"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-16" x1="-5" y2="-12" x2="-5"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-16" x1="-1" y2="-12" x2="-1"/>
+        <input x="-8" y="-4.5" size="5" rotate="true" text="°C"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="8" x1="1" y2="8" x2="-1"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="0" x1="-9" y2="0" x2="-7"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-1" x1="-8" y2="1" x2="-8"/>
+        <terminal x="-12" y="0" orientation="w"/>
+        <terminal x="12" y="0" orientation="e"/>
+        <terminal x="0" y="12" orientation="s"/>
+    </description>
+</definition>

Added: branches/0.3/elements/energie/solaire/eau_sanitaire/rechauff_ecs_doublenveloppe.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/eau_sanitaire/rechauff_ecs_doublenveloppe.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/eau_sanitaire/rechauff_ecs_doublenveloppe.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,30 @@
+<definition width="60" version="0.3" hotspot_x="30" hotspot_y="35" height="70" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">Réchauffeur ECS double enveloppe</name>
+    </names>
+    <informations></informations>
+    <description>
+        <text x="12" y="-22" size="4" text="EF"/>
+        <text x="-10" y="-24" size="4" text="ECS"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="triangle" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="20" x1="-17" y2="20" x2="-25"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="triangle" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="-24" y2="-20" x2="-16"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-31" x1="10" y2="18" x2="10"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-31" x1="-10" y2="-18" x2="-10"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-18" x1="-15" y2="19" x2="-15"/>
+        <text x="25" y="20" size="4" rotation="-90" text="réchauffeur ecs"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-18" x1="15" y2="19" x2="15"/>
+        <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="-24" x1="-20" y2="27" x2="-20"/>
+        <arc width="30" x="-15" y="-21.5" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
+        <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="-25" x1="20" y2="26" x2="20"/>
+        <arc width="30" x="-15" y="16.5" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
+        <circle x="-21" y="-21" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="2"/>
+        <arc width="40" x="-20" y="-29.5" antialias="true" height="8" style="line-style:dotted;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
+        <circle x="19" y="23" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="2"/>
+        <circle x="-21" y="19" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="2"/>
+        <arc width="40" x="-20" y="22.5" antialias="true" height="8" style="line-style:dotted;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
+        <terminal x="-24" y="-20" orientation="w"/>
+        <terminal x="-24" y="20" orientation="w"/>
+        <terminal x="10" y="-30" orientation="n"/>
+        <terminal x="-10" y="-30" orientation="n"/>
+    </description>
+</definition>

Added: branches/0.3/elements/energie/solaire/eau_sanitaire/rechauff_ecs_plaques.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/eau_sanitaire/rechauff_ecs_plaques.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/eau_sanitaire/rechauff_ecs_plaques.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,24 @@
+<definition width="60" version="0.3" hotspot_x="30" hotspot_y="35" height="70" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">Réchauffeur ECS à Plaques</name>
+    </names>
+    <informations></informations>
+    <description>
+        <text x="25" y="-18" size="4" rotation="-90" text="ECS"/>
+        <text x="25" y="28" size="4" rotation="-90" text="EF"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="triangle" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30" x1="-26.55" y2="30" x2="-19.55"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="triangle" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="-27.55" y2="-30" x2="-20.55"/>
+        <circle x="19" y="-31" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="2"/>
+        <circle x="-21" y="-31" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="2"/>
+        <circle x="-21" y="29" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="2"/>
+        <circle x="19" y="29" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="2"/>
+        <rect width="40" x="-20" y="-33" antialias="true" height="65" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="20" x2="10" x3="-5" x4="10" antialias="true" x5="-5" x6="10" x7="-5" x8="10" x9="20" closed="false" y1="-30" y10="30" y2="-30" y3="-20" y4="-10" y5="0" x10="20" y6="10" y7="20" y8="30" y9="30"/>
+        <polygon style="line-style:dashed;line-weight:normal;filling:none;color:black" x1="-20" x2="5" x3="-10" x4="5" antialias="true" x5="-10" x6="5" x7="-10" x8="5" x9="-20" closed="false" y1="-30" y10="30" y2="-30" y3="-20" y4="-10" y5="0" x10="-20" y6="10" y7="20" y8="30" y9="30"/>
+        <text x="18" y="9" size="4" rotation="-90" text="Plaques"/>
+        <terminal x="-20" y="-30" orientation="w"/>
+        <terminal x="-20" y="30" orientation="w"/>
+        <terminal x="20" y="-30" orientation="e"/>
+        <terminal x="20" y="30" orientation="e"/>
+    </description>
+</definition>

Added: branches/0.3/elements/energie/solaire/eau_sanitaire/rechauff_ecs_tubulaire.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/eau_sanitaire/rechauff_ecs_tubulaire.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/eau_sanitaire/rechauff_ecs_tubulaire.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,22 @@
+<definition width="60" version="0.3" hotspot_x="30" hotspot_y="35" height="70" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">réchauffeur ECS tubulaire</name>
+    </names>
+    <informations></informations>
+    <description>
+        <text x="13" y="-27" size="4" text="EF"/>
+        <text x="-26" y="-27" size="4" text="ECS"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="triangle" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="15" x1="-17" y2="15" x2="-23"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="triangle" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-16" x1="-23" y2="-16" x2="-16"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-10" x2="-10" x3="14" x4="-15" antialias="false" x5="14" x6="-15" x7="14" x8="-15" x9="14" closed="false" y1="-32" y10="20" y2="-20" y11="20" y3="-15" y4="-10" y12="-32" y5="-5" x10="-15" y6="0" x11="10" y7="5" x12="10" y8="10" y9="15"/>
+        <text x="25" y="21" size="4" rotation="-90" text="réchauffeur ecs"/>
+        <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="-25" x1="-20" y2="26" x2="-20"/>
+        <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="-25" x1="20" y2="26" x2="20"/>
+        <arc width="40" x="-20" y="-29.5" antialias="true" height="8" style="line-style:dotted;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
+        <arc width="40" x="-20" y="22.5" antialias="true" height="8" style="line-style:dotted;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
+        <terminal x="-23" y="-16" orientation="w"/>
+        <terminal x="-22" y="15" orientation="w"/>
+        <terminal x="-10" y="-32" orientation="n"/>
+        <terminal x="10" y="-32" orientation="n"/>
+    </description>
+</definition>

Modified: branches/0.3/elements/energie/solaire/eau_sanitaire/rechauffeur_ecs.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/eau_sanitaire/rechauffeur_ecs.elmt	2012-04-17 05:43:08 UTC (rev 1663)
+++ branches/0.3/elements/energie/solaire/eau_sanitaire/rechauffeur_ecs.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -1,25 +1,26 @@
 <definition width="60" version="0.3" hotspot_x="30" hotspot_y="35" height="70" type="element" orientation="ndny">
     <names>
-        <name lang="en">ECS heater</name>
         <name lang="fr">Réchauffeur ECS</name>
-        <name lang="cs">Ohřívač ECS</name>
-        <name lang="pl">Ogrzewacz CWU</name>
     </names>
     <informations></informations>
     <description>
-        <input x="19" y="21" size="4" rotation="270" rotate="true" text="réchauffeur ecs"/>
+        <text x="2" y="-25" size="4" text="ECS"/>
+        <text x="26" y="28" size="4" rotation="-90" text="EF"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="triangle" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="20" x1="-26.55" y2="20" x2="-19.55"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="triangle" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="-27.55" y2="-20" x2="-20.55"/>
+        <text x="17" y="19" size="4" rotation="-90" text="réchauffeur ecs"/>
         <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-26" x1="-20" y2="25" x2="-20"/>
         <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-26" x1="20" y2="25" x2="20"/>
         <circle x="-21" y="-21" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="2"/>
-        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-20" x2="10" x3="-10" x4="10" antialias="true" x5="-10" x6="10" x7="-10" x8="10" x9="-10" closed="false" y1="-20" y2="-20" y10="20" y3="-15" y11="20" y4="-10" y12="20" y5="-6" x10="10" y13="20" y6="0" x11="10" y7="5" x12="-20" y8="10" x13="-20" y9="15"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-20" x2="10" x3="-10" x4="10" antialias="true" x5="-10" x6="10" x7="-10" x8="10" x9="-10" closed="false" y1="-20" y10="20" y2="-20" y11="20" y3="-15" y4="-10" y12="20" y5="-6" x10="10" y13="20" y6="0" x11="10" y7="5" x12="-20" y8="10" x13="-20" y9="15"/>
         <arc width="40" x="-20" y="-30.5" antialias="true" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
-        <circle x="19" y="22" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="2"/>
+        <circle x="19" y="19" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="2"/>
         <circle x="-1" y="-31.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="2"/>
         <circle x="-21" y="19" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="2"/>
         <arc width="40" x="-20" y="21.5" antialias="true" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
         <terminal x="-20" y="-20" orientation="w"/>
         <terminal x="-20" y="20" orientation="w"/>
         <terminal x="0" y="-30" orientation="n"/>
-        <terminal x="20" y="23" orientation="e"/>
+        <terminal x="20" y="20" orientation="e"/>
     </description>
 </definition>

Added: branches/0.3/elements/energie/solaire/eau_sanitaire/robinet_melangeur_01.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/eau_sanitaire/robinet_melangeur_01.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/eau_sanitaire/robinet_melangeur_01.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,20 @@
+<definition width="30" version="0.3" hotspot_x="15" hotspot_y="20" height="30" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">robinet Melangeur</name>
+    </names>
+    <informations></informations>
+    <description>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-9" x1="2" y2="-7" x2="3"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="2" x1="-2" y2="7" x2="-2"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-3" x1="-5" y2="-4" x2="-4"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-3" x1="4" y2="-4" x2="3"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-3" x1="-4" y2="2" x2="1"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-3" x1="3" y2="2" x2="-2"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="2" x1="1" y2="7" x2="1"/>
+        <arc width="3" x="-1.5" y="-12" antialias="true" height="12" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-100" angle="-200"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-10" x1="2" y2="-8" x2="5"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-10" x1="1" y2="-6" x2="1"/>
+        <terminal x="-2" y="7" orientation="s"/>
+        <terminal x="1" y="7" orientation="s"/>
+    </description>
+</definition>

Added: branches/0.3/elements/energie/solaire/eau_sanitaire/robinet_puisage_01.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/eau_sanitaire/robinet_puisage_01.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/eau_sanitaire/robinet_puisage_01.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,19 @@
+<definition width="30" version="0.3" hotspot_x="15" hotspot_y="15" height="30" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">Robinet de Puisage</name>
+    </names>
+    <informations></informations>
+    <description>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-1" x1="-10" y2="-1" x2="1"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-10" y2="0" x2="0"/>
+        <arc width="12" x="-6" y="0" antialias="true" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-90"/>
+        <arc width="12" x="-5" y="-0.8" antialias="true" height="5.6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-90"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="3" x1="5" y2="7" x2="4"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-3" x1="-1" y2="-3" x2="3"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-1" x1="1" y2="-3" x2="1"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="3" x1="8" y2="7" x2="9"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="3" x1="7" y2="7" x2="7"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="3" x1="6" y2="7" x2="6"/>
+        <terminal x="-10" y="0" orientation="w"/>
+    </description>
+</definition>

Added: branches/0.3/elements/energie/solaire/eau_sanitaire/robinet_tournant_boulle_01.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/eau_sanitaire/robinet_tournant_boulle_01.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/eau_sanitaire/robinet_tournant_boulle_01.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,18 @@
+<definition width="40" version="0.3" hotspot_x="20" hotspot_y="20" height="40" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">Robinet tournant à boulle</name>
+    </names>
+    <informations></informations>
+    <description>
+        <input x="-7" y="-3" size="7" rotate="true" text="R"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="4" x1="0" y2="4" x2="6"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="6" x1="0" y2="4" x2="0"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="10" y2="10" x2="12"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="-10" y2="10" x2="-12"/>
+        <polygon x4="4" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="8" x1="4" y2="5" x2="10" y3="15" x3="10" y4="12"/>
+        <polygon x4="-4" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="12" x1="-4" y2="15" x2="-10" y3="5" x3="-10" y4="8"/>
+        <circle x="-3.60555" y="6.39445" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7.2111"/>
+        <terminal x="-10" y="10" orientation="w"/>
+        <terminal x="10" y="10" orientation="e"/>
+    </description>
+</definition>

Added: branches/0.3/elements/energie/solaire/expansion_soupape/bouteille_guy_delsol.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/expansion_soupape/bouteille_guy_delsol.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/expansion_soupape/bouteille_guy_delsol.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,23 @@
+<definition width="50" version="0.3" hotspot_x="25" hotspot_y="50" height="100" type="element" orientation="dnnn">
+    <names>
+        <name lang="fr">Bouteille auto-vidange Guy Delsol</name>
+    </names>
+    <informations></informations>
+    <description>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="40" x1="0" y2="35" x2="0"/>
+        <rect width="8" x="12" y="-21" antialias="false" height="1" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <text x="-2" y="2" size="4" rotation="-90" text="bouteille&#xa;guy Delsol"/>
+        <circle x="-0.414214" y="-33.4142" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="2.82843"/>
+        <arc width="20" x="-20" y="-41" antialias="true" height="70" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-80"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-40" x1="0" y2="-6" x2="0"/>
+        <arc width="25" x="-12.5" y="-37.5" antialias="true" height="25" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dotted;line-weight:thin;filling:none;color:black" y1="-20" x1="-12" y2="-20" x2="12"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dotted;line-weight:thin;filling:none;color:black" y1="14" x1="-12" y2="14" x2="12"/>
+        <arc width="25" x="-12.5" y="12.5" antialias="true" height="25" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-25" x1="-12.5" y2="25" x2="-12.5"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-25" x1="12.5" y2="25" x2="12.5"/>
+        <terminal x="0" y="40" orientation="s"/>
+        <terminal x="0" y="-40" orientation="n"/>
+        <terminal x="20" y="-20" orientation="e"/>
+    </description>
+</definition>

Added: branches/0.3/elements/energie/solaire/expansion_soupape/event_01.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/expansion_soupape/event_01.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/expansion_soupape/event_01.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,13 @@
+<definition width="30" version="0.3" hotspot_x="20" hotspot_y="25" height="30" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">Event Vase Ouvert</name>
+    </names>
+    <informations></informations>
+    <description>
+        <input x="-14" y="-4.5" size="4" rotate="true" text="Event"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="0" y2="-8" x2="0"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-10" y2="-10" x2="-10"/>
+        <arc width="10" x="-10" y="-15" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
+        <terminal x="-10" y="0" orientation="s"/>
+    </description>
+</definition>

Added: branches/0.3/elements/energie/solaire/expansion_soupape/groupe_securite_01d.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/expansion_soupape/groupe_securite_01d.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/expansion_soupape/groupe_securite_01d.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,21 @@
+<definition width="50" version="0.3" hotspot_x="20" hotspot_y="20" height="50" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">Groupe de Sécurité (droite)</name>
+    </names>
+    <informations></informations>
+    <description>
+        <polygon style="line-style:dotted;line-weight:thin;filling:none;color:black" x1="0" x2="-8" x3="-8" x4="8" antialias="false" x5="8" x6="20" x7="20" x8="8" x9="8" closed="false" y1="20" y10="20" y2="20" y3="-10" y4="-10" y5="-7" x10="0" y6="-7" y7="7" y8="7" y9="20"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="20" y2="0" x2="17"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="0" y2="0" x2="8"/>
+        <polygon x4="17" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="17" y2="-5" x2="8" y3="5" x3="8" y4="0"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" x2="-3" x3="-4" x4="-5" antialias="false" x5="-6" x6="-7" x7="-8" x8="-9" closed="false" y1="12" y2="12" y3="14" y4="10" y5="14" y6="10" y7="12" y8="12"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="0" y2="4" x2="0"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5" x1="17" y2="5" x2="17"/>
+        <polygon x4="0" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="12" x1="0" y2="20" x2="-5" y3="20" x3="5" y4="12"/>
+        <polygon x4="0" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="12" x1="0" y2="4" x2="-5" y3="4" x3="5" y4="12"/>
+        <input x="5" y="18.5" size="5" text="xBar"/>
+        <terminal x="20" y="0" orientation="e"/>
+        <terminal x="0" y="20" orientation="s"/>
+        <terminal x="0" y="-10" orientation="n"/>
+    </description>
+</definition>

Added: branches/0.3/elements/energie/solaire/expansion_soupape/groupe_securite_01g.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/expansion_soupape/groupe_securite_01g.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/expansion_soupape/groupe_securite_01g.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,21 @@
+<definition width="50" version="0.3" hotspot_x="30" hotspot_y="20" height="50" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">Groupe de Sécurité (gauche)</name>
+    </names>
+    <informations></informations>
+    <description>
+        <polygon style="line-style:dotted;line-weight:thin;filling:none;color:black" x1="0" x2="-6" x3="-6" x4="-20" antialias="false" x5="-20" x6="-8" x7="-8" x8="7" x9="7" closed="false" y1="20" y10="20" y2="20" y3="7" y4="7" y5="-7" x10="0" y6="-7" y7="-10" y8="-10" y9="20"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" x2="3" x3="4" x4="5" antialias="false" x5="6" x6="7" x7="8" x8="10" closed="false" y1="12" y2="12" y3="10" y4="14" y5="10" y6="14" y7="12" y8="12"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-8" y2="0" x2="0"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="0" y2="4" x2="0"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-20" y2="0" x2="-17"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5" x1="-17" y2="5" x2="-17"/>
+        <polygon x4="-17" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-17" y2="-5" x2="-8" y3="5" x3="-8" y4="0"/>
+        <polygon x4="0" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="12" x1="0" y2="20" x2="-5" y3="20" x3="5" y4="12"/>
+        <polygon x4="0" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="12" x1="0" y2="4" x2="-5" y3="4" x3="5" y4="12"/>
+        <input x="-27" y="17.5" size="5" text="xBar"/>
+        <terminal x="-20" y="0" orientation="w"/>
+        <terminal x="0" y="20" orientation="s"/>
+        <terminal x="0" y="-10" orientation="n"/>
+    </description>
+</definition>

Added: branches/0.3/elements/energie/solaire/expansion_soupape/manometre_01.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/expansion_soupape/manometre_01.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/expansion_soupape/manometre_01.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,24 @@
+<definition width="30" version="0.3" hotspot_x="15" hotspot_y="15" height="30" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">Manomètre </name>
+    </names>
+    <informations></informations>
+    <description>
+        <polygon x4="1" y5="7.75" x5="1" y6="7.75" x6="1" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="7.75" x1="-1" y2="10.75" x2="-1" y3="10.75" x3="-1" y4="10.75"/>
+        <text x="-4" y="3.75" size="4" text="bar"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10.75" x1="0" y2="11.75" x2="0"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5.25" x1="-3" y2="-4.25" x2="0"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5.25" x1="-3" y2="-2.25" x2="-2"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5.25" x1="-3" y2="-0.25" x2="2"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="3.75" x1="6" y2="2.75" x2="5"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="3.75" x1="-6" y2="2.75" x2="-5"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-8.25" x1="6" y2="-7.25" x2="5"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-8.25" x1="-6" y2="-7.25" x2="-5"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10.25" x1="0" y2="-9.25" x2="0"/>
+        <circle x="-8.60233" y="-10.8523" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="17.2047"/>
+        <circle x="-10" y="-12.25" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="20"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-2.25" x1="7" y2="-2.25" x2="8"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-2.25" x1="-8" y2="-2.25" x2="-7"/>
+        <terminal x="0" y="11.75" orientation="s"/>
+    </description>
+</definition>

Added: branches/0.3/elements/energie/solaire/expansion_soupape/purgeur.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/expansion_soupape/purgeur.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/expansion_soupape/purgeur.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,21 @@
+<definition width="30" version="0.3" hotspot_x="15" hotspot_y="20" height="40" type="element" orientation="ndny">
+    <names>
+        <name lang="fr">purgeur</name>
+    </names>
+    <informations/>
+    <description>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-12" x1="3.5" y2="-11" x2="3.5"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-12" x1="-7" y2="-11" x2="-7"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-16" x1="3" y2="-16" x2="6"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-13" x1="4" y2="-15" x2="4"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-13" x1="5" y2="-15" x2="5"/>
+        <rect width="2" x="-1" y="10" antialias="false" height="3" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect width="14" x="-7" y="-10" antialias="true" height="20" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect width="18" x="-9" y="-13" antialias="true" height="3" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-12" x1="0" y2="-11" x2="0"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-12" x1="-4" y2="-11" x2="-4"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-12" x1="6.5" y2="-11" x2="6.5"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-12" x1="-1" y2="-11" x2="-1"/>
+        <terminal x="0" y="13" orientation="s"/>
+    </description>
+</definition>

Added: branches/0.3/elements/energie/solaire/expansion_soupape/qet_directory
===================================================================
--- branches/0.3/elements/energie/solaire/expansion_soupape/qet_directory	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/expansion_soupape/qet_directory	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,5 @@
+<qet-directory>
+    <names>
+        <name lang="fr">vase expansion soupape</name>
+    </names>
+</qet-directory>

Added: branches/0.3/elements/energie/solaire/expansion_soupape/soupape_01d.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/expansion_soupape/soupape_01d.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/expansion_soupape/soupape_01d.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,14 @@
+<definition width="30" version="0.3" hotspot_x="15" hotspot_y="30" height="50" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">Soupape de Sécurité "droite"</name>
+    </names>
+    <informations></informations>
+    <description>
+        <polygon x4="0" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="0" x1="0" y2="-6" x2="10" y3="6" x3="10" y4="0"/>
+        <polygon x4="0" y5="0" x5="0" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="0" x1="0" y2="10" x2="-6" y3="10" x3="6" y4="0"/>
+        <input x="-12" y="-19.5" size="5" text="xBar"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" x2="0" x3="-3" x4="3" antialias="true" x5="-3" x6="3" x7="-3" x8="3" x9="0" closed="false" y1="0" y10="-17" y2="-4" y11="-17" y3="-6" y4="-8" y12="-17" y5="-9" x10="0" y6="-11" x11="0" y7="-12" x12="0" y8="-14" y9="-15"/>
+        <terminal x="10" y="0" orientation="e"/>
+        <terminal x="0" y="10" orientation="s"/>
+    </description>
+</definition>

Added: branches/0.3/elements/energie/solaire/expansion_soupape/soupape_01g.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/expansion_soupape/soupape_01g.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/expansion_soupape/soupape_01g.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,14 @@
+<definition width="30" version="0.3" hotspot_x="15" hotspot_y="30" height="50" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">Soupape Sécurité "gauche"</name>
+    </names>
+    <informations></informations>
+    <description>
+        <polygon x4="0" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="0" x1="0" y2="10" x2="-6" y3="10" x3="6" y4="0"/>
+        <polygon x4="0" y5="0" x5="0" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="0" x1="0" y2="-6" x2="-10" y3="6" x3="-10" y4="0"/>
+        <input x="-12" y="-19.5" size="5" text="xBar"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" x2="0" x3="-3" x4="3" antialias="true" x5="-3" x6="3" x7="-3" x8="3" x9="0" closed="false" y1="0" y10="-17" y2="-4" y11="-17" y3="-6" y4="-8" y12="-17" y5="-9" x10="0" y6="-11" x11="0" y7="-12" x12="0" y8="-14" y9="-15"/>
+        <terminal x="-10" y="0" orientation="w"/>
+        <terminal x="0" y="10" orientation="s"/>
+    </description>
+</definition>

Added: branches/0.3/elements/energie/solaire/expansion_soupape/termovar.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/expansion_soupape/termovar.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/expansion_soupape/termovar.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,21 @@
+<definition width="40" version="0.3" hotspot_x="20" hotspot_y="20" height="40" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">Thermovar</name>
+    </names>
+    <informations></informations>
+    <description>
+        <text x="-11" y="-5" size="4" text="Termovar"/>
+        <arc width="5" x="-2" y="1" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-90"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="4" y2="0" x2="-5"/>
+        <rect width="20" x="-10" y="-10" antialias="false" height="20" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
+        <rect width="22" x="-11" y="-11" antialias="false" height="22" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <polygon x4="8" y5="0" x5="8" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="0" x1="8" y2="-3" x2="5" y3="3" x3="5" y4="0"/>
+        <rect width="10" x="-6" y="-1" antialias="false" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect width="14" x="-7" y="11" antialias="false" height="3" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect width="3" x="-14" y="-9" antialias="false" height="18" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect width="3" x="11" y="-9" antialias="false" height="18" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <terminal x="-14" y="0" orientation="w"/>
+        <terminal x="14" y="0" orientation="e"/>
+        <terminal x="0" y="14" orientation="s"/>
+    </description>
+</definition>

Added: branches/0.3/elements/energie/solaire/expansion_soupape/thermometre_rond_01.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/expansion_soupape/thermometre_rond_01.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/expansion_soupape/thermometre_rond_01.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,22 @@
+<definition width="30" version="0.3" hotspot_x="15" hotspot_y="10" height="30" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">Thermomètre à cadran</name>
+    </names>
+    <informations></informations>
+    <description>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="simple" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="-4" y2="0" x2="5"/>
+        <circle x="-8.60233" y="-5.85233" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="17.2047"/>
+        <circle x="-10" y="-7.25" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="20"/>
+        <polygon x4="1" y5="12.75" x5="1" y6="12.75" x6="1" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="12.75" x1="-1" y2="15.75" x2="-1" y3="15.75" x3="-1" y4="15.75"/>
+        <text x="-3" y="10" size="4" text="°C"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="15.75" x1="0" y2="16.75" x2="0"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="8.75" x1="6" y2="7.75" x2="5"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="8.75" x1="-6" y2="7.75" x2="-5"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-3.25" x1="6" y2="-2.25" x2="5"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-3.25" x1="-6" y2="-2.25" x2="-5"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5.25" x1="0" y2="-4.25" x2="0"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="2.75" x1="7" y2="2.75" x2="8"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="2.75" x1="-8" y2="2.75" x2="-7"/>
+        <terminal x="0" y="16.75" orientation="s"/>
+    </description>
+</definition>

Added: branches/0.3/elements/energie/solaire/expansion_soupape/thermometre_vertical_01.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/expansion_soupape/thermometre_vertical_01.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/expansion_soupape/thermometre_vertical_01.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,27 @@
+<definition width="30" version="0.3" hotspot_x="15" hotspot_y="25" height="50" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">Thermomètre Vertical </name>
+    </names>
+    <informations></informations>
+    <description>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-16" x1="-1" y2="-16" x2="1"/>
+        <text x="-1" y="-16" size="2" text="°c"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dotted;line-weight:thin;filling:none;color:black" y1="-17" x1="0" y2="7" x2="0"/>
+        <rect width="4" x="-2" y="-17" antialias="false" height="24" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="13" x1="0" y2="22" x2="0"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="0" y2="12" x2="0"/>
+        <rect width="2" x="-1" y="10" antialias="false" height="13" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect width="8" x="-4" y="-20" antialias="false" height="30" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="2" x1="-1" y2="2" x2="1"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="4" x1="-1" y2="4" x2="1"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-2" x1="-1" y2="-2" x2="1"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="0" x1="-1" y2="0" x2="1"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-6" x1="-1" y2="-6" x2="1"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-4" x1="-1" y2="-4" x2="1"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-14" x1="-1" y2="-14" x2="1"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-8" x1="-1" y2="-8" x2="1"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-10" x1="-1" y2="-10" x2="1"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-12" x1="-1" y2="-12" x2="1"/>
+        <terminal x="0" y="23" orientation="s"/>
+    </description>
+</definition>

Added: branches/0.3/elements/energie/solaire/expansion_soupape/vanne_diferentielle_01d.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/expansion_soupape/vanne_diferentielle_01d.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/expansion_soupape/vanne_diferentielle_01d.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,20 @@
+<definition width="40" version="0.3" hotspot_x="20" hotspot_y="35" height="50" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">Vanne diférentielle "droite"</name>
+    </names>
+    <informations></informations>
+    <description>
+        <polygon x4="0" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="0" x1="0" y2="-6" x2="10" y3="6" x3="10" y4="0"/>
+        <polygon x4="0" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="0" x1="0" y2="10" x2="-6" y3="10" x3="6" y4="0"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="simple" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-16" x1="-9" y2="-18" x2="-11"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="simple" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-16" x1="9" y2="-18" x2="12"/>
+        <arc width="18" x="-9" y="-17.5" antialias="true" height="3" style="line-style:normal;line-weight:thin;filling:none;color:black" start="-10" angle="-160"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-14" x1="11" y2="-14" x2="15"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-14" x1="-15" y2="-14" x2="-11"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-16" x1="-13" y2="-12" x2="-13"/>
+        <input x="-12" y="-23.5" size="5" text="xBar"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" x2="0" x3="-3" x4="3" antialias="true" x5="-3" x6="3" x7="-3" x8="3" x9="0" closed="false" y1="0" y10="-17" y2="-4" y11="-17" y3="-6" y4="-8" y12="-17" y5="-9" x10="0" y6="-11" x11="0" y7="-12" x12="0" y8="-14" y9="-15"/>
+        <terminal x="10" y="0" orientation="e"/>
+        <terminal x="0" y="10" orientation="s"/>
+    </description>
+</definition>

Added: branches/0.3/elements/energie/solaire/expansion_soupape/vanne_diferentielle_03.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/expansion_soupape/vanne_diferentielle_03.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/expansion_soupape/vanne_diferentielle_03.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,21 @@
+<definition width="40" version="0.3" hotspot_x="20" hotspot_y="30" height="50" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">Vanne Pression Diférentielle</name>
+    </names>
+    <informations></informations>
+    <description>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-6" x1="8" y2="-6" x2="12"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-5" x1="4" y2="-5" x2="6"/>
+        <polygon x4="0" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="10" x1="0" y2="4" x2="-10" y3="16" x3="-10" y4="10"/>
+        <polygon x4="0" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="10" x1="0" y2="4" x2="10" y3="16" x3="10" y4="10"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dotted;line-weight:thin;filling:none;color:black" y1="-7" x1="6" y2="3" x2="6"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="2" x1="8" y2="2" x2="12"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-8" x1="10" y2="-4" x2="10"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="1" x1="4" y2="1" x2="6"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-2" x1="4" y2="-2" x2="6"/>
+        <input x="-12" y="-19.5" size="5" text="xBar"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" x2="0" x3="-3" x4="3" antialias="true" x5="-3" x6="3" x7="-3" x8="3" x9="0" closed="false" y1="9" y10="-8" y2="5" y11="-8" y3="3" y4="1" y12="-8" y5="0" x10="0" y6="-2" x11="0" y7="-3" x12="0" y8="-5" y9="-6"/>
+        <terminal x="10" y="10" orientation="e"/>
+        <terminal x="-10" y="10" orientation="w"/>
+    </description>
+</definition>

Added: branches/0.3/elements/energie/solaire/expansion_soupape/vanne_diferentielle_1g.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/expansion_soupape/vanne_diferentielle_1g.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/expansion_soupape/vanne_diferentielle_1g.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,20 @@
+<definition width="40" version="0.3" hotspot_x="20" hotspot_y="35" height="50" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">Vanne diférentielle "gauche"</name>
+    </names>
+    <informations></informations>
+    <description>
+        <polygon x4="0" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="0" x1="0" y2="-6" x2="-10" y3="6" x3="-10" y4="0"/>
+        <polygon x4="0" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="0" x1="0" y2="10" x2="-6" y3="10" x3="6" y4="0"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="simple" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-16" x1="-9" y2="-18" x2="-11"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="simple" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-16" x1="9" y2="-18" x2="12"/>
+        <arc width="18" x="-9" y="-17.5" antialias="true" height="3" style="line-style:normal;line-weight:thin;filling:none;color:black" start="-10" angle="-160"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-14" x1="11" y2="-14" x2="15"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-14" x1="-15" y2="-14" x2="-11"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-16" x1="-13" y2="-12" x2="-13"/>
+        <input x="-12" y="-21.5" size="5" text="xBar"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" x2="0" x3="-3" x4="3" antialias="true" x5="-3" x6="3" x7="-3" x8="3" x9="0" closed="false" y1="0" y10="-17" y2="-4" y11="-17" y3="-6" y4="-8" y12="-17" y5="-9" x10="0" y6="-11" x11="0" y7="-12" x12="0" y8="-14" y9="-15"/>
+        <terminal x="-10" y="0" orientation="w"/>
+        <terminal x="0" y="10" orientation="s"/>
+    </description>
+</definition>

Added: branches/0.3/elements/energie/solaire/expansion_soupape/vanne_diferentielle_3d.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/expansion_soupape/vanne_diferentielle_3d.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/expansion_soupape/vanne_diferentielle_3d.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,21 @@
+<definition width="40" version="0.3" hotspot_x="20" hotspot_y="35" height="50" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">Vanne diférentielle "droite"</name>
+    </names>
+    <informations></informations>
+    <description>
+        <polygon x4="0" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="0" x1="0" y2="-6" x2="10" y3="6" x3="10" y4="0"/>
+        <polygon x4="0" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="0" x1="0" y2="10" x2="-6" y3="10" x3="6" y4="0"/>
+        <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="-14" x1="-7" y2="-4" x2="-7"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-2" x1="-12" y2="-2" x2="-8"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-16" x1="-12" y2="-16" x2="-8"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-18" x1="-10" y2="-14" x2="-10"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-6" x1="-7" y2="-6" x2="-5"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-9" x1="-7" y2="-9" x2="-5"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-12" x1="-7" y2="-12" x2="-5"/>
+        <input x="-12" y="-22.5" size="5" text="xBar"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" x2="0" x3="-3" x4="3" antialias="true" x5="-3" x6="3" x7="-3" x8="3" x9="0" closed="false" y1="0" y10="-17" y2="-4" y11="-17" y3="-6" y4="-8" y12="-17" y5="-9" x10="0" y6="-11" x11="0" y7="-12" x12="0" y8="-14" y9="-15"/>
+        <terminal x="10" y="0" orientation="e"/>
+        <terminal x="0" y="10" orientation="s"/>
+    </description>
+</definition>

Added: branches/0.3/elements/energie/solaire/expansion_soupape/vanne_diferentielle_3g.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/expansion_soupape/vanne_diferentielle_3g.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/expansion_soupape/vanne_diferentielle_3g.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,21 @@
+<definition width="40" version="0.3" hotspot_x="20" hotspot_y="35" height="50" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">Vanne diférentielle "gauche"</name>
+    </names>
+    <informations></informations>
+    <description>
+        <polygon x4="0" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="0" x1="0" y2="-6" x2="-10" y3="6" x3="-10" y4="0"/>
+        <polygon x4="0" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="0" x1="0" y2="10" x2="-6" y3="10" x3="6" y4="0"/>
+        <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="-16" x1="7" y2="-6" x2="7"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-4" x1="8" y2="-4" x2="12"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-18" x1="8" y2="-18" x2="12"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="10" y2="-16" x2="10"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-8" x1="5" y2="-8" x2="7"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="5" y2="-11" x2="7"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-14" x1="5" y2="-14" x2="7"/>
+        <input x="-12" y="-22.5" size="5" text="xBar"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" x2="0" x3="-3" x4="3" antialias="true" x5="-3" x6="3" x7="-3" x8="3" x9="0" closed="false" y1="0" y10="-17" y2="-4" y11="-17" y3="-6" y4="-8" y12="-17" y5="-9" x10="0" y6="-11" x11="0" y7="-12" x12="0" y8="-14" y9="-15"/>
+        <terminal x="-10" y="0" orientation="w"/>
+        <terminal x="0" y="10" orientation="s"/>
+    </description>
+</definition>

Added: branches/0.3/elements/energie/solaire/expansion_soupape/vanne_recyclage_thermostatique_01g.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/expansion_soupape/vanne_recyclage_thermostatique_01g.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/expansion_soupape/vanne_recyclage_thermostatique_01g.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,22 @@
+<definition width="50" version="0.3" hotspot_x="35" hotspot_y="35" height="60" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">Vanne de Recyclage Thermostatique</name>
+    </names>
+    <informations></informations>
+    <description>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="-10" y2="-25" x2="-10"/>
+        <rect width="4" x="-12" y="-24" antialias="false" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <polygon x4="-10" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="-10" y2="-18" x2="-15" y3="-18" x3="-5" y4="-10"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="-20" y2="-10" x2="-30"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="10" y2="-10" x2="0"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="triangle" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="0" x1="-21" y2="0" x2="-1"/>
+        <polygon style="line-style:normal;line-weight:thin;filling:none;color:black" x1="-5" x2="-15" x3="-5" x4="-15" antialias="false" x5="-5" x6="-15" x7="-5" x8="-15" x9="-5" closed="false" y1="-4" y2="-4" y3="-6" y4="-7" y5="-9" y6="-11" y7="-13" y8="-14" y9="-14"/>
+        <polygon x4="-4" antialias="false" style="line-style:normal;line-weight:thin;filling:none;color:black" closed="false" y1="-7" x1="-16" y2="-3" x2="-16" y3="-3" x3="-4" y4="-7"/>
+        <polygon x4="-10" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="-10" y2="-16" x2="0" y3="-4" x3="0" y4="-10"/>
+        <polygon x4="-10" y5="-10" x5="-10" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="-10" y2="-16" x2="-20" y3="-4" x3="-20" y4="-10"/>
+        <input x="-32" y="12" size="6" text="termovar"/>
+        <terminal x="-30" y="-10" orientation="w"/>
+        <terminal x="-10" y="-30" orientation="n"/>
+        <terminal x="10" y="-10" orientation="e"/>
+    </description>
+</definition>

Added: branches/0.3/elements/energie/solaire/expansion_soupape/vase_chauffage_01.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/expansion_soupape/vase_chauffage_01.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/expansion_soupape/vase_chauffage_01.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,18 @@
+<definition width="50" version="0.3" hotspot_x="25" hotspot_y="25" height="60" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">Vase Chauffage 01</name>
+    </names>
+    <informations></informations>
+    <description>
+        <input x="-13" y="25" size="7" rotate="true" text="10L"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="19.1" x1="0" y2="20.1" x2="0"/>
+        <polygon x4="1" y5="-17.9" x5="1" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-17.9" x1="-1" y2="-19.9" x2="-1" y3="-19.9" x3="1" y4="-17.9"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-9.9" x1="20" y2="10.1" x2="20"/>
+        <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="1.1" x1="-20" y2="1.1" x2="20"/>
+        <polygon x4="0" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="1.1" x1="0" y2="9.1" x2="-5" y3="9.1" x3="5" y4="1.1"/>
+        <arc width="40" x="-20" y="-18.4" antialias="true" height="15" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
+        <arc width="40" x="-20" y="3.6" antialias="true" height="15" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-9.9" x1="-20" y2="10.1" x2="-20"/>
+        <terminal x="0" y="-18.9" orientation="n"/>
+    </description>
+</definition>

Added: branches/0.3/elements/energie/solaire/expansion_soupape/vase_chauffage_02.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/expansion_soupape/vase_chauffage_02.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/expansion_soupape/vase_chauffage_02.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,18 @@
+<definition width="50" version="0.3" hotspot_x="25" hotspot_y="30" height="80" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">Vase Chauffage 02</name>
+    </names>
+    <informations></informations>
+    <description>
+        <polygon x4="0" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="0" y2="3" x2="-3" y3="3" x3="3" y4="0"/>
+        <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="0" x1="-20" y2="0" x2="20"/>
+        <input x="-12" y="36" size="7" rotate="true" text="50L"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-17" x1="20" y2="20" x2="20"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-17" x1="-20" y2="20" x2="-20"/>
+        <rect width="2" x="-1" y="27" antialias="false" height="1" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <polygon x4="1" y5="-23.9" x5="1" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-23.9" x1="-1" y2="-25.9" x2="-1" y3="-25.9" x3="1" y4="-23.9"/>
+        <arc width="40" x="-20" y="-24.5" antialias="true" height="15" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
+        <arc width="40" x="-20" y="12.5" antialias="true" height="15" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
+        <terminal x="0" y="-26" orientation="n"/>
+    </description>
+</definition>

Added: branches/0.3/elements/energie/solaire/expansion_soupape/vase_chauffage_03.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/expansion_soupape/vase_chauffage_03.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/expansion_soupape/vase_chauffage_03.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,23 @@
+<definition width="50" version="0.3" hotspot_x="25" hotspot_y="25" height="50" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">Vase Chauffage circulaire</name>
+    </names>
+    <informations></informations>
+    <description>
+        <circle x="-21.6333" y="-21.6333" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="43.2666"/>
+        <circle x="-20" y="-20" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="40"/>
+        <input x="-9" y="-9" size="7" rotate="true" text="xL"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="3" x1="-4" y2="8" x2="-9"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-3" x1="4" y2="-7" x2="8"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="3" x1="3" y2="7" x2="7"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-3" x1="-3" y2="-7" x2="-7"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="0" x1="-4" y2="0" x2="-9"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="0" x1="4" y2="0" x2="9"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="4" x1="0" y2="9" x2="0"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-4" x1="0" y2="-9" x2="0"/>
+        <circle x="-3.60555" y="-3.60555" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="7.2111"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="0" y2="-21" x2="0"/>
+        <rect width="2" x="-1" y="22" antialias="false" height="1" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <terminal x="0" y="23" orientation="s"/>
+    </description>
+</definition>

Added: branches/0.3/elements/energie/solaire/expansion_soupape/vase_chauffage_ouvert_01.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/expansion_soupape/vase_chauffage_ouvert_01.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/expansion_soupape/vase_chauffage_ouvert_01.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,17 @@
+<definition width="70" version="0.3" hotspot_x="35" hotspot_y="15" height="30" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">Vase Chauffage Ouvert 01</name>
+    </names>
+    <informations></informations>
+    <description>
+        <input x="-10" y="1.5" size="7" rotate="true" text="xL"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dotted;line-weight:thin;filling:none;color:black" y1="-7" x1="-29" y2="-7" x2="29"/>
+        <rect width="2" x="-1" y="10" antialias="false" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect width="2" x="-32" y="-9" antialias="false" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect width="2" x="-1" y="-12" antialias="false" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect width="60" x="-30" y="-10" antialias="false" height="20" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <terminal x="0" y="-12" orientation="n"/>
+        <terminal x="-32" y="-8" orientation="w"/>
+        <terminal x="0" y="12" orientation="s"/>
+    </description>
+</definition>

Added: branches/0.3/elements/energie/solaire/expansion_soupape/vase_chauffage_ouvert_02.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/expansion_soupape/vase_chauffage_ouvert_02.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/expansion_soupape/vase_chauffage_ouvert_02.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,22 @@
+<definition width="40" version="0.3" hotspot_x="20" hotspot_y="25" height="50" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">Vase Chauffage Ouvert 02</name>
+    </names>
+    <informations></informations>
+    <description>
+        <input x="-11" y="-9.5" size="9" rotate="true" text="xL"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dotted;line-weight:thin;filling:none;color:black" y1="-15" x1="15" y2="-15" x2="-15"/>
+        <circle x="-0.75" y="15.25" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="1.5"/>
+        <rect width="2" x="16" y="-18" antialias="false" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-18" x1="16" y2="18" x2="16"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-18" x1="-16" y2="17" x2="-16"/>
+        <circle x="-0.75" y="1.25" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="1.5"/>
+        <polygon x4="1" y5="-20.9" x5="1" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-20.9" x1="-1" y2="-22.9" x2="-1" y3="-22.9" x3="1" y4="-20.9"/>
+        <arc width="32" x="-16" y="-20" antialias="true" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
+        <arc width="32" x="-16" y="16" antialias="true" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
+        <terminal x="0" y="-23" orientation="n"/>
+        <terminal x="18" y="-17" orientation="e"/>
+        <terminal x="0" y="2" orientation="s"/>
+        <terminal x="0" y="16" orientation="s"/>
+    </description>
+</definition>

Added: branches/0.3/elements/energie/solaire/expansion_soupape/vidange.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/expansion_soupape/vidange.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/expansion_soupape/vidange.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,19 @@
+<definition width="40" version="0.3" hotspot_x="20" hotspot_y="25" height="50" type="element" orientation="dnnn">
+    <names>
+        <name lang="fr">vidange égout</name>
+    </names>
+    <informations></informations>
+    <description>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="0" y2="-7" x2="0"/>
+        <polygon x4="-9" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="16" x1="-15" y2="21" x2="-12" y3="16" x3="-9" y4="16"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="8" x1="-12" y2="21" x2="-12"/>
+        <arc width="5" x="-12" y="5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-90"/>
+        <arc width="5" x="-11" y="5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-90"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="12" x1="-6" y2="8" x2="-6"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="4" x1="0" y2="12" x2="0"/>
+        <arc width="5" x="-6" y="10" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-90"/>
+        <arc width="5" x="-5" y="10" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
+        <polygon x4="18" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-14" x1="-18" y2="4" x2="0" y3="-14" x3="18" y4="-14"/>
+        <terminal x="0" y="-20" orientation="n"/>
+    </description>
+</definition>

Added: branches/0.3/elements/energie/solaire/pompe/circulateur_reversible_01.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/pompe/circulateur_reversible_01.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/pompe/circulateur_reversible_01.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,18 @@
+<definition width="40" version="0.3" hotspot_x="20" hotspot_y="25" height="40" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">Circulateur Réversible</name>
+    </names>
+    <informations></informations>
+    <description>
+        <polygon x4="6" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="6" y2="-5" x2="1" y3="5" x3="1" y4="0"/>
+        <polygon x4="-6" y5="0" x5="-6" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-6" y2="-5" x2="-1" y3="5" x3="-1" y4="0"/>
+        <circle x="-7" y="-7" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="14"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="simple" end2="simple" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="10" x1="-7" y2="10" x2="7"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-10" y2="0" x2="-7"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="10" y2="0" x2="7"/>
+        <input x="-11" y="-12" size="7" text="C1"/>
+        <terminal x="-10" y="0" orientation="w"/>
+        <terminal x="10" y="0" orientation="e"/>
+        <terminal x="0" y="7" orientation="s"/>
+    </description>
+</definition>

Added: branches/0.3/elements/energie/solaire/pompe/circulateur_sanitaire_01.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/pompe/circulateur_sanitaire_01.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/pompe/circulateur_sanitaire_01.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,17 @@
+<definition width="40" version="0.3" hotspot_x="20" hotspot_y="25" height="40" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">Circulateur Sanitaire</name>
+    </names>
+    <informations></informations>
+    <description>
+        <polygon x4="4" y5="0" x5="4" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="4" y2="-4" x2="-2" y3="4" x3="-2" y4="0"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="simple" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="10" x1="-7" y2="10" x2="7"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-10" y2="0" x2="-7"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="10" y2="0" x2="7"/>
+        <circle x="-7" y="-7" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="14"/>
+        <input x="-11" y="-12" size="7" text="C1"/>
+        <terminal x="-10" y="0" orientation="w"/>
+        <terminal x="10" y="0" orientation="e"/>
+        <terminal x="0" y="7" orientation="s"/>
+    </description>
+</definition>

Added: branches/0.3/elements/energie/solaire/pompe/circulateur_sanitaire_clapet_01.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/pompe/circulateur_sanitaire_clapet_01.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/pompe/circulateur_sanitaire_clapet_01.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,19 @@
+<definition width="50" version="0.3" hotspot_x="20" hotspot_y="25" height="40" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">Circulateur Sanitaire et clapet</name>
+    </names>
+    <informations></informations>
+    <description>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-10" y2="0" x2="-7"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="13" y2="0" x2="20"/>
+        <polygon x4="8" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="8" y2="-3" x2="13" y3="3" x3="13" y4="0"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5" x1="8" y2="6" x2="8"/>
+        <polygon x4="4" y5="0" x5="4" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="4" y2="-4" x2="-2" y3="4" x3="-2" y4="0"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="simple" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="10" x1="-8" y2="10" x2="6"/>
+        <circle x="-7" y="-7" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="14"/>
+        <input x="-11" y="-12" size="7" text="C1"/>
+        <terminal x="-10" y="0" orientation="w"/>
+        <terminal x="20" y="0" orientation="e"/>
+        <terminal x="0" y="7" orientation="s"/>
+    </description>
+</definition>

Added: branches/0.3/elements/energie/solaire/pompe/debimetre_helice_01.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/pompe/debimetre_helice_01.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/pompe/debimetre_helice_01.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,16 @@
+<definition width="30" version="0.3" hotspot_x="15" hotspot_y="30" height="50" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">Débimetre Hélice</name>
+    </names>
+    <informations></informations>
+    <description>
+        <input x="-4.5" y="17" size="5" rotation="-90" rotate="true" text="Débimètre"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="simple" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="11" y2="15" x2="11"/>
+        <arc width="5" x="6" y="0" antialias="true" height="9" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-90"/>
+        <circle x="-8.60233" y="-8.60233" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="17.2047"/>
+        <rect width="6" x="-3" y="-1" antialias="false" height="2" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
+        <ellipse width="2" x="-1" y="-7" antialias="true" height="9" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
+        <ellipse width="2" x="-1" y="-1" antialias="true" height="9" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
+        <terminal x="0" y="-10" orientation="n"/>
+    </description>
+</definition>

Added: branches/0.3/elements/energie/solaire/pompe/module_hydraulique_01.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/pompe/module_hydraulique_01.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/pompe/module_hydraulique_01.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,49 @@
+<definition width="80" version="0.3" hotspot_x="40" hotspot_y="55" height="100" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">module Hydraulique n°1</name>
+    </names>
+    <informations></informations>
+    <description>
+        <polygon x4="0" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-8" x1="0" y2="3" x2="-6" y3="3" x3="6" y4="-8"/>
+        <circle x="-9.99995" y="-11" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="20"/>
+        <polygon x4="20" y5="-1" x5="20" antialias="false" style="line-style:normal;line-weight:thin;filling:none;color:black" closed="false" y1="-1" x1="10" y2="1" x2="14" y3="-3" x3="16" y4="-1"/>
+        <rect width="60" x="-31" y="-40" antialias="false" height="80" style="line-style:dotted;line-weight:normal;filling:none;color:black"/>
+        <rect width="4" x="-22" y="-14" antialias="false" height="54" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect width="4" x="-22" y="-39" antialias="false" height="11" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect width="4" x="-2" y="-39" antialias="false" height="11" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="21" x2="21" x3="29" x4="29" antialias="false" x5="23" x6="23" x7="21" x8="21" y1="-13" y2="-9" y3="-9" y4="-11" y5="-11" y6="-14" y7="-14" y8="-14"/>
+        <polygon x4="22" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-30" x1="22" y2="-33" x2="26" y3="-27" x3="26" y4="-30"/>
+        <polygon x4="25" y5="-30" x5="22" y6="-30" x6="22" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-30" x1="22" y2="-30" x2="22" y3="-26" x3="19" y4="-26"/>
+        <rect width="9" x="7" y="-22" antialias="false" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect width="4" x="-2" y="9" antialias="false" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect width="4" x="-2" y="-14" antialias="false" height="3" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <circle x="-7.00005" y="-28.0001" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="14"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30" x1="9" y2="32" x2="9"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="20" x1="10" y2="22" x2="10"/>
+        <polygon x4="8" y5="21" x5="8" y6="21" x6="8" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="21" x1="8" y2="19" x2="12" y3="21" x3="12" y4="19"/>
+        <polygon x4="7" y5="29" x5="7" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="29" x1="7" y2="31" x2="11" y3="29" x3="11" y4="31"/>
+        <rect width="2" x="4" y="29" antialias="false" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect width="2" x="5" y="19" antialias="false" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <text x="-22" y="-15" size="2" text="°c"/>
+        <text x="-2" y="-15" size="2" text="°c"/>
+        <circle x="15.9999" y="-26.0001" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="12"/>
+        <text x="17" y="-17" size="2" text="bar"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="simple" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-19" x1="21" y2="-23" x2="24"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="simple" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-19" x1="-19" y2="-25" x2="-23"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="26" y2="-30" x2="29"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="22" x2="22" x3="20" x4="23" antialias="false" x5="20" x6="23" x7="22" x8="22" x9="22" closed="false" y1="-30" y2="-32" y3="-33" y4="-34" y5="-35" y6="-36" y7="-37" y8="-38" y9="-38"/>
+        <rect width="4" x="-2" y="36" antialias="false" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect width="3" x="-2" y="17" antialias="false" height="11" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
+        <rect width="8" x="-4" y="14" antialias="false" height="22" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <circle x="-27.0001" y="-28.0001" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="14"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="simple" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-19" x1="1" y2="-25" x2="-3"/>
+        <terminal x="-20" y="-40" orientation="n"/>
+        <terminal x="0" y="-40" orientation="n"/>
+        <terminal x="-20" y="40" orientation="s"/>
+        <terminal x="0" y="40" orientation="s"/>
+        <terminal x="30" y="-30" orientation="e"/>
+        <terminal x="30" y="-10" orientation="e"/>
+        <terminal x="10" y="20" orientation="e"/>
+        <terminal x="10" y="30" orientation="e"/>
+    </description>
+</definition>

Added: branches/0.3/elements/energie/solaire/pompe/module_hydraulique_02.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/pompe/module_hydraulique_02.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/pompe/module_hydraulique_02.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,48 @@
+<definition width="50" version="0.3" hotspot_x="15" hotspot_y="50" height="100" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">Module Hydraulique n°2</name>
+    </names>
+    <informations></informations>
+    <description>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="20" y2="-13" x2="20"/>
+        <rect width="4" x="-2" y="-40" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect width="4" x="-2" y="-20" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <polygon x4="0" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-7" x1="0" y2="5" x2="-6" y3="5" x3="6" y4="-7"/>
+        <circle x="-10" y="-10" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="20"/>
+        <polygon x4="20" antialias="false" style="line-style:normal;line-weight:thin;filling:none;color:black" closed="false" y1="0" x1="10" y2="2" x2="14" y3="-1" x3="17" y4="0"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="32" x1="8" y2="31" x2="8"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="22" x1="8" y2="21" x2="8"/>
+        <rect width="42" x="-12" y="-40" antialias="false" height="80" style="line-style:dotted;line-weight:normal;filling:none;color:black"/>
+        <rect width="2" x="10" y="29" antialias="false" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="31" x1="6" y2="29" x2="10"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="29" x1="6" y2="31" x2="10"/>
+        <rect width="2" x="10" y="19" antialias="false" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="21" x1="6" y2="19" x2="10"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="19" x1="6" y2="21" x2="10"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="20" y2="-10" x2="30"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="25" y2="-30" x2="30"/>
+        <polygon x4="20" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-30" x1="20" y2="-33" x2="25" y3="-27" x3="25" y4="-30"/>
+        <polygon x4="23" y5="-30" x5="20" y6="-30" x6="20" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-30" x1="20" y2="-26" x2="17" y3="-26" x3="22" y4="-26"/>
+        <rect width="2" x="4" y="29" antialias="false" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect width="2" x="4" y="19" antialias="true" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <text x="-2" y="-22" size="2" text="°c"/>
+        <circle x="14" y="-25" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="12"/>
+        <text x="17" y="-15" size="2" text="bar"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="simple" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-18.25" x1="19.25" y2="-22.25" x2="22.25"/>
+        <rect width="10" x="3" y="-20" antialias="false" height="1" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="20.25" x2="20.25" x3="18.25" x4="21.25" antialias="false" x5="18.25" x6="21.25" x7="20.25" x8="20.25" x9="20.25" closed="false" y1="-30.25" y2="-32.25" y3="-33.25" y4="-34.25" y5="-35.25" y6="-36.25" y7="-37.25" y8="-38.25" y9="-38.25"/>
+        <rect width="4" x="-2" y="36.75" antialias="false" height="3" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect width="3" x="-2" y="21.75" antialias="false" height="11" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
+        <rect width="8" x="-4" y="14.75" antialias="false" height="22" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect width="4" x="-2" y="9.75" antialias="false" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="simple" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-25.25" x1="1.25" y2="-31.25" x2="-2.75"/>
+        <circle x="-7" y="-34.2501" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="14"/>
+        <terminal x="0" y="-40" orientation="n"/>
+        <terminal x="0" y="40" orientation="s"/>
+        <terminal x="30" y="-30" orientation="e"/>
+        <terminal x="30" y="-10" orientation="e"/>
+        <terminal x="10" y="20" orientation="e"/>
+        <terminal x="10" y="30" orientation="e"/>
+        <terminal x="20" y="0" orientation="e"/>
+    </description>
+</definition>

Added: branches/0.3/elements/energie/solaire/pompe/pompe_01.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/pompe/pompe_01.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/pompe/pompe_01.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,14 @@
+<definition width="40" version="0.3" hotspot_x="20" hotspot_y="30" height="50" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">Pompe</name>
+    </names>
+    <informations></informations>
+    <description>
+        <input x="-10" y="-17" size="7" text="P1"/>
+        <polygon x4="8" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="8" y2="-7" x2="-4" y3="7" x3="-4" y4="0"/>
+        <circle x="-10.2956" y="-10.2956" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="20.5913"/>
+        <terminal x="-11" y="0" orientation="w"/>
+        <terminal x="11" y="0" orientation="e"/>
+        <terminal x="0" y="10" orientation="s"/>
+    </description>
+</definition>

Added: branches/0.3/elements/energie/solaire/pompe/pompe_clapet_01.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/pompe/pompe_clapet_01.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/pompe/pompe_clapet_01.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,18 @@
+<definition width="50" version="0.3" hotspot_x="20" hotspot_y="30" height="50" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">Pompe avec Clapet</name>
+    </names>
+    <informations></informations>
+    <description>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="14" x1="0" y2="11" x2="0"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="20" y2="0" x2="16"/>
+        <polygon x4="11" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="11" y2="-4" x2="16" y3="4" x3="16" y4="0"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-7" x1="11" y2="7" x2="11"/>
+        <input x="-10" y="-17" size="7" text="P1"/>
+        <polygon x4="8" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="8" y2="-7" x2="-4" y3="7" x3="-4" y4="0"/>
+        <circle x="-10.2956" y="-10.2956" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="20.5913"/>
+        <terminal x="-11" y="0" orientation="w"/>
+        <terminal x="20" y="0" orientation="e"/>
+        <terminal x="0" y="10" orientation="s"/>
+    </description>
+</definition>

Added: branches/0.3/elements/energie/solaire/pompe/qet_directory
===================================================================
--- branches/0.3/elements/energie/solaire/pompe/qet_directory	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/pompe/qet_directory	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,5 @@
+<qet-directory>
+    <names>
+        <name lang="fr">Pompes et Circulateurs</name>
+    </names>
+</qet-directory>

Added: branches/0.3/elements/energie/solaire/productions/cap_thersolaire.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/productions/cap_thersolaire.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/productions/cap_thersolaire.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,43 @@
+<definition width="170" version="0.3" hotspot_x="60" hotspot_y="40" height="100" type="element" orientation="ndny">
+    <names>
+        <name lang="fr">panneau solaire eau</name>
+    </names>
+    <informations></informations>
+    <description>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="50" x1="50" y2="50" x2="-50"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="-9" y2="-30" x2="90"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-32" x1="94" y2="-28" x2="48"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-32" x1="44" y2="-28" x2="-2"/>
+        <polygon x4="44" y5="50" x5="0" y6="50" x6="0" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="50" x1="0" y2="-26" x2="0" y3="-30" x3="44" y4="46"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="53" x1="48" y2="-28" x2="48"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="50" x1="0" y2="-31" x2="0"/>
+        <polygon x4="-6" y5="50" x5="-50" y6="50" x6="-50" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="50" x1="-50" y2="-26" x2="-50" y3="-30" x3="-6" y4="46"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="52" x1="-52" y2="-29" x2="-52"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-32" x1="-6" y2="-28" x2="-52"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-24" x1="-13" y2="41" x2="-13"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-24" x1="-20.5" y2="41" x2="-20.5"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-24" x1="-28" y2="41" x2="-28"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-24" x1="-35.5" y2="41" x2="-35.5"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-24" x1="-43" y2="41" x2="-43"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-24" x1="40" y2="41" x2="40"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-24" x1="32.5" y2="41" x2="32.5"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-24" x1="25" y2="41" x2="25"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-24" x1="17" y2="41" x2="17"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-24" x1="10" y2="41" x2="10"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-24" x1="90" y2="41" x2="90"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-24" x1="82.5" y2="41" x2="82.5"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-24" x1="75" y2="41" x2="75"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-24" x1="67.5" y2="41" x2="67.5"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-24" x1="60" y2="41" x2="60"/>
+        <ellipse width="2" x="-51" y="49" antialias="true" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <ellipse width="2" x="-1" y="49" antialias="true" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <ellipse width="2" x="49" y="49" antialias="true" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <ellipse width="2" x="-10" y="-31" antialias="true" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <ellipse width="2" x="39" y="-31" antialias="true" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <ellipse width="2" x="89" y="-31" antialias="true" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <text x="-18" y="11" size="8" text="Panneaux Solaire"/>
+        <polygon x4="94" y5="50" x5="50" y6="50" x6="50" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="50" x1="50" y2="-26" x2="50" y3="-30" x3="94" y4="46"/>
+        <terminal x="-50" y="50" orientation="s"/>
+        <terminal x="90" y="-30" orientation="e"/>
+    </description>
+</definition>

Added: branches/0.3/elements/energie/solaire/productions/capteur_tubes_01.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/productions/capteur_tubes_01.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/productions/capteur_tubes_01.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,114 @@
+<definition width="160" version="0.3" hotspot_x="45" hotspot_y="25" height="100" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">capteurs à tube</name>
+    </names>
+    <informations></informations>
+    <description>
+        <polygon x4="32" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-13" x1="98" y2="-13" x2="100" y3="-22" x3="100" y4="-22"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-13" x1="88" y2="-13" x2="91"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-13" x1="77" y2="-13" x2="80"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-13" x1="65" y2="-13" x2="69"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-13" x1="55" y2="-13" x2="58"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-13" x1="44" y2="-13" x2="47"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-13" x1="33" y2="-13" x2="36"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-13" x1="21" y2="-13" x2="25"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-13" x1="11" y2="-13" x2="14"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-13" x1="-1" y2="-13" x2="3"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-13" x1="-11" y2="-13" x2="-8"/>
+        <polygon x4="-20" y5="-13" x5="-18" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-22" x1="32" y2="-22" x2="-20" y3="-18" x3="-20" y4="-13"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="-17" y2="-20" x2="97"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-17" x1="-16" y2="-17" x2="97"/>
+        <rect width="114" x="-17" y="-18" antialias="false" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect width="116" x="-18" y="-19" antialias="false" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-13" x1="-14" y2="54" x2="-14"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dotted;line-weight:thin;filling:none;color:black" y1="47" x1="-16" y2="65" x2="-16"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dotted;line-weight:thin;filling:none;color:black" y1="17" x1="-16" y2="43" x2="-16"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dotted;line-weight:thin;filling:none;color:black" y1="-17" x1="-16" y2="14" x2="-16"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="-19" x1="-15" y2="65" x2="-15"/>
+        <arc width="6" x="-18" y="63" antialias="true" height="7" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
+        <polygon x4="-12" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="67" x1="-18" y2="-21" x2="-18" y3="-21" x3="-12" y4="67"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-19" x2="-19" x3="-20" x4="-20" antialias="false" x5="-10" x6="-10" x7="-11" x8="-11" closed="false" y1="65" y2="67" y3="69" y4="72" y5="72" y6="69" y7="67" y8="65"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-13" x1="-3" y2="54" x2="-3"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-13" x1="8" y2="54" x2="8"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-13" x1="19" y2="54" x2="19"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-13" x1="30" y2="54" x2="30"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-13" x1="41" y2="54" x2="41"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-13" x1="52" y2="54" x2="52"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-13" x1="63" y2="54" x2="63"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-13" x1="74" y2="54" x2="74"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-13" x1="85" y2="54" x2="85"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-13" x1="96" y2="54" x2="96"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dotted;line-weight:thin;filling:none;color:black" y1="47" x1="-5" y2="65" x2="-5"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dotted;line-weight:thin;filling:none;color:black" y1="47" x1="6" y2="65" x2="6"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dotted;line-weight:thin;filling:none;color:black" y1="47" x1="17" y2="65" x2="17"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dotted;line-weight:thin;filling:none;color:black" y1="47" x1="28" y2="65" x2="28"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dotted;line-weight:thin;filling:none;color:black" y1="47" x1="39" y2="65" x2="39"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dotted;line-weight:thin;filling:none;color:black" y1="47" x1="50" y2="65" x2="50"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dotted;line-weight:thin;filling:none;color:black" y1="47" x1="61" y2="65" x2="61"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dotted;line-weight:thin;filling:none;color:black" y1="47" x1="72" y2="65" x2="72"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dotted;line-weight:thin;filling:none;color:black" y1="47" x1="83" y2="65" x2="83"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dotted;line-weight:thin;filling:none;color:black" y1="47" x1="94" y2="65" x2="94"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dotted;line-weight:thin;filling:none;color:black" y1="17" x1="-5" y2="43" x2="-5"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dotted;line-weight:thin;filling:none;color:black" y1="17" x1="6" y2="43" x2="6"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dotted;line-weight:thin;filling:none;color:black" y1="17" x1="17" y2="43" x2="17"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dotted;line-weight:thin;filling:none;color:black" y1="17" x1="28" y2="43" x2="28"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dotted;line-weight:thin;filling:none;color:black" y1="17" x1="39" y2="43" x2="39"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dotted;line-weight:thin;filling:none;color:black" y1="17" x1="50" y2="43" x2="50"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dotted;line-weight:thin;filling:none;color:black" y1="17" x1="61" y2="43" x2="61"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dotted;line-weight:thin;filling:none;color:black" y1="17" x1="72" y2="43" x2="72"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dotted;line-weight:thin;filling:none;color:black" y1="17" x1="83" y2="43" x2="83"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dotted;line-weight:thin;filling:none;color:black" y1="17" x1="94" y2="43" x2="94"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dotted;line-weight:thin;filling:none;color:black" y1="-17" x1="-5" y2="14" x2="-5"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dotted;line-weight:thin;filling:none;color:black" y1="-17" x1="6" y2="14" x2="6"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dotted;line-weight:thin;filling:none;color:black" y1="-17" x1="17" y2="14" x2="17"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dotted;line-weight:thin;filling:none;color:black" y1="-17" x1="28" y2="14" x2="28"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dotted;line-weight:thin;filling:none;color:black" y1="-17" x1="39" y2="14" x2="39"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dotted;line-weight:thin;filling:none;color:black" y1="-17" x1="50" y2="14" x2="50"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dotted;line-weight:thin;filling:none;color:black" y1="-17" x1="61" y2="14" x2="61"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dotted;line-weight:thin;filling:none;color:black" y1="-17" x1="72" y2="14" x2="72"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dotted;line-weight:thin;filling:none;color:black" y1="-17" x1="83" y2="14" x2="83"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dotted;line-weight:thin;filling:none;color:black" y1="-17" x1="94" y2="14" x2="94"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="-19" x1="-4" y2="65" x2="-4"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="-19" x1="7" y2="65" x2="7"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="-19" x1="18" y2="65" x2="18"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="-19" x1="29" y2="65" x2="29"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="-19" x1="40" y2="65" x2="40"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="-19" x1="51" y2="65" x2="51"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="-19" x1="62" y2="65" x2="62"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="-19" x1="73" y2="65" x2="73"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="-19" x1="84" y2="65" x2="84"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="-19" x1="95" y2="65" x2="95"/>
+        <arc width="6" x="-7" y="63" antialias="true" height="7" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
+        <arc width="6" x="4" y="63" antialias="true" height="7" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
+        <arc width="6" x="15" y="63" antialias="true" height="7" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
+        <arc width="6" x="26" y="63" antialias="true" height="7" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
+        <arc width="6" x="37" y="63" antialias="true" height="7" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
+        <arc width="6" x="48" y="63" antialias="true" height="7" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
+        <arc width="6" x="59" y="63" antialias="true" height="7" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
+        <arc width="6" x="70" y="63" antialias="true" height="7" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
+        <arc width="6" x="81" y="63" antialias="true" height="7" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
+        <arc width="6" x="92" y="63" antialias="true" height="7" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
+        <polygon x4="-1" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="67" x1="-7" y2="-21" x2="-7" y3="-21" x3="-1" y4="67"/>
+        <polygon x4="10" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="67" x1="4" y2="-21" x2="4" y3="-21" x3="10" y4="67"/>
+        <polygon x4="21" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="67" x1="15" y2="-21" x2="15" y3="-21" x3="21" y4="67"/>
+        <polygon x4="32" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="67" x1="26" y2="-21" x2="26" y3="-21" x3="32" y4="67"/>
+        <polygon x4="43" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="67" x1="37" y2="-21" x2="37" y3="-21" x3="43" y4="67"/>
+        <polygon x4="54" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="67" x1="48" y2="-21" x2="48" y3="-21" x3="54" y4="67"/>
+        <polygon x4="65" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="67" x1="59" y2="-21" x2="59" y3="-21" x3="65" y4="67"/>
+        <polygon x4="76" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="67" x1="70" y2="-21" x2="70" y3="-21" x3="76" y4="67"/>
+        <polygon x4="87" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="67" x1="81" y2="-21" x2="81" y3="-21" x3="87" y4="67"/>
+        <polygon x4="98" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="67" x1="92" y2="-21" x2="92" y3="-21" x3="98" y4="67"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-8" x2="-8" x3="-9" x4="-9" antialias="false" x5="1" x6="1" x7="0" x8="0" closed="false" y1="65" y2="67" y3="69" y4="72" y5="72" y6="69" y7="67" y8="65"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="3" x2="3" x3="2" x4="2" antialias="false" x5="12" x6="12" x7="11" x8="11" closed="false" y1="65" y2="67" y3="69" y4="72" y5="72" y6="69" y7="67" y8="65"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="14" x2="14" x3="13" x4="13" antialias="false" x5="23" x6="23" x7="22" x8="22" closed="false" y1="65" y2="67" y3="69" y4="72" y5="72" y6="69" y7="67" y8="65"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="25" x2="25" x3="24" x4="24" antialias="false" x5="34" x6="34" x7="33" x8="33" closed="false" y1="65" y2="67" y3="69" y4="72" y5="72" y6="69" y7="67" y8="65"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="36" x2="36" x3="35" x4="35" antialias="false" x5="45" x6="45" x7="44" x8="44" closed="false" y1="65" y2="67" y3="69" y4="72" y5="72" y6="69" y7="67" y8="65"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="47" x2="47" x3="46" x4="46" antialias="false" x5="56" x6="56" x7="55" x8="55" closed="false" y1="65" y2="67" y3="69" y4="72" y5="72" y6="69" y7="67" y8="65"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="58" x2="58" x3="57" x4="57" antialias="false" x5="67" x6="67" x7="66" x8="66" closed="false" y1="65" y2="67" y3="69" y4="72" y5="72" y6="69" y7="67" y8="65"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="69" x2="69" x3="68" x4="68" antialias="false" x5="78" x6="78" x7="77" x8="77" closed="false" y1="65" y2="67" y3="69" y4="72" y5="72" y6="69" y7="67" y8="65"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="80" x2="80" x3="79" x4="79" antialias="false" x5="89" x6="89" x7="88" x8="88" closed="false" y1="65" y2="67" y3="69" y4="72" y5="72" y6="69" y7="67" y8="65"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="91" x2="91" x3="90" x4="90" antialias="false" x5="100" x6="100" x7="99" x8="99" closed="false" y1="65" y2="67" y3="69" y4="72" y5="72" y6="69" y7="67" y8="65"/>
+        <terminal x="-20" y="-20" orientation="w"/>
+        <terminal x="100" y="-20" orientation="e"/>
+    </description>
+</definition>

Added: branches/0.3/elements/energie/solaire/productions/chaudiere_bois_01.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/productions/chaudiere_bois_01.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/productions/chaudiere_bois_01.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,39 @@
+<definition width="100" version="0.3" hotspot_x="50" hotspot_y="70" height="140" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">Chaudière Bois</name>
+    </names>
+    <informations></informations>
+    <description>
+        <rect width="70" x="-35" y="-60" antialias="false" height="120" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="circle" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="50" x1="35" y2="50" x2="40"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="circle" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-40" x1="35" y2="-40" x2="40"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="circle" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="50" x1="-40" y2="50" x2="-36"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="circle" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-40" x1="-35" y2="-40" x2="-40"/>
+        <circle x="-3.60555" y="-29.6056" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7.2111"/>
+        <circle x="-7.28011" y="-33.2801" antialias="true" style="line-style:dotted;line-weight:normal;filling:none;color:black" diameter="14.5602"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-55" x1="-18" y2="-55" x2="-19"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-55" x1="-22" y2="-55" x2="-21"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-57" x1="-20" y2="-56" x2="-20"/>
+        <circle x="-23.6056" y="-58.6056" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7.2111"/>
+        <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="-60" x1="37" y2="47" x2="16"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="circle" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-66" x1="13" y2="-61" x2="39"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="24" x2="24" x3="25" x4="25" antialias="false" x5="24" x6="24" x7="25" x8="25" x9="20" closed="false" y1="-60" y2="-62" y10="-65" y3="-62" y11="-64" y4="-63" y12="-63" y5="-63" x10="20" y13="-63" y6="-64" x11="21" y14="-62" y7="-65" x12="21" y15="-62" y8="-67" x13="20" y16="-61" y9="-67" x14="20" y17="-61" x15="21" x16="21" x17="21"/>
+        <ellipse width="2" x="-26" y="-32" antialias="true" height="15" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <circle x="14.5858" y="46.5858" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="2.82843"/>
+        <ellipse width="9" x="-4.5" y="43.5" antialias="true" height="3" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <polygon x4="15" y5="25" x5="-14" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="25" x1="-15" y2="50" x2="-18" y3="50" x3="18" y4="25"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-27" x2="-27" x3="25" x4="25" antialias="true" x5="27" x6="27" x7="25" x8="25" x9="-26" y1="19" y2="56" y3="56" y4="54" y5="54" y6="21" y7="21" y8="19" y9="19"/>
+        <rect width="58" x="-29" y="17" antialias="false" height="41" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-2" x1="-31" y2="-2" x2="30"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-29" x2="-29" x3="27" x4="27" antialias="false" x5="29" x6="29" x7="27" x8="27" x9="-28" closed="false" y1="-48" y2="-4" y3="-4" y4="-6" y5="-6" y6="-46" y7="-46" y8="-48" y9="-48"/>
+        <rect width="70" x="-35" y="-60" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect width="4" x="-35" y="-50" antialias="false" height="110" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <ellipse width="2" x="-25" y="29" antialias="true" height="15" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="15" x1="-31" y2="15" x2="30"/>
+        <rect width="4" x="31" y="-50" antialias="false" height="110" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <terminal x="-40" y="-40" orientation="w"/>
+        <terminal x="-40" y="50" orientation="w"/>
+        <terminal x="40" y="-40" orientation="e"/>
+        <terminal x="40" y="50" orientation="e"/>
+    </description>
+</definition>

Added: branches/0.3/elements/energie/solaire/productions/poele_01.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/productions/poele_01.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/productions/poele_01.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,40 @@
+<definition width="110" version="0.3" hotspot_x="65" hotspot_y="85" height="140" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">Poele Jmo</name>
+    </names>
+    <informations></informations>
+    <description>
+        <rect width="4" x="24" y="-51" antialias="false" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect width="6" x="-48" y="-51" antialias="false" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <circle x="-52" y="-52" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <polygon x4="-9" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" closed="false" y1="11" x1="-8" y2="9" x2="-8" y3="8" x3="-9" y4="7"/>
+        <polygon x4="-11" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" closed="false" y1="11" x1="-12" y2="9" x2="-12" y3="8" x3="-11" y4="7"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="11" x1="-11" y2="9" x2="-9"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="9" x1="-11" y2="11" x2="-9"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="10" x1="-11" y2="10" x2="-9"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="9" x1="-10" y2="11" x2="-10"/>
+        <rect width="6" x="-12" y="-32" antialias="false" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect width="2" x="10" y="-20" antialias="false" height="20" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect width="32" x="-26" y="-20" antialias="false" height="20" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect width="50" x="-34" y="-40" antialias="true" height="60" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect width="50" x="-34" y="-58" antialias="false" height="14" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-60" x1="-42" y2="41" x2="-42"/>
+        <rect width="70" x="-44" y="-64" antialias="false" height="3" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect width="80" x="-50" y="-70" antialias="false" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect width="4" x="24" y="29" antialias="false" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect width="6" x="-48" y="29" antialias="false" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <circle x="28" y="-52" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="28" y="28" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="-52" y="28" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <rect width="50" x="-34" y="24" antialias="false" height="14" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-61" x1="-38" y2="40" x2="-38"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-60" x1="20" y2="41" x2="20"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-60" x1="24" y2="41" x2="24"/>
+        <rect width="70" x="-44" y="41" antialias="false" height="3" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect width="80" x="-50" y="44" antialias="false" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <terminal x="-50" y="-50" orientation="w"/>
+        <terminal x="-50" y="30" orientation="w"/>
+        <terminal x="30" y="-50" orientation="e"/>
+        <terminal x="30" y="30" orientation="e"/>
+    </description>
+</definition>

Added: branches/0.3/elements/energie/solaire/productions/qet_directory
===================================================================
--- branches/0.3/elements/energie/solaire/productions/qet_directory	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/productions/qet_directory	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,5 @@
+<qet-directory>
+    <names>
+        <name lang="fr">Productions</name>
+    </names>
+</qet-directory>

Added: branches/0.3/elements/energie/solaire/signaletiques/diametre_01.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/signaletiques/diametre_01.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/signaletiques/diametre_01.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,11 @@
+<definition width="60" version="0.3" hotspot_x="5" hotspot_y="20" height="30" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">Diamètre cuivre</name>
+    </names>
+    <informations></informations>
+    <description>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-13" x1="52" y2="3" x2="36"/>
+        <circle x="38.0001" y="-11" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="12"/>
+        <input x="-2" y="-7" size="8" rotate="true" text=" / "/>
+    </description>
+</definition>

Added: branches/0.3/elements/energie/solaire/signaletiques/entre_ef_ecs.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/signaletiques/entre_ef_ecs.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/signaletiques/entre_ef_ecs.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,12 @@
+<definition width="30" version="0.3" hotspot_x="15" hotspot_y="10" height="20" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">Entrée Eau Froide ECS</name>
+    </names>
+    <informations></informations>
+    <description>
+        <text x="-5" y="4" size="5" rotation="-90" text="EF"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="triangle" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="3" y2="0" x2="11"/>
+        <polygon x4="-3" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5" x1="-3" y2="5" x2="-3" y3="0" x3="3" y4="-5"/>
+        <terminal x="10" y="0" orientation="e"/>
+    </description>
+</definition>

Added: branches/0.3/elements/energie/solaire/signaletiques/fleche_3voies_01.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/signaletiques/fleche_3voies_01.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/signaletiques/fleche_3voies_01.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,12 @@
+<definition width="30" version="0.3" hotspot_x="15" hotspot_y="10" height="30" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">Fléche 3 Voies 01</name>
+    </names>
+    <informations></informations>
+    <description>
+        <polygon x4="-7" y5="0" x5="-7" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-7" y2="-3" x2="-7" y3="0" x3="-4" y4="3"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="triangle" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-2" y2="0" x2="13"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="triangle" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="6" x1="5" y2="10" x2="5"/>
+        <arc width="18" x="-13" y="0" antialias="true" height="12" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-90"/>
+    </description>
+</definition>

Added: branches/0.3/elements/energie/solaire/signaletiques/fleche_3voies_02.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/signaletiques/fleche_3voies_02.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/signaletiques/fleche_3voies_02.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,12 @@
+<definition width="30" version="0.3" hotspot_x="15" hotspot_y="20" height="30" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">Fléche 3 Voies 02</name>
+    </names>
+    <informations></informations>
+    <description>
+        <polygon x4="-7" y5="0" x5="-7" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-7" y2="-3" x2="-7" y3="0" x3="-4" y4="3"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="triangle" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-3" y2="0" x2="12"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="triangle" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="5" y2="-7" x2="5"/>
+        <arc width="18" x="-13" y="-12" antialias="true" height="12" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
+    </description>
+</definition>

Added: branches/0.3/elements/energie/solaire/signaletiques/fleche_3voies_03.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/signaletiques/fleche_3voies_03.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/signaletiques/fleche_3voies_03.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,14 @@
+<definition width="30" version="0.3" hotspot_x="15" hotspot_y="10" height="30" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">Fléche 3 Voies 03</name>
+    </names>
+    <informations></informations>
+    <description>
+        <polygon x4="-7" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="0" x1="-7" y2="-3" x2="-4" y3="3" x3="-4" y4="0"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="8" x1="5" y2="7" x2="5"/>
+        <polygon x4="5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="8" x1="5" y2="10" x2="3" y3="10" x3="7" y4="8"/>
+        <polygon x4="11" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="0" x1="11" y2="-2" x2="13" y3="2" x3="13" y4="0"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-4" y2="0" x2="11"/>
+        <arc width="18" x="-13" y="0" antialias="true" height="12" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-90"/>
+    </description>
+</definition>

Added: branches/0.3/elements/energie/solaire/signaletiques/fleche_3voies_04.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/signaletiques/fleche_3voies_04.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/signaletiques/fleche_3voies_04.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,14 @@
+<definition width="30" version="0.3" hotspot_x="15" hotspot_y="20" height="30" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">Fléche 3 Voies 04</name>
+    </names>
+    <informations></informations>
+    <description>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-8" x1="5" y2="-6" x2="5"/>
+        <polygon x4="5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-8" x1="5" y2="-10" x2="3" y3="-10" x3="7" y4="-8"/>
+        <polygon x4="11" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="11" y2="-2" x2="13" y3="2" x3="13" y4="0"/>
+        <polygon x4="-7" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-7" y2="-3" x2="-4" y3="3" x3="-4" y4="0"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-4" y2="0" x2="11"/>
+        <arc width="18" x="-13" y="-12" antialias="true" height="12" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
+    </description>
+</definition>

Added: branches/0.3/elements/energie/solaire/signaletiques/lien_folio_01.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/signaletiques/lien_folio_01.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/signaletiques/lien_folio_01.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,12 @@
+<definition width="40" version="0.3" hotspot_x="20" hotspot_y="30" height="50" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">lien Folio</name>
+    </names>
+    <informations></informations>
+    <description>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="0" y2="-13" x2="0"/>
+        <polygon x4="0" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-13" x1="0" y2="-3" x2="-5" y3="-3" x3="5" y4="-13"/>
+        <input x="-18" y="6.5" size="8" text="texte"/>
+        <terminal x="0" y="-20" orientation="n"/>
+    </description>
+</definition>

Added: branches/0.3/elements/energie/solaire/signaletiques/lien_folio_02.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/signaletiques/lien_folio_02.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/signaletiques/lien_folio_02.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,12 @@
+<definition width="40" version="0.3" hotspot_x="20" hotspot_y="35" height="50" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">lien Folio</name>
+    </names>
+    <informations></informations>
+    <description>
+        <polygon x4="0" y5="2" x5="0" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="2" x1="0" y2="-8" x2="-5" y3="-8" x3="5" y4="2"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="2" x1="0" y2="9" x2="0"/>
+        <input x="-18" y="-19.5" size="8" text="texte"/>
+        <terminal x="0" y="9" orientation="s"/>
+    </description>
+</definition>

Added: branches/0.3/elements/energie/solaire/signaletiques/percement.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/signaletiques/percement.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/signaletiques/percement.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,15 @@
+<definition width="40" version="0.3" hotspot_x="25" hotspot_y="25" height="40" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">passage percement</name>
+    </names>
+    <informations></informations>
+    <description>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-10" y2="-5" x2="-10"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="-10" y2="-10" x2="-10"/>
+        <rect width="12" x="-16" y="-17" antialias="false" height="14" style="line-style:dotted;line-weight:normal;filling:none;color:black"/>
+        <circle x="-14.2426" y="-14.2426" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="8.48528"/>
+        <input x="-3" y="1" size="8" rotate="true" text="A"/>
+        <terminal x="-10" y="0" orientation="s"/>
+        <terminal x="-10" y="-20" orientation="n"/>
+    </description>
+</definition>

Added: branches/0.3/elements/energie/solaire/signaletiques/percement_murale_01.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/signaletiques/percement_murale_01.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/signaletiques/percement_murale_01.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,15 @@
+<definition width="40" version="0.3" hotspot_x="25" hotspot_y="25" height="40" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">Passage murale </name>
+    </names>
+    <informations></informations>
+    <description>
+        <polygon antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="0" x1="-20" y2="0" x2="-16" y3="-5" x3="-13"/>
+        <polygon antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-20" x1="0" y2="-20" x2="-4" y3="-10" x3="-10"/>
+        <rect width="12" x="-16" y="-17" antialias="false" height="14" style="line-style:dotted;line-weight:normal;filling:none;color:black"/>
+        <circle x="-14.2426" y="-14.2426" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="8.48528"/>
+        <input x="-3" y="1" size="8" rotate="true" text="A"/>
+        <terminal x="-10" y="0" orientation="w"/>
+        <terminal x="-10" y="-20" orientation="e"/>
+    </description>
+</definition>

Added: branches/0.3/elements/energie/solaire/signaletiques/percement_plancher_01.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/signaletiques/percement_plancher_01.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/signaletiques/percement_plancher_01.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,15 @@
+<definition width="40" version="0.3" hotspot_x="25" hotspot_y="25" height="40" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">Passage Plancher</name>
+    </names>
+    <informations></informations>
+    <description>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-10" y2="-5" x2="-10"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="-10" y2="-10" x2="-10"/>
+        <rect width="12" x="-16" y="-17" antialias="false" height="14" style="line-style:dotted;line-weight:normal;filling:none;color:black"/>
+        <circle x="-14.2426" y="-14.2426" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="8.48528"/>
+        <input x="-3" y="1" size="8" rotate="true" text="A"/>
+        <terminal x="-10" y="0" orientation="s"/>
+        <terminal x="-10" y="-20" orientation="n"/>
+    </description>
+</definition>

Added: branches/0.3/elements/energie/solaire/signaletiques/sortie_ecs.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/signaletiques/sortie_ecs.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/signaletiques/sortie_ecs.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,12 @@
+<definition width="30" version="0.3" hotspot_x="15" hotspot_y="10" height="20" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">sortie ECS</name>
+    </names>
+    <informations></informations>
+    <description>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="4" y2="0" x2="12"/>
+        <polygon x4="-2" y5="0" x5="-2" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-2" y2="-5" x2="4" y3="5" x3="4" y4="0"/>
+        <text x="-4" y="6" size="5" rotation="-90" text="ECS"/>
+        <terminal x="12" y="0" orientation="e"/>
+    </description>
+</definition>

Added: branches/0.3/elements/energie/solaire/signaletiques/vanne_3v_secteur.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/signaletiques/vanne_3v_secteur.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/signaletiques/vanne_3v_secteur.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,58 @@
+<definition width="80" version="0.3" hotspot_x="25" hotspot_y="35" height="110" type="element" orientation="dnnn">
+    <names>
+        <name lang="fr">circul. vanne 3voies à secteur</name>
+    </names>
+    <informations></informations>
+    <description>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="47" x1="35" y2="53" x2="35"/>
+        <arc width="20" x="-15" y="45" antialias="true" height="20" style="line-style:normal;line-weight:normal;filling:none;color:black" start="36" angle="-252"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="triangle" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="40" x1="42" y2="40" x2="49"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="6" x1="19" y2="6" x2="27"/>
+        <arc width="14" x="35" y="40.5" antialias="true" height="12" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-90"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="triangle" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="14" x1="35" y2="20" x2="35"/>
+        <arc width="20" x="-15" y="10" antialias="true" height="20" style="line-style:normal;line-weight:normal;filling:none;color:black" start="36" angle="-252"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="61" x1="-5" y2="67" x2="-5"/>
+        <arc width="15" x="20" y="6" antialias="true" height="16" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-90"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="triangle" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="54" x1="2" y2="54" x2="9"/>
+        <arc width="14" x="-5" y="54.5" antialias="true" height="12" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-90"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="triangle" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="28" x1="-5" y2="34" x2="-5"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="20" x1="-12" y2="20" x2="-18"/>
+        <arc width="15" x="-20" y="20" antialias="true" height="16" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-90"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="triangle" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-16" x1="-20" y2="-16" x2="11"/>
+        <input x="28" y="28.5" size="5" text="E"/>
+        <input x="28" y="-5.5" size="5" text="D"/>
+        <input x="-12" y="44.5" size="5" text="C"/>
+        <input x="-12" y="9.5" size="5" text="B"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="triangle" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="36" x1="19" y2="36" x2="50"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="triangle" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="3" x1="19" y2="3" x2="50"/>
+        <arc width="20" x="25" y="29" antialias="true" height="20" style="line-style:normal;line-weight:normal;filling:none;color:black" start="36" angle="-252"/>
+        <arc width="20" x="25" y="-5" antialias="true" height="20" style="line-style:normal;line-weight:normal;filling:none;color:black" start="36" angle="-252"/>
+        <arc width="20" x="-14" y="-24" antialias="true" height="20" style="line-style:normal;line-weight:normal;filling:none;color:black" start="36" angle="-252"/>
+        <polygon x4="41" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="39" x1="41" y2="37" x2="43" y3="41" x3="43" y4="39"/>
+        <polygon x4="1" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="55" x1="1" y2="53" x2="3" y3="57" x3="3" y4="55"/>
+        <polygon x4="1" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="20" x1="1" y2="18" x2="3" y3="22" x3="3" y4="20"/>
+        <polygon x4="41" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="5" x1="41" y2="3" x2="43" y3="7" x3="43" y4="5"/>
+        <polygon x4="2" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-14" x1="2" y2="-16" x2="4" y3="-12" x3="4" y4="-14"/>
+        <polygon x4="35" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="45" x1="35" y2="47" x2="33" y3="47" x3="37" y4="45"/>
+        <polygon x4="-5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="61" x1="-5" y2="63" x2="-7" y3="63" x3="-3" y4="61"/>
+        <polygon x4="-5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="26" x1="-5" y2="28" x2="-7" y3="28" x3="-3" y4="26"/>
+        <polygon x4="35" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="11" x1="35" y2="13" x2="33" y3="13" x3="37" y4="11"/>
+        <polygon x4="-4" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-8" x1="-4" y2="-6" x2="-6" y3="-6" x3="-2" y4="-8"/>
+        <polygon x4="29" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="39" x1="29" y2="37" x2="27" y3="41" x3="27" y4="39"/>
+        <polygon x4="-11" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="55" x1="-11" y2="53" x2="-13" y3="57" x3="-13" y4="55"/>
+        <polygon x4="-11" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="20" x1="-11" y2="18" x2="-13" y3="22" x3="-13" y4="20"/>
+        <polygon x4="29" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="5" x1="29" y2="3" x2="27" y3="7" x3="27" y4="5"/>
+        <polygon x4="-10" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-14" x1="-10" y2="-16" x2="-12" y3="-12" x3="-12" y4="-14"/>
+        <arc width="9" x="30.5" y="34.5" antialias="true" height="9" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-110" angle="-80"/>
+        <arc width="9" x="-9.5" y="50.5" antialias="true" height="9" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-140" angle="-100"/>
+        <arc width="9" x="-9.5" y="15.5" antialias="true" height="9" style="line-style:normal;line-weight:normal;filling:none;color:black" start="45" angle="-100"/>
+        <arc width="9" x="30.5" y="0.5" antialias="true" height="9" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-80"/>
+        <arc width="9" x="-8.5" y="-18.5" antialias="true" height="9" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-40" angle="-100"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="33" x1="27" y2="33" x2="43"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="49" x1="-13" y2="49" x2="3"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="14" x1="-13" y2="14" x2="3"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-1" x1="27" y2="-1" x2="43"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="-12" y2="-20" x2="4"/>
+        <input x="-11" y="-24.5" size="5" text="A"/>
+    </description>
+</definition>

Added: branches/0.3/elements/energie/solaire/testsymboles/ballon_central.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/testsymboles/ballon_central.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/testsymboles/ballon_central.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,18 @@
+<definition width="100" version="0.3" hotspot_x="50" hotspot_y="70" height="140" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">ballon symbol</name>
+    </names>
+    <informations></informations>
+    <description>
+        <ellipse width="70" x="-35" y="-60" antialias="true" height="120" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <input x="-14" y="-15.5" size="30" text="?"/>
+        <terminal x="-30" y="0" orientation="w"/>
+        <terminal x="30" y="0" orientation="e"/>
+        <terminal x="0" y="-60" orientation="n"/>
+        <terminal x="0" y="60" orientation="s"/>
+        <terminal x="-20" y="-40" orientation="w"/>
+        <terminal x="-20" y="40" orientation="w"/>
+        <terminal x="20" y="-40" orientation="e"/>
+        <terminal x="20" y="40" orientation="e"/>
+    </description>
+</definition>

Added: branches/0.3/elements/energie/solaire/testsymboles/clap_b.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/testsymboles/clap_b.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/testsymboles/clap_b.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,42 @@
+<definition width="160" version="0.3" hotspot_x="75" hotspot_y="50" height="100" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">Nom du nouvel élément</name>
+    </names>
+    <informations></informations>
+    <description>
+        <polygon antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="36" x1="51" y2="30" x2="56" y3="23" x3="51"/>
+        <input x="-62" y="-30.2" size="7" rotate="true" text="_"/>
+        <input x="25" y="14" size="7" rotate="true" text="_"/>
+        <input x="27" y="-30.2" size="7" rotate="true" text="_"/>
+        <input x="-66" y="14.3" size="7" rotate="true" text="_"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="simple" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="40" x1="-50" y2="40" x2="-30"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-14" x1="-37" y2="-26" x2="-37"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="simple" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="39.7" x1="41" y2="39.7" x2="61"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-14" x1="52" y2="-26" x2="52"/>
+        <circle x="-44" y="26" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="8"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-26" x1="-36" y2="-14" x2="-36"/>
+        <circle x="47" y="25.7" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="8"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-26" x1="53" y2="-14" x2="53"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="simple" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-10" x1="-50" y2="-10" x2="-30"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="simple" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-10" x1="39" y2="-10" x2="59"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30" x1="-30" y2="30" x2="-35"/>
+        <polygon x4="-44" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-25" x1="-44" y2="-20" x2="-36" y3="-15" x3="-44" y4="-25"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="29.7" x1="61" y2="29.7" x2="56"/>
+        <polygon x4="45" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-25" x1="45" y2="-20" x2="53" y3="-15" x3="45" y4="-25"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30" x1="-50" y2="30" x2="-44"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="29.7" x1="41" y2="29.7" x2="47"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="52" y2="-20" x2="59"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="-37" y2="-20" x2="-30"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="39" y2="-20" x2="45"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="25" x1="-36" y2="35" x2="-36"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="-50" y2="-20" x2="-44"/>
+        <terminal x="-50" y="-20" orientation="w"/>
+        <terminal x="-30" y="-20" orientation="e"/>
+        <terminal x="-50" y="30" orientation="w"/>
+        <terminal x="-30" y="30" orientation="e"/>
+        <terminal x="39" y="-20" orientation="w"/>
+        <terminal x="59" y="-20" orientation="e"/>
+        <terminal x="41" y="29.7" orientation="w"/>
+        <terminal x="61" y="29.7" orientation="e"/>
+    </description>
+</definition>

Added: branches/0.3/elements/energie/solaire/testsymboles/clapbat.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/testsymboles/clapbat.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/testsymboles/clapbat.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,15 @@
+<definition width="60" version="0.3" hotspot_x="30" hotspot_y="30" height="60" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">Nom du nouvel élément</name>
+    </names>
+    <informations></informations>
+    <description>
+        <polygon style="line-style:dotted;line-weight:thin;filling:none;color:black" x1="7" x2="25" x3="23" x4="21" antialias="false" x5="19" x6="7" x7="8" x8="5" x9="7" closed="false" y1="-18" y2="11" y3="12" y4="9" y5="10" y6="-10" y7="-11" y8="-16" y9="-18"/>
+        <circle x="2.58579" y="-18.4142" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="2.82843"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="triangle" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-20" y2="0" x2="-6"/>
+        <rect width="2" x="-2" y="-21" antialias="false" height="9" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <polygon x4="1" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="0" x1="1" y2="-2" x2="3" y3="2" x3="3" y4="0"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" x2="0" x3="2" x4="2" antialias="false" x5="5" x6="5" x7="2" x8="2" x9="1" closed="false" y1="-10" y2="10" y3="10" y4="15" y5="15" y6="-15" y7="-15" y8="-10" y9="-10"/>
+        <rect width="2" x="-2" y="12" antialias="false" height="9" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+    </description>
+</definition>

Added: branches/0.3/elements/energie/solaire/testsymboles/clapboulle.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/testsymboles/clapboulle.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/testsymboles/clapboulle.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,13 @@
+<definition width="60" version="0.3" hotspot_x="30" hotspot_y="30" height="60" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">Nom du nouvel élément</name>
+    </names>
+    <informations></informations>
+    <description>
+        <line length1="1.5" length2="1.5" antialias="false" end1="triangle" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="12" y2="0" x2="25"/>
+        <polygon x4="-17" y5="-10" x5="-20" y6="10" x6="-20" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="-10" y2="10" x2="-10" y3="-10" x3="-14" y4="10"/>
+        <polygon antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="15" x1="-15" y2="15" x2="10" y3="6" x3="10"/>
+        <polygon antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-14" x1="-15" y2="-14" x2="10" y3="-6" x3="10"/>
+        <circle x="-9.43398" y="-9.43398" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="18.868"/>
+    </description>
+</definition>

Added: branches/0.3/elements/energie/solaire/testsymboles/clapdiode.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/testsymboles/clapdiode.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/testsymboles/clapdiode.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,21 @@
+<definition width="80" version="0.3" hotspot_x="40" hotspot_y="40" height="80" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">Nom du nouvel élément</name>
+    </names>
+    <informations></informations>
+    <description>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="26" x1="2" y2="26" x2="8"/>
+        <polygon x4="-9" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-20" x1="-9" y2="-26" x2="0" y3="-15" x3="0" y4="-20"/>
+        <input x="-25" y="2" size="7" rotate="true" text="Electron"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="simple" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-9" x1="9" y2="-9" x2="-14"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="simple" end2="none" style="line-style:dotted;line-weight:normal;filling:none;color:black" y1="-36" x1="-15" y2="-36" x2="11"/>
+        <input x="-18" y="-29" size="6" rotate="true" text="courant"/>
+        <polygon x4="10" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-20" x1="0" y2="-20" x2="30" y3="26" x3="30" y4="26"/>
+        <polygon x4="-21" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-20" x1="-10" y2="-20" x2="-30" y3="25" x3="-30" y4="25"/>
+        <circle x="-1.11022e-16" y="21" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
+        <circle x="-20.831" y="20.169" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="11.6619"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="26" x1="-18" y2="26" x2="-12"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="23" x1="5" y2="29" x2="5"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-25" x1="-9" y2="-14" x2="-9"/>
+    </description>
+</definition>

Added: branches/0.3/elements/energie/solaire/testsymboles/clapet_a.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/testsymboles/clapet_a.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/testsymboles/clapet_a.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,43 @@
+<definition width="160" version="0.3" hotspot_x="75" hotspot_y="45" height="100" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">Nom du nouvel élément</name>
+    </names>
+    <informations></informations>
+    <description>
+        <polygon antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="36" x1="50" y2="30" x2="55" y3="23" x3="50"/>
+        <input x="-62" y="-30.2" size="7" rotate="true" text="_"/>
+        <input x="24" y="14" size="7" rotate="true" text="_"/>
+        <input x="28" y="-30.2" size="7" rotate="true" text="_"/>
+        <input x="-66" y="14.3" size="7" rotate="true" text="_"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="simple" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="40" x1="-50" y2="40" x2="-30"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-14" x1="-37" y2="-26" x2="-37"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="simple" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="39.7" x1="40" y2="39.7" x2="60"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-14" x1="53" y2="-26" x2="53"/>
+        <circle x="-44" y="26" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="8"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-26" x1="-36" y2="-14" x2="-36"/>
+        <circle x="46" y="25.7" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="8"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-26" x1="54" y2="-14" x2="54"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="25" x1="-35" y2="35" x2="-35"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="simple" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-10" x1="-50" y2="-10" x2="-30"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="simple" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-10" x1="40" y2="-10" x2="60"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30" x1="-30" y2="30" x2="-35"/>
+        <polygon x4="-44" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-25" x1="-44" y2="-20" x2="-36" y3="-15" x3="-44" y4="-25"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="29.7" x1="60" y2="29.7" x2="55"/>
+        <polygon x4="46" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-25" x1="46" y2="-20" x2="54" y3="-15" x3="46" y4="-25"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30" x1="-50" y2="30" x2="-44"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="29.7" x1="40" y2="29.7" x2="46"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="53" y2="-20" x2="60"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="-37" y2="-20" x2="-30"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="40" y2="-20" x2="46"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="25" x1="-36" y2="35" x2="-36"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="-50" y2="-20" x2="-44"/>
+        <terminal x="-50" y="-20" orientation="w"/>
+        <terminal x="-30" y="-20" orientation="e"/>
+        <terminal x="-50" y="30" orientation="w"/>
+        <terminal x="-30" y="30" orientation="e"/>
+        <terminal x="40" y="-20" orientation="w"/>
+        <terminal x="60" y="-20" orientation="e"/>
+        <terminal x="40" y="29.7" orientation="w"/>
+        <terminal x="60" y="29.7" orientation="e"/>
+    </description>
+</definition>

Added: branches/0.3/elements/energie/solaire/testsymboles/claptriang.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/testsymboles/claptriang.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/testsymboles/claptriang.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,14 @@
+<definition width="60" version="0.3" hotspot_x="30" hotspot_y="30" height="60" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">Nom du nouvel élément</name>
+    </names>
+    <informations></informations>
+    <description>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="triangle" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-25" y2="0" x2="-14"/>
+        <polygon x4="16" y5="-10" x5="20" y6="10" x6="20" y7="10" x7="20" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="2" y2="10" x2="6" y3="-10" x3="10" y4="10"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="0" y2="0" x2="24"/>
+        <rect width="3" x="-7" y="-26" antialias="false" height="12" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <polygon x4="-10" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="0" x1="-10" y2="-20" x2="0" y3="20" x3="0" y4="1"/>
+        <rect width="3" x="-8" y="13" antialias="false" height="12" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+    </description>
+</definition>

Added: branches/0.3/elements/energie/solaire/testsymboles/lement_inconnue.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/testsymboles/lement_inconnue.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/testsymboles/lement_inconnue.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,14 @@
+<definition width="30" version="0.3" hotspot_x="15" hotspot_y="15" height="30" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">Element Inconnue</name>
+    </names>
+    <informations/>
+    <description>
+        <text x="-3" y="4" size="9" text="?"/>
+        <circle x="-9.84886" y="-9.84886" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="19.6977"/>
+        <terminal x="-10" y="0" orientation="w"/>
+        <terminal x="0" y="-10" orientation="n"/>
+        <terminal x="10" y="0" orientation="e"/>
+        <terminal x="0" y="10" orientation="s"/>
+    </description>
+</definition>

Added: branches/0.3/elements/energie/solaire/testsymboles/oeuf.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/testsymboles/oeuf.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/testsymboles/oeuf.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,24 @@
+<definition width="180" version="0.3" hotspot_x="90" hotspot_y="85" height="300" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">Oeuf dur</name>
+    </names>
+    <informations></informations>
+    <description>
+        <circle x="-46.5725" y="-57.5725" antialias="true" style="line-style:dotted;line-weight:thin;filling:none;color:black" diameter="93.145"/>
+        <arc width="116" x="-58" y="-67" antialias="true" height="116" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-190" angle="-160"/>
+        <circle x="-2.5" y="-69.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <circle x="-2.5" y="38.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <circle x="-2.5" y="118.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <circle x="-2.5" y="-22.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <arc width="162" x="-80.5" y="39" antialias="true" height="162" style="line-style:normal;line-weight:normal;filling:none;color:black" start="10" angle="-200"/>
+        <circle x="-2.5" y="198.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <circle x="-61.5873" y="54.4127" antialias="true" style="line-style:dotted;line-weight:thin;filling:none;color:black" diameter="123.175"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-19" x1="57" y2="106" x2="80"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-19" x1="-57" y2="106" x2="-79"/>
+        <terminal x="0" y="-66" orientation="n"/>
+        <terminal x="0" y="-20" orientation="n"/>
+        <terminal x="0" y="41" orientation="n"/>
+        <terminal x="0" y="122" orientation="n"/>
+        <terminal x="0" y="201" orientation="s"/>
+    </description>
+</definition>

Added: branches/0.3/elements/energie/solaire/testsymboles/qet_directory
===================================================================
--- branches/0.3/elements/energie/solaire/testsymboles/qet_directory	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/testsymboles/qet_directory	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,5 @@
+<qet-directory>
+    <names>
+        <name lang="fr">recherche d'élements symboliques</name>
+    </names>
+</qet-directory>

Added: branches/0.3/elements/energie/solaire/testsymboles/rechauff_ecs.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/testsymboles/rechauff_ecs.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/testsymboles/rechauff_ecs.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,21 @@
+<definition width="80" version="0.3" hotspot_x="40" hotspot_y="60" height="120" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">Réchaufeur ECS tubulaire</name>
+    </names>
+    <informations/>
+    <description>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="triangle" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30" x1="17" y2="30" x2="29"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="triangle" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-27" x1="-31" y2="-27" x2="-19"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="triangle" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-41" x1="0" y2="-56" x2="0"/>
+        <text x="-5" y="30" size="6" rotation="-90" text="Echangeur ECS"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="simple" style="line-style:dotted;line-weight:normal;filling:none;color:black" y1="35" x1="0" y2="-37" x2="0"/>
+        <circle x="-25.5" y="-28.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="3"/>
+        <rect width="2" x="-1" y="40" antialias="false" height="7" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect width="2" x="-1" y="-47" antialias="false" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <ellipse width="60" x="-30" y="-45" antialias="true" height="90" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <circle x="20.5" y="28.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="3"/>
+        <terminal x="0" y="46" orientation="s"/>
+        <terminal x="0" y="-55" orientation="n"/>
+        <terminal x="30" y="0" orientation="e"/>
+    </description>
+</definition>

Added: branches/0.3/elements/energie/solaire/testsymboles/test_text.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/testsymboles/test_text.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/testsymboles/test_text.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,17 @@
+<definition width="160" version="0.3" hotspot_x="15" hotspot_y="35" height="110" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">essai de texte</name>
+    </names>
+    <informations/>
+    <description>
+        <input x="125" y="67.5" size="1" rotate="true" text="texte 1"/>
+        <input x="95" y="64.5" size="2" rotate="true" text="texte 2"/>
+        <input x="64" y="62.5" size="3" rotate="true" text="texte 3"/>
+        <input x="24" y="59.5" size="4" rotate="true" text="texte 4"/>
+        <input x="2" y="39.5" size="5" rotate="true" text="texte 5"/>
+        <input x="57" y="27.5" size="6" rotate="true" text="texte 6"/>
+        <input x="101" y="14.5" size="7" rotate="true" text="texte 7"/>
+        <input x="53" y="-4.5" size="8" rotate="true" text="texte 8"/>
+        <input x="-5" y="-15.5" size="9" rotate="true" text="texte 9"/>
+    </description>
+</definition>

Added: branches/0.3/elements/energie/solaire/vanne/clapet_01.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/vanne/clapet_01.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/vanne/clapet_01.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,16 @@
+<definition width="40" version="0.3" hotspot_x="25" hotspot_y="25" height="40" type="element" orientation="dnnn">
+    <names>
+        <name lang="fr">Clapet anti-retour à Gravité </name>
+    </names>
+    <informations></informations>
+    <description>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="simple" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="7" x1="10" y2="-5" x2="10"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="4" x1="0" y2="10" x2="0"/>
+        <polygon x4="0" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="4" x1="0" y2="-4" x2="-5" y3="-4" x3="5" y4="4"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="4" x1="-6" y2="4" x2="6"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="0" y2="-4" x2="0"/>
+        <input x="-13" y="14" size="7" rotation="-90" rotate="true" text="clapet"/>
+        <terminal x="0" y="10" orientation="s"/>
+        <terminal x="0" y="-10" orientation="n"/>
+    </description>
+</definition>

Added: branches/0.3/elements/energie/solaire/vanne/clapet_02.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/vanne/clapet_02.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/vanne/clapet_02.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,17 @@
+<definition width="40" version="0.3" hotspot_x="20" hotspot_y="25" height="40" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">Clapet anti-retour à Ressort </name>
+    </names>
+    <informations></informations>
+    <description>
+        <polygon x4="-7" y5="3" x5="-8" y6="-3" x6="-9" antialias="false" style="line-style:normal;line-weight:thin;filling:none;color:black" closed="false" y1="3" x1="-5" y2="-3" x2="-5" y3="3" x3="-6" y4="-3"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-6" x1="4" y2="6" x2="4"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="simple" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="10" x1="-10" y2="10" x2="10"/>
+        <polygon x4="-4" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-5" x1="-4" y2="0" x2="4" y3="5" x3="-4" y4="-5"/>
+        <input x="-19" y="-13" size="7" text="clapet"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="3" y2="0" x2="10"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-10" y2="0" x2="-4"/>
+        <terminal x="-10" y="0" orientation="w"/>
+        <terminal x="10" y="0" orientation="e"/>
+    </description>
+</definition>

Added: branches/0.3/elements/energie/solaire/vanne/clapet_03.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/vanne/clapet_03.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/vanne/clapet_03.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,16 @@
+<definition width="40" version="0.3" hotspot_x="20" hotspot_y="25" height="40" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">Clapet anti-retour à Bille</name>
+    </names>
+    <informations></informations>
+    <description>
+        <line length1="1.5" length2="1.5" antialias="false" end1="simple" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="10" x1="-10" y2="10" x2="10"/>
+        <circle x="-4" y="-4" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="8"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5" x1="4" y2="5" x2="4"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="10" y2="0" x2="5"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-10" y2="0" x2="-4"/>
+        <input x="-19" y="-13" size="7" text="clapet"/>
+        <terminal x="-10" y="0" orientation="w"/>
+        <terminal x="10" y="0" orientation="e"/>
+    </description>
+</definition>

Added: branches/0.3/elements/energie/solaire/vanne/filtre_01.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/vanne/filtre_01.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/vanne/filtre_01.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,16 @@
+<definition width="30" version="0.3" hotspot_x="15" hotspot_y="25" height="40" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">Filtre à Tamis</name>
+    </names>
+    <informations></informations>
+    <description>
+        <input x="-14" y="-14" size="6" rotate="true" text="filtre"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-12" x1="0" y2="-5" x2="8"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5" x1="10" y2="5" x2="10"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5" x1="-10" y2="5" x2="-10"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-10" x2="-7" x3="1" x4="7" antialias="true" x5="4" x6="10" x7="10" x8="-10" x9="-10" y1="-3" y2="-3" y3="-11" y4="-6" y5="-3" y6="-3" y7="3" y8="3" y9="-3"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="simple" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-3" y2="0" x2="2"/>
+        <terminal x="-10" y="0" orientation="w"/>
+        <terminal x="10" y="0" orientation="e"/>
+    </description>
+</definition>

Added: branches/0.3/elements/energie/solaire/vanne/soupape_capteur_01.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/vanne/soupape_capteur_01.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/vanne/soupape_capteur_01.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,15 @@
+<definition width="10" version="0.3" hotspot_x="5" hotspot_y="20" height="30" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">Capteur Soupape Thermique</name>
+    </names>
+    <informations></informations>
+    <description>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="0" y2="-8" x2="0"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" x2="0" x3="-1" x4="1" antialias="false" x5="-1" x6="0" x7="0" x8="0" closed="false" y1="-1" y2="-2" y3="-3" y4="-4" y5="-5" y6="-6" y7="-7" y8="-7"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0.5" x1="-1.5" y2="6" x2="-1.5"/>
+        <arc width="3" x="-1.5" y="6" antialias="true" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0.5" x1="1.5" y2="6" x2="1.5"/>
+        <arc width="3" x="-1.5" y="-1" antialias="true" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
+        <terminal x="0" y="-10" orientation="n"/>
+    </description>
+</definition>

Added: branches/0.3/elements/energie/solaire/vanne/soupape_thermique_01.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/vanne/soupape_thermique_01.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/vanne/soupape_thermique_01.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,22 @@
+<definition width="50" version="0.3" hotspot_x="25" hotspot_y="35" height="50" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">Soupape de sûreté thermique, avec capteur</name>
+    </names>
+    <informations></informations>
+    <description>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="20" y2="-10" x2="11"/>
+        <polygon x4="7" y5="-14" x5="8" y6="-10" x6="9" y7="-10" x7="10" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-12" x1="4" y2="-12" x2="5" y3="-14" x3="6" y4="-10"/>
+        <input x="-24" y="-21" size="7" text="soupape"/>
+        <rect width="2" x="2" y="-14" antialias="false" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <polygon x4="2" y5="-4" x5="2" y6="-4" x6="2" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-5" x1="-2" y2="-14" x2="-2" y3="-14" x3="2" y4="-5"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-1" x1="0" y2="2" x2="0"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-2" x1="-1" y2="-2" x2="1"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-3" x1="-2" y2="-3" x2="2"/>
+        <polygon x4="4" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-2" x1="-4" y2="-4" x2="-4" y3="-4" x3="4" y4="-2"/>
+        <rect width="4" x="-2" y="1" antialias="false" height="1" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <polygon x4="10" y5="-5" x5="-10" y6="-5" x6="-10" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5" x1="-10" y2="5" x2="-10" y3="-5" x3="10" y4="5"/>
+        <terminal x="-10" y="0" orientation="w"/>
+        <terminal x="10" y="0" orientation="e"/>
+        <terminal x="20" y="-10" orientation="e"/>
+    </description>
+</definition>

Added: branches/0.3/elements/energie/solaire/vanne/te_reglage_couder_01d.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/vanne/te_reglage_couder_01d.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/vanne/te_reglage_couder_01d.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,17 @@
+<definition width="40" version="0.3" hotspot_x="25" hotspot_y="25" height="40" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">Té de Réglage Couder "droite"</name>
+    </names>
+    <informations></informations>
+    <description>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="0" y2="-10" x2="-2"/>
+        <polygon x4="-8" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-9" x1="-8" y2="-5" x2="-2" y3="-15" x3="-2" y4="-11"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-10" y2="-2" x2="-10"/>
+        <polygon x4="-9" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-8" x1="-11" y2="-2" x2="-15" y3="-2" x3="-5" y4="-8"/>
+        <circle x="-12.2361" y="-12.2361" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <circle x="-11" y="-11" antialias="true" style="line-style:dotted;line-weight:normal;filling:none;color:black" diameter="2"/>
+        <input x="-7" y="4" size="6" text="Té "/>
+        <terminal x="0" y="-10" orientation="e"/>
+        <terminal x="-10" y="0" orientation="s"/>
+    </description>
+</definition>

Added: branches/0.3/elements/energie/solaire/vanne/te_reglage_couder_01g.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/vanne/te_reglage_couder_01g.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/vanne/te_reglage_couder_01g.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,17 @@
+<definition width="40" version="0.3" hotspot_x="25" hotspot_y="25" height="40" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">Té de Réglage Couder "gauche"</name>
+    </names>
+    <informations></informations>
+    <description>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-10" y2="-2" x2="-10"/>
+        <polygon x4="-9" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-8" x1="-11" y2="-2" x2="-15" y3="-2" x3="-5" y4="-8"/>
+        <circle x="-12.2361" y="-12.2361" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <circle x="-11" y="-11" antialias="true" style="line-style:dotted;line-weight:normal;filling:none;color:black" diameter="2"/>
+        <polygon x4="-12" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-11" x1="-12" y2="-15" x2="-18" y3="-5" x3="-18" y4="-9"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="-20" y2="-10" x2="-19"/>
+        <input x="-7" y="4" size="6" text="Té "/>
+        <terminal x="-20" y="-10" orientation="w"/>
+        <terminal x="-10" y="0" orientation="s"/>
+    </description>
+</definition>

Added: branches/0.3/elements/energie/solaire/vanne/te_reglage_droit_01.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/vanne/te_reglage_droit_01.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/vanne/te_reglage_droit_01.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,17 @@
+<definition width="40" version="0.3" hotspot_x="25" hotspot_y="25" height="40" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">Té de régalge "droit"</name>
+    </names>
+    <informations></informations>
+    <description>
+        <circle x="-12.2361" y="-12.2361" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <circle x="-11" y="-11" antialias="true" style="line-style:dotted;line-weight:normal;filling:none;color:black" diameter="2"/>
+        <polygon x4="-12" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-11" x1="-12" y2="-15" x2="-18" y3="-5" x3="-18" y4="-9"/>
+        <polygon x4="-8" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-11" x1="-8" y2="-15" x2="-2" y3="-5" x3="-2" y4="-9"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="-20" y2="-10" x2="-19"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="0" y2="-10" x2="-2"/>
+        <input x="-15" y="5" size="6" text="Té "/>
+        <terminal x="-20" y="-10" orientation="w"/>
+        <terminal x="0" y="-10" orientation="e"/>
+    </description>
+</definition>

Added: branches/0.3/elements/energie/solaire/vanne/vanne2voies_01.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/vanne/vanne2voies_01.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/vanne/vanne2voies_01.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,19 @@
+<definition width="40" version="0.3" hotspot_x="20" hotspot_y="40" height="60" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">Vanne 2voies motorisées </name>
+    </names>
+    <informations></informations>
+    <description>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-9" x1="1" y2="-1" x2="1"/>
+        <polygon x4="5" y5="-10" x5="10" y6="-17" x6="10" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-17" x1="-10" y2="-10" x2="-10" y3="-9" x3="-5" y4="-9"/>
+        <polygon x4="0" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="0" y2="-6" x2="10" y3="6" x3="10" y4="0"/>
+        <polygon x4="0" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="0" y2="6" x2="-10" y3="-6" x3="-10" y4="0"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-9" x1="-1" y2="-1" x2="-1"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-23" x1="9" y2="-23" x2="11"/>
+        <arc width="20" x="-10" y="-20" antialias="true" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
+        <input x="-10" y="-28" size="7" text="V0"/>
+        <terminal x="-10" y="0" orientation="w"/>
+        <terminal x="10" y="0" orientation="e"/>
+        <terminal x="0" y="-20" orientation="n"/>
+    </description>
+</definition>

Added: branches/0.3/elements/energie/solaire/vanne/vanne3voies_01.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/vanne/vanne3voies_01.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/vanne/vanne3voies_01.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,20 @@
+<definition width="40" version="0.3" hotspot_x="20" hotspot_y="40" height="60" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">Vanne 3 Voies motorisée</name>
+    </names>
+    <informations></informations>
+    <description>
+        <polygon x4="5" y5="-10" x5="10" y6="-17" x6="10" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-17" x1="-10" y2="-10" x2="-10" y3="-9" x3="-5" y4="-9"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-9" x1="1" y2="-1" x2="1"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-9" x1="-1" y2="-1" x2="-1"/>
+        <polygon x4="0" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="0" y2="10" x2="-6" y3="10" x3="6" y4="0"/>
+        <polygon x4="0" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="0" y2="-6" x2="10" y3="6" x3="10" y4="0"/>
+        <polygon x4="0" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="0" y2="-6" x2="-10" y3="6" x3="-10" y4="0"/>
+        <arc width="20" x="-10" y="-20" antialias="true" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
+        <input x="-9" y="-28" size="6" text="V0"/>
+        <terminal x="-10" y="0" orientation="w"/>
+        <terminal x="10" y="0" orientation="e"/>
+        <terminal x="0" y="10" orientation="s"/>
+        <terminal x="0" y="-20" orientation="n"/>
+    </description>
+</definition>

Added: branches/0.3/elements/energie/solaire/vanne/vanne_01.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/vanne/vanne_01.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/vanne/vanne_01.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,14 @@
+<definition width="30" version="0.3" hotspot_x="15" hotspot_y="25" height="40" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">Vanne d'arret</name>
+    </names>
+    <informations></informations>
+    <description>
+        <input x="-10" y="-12" size="7" text="Rx"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-7" x1="-3" y2="-7" x2="3"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="0" y2="-7" x2="0"/>
+        <polygon x4="10" y5="-5" x5="-10" y6="-5" x6="-10" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5" x1="-10" y2="5" x2="-10" y3="-5" x3="10" y4="5"/>
+        <terminal x="-10" y="0" orientation="w"/>
+        <terminal x="10" y="0" orientation="e"/>
+    </description>
+</definition>

Added: branches/0.3/elements/energie/solaire/vanne/vanne_3v_a_secteur_01.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/vanne/vanne_3v_a_secteur_01.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/vanne/vanne_3v_a_secteur_01.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,23 @@
+<definition width="40" version="0.3" hotspot_x="20" hotspot_y="40" height="60" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">Vanne 3 voies a secteur</name>
+    </names>
+    <informations></informations>
+    <description>
+        <arc width="20" x="-10" y="-10" antialias="true" height="20" style="line-style:normal;line-weight:normal;filling:none;color:black" start="36" angle="-252"/>
+        <polygon x4="6" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="0" x1="6" y2="-2" x2="8" y3="2" x3="8" y4="0"/>
+        <polygon x4="0" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="6" x1="0" y2="8" x2="-2" y3="8" x3="2" y4="6"/>
+        <polygon x4="-6" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="0" x1="-6" y2="-2" x2="-8" y3="2" x3="-8" y4="0"/>
+        <arc width="9" x="-4.5" y="-4.5" antialias="true" height="9" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-40" angle="-100"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-9" x1="1" y2="-7" x2="1"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-9" x1="-1" y2="-7" x2="-1"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-6" x1="-8" y2="-6" x2="8"/>
+        <polygon x4="5" y5="-10" x5="10" y6="-17" x6="10" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-17" x1="-10" y2="-10" x2="-10" y3="-9" x3="-5" y4="-9"/>
+        <arc width="20" x="-10" y="-20" antialias="true" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
+        <input x="-9" y="-27" size="6" text="V0"/>
+        <terminal x="-10" y="0" orientation="w"/>
+        <terminal x="10" y="0" orientation="e"/>
+        <terminal x="0" y="10" orientation="s"/>
+        <terminal x="0" y="-20" orientation="n"/>
+    </description>
+</definition>

Added: branches/0.3/elements/energie/solaire/vanne/vanne_equilibrage_debimetre_01.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/vanne/vanne_equilibrage_debimetre_01.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/vanne/vanne_equilibrage_debimetre_01.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,35 @@
+<definition width="30" version="0.3" hotspot_x="15" hotspot_y="15" height="50" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">Vanne d'équilibrage avec débimètre</name>
+    </names>
+    <informations></informations>
+    <description>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="31" x1="4" y2="32" x2="4"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30" x1="-4" y2="32" x2="-4"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-13" x1="4" y2="-11" x2="4"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-13" x1="-4" y2="-11" x2="-4"/>
+        <rect width="16" x="-8" y="-10" antialias="false" height="40" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect width="9" x="-5" y="9" antialias="false" height="18" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
+        <polygon x4="-1" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="17" x1="-1" y2="17" x2="1" y3="19" x3="0" y4="17"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="22" x1="-3" y2="22" x2="-2"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="19" x1="-3" y2="19" x2="-2"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="16" x1="-3" y2="16" x2="-2"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="13" x1="-3" y2="13" x2="-2"/>
+        <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="11" x1="-3" y2="25" x2="-3"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="6" x1="4" y2="6" x2="6"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="6" x1="-6" y2="6" x2="-4"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="-5" y2="7" x2="-5"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-4" x1="4" y2="-3" x2="3"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-4" x1="-4" y2="-3" x2="-3"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="6" y2="0" x2="5"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-6" x1="0" y2="-5" x2="0"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-6" y2="0" x2="-5"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-1" x1="-1" y2="1" x2="1"/>
+        <rect width="18" x="-9" y="30" antialias="false" height="3" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <circle x="-1.5" y="-1.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="3"/>
+        <circle x="-6.00001" y="-6.00001" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="12"/>
+        <rect width="18" x="-9" y="-13" antialias="false" height="3" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <terminal x="0" y="-13" orientation="n"/>
+        <terminal x="0" y="33" orientation="s"/>
+    </description>
+</definition>

Added: branches/0.3/elements/energie/solaire/vanne/vanne_equilibrage_ta_01.elmt
===================================================================
--- branches/0.3/elements/energie/solaire/vanne/vanne_equilibrage_ta_01.elmt	                        (rev 0)
+++ branches/0.3/elements/energie/solaire/vanne/vanne_equilibrage_ta_01.elmt	2012-04-17 14:34:41 UTC (rev 1664)
@@ -0,0 +1,19 @@
+<definition width="30" version="0.3" hotspot_x="15" hotspot_y="15" height="30" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">vanne d'équilibrage T.A.</name>
+    </names>
+    <informations></informations>
+    <description>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="0" y2="-10" x2="5"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="3" y2="-9" x2="7"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dotted;line-weight:thin;filling:none;color:black" y1="-10" x1="6" y2="-4" x2="3"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-6" x1="3" y2="-7" x2="1"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-3" x1="1" y2="-4" x2="-1"/>
+        <input x="-10" y="6.5" size="4" text="1 - 8"/>
+        <circle x="0.5" y="-7.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="1"/>
+        <circle x="-1.5" y="-4.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="1"/>
+        <polygon x4="10" y5="-5" x5="-10" y6="-5" x6="-10" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5" x1="-10" y2="5" x2="-10" y3="-5" x3="10" y4="5"/>
+        <terminal x="-10" y="0" orientation="w"/>
+        <terminal x="10" y="0" orientation="e"/>
+    </description>
+</definition>


Mail converted by MHonArc 2.6.19+ http://listengine.tuxfamily.org/