From c86b064847e3beb5e855b4e4e94043786adb0b90 Mon Sep 17 00:00:00 2001
From: scorpio810
 <scorpio810@r995  scorpio810  2010-05-20 11:17:04 +0200 (jeu. 20 mai 2010)>
Date: Sun, 8 Jan 2012 14:03:53 +0000
Subject: [PATCH] Add new symbols

git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/branches/0.3@1432 bfdf4180-ca20-0410-9c96-a3a8aa849046
---
 elements/energie/qet_directory                |  6 +++
 .../ballon_echangeur/ballon_demi_strat.elmt   | 37 ++++++++++++++++
 .../ballon_echangeur/ballon_stock1000l.elmt   | 28 ++++++++++++
 .../ballon_echangeur/echangeur_plaque.elmt    | 22 ++++++++++
 .../solaire/ballon_echangeur/mur_radian.elmt  | 25 +++++++++++
 .../solaire/ballon_echangeur/qet_directory    |  5 +++
 .../solaire/ballon_echangeur/sksw-0.elmt      | 36 +++++++++++++++
 .../base_distrib/ballon_chicane-plus.elmt     | 27 ++++++++++++
 .../solaire/base_distrib/bouteille_vanne.elmt | 32 ++++++++++++++
 .../energie/solaire/base_distrib/chicane.elmt | 24 ++++++++++
 .../energie/solaire/base_distrib/direct.elmt  | 23 ++++++++++
 .../base_distrib/direct_chauffage.elmt        | 23 ++++++++++
 .../solaire/base_distrib/direct_ecs.elmt      | 24 ++++++++++
 .../solaire/base_distrib/echangeur.elmt       | 27 ++++++++++++
 .../solaire/base_distrib/indirecte.elmt       | 24 ++++++++++
 .../solaire/base_distrib/qet_directory        |  5 +++
 .../solaire/base_distrib/semi-direct_bis.elmt | 24 ++++++++++
 .../solaire/base_ecs/ballon_ecs_elec.elmt     | 20 +++++++++
 .../energie/solaire/base_ecs/qet_directory    |  5 +++
 .../solaire/base_ecs/rechauff_ecs.elmt        | 20 +++++++++
 elements/energie/solaire/bout_gd.elmt         | 24 ++++++++++
 elements/energie/solaire/cap_thersolaire.elmt | 44 +++++++++++++++++++
 elements/energie/solaire/circulateur.elmt     | 12 +++++
 elements/energie/solaire/circulateuranti.elmt | 14 ++++++
 .../eau_sanitaire/circulateur_sanitaire.elmt  | 16 +++++++
 .../solaire/eau_sanitaire/cumuls_elec.elmt    | 24 ++++++++++
 .../disconnecteur_sanitaire.elmt              | 24 ++++++++++
 .../energie/solaire/eau_sanitaire/douche.elmt | 20 +++++++++
 .../solaire/eau_sanitaire/eau_ville.elmt      | 13 ++++++
 .../solaire/eau_sanitaire/ecs_robinet.elmt    | 19 ++++++++
 .../mitigeur_thermostatique.elmt              | 25 +++++++++++
 .../solaire/eau_sanitaire/qet_directory       |  5 +++
 .../eau_sanitaire/rechauffeur_ecs.elmt        | 22 ++++++++++
 elements/energie/solaire/flexpression.elmt    | 17 +++++++
 elements/energie/solaire/mano.elmt            | 25 +++++++++++
 elements/energie/solaire/purgeur.elmt         | 21 +++++++++
 elements/energie/solaire/qet_directory        |  6 +++
 .../solaire/raccords_cuivre/coude_90.elmt     | 11 +++++
 .../raccords_cuivre/coude_90_grandrayon.elmt  | 11 +++++
 .../solaire/raccords_cuivre/cumulus2.elmt     | 19 ++++++++
 .../solaire/raccords_cuivre/qet_directory     |  5 +++
 .../solaire/raccords_cuivre/te_droit.elmt     | 13 ++++++
 .../solaire/raccords_cuivre/te_oblique.elmt   | 13 ++++++
 .../energie/solaire/signaletiques/fleche.elmt |  9 ++++
 .../solaire/signaletiques/fleche2.elmt        |  9 ++++
 .../solaire/signaletiques/fleche3.elmt        |  9 ++++
 .../solaire/signaletiques/fleche4.elmt        | 10 +++++
 .../solaire/signaletiques/fleche_fluide.elmt  | 12 +++++
 .../solaire/signaletiques/flechedroite.elmt   | 11 +++++
 .../solaire/signaletiques/qet_directory       |  5 +++
 .../solaire/signaletiques/sens3voies.elmt     | 13 ++++++
 .../vanne/clap_anti-retour_simple.elmt        | 15 +++++++
 .../solaire/vanne/clap_antiretour_bille.elmt  | 15 +++++++
 .../energie/solaire/vanne/clapet_pompe.elmt   | 12 +++++
 elements/energie/solaire/vanne/qet_directory  |  5 +++
 .../energie/solaire/vanne/soupape-diff.elmt   | 19 ++++++++
 .../energie/solaire/vanne/vanne-arret.elmt    | 13 ++++++
 elements/energie/solaire/vanne/vanne2.elmt    | 16 +++++++
 elements/energie/solaire/vanne/vanne3.elmt    | 19 ++++++++
 .../solaire/vanne/vanne_diferentielle.elmt    | 14 ++++++
 elements/energie/solaire/vidange.elmt         | 18 ++++++++
 61 files changed, 1064 insertions(+)
 create mode 100644 elements/energie/qet_directory
 create mode 100644 elements/energie/solaire/ballon_echangeur/ballon_demi_strat.elmt
 create mode 100644 elements/energie/solaire/ballon_echangeur/ballon_stock1000l.elmt
 create mode 100644 elements/energie/solaire/ballon_echangeur/echangeur_plaque.elmt
 create mode 100644 elements/energie/solaire/ballon_echangeur/mur_radian.elmt
 create mode 100644 elements/energie/solaire/ballon_echangeur/qet_directory
 create mode 100644 elements/energie/solaire/ballon_echangeur/sksw-0.elmt
 create mode 100644 elements/energie/solaire/base_distrib/ballon_chicane-plus.elmt
 create mode 100644 elements/energie/solaire/base_distrib/bouteille_vanne.elmt
 create mode 100644 elements/energie/solaire/base_distrib/chicane.elmt
 create mode 100644 elements/energie/solaire/base_distrib/direct.elmt
 create mode 100644 elements/energie/solaire/base_distrib/direct_chauffage.elmt
 create mode 100644 elements/energie/solaire/base_distrib/direct_ecs.elmt
 create mode 100644 elements/energie/solaire/base_distrib/echangeur.elmt
 create mode 100644 elements/energie/solaire/base_distrib/indirecte.elmt
 create mode 100644 elements/energie/solaire/base_distrib/qet_directory
 create mode 100644 elements/energie/solaire/base_distrib/semi-direct_bis.elmt
 create mode 100644 elements/energie/solaire/base_ecs/ballon_ecs_elec.elmt
 create mode 100644 elements/energie/solaire/base_ecs/qet_directory
 create mode 100644 elements/energie/solaire/base_ecs/rechauff_ecs.elmt
 create mode 100644 elements/energie/solaire/bout_gd.elmt
 create mode 100644 elements/energie/solaire/cap_thersolaire.elmt
 create mode 100644 elements/energie/solaire/circulateur.elmt
 create mode 100644 elements/energie/solaire/circulateuranti.elmt
 create mode 100644 elements/energie/solaire/eau_sanitaire/circulateur_sanitaire.elmt
 create mode 100644 elements/energie/solaire/eau_sanitaire/cumuls_elec.elmt
 create mode 100644 elements/energie/solaire/eau_sanitaire/disconnecteur_sanitaire.elmt
 create mode 100644 elements/energie/solaire/eau_sanitaire/douche.elmt
 create mode 100644 elements/energie/solaire/eau_sanitaire/eau_ville.elmt
 create mode 100644 elements/energie/solaire/eau_sanitaire/ecs_robinet.elmt
 create mode 100644 elements/energie/solaire/eau_sanitaire/mitigeur_thermostatique.elmt
 create mode 100644 elements/energie/solaire/eau_sanitaire/qet_directory
 create mode 100644 elements/energie/solaire/eau_sanitaire/rechauffeur_ecs.elmt
 create mode 100644 elements/energie/solaire/flexpression.elmt
 create mode 100644 elements/energie/solaire/mano.elmt
 create mode 100644 elements/energie/solaire/purgeur.elmt
 create mode 100644 elements/energie/solaire/qet_directory
 create mode 100644 elements/energie/solaire/raccords_cuivre/coude_90.elmt
 create mode 100644 elements/energie/solaire/raccords_cuivre/coude_90_grandrayon.elmt
 create mode 100644 elements/energie/solaire/raccords_cuivre/cumulus2.elmt
 create mode 100644 elements/energie/solaire/raccords_cuivre/qet_directory
 create mode 100644 elements/energie/solaire/raccords_cuivre/te_droit.elmt
 create mode 100644 elements/energie/solaire/raccords_cuivre/te_oblique.elmt
 create mode 100644 elements/energie/solaire/signaletiques/fleche.elmt
 create mode 100644 elements/energie/solaire/signaletiques/fleche2.elmt
 create mode 100644 elements/energie/solaire/signaletiques/fleche3.elmt
 create mode 100644 elements/energie/solaire/signaletiques/fleche4.elmt
 create mode 100644 elements/energie/solaire/signaletiques/fleche_fluide.elmt
 create mode 100644 elements/energie/solaire/signaletiques/flechedroite.elmt
 create mode 100644 elements/energie/solaire/signaletiques/qet_directory
 create mode 100644 elements/energie/solaire/signaletiques/sens3voies.elmt
 create mode 100644 elements/energie/solaire/vanne/clap_anti-retour_simple.elmt
 create mode 100644 elements/energie/solaire/vanne/clap_antiretour_bille.elmt
 create mode 100644 elements/energie/solaire/vanne/clapet_pompe.elmt
 create mode 100644 elements/energie/solaire/vanne/qet_directory
 create mode 100644 elements/energie/solaire/vanne/soupape-diff.elmt
 create mode 100644 elements/energie/solaire/vanne/vanne-arret.elmt
 create mode 100644 elements/energie/solaire/vanne/vanne2.elmt
 create mode 100644 elements/energie/solaire/vanne/vanne3.elmt
 create mode 100644 elements/energie/solaire/vanne/vanne_diferentielle.elmt
 create mode 100644 elements/energie/solaire/vidange.elmt

diff --git a/elements/energie/qet_directory b/elements/energie/qet_directory
new file mode 100644
index 000000000..951c3d66e
--- /dev/null
+++ b/elements/energie/qet_directory
@@ -0,0 +1,6 @@
+<qet-directory>
+    <names>
+        <name lang="fr">Energie</name>
+	<name lang="en">Energy</name>
+    </names>
+</qet-directory>
diff --git a/elements/energie/solaire/ballon_echangeur/ballon_demi_strat.elmt b/elements/energie/solaire/ballon_echangeur/ballon_demi_strat.elmt
new file mode 100644
index 000000000..62e5b777e
--- /dev/null
+++ b/elements/energie/solaire/ballon_echangeur/ballon_demi_strat.elmt
@@ -0,0 +1,37 @@
+<definition width="150" version="0.3" hotspot_x="75" hotspot_y="125" height="260" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">ballon 1000L chicane et strat</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="-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"/>
+        <rect width="20" x="-10" y="0" antialias="false" height="100" style="line-style:dotted;line-weight:normal;filling:none;color:black"/>
+        <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="76.25" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5.5"/>
+        <circle x="-2.75" y="21.25" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5.5"/>
+        <circle x="-2.75" y="-93.75" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5.5"/>
+        <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"/>
+        <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="-80.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="82" 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="-41" y="106" 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="-78" orientation="e"/>
+        <terminal x="0" y="110" orientation="s"/>
+        <terminal x="0" y="-109" orientation="n"/>
+        <terminal x="0" y="79" orientation="e"/>
+        <terminal x="-1" y="-91" orientation="e"/>
+        <terminal x="-1" y="24" orientation="e"/>
+        <terminal x="-41" y="0" orientation="w"/>
+        <terminal x="-39" y="108" orientation="w"/>
+    </description>
+</definition>
diff --git a/elements/energie/solaire/ballon_echangeur/ballon_stock1000l.elmt b/elements/energie/solaire/ballon_echangeur/ballon_stock1000l.elmt
new file mode 100644
index 000000000..91bc70224
--- /dev/null
+++ b/elements/energie/solaire/ballon_echangeur/ballon_stock1000l.elmt
@@ -0,0 +1,28 @@
+<definition width="150" version="0.3" hotspot_x="75" hotspot_y="65" height="260" type="element" orientation="ndny">
+    <names>
+        <name lang="fr">Ballon Stockage 1000L</name>
+    </names>
+    <informations/>
+    <description>
+        <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"/>
+        <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="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="129" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="38" y="56" 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="58" orientation="e"/>
+        <terminal x="40" y="131" orientation="e"/>
+    </description>
+</definition>
diff --git a/elements/energie/solaire/ballon_echangeur/echangeur_plaque.elmt b/elements/energie/solaire/ballon_echangeur/echangeur_plaque.elmt
new file mode 100644
index 000000000..27e3d4456
--- /dev/null
+++ b/elements/energie/solaire/ballon_echangeur/echangeur_plaque.elmt
@@ -0,0 +1,22 @@
+<definition width="50" version="0.3" hotspot_x="25" hotspot_y="50" height="100" type="element" orientation="ndny">
+    <names>
+        <name lang="fr">echangeur à Plaques</name>
+    </names>
+    <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" y10="30" y2="-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" y10="30" y2="-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"/>
+    </description>
+</definition>
diff --git a/elements/energie/solaire/ballon_echangeur/mur_radian.elmt b/elements/energie/solaire/ballon_echangeur/mur_radian.elmt
new file mode 100644
index 000000000..6eee2664b
--- /dev/null
+++ b/elements/energie/solaire/ballon_echangeur/mur_radian.elmt
@@ -0,0 +1,25 @@
+<definition width="50" version="0.3" hotspot_x="25" hotspot_y="50" height="100" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">mur chauffant</name>
+    </names>
+    <informations/>
+    <description>
+        <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="-27" x1="4" y2="27" x2="4"/>
+        <circle x="-9.5" y="-7.5" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="3"/>
+        <polygon x4="23" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="44" x1="0" y2="22" x2="23" y3="-47" x3="23" y4="-47"/>
+        <polygon x4="0" y5="-30" x5="0" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-30" x1="-15" y2="-48" x2="13" y3="-48" x3="24" y4="-30"/>
+        <rect width="15" x="-15" y="-30" antialias="false" height="74" 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:dotted;line-weight:thin;filling:none;color:black" y1="-33" x1="12" y2="21" 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="-37" x1="16" y2="17" 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="-41" x1="20" y2="13" x2="20"/>
+        <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="-30" x1="8" y2="24" x2="8"/>
+        <circle x="-9.5" y="33.5" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="3"/>
+        <circle x="-9.5" y="23.5" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="3"/>
+        <circle x="-9.5" y="13.5" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="3"/>
+        <circle x="-9.5" y="3.5" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="3"/>
+        <circle x="-9.5" y="-17.5" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="3"/>
+        <circle x="-9.5" y="-26.5" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="3"/>
+        <terminal x="-8" y="35" orientation="e"/>
+        <terminal x="-8" y="-25" orientation="e"/>
+    </description>
+</definition>
diff --git a/elements/energie/solaire/ballon_echangeur/qet_directory b/elements/energie/solaire/ballon_echangeur/qet_directory
new file mode 100644
index 000000000..5ab8471ef
--- /dev/null
+++ b/elements/energie/solaire/ballon_echangeur/qet_directory
@@ -0,0 +1,5 @@
+<qet-directory>
+    <names>
+        <name lang="fr">ballon échangeur et autres</name>
+    </names>
+</qet-directory>
diff --git a/elements/energie/solaire/ballon_echangeur/sksw-0.elmt b/elements/energie/solaire/ballon_echangeur/sksw-0.elmt
new file mode 100644
index 000000000..1a47bb07b
--- /dev/null
+++ b/elements/energie/solaire/ballon_echangeur/sksw-0.elmt
@@ -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 sksw ecs</name>
+    </names>
+    <informations></informations>
+    <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" 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"/>
+        <circle x="-39.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="-83" y2="-90" y3="-90" y4="-92" y5="-92" y6="-90" y7="-90" y8="-83" y9="-83"/>
+        <rect width="90" x="-45" y="-69" antialias="true" height="133" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <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="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="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="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="25" orientation="e"/>
+        <terminal x="37" y="60" orientation="e"/>
+    </description>
+</definition>
diff --git a/elements/energie/solaire/base_distrib/ballon_chicane-plus.elmt b/elements/energie/solaire/base_distrib/ballon_chicane-plus.elmt
new file mode 100644
index 000000000..c1d1e159e
--- /dev/null
+++ b/elements/energie/solaire/base_distrib/ballon_chicane-plus.elmt
@@ -0,0 +1,27 @@
+<definition width="100" version="0.3" hotspot_x="50" hotspot_y="40" height="80" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">D" ballon et compartiment</name>
+    </names>
+    <informations></informations>
+    <description>
+        <text x="-45" y="-23" size="9" text="D&quot;"/>
+        <rect width="29" x="-15" y="-20.7" antialias="false" height="52" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <text x="-13" y="-1" size="4" text="stockage"/>
+        <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="-10" x1="13" y2="-10" x2="-15"/>
+        <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="-17" x1="-14" y2="-17" x2="14"/>
+        <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="26" x1="-14" y2="26" x2="6"/>
+        <polygon antialias="false" style="line-style:dotted;line-weight:normal;filling:none;color:black" closed="false" y1="5" x1="13" y2="5" x2="6" y3="31" x3="6"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="12" x2="32" x3="22" x4="32" antialias="true" x5="22" x6="32" x7="12" x8="12" closed="false" y1="-11.2" y2="-11.2" y3="-6.2" y4="-1.2" y5="3.8" y6="8.8" y7="8.8" y8="8.8"/>
+        <polygon x4="41" y5="9" x5="46" y6="9" x6="46" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="25" x1="12" y2="25" x2="44" y3="15" x3="44" y4="12"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="12" x2="45" x3="45" x4="41" antialias="false" x5="47" x6="41" x7="46" x8="41" x9="46" closed="false" y1="-15" y2="-15" y3="-6" y4="-3" y5="-1" y6="2" y7="4" y8="7" y9="9"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-10" x2="-34" x3="-34" x4="-40" antialias="false" x5="-31" x6="-40" x7="-31" x8="-40" x9="-35" closed="false" y1="-19" y10="30" y2="-19" y11="30" y3="-10" y4="-6" y5="-1" x10="-35" y6="4" x11="-11" y7="8" y8="14" y9="19"/>
+        <polygon x4="35" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="24.8" x1="35" y2="21.8" x2="38" y3="27.8" x3="38" y4="24.8"/>
+        <polygon x4="-28" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30.1" x1="-28" y2="27.1" x2="-25" y3="33.1" x3="-25" y4="30.1"/>
+        <circle x="33" y="20.8" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="8"/>
+        <circle x="-30" y="26.1" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="8"/>
+        <text x="-37" y="6.1" size="4" text="solaire"/>
+        <text x="39" y="14" size="4" rotation="-90" text="chauff."/>
+        <text x="15" y="0" size="4" text="ECS"/>
+        <text x="-12" y="-23" size="4" text="ballon"/>
+    </description>
+</definition>
diff --git a/elements/energie/solaire/base_distrib/bouteille_vanne.elmt b/elements/energie/solaire/base_distrib/bouteille_vanne.elmt
new file mode 100644
index 000000000..a57dde755
--- /dev/null
+++ b/elements/energie/solaire/base_distrib/bouteille_vanne.elmt
@@ -0,0 +1,32 @@
+<definition width="100" version="0.3" hotspot_x="50" hotspot_y="40" height="80" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">E bouteille et vanne</name>
+    </names>
+    <informations></informations>
+    <description>
+        <text x="-43" y="-22" size="9" text="E"/>
+        <text x="25" y="-22" size="4" text="stock"/>
+        <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="31" x1="33" y2="31" x2="40"/>
+        <polygon antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="21" x1="2" y2="31" x2="2" y3="31" x3="33"/>
+        <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="-27" x1="42" y2="-27" x2="37"/>
+        <polygon antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-14" x1="2" y2="-27" x2="2" y3="-27" x3="37"/>
+        <line 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="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="3" x1="-1" y2="3" x2="-7"/>
+        <rect width="3" x="-2" y="6" antialias="false" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect width="3" x="-2" y="-4" antialias="false" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <polygon x4="4" y5="0" x5="-5" y6="0" x6="-5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="0" x1="-5" y2="0" x2="4" y3="6" x3="-5" y4="6"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="12" x2="41" x3="41" x4="45" antialias="false" x5="38" x6="44" x7="38" x8="43" x9="38" closed="false" y1="-13.2" y10="12.8" y2="-13.2" y11="21.8" y3="-6.2" y4="-3.2" y12="21.8" y5="-1.2" x10="41" y13="21.8" y6="1.8" x11="41" y7="3.8" x12="12" y8="6.8" x13="13" y9="9.8"/>
+        <rect width="32" x="-18" y="-16.2" antialias="false" height="12" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <polygon x4="24" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="21.8" x1="24" y2="18.8" x2="27" y3="24.8" x3="27" y4="21.8"/>
+        <polygon x4="-30" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="13.8" x1="-30" y2="10.8" x2="-27" y3="16.8" x3="-27" y4="13.8"/>
+        <circle x="22" y="17.8" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="8"/>
+        <circle x="-32" y="9.8" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="8"/>
+        <rect width="32" x="-18" y="11.8" antialias="false" height="12" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <text x="-37" y="5.8" size="4" text="solaire"/>
+        <text x="37" y="12.8" size="4" rotation="-90" text="chauff."/>
+        <text x="11" y="5.8" size="4" text="ECS"/>
+        <text x="-22" y="-20" size="4" text="bouteille"/>
+        <polygon x4="-45" y5="8.8" x5="-35" y6="13.8" x6="-45" y7="13.8" x7="-12" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-6.2" x1="-12" y2="-6.2" x2="-45" y3="-1.2" x3="-35" y4="3.8"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="12" x2="32" x3="22" x4="32" antialias="true" x5="22" x6="32" x7="12" x8="12" closed="false" y1="-6.2" y2="-6.2" y3="-1.2" y4="3.8" y5="8.8" y6="13.8" y7="13.8" y8="13.8"/>
+    </description>
+</definition>
diff --git a/elements/energie/solaire/base_distrib/chicane.elmt b/elements/energie/solaire/base_distrib/chicane.elmt
new file mode 100644
index 000000000..3fcb76dff
--- /dev/null
+++ b/elements/energie/solaire/base_distrib/chicane.elmt
@@ -0,0 +1,24 @@
+<definition width="100" version="0.3" hotspot_x="50" hotspot_y="40" height="80" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">D ballon et chicanes</name>
+    </names>
+    <informations></informations>
+    <description>
+        <text x="-45" y="-24" size="9" text="D"/>
+        <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="6" x1="-14" y2="6" x2="12"/>
+        <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="3" x1="-12" y2="3" x2="11"/>
+        <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" x1="-13" y2="-1" x2="11"/>
+        <rect width="29" x="-15" y="-22" antialias="false" height="52" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="12" x2="41" x3="41" x4="45" antialias="false" x5="38" x6="44" x7="38" x8="43" x9="38" closed="false" y1="-14.2" y10="11.8" y2="-14.2" y11="20.8" y3="-7.2" y4="-4.2" y12="20.8" y5="-2.2" x10="41" y13="20.8" y6="0.8" x11="41" y7="2.8" x12="12" y8="5.8" x13="13" y9="8.8"/>
+        <polygon x4="24" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="20.8" x1="24" y2="17.8" x2="27" y3="23.8" x3="27" y4="20.8"/>
+        <polygon x4="-30" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="12.8" x1="-30" y2="9.8" x2="-27" y3="15.8" x3="-27" y4="12.8"/>
+        <circle x="22" y="16.8" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="8"/>
+        <circle x="-32" y="8.8" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="8"/>
+        <text x="-37" y="4.8" size="4" text="solaire"/>
+        <text x="37" y="11.8" size="4" rotation="-90" text="chauff."/>
+        <text x="15" y="5" size="4" text="ECS"/>
+        <text x="-10" y="-27" size="4" text="bouteille"/>
+        <polygon x4="-45" y5="7.8" x5="-35" y6="12.8" x6="-45" y7="12.8" x7="-12" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-7.2" x1="-12" y2="-7.2" x2="-45" y3="-2.2" x3="-35" y4="2.8"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="12" x2="32" x3="22" x4="32" antialias="true" x5="22" x6="32" x7="12" x8="12" closed="false" y1="-7.2" y2="-7.2" y3="-2.2" y4="2.8" y5="7.8" y6="12.8" y7="12.8" y8="12.8"/>
+    </description>
+</definition>
diff --git a/elements/energie/solaire/base_distrib/direct.elmt b/elements/energie/solaire/base_distrib/direct.elmt
new file mode 100644
index 000000000..a7daf58b1
--- /dev/null
+++ b/elements/energie/solaire/base_distrib/direct.elmt
@@ -0,0 +1,23 @@
+<definition width="100" version="0.3" hotspot_x="50" hotspot_y="40" height="80" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">A échange indirecte</name>
+    </names>
+    <informations></informations>
+    <description>
+        <text x="-42" y="-23" size="9" text="A"/>
+        <polygon x4="24" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="24" x1="24" y2="21" x2="27" y3="27" x3="27" y4="24"/>
+        <polygon x4="-28" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="-28" y2="7" x2="-25" y3="13" x3="-25" y4="10"/>
+        <circle x="22" y="20" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="8"/>
+        <circle x="-30" y="6" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="8"/>
+        <rect width="32" x="-16" y="-30" 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="4" y2="4" y3="9" y4="14" y5="19" y6="24" y7="24" y8="24"/>
+        <text x="-35" y="2" size="4" text="solaire"/>
+        <text x="18" y="16" size="4" text="chauff."/>
+        <text x="21" y="-11" size="4" text="ECS"/>
+        <text x="-14" y="-21" size="4" text="ballon"/>
+        <polygon x4="-43" y5="5" x5="-33" y6="10" x6="-43" y7="10" x7="-23" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="-23" y2="-10" x2="-43" y3="-5" x3="-33" y4="0"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-22" x2="-2" x3="-12" x4="-2" antialias="true" x5="-12" x6="-2" x7="-22" x8="-22" closed="false" y1="-10" y2="-10" y3="-5" y4="0" y5="5" y6="10" y7="10" y8="10"/>
+        <polygon x4="3" y5="19" x5="13" y6="24" x6="3" y7="24" x7="23" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="4" x1="23" y2="4" x2="3" y3="9" x3="13" y4="14"/>
+        <polygon x4="3" y5="-9" x5="13" y6="-4" x6="3" y7="-4" x7="23" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-24" x1="23" y2="-24" x2="3" y3="-19" x3="13" y4="-14"/>
+    </description>
+</definition>
diff --git a/elements/energie/solaire/base_distrib/direct_chauffage.elmt b/elements/energie/solaire/base_distrib/direct_chauffage.elmt
new file mode 100644
index 000000000..4c5a93a1b
--- /dev/null
+++ b/elements/energie/solaire/base_distrib/direct_chauffage.elmt
@@ -0,0 +1,23 @@
+<definition width="100" version="0.3" hotspot_x="50" hotspot_y="40" height="80" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">C échange direct</name>
+    </names>
+    <informations></informations>
+    <description>
+        <text x="-40" y="-22" size="9" text="C"/>
+        <circle x="21" y="-8" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="8"/>
+        <circle x="21" y="20" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="8"/>
+        <circle x="-30" y="6" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="8"/>
+        <polygon x4="23" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-4" x1="23" y2="-7" x2="26" y3="-1" x3="26" y4="-4"/>
+        <polygon x4="23" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="24" x1="23" y2="21" x2="26" y3="27" x3="26" y4="24"/>
+        <polygon x4="-28" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="-28" y2="7" x2="-25" y3="13" x3="-25" y4="10"/>
+        <rect width="32" x="-16" y="-29.5" 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="10" x2="43" x3="33" x4="43" antialias="true" x5="33" x6="43" x7="23" x8="10" closed="false" y1="4.5" y2="4.5" y3="9.5" y4="14.5" y5="19.5" y6="24.5" y7="24.5" y8="24.5"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="10" x2="42" x3="32" x4="42" antialias="true" x5="32" x6="42" x7="22" x8="10" closed="false" y1="-23.5" y2="-23.5" y3="-18.5" y4="-13.5" y5="-8.5" y6="-3.5" y7="-3.5" y8="-3.5"/>
+        <text x="-35" y="2.5" size="4" text="solaire"/>
+        <text x="18" y="16.5" size="4" text="chauff."/>
+        <text x="21" y="-10.5" size="4" text="ECS"/>
+        <text x="-14" y="-20.5" size="4" text="ballon"/>
+        <polygon x4="-43" y5="5.5" x5="-33" y6="10.5" x6="-43" y7="10.5" x7="-10" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-9.5" x1="-10" y2="-9.5" x2="-43" y3="-4.5" x3="-33" y4="0.5"/>
+    </description>
+</definition>
diff --git a/elements/energie/solaire/base_distrib/direct_ecs.elmt b/elements/energie/solaire/base_distrib/direct_ecs.elmt
new file mode 100644
index 000000000..ff10eb876
--- /dev/null
+++ b/elements/energie/solaire/base_distrib/direct_ecs.elmt
@@ -0,0 +1,24 @@
+<definition width="100" version="0.3" hotspot_x="50" hotspot_y="40" height="80" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">A" échange indirect / ballon ecs</name>
+    </names>
+    <informations></informations>
+    <description>
+        <text x="-43" y="-21" size="9" text="A&quot;"/>
+        <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="-8" x1="29" y2="-8" 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="-24" x1="29" y2="-24" x2="6"/>
+        <polygon x4="24" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="24" x1="24" y2="21" x2="27" y3="27" x3="27" y4="24"/>
+        <polygon x4="-28" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="-28" y2="7" x2="-25" y3="13" x3="-25" y4="10"/>
+        <circle x="22" y="20" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="8"/>
+        <circle x="-30" y="6" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="8"/>
+        <rect width="32" x="-16" y="-30" 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="4" y2="4" y3="9" y4="14" y5="19" y6="24" y7="24" y8="24"/>
+        <text x="-35" y="2" size="4" text="solaire"/>
+        <text x="18" y="16" size="4" text="chauff."/>
+        <text x="25" y="-14" size="4" text="ECS"/>
+        <text x="-14" y="-21" size="4" text="ballon"/>
+        <polygon x4="-43" y5="5" x5="-33" y6="10" x6="-43" y7="10" x7="-23" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="-23" y2="-10" x2="-43" y3="-5" x3="-33" y4="0"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-22" x2="-2" x3="-12" x4="-2" antialias="true" x5="-12" x6="-2" x7="-22" x8="-22" closed="false" y1="-10" y2="-10" y3="-5" y4="0" y5="5" y6="10" y7="10" y8="10"/>
+        <polygon x4="3" y5="19" x5="13" y6="24" x6="3" y7="24" x7="23" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="4" x1="23" y2="4" x2="3" y3="9" x3="13" y4="14"/>
+    </description>
+</definition>
diff --git a/elements/energie/solaire/base_distrib/echangeur.elmt b/elements/energie/solaire/base_distrib/echangeur.elmt
new file mode 100644
index 000000000..d9fe89803
--- /dev/null
+++ b/elements/energie/solaire/base_distrib/echangeur.elmt
@@ -0,0 +1,27 @@
+<definition width="100" version="0.3" hotspot_x="50" hotspot_y="40" height="80" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">F bouteille</name>
+    </names>
+    <informations></informations>
+    <description>
+        <text x="-41" y="-21" size="9" text="F"/>
+        <text x="23" y="-24" 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="30" x1="40" y2="30" x2="33"/>
+        <polygon x4="32" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="17" x1="1" y2="30" x2="1" y3="30" x3="32" y4="30"/>
+        <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="33" y2="-30" x2="41"/>
+        <polygon antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-18" x1="2" y2="-30" x2="2" y3="-30" x3="33"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="14" x2="43" x3="43" x4="47" antialias="false" x5="40" x6="46" x7="40" x8="45" x9="40" closed="false" y1="-17" y10="9" y2="-17" y11="18" y3="-10" y4="-7" y12="18" y5="-5" x10="43" y13="18" y6="-2" x11="43" y7="0" x12="14" y8="3" x13="15" y9="6"/>
+        <rect width="32" x="-16" y="-20" antialias="false" height="12" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <polygon x4="26" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="18" x1="26" y2="15" x2="29" y3="21" x3="29" y4="18"/>
+        <polygon x4="-28" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="-28" y2="7" x2="-25" y3="13" x3="-25" y4="10"/>
+        <circle x="24" y="14" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="8"/>
+        <circle x="-30" y="6" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="8"/>
+        <rect width="32" x="-16" y="8" antialias="false" height="12" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <text x="-35" y="2" size="4" text="solaire"/>
+        <text x="39" y="9" size="4" rotation="-90" text="chauff."/>
+        <text x="13" y="2" size="4" text="ECS"/>
+        <text x="-20" y="-24" size="4" text="bouteille"/>
+        <polygon x4="-43" y5="5" x5="-33" y6="10" x6="-43" y7="10" x7="-10" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="-10" y2="-10" x2="-43" y3="-5" x3="-33" y4="0"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="14" x2="34" x3="24" x4="34" antialias="true" x5="24" x6="34" x7="14" x8="14" closed="false" y1="-10" y2="-10" y3="-5" y4="0" y5="5" y6="10" y7="10" y8="10"/>
+    </description>
+</definition>
diff --git a/elements/energie/solaire/base_distrib/indirecte.elmt b/elements/energie/solaire/base_distrib/indirecte.elmt
new file mode 100644
index 000000000..baa2e4c2f
--- /dev/null
+++ b/elements/energie/solaire/base_distrib/indirecte.elmt
@@ -0,0 +1,24 @@
+<definition width="100" version="0.3" hotspot_x="50" hotspot_y="40" height="80" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">B semi-direct</name>
+    </names>
+    <informations></informations>
+    <description>
+        <text x="-41" y="-21" size="9" text="B"/>
+        <circle x="19" y="-8" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="8"/>
+        <circle x="-31" y="6" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="8"/>
+        <circle x="19" y="20" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="8"/>
+        <polygon x4="21" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="24" x1="21" y2="21" x2="24" y3="27" x3="24" y4="24"/>
+        <polygon x4="21" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-4" x1="21" y2="-7" x2="24" y3="-1" x3="24" y4="-4"/>
+        <polygon x4="-29" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="-29" y2="7" x2="-26" y3="13" x3="-26" y4="10"/>
+        <rect width="32" x="-16" y="-30" 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="4" y2="4" y3="9" y4="14" y5="19" y6="24" y7="24" y8="24"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="8" x2="42" x3="32" x4="42" antialias="true" x5="32" x6="42" x7="22" x8="8" closed="false" y1="-24" y2="-24" y3="-19" y4="-14" y5="-9" y6="-4" y7="-4" y8="-4"/>
+        <text x="-35" y="2" size="4" text="solaire"/>
+        <text x="18" y="16" size="4" text="chauff."/>
+        <text x="21" y="-11" size="4" text="ECS"/>
+        <text x="-14" y="-21" size="4" text="ballon"/>
+        <polygon x4="-43" y5="5" x5="-33" y6="10" x6="-43" y7="10" x7="-10" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="-10" y2="-10" x2="-43" y3="-5" x3="-33" y4="0"/>
+        <polygon x4="3" y5="19" x5="13" y6="24" x6="3" y7="24" x7="23" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="4" x1="23" y2="4" x2="3" y3="9" x3="13" y4="14"/>
+    </description>
+</definition>
diff --git a/elements/energie/solaire/base_distrib/qet_directory b/elements/energie/solaire/base_distrib/qet_directory
new file mode 100644
index 000000000..b4506b93d
--- /dev/null
+++ b/elements/energie/solaire/base_distrib/qet_directory
@@ -0,0 +1,5 @@
+<qet-directory>
+    <names>
+        <name lang="fr">schema de base</name>
+    </names>
+</qet-directory>
diff --git a/elements/energie/solaire/base_distrib/semi-direct_bis.elmt b/elements/energie/solaire/base_distrib/semi-direct_bis.elmt
new file mode 100644
index 000000000..9180cfc67
--- /dev/null
+++ b/elements/energie/solaire/base_distrib/semi-direct_bis.elmt
@@ -0,0 +1,24 @@
+<definition width="100" version="0.3" hotspot_x="50" hotspot_y="40" height="80" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">B" semi directe bis</name>
+    </names>
+    <informations></informations>
+    <description>
+        <text x="-41" y="-22" size="9" text="B&quot;"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-32" x2="2" x3="-8" x4="2" antialias="true" x5="-8" x6="2" x7="-18" x8="-32" closed="false" y1="-9.5" y2="-9.5" y3="-4.5" y4="0.5" y5="5.5" y6="10.5" y7="10.5" y8="10.5"/>
+        <rect width="32" x="-15" y="-29.5" antialias="false" height="59" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <circle x="20" y="-7.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="8"/>
+        <circle x="-30" y="6.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="8"/>
+        <circle x="20" y="20.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="8"/>
+        <polygon x4="22" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="24.5" x1="22" y2="21.5" x2="25" y3="27.5" x3="25" y4="24.5"/>
+        <polygon x4="22" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-3.5" x1="22" y2="-6.5" x2="25" y3="-0.5" x3="25" y4="-3.5"/>
+        <polygon x4="-28" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10.5" x1="-28" y2="7.5" x2="-25" y3="13.5" x3="-25" y4="10.5"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="12" x2="44" x3="34" x4="44" antialias="true" x5="34" x6="44" x7="24" x8="12" closed="false" y1="4.5" y2="4.5" y3="9.5" y4="14.5" y5="19.5" y6="24.5" y7="24.5" y8="24.5"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="9" x2="43" x3="33" x4="43" antialias="true" x5="33" x6="43" x7="23" x8="9" closed="false" y1="-23.5" y2="-23.5" y3="-18.5" y4="-13.5" y5="-8.5" y6="-3.5" y7="-3.5" y8="-3.5"/>
+        <text x="-34" y="2.5" size="4" text="solaire"/>
+        <text x="19" y="16.5" size="4" text="chauff."/>
+        <text x="22" y="-10.5" size="4" text="ECS"/>
+        <text x="-13" y="-20.5" size="4" text="ballon"/>
+        <polygon x4="-42" y5="5.5" x5="-32" y6="10.5" x6="-42" y7="10.5" x7="-9" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-9.5" x1="-9" y2="-9.5" x2="-42" y3="-4.5" x3="-32" y4="0.5"/>
+    </description>
+</definition>
diff --git a/elements/energie/solaire/base_ecs/ballon_ecs_elec.elmt b/elements/energie/solaire/base_ecs/ballon_ecs_elec.elmt
new file mode 100644
index 000000000..aa9426bf2
--- /dev/null
+++ b/elements/energie/solaire/base_ecs/ballon_ecs_elec.elmt
@@ -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></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>
diff --git a/elements/energie/solaire/base_ecs/qet_directory b/elements/energie/solaire/base_ecs/qet_directory
new file mode 100644
index 000000000..46dbb6da3
--- /dev/null
+++ b/elements/energie/solaire/base_ecs/qet_directory
@@ -0,0 +1,5 @@
+<qet-directory>
+    <names>
+        <name lang="fr">schéma de base ECS</name>
+    </names>
+</qet-directory>
diff --git a/elements/energie/solaire/base_ecs/rechauff_ecs.elmt b/elements/energie/solaire/base_ecs/rechauff_ecs.elmt
new file mode 100644
index 000000000..5f97a0ba3
--- /dev/null
+++ b/elements/energie/solaire/base_ecs/rechauff_ecs.elmt
@@ -0,0 +1,20 @@
+<definition width="100" version="0.3" hotspot_x="50" hotspot_y="70" height="140" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">Réchaufeur ECS tubulaire</name>
+    </names>
+    <informations></informations>
+    <description>
+        <text x="45" y="31" 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="-30.5" y="-31.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"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-30" x2="20" x3="-20" x4="20" antialias="false" x5="-20" x6="20" x7="-30" x8="-30" closed="false" y1="-30" y2="-30" y3="-14" y4="0" y5="16" y6="30" y7="30" y8="30"/>
+        <circle x="-30.5" y="28.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="3"/>
+        <terminal x="-29" y="30" orientation="w"/>
+        <terminal x="-29" y="-30" orientation="w"/>
+        <terminal x="0" y="46" orientation="s"/>
+        <terminal x="0" y="-46" orientation="n"/>
+    </description>
+</definition>
diff --git a/elements/energie/solaire/bout_gd.elmt b/elements/energie/solaire/bout_gd.elmt
new file mode 100644
index 000000000..e1ca6a853
--- /dev/null
+++ b/elements/energie/solaire/bout_gd.elmt
@@ -0,0 +1,24 @@
+<definition width="50" version="0.3" hotspot_x="25" hotspot_y="50" height="100" type="element" orientation="dnnn">
+    <names>
+        <name lang="fr">Bouteille 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="-21" x1="12" y2="-21" 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="-20" x1="12" y2="-20" x2="16"/>
+        <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"/>
+        <line 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.8633" x1="0" y2="42.9336" x2="0"/>
+        <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="43" orientation="s"/>
+        <terminal x="0" y="-40" orientation="n"/>
+        <terminal x="16" y="-21" orientation="e"/>
+    </description>
+</definition>
diff --git a/elements/energie/solaire/cap_thersolaire.elmt b/elements/energie/solaire/cap_thersolaire.elmt
new file mode 100644
index 000000000..9b360449f
--- /dev/null
+++ b/elements/energie/solaire/cap_thersolaire.elmt
@@ -0,0 +1,44 @@
+<definition width="160" 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: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="42" y2="-28" x2="-4"/>
+        <polygon x4="42" y5="54" x5="-2" y6="54" x6="-2" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="54" x1="-2" y2="-26" x2="-2" y3="-30" x3="42" y4="50"/>
+        <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="54" x1="48" y2="-27" 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="54" x1="-4" y2="-27" x2="-4"/>
+        <polygon x4="-10" y5="54" x5="-54" y6="54" x6="-54" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="54" x1="-54" y2="-26" x2="-54" y3="-30" x3="-10" y4="50"/>
+        <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="54" x1="-56" y2="-27" x2="-56"/>
+        <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="-10" y2="-28" x2="-56"/>
+        <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="-20" x1="-17" y2="45" 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="-20" x1="-24.5" y2="45" x2="-24.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="-20" x1="-32" y2="45" x2="-32"/>
+        <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="-20" x1="-39.5" y2="45" x2="-39.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="-20" x1="-47" y2="45" x2="-47"/>
+        <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="-20" x1="36" y2="45" x2="36"/>
+        <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="-20" x1="28.5" y2="45" x2="28.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="-20" x1="21" y2="45" 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="-20" x1="13" y2="45" 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="-20" x1="6" y2="45" 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="-20" x1="86" y2="45" x2="86"/>
+        <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="-20" x1="78.5" y2="45" x2="78.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="-20" x1="71" y2="45" x2="71"/>
+        <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="-20" x1="63.5" y2="45" x2="63.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="-20" x1="56" y2="45" x2="56"/>
+        <ellipse width="2" x="-55" y="53" antialias="true" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <ellipse width="2" x="-3" y="53" antialias="true" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <ellipse width="2" x="49" y="53" antialias="true" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <ellipse width="2" x="-11" y="-31" antialias="true" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <ellipse width="2" x="40" y="-31" antialias="true" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <ellipse width="2" x="93" y="-31" antialias="true" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <text x="-29" y="4" size="8" text="Panneaux Solaire"/>
+        <line 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="93" y2="-30" x2="97"/>
+        <polygon x4="94" y5="54" x5="50" y6="54" x6="50" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="54" x1="50" y2="-26" x2="50" y3="-30" x3="94" y4="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="55" x1="50" y2="55" x2="-53"/>
+        <line 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="95"/>
+        <terminal x="-54" y="56" orientation="s"/>
+        <terminal x="98" y="-30" orientation="e"/>
+    </description>
+</definition>
diff --git a/elements/energie/solaire/circulateur.elmt b/elements/energie/solaire/circulateur.elmt
new file mode 100644
index 000000000..6504772c9
--- /dev/null
+++ b/elements/energie/solaire/circulateur.elmt
@@ -0,0 +1,12 @@
+<definition width="40" version="0.22" hotspot_x="20" hotspot_y="20" height="40" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">circulateur</name>
+    </names>
+    <informations></informations>
+    <description>
+        <polygon x4="14" y5="0" x5="14" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="14" y2="-12" x2="-7" y3="12" x3="-7" y4="0"/>
+        <circle x="-15.6525" y="-15.6525" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="31.305"/>
+        <terminal x="-16" y="0" orientation="w"/>
+        <terminal x="16" y="0" orientation="e"/>
+    </description>
+</definition>
diff --git a/elements/energie/solaire/circulateuranti.elmt b/elements/energie/solaire/circulateuranti.elmt
new file mode 100644
index 000000000..87bab2586
--- /dev/null
+++ b/elements/energie/solaire/circulateuranti.elmt
@@ -0,0 +1,14 @@
+<definition width="60" version="0.22" hotspot_x="20" hotspot_y="20" height="40" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">circulateur_clapet</name>
+    </names>
+    <informations></informations>
+    <description>
+        <rect width="1" x="17" y="-10" antialias="false" height="20" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <polygon x4="14" y5="0" x5="14" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="14" y2="-12" x2="-7" y3="12" x3="-7" y4="0"/>
+        <polygon x4="32" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="32" y2="-10" x2="32" y3="0" x3="17" y4="10"/>
+        <circle x="-15.6525" y="-15.6525" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="31.305"/>
+        <terminal x="-16" y="0" orientation="w"/>
+        <terminal x="32" y="0" orientation="e"/>
+    </description>
+</definition>
diff --git a/elements/energie/solaire/eau_sanitaire/circulateur_sanitaire.elmt b/elements/energie/solaire/eau_sanitaire/circulateur_sanitaire.elmt
new file mode 100644
index 000000000..fb82e8250
--- /dev/null
+++ b/elements/energie/solaire/eau_sanitaire/circulateur_sanitaire.elmt
@@ -0,0 +1,16 @@
+<definition width="30" version="0.3" hotspot_x="15" hotspot_y="15" height="30" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">circulateur sanitaire</name>
+    </names>
+    <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="11" y2="0" x2="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="0" x1="-8" y2="0" x2="-13"/>
+        <polygon x4="8" y5="0" x5="8" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="0" x1="8" y2="-3" x2="11" y3="3" x3="11" 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="-4" x1="8" y2="4" x2="8"/>
+        <polygon x4="-3" y5="5" x5="-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="5" y4="5"/>
+        <circle x="-7.2111" y="-7.2111" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="14.4222"/>
+        <terminal x="-13" y="0" orientation="w"/>
+        <terminal x="13" y="0" orientation="e"/>
+    </description>
+</definition>
diff --git a/elements/energie/solaire/eau_sanitaire/cumuls_elec.elmt b/elements/energie/solaire/eau_sanitaire/cumuls_elec.elmt
new file mode 100644
index 000000000..07e54b754
--- /dev/null
+++ b/elements/energie/solaire/eau_sanitaire/cumuls_elec.elmt
@@ -0,0 +1,24 @@
+<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</name>
+    </names>
+    <informations/>
+    <description>
+        <text x="15" 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="0" x1="-24" y2="0" 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="-40" x1="25" y2="39" 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="40" x2="-25"/>
+        <arc width="50" x="-25" y="34" antialias="true" height="12" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
+        <circle x="-17.25" y="43.75" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="2.5"/>
+        <circle x="-26.25" y="-1.25" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="2.5"/>
+        <circle x="14.75" y="43.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="20" y10="34" y2="22" y11="35" y3="23" y4="25" y12="37" y5="26" x10="-3" y13="38" y6="28" x11="3" y14="40" y7="29" x12="-3" y15="41" y8="31" x13="3" y16="42" y9="32" x14="-3" y17="42" 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="36" x1="-16" y2="45" 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="-40" x1="16" y2="44" x2="16"/>
+        <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="43" antialias="false" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <terminal x="-25" y="0" orientation="w"/>
+        <terminal x="-16" y="45" orientation="s"/>
+        <terminal x="16" y="45" orientation="s"/>
+    </description>
+</definition>
diff --git a/elements/energie/solaire/eau_sanitaire/disconnecteur_sanitaire.elmt b/elements/energie/solaire/eau_sanitaire/disconnecteur_sanitaire.elmt
new file mode 100644
index 000000000..8c777acec
--- /dev/null
+++ b/elements/energie/solaire/eau_sanitaire/disconnecteur_sanitaire.elmt
@@ -0,0 +1,24 @@
+<definition width="60" version="0.3" hotspot_x="30" hotspot_y="20" height="40" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">disconnecteur</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="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="-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"/>
+        <rect width="50" x="-25" y="-15" antialias="false" height="30" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
+        <text x="-18" y="-9" size="4" text="disconnecteur"/>
+        <circle x="-23" y="-1" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="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="0" x1="-18" y2="0" x2="-21"/>
+        <line 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="18" y2="0" x2="22"/>
+        <circle x="22" y="-1" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="2"/>
+        <circle x="-1" y="11" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="2"/>
+        <rect width="1" x="16" y="-7" antialias="false" height="14" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect width="1" x="-6" y="-7" antialias="false" height="14" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <polygon x4="5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-7" x1="5" y2="7" x2="5" y3="0" x3="16" y4="-7"/>
+        <terminal x="23" y="0" orientation="e"/>
+        <terminal x="-22" y="0" orientation="w"/>
+        <terminal x="0" y="12" orientation="s"/>
+    </description>
+</definition>
diff --git a/elements/energie/solaire/eau_sanitaire/douche.elmt b/elements/energie/solaire/eau_sanitaire/douche.elmt
new file mode 100644
index 000000000..7735a3034
--- /dev/null
+++ b/elements/energie/solaire/eau_sanitaire/douche.elmt
@@ -0,0 +1,20 @@
+<definition width="30" version="0.3" hotspot_x="15" hotspot_y="10" height="20" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">douche</name>
+    </names>
+    <informations></informations>
+    <description>
+        <text x="-2" y="-3" size="3" text="douche"/>
+        <polygon x4="-9" y5="8" x5="-9" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-2" x1="-1" y2="-3" x2="-2" y3="-3" x3="-9" y4="8"/>
+        <polygon x4="-1" y5="6" x5="-1" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="6" x1="-1" y2="-2" x2="8" y3="-2" x3="-1" y4="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="5" y2="4" 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="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="6" x1="1" y2="8" 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="5" x1="2" y2="7" 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="0" x1="7" y2="2" 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="1" x1="6" y2="3" 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="4" x1="3" y2="6" 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="3" x1="4" y2="5" x2="6"/>
+        <terminal x="-9" y="8" orientation="s"/>
+    </description>
+</definition>
diff --git a/elements/energie/solaire/eau_sanitaire/eau_ville.elmt b/elements/energie/solaire/eau_sanitaire/eau_ville.elmt
new file mode 100644
index 000000000..9e001bc3d
--- /dev/null
+++ b/elements/energie/solaire/eau_sanitaire/eau_ville.elmt
@@ -0,0 +1,13 @@
+<definition width="30" version="0.3" hotspot_x="15" hotspot_y="10" height="20" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">arrivée d'eau froide</name>
+    </names>
+    <informations></informations>
+    <description>
+        <polygon x4="1" y5="0" x5="1" antialias="false" 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"/>
+    </description>
+</definition>
diff --git a/elements/energie/solaire/eau_sanitaire/ecs_robinet.elmt b/elements/energie/solaire/eau_sanitaire/ecs_robinet.elmt
new file mode 100644
index 000000000..54e7997ba
--- /dev/null
+++ b/elements/energie/solaire/eau_sanitaire/ecs_robinet.elmt
@@ -0,0 +1,19 @@
+<definition width="20" version="0.3" hotspot_x="10" hotspot_y="10" height="20" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">robinet puisage ECS</name>
+    </names>
+    <informations></informations>
+    <description>
+        <arc width="12" x="-7" 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="-6" y="-0.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:thin;filling:none;color:black" y1="3" x1="4" 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="-3" x1="-2" y2="-3" 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="-1" x1="0" y2="-3" 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.5" x1="0" y2="-0.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="0" x1="-1" y2="0" 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="7" 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="6" y2="7" 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="3" x1="5" y2="7" x2="5"/>
+        <terminal x="-8" y="0" orientation="w"/>
+    </description>
+</definition>
diff --git a/elements/energie/solaire/eau_sanitaire/mitigeur_thermostatique.elmt b/elements/energie/solaire/eau_sanitaire/mitigeur_thermostatique.elmt
new file mode 100644
index 000000000..16dca8e48
--- /dev/null
+++ b/elements/energie/solaire/eau_sanitaire/mitigeur_thermostatique.elmt
@@ -0,0 +1,25 @@
+<definition width="40" version="0.3" hotspot_x="20" hotspot_y="20" height="40" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">mitigeur thermostatique ECS</name>
+    </names>
+    <informations>Le mitigeur thermostatique posé en sortie de ballon permet de distribuer l'eau chaude sanitaire à une température constante.</informations>
+    <description>
+        <circle x="-13" y="-13" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="26"/>
+        <arc width="14" x="-7" y="-9" antialias="true" height="16" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-221" angle="-97"/>
+        <text x="-4" y="-2" 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="-8" x1="0" y2="-10" 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="-6" x1="5" 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="-6" x1="-5" y2="-7" x2="-6"/>
+        <text x="12" y="-10" size="4" text="EF"/>
+        <text x="-17" y="-10" size="4" text="EC"/>
+        <rect width="2" x="13" y="-1" antialias="false" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect width="2" x="-1" y="13" antialias="false" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect width="2" x="-15" y="-1" antialias="false" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <polygon x4="0" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="1" x1="0" y2="10" x2="-6" y3="10" x3="6" y4="1"/>
+        <polygon x4="10" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-5" x1="10" y2="6" x2="10" y3="0" x3="1" y4="-5"/>
+        <polygon x4="-10" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-6" x1="-10" y2="6" x2="-10" y3="0" x3="-1" y4="-6"/>
+        <terminal x="-14" y="0" orientation="w"/>
+        <terminal x="14" y="0" orientation="e"/>
+        <terminal x="0" y="14" orientation="s"/>
+    </description>
+</definition>
diff --git a/elements/energie/solaire/eau_sanitaire/qet_directory b/elements/energie/solaire/eau_sanitaire/qet_directory
new file mode 100644
index 000000000..ab3ef2aaf
--- /dev/null
+++ b/elements/energie/solaire/eau_sanitaire/qet_directory
@@ -0,0 +1,5 @@
+<qet-directory>
+    <names>
+        <name lang="fr">ECS eau chaude sanitaire</name>
+    </names>
+</qet-directory>
diff --git a/elements/energie/solaire/eau_sanitaire/rechauffeur_ecs.elmt b/elements/energie/solaire/eau_sanitaire/rechauffeur_ecs.elmt
new file mode 100644
index 000000000..c53752336
--- /dev/null
+++ b/elements/energie/solaire/eau_sanitaire/rechauffeur_ecs.elmt
@@ -0,0 +1,22 @@
+<definition width="60" version="0.3" hotspot_x="30" hotspot_y="35" height="70" type="element" orientation="ndny">
+    <names>
+        <name lang="fr">Réchauffeur ECS</name>
+    </names>
+    <informations></informations>
+    <description>
+        <text x="17" y="20" 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" 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="-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"/>
+    </description>
+</definition>
diff --git a/elements/energie/solaire/flexpression.elmt b/elements/energie/solaire/flexpression.elmt
new file mode 100644
index 000000000..908cb15f0
--- /dev/null
+++ b/elements/energie/solaire/flexpression.elmt
@@ -0,0 +1,17 @@
+<definition width="50" version="0.3" hotspot_x="25" hotspot_y="25" height="50" type="element" orientation="dnyn">
+    <names>
+        <name lang="fr">flexcon</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="18" x1="0" y2="19" x2="0"/>
+        <polygon x4="1" y5="-19" x5="1" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-19" x1="-1" y2="-21" x2="-1" y3="-21" x3="1" y4="-19"/>
+        <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="20" y2="9" 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="0" x1="-20" y2="0" x2="20"/>
+        <polygon x4="0" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="0" x1="0" y2="8" x2="-5" y3="8" x3="5" y4="0"/>
+        <arc width="40" x="-20" y="-19.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="2.5" 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="-11" x1="-20" y2="9" x2="-20"/>
+        <terminal x="0" y="-20" orientation="n"/>
+    </description>
+</definition>
diff --git a/elements/energie/solaire/mano.elmt b/elements/energie/solaire/mano.elmt
new file mode 100644
index 000000000..c7cd660d9
--- /dev/null
+++ b/elements/energie/solaire/mano.elmt
@@ -0,0 +1,25 @@
+<definition width="30" version="0.3" hotspot_x="15" hotspot_y="15" height="40" type="element" orientation="dnnn">
+    <names>
+        <name lang="fr">manometre</name>
+    </names>
+    <informations>Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
+    <description>
+        <polygon x4="1" y5="10" x5="1" y6="10" x6="1" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="10" x1="-1" y2="13" x2="-1" y3="13" x3="-1" y4="13"/>
+        <text x="-4" y="6" 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="13" x1="0" y2="14" 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="-3" x1="-3" 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="-3" x1="-3" y2="0" 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" x1="-3" y2="2" 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="6" x1="6" y2="5" 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="-6" y2="5" 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="6" y2="-5" 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="-6" y2="-5" 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" x1="0" y2="-7" x2="0"/>
+        <circle x="-8.60233" y="-8.60233" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="17.2047"/>
+        <circle x="-10" y="-10" 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="0" x1="7" y2="0" 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="0" x1="-8" y2="0" x2="-7"/>
+        <terminal x="0" y="14" orientation="s"/>
+    </description>
+</definition>
diff --git a/elements/energie/solaire/purgeur.elmt b/elements/energie/solaire/purgeur.elmt
new file mode 100644
index 000000000..04769f578
--- /dev/null
+++ b/elements/energie/solaire/purgeur.elmt
@@ -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></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>
diff --git a/elements/energie/solaire/qet_directory b/elements/energie/solaire/qet_directory
new file mode 100644
index 000000000..c08aa8c1a
--- /dev/null
+++ b/elements/energie/solaire/qet_directory
@@ -0,0 +1,6 @@
+<qet-directory>
+    <names>
+        <name lang="fr">Solaire-thermique</name>
+	<name lang="en">Solar-thermal</name>
+    </names>
+</qet-directory>
diff --git a/elements/energie/solaire/raccords_cuivre/coude_90.elmt b/elements/energie/solaire/raccords_cuivre/coude_90.elmt
new file mode 100644
index 000000000..888908361
--- /dev/null
+++ b/elements/energie/solaire/raccords_cuivre/coude_90.elmt
@@ -0,0 +1,11 @@
+<definition width="30" version="0.3" hotspot_x="15" hotspot_y="15" height="30" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">coude à 90</name>
+    </names>
+    <informations></informations>
+    <description>
+        <arc width="12" x="-12" y="-12" antialias="true" height="12" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
+        <terminal x="-6" y="0" orientation="w"/>
+        <terminal x="0" y="-6" orientation="n"/>
+    </description>
+</definition>
diff --git a/elements/energie/solaire/raccords_cuivre/coude_90_grandrayon.elmt b/elements/energie/solaire/raccords_cuivre/coude_90_grandrayon.elmt
new file mode 100644
index 000000000..d72c2d843
--- /dev/null
+++ b/elements/energie/solaire/raccords_cuivre/coude_90_grandrayon.elmt
@@ -0,0 +1,11 @@
+<definition width="30" version="0.3" hotspot_x="15" hotspot_y="15" height="30" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">Coude à 90 grand rayon</name>
+    </names>
+    <informations></informations>
+    <description>
+        <arc width="16" x="-6" y="-6" antialias="true" height="16" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
+        <terminal x="3" y="10" orientation="w"/>
+        <terminal x="10" y="2" orientation="n"/>
+    </description>
+</definition>
diff --git a/elements/energie/solaire/raccords_cuivre/cumulus2.elmt b/elements/energie/solaire/raccords_cuivre/cumulus2.elmt
new file mode 100644
index 000000000..86490634d
--- /dev/null
+++ b/elements/energie/solaire/raccords_cuivre/cumulus2.elmt
@@ -0,0 +1,19 @@
+<definition width="30" version="0.22" hotspot_x="15" hotspot_y="35" height="70" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">cumulus electrique</name>
+    </names>
+    <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="-7.5" x1="-4.25" y2="-10.25" 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="-7" x1="-4.5" y2="-4" x2="4.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="0.5" x1="-5" y2="-3.5" x2="4.75"/>
+        <line 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.75" x1="-4.75" y2="3.5" x2="3.75"/>
+        <line 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.5" x1="-4.5" y2="3.5" 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="-29.5" x1="-9.75" y2="9.25" x2="-9.75"/>
+        <line 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.75" x1="9.75" y2="9.25" x2="9.75"/>
+        <line 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.75" x1="-9.75" y2="9.75" 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="-30" x1="-9.5" y2="-30" x2="9.75"/>
+        <terminal x="0" y="-33.75" orientation="n"/>
+        <terminal x="0.25" y="-35" orientation="n"/>
+    </description>
+</definition>
diff --git a/elements/energie/solaire/raccords_cuivre/qet_directory b/elements/energie/solaire/raccords_cuivre/qet_directory
new file mode 100644
index 000000000..a7a132b55
--- /dev/null
+++ b/elements/energie/solaire/raccords_cuivre/qet_directory
@@ -0,0 +1,5 @@
+<qet-directory>
+    <names>
+        <name lang="fr">Raccords Coudes Tés</name>
+    </names>
+</qet-directory>
diff --git a/elements/energie/solaire/raccords_cuivre/te_droit.elmt b/elements/energie/solaire/raccords_cuivre/te_droit.elmt
new file mode 100644
index 000000000..632c67b69
--- /dev/null
+++ b/elements/energie/solaire/raccords_cuivre/te_droit.elmt
@@ -0,0 +1,13 @@
+<definition width="30" version="0.3" hotspot_x="15" hotspot_y="15" height="30" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">Tés Droit</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="-6" x1="0" 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="0" x1="-6" y2="0" x2="6"/>
+        <terminal x="6" y="0" orientation="e"/>
+        <terminal x="-6" y="0" orientation="w"/>
+        <terminal x="0" y="-6" orientation="n"/>
+    </description>
+</definition>
diff --git a/elements/energie/solaire/raccords_cuivre/te_oblique.elmt b/elements/energie/solaire/raccords_cuivre/te_oblique.elmt
new file mode 100644
index 000000000..75ccb748b
--- /dev/null
+++ b/elements/energie/solaire/raccords_cuivre/te_oblique.elmt
@@ -0,0 +1,13 @@
+<definition width="30" version="0.3" hotspot_x="15" hotspot_y="15" height="30" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">Té pied de biche</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="-11" y2="0" x2="1"/>
+        <arc width="12" x="-12" y="-12" antialias="true" height="12" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
+        <terminal x="1" y="0" orientation="e"/>
+        <terminal x="-11" y="0" orientation="w"/>
+        <terminal x="0" y="-6" orientation="n"/>
+    </description>
+</definition>
diff --git a/elements/energie/solaire/signaletiques/fleche.elmt b/elements/energie/solaire/signaletiques/fleche.elmt
new file mode 100644
index 000000000..5f3afbc61
--- /dev/null
+++ b/elements/energie/solaire/signaletiques/fleche.elmt
@@ -0,0 +1,9 @@
+<definition width="20" version="0.3" hotspot_x="10" hotspot_y="5" height="10" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">direction</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="-7" y2="0" x2="7"/>
+    </description>
+</definition>
diff --git a/elements/energie/solaire/signaletiques/fleche2.elmt b/elements/energie/solaire/signaletiques/fleche2.elmt
new file mode 100644
index 000000000..e4731226f
--- /dev/null
+++ b/elements/energie/solaire/signaletiques/fleche2.elmt
@@ -0,0 +1,9 @@
+<definition width="30" version="0.3" hotspot_x="15" hotspot_y="35" height="70" 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="-31" x1="10" y2="30" x2="-11"/>
+    </description>
+</definition>
diff --git a/elements/energie/solaire/signaletiques/fleche3.elmt b/elements/energie/solaire/signaletiques/fleche3.elmt
new file mode 100644
index 000000000..5ae751155
--- /dev/null
+++ b/elements/energie/solaire/signaletiques/fleche3.elmt
@@ -0,0 +1,9 @@
+<definition width="30" version="0.3" hotspot_x="15" hotspot_y="35" height="70" 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="-31" x1="-11" y2="31" x2="10"/>
+    </description>
+</definition>
diff --git a/elements/energie/solaire/signaletiques/fleche4.elmt b/elements/energie/solaire/signaletiques/fleche4.elmt
new file mode 100644
index 000000000..0863a4ec3
--- /dev/null
+++ b/elements/energie/solaire/signaletiques/fleche4.elmt
@@ -0,0 +1,10 @@
+<definition width="50" version="0.3" hotspot_x="25" hotspot_y="10" height="20" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">fleche 4 long</name>
+    </names>
+    <informations></informations>
+    <description>
+        <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="-22" y2="0" x2="14"/>
+        <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="10" y2="0" x2="20"/>
+    </description>
+</definition>
diff --git a/elements/energie/solaire/signaletiques/fleche_fluide.elmt b/elements/energie/solaire/signaletiques/fleche_fluide.elmt
new file mode 100644
index 000000000..151eb8058
--- /dev/null
+++ b/elements/energie/solaire/signaletiques/fleche_fluide.elmt
@@ -0,0 +1,12 @@
+<definition width="20" version="0.3" hotspot_x="10" hotspot_y="5" height="10" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">sens fluide</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="-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="0" x1="8" y2="0" x2="0"/>
+        <terminal x="-8" y="0" orientation="w"/>
+        <terminal x="8" y="0" orientation="e"/>
+    </description>
+</definition>
diff --git a/elements/energie/solaire/signaletiques/flechedroite.elmt b/elements/energie/solaire/signaletiques/flechedroite.elmt
new file mode 100644
index 000000000..2ca274d5d
--- /dev/null
+++ b/elements/energie/solaire/signaletiques/flechedroite.elmt
@@ -0,0 +1,11 @@
+<definition width="60" version="0.3" hotspot_x="35" hotspot_y="10" height="20" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">sens fluide</name>
+    </names>
+    <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="3" x1="1" y2="0" 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="-3" x1="1" y2="0" 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="0" x1="-25" y2="0" x2="14"/>
+    </description>
+</definition>
diff --git a/elements/energie/solaire/signaletiques/qet_directory b/elements/energie/solaire/signaletiques/qet_directory
new file mode 100644
index 000000000..d24a132e7
--- /dev/null
+++ b/elements/energie/solaire/signaletiques/qet_directory
@@ -0,0 +1,5 @@
+<qet-directory>
+    <names>
+        <name lang="fr">signalétique</name>
+    </names>
+</qet-directory>
diff --git a/elements/energie/solaire/signaletiques/sens3voies.elmt b/elements/energie/solaire/signaletiques/sens3voies.elmt
new file mode 100644
index 000000000..37057b3bf
--- /dev/null
+++ b/elements/energie/solaire/signaletiques/sens3voies.elmt
@@ -0,0 +1,13 @@
+<definition width="50" version="0.3" hotspot_x="25" hotspot_y="15" height="40" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">signalétique V3voies</name>
+    </names>
+    <informations/>
+    <description>
+        <polygon x4="6" y5="12" x5="3.5" y6="11" x6="3.5" y7="11" x7="3.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="12" x1="1" y2="12" x2="-1" y3="15" x3="2" y4="12"/>
+        <polygon x4="-14" y5="1" x5="-10" y6="1" x6="-10" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-1" x1="-14" y2="-5" x2="-17" y3="5" x3="-17" y4="1"/>
+        <arc width="22" x="-20.5" y="1" antialias="true" height="22" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-90"/>
+        <arc width="18" x="-14.5" y="0" antialias="true" height="22" style="line-style:normal;line-weight:normal;filling:none;color:black" start="65" angle="-65"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-14" x2="11" x3="11" x4="19" antialias="false" x5="11" x6="11" x7="-2" x8="-1" closed="false" y1="-1" y2="-1" y3="-5" y4="0" y5="5" y6="1" y7="1" y8="1"/>
+    </description>
+</definition>
diff --git a/elements/energie/solaire/vanne/clap_anti-retour_simple.elmt b/elements/energie/solaire/vanne/clap_anti-retour_simple.elmt
new file mode 100644
index 000000000..c83b8219d
--- /dev/null
+++ b/elements/energie/solaire/vanne/clap_anti-retour_simple.elmt
@@ -0,0 +1,15 @@
+<definition width="20" version="0.3" hotspot_x="10" hotspot_y="10" height="20" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">Clapet anti-retour simple</name>
+    </names>
+    <informations></informations>
+    <description>
+        <polygon x4="3" y5="0" x5="3" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="3" y2="-5" x2="-3" y3="5" x3="-3" 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="-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="3" 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="-7" y2="0" 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="2" y2="4" x2="2"/>
+        <terminal x="-7" y="0" orientation="w"/>
+        <terminal x="7" y="0" orientation="e"/>
+    </description>
+</definition>
diff --git a/elements/energie/solaire/vanne/clap_antiretour_bille.elmt b/elements/energie/solaire/vanne/clap_antiretour_bille.elmt
new file mode 100644
index 000000000..d306924e0
--- /dev/null
+++ b/elements/energie/solaire/vanne/clap_antiretour_bille.elmt
@@ -0,0 +1,15 @@
+<definition width="20" version="0.3" hotspot_x="10" hotspot_y="10" height="20" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">clapet anti-retour à bille</name>
+    </names>
+    <informations></informations>
+    <description>
+        <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="simple" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-6" 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="0" x1="4" 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="-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="-4" x1="3" y2="4" x2="3"/>
+        <terminal x="-7" y="0" orientation="w"/>
+        <terminal x="7" y="0" orientation="e"/>
+    </description>
+</definition>
diff --git a/elements/energie/solaire/vanne/clapet_pompe.elmt b/elements/energie/solaire/vanne/clapet_pompe.elmt
new file mode 100644
index 000000000..d41773ac4
--- /dev/null
+++ b/elements/energie/solaire/vanne/clapet_pompe.elmt
@@ -0,0 +1,12 @@
+<definition width="20" version="0.3" hotspot_x="10" hotspot_y="10" height="20" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">clapet pompe</name>
+    </names>
+    <informations></informations>
+    <description>
+        <polygon x4="3" y5="0" x5="3" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="3" y2="-5" x2="-3" y3="5" x3="-3" 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="-7" y2="0" 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="3" y2="4" x2="3"/>
+        <terminal x="-7" y="0" orientation="w"/>
+    </description>
+</definition>
diff --git a/elements/energie/solaire/vanne/qet_directory b/elements/energie/solaire/vanne/qet_directory
new file mode 100644
index 000000000..16ab947ab
--- /dev/null
+++ b/elements/energie/solaire/vanne/qet_directory
@@ -0,0 +1,5 @@
+<qet-directory>
+    <names>
+        <name lang="fr">vannes clapets soupapes</name>
+    </names>
+</qet-directory>
diff --git a/elements/energie/solaire/vanne/soupape-diff.elmt b/elements/energie/solaire/vanne/soupape-diff.elmt
new file mode 100644
index 000000000..ec5007e4a
--- /dev/null
+++ b/elements/energie/solaire/vanne/soupape-diff.elmt
@@ -0,0 +1,19 @@
+<definition width="40" version="0.3" hotspot_x="20" hotspot_y="35" height="60" type="element" orientation="ndny">
+    <names>
+        <name lang="fr">soupape diferentielle</name>
+    </names>
+    <informations>ne pas confondre 
+soupape de pression différentielle
+( souvre a une pression)
+et
+vanne de maintien de pression différentielle 
+( maintien une pression diff. )</informations>
+    <description>
+        <input x="-20" y="-23.3333" size="3" text="soupape&#xa;différentielle"/>
+        <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"/>
+        <polygon x4="-10" y5="15" x5="-10" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="15" x1="-10" y2="15" x2="10" y3="0" x3="0" y4="15"/>
+        <polygon x4="-15" y5="-10" x5="-15" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="-15" y2="10" x2="-15" y3="0" x3="0" y4="-10"/>
+        <terminal x="-15" y="0" orientation="w"/>
+        <terminal x="0" y="15" orientation="s"/>
+    </description>
+</definition>
diff --git a/elements/energie/solaire/vanne/vanne-arret.elmt b/elements/energie/solaire/vanne/vanne-arret.elmt
new file mode 100644
index 000000000..3b6eef9f9
--- /dev/null
+++ b/elements/energie/solaire/vanne/vanne-arret.elmt
@@ -0,0 +1,13 @@
+<definition width="30" version="0.3" hotspot_x="15" hotspot_y="15" height="30" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">vanne d'arret, d'isolement</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="-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>
diff --git a/elements/energie/solaire/vanne/vanne2.elmt b/elements/energie/solaire/vanne/vanne2.elmt
new file mode 100644
index 000000000..4336dbd9a
--- /dev/null
+++ b/elements/energie/solaire/vanne/vanne2.elmt
@@ -0,0 +1,16 @@
+<definition width="40" version="0.3" hotspot_x="20" hotspot_y="40" height="60" type="element" orientation="dyyy">
+    <names>
+        <name lang="fr">vanne 2 voies</name>
+    </names>
+    <informations/>
+    <description>
+        <rect width="20" x="-10" y="-31" antialias="false" height="20" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <text x="-5" y="-19" size="6" text="V1"/>
+        <line length1="2.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" 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="-10" x1="-1" y2="-1" x2="-1"/>
+        <polygon x4="15" y5="10" x5="15" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="15" y2="0" x2="0" y3="-10" x3="15" y4="10"/>
+        <polygon x4="0" y5="0" x5="0" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="0" y2="-10" x2="-15" y3="10" x3="-15" y4="0"/>
+        <terminal x="-15" y="0" orientation="w"/>
+        <terminal x="15" y="0" orientation="e"/>
+    </description>
+</definition>
diff --git a/elements/energie/solaire/vanne/vanne3.elmt b/elements/energie/solaire/vanne/vanne3.elmt
new file mode 100644
index 000000000..80a2bd999
--- /dev/null
+++ b/elements/energie/solaire/vanne/vanne3.elmt
@@ -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 3 voies</name>
+    </names>
+    <informations/>
+    <description>
+        <rect width="20" x="-10" y="-31" antialias="false" height="20" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <input x="-5" y="-16.3333" size="6" rotate="true" text="V1"/>
+        <line 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="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="-10" x1="-1" y2="-1" x2="-1"/>
+        <polygon x4="-10" y5="16" x5="-10" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="16" x1="-10" y2="16" x2="10" y3="0" x3="0" y4="16"/>
+        <polygon x4="15" y5="-10" x5="15" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="15" y2="10" x2="15" y3="0" x3="0" y4="-10"/>
+        <polygon x4="-15" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="-15" y2="10" x2="-15" y3="0" x3="0" y4="-10"/>
+        <terminal x="-15" y="0" orientation="w"/>
+        <terminal x="15" y="0" orientation="e"/>
+        <terminal x="0" y="16" orientation="s"/>
+        <terminal x="0" y="-31" orientation="n"/>
+    </description>
+</definition>
diff --git a/elements/energie/solaire/vanne/vanne_diferentielle.elmt b/elements/energie/solaire/vanne/vanne_diferentielle.elmt
new file mode 100644
index 000000000..b8ab839cc
--- /dev/null
+++ b/elements/energie/solaire/vanne/vanne_diferentielle.elmt
@@ -0,0 +1,14 @@
+<definition width="40" version="0.3" hotspot_x="20" hotspot_y="35" height="60" type="element" orientation="ndny">
+    <names>
+        <name lang="fr">vanne diferentielle</name>
+    </names>
+    <informations/>
+    <description>
+        <input x="-19" y="-23" size="3" text="vanne pression&#xa;différentielle"/>
+        <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"/>
+        <polygon x4="-10" y5="15" x5="-10" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="15" x1="-10" y2="15" x2="10" y3="0" x3="0" y4="15"/>
+        <polygon x4="-15" y5="-10" x5="-15" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="-15" y2="10" x2="-15" y3="0" x3="0" y4="-10"/>
+        <terminal x="-15" y="0" orientation="w"/>
+        <terminal x="0" y="15" orientation="s"/>
+    </description>
+</definition>
diff --git a/elements/energie/solaire/vidange.elmt b/elements/energie/solaire/vidange.elmt
new file mode 100644
index 000000000..7aeb49b2b
--- /dev/null
+++ b/elements/energie/solaire/vidange.elmt
@@ -0,0 +1,18 @@
+<definition width="40" version="0.22" hotspot_x="20" hotspot_y="25" height="50" type="element" orientation="dnnn">
+    <names>
+        <name lang="fr">vidange égout</name>
+    </names>
+    <informations></informations>
+    <description>
+        <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="-13" orientation="n"/>
+    </description>
+</definition>