diff --git a/elements/10_electric/20_manufacturers_articles/delta/dvp-se.elmt b/elements/10_electric/20_manufacturers_articles/delta/dvp-se.elmt
deleted file mode 100644
index e73a83089..000000000
--- a/elements/10_electric/20_manufacturers_articles/delta/dvp-se.elmt
+++ /dev/null
@@ -1,87 +0,0 @@
-
-
-
- DVP-SE
- DVP-SE
- DVP-SE
- DVP-SE
- DVP-SE
- DVP-SE
- DVP-SE
- DVP-SE
-
- Author: Guillaume Morel
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/elements/10_electric/20_manufacturers_articles/delta/frequency_drives/qet_directory b/elements/10_electric/20_manufacturers_articles/delta/frequency_drives/qet_directory
new file mode 100644
index 000000000..a5e89db99
--- /dev/null
+++ b/elements/10_electric/20_manufacturers_articles/delta/frequency_drives/qet_directory
@@ -0,0 +1,14 @@
+
+
+ Frequenzumrichter
+ Преобразователи частоты
+ Frequency drives
+ Variateurs de fréquence
+ مُغيّرات تردّد
+ Przemienniki częstotliwości
+ Inverter
+ Převodníky kmitočtu
+ Ρυθμιστές στροφών
+ Frequentieomvormers
+
+
diff --git a/elements/10_electric/20_manufacturers_articles/delta/vfd007e43t.elmt b/elements/10_electric/20_manufacturers_articles/delta/frequency_drives/vfd007e43t.elmt
similarity index 100%
rename from elements/10_electric/20_manufacturers_articles/delta/vfd007e43t.elmt
rename to elements/10_electric/20_manufacturers_articles/delta/frequency_drives/vfd007e43t.elmt
diff --git a/elements/10_electric/20_manufacturers_articles/delta/input_output_cards/dvp16sp11r/dvp16sp11r(inputs).elmt b/elements/10_electric/20_manufacturers_articles/delta/input_output_cards/dvp16sp11r/dvp16sp11r(inputs).elmt
new file mode 100644
index 000000000..bec91ae26
--- /dev/null
+++ b/elements/10_electric/20_manufacturers_articles/delta/input_output_cards/dvp16sp11r/dvp16sp11r(inputs).elmt
@@ -0,0 +1,79 @@
+
+
+
+ DVP16SP11R (inputs)
+
+
+ License: see http://qelectrotech.org/wiki/doc/elements_license
+
+
+ 24 V DC INPUTS
+
+
+
+
+
+
+
+
+
+
+
+
+ X7
+
+
+ X6
+
+
+ X5
+
+
+
+ X4
+
+
+ X3
+
+
+ X2
+
+
+
+ X1
+
+
+ S/S
+
+
+ X0
+
+
+
+
+
+
+
+
+
+
+
+
+
+ DVP16SP11R DI x 8 24VDC
+
+
+
+ label
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/elements/10_electric/20_manufacturers_articles/delta/input_output_cards/dvp16sp11r/dvp16sp11r(outputs).elmt b/elements/10_electric/20_manufacturers_articles/delta/input_output_cards/dvp16sp11r/dvp16sp11r(outputs).elmt
new file mode 100644
index 000000000..8e1c940cb
--- /dev/null
+++ b/elements/10_electric/20_manufacturers_articles/delta/input_output_cards/dvp16sp11r/dvp16sp11r(outputs).elmt
@@ -0,0 +1,79 @@
+
+
+
+ DVP16SP11R (outputs)
+
+
+ License: see http://qelectrotech.org/wiki/doc/elements_license
+
+
+ RELAY OUTPUTS
+
+
+
+ Y7
+
+
+
+
+
+
+
+
+
+
+
+ C0
+
+
+ Y1
+
+
+ Y6
+
+
+
+ Y5
+
+
+ Y4
+
+
+ Y3
+
+
+ Y2
+
+
+ Y0
+
+
+
+
+
+
+
+
+
+
+
+
+
+ DVP16SP11R RLY x 8
+
+
+
+
+ label
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/elements/10_electric/20_manufacturers_articles/delta/input_output_cards/dvp16sp11r/dvp16sp11r.elmt b/elements/10_electric/20_manufacturers_articles/delta/input_output_cards/dvp16sp11r/dvp16sp11r.elmt
new file mode 100644
index 000000000..412cf7bd2
--- /dev/null
+++ b/elements/10_electric/20_manufacturers_articles/delta/input_output_cards/dvp16sp11r/dvp16sp11r.elmt
@@ -0,0 +1,69 @@
+
+
+
+ DVP16SP11R
+ DVP16SP11R
+ DVP16SP11R
+ DVP16SP11R
+ DVP16SP11R
+ DVP16SP11R
+ DVP16SP11R
+ DVP16SP11R
+
+
+ Author: Guillaume Morel
+
+
+
+
+
+
+
+ label
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/elements/10_electric/20_manufacturers_articles/delta/input_output_cards/dvp16sp11r/qet_directory b/elements/10_electric/20_manufacturers_articles/delta/input_output_cards/dvp16sp11r/qet_directory
new file mode 100644
index 000000000..0fd2a6189
--- /dev/null
+++ b/elements/10_electric/20_manufacturers_articles/delta/input_output_cards/dvp16sp11r/qet_directory
@@ -0,0 +1,11 @@
+
+
+ DVP16SP11R
+ DVP16SP11R
+ DVP16SP11R
+ DVP16SP11R
+ DVP16SP11R
+ DVP16SP11R
+ DVP16SP11R
+
+
diff --git a/elements/10_electric/20_manufacturers_articles/delta/input_output_cards/qet_directory b/elements/10_electric/20_manufacturers_articles/delta/input_output_cards/qet_directory
new file mode 100644
index 000000000..ed6b6c3d9
--- /dev/null
+++ b/elements/10_electric/20_manufacturers_articles/delta/input_output_cards/qet_directory
@@ -0,0 +1,6 @@
+
+
+ Input Output cards
+ Cartes d'entrées sorties
+
+
diff --git a/elements/10_electric/20_manufacturers_articles/delta/plc_and_controllers/dvp12se11r/dvp12se11r(inputs).elmt b/elements/10_electric/20_manufacturers_articles/delta/plc_and_controllers/dvp12se11r/dvp12se11r(inputs).elmt
new file mode 100644
index 000000000..7407eff89
--- /dev/null
+++ b/elements/10_electric/20_manufacturers_articles/delta/plc_and_controllers/dvp12se11r/dvp12se11r(inputs).elmt
@@ -0,0 +1,79 @@
+
+
+
+ DVP12SE11R (inputs)
+
+
+ License: see http://qelectrotech.org/wiki/doc/elements_license
+
+
+ 24 V DC INPUTS
+
+
+
+
+
+
+
+
+
+
+ X7
+
+
+ X6
+
+
+ X5
+
+
+
+ X4
+
+
+
+ X3
+
+
+
+ X2
+
+
+ X1
+
+
+
+ S/S
+
+
+ X0
+
+
+
+
+
+
+
+
+
+
+
+
+
+ DVP14SS211T - INPUTS
+
+
+
+ label
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/elements/10_electric/20_manufacturers_articles/delta/plc_and_controllers/dvp12se11r/dvp12se11r(outputs).elmt b/elements/10_electric/20_manufacturers_articles/delta/plc_and_controllers/dvp12se11r/dvp12se11r(outputs).elmt
new file mode 100644
index 000000000..f958ef5ac
--- /dev/null
+++ b/elements/10_electric/20_manufacturers_articles/delta/plc_and_controllers/dvp12se11r/dvp12se11r(outputs).elmt
@@ -0,0 +1,79 @@
+
+
+
+ DVP12SE11R (outputs)
+
+
+ License: see http://qelectrotech.org/wiki/doc/elements_license
+
+
+ RELAY OUTPUTS
+
+
+
+ COM3-
+
+
+
+
+
+
+
+
+
+
+
+ C0
+
+
+ Y1
+
+
+ COM3+
+
+
+
+ SG
+
+
+ -
+
+
+ Y3
+
+
+
+ Y2
+
+
+
+ Y0
+
+
+
+
+
+
+
+
+
+
+
+
+ DVP12SE11R - OUTPUTS
+
+
+
+
+ label
+
+
+
+
+
+
+
+
+
+
+
diff --git a/elements/10_electric/20_manufacturers_articles/delta/plc_and_controllers/dvp12se11r/dvp12se11r.elmt b/elements/10_electric/20_manufacturers_articles/delta/plc_and_controllers/dvp12se11r/dvp12se11r.elmt
new file mode 100644
index 000000000..d5618b16a
--- /dev/null
+++ b/elements/10_electric/20_manufacturers_articles/delta/plc_and_controllers/dvp12se11r/dvp12se11r.elmt
@@ -0,0 +1,96 @@
+
+
+
+ DVP12SE11R
+ DVP12SE11R
+ DVP12SE11R
+ DVP12SE11R
+ DVP12SE11R
+ DVP12SE11R
+ DVP12SE11R
+ DVP12SE11R
+
+
+ Author: Rafał Zapała
+
+
+
+
+
+
+
+ label
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/elements/10_electric/20_manufacturers_articles/delta/plc_and_controllers/dvp12se11r/qet_directory b/elements/10_electric/20_manufacturers_articles/delta/plc_and_controllers/dvp12se11r/qet_directory
new file mode 100644
index 000000000..c32fe07ce
--- /dev/null
+++ b/elements/10_electric/20_manufacturers_articles/delta/plc_and_controllers/dvp12se11r/qet_directory
@@ -0,0 +1,11 @@
+
+
+ DVP12SE11R
+ DVP12SE11R
+ DVP12SE11R
+ DVP12SE11R
+ DVP12SE11R
+ DVP12SE11R
+ DVP12SE11R
+
+
diff --git a/elements/10_electric/20_manufacturers_articles/delta/plc_and_controllers/dvp12ss211s/dvp12ss211s(inputs).elmt b/elements/10_electric/20_manufacturers_articles/delta/plc_and_controllers/dvp12ss211s/dvp12ss211s(inputs).elmt
new file mode 100644
index 000000000..d670c1a56
--- /dev/null
+++ b/elements/10_electric/20_manufacturers_articles/delta/plc_and_controllers/dvp12ss211s/dvp12ss211s(inputs).elmt
@@ -0,0 +1,79 @@
+
+
+
+ DVP12SS211S (inputs)
+
+
+ License: see http://qelectrotech.org/wiki/doc/elements_license
+
+
+ 24 V DC INPUTS
+
+
+
+
+
+
+
+
+
+
+ X7
+
+
+ X6
+
+
+ X5
+
+
+
+ X4
+
+
+
+ X3
+
+
+
+ X2
+
+
+ X1
+
+
+
+ S/S
+
+
+ X0
+
+
+
+
+
+
+
+
+
+
+
+
+
+ DVP14SS211T - INPUTS
+
+
+
+ label
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/elements/10_electric/20_manufacturers_articles/delta/plc_and_controllers/dvp12ss211s/dvp12ss211s(outputs).elmt b/elements/10_electric/20_manufacturers_articles/delta/plc_and_controllers/dvp12ss211s/dvp12ss211s(outputs).elmt
new file mode 100644
index 000000000..6ea107968
--- /dev/null
+++ b/elements/10_electric/20_manufacturers_articles/delta/plc_and_controllers/dvp12ss211s/dvp12ss211s(outputs).elmt
@@ -0,0 +1,78 @@
+
+
+
+ DVP12SS211S (outputs)
+
+
+ License: see http://qelectrotech.org/wiki/doc/elements_license
+
+
+ 24 V DC OUTPUTS
+
+
+
+ Y3
+
+
+
+
+
+
+
+
+
+
+ UP
+
+
+
+ -
+
+
+ Y2
+
+
+ Y1
+
+
+ Y0
+
+
+
+ PWM
+
+
+ DA
+
+
+ ZP
+
+
+
+
+
+
+
+
+
+
+
+
+
+ DVP12SS211S - OUTPUTS
+
+
+
+
+ label
+
+
+
+
+
+
+
+
+
+
+
diff --git a/elements/10_electric/20_manufacturers_articles/delta/plc_and_controllers/dvp12ss211s/dvp12ss211s.elmt b/elements/10_electric/20_manufacturers_articles/delta/plc_and_controllers/dvp12ss211s/dvp12ss211s.elmt
new file mode 100644
index 000000000..00dc82e8c
--- /dev/null
+++ b/elements/10_electric/20_manufacturers_articles/delta/plc_and_controllers/dvp12ss211s/dvp12ss211s.elmt
@@ -0,0 +1,97 @@
+
+
+
+ DVP12SS211S
+ DVP12SS211S
+ DVP12SS211S
+ DVP12SS211S
+ DVP12SS211S
+ DVP12SS211S
+ DVP12SS211S
+ DVP12SS211S
+
+
+ Author: Rafał Zapała
+
+
+
+
+
+
+
+ label
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/elements/10_electric/20_manufacturers_articles/delta/plc_and_controllers/dvp12ss211s/qet_directory b/elements/10_electric/20_manufacturers_articles/delta/plc_and_controllers/dvp12ss211s/qet_directory
new file mode 100644
index 000000000..809d3cc16
--- /dev/null
+++ b/elements/10_electric/20_manufacturers_articles/delta/plc_and_controllers/dvp12ss211s/qet_directory
@@ -0,0 +1,11 @@
+
+
+ DVP12SS211S
+ DVP12SS211S
+ DVP12SS211S
+ DVP12SS211S
+ DVP12SS211S
+ DVP12SS211S
+ DVP12SS211S
+
+
diff --git a/elements/10_electric/20_manufacturers_articles/delta/plc_and_controllers/dvp14ss211r/dvp14ss211r(inputs).elmt b/elements/10_electric/20_manufacturers_articles/delta/plc_and_controllers/dvp14ss211r/dvp14ss211r(inputs).elmt
new file mode 100644
index 000000000..2f6effdb8
--- /dev/null
+++ b/elements/10_electric/20_manufacturers_articles/delta/plc_and_controllers/dvp14ss211r/dvp14ss211r(inputs).elmt
@@ -0,0 +1,79 @@
+
+
+
+ DVP14SS211R (inputs)
+
+
+ License: see http://qelectrotech.org/wiki/doc/elements_license
+
+
+ 24 V DC INPUTS
+
+
+
+
+
+
+
+
+
+
+ X7
+
+
+ X6
+
+
+ X5
+
+
+
+ X4
+
+
+
+ X3
+
+
+
+ X2
+
+
+ X1
+
+
+
+ S/S
+
+
+ X0
+
+
+
+
+
+
+
+
+
+
+
+
+
+ DVP14SS211R - INPUTS
+
+
+
+ label
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/elements/10_electric/20_manufacturers_articles/delta/plc_and_controllers/dvp14ss211r/dvp14ss211r(outputs).elmt b/elements/10_electric/20_manufacturers_articles/delta/plc_and_controllers/dvp14ss211r/dvp14ss211r(outputs).elmt
new file mode 100644
index 000000000..db92d2af2
--- /dev/null
+++ b/elements/10_electric/20_manufacturers_articles/delta/plc_and_controllers/dvp14ss211r/dvp14ss211r(outputs).elmt
@@ -0,0 +1,78 @@
+
+
+
+ DVP14SS211R (outputs)
+
+
+ License: see http://qelectrotech.org/wiki/doc/elements_license
+
+
+ RELAY OUTPUTS
+
+
+
+ Y5
+
+
+
+
+
+
+
+
+
+
+ C0
+
+
+
+ Y1
+
+
+ Y4
+
+
+ Y3
+
+
+ C1
+
+
+
+ -
+
+
+ Y2
+
+
+ Y0
+
+
+
+
+
+
+
+
+
+
+
+
+
+ DVP14SS211R - OUTPUTS
+
+
+
+
+ label
+
+
+
+
+
+
+
+
+
+
+
diff --git a/elements/10_electric/20_manufacturers_articles/delta/plc_and_controllers/dvp14ss211r/dvp14ss211r.elmt b/elements/10_electric/20_manufacturers_articles/delta/plc_and_controllers/dvp14ss211r/dvp14ss211r.elmt
new file mode 100644
index 000000000..7894ba80a
--- /dev/null
+++ b/elements/10_electric/20_manufacturers_articles/delta/plc_and_controllers/dvp14ss211r/dvp14ss211r.elmt
@@ -0,0 +1,97 @@
+
+
+
+ DVP14SS211R
+ DVP14SS211R
+ DVP14SS211R
+ DVP14SS211R
+ DVP14SS211R
+ DVP14SS211R
+ DVP14SS211R
+ DVP14SS211R
+
+
+ Author: Guillaume Morel
+
+
+
+
+
+
+
+ label
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/elements/10_electric/20_manufacturers_articles/delta/plc_and_controllers/dvp14ss211r/qet_directory b/elements/10_electric/20_manufacturers_articles/delta/plc_and_controllers/dvp14ss211r/qet_directory
new file mode 100644
index 000000000..09d4a4051
--- /dev/null
+++ b/elements/10_electric/20_manufacturers_articles/delta/plc_and_controllers/dvp14ss211r/qet_directory
@@ -0,0 +1,11 @@
+
+
+ DVP14SS211R
+ DVP14SS211R
+ DVP14SS211R
+ DVP14SS211R
+ DVP14SS211R
+ DVP14SS211R
+ DVP14SS211R
+
+
diff --git a/elements/10_electric/20_manufacturers_articles/delta/plc_and_controllers/dvp14ss211t/dvp14ss211t(inputs).elmt b/elements/10_electric/20_manufacturers_articles/delta/plc_and_controllers/dvp14ss211t/dvp14ss211t(inputs).elmt
new file mode 100644
index 000000000..a4733ab03
--- /dev/null
+++ b/elements/10_electric/20_manufacturers_articles/delta/plc_and_controllers/dvp14ss211t/dvp14ss211t(inputs).elmt
@@ -0,0 +1,79 @@
+
+
+
+ DVP14SS211T (inputs)
+
+
+ License: see http://qelectrotech.org/wiki/doc/elements_license
+
+
+ 24 V DC INPUTS
+
+
+
+
+
+
+
+
+
+
+ X7
+
+
+ X6
+
+
+ X5
+
+
+
+ X4
+
+
+
+ X3
+
+
+
+ X2
+
+
+ X1
+
+
+
+ S/S
+
+
+ X0
+
+
+
+
+
+
+
+
+
+
+
+
+
+ DVP14SS211T - INPUTS
+
+
+
+ label
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/elements/10_electric/20_manufacturers_articles/delta/plc_and_controllers/dvp14ss211t/dvp14ss211t(outputs).elmt b/elements/10_electric/20_manufacturers_articles/delta/plc_and_controllers/dvp14ss211t/dvp14ss211t(outputs).elmt
new file mode 100644
index 000000000..d70ab4529
--- /dev/null
+++ b/elements/10_electric/20_manufacturers_articles/delta/plc_and_controllers/dvp14ss211t/dvp14ss211t(outputs).elmt
@@ -0,0 +1,78 @@
+
+
+
+ DVP14SS211T (outputs)
+
+
+ License: see http://qelectrotech.org/wiki/doc/elements_license
+
+
+ 24 V DC OUTPUTS
+
+
+
+ Y5
+
+
+
+
+
+
+
+
+
+ UP
+
+
+ -
+
+
+
+ Y4
+
+
+
+ Y3
+
+
+ Y2
+
+
+ Y1
+
+
+
+ Y0
+
+
+ ZP
+
+
+
+
+
+
+
+
+
+
+
+
+
+ DVP14SS211T - OUTPUTS
+
+
+
+
+ label
+
+
+
+
+
+
+
+
+
+
+
diff --git a/elements/10_electric/20_manufacturers_articles/delta/plc_and_controllers/dvp14ss211t/dvp14ss211t.elmt b/elements/10_electric/20_manufacturers_articles/delta/plc_and_controllers/dvp14ss211t/dvp14ss211t.elmt
new file mode 100644
index 000000000..9f1e0c031
--- /dev/null
+++ b/elements/10_electric/20_manufacturers_articles/delta/plc_and_controllers/dvp14ss211t/dvp14ss211t.elmt
@@ -0,0 +1,97 @@
+
+
+
+ DVP14SS211T
+ DVP14SS211T
+ DVP14SS211T
+ DVP14SS211T
+ DVP14SS211T
+ DVP14SS211T
+ DVP14SS211T
+ DVP14SS211T
+
+
+ Author: Guillaume Morel
+
+
+
+
+
+
+
+ label
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/elements/10_electric/20_manufacturers_articles/delta/plc_and_controllers/dvp14ss211t/qet_directory b/elements/10_electric/20_manufacturers_articles/delta/plc_and_controllers/dvp14ss211t/qet_directory
new file mode 100644
index 000000000..008fb243e
--- /dev/null
+++ b/elements/10_electric/20_manufacturers_articles/delta/plc_and_controllers/dvp14ss211t/qet_directory
@@ -0,0 +1,11 @@
+
+
+ DVP14SS211T
+ DVP14SS211T
+ DVP14SS211T
+ DVP14SS211T
+ DVP14SS211T
+ DVP14SS211T
+ DVP14SS211T
+
+
diff --git a/elements/10_electric/20_manufacturers_articles/delta/plc_and_controllers/qet_directory b/elements/10_electric/20_manufacturers_articles/delta/plc_and_controllers/qet_directory
new file mode 100644
index 000000000..74d9fc5f1
--- /dev/null
+++ b/elements/10_electric/20_manufacturers_articles/delta/plc_and_controllers/qet_directory
@@ -0,0 +1,11 @@
+
+
+ ПЛК и схемы управления
+ SPS und Steuerungen
+ Sterowniki PLC i kontrolery
+ PLC e controllori
+ PLC and controllers
+ API et commandes
+ PLC a řízení
+
+
diff --git a/elements/10_electric/20_manufacturers_articles/legrand/leg069731.elmt b/elements/10_electric/20_manufacturers_articles/legrand/leg069731.elmt
new file mode 100644
index 000000000..17444d3b2
--- /dev/null
+++ b/elements/10_electric/20_manufacturers_articles/legrand/leg069731.elmt
@@ -0,0 +1,47 @@
+
+
+
+ Prise Plexo 16A
+ Gniazdo wtyczkowe
+ Contact AC + aarde
+ Zásuvka jednopólová
+ مقبس أحادي الوجه
+ Toma corriente 3P
+ Outlet 3 poles
+ Presa monofase
+ Steckdose 3-polig
+
+
+
+ Prise Plexo 20A
+
+
+
+
+ LEG069731
+ Legrand
+
+
+ Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license
+
+
+
+ label
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/elements/10_electric/20_manufacturers_articles/legrand/leg413098.elmt b/elements/10_electric/20_manufacturers_articles/legrand/leg413098.elmt
new file mode 100644
index 000000000..efbb429eb
--- /dev/null
+++ b/elements/10_electric/20_manufacturers_articles/legrand/leg413098.elmt
@@ -0,0 +1,57 @@
+
+
+
+ Single phase transducer 63VA
+ eenfase transformator 63VA
+ Trasformatore monofase 63VA
+ Transformator jednofazowy 63VA
+ Transformador monofásico 63VA
+ محوّل أحادي الوجه
+ Transformator einphasig 63VA
+ Transformador monofásico Yyd 63VA
+ Jednofázový transformátor 63VA
+ Transfo mono 63VA
+ Однофазный трансформатор 63VA
+
+
+ 63VA
+ TRANSFORMATEUR MODULAIRE 230/24V 63VA
+
+ Legrand
+
+
+
+ LEG413098
+
+
+ Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license
+
+
+ 24V
+
+
+
+ 230V
+
+
+
+
+ label
+
+
+
+
+
+
+
+ 63VA
+ comment
+
+
+
+
+
+
+
+
diff --git a/elements/10_electric/20_manufacturers_articles/schneider_electric/light/light_230V/xb4bvm1_blanc.elmt b/elements/10_electric/20_manufacturers_articles/schneider_electric/light/light_230V/xb4bvm1_blanc.elmt
index efc3fc264..f16a55d68 100644
--- a/elements/10_electric/20_manufacturers_articles/schneider_electric/light/light_230V/xb4bvm1_blanc.elmt
+++ b/elements/10_electric/20_manufacturers_articles/schneider_electric/light/light_230V/xb4bvm1_blanc.elmt
@@ -1,52 +1,47 @@
-
-
+
+
- Lâmpada
- Světlo
- Luce
- Λυχνία
- Lamp
- Лампа
- Meldeleuchte
- Light
- Lampa
Lámpara
- مصباح
+ Лампа
+ Světlo
+ Lampa
+ Λυχνία
+ Meldeleuchte
+ Luce
XB4BVM1_BLANC
+ Lâmpada
+ Lamp
+ Light
+ مصباح
-
-
-
- BLANC
- SCHNEIDER
- XB4BVM1
-
-
+ Schneider Electric
+ XB4BVM1
+ Voyant lumineux blanc 230V
+
+
+
- Author: The QElectroTech team
+ Author: The QElectroTech team
License: see http://qelectrotech.org/wiki/doc/elements_license
-
-
-
-
-
-
+
+
+
+
+
+
label
-
- BLANC
- description
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/elements/10_electric/20_manufacturers_articles/schneider_electric/light/light_230V/xb4bvm3_vert.elmt b/elements/10_electric/20_manufacturers_articles/schneider_electric/light/light_230V/xb4bvm3_vert.elmt
index 06045f549..f067c20ff 100644
--- a/elements/10_electric/20_manufacturers_articles/schneider_electric/light/light_230V/xb4bvm3_vert.elmt
+++ b/elements/10_electric/20_manufacturers_articles/schneider_electric/light/light_230V/xb4bvm3_vert.elmt
@@ -1,50 +1,47 @@
-
-
+
+
- Лампа
- Meldeleuchte
- XB4BVM3_VERT
- Lamp
- Luce
- Lampa
- مصباح
- Lâmpada
- Λυχνία
- Light
Lámpara
+ Лампа
Světlo
+ Lampa
+ Λυχνία
+ Meldeleuchte
+ Luce
+ XB4BVM3_VERT
+ Lâmpada
+ Lamp
+ Light
+ مصباح
- SCHNEIDER
-
-
-
-
-
- XB4BVM3
- VERT
+ Schneider Electric
+ XB4BVM3
+
+ Voyant lumineux vert 230V
+
+
+
+
- Author: The QElectroTech team
+ Author: The QElectroTech team
License: see http://qelectrotech.org/wiki/doc/elements_license
-
-
-
-
-
-
-
+
+
+
+
+
+
+
label
-
-
- VERT
- description
-
-
-
-
+
+
+
+
+
diff --git a/elements/10_electric/20_manufacturers_articles/schneider_electric/light/light_230V/xb4bvm4_rouge.elmt b/elements/10_electric/20_manufacturers_articles/schneider_electric/light/light_230V/xb4bvm4_rouge.elmt
index ca3788fe1..0dd00e0b4 100644
--- a/elements/10_electric/20_manufacturers_articles/schneider_electric/light/light_230V/xb4bvm4_rouge.elmt
+++ b/elements/10_electric/20_manufacturers_articles/schneider_electric/light/light_230V/xb4bvm4_rouge.elmt
@@ -1,52 +1,47 @@
-
-
+
+
- Lâmpada
- Světlo
- Luce
- Λυχνία
- Lamp
- Лампа
- Meldeleuchte
- Light
- Lampa
Lámpara
- مصباح
+ Лампа
+ Světlo
+ Lampa
+ Λυχνία
+ Meldeleuchte
+ Luce
XB4BVM4_ROUGE
+ Lâmpada
+ Lamp
+ Light
+ مصباح
-
-
-
- ROUGE
- SCHNEIDER
- XB4BVM4
-
-
+ Schneider Electric
+ XB4BVM4
+ Voyant lumineux rouge 230V
+
+
+
- Author: The QElectroTech team
+ Author: The QElectroTech team
License: see http://qelectrotech.org/wiki/doc/elements_license
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
label
-
- ROUGE
- description
-
-
-
+
+
+
+
+
+
diff --git a/elements/10_electric/20_manufacturers_articles/schneider_electric/light/light_230V/xb4bvm5_orange.elmt b/elements/10_electric/20_manufacturers_articles/schneider_electric/light/light_230V/xb4bvm5_orange.elmt
index 314e60453..a7bb70bd7 100644
--- a/elements/10_electric/20_manufacturers_articles/schneider_electric/light/light_230V/xb4bvm5_orange.elmt
+++ b/elements/10_electric/20_manufacturers_articles/schneider_electric/light/light_230V/xb4bvm5_orange.elmt
@@ -1,52 +1,47 @@
-
-
+
+
- Lâmpada
- Světlo
- Luce
- Λυχνία
- Lamp
- Лампа
- Meldeleuchte
- Light
- Lampa
Lámpara
- مصباح
+ Лампа
+ Světlo
+ Lampa
+ Λυχνία
+ Meldeleuchte
+ Luce
XB4BVM5_ORANGE
+ Lâmpada
+ Lamp
+ Light
+ مصباح
-
-
-
- ORANGE
- SCHNEIDER
- XB4BVM5
-
-
+ Schneider Electric
+ XB4BVM5
+ Voyant lumineux orange 230V
+
+
+
- Author: The QElectroTech team
+ Author: The QElectroTech team
License: see http://qelectrotech.org/wiki/doc/elements_license
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
label
-
- ORANGE
- description
-
-
-
+
+
+
+
+
diff --git a/elements/10_electric/20_manufacturers_articles/schneider_electric/light/light_230V/xb4bvm6_bleu.elmt b/elements/10_electric/20_manufacturers_articles/schneider_electric/light/light_230V/xb4bvm6_bleu.elmt
index 1a6c83dd8..2797989b7 100644
--- a/elements/10_electric/20_manufacturers_articles/schneider_electric/light/light_230V/xb4bvm6_bleu.elmt
+++ b/elements/10_electric/20_manufacturers_articles/schneider_electric/light/light_230V/xb4bvm6_bleu.elmt
@@ -1,49 +1,47 @@
-
-
+
+
- Lâmpada
- Světlo
- Luce
- Λυχνία
- Lamp
- Лампа
- Meldeleuchte
- Light
- Lampa
Lámpara
- مصباح
+ Лампа
+ Světlo
+ Λυχνία
+ Lampa
+ Meldeleuchte
+ Luce
XB4BVM6_BLEU
+ Lâmpada
+ Lamp
+ مصباح
+ Light
-
-
-
- BLEU
- SCHNEIDER
- XB4BVM6
-
-
+ Schneider Electric
+ XB4BVM6
+ Voyant lumineux bleu 230V
+
+
+
- Author: The QElectroTech team
+ Author: The QElectroTech team
License: see http://qelectrotech.org/wiki/doc/elements_license
-
-
-
-
-
-
+
+
+
+
+
+
+
label
-
- BLEU
- description
-
-
-
+
+
+
+
+
diff --git a/elements/10_electric/20_manufacturers_articles/schneider_electric/light/light_24V/xb4bvb1_blanc.elmt b/elements/10_electric/20_manufacturers_articles/schneider_electric/light/light_24V/xb4bvb1_blanc.elmt
index 5b87319d9..6cadd7a86 100644
--- a/elements/10_electric/20_manufacturers_articles/schneider_electric/light/light_24V/xb4bvb1_blanc.elmt
+++ b/elements/10_electric/20_manufacturers_articles/schneider_electric/light/light_24V/xb4bvb1_blanc.elmt
@@ -1,52 +1,49 @@
-
-
+
+
- Лампа
- Meldeleuchte
- XB4BVB1_BLANC
+ Light
Lamp
Luce
Lampa
- مصباح
- Light
Lâmpada
+ مصباح
Λυχνία
+ Meldeleuchte
Lámpara
Světlo
+ XB4BVB1_BLANC
+ Лампа
-
- SCHNEIDER
-
-
-
-
-
- XB4BVB1
-
- BLANC
-
+
+ Bouton poussoir lumineux blanc 24V
+
+ Schneider Electric
+
+
+
+
+
+ XB4BVB1
+
- Author: The QElectroTech team
+ Author: The QElectroTech team
License: see http://qelectrotech.org/wiki/doc/elements_license
-
-
-
-
-
-
+
+
+
+
+
+
label
-
- BLANC
- description
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/elements/10_electric/20_manufacturers_articles/schneider_electric/light/light_24V/xb4bvb3_vert.elmt b/elements/10_electric/20_manufacturers_articles/schneider_electric/light/light_24V/xb4bvb3_vert.elmt
index 7aa9a6dcc..2f959e3a8 100644
--- a/elements/10_electric/20_manufacturers_articles/schneider_electric/light/light_24V/xb4bvb3_vert.elmt
+++ b/elements/10_electric/20_manufacturers_articles/schneider_electric/light/light_24V/xb4bvb3_vert.elmt
@@ -1,52 +1,49 @@
-
-
+
+
- Лампа
- Meldeleuchte
- XB4BVB3_VERT
Lamp
- Luce
Lampa
- مصباح
Light
Lâmpada
- Λυχνία
+ Meldeleuchte
+ Luce
Lámpara
+ XB4BVB3_VERT
+ Лампа
+ Λυχνία
Světlo
+ مصباح
+ XB4BVB3
+
+ Bouton poussoir lumineux vert 24V
- SCHNEIDER
+
+
+
-
-
- XB4BVB3
-
- VERT
-
+ SCHNEIDER
- Author: The QElectroTech team
+ Author: The QElectroTech team
License: see http://qelectrotech.org/wiki/doc/elements_license
-
-
-
-
-
-
+
+
+
+
+
+
label
-
-
- VERT
- description
-
-
-
-
-
+
+
+
+
+
+
diff --git a/elements/10_electric/20_manufacturers_articles/schneider_electric/light/light_24V/xb4bvb4_rouge.elmt b/elements/10_electric/20_manufacturers_articles/schneider_electric/light/light_24V/xb4bvb4_rouge.elmt
index 022ed5f26..d924cb25e 100644
--- a/elements/10_electric/20_manufacturers_articles/schneider_electric/light/light_24V/xb4bvb4_rouge.elmt
+++ b/elements/10_electric/20_manufacturers_articles/schneider_electric/light/light_24V/xb4bvb4_rouge.elmt
@@ -1,50 +1,49 @@
-
-
+
+
- Лампа
- Light
- مصباح
Lamp
+ Light
Lampa
- XB4BVB4_ROUGE
Lâmpada
- Λυχνία
- Lámpara
Luce
- Světlo
Meldeleuchte
+ Lámpara
+ XB4BVB4_ROUGE
+ Лампа
+ Λυχνία
+ Světlo
+ مصباح
-
-
- SCHNEIDER
-
-
-
- ROUGE
-
- XB4BVB4
-
-
+ XB4BVB4
+
+ Voyant lumineux rouge 24V
+
+
+
+
+
+
+
+ Schneider Electric
- Author: The QElectroTech team
+ Author: The QElectroTech team
License: see http://qelectrotech.org/wiki/doc/elements_license
-
-
-
-
-
-
-
+
+
+
+
+
+
+
label
-
- ROUGE
- description
-
-
-
+
+
+
+
+
diff --git a/elements/10_electric/20_manufacturers_articles/schneider_electric/light/light_24V/xb4bvb5_jaune.elmt b/elements/10_electric/20_manufacturers_articles/schneider_electric/light/light_24V/xb4bvb5_jaune.elmt
deleted file mode 100644
index 5ac75098b..000000000
--- a/elements/10_electric/20_manufacturers_articles/schneider_electric/light/light_24V/xb4bvb5_jaune.elmt
+++ /dev/null
@@ -1,50 +0,0 @@
-
-
-
- Лампа
- Light
- مصباح
- Lamp
- Lampa
- XB4BVB5_ORANGE
- Lâmpada
- Λυχνία
- Lámpara
- Luce
- Světlo
- Meldeleuchte
-
-
-
-
- SCHNEIDER
-
-
-
- ORANGE
-
- XB4BVB5
-
-
-
- Author: The QElectroTech team
-License: see http://qelectrotech.org/wiki/doc/elements_license
-
-
-
-
-
-
-
-
-
- label
-
-
- ORANGE
- description
-
-
-
-
-
diff --git a/elements/10_electric/20_manufacturers_articles/schneider_electric/light/light_24V/xb4bvb5_orange.elmt b/elements/10_electric/20_manufacturers_articles/schneider_electric/light/light_24V/xb4bvb5_orange.elmt
new file mode 100644
index 000000000..1abbb9931
--- /dev/null
+++ b/elements/10_electric/20_manufacturers_articles/schneider_electric/light/light_24V/xb4bvb5_orange.elmt
@@ -0,0 +1,49 @@
+
+
+
+ Lamp
+ Light
+ Lampa
+ Lâmpada
+ Meldeleuchte
+ Luce
+ Lámpara
+ XB4BVB5_ORANGE
+ Světlo
+ Λυχνία
+ Лампа
+ مصباح
+
+
+ XB4BVB5
+
+ Voyant lumineux orange 24V
+
+
+
+
+
+
+
+ Schneider Electric
+
+ Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license
+
+
+
+
+
+
+
+
+
+ label
+
+
+
+
+
+
+
+
diff --git a/elements/10_electric/20_manufacturers_articles/schneider_electric/light/light_24V/xb4bvb6_bleu.elmt b/elements/10_electric/20_manufacturers_articles/schneider_electric/light/light_24V/xb4bvb6_bleu.elmt
index 346d0bab4..1a21fec26 100644
--- a/elements/10_electric/20_manufacturers_articles/schneider_electric/light/light_24V/xb4bvb6_bleu.elmt
+++ b/elements/10_electric/20_manufacturers_articles/schneider_electric/light/light_24V/xb4bvb6_bleu.elmt
@@ -1,50 +1,49 @@
-
-
+
+
- Лампа
- Light
- مصباح
Lamp
+ Light
Lampa
- XB4BVB6_BLEU
Lâmpada
- Λυχνία
- Lámpara
- Luce
- Světlo
Meldeleuchte
+ Luce
+ Lámpara
+ XB4BVB6_bleu
+ Světlo
+ Λυχνία
+ Лампа
+ مصباح
-
-
- SCHNEIDER
-
-
-
- BLEU
-
- XB4BVB6
-
-
+ XB4BVB6
+
+ Voyant lumineux bleu 24V
+
+
+
+
+
+
+
+ Schneider Electric
- Author: The QElectroTech team
+ Author: The QElectroTech team
License: see http://qelectrotech.org/wiki/doc/elements_license
-
-
-
-
-
-
-
+
+
+
+
+
+
+
label
-
- BLEU
- description
-
-
-
+
+
+
+
+
diff --git a/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/legrand/40-portier/sonnerie/413097-transfo_sonnerie_230V_12-24V_40VA_5m.elmt b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/legrand/40-portier/sonnerie/413097-transfo_sonnerie_230V_12-24V_40VA_5m.elmt
new file mode 100644
index 000000000..0e39a617d
--- /dev/null
+++ b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/legrand/40-portier/sonnerie/413097-transfo_sonnerie_230V_12-24V_40VA_5m.elmt
@@ -0,0 +1,114 @@
+
+
+
+ 413097 - Bell transformer 230V 12-24V 40VA - 5 modules
+ 413097 - Transformateur sonnerie 230V 12-24V 40VA - 5 modules
+
+
+
+ Transformateur pour sonnerie 230V vers 24V à 12V - 40 VA - 5 modules
+
+ Legrand
+
+
+
+ 4130 97
+
+
+ Alexandre Dis
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 4130 97
+ designation
+
+
+ Legrand
+ manufacturer
+
+
+ _
+
+
+
+ label
+
+
+
+
+
+
+
+
diff --git a/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/atv12.elmt b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/atv12.elmt
new file mode 100644
index 000000000..806c609b1
--- /dev/null
+++ b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/atv12.elmt
@@ -0,0 +1,317 @@
+
+
+
+ ATV12
+
+
+
+
+
+ Schneider
+
+
+
+
+ ATV12
+
+ PFIT 589
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ _
+ #ff00ff
+
+
+
+
+ _
+ #ff00ff
+
+
+ _
+ #ff00ff
+
+
+ _
+ #ff00ff
+
+
+ _
+ #ff00ff
+
+
+ _
+ #ff00ff
+
+
+ _
+ #ff00ff
+
+
+ _
+ #ff00ff
+
+
+ _
+ #ff00ff
+
+
+ _
+ #ff00ff
+
+
+ _
+ #ff00ff
+
+
+ _
+ #ff00ff
+
+
+ _
+ #ff00ff
+
+
+ _
+ #ff00ff
+
+
+ _
+ #ff00ff
+
+
+ _
+ #ff00ff
+
+
+ _
+ #ff00ff
+
+
+ _
+ #ff00ff
+
+
+ _
+ #ff00ff
+
+
+ _
+ #ff00ff
+
+
+ _
+ #ff00ff
+
+
+ _
+ #ff00ff
+
+
+ _
+ #ff00ff
+
+
+ _
+ #ff00ff
+
+
+ _
+ #ff00ff
+
+
+ _
+ #ff00ff
+
+
+
+ label
+
+
+ ATV12H075m2
+ #ff00ff
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/Schneider_man_10A.elmt b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/disjoncteurs/Schneider_man_10A.elmt
similarity index 100%
rename from elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/Schneider_man_10A.elmt
rename to elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/disjoncteurs/Schneider_man_10A.elmt
diff --git a/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/Schneider_man_16A.elmt b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/disjoncteurs/Schneider_man_16A.elmt
similarity index 100%
rename from elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/Schneider_man_16A.elmt
rename to elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/disjoncteurs/Schneider_man_16A.elmt
diff --git a/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/Schneider_man_20A.elmt b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/disjoncteurs/Schneider_man_20A.elmt
similarity index 100%
rename from elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/Schneider_man_20A.elmt
rename to elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/disjoncteurs/Schneider_man_20A.elmt
diff --git a/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/Schneider_man_25A.elmt b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/disjoncteurs/Schneider_man_25A.elmt
similarity index 100%
rename from elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/Schneider_man_25A.elmt
rename to elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/disjoncteurs/Schneider_man_25A.elmt
diff --git a/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/Schneider_man_2A.elmt b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/disjoncteurs/Schneider_man_2A.elmt
similarity index 100%
rename from elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/Schneider_man_2A.elmt
rename to elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/disjoncteurs/Schneider_man_2A.elmt
diff --git a/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/Schneider_man_30mA.elmt b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/disjoncteurs/Schneider_man_30mA.elmt
similarity index 100%
rename from elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/Schneider_man_30mA.elmt
rename to elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/disjoncteurs/Schneider_man_30mA.elmt
diff --git a/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/Schneider_man_32A.elmt b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/disjoncteurs/Schneider_man_32A.elmt
similarity index 100%
rename from elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/Schneider_man_32A.elmt
rename to elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/disjoncteurs/Schneider_man_32A.elmt
diff --git a/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/disjoncteur-tetra-dt40.elmt b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/disjoncteurs/disjoncteur-tetra-dt40.elmt
similarity index 100%
rename from elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/disjoncteur-tetra-dt40.elmt
rename to elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/disjoncteurs/disjoncteur-tetra-dt40.elmt
diff --git a/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/disjoncteur-uni-dclic.elmt b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/disjoncteurs/disjoncteur-uni-dclic.elmt
similarity index 100%
rename from elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/disjoncteur-uni-dclic.elmt
rename to elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/disjoncteurs/disjoncteur-uni-dclic.elmt
diff --git a/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/disjoncteur-uni-dt40.elmt b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/disjoncteurs/disjoncteur-uni-dt40.elmt
similarity index 100%
rename from elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/disjoncteur-uni-dt40.elmt
rename to elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/disjoncteurs/disjoncteur-uni-dt40.elmt
diff --git a/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/domA42_2p_10a.elmt b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/disjoncteurs/domA42_2p_10a.elmt
similarity index 100%
rename from elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/domA42_2p_10a.elmt
rename to elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/disjoncteurs/domA42_2p_10a.elmt
diff --git a/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/doma42_2p_16a.elmt b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/disjoncteurs/doma42_2p_16a.elmt
similarity index 100%
rename from elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/doma42_2p_16a.elmt
rename to elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/disjoncteurs/doma42_2p_16a.elmt
diff --git a/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/doma42_2p_20a.elmt b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/disjoncteurs/doma42_2p_20a.elmt
similarity index 100%
rename from elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/doma42_2p_20a.elmt
rename to elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/disjoncteurs/doma42_2p_20a.elmt
diff --git a/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/doma42_2p_25a.elmt b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/disjoncteurs/doma42_2p_25a.elmt
similarity index 100%
rename from elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/doma42_2p_25a.elmt
rename to elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/disjoncteurs/doma42_2p_25a.elmt
diff --git a/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/doma42_2p_32a.elmt b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/disjoncteurs/doma42_2p_32a.elmt
similarity index 100%
rename from elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/doma42_2p_32a.elmt
rename to elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/disjoncteurs/doma42_2p_32a.elmt
diff --git a/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/doma45_1p+n _25a.elmt b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/disjoncteurs/doma45_1p+n _25a.elmt
similarity index 100%
rename from elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/doma45_1p+n _25a.elmt
rename to elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/disjoncteurs/doma45_1p+n _25a.elmt
diff --git a/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/doma45_1p+n_10a.elmt b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/disjoncteurs/doma45_1p+n_10a.elmt
similarity index 100%
rename from elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/doma45_1p+n_10a.elmt
rename to elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/disjoncteurs/doma45_1p+n_10a.elmt
diff --git a/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/doma45_1p+n_16a.elmt b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/disjoncteurs/doma45_1p+n_16a.elmt
similarity index 100%
rename from elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/doma45_1p+n_16a.elmt
rename to elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/disjoncteurs/doma45_1p+n_16a.elmt
diff --git a/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/doma45_1p+n_20a.elmt b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/disjoncteurs/doma45_1p+n_20a.elmt
similarity index 100%
rename from elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/doma45_1p+n_20a.elmt
rename to elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/disjoncteurs/doma45_1p+n_20a.elmt
diff --git a/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/doma45_1p+n_32a.elmt b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/disjoncteurs/doma45_1p+n_32a.elmt
similarity index 100%
rename from elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/doma45_1p+n_32a.elmt
rename to elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/disjoncteurs/doma45_1p+n_32a.elmt
diff --git a/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/domb _25a _2p _300ma_ac.elmt b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/disjoncteurs/domb _25a _2p _300ma_ac.elmt
similarity index 100%
rename from elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/domb _25a _2p _300ma_ac.elmt
rename to elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/disjoncteurs/domb _25a _2p _300ma_ac.elmt
diff --git a/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/domb_25a_2_30ma_ac.elmt b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/disjoncteurs/domb_25a_2_30ma_ac.elmt
similarity index 100%
rename from elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/domb_25a_2_30ma_ac.elmt
rename to elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/disjoncteurs/domb_25a_2_30ma_ac.elmt
diff --git a/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/domb_40a_2p_300ma_ac.elmt b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/disjoncteurs/domb_40a_2p_300ma_ac.elmt
similarity index 100%
rename from elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/domb_40a_2p_300ma_ac.elmt
rename to elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/disjoncteurs/domb_40a_2p_300ma_ac.elmt
diff --git a/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/domb_40a_2p_30ma_ac.elmt b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/disjoncteurs/domb_40a_2p_30ma_ac.elmt
similarity index 100%
rename from elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/domb_40a_2p_30ma_ac.elmt
rename to elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/disjoncteurs/domb_40a_2p_30ma_ac.elmt
diff --git a/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/dt40_25A.elmt b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/disjoncteurs/dt40_25A.elmt
similarity index 100%
rename from elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/dt40_25A.elmt
rename to elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/disjoncteurs/dt40_25A.elmt
diff --git a/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/disjoncteurs/qet_directory b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/disjoncteurs/qet_directory
new file mode 100644
index 000000000..6a7dca4a2
--- /dev/null
+++ b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/disjoncteurs/qet_directory
@@ -0,0 +1,17 @@
+
+
+ Leitungsschutzschalter und Lastschalter
+ Выключатели
+ Circuit-breakers
+ Disjoncteurs
+ قواطع
+ Disyuntores
+ Jističe
+ Disjuntores
+ Wyłączniki
+ Relè termici
+ Lastscheiders
+ Αυτόματοι διακόπτες
+ Afbryder
+
+
diff --git a/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/vigi-dt40 -.elmt b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/disjoncteurs/vigi-dt40 -.elmt
similarity index 100%
rename from elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/vigi-dt40 -.elmt
rename to elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/disjoncteurs/vigi-dt40 -.elmt
diff --git a/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/gv2me.elmt b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/gv2/gv2me.elmt
similarity index 100%
rename from elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/gv2me.elmt
rename to elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/gv2/gv2me.elmt
diff --git a/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/gv2me_2.elmt b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/gv2/gv2me_2.elmt
similarity index 100%
rename from elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/gv2me_2.elmt
rename to elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/gv2/gv2me_2.elmt
diff --git a/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/gv2p.elmt b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/gv2/gv2p.elmt
similarity index 100%
rename from elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/gv2p.elmt
rename to elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/gv2/gv2p.elmt
diff --git a/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/gv2/qet_directory b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/gv2/qet_directory
new file mode 100644
index 000000000..b802e974c
--- /dev/null
+++ b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/gv2/qet_directory
@@ -0,0 +1,5 @@
+
+
+ GV2
+
+
diff --git a/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/m221CE40T.elmt b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/m221CE40T.elmt
new file mode 100644
index 000000000..e26dffcac
--- /dev/null
+++ b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/m221CE40T.elmt
@@ -0,0 +1,618 @@
+
+
+
+ M221CE40T
+
+
+
+
+
+ Schneider
+
+
+
+
+ M221CE40T
+
+ PFIT 589
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ _
+ #ff00ff
+
+
+ _
+ #ff00ff
+
+
+ _
+ #ff00ff
+
+
+ _
+ #ff00ff
+
+
+ _
+ #ff00ff
+
+
+ _
+ #ff00ff
+
+
+ _
+ #ff00ff
+
+
+ _
+ #ff00ff
+
+
+ _
+ #ff00ff
+
+
+ _
+ #ff00ff
+
+
+ _
+ #ff00ff
+
+
+ _
+ #ff00ff
+
+
+ _
+ #ff00ff
+
+
+ _
+ #ff00ff
+
+
+ _
+ #ff00ff
+
+
+ _
+ #ff00ff
+
+
+ _
+ #ff00ff
+
+
+ _
+ #ff00ff
+
+
+ _
+ #ff00ff
+
+
+ _
+ #ff00ff
+
+
+ _
+ #ff00ff
+
+
+ _
+ #ff00ff
+
+
+ _
+ #ff00ff
+
+
+ _
+ #ff00ff
+
+
+ _
+ #ff00ff
+
+
+ _
+ #ff00ff
+
+
+ _
+ #ff00ff
+
+
+ _
+ #ff00ff
+
+
+ _
+ #ff00ff
+
+
+ _
+ #ff00ff
+
+
+ _
+ #ff00ff
+
+
+ _
+ #ff00ff
+
+
+ _
+ #ff00ff
+
+
+ _
+ #ff00ff
+
+
+ _
+ #ff00ff
+
+
+ _
+ #ff00ff
+
+
+ _
+ #ff00ff
+
+
+ _
+ #ff00ff
+
+
+ _
+ #ff00ff
+
+
+ _
+ #ff00ff
+
+
+ _
+ #ff00ff
+
+
+ _
+ #ff00ff
+
+
+ _
+ #ff00ff
+
+
+ _
+ #ff00ff
+
+
+ _
+ #ff00ff
+
+
+ _
+ #ff00ff
+
+
+ _
+ #ff00ff
+
+
+ _
+ #ff00ff
+
+
+ _
+ #ff00ff
+
+
+ _
+ #ff00ff
+
+
+
+ label
+
+
+
+ label
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/ict_2p _63a.elmt b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/relays_contactors&contacts/ict_2p _63a.elmt
similarity index 100%
rename from elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/ict_2p _63a.elmt
rename to elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/relays_contactors&contacts/ict_2p _63a.elmt
diff --git a/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/ict_2p_16a.elmt b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/relays_contactors&contacts/ict_2p_16a.elmt
similarity index 100%
rename from elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/ict_2p_16a.elmt
rename to elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/relays_contactors&contacts/ict_2p_16a.elmt
diff --git a/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/ict_2p_20a.elmt b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/relays_contactors&contacts/ict_2p_20a.elmt
similarity index 100%
rename from elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/ict_2p_20a.elmt
rename to elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/relays_contactors&contacts/ict_2p_20a.elmt
diff --git a/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/ict_2p_25a.elmt b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/relays_contactors&contacts/ict_2p_25a.elmt
similarity index 100%
rename from elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/ict_2p_25a.elmt
rename to elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/relays_contactors&contacts/ict_2p_25a.elmt
diff --git a/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/ict_2p_40a.elmt b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/relays_contactors&contacts/ict_2p_40a.elmt
similarity index 100%
rename from elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/ict_2p_40a.elmt
rename to elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/relays_contactors&contacts/ict_2p_40a.elmt
diff --git a/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/ka.elmt b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/relays_contactors&contacts/ka.elmt
similarity index 100%
rename from elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/ka.elmt
rename to elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/relays_contactors&contacts/ka.elmt
diff --git a/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/km_tetra.elmt b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/relays_contactors&contacts/km_tetra.elmt
similarity index 100%
rename from elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/km_tetra.elmt
rename to elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/relays_contactors&contacts/km_tetra.elmt
diff --git a/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/km_tri.elmt b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/relays_contactors&contacts/km_tri.elmt
similarity index 100%
rename from elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/km_tri.elmt
rename to elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/relays_contactors&contacts/km_tri.elmt
diff --git a/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/ladn22 tetra.elmt b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/relays_contactors&contacts/ladn22 tetra.elmt
similarity index 100%
rename from elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/ladn22 tetra.elmt
rename to elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/relays_contactors&contacts/ladn22 tetra.elmt
diff --git a/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/ladn22 tri.elmt b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/relays_contactors&contacts/ladn22 tri.elmt
similarity index 100%
rename from elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/ladn22 tri.elmt
rename to elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/relays_contactors&contacts/ladn22 tri.elmt
diff --git a/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/ladr4 tri - repos.elmt b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/relays_contactors&contacts/ladr4 tri - repos.elmt
similarity index 100%
rename from elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/ladr4 tri - repos.elmt
rename to elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/relays_contactors&contacts/ladr4 tri - repos.elmt
diff --git a/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/lads2 tri - travail.elmt b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/relays_contactors&contacts/lads2 tri - travail.elmt
similarity index 100%
rename from elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/lads2 tri - travail.elmt
rename to elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/relays_contactors&contacts/lads2 tri - travail.elmt
diff --git a/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/lc1d.elmt b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/relays_contactors&contacts/lc1d.elmt
similarity index 100%
rename from elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/lc1d.elmt
rename to elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/relays_contactors&contacts/lc1d.elmt
diff --git a/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/lc1k.elmt b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/relays_contactors&contacts/lc1k.elmt
similarity index 100%
rename from elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/lc1k.elmt
rename to elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/relays_contactors&contacts/lc1k.elmt
diff --git a/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/lc2d.elmt b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/relays_contactors&contacts/lc2d.elmt
similarity index 100%
rename from elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/lc2d.elmt
rename to elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/relays_contactors&contacts/lc2d.elmt
diff --git a/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/lc2k.elmt b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/relays_contactors&contacts/lc2k.elmt
similarity index 100%
rename from elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/lc2k.elmt
rename to elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/relays_contactors&contacts/lc2k.elmt
diff --git a/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/relays_contactors&contacts/lrd.elmt b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/relays_contactors&contacts/lrd.elmt
new file mode 100644
index 000000000..738a97670
--- /dev/null
+++ b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/relays_contactors&contacts/lrd.elmt
@@ -0,0 +1,78 @@
+
+
+
+ LRD
+ LRD
+ LRD
+ LRD
+ LRD
+ LRD
+ LRD
+
+
+
+
+
+
+
+
+
+
+
+
+ Schneider
+
+ Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ LRD
+
+
+
+ label
+
+
+
+
+
+
+
diff --git a/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/relays_contactors&contacts/qet_directory b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/relays_contactors&contacts/qet_directory
new file mode 100644
index 000000000..fac4ddc3b
--- /dev/null
+++ b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/relays_contactors&contacts/qet_directory
@@ -0,0 +1,15 @@
+
+
+ Реле, пускатели и контакты
+ Relays, contactors and contacts
+ Relevadores, contactores y contactos
+ Relais, contacteurs et contacts
+ Relè, contattori e contatti
+ Przekaźniki i styczniki
+ Relais, Schütze und Kontakte
+ Relais, contactoren en contacten
+ Ηλεκτρονόμοι και επαφές
+ Relé, stykače a kontakty
+ Relæer, kontaktorer og kontakter
+
+
diff --git a/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/voyants/qet_directory b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/voyants/qet_directory
new file mode 100644
index 000000000..d97268ceb
--- /dev/null
+++ b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/voyants/qet_directory
@@ -0,0 +1,6 @@
+
+
+ Lights
+ Voyants
+
+
diff --git a/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/voyants/voyant_230V/qet_directory b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/voyants/voyant_230V/qet_directory
new file mode 100644
index 000000000..89feaf0b6
--- /dev/null
+++ b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/voyants/voyant_230V/qet_directory
@@ -0,0 +1,6 @@
+
+
+ Lights 230V
+ Voyants 230V
+
+
diff --git a/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/voyants/voyant_230V/xb4bvm1-blanc.elmt b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/voyants/voyant_230V/xb4bvm1-blanc.elmt
new file mode 100644
index 000000000..b4acd8a8a
--- /dev/null
+++ b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/voyants/voyant_230V/xb4bvm1-blanc.elmt
@@ -0,0 +1,35 @@
+
+
+
+ Light
+ Lamp
+ Lampada spia
+ Lampka sygnalizacyjna
+ مُؤشّر ضوئي
+ Λάμπα
+ Světelný signál
+ Voyant blanc XB4BVM1
+
+
+
+ Voyant blanc
+ Schneider
+
+
+
+
+ XB4BVM1
+
+
+ Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license
+
+
+
+
+
+
+ label
+
+
+
diff --git a/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/voyants/voyant_230V/xb4bvm3-vert.elmt b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/voyants/voyant_230V/xb4bvm3-vert.elmt
new file mode 100644
index 000000000..3d5642824
--- /dev/null
+++ b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/voyants/voyant_230V/xb4bvm3-vert.elmt
@@ -0,0 +1,35 @@
+
+
+
+ Light
+ Lamp
+ Lampada spia
+ Lampka sygnalizacyjna
+ مُؤشّر ضوئي
+ Λάμπα
+ Světelný signál
+ Voyant vert XB4BVM3
+
+
+
+ Voyant VERT
+ Schneider
+
+
+
+
+ XB4BVM3
+
+
+ Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license
+
+
+
+
+
+
+ label
+
+
+
diff --git a/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/voyants/voyant_230V/xb4bvm4-rouge.elmt b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/voyants/voyant_230V/xb4bvm4-rouge.elmt
new file mode 100644
index 000000000..598d7d680
--- /dev/null
+++ b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/voyants/voyant_230V/xb4bvm4-rouge.elmt
@@ -0,0 +1,35 @@
+
+
+
+ Light
+ Lamp
+ Lampada spia
+ Lampka sygnalizacyjna
+ مُؤشّر ضوئي
+ Λάμπα
+ Světelný signál
+ Voyant rouge XB4BVM4
+
+
+
+ Voyant rouge
+ Schneider
+
+
+
+
+ XB4BVM4
+
+
+ Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license
+
+
+
+
+
+
+ label
+
+
+
diff --git a/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/voyants/voyant_230V/xb4bvm5-orange.elmt b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/voyants/voyant_230V/xb4bvm5-orange.elmt
new file mode 100644
index 000000000..03386f24d
--- /dev/null
+++ b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/voyants/voyant_230V/xb4bvm5-orange.elmt
@@ -0,0 +1,35 @@
+
+
+
+ Light
+ Lamp
+ Lampada spia
+ Lampka sygnalizacyjna
+ مُؤشّر ضوئي
+ Λάμπα
+ Světelný signál
+ Voyant orange XB4BVM5
+
+
+
+ Voyant orange
+ Schneider
+
+
+
+
+ XB4BVM5
+
+
+ Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license
+
+
+
+
+
+
+ label
+
+
+
diff --git a/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/voyants/voyant_230V/xb4bvm6-bleu.elmt b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/voyants/voyant_230V/xb4bvm6-bleu.elmt
new file mode 100644
index 000000000..493e10749
--- /dev/null
+++ b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/voyants/voyant_230V/xb4bvm6-bleu.elmt
@@ -0,0 +1,35 @@
+
+
+
+ Light
+ Lamp
+ Lampada spia
+ Lampka sygnalizacyjna
+ مُؤشّر ضوئي
+ Λάμπα
+ Světelný signál
+ Voyant bleu XB4BVM6
+
+
+
+ Voyant bleu
+ Schneider
+
+
+
+
+ XB4BVM6
+
+
+ Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license
+
+
+
+
+
+
+ label
+
+
+
diff --git a/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/voyant/qet_directory b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/voyants/voyants_24v/qet_directory
similarity index 100%
rename from elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/voyant/qet_directory
rename to elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/voyants/voyants_24v/qet_directory
diff --git a/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/voyant/xb4bvb1-blanc.elmt b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/voyants/voyants_24v/xb4bvb1-blanc.elmt
similarity index 100%
rename from elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/voyant/xb4bvb1-blanc.elmt
rename to elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/voyants/voyants_24v/xb4bvb1-blanc.elmt
diff --git a/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/voyant/xb4bvb3-vert.elmt b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/voyants/voyants_24v/xb4bvb3-vert.elmt
similarity index 100%
rename from elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/voyant/xb4bvb3-vert.elmt
rename to elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/voyants/voyants_24v/xb4bvb3-vert.elmt
diff --git a/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/voyant/xb4bvb4-rouge.elmt b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/voyants/voyants_24v/xb4bvb4-rouge.elmt
similarity index 100%
rename from elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/voyant/xb4bvb4-rouge.elmt
rename to elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/voyants/voyants_24v/xb4bvb4-rouge.elmt
diff --git a/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/voyant/xb4bvb5-orange.elmt b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/voyants/voyants_24v/xb4bvb5-orange.elmt
similarity index 100%
rename from elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/voyant/xb4bvb5-orange.elmt
rename to elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/voyants/voyants_24v/xb4bvb5-orange.elmt
diff --git a/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/voyant/xb4bvb6-bleu.elmt b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/voyants/voyants_24v/xb4bvb6-bleu.elmt
similarity index 100%
rename from elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/voyant/xb4bvb6-bleu.elmt
rename to elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/voyants/voyants_24v/xb4bvb6-bleu.elmt
diff --git a/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/sofrel/16di.elmt b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/sofrel/16di.elmt
index bc8bc20a4..9cc518ca2 100644
--- a/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/sofrel/16di.elmt
+++ b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/sofrel/16di.elmt
@@ -1,176 +1,168 @@
-
-
+
+
16DI
-
- Sofrel
-
- 16 DI
-
- Carte d'entrées digitale
-
-
-
-
-
-
-
+
+ simple
+ NO
+ 1
+
S.DEFFAUX
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/sofrel/sofrel_6ai-t.elmt b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/sofrel/sofrel_6ai-t.elmt
index 20a892722..f9cf7dc6d 100644
--- a/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/sofrel/sofrel_6ai-t.elmt
+++ b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/sofrel/sofrel_6ai-t.elmt
@@ -1,152 +1,152 @@
-
-
+
+
- 6AI-T°
6AI-T°
+ 6AI-T°
- simple
- NO
- 1
+ simple
+ NO
+ 1
S.DEFFAUX
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/lang/qet_da.qm b/lang/qet_da.qm
index 8560756a3..24628c88a 100644
Binary files a/lang/qet_da.qm and b/lang/qet_da.qm differ
diff --git a/lang/qet_da.ts b/lang/qet_da.ts
index 9bc56a4f9..04f171680 100644
--- a/lang/qet_da.ts
+++ b/lang/qet_da.ts
@@ -2011,157 +2011,157 @@ Bemærk: Disse muligheder VIL IKKE tillade eller blokere autonummereringer, kun
Form
-
+ Formular
Informations disponibles
- Information tilgængelig
+ Information tilgængelig
Informations à exporter
- Eksportere information
+ Eksportere information
Monter la sélection
- Tilpasse udvalgte
+ Tilpasse udvalgte
Ajouter la sélection
- Tilføje udvalgte
+ Tilføje udvalgte
Supprimer la sélection
-
+ Fjerne udvalgte
Descendre la sélection
- Gå ned i udvalgte
+ Gå ned i udvalgte
Pas de filtre
-
+ Intet filter
N'est pas vide
-
+ Er ikke tom
Est vide
-
+ Er tom
Contient
-
+ Indeholder
Ne contient pas
-
+ Indeholder ikke
Est égal à
-
+ Er lig med
N'est pas égale à
-
+ Er ikke lig med
Filtre :
-
+ Filter:
Type d'éléments
- Symbol type
+ Symbol type
Simples
- Enkel
+ Enkel
Tous
- Alle
+ Alle
Contacteurs et relais
- Kontaktorer og relæer
+ Kontaktorer og relæer
Boutons et commutateurs
- Knapper og afbrydere
+ Knapper og afbrydere
Borniers
- Klemmer
+ Klemmer
Organes de protection
- Person beskyttelse
+ Person beskyttelse
Configuration
- Opsætning
+ Opsætning
Ouvrir la configuration sélectionné
- Åbne valgt konfiguration
+ Åbne valgt konfiguration
Sauvegarder la configuration actuelle
- Gem aktuel konfiguration
+ Gem aktuel konfiguration
Requête SQL personnalisée
- Tilpasset SQL forespørgsel
+ Tilpasset SQL forespørgsel
Requête SQL :
- SQL forespørgsel:
+ SQL forespørgsel:
Position
- Placering
+ Placering
Titre du folio
- Ark titel
+ Ark titel
Position du folio
- Ark placering
+ Ark placering
Numéro du folio
-
+ Ark nummer
@@ -3418,159 +3418,159 @@ Her kan standardværdien angives for dette felt for de oprettede symboler:
Form
-
+ Formular
Affichage
- Vise
+ Vise
Nom du tableau
-
+ Tabel navn
Position et lignes
-
+ Placering og linjer
Aucun
- Ingen
+ Ingen
Toutes
-
+ Alle
Lignes à afficher :
-
+ Synlige linjer:
Y :
- Y:
+ Y:
Tableau suivant
-
+ Følgende tabel
X :
- X:
+ X:
Tableau précédent
-
+ Forrige tabel
Tableau précédent :
-
+ Nuværende tabel:
En tête
-
+ Hoved
Marge
-
+ Margin
Aligement :
-
+ Juster:
Gauche
- Venstre
+ Venstre
Centré
- Centrer
+ Centrer
Droite
- Højre
+ Højre
Police
- Skrifttype
+ Skrifttype
Tableau
-
+ Tabel
Alignement :
- Juster:
+ Juster:
Contenu
-
+ Indhold
Déplacer un tableau
-
+ Flyt tabel
Modifier le nombre de ligne affiché par un tableau
-
+ Ændre antal tabel rækker
Modifier les marges d'une en tête de tableau
-
+ Ændre tabel overskrift margen
Modifier les marges d'un tableau
-
+ Ændre tabel margen
Modifier l'alignement d'une en tête de tableau
-
+ Ændre tabel overskrift justering
Modifier l'alignement des textes d'un tableau
-
+ Ændre tabel tekst justering
Modifier la police d'une en tête de tableau
-
+ Ændre tabel hoved skrifttype
Changer la police d'un tableau
-
+ Ændre tabel skrifttype
@@ -4338,17 +4338,17 @@ Brug avanceret redigering til dette.
Form
-
+ Formular
Requête
-
+ Forespørgsel
Recharger
- Genindlæs
+ Genindlæs
@@ -4985,7 +4985,7 @@ Sletningen kan ikke fortrydes.
Date
- Dato
+ Dato
@@ -5477,7 +5477,7 @@ Kommandovalg:
Ajouter un tableau lambda (Fonctionnalité en cours de devellopement)
-
+ Tilføj en lambda tabel (Under udvikling)
@@ -5492,7 +5492,7 @@ Kommandovalg:
Exporter la base de donnée interne du projet
-
+ Eksportere intern projekt datbase
@@ -8790,7 +8790,7 @@ Voulez-vous la remplacer ?
Modifier la géometrie d'un tableau
-
+ Ændre tabel geometri
@@ -10973,7 +10973,7 @@ De andre felter anvendes ikke.
Pink : Pink
element part filling
-
+ Lyserød : lyserød
@@ -11057,7 +11057,7 @@ De andre felter anvendes ikke.
Red : Red
element part filling
-
+ Rød : rød
@@ -11093,7 +11093,7 @@ De andre felter anvendes ikke.
Yellow : Yellow
element part filling
-
+ Gul : gul
@@ -12933,12 +12933,12 @@ Maksimum længde: %2piksel
Position
- Placering
+ Placering
Position du folio
- Ark placering
+ Ark placering
@@ -12948,7 +12948,7 @@ Maksimum længde: %2piksel
sans_nom
-
+ ikke_navngivet
diff --git a/qelectrotech.pro b/qelectrotech.pro
index 78c51d530..5799dfdb7 100644
--- a/qelectrotech.pro
+++ b/qelectrotech.pro
@@ -71,6 +71,8 @@ include(sources/PropertiesEditor/PropertiesEditor.pri)
include(sources/QetGraphicsItemModeler/QetGraphicsItemModeler.pri)
include(sources/QPropertyUndoCommand/QPropertyUndoCommand.pri)
include(SingleApplication/singleapplication.pri)
+include(sources/QWidgetAnimation/QWidgetAnimation.pri)
+
DEFINES += QAPPLICATION_CLASS=QApplication
TEMPLATE = app
diff --git a/sources/QWidgetAnimation/QWidgetAnimation.pri b/sources/QWidgetAnimation/QWidgetAnimation.pri
new file mode 100644
index 000000000..7072f1b6f
--- /dev/null
+++ b/sources/QWidgetAnimation/QWidgetAnimation.pri
@@ -0,0 +1,5 @@
+HEADERS += \
+ $$PWD/qwidgetanimation.h
+
+SOURCES += \
+ $$PWD/qwidgetanimation.cpp
diff --git a/sources/QWidgetAnimation/qwidgetanimation.cpp b/sources/QWidgetAnimation/qwidgetanimation.cpp
new file mode 100644
index 000000000..df0932a91
--- /dev/null
+++ b/sources/QWidgetAnimation/qwidgetanimation.cpp
@@ -0,0 +1,162 @@
+/*
+ Copyright 2006-2020 The QElectroTech Team
+ This file is part of QElectroTech.
+
+ QElectroTech is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 2 of the License, or
+ (at your option) any later version.
+
+ QElectroTech is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with QElectroTech. If not, see .
+*/
+#include "qwidgetanimation.h"
+#include
+
+/**
+ * @brief QWidgetAnimation::QWidgetAnimation
+ * @param widget : widget to animate
+ * @param orientation : animate widget horizontally or vertically
+ * @param duration : the duration of animation @see void QVariantAnimation::setDuration(int msecs)
+ */
+QWidgetAnimation::QWidgetAnimation(QWidget *widget, Qt::Orientation orientation, QWidgetAnimation::Behavior behavior, int duration) :
+ QPropertyAnimation(widget),
+ m_orientation(orientation),
+ m_widget(widget),
+ m_maximum(widget->maximumSize()),
+ m_last_rect(widget->geometry()),
+ m_behavior(behavior)
+{
+ setTargetObject(widget);
+ setPropertyName( m_orientation == Qt::Vertical ? "maximumHeight" : "maximumWidth");
+ setDuration(duration);
+ setEasingCurve(QEasingCurve::OutCubic);
+
+ connect(this, &QPropertyAnimation::finished, [this]()
+ {
+ m_state = QWidgetAnimation::Finish;
+
+ if ( (this->m_orientation == Qt::Vertical && m_widget->geometry().height() == 0) ||
+ (this->m_orientation == Qt::Horizontal && m_widget->geometry().width() == 0) ) {
+ m_widget->hide();
+ } else {
+ m_widget->setMaximumSize(m_maximum);
+ }
+ });
+}
+
+/**
+ * @brief QWidgetAnimation::widgetToSubtract
+ * Widget to subtract the size when the behavior is availableSpace
+ * @param widgets
+ */
+void QWidgetAnimation::widgetToSubtract(QVector widgets)
+{
+ m_widget_to_substract.clear();
+ m_widget_to_substract = widgets;
+}
+
+/**
+ * @brief QWidgetAnimation::show
+ * show the widget
+ */
+void QWidgetAnimation::show()
+{
+ if (m_state == QWidgetAnimation::Showing)
+ return;
+
+ stop();
+
+ m_widget->show();
+
+ int end_value = 10000;
+ if (m_behavior == QWidgetAnimation::minimumSizeHint)
+ {
+ end_value = m_orientation == Qt::Horizontal ? m_widget->minimumSizeHint().width() :
+ m_widget->minimumSizeHint().height();
+ }
+ else if (m_behavior == QWidgetAnimation::availableSpace && m_widget->parentWidget())
+ {
+ m_widget->parentWidget()->layout();
+ int available_ = m_orientation == Qt::Horizontal ? m_widget->parentWidget()->width() :
+ m_widget->parentWidget()->height();
+ for (auto w : m_widget_to_substract) {
+ available_ -= m_orientation == Qt::Horizontal ? w->minimumSizeHint().width() :
+ w->minimumSizeHint().height();
+ }
+
+ int mini_ = m_orientation == Qt::Horizontal ? m_widget->minimumSizeHint().width() :
+ m_widget->minimumSizeHint().height();
+
+ end_value = available_ > mini_ ? available_ : mini_;
+ }
+ else
+ {
+ if (m_last_rect.isValid()) {
+ end_value = m_orientation == Qt::Horizontal ? m_last_rect.width() :
+ m_last_rect.height();
+ } else {
+ end_value = m_orientation == Qt::Horizontal ? m_maximum.width() :
+ m_maximum.height();
+ }
+ }
+
+ setStartValue(0);
+ setEndValue(end_value);
+ m_state = QWidgetAnimation::Showing;
+ start();
+}
+
+/**
+ * @brief QWidgetAnimation::hide
+ * Hide the widget
+ */
+void QWidgetAnimation::hide()
+{
+ if (m_state == QWidgetAnimation::Hidding)
+ return;
+
+ if (m_state == Finish && m_widget->isVisible()) {
+ m_last_rect = m_widget->geometry();
+ }
+
+ stop();
+ int start_value = m_orientation == Qt::Horizontal ? m_widget->width() :
+ m_widget->height();
+ setStartValue(start_value);
+ setEndValue(0);
+ m_state = QWidgetAnimation::Hidding;
+ start();
+}
+
+/**
+ * @brief QWidgetAnimation::setHidden
+ * true hide, false show
+ * @param hidden
+ */
+void QWidgetAnimation::setHidden(bool hidden)
+{
+ if (hidden)
+ hide();
+ else
+ show();
+}
+
+/**
+ * @brief QWidgetAnimation::setLastShowSize
+ * Force the last show size value to @size
+ * @param size
+ */
+void QWidgetAnimation::setLastShowSize(int size)
+{
+ if (m_orientation == Qt::Vertical) {
+ m_last_rect.setHeight(size);
+ } else {
+ m_last_rect.setWidth(size);
+ }
+}
diff --git a/sources/QWidgetAnimation/qwidgetanimation.h b/sources/QWidgetAnimation/qwidgetanimation.h
new file mode 100644
index 000000000..92e6b18b2
--- /dev/null
+++ b/sources/QWidgetAnimation/qwidgetanimation.h
@@ -0,0 +1,73 @@
+/*
+ Copyright 2006-2020 The QElectroTech Team
+ This file is part of QElectroTech.
+
+ QElectroTech is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 2 of the License, or
+ (at your option) any later version.
+
+ QElectroTech is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with QElectroTech. If not, see .
+*/
+#ifndef QWIDGETANIMATION_H
+#define QWIDGETANIMATION_H
+
+#include
+#include
+#include
+
+/**
+ * @brief The QWidgetAnimation class
+ * This class animate the show and hide function of a QWidget.
+ *
+ * The role of @behavior is to calcul as best the animation process when widget is show.
+ * Because this class don't change the current and final size of the widget but her maximum size during the animation process,
+ * we must to know in advance the final size of the widget.
+ * Behavior minimumSizeHint : the final size of the widget will be his minimum size hint.
+ * Behavior availableSpace : the final size of widget will be the available size of her parent.
+ * Since parent can have other widgets you can add a QVector of widget to subtract of the final size.
+ * Because we suppose the animated widget will take the maximum available space, we subtract the minimum size hint of widgets in QVector.
+ * Behavior lastSize : The widget will have the same size as the last time he was showed.
+ */
+class QWidgetAnimation : public QPropertyAnimation
+{
+ Q_OBJECT
+
+ public:
+ enum Behavior {
+ minimumSizeHint,
+ availableSpace,
+ lastSize,
+ };
+
+ QWidgetAnimation(QWidget *widget, Qt::Orientation orientation, QWidgetAnimation::Behavior behavior = QWidgetAnimation::minimumSizeHint, int duration = 250);
+ void widgetToSubtract (QVector widgets);
+
+ void show();
+ void hide();
+ void setHidden(bool hidden);
+ void setLastShowSize(int size);
+
+ private:
+ enum currentState {
+ Showing,
+ Hidding,
+ Finish
+ };
+
+ Qt::Orientation m_orientation = Qt::Horizontal;
+ QVector m_widget_to_substract;
+ QWidget *m_widget;
+ QSize m_maximum;
+ QRect m_last_rect;
+ QWidgetAnimation::Behavior m_behavior = Behavior::minimumSizeHint;
+ QWidgetAnimation::currentState m_state = QWidgetAnimation::Finish;
+};
+
+#endif // QWIDGETANIMATION_H
diff --git a/sources/SearchAndReplace/ui/searchandreplacewidget.cpp b/sources/SearchAndReplace/ui/searchandreplacewidget.cpp
index 82f0356b7..7ac92b205 100644
--- a/sources/SearchAndReplace/ui/searchandreplacewidget.cpp
+++ b/sources/SearchAndReplace/ui/searchandreplacewidget.cpp
@@ -44,6 +44,13 @@ SearchAndReplaceWidget::SearchAndReplaceWidget(QWidget *parent) :
ui(new Ui::SearchAndReplaceWidget)
{
ui->setupUi(this);
+
+ m_horizontal_animation = new QWidgetAnimation(ui->m_advanced_button_widget, Qt::Horizontal, QWidgetAnimation::minimumSizeHint, 250);
+ m_vertical_animation = new QWidgetAnimation(ui->m_advanced_widget, Qt::Vertical, QWidgetAnimation::availableSpace, 250);
+ QVector v;
+ v << ui->m_header_widget;
+ m_vertical_animation->widgetToSubtract(v);
+
setHideAdvanced(true);
setUpTreeItems();
@@ -70,7 +77,6 @@ bool SearchAndReplaceWidget::event(QEvent *event)
if (event->type() == QEvent::Hide)
{
clear();
- setHideAdvanced(true);
if (m_highlighted_element)
{
m_highlighted_element.data()->setHighlighted(false);
@@ -204,20 +210,10 @@ void SearchAndReplaceWidget::setUpTreeItems()
* Hide advanced widgets
* @param hide
*/
-void SearchAndReplaceWidget::setHideAdvanced(bool hide) const
+void SearchAndReplaceWidget::setHideAdvanced(bool hide)
{
- ui->m_advanced_pb ->setChecked(!hide);
- ui->m_replace ->setHidden(hide);
- ui->m_replace_le ->setHidden(hide);
- ui->m_folio_pb ->setHidden(hide);
- ui->m_element_pb ->setHidden(hide);
- ui->m_conductor_pb ->setHidden(hide);
- ui->m_tree_widget ->setHidden(hide);
- ui->m_replace_pb ->setHidden(hide);
- ui->m_replace_all_pb ->setHidden(hide);
- ui->m_mode_cb ->setHidden(hide);
- ui->m_case_sensitive_cb->setHidden(hide);
- ui->m_advanced_replace_pb->setHidden(hide);
+ m_vertical_animation->setHidden(hide);
+ m_horizontal_animation->setHidden(hide);
}
/**
diff --git a/sources/SearchAndReplace/ui/searchandreplacewidget.h b/sources/SearchAndReplace/ui/searchandreplacewidget.h
index c51bddcc5..543c11696 100644
--- a/sources/SearchAndReplace/ui/searchandreplacewidget.h
+++ b/sources/SearchAndReplace/ui/searchandreplacewidget.h
@@ -24,6 +24,7 @@
#include "element.h"
#include "independenttextitem.h"
#include "searchandreplaceworker.h"
+#include "QWidgetAnimation/qwidgetanimation.h"
class QTreeWidgetItem;
@@ -39,7 +40,7 @@ class SearchAndReplaceWidget : public QWidget
public:
explicit SearchAndReplaceWidget(QWidget *parent = nullptr);
- ~SearchAndReplaceWidget();
+ ~SearchAndReplaceWidget() override;
bool event(QEvent *event) override;
void clear();
@@ -47,7 +48,7 @@ class SearchAndReplaceWidget : public QWidget
private:
void setUpTreeItems();
- void setHideAdvanced(bool hide) const;
+ void setHideAdvanced(bool hide);
void fillItemsList();
void addElement(Element *element);
void search();
@@ -109,6 +110,8 @@ class SearchAndReplaceWidget : public QWidget
QPointer m_last_selected;
QHash> m_diagram_hash;
SearchAndReplaceWorker m_worker;
+ QWidgetAnimation *m_vertical_animation;
+ QWidgetAnimation *m_horizontal_animation;
};
#endif // SEARCHANDREPLACEWIDGET_H
diff --git a/sources/SearchAndReplace/ui/searchandreplacewidget.ui b/sources/SearchAndReplace/ui/searchandreplacewidget.ui
index e5e7e350d..8514000a3 100644
--- a/sources/SearchAndReplace/ui/searchandreplacewidget.ui
+++ b/sources/SearchAndReplace/ui/searchandreplacewidget.ui
@@ -6,22 +6,331 @@
0
0
- 970
- 436
+ 989
+ 661
Form
-
- -
-
-
- Chercher :
-
+
+
+ 9
+
+
-
+
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
-
+
+
+ Chercher :
+
+
+
+ -
+
+
+
+ 1
+ 0
+
+
+
+ true
+
+
+
+ -
+
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
-
+
+
+ Mode
+
+
+ true
+
+
-
+
+ Texte brut
+
+
+ -
+
+ Mots entiers
+
+
+
+
+ -
+
+
+ Sensible à la casse
+
+
+
+
+
+
+ -
+
+
+ Aller à la correspondance suivante
+
+
+
+
+
+
+ :/ico/16x16/go-bottom.png:/ico/16x16/go-bottom.png
+
+
+ true
+
+
+
+ -
+
+
+ Aller à la correspondance précédente
+
+
+
+
+
+
+ :/ico/16x16/go-top.png:/ico/16x16/go-top.png
+
+
+ true
+
+
+
+ -
+
+
+ Actualiser
+
+
+
+
+
+
+ :/ico/16x16/view-refresh.png:/ico/16x16/view-refresh.png
+
+
+ true
+
+
+
+ -
+
+
+ <html><head/><body><p>Afficher les options avancées</p></body></html>
+
+
+
+
+
+
+ :/ico/16x16/configure-toolbars.png:/ico/16x16/configure-toolbars.png
+
+
+ true
+
+
+ false
+
+
+ true
+
+
+
+
- -
+
-
+
+
+
+ 0
+ 0
+
+
+
+
+ 0
+ 0
+
+
+
+
+ 0
+
+
-
+
+
+ true
+
+
+ <html><head/><body><p>Définir les propriétés à remplacer dans les éléments</p></body></html>
+
+
+ Élément
+
+
+
+ -
+
+
+ <html><head/><body><p>Définir les propriétés à remplacer dans les conducteurs</p></body></html>
+
+
+ Conducteur
+
+
+
+ -
+
+
+ false
+
+
+ <html><head/><body><p>Remplacer les correspondances cochées</p></body></html>
+
+
+ Tout remplacer
+
+
+
+ -
+
+
+ avancé
+
+
+
+ -
+
+
+ Remplacer :
+
+
+
+ -
+
+
+ <html><head/><body><p>Définir les propriétés à remplacer dans les folios</p></body></html>
+
+
+ Folio
+
+
+
+ -
+
+
+
+ 200
+ 0
+
+
+
+ Champ texte de folio
+
+
+ true
+
+
+
+ -
+
+
+ false
+
+
+ <html><head/><body><p>Remplacer la correspondance sélectionnée</p></body></html>
+
+
+ Remplacer
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 0
+ 0
+
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ false
+
+
+
+ 1
+
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 100
+ 20
+
+
+
+
+
+
+
+ -
Quitter
@@ -38,217 +347,18 @@
- -
-
-
- Mode
+
-
+
+
+ Qt::Vertical
-
- true
+
+
+ 20
+ 40
+
-
-
-
- Texte brut
-
-
- -
-
- Mots entiers
-
-
-
-
- -
-
-
- Sensible à la casse
-
-
-
- -
-
-
- Remplacer :
-
-
-
- -
-
-
- Aller à la correspondance suivante
-
-
-
-
-
-
- :/ico/16x16/go-bottom.png:/ico/16x16/go-bottom.png
-
-
- true
-
-
-
- -
-
-
- Aller à la correspondance précédente
-
-
-
-
-
-
- :/ico/16x16/go-top.png:/ico/16x16/go-top.png
-
-
- true
-
-
-
- -
-
-
- <html><head/><body><p>Afficher les options avancées</p></body></html>
-
-
-
-
-
-
- :/ico/16x16/configure-toolbars.png:/ico/16x16/configure-toolbars.png
-
-
- true
-
-
- false
-
-
- true
-
-
-
- -
-
-
- Actualiser
-
-
-
-
-
-
- :/ico/16x16/view-refresh.png:/ico/16x16/view-refresh.png
-
-
- true
-
-
-
- -
-
-
- Champ texte de folio
-
-
- true
-
-
-
- -
-
-
- <html><head/><body><p>Définir les propriétés à remplacer dans les folios</p></body></html>
-
-
- Folio
-
-
-
- -
-
-
- true
-
-
- <html><head/><body><p>Définir les propriétés à remplacer dans les éléments</p></body></html>
-
-
- Élément
-
-
-
- -
-
-
- <html><head/><body><p>Définir les propriétés à remplacer dans les conducteurs</p></body></html>
-
-
- Conducteur
-
-
-
- -
-
-
- false
-
-
- <html><head/><body><p>Remplacer la correspondance sélectionnée</p></body></html>
-
-
- Remplacer
-
-
-
- -
-
-
- false
-
-
- <html><head/><body><p>Remplacer les correspondances cochées</p></body></html>
-
-
- Tout remplacer
-
-
-
- -
-
-
- true
-
-
- true
-
-
- true
-
-
- false
-
-
-
- 1
-
-
-
-
- -
-
-
- avancé
-
-
-
- -
-
-
- true
-
-
+
diff --git a/sources/dataBase/projectdatabase.cpp b/sources/dataBase/projectdatabase.cpp
index 7a8adbb01..ac53e5b48 100644
--- a/sources/dataBase/projectdatabase.cpp
+++ b/sources/dataBase/projectdatabase.cpp
@@ -90,7 +90,7 @@ QVector projectDataBase::elementsInfoFromQuery(const QString &query
* @return the header according to @query.
* Header can be false, notably when user create is own query.
*/
-QStringList projectDataBase::headersFromElementsInfoQuery(const QString &query)
+QStringList projectDataBase::headersFromElementNomenclatureViewQuery(const QString &query)
{
QStringList header_string;
if (!query.startsWith("SELECT ") && !query.contains("FROM")) {
@@ -107,34 +107,27 @@ QStringList projectDataBase::headersFromElementsInfoQuery(const QString &query)
return header_string;
}
- for (int i=0 ; iuuid().toString();
}
@@ -255,12 +248,48 @@ bool projectDataBase::createDataBase(const QString &connection_name, const QStri
if (!query_.exec(element_info_table)) {
qDebug() << " element_info_table query : " << query_.lastError();
}
+
+ createElementNomenclatureView();
}
updateDB();
return true;
}
+void projectDataBase::createElementNomenclatureView()
+{
+ QString create_view ("CREATE VIEW element_nomenclature_view AS SELECT "
+ "ei.label AS label,"
+ "ei.plant AS plant,"
+ "ei.location AS location,"
+ "ei.comment AS comment,"
+ "ei.function AS function,"
+ "ei.tension_protocol AS tension_protocol,"
+ "ei.auxiliary1 AS auxiliary1,"
+ "ei.auxiliary2 AS auxiliary2,"
+ "ei.description AS description,"
+ "ei.designation AS designation,"
+ "ei.manufacturer AS manufacturer,"
+ "ei.manufacturer_reference AS manufacturer_reference,"
+ "ei.machine_manufacturer_reference AS machine_manufacturer_reference,"
+ "ei.supplier AS supplier,"
+ "ei.quantity AS quantity,"
+ "ei.unity AS unity,"
+ "d.pos AS diagram_position,"
+ "e.type AS element_type,"
+ "e.sub_type AS element_sub_type,"
+ "di.title AS title,"
+ "di.folio AS folio,"
+ "e.pos AS position "
+ " FROM element_info ei, diagram_info di, element e, diagram d"
+ " WHERE ei.element_uuid = e.uuid AND e.diagram_uuid = d.uuid AND di.diagram_uuid = d.uuid");
+
+ QSqlQuery query(m_data_base);
+ if (!query.exec(create_view)) {
+ qDebug() << query.lastError();
+ }
+}
+
void projectDataBase::populateDiagramTable()
{
QSqlQuery query_(m_data_base);
diff --git a/sources/dataBase/projectdatabase.h b/sources/dataBase/projectdatabase.h
index 610a9d2ba..5aa44cc62 100644
--- a/sources/dataBase/projectdatabase.h
+++ b/sources/dataBase/projectdatabase.h
@@ -49,13 +49,14 @@ class projectDataBase : public QObject
void updateDB();
QETProject *project() const;
- static QStringList headersFromElementsInfoQuery(const QString &query);
+ static QStringList headersFromElementNomenclatureViewQuery(const QString &query);
signals:
void dataBaseUpdated();
private:
bool createDataBase(const QString &connection_name= QString(), const QString &name = QString());
+ void createElementNomenclatureView();
void populateDiagramTable();
void populateElementTable();
void populateElementInfoTable();
diff --git a/sources/dataBase/ui/elementquerywidget.cpp b/sources/dataBase/ui/elementquerywidget.cpp
index f05e5c49d..fb7760082 100644
--- a/sources/dataBase/ui/elementquerywidget.cpp
+++ b/sources/dataBase/ui/elementquerywidget.cpp
@@ -29,10 +29,10 @@ ElementQueryWidget::ElementQueryWidget(QWidget *parent) :
{
ui->setupUi(this);
- m_export_info.insert("e.pos", tr("Position"));
- m_export_info.insert("di.title", tr("Titre du folio"));
- m_export_info.insert("d.pos", tr("Position du folio"));
- m_export_info.insert("di.folio", tr("Numéro du folio"));
+ m_export_info.insert("position", tr("Position"));
+ m_export_info.insert("title", tr("Titre du folio"));
+ m_export_info.insert("diagram_position", tr("Position du folio"));
+ m_export_info.insert("folio", tr("Numéro du folio"));
m_button_group.setExclusive(false);
m_button_group.addButton(ui->m_all_cb, 0);
@@ -149,42 +149,38 @@ QString ElementQueryWidget::queryStr() const
}
}
- QString from = " FROM element_info ei, element e, diagram d, diagram_info di";
- QString where = " WHERE ei.element_uuid = e.uuid"
- " AND di.diagram_uuid = d.uuid"
- " AND e.diagram_uuid = d.uuid";
+ QString from = " FROM element_nomenclature_view";
+ QString where;
if (ui->m_all_cb->checkState() == Qt::PartiallyChecked)
{
+ where = " WHERE ";
bool b = false;
- where += " AND (";
if (ui->m_terminal_cb->isChecked()) {
if (b) where +=" OR";
- where += " e.type = 'Terminale'";
+ where += " element_type = 'Terminale'";
b = true;
}
if (ui->m_simple_cb->isChecked()) {
if (b) where +=" OR";
- where += " e.type = 'Simple'";
+ where += " element_type = 'Simple'";
b = true;
}
if (ui->m_button_cb->isChecked()) {
if (b) where +=" OR";
- where += " e.sub_type = 'commutator'";
+ where += " element_sub_type = 'commutator'";
b = true;
}
if (ui->m_coil_cb->isChecked()) {
if (b) where +=" OR";
- where += " e.sub_type = 'coil'";
+ where += " element_sub_type = 'coil'";
b = true;
}
if (ui->m_protection_cb->isChecked()) {
if (b) where +=" OR";
- where += " e.sub_type = 'protection'";
+ where += " element_sub_type = 'protection'";
}
- where += ")";
}
-
QString q(select + column + from + where + filter_ + order_by);
return q;
@@ -233,8 +229,11 @@ void ElementQueryWidget::setUpItems()
{
for(QString key : QETApp::elementInfoKeys())
{
+ if (key == "formula")
+ continue;
+
auto item = new QListWidgetItem(QETApp::elementTranslatedInfoKey(key), ui->m_var_list);
- item->setData(Qt::UserRole, "ei." + key);
+ item->setData(Qt::UserRole, key);
m_items_list << item;
}
diff --git a/sources/qetdiagrameditor.cpp b/sources/qetdiagrameditor.cpp
index 04a52223f..7261f8612 100644
--- a/sources/qetdiagrameditor.cpp
+++ b/sources/qetdiagrameditor.cpp
@@ -39,6 +39,7 @@
#include "qetgraphicstableitem.h"
#include "bomexportdialog.h"
#include "nomenclaturemodel.h"
+#include "QWidgetAnimation/qwidgetanimation.h"
#include
@@ -66,9 +67,17 @@ QETDiagramEditor::QETDiagramEditor(const QStringList &files, QWidget *parent) :
splitter_->setOrientation(Qt::Vertical);
splitter_->addWidget(&m_workspace);
splitter_->addWidget(&m_search_and_replace_widget);
- m_search_and_replace_widget.setHidden(true);
- m_search_and_replace_widget.setEditor(this);
setCentralWidget(splitter_);
+ m_search_and_replace_widget.setEditor(this);
+
+ QList s;
+ s << m_workspace.maximumHeight() << m_search_and_replace_widget.minimumSizeHint().height();
+ splitter_->setSizes(s); //Force the size of the search and replace widget, force have a good animation the first time he is showed
+
+ auto anim = new QWidgetAnimation(&m_search_and_replace_widget, Qt::Vertical, QWidgetAnimation::lastSize, 250);
+ anim->setObjectName("search and replace animator");
+ m_search_and_replace_widget.setHidden(true);
+ anim->setLastShowSize(m_search_and_replace_widget.minimumSizeHint().height());
//Set object name to be retrieved by the stylesheets
m_workspace.setBackground(QBrush(Qt::NoBrush));
@@ -654,8 +663,13 @@ void QETDiagramEditor::setUpActions()
m_find = new QAction(tr("Chercher/remplacer"), this);
m_find->setShortcut(QKeySequence::Find);
- connect(m_find, &QAction::triggered, [this]() {
- this->m_search_and_replace_widget.setHidden(!m_search_and_replace_widget.isHidden());
+ connect(m_find, &QAction::triggered, [this]()
+ {
+ if (auto animator = m_search_and_replace_widget.findChild("search and replace animator")) {
+ animator->setHidden(!m_search_and_replace_widget.isHidden());
+ } else {
+ this->m_search_and_replace_widget.setHidden(!m_search_and_replace_widget.isHidden());
+ }
});
}
@@ -2311,7 +2325,7 @@ void QETDiagramEditor::generateTerminalBlock()
" First install on macOSX"
""""
"
"
- "1. Install, if required, python 3.5 "
+ "1. Install, if required, python 3.8 bundle only, because program use hardcoded PATH for localise qet-tb-generator plugin "
"
"
" Visit :"
"
"
diff --git a/sources/qetgraphicsitem/ViewItem/nomenclaturemodel.cpp b/sources/qetgraphicsitem/ViewItem/nomenclaturemodel.cpp
index e991a53e9..a485ddc33 100644
--- a/sources/qetgraphicsitem/ViewItem/nomenclaturemodel.cpp
+++ b/sources/qetgraphicsitem/ViewItem/nomenclaturemodel.cpp
@@ -197,7 +197,7 @@ QETProject *NomenclatureModel::project() const {
*/
void NomenclatureModel::autoHeaders()
{
- auto headers = projectDataBase::headersFromElementsInfoQuery(m_query);
+ auto headers = projectDataBase::headersFromElementNomenclatureViewQuery(m_query);
for (auto i=0 ; isetHeaderData(i, Qt::Horizontal, headers.at(i));
}