From a19eb57a0f7db2290101e40c70045b98a84040e7 Mon Sep 17 00:00:00 2001 From: sdeffaux <53090527+sdeffaux@users.noreply.github.com> Date: Thu, 23 Apr 2020 10:36:56 +0200 Subject: [PATCH 1/7] add symbols and reorganised folders --- .../legrand/leg069731.elmt | 47 ++ .../legrand/leg413098.elmt | 57 ++ .../light/light_230V/xb4bvm1_blanc.elmt | 67 +- .../light/light_230V/xb4bvm3_vert.elmt | 69 +- .../light/light_230V/xb4bvm4_rouge.elmt | 67 +- .../light/light_230V/xb4bvm5_orange.elmt | 67 +- .../light/light_230V/xb4bvm6_bleu.elmt | 64 +- .../light/light_24V/xb4bvb1_blanc.elmt | 65 +- .../light/light_24V/xb4bvb3_vert.elmt | 59 +- .../light/light_24V/xb4bvb4_rouge.elmt | 67 +- .../light/light_24V/xb4bvb5_jaune.elmt | 50 -- .../light/light_24V/xb4bvb5_orange.elmt | 49 ++ .../light/light_24V/xb4bvb6_bleu.elmt | 69 +- ...-transfo_sonnerie_230V_12-24V_40VA_5m.elmt | 114 ++++ .../schneider_electric/atv12.elmt | 317 +++++++++ .../{ => disjoncteurs}/Schneider_man_10A.elmt | 0 .../{ => disjoncteurs}/Schneider_man_16A.elmt | 0 .../{ => disjoncteurs}/Schneider_man_20A.elmt | 0 .../{ => disjoncteurs}/Schneider_man_25A.elmt | 0 .../{ => disjoncteurs}/Schneider_man_2A.elmt | 0 .../Schneider_man_30mA.elmt | 0 .../{ => disjoncteurs}/Schneider_man_32A.elmt | 0 .../disjoncteur-tetra-dt40.elmt | 0 .../disjoncteur-uni-dclic.elmt | 0 .../disjoncteur-uni-dt40.elmt | 0 .../{ => disjoncteurs}/domA42_2p_10a.elmt | 0 .../{ => disjoncteurs}/doma42_2p_16a.elmt | 0 .../{ => disjoncteurs}/doma42_2p_20a.elmt | 0 .../{ => disjoncteurs}/doma42_2p_25a.elmt | 0 .../{ => disjoncteurs}/doma42_2p_32a.elmt | 0 .../{ => disjoncteurs}/doma45_1p+n _25a.elmt | 0 .../{ => disjoncteurs}/doma45_1p+n_10a.elmt | 0 .../{ => disjoncteurs}/doma45_1p+n_16a.elmt | 0 .../{ => disjoncteurs}/doma45_1p+n_20a.elmt | 0 .../{ => disjoncteurs}/doma45_1p+n_32a.elmt | 0 .../domb _25a _2p _300ma_ac.elmt | 0 .../domb_25a_2_30ma_ac.elmt | 0 .../domb_40a_2p_300ma_ac.elmt | 0 .../domb_40a_2p_30ma_ac.elmt | 0 .../{ => disjoncteurs}/dt40_25A.elmt | 0 .../disjoncteurs/qet_directory | 17 + .../{ => disjoncteurs}/vigi-dt40 -.elmt | 0 .../schneider_electric/{ => gv2}/gv2me.elmt | 0 .../schneider_electric/{ => gv2}/gv2me_2.elmt | 0 .../schneider_electric/{ => gv2}/gv2p.elmt | 0 .../schneider_electric/gv2/qet_directory | 5 + .../schneider_electric/m221CE40T.elmt | 618 ++++++++++++++++++ .../ict_2p _63a.elmt | 0 .../ict_2p_16a.elmt | 0 .../ict_2p_20a.elmt | 0 .../ict_2p_25a.elmt | 0 .../ict_2p_40a.elmt | 0 .../{ => relays_contactors&contacts}/ka.elmt | 0 .../km_tetra.elmt | 0 .../km_tri.elmt | 0 .../ladn22 tetra.elmt | 0 .../ladn22 tri.elmt | 0 .../ladr4 tri - repos.elmt | 0 .../lads2 tri - travail.elmt | 0 .../lc1d.elmt | 0 .../lc1k.elmt | 0 .../lc2d.elmt | 0 .../lc2k.elmt | 0 .../relays_contactors&contacts/lrd.elmt | 78 +++ .../relays_contactors&contacts/qet_directory | 15 + .../schneider_electric/voyants/qet_directory | 6 + .../voyants/voyant_230V/qet_directory | 6 + .../voyants/voyant_230V/xb4bvm1-blanc.elmt | 35 + .../voyants/voyant_230V/xb4bvm3-vert.elmt | 35 + .../voyants/voyant_230V/xb4bvm4-rouge.elmt | 35 + .../voyants/voyant_230V/xb4bvm5-orange.elmt | 35 + .../voyants/voyant_230V/xb4bvm6-bleu.elmt | 35 + .../voyants_24v}/qet_directory | 0 .../voyants_24v}/xb4bvb1-blanc.elmt | 0 .../voyants_24v}/xb4bvb3-vert.elmt | 0 .../voyants_24v}/xb4bvb4-rouge.elmt | 0 .../voyants_24v}/xb4bvb5-orange.elmt | 0 .../voyants_24v}/xb4bvb6-bleu.elmt | 0 .../sofrel/16di.elmt | 330 +++++----- .../sofrel/sofrel_6ai-t.elmt | 286 ++++---- 80 files changed, 2091 insertions(+), 673 deletions(-) create mode 100644 elements/10_electric/20_manufacturers_articles/legrand/leg069731.elmt create mode 100644 elements/10_electric/20_manufacturers_articles/legrand/leg413098.elmt delete mode 100644 elements/10_electric/20_manufacturers_articles/schneider_electric/light/light_24V/xb4bvb5_jaune.elmt create mode 100644 elements/10_electric/20_manufacturers_articles/schneider_electric/light/light_24V/xb4bvb5_orange.elmt create mode 100644 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 create mode 100644 elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/atv12.elmt rename elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/{ => disjoncteurs}/Schneider_man_10A.elmt (100%) rename elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/{ => disjoncteurs}/Schneider_man_16A.elmt (100%) rename elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/{ => disjoncteurs}/Schneider_man_20A.elmt (100%) rename elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/{ => disjoncteurs}/Schneider_man_25A.elmt (100%) rename elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/{ => disjoncteurs}/Schneider_man_2A.elmt (100%) rename elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/{ => disjoncteurs}/Schneider_man_30mA.elmt (100%) rename elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/{ => disjoncteurs}/Schneider_man_32A.elmt (100%) rename elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/{ => disjoncteurs}/disjoncteur-tetra-dt40.elmt (100%) rename elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/{ => disjoncteurs}/disjoncteur-uni-dclic.elmt (100%) rename elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/{ => disjoncteurs}/disjoncteur-uni-dt40.elmt (100%) rename elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/{ => disjoncteurs}/domA42_2p_10a.elmt (100%) rename elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/{ => disjoncteurs}/doma42_2p_16a.elmt (100%) rename elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/{ => disjoncteurs}/doma42_2p_20a.elmt (100%) rename elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/{ => disjoncteurs}/doma42_2p_25a.elmt (100%) rename elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/{ => disjoncteurs}/doma42_2p_32a.elmt (100%) rename elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/{ => disjoncteurs}/doma45_1p+n _25a.elmt (100%) rename elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/{ => disjoncteurs}/doma45_1p+n_10a.elmt (100%) rename elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/{ => disjoncteurs}/doma45_1p+n_16a.elmt (100%) rename elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/{ => disjoncteurs}/doma45_1p+n_20a.elmt (100%) rename elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/{ => disjoncteurs}/doma45_1p+n_32a.elmt (100%) rename elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/{ => disjoncteurs}/domb _25a _2p _300ma_ac.elmt (100%) rename elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/{ => disjoncteurs}/domb_25a_2_30ma_ac.elmt (100%) rename elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/{ => disjoncteurs}/domb_40a_2p_300ma_ac.elmt (100%) rename elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/{ => disjoncteurs}/domb_40a_2p_30ma_ac.elmt (100%) rename elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/{ => disjoncteurs}/dt40_25A.elmt (100%) create mode 100644 elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/disjoncteurs/qet_directory rename elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/{ => disjoncteurs}/vigi-dt40 -.elmt (100%) rename elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/{ => gv2}/gv2me.elmt (100%) rename elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/{ => gv2}/gv2me_2.elmt (100%) rename elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/{ => gv2}/gv2p.elmt (100%) create mode 100644 elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/gv2/qet_directory create mode 100644 elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/m221CE40T.elmt rename elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/{ => relays_contactors&contacts}/ict_2p _63a.elmt (100%) rename elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/{ => relays_contactors&contacts}/ict_2p_16a.elmt (100%) rename elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/{ => relays_contactors&contacts}/ict_2p_20a.elmt (100%) rename elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/{ => relays_contactors&contacts}/ict_2p_25a.elmt (100%) rename elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/{ => relays_contactors&contacts}/ict_2p_40a.elmt (100%) rename elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/{ => relays_contactors&contacts}/ka.elmt (100%) rename elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/{ => relays_contactors&contacts}/km_tetra.elmt (100%) rename elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/{ => relays_contactors&contacts}/km_tri.elmt (100%) rename elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/{ => relays_contactors&contacts}/ladn22 tetra.elmt (100%) rename elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/{ => relays_contactors&contacts}/ladn22 tri.elmt (100%) rename elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/{ => relays_contactors&contacts}/ladr4 tri - repos.elmt (100%) rename elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/{ => relays_contactors&contacts}/lads2 tri - travail.elmt (100%) rename elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/{ => relays_contactors&contacts}/lc1d.elmt (100%) rename elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/{ => relays_contactors&contacts}/lc1k.elmt (100%) rename elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/{ => relays_contactors&contacts}/lc2d.elmt (100%) rename elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/{ => relays_contactors&contacts}/lc2k.elmt (100%) create mode 100644 elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/relays_contactors&contacts/lrd.elmt create mode 100644 elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/relays_contactors&contacts/qet_directory create mode 100644 elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/voyants/qet_directory create mode 100644 elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/voyants/voyant_230V/qet_directory create mode 100644 elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/voyants/voyant_230V/xb4bvm1-blanc.elmt create mode 100644 elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/voyants/voyant_230V/xb4bvm3-vert.elmt create mode 100644 elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/voyants/voyant_230V/xb4bvm4-rouge.elmt create mode 100644 elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/voyants/voyant_230V/xb4bvm5-orange.elmt create mode 100644 elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/voyants/voyant_230V/xb4bvm6-bleu.elmt rename elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/{voyant => voyants/voyants_24v}/qet_directory (100%) rename elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/{voyant => voyants/voyants_24v}/xb4bvb1-blanc.elmt (100%) rename elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/{voyant => voyants/voyants_24v}/xb4bvb3-vert.elmt (100%) rename elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/{voyant => voyants/voyants_24v}/xb4bvb4-rouge.elmt (100%) rename elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/{voyant => voyants/voyants_24v}/xb4bvb5-orange.elmt (100%) rename elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/schneider_electric/{voyant => voyants/voyants_24v}/xb4bvb6-bleu.elmt (100%) 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 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From f4cbf21075509f92d2528e958fef06442a0690f0 Mon Sep 17 00:00:00 2001 From: Laurent Trinques Date: Thu, 23 Apr 2020 12:45:37 +0200 Subject: [PATCH 2/7] =?UTF-8?q?Add=20new=20Delta=20symbols,=20thanks=20Raf?= =?UTF-8?q?a=C5=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../delta/dvp-se.elmt | 87 ----------------- .../delta/frequency_drives/qet_directory | 14 +++ .../{ => frequency_drives}/vfd007e43t.elmt | 0 .../dvp16sp11r/dvp16sp11r(inputs).elmt | 79 +++++++++++++++ .../dvp16sp11r/dvp16sp11r(outputs).elmt | 79 +++++++++++++++ .../dvp16sp11r/dvp16sp11r.elmt | 69 +++++++++++++ .../dvp16sp11r/qet_directory | 11 +++ .../delta/input_output_cards/qet_directory | 6 ++ .../dvp12se11r/dvp12se11r(inputs).elmt | 79 +++++++++++++++ .../dvp12se11r/dvp12se11r(outputs).elmt | 79 +++++++++++++++ .../dvp12se11r/dvp12se11r.elmt | 96 ++++++++++++++++++ .../dvp12se11r/qet_directory | 11 +++ .../dvp12ss211s/dvp12ss211s(inputs).elmt | 79 +++++++++++++++ .../dvp12ss211s/dvp12ss211s(outputs).elmt | 78 +++++++++++++++ .../dvp12ss211s/dvp12ss211s.elmt | 97 +++++++++++++++++++ .../dvp12ss211s/qet_directory | 11 +++ .../dvp14ss211r/dvp14ss211r(inputs).elmt | 79 +++++++++++++++ .../dvp14ss211r/dvp14ss211r(outputs).elmt | 78 +++++++++++++++ .../dvp14ss211r/dvp14ss211r.elmt | 97 +++++++++++++++++++ .../dvp14ss211r/qet_directory | 11 +++ .../dvp14ss211t/dvp14ss211t(inputs).elmt | 79 +++++++++++++++ .../dvp14ss211t/dvp14ss211t(outputs).elmt | 78 +++++++++++++++ .../dvp14ss211t/dvp14ss211t.elmt | 97 +++++++++++++++++++ .../dvp14ss211t/qet_directory | 11 +++ .../delta/plc_and_controllers/qet_directory | 11 +++ 25 files changed, 1329 insertions(+), 87 deletions(-) delete mode 100644 elements/10_electric/20_manufacturers_articles/delta/dvp-se.elmt create mode 100644 elements/10_electric/20_manufacturers_articles/delta/frequency_drives/qet_directory rename elements/10_electric/20_manufacturers_articles/delta/{ => frequency_drives}/vfd007e43t.elmt (100%) create mode 100644 elements/10_electric/20_manufacturers_articles/delta/input_output_cards/dvp16sp11r/dvp16sp11r(inputs).elmt create mode 100644 elements/10_electric/20_manufacturers_articles/delta/input_output_cards/dvp16sp11r/dvp16sp11r(outputs).elmt create mode 100644 elements/10_electric/20_manufacturers_articles/delta/input_output_cards/dvp16sp11r/dvp16sp11r.elmt create mode 100644 elements/10_electric/20_manufacturers_articles/delta/input_output_cards/dvp16sp11r/qet_directory create mode 100644 elements/10_electric/20_manufacturers_articles/delta/input_output_cards/qet_directory create mode 100644 elements/10_electric/20_manufacturers_articles/delta/plc_and_controllers/dvp12se11r/dvp12se11r(inputs).elmt create mode 100644 elements/10_electric/20_manufacturers_articles/delta/plc_and_controllers/dvp12se11r/dvp12se11r(outputs).elmt create mode 100644 elements/10_electric/20_manufacturers_articles/delta/plc_and_controllers/dvp12se11r/dvp12se11r.elmt create mode 100644 elements/10_electric/20_manufacturers_articles/delta/plc_and_controllers/dvp12se11r/qet_directory create mode 100644 elements/10_electric/20_manufacturers_articles/delta/plc_and_controllers/dvp12ss211s/dvp12ss211s(inputs).elmt create mode 100644 elements/10_electric/20_manufacturers_articles/delta/plc_and_controllers/dvp12ss211s/dvp12ss211s(outputs).elmt create mode 100644 elements/10_electric/20_manufacturers_articles/delta/plc_and_controllers/dvp12ss211s/dvp12ss211s.elmt create mode 100644 elements/10_electric/20_manufacturers_articles/delta/plc_and_controllers/dvp12ss211s/qet_directory create mode 100644 elements/10_electric/20_manufacturers_articles/delta/plc_and_controllers/dvp14ss211r/dvp14ss211r(inputs).elmt create mode 100644 elements/10_electric/20_manufacturers_articles/delta/plc_and_controllers/dvp14ss211r/dvp14ss211r(outputs).elmt create mode 100644 elements/10_electric/20_manufacturers_articles/delta/plc_and_controllers/dvp14ss211r/dvp14ss211r.elmt create mode 100644 elements/10_electric/20_manufacturers_articles/delta/plc_and_controllers/dvp14ss211r/qet_directory create mode 100644 elements/10_electric/20_manufacturers_articles/delta/plc_and_controllers/dvp14ss211t/dvp14ss211t(inputs).elmt create mode 100644 elements/10_electric/20_manufacturers_articles/delta/plc_and_controllers/dvp14ss211t/dvp14ss211t(outputs).elmt create mode 100644 elements/10_electric/20_manufacturers_articles/delta/plc_and_controllers/dvp14ss211t/dvp14ss211t.elmt create mode 100644 elements/10_electric/20_manufacturers_articles/delta/plc_and_controllers/dvp14ss211t/qet_directory create mode 100644 elements/10_electric/20_manufacturers_articles/delta/plc_and_controllers/qet_directory 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í + + From 9525278be7e9213d0aac259ff402fc701b0aeb15 Mon Sep 17 00:00:00 2001 From: Claveau Joshua Date: Thu, 23 Apr 2020 19:52:56 +0200 Subject: [PATCH 3/7] Animate show and replace widget. this feature is totally useless and by consequent indispensable. --- qelectrotech.pro | 5 + sources/QWidgetAnimation/QWidgetAnimation.pri | 5 + sources/QWidgetAnimation/qwidgetanimation.cpp | 162 ++++++ sources/QWidgetAnimation/qwidgetanimation.h | 73 +++ .../ui/searchandreplacewidget.cpp | 24 +- .../ui/searchandreplacewidget.h | 7 +- .../ui/searchandreplacewidget.ui | 546 +++++++++++------- sources/qetdiagrameditor.cpp | 22 +- 8 files changed, 606 insertions(+), 238 deletions(-) create mode 100644 sources/QWidgetAnimation/QWidgetAnimation.pri create mode 100644 sources/QWidgetAnimation/qwidgetanimation.cpp create mode 100644 sources/QWidgetAnimation/qwidgetanimation.h diff --git a/qelectrotech.pro b/qelectrotech.pro index 78c51d530..6fc5d4311 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 @@ -280,3 +282,6 @@ macx { unix { QMAKE_COPY_DIR = 'cp -f -r --preserve=timestamps' } + +SUBDIRS += \ + sources/QwidgetAnimation/QWidgetAnimation.pro 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/qetdiagrameditor.cpp b/sources/qetdiagrameditor.cpp index 04a52223f..d9278db8f 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()); + } }); } From 44bf0a5ce4838f02ecccf2c7ea3f2fbe63f4ddeb Mon Sep 17 00:00:00 2001 From: Claveau Joshua Date: Thu, 23 Apr 2020 20:01:01 +0200 Subject: [PATCH 4/7] minor --- qelectrotech.pro | 3 --- 1 file changed, 3 deletions(-) diff --git a/qelectrotech.pro b/qelectrotech.pro index 6fc5d4311..5799dfdb7 100644 --- a/qelectrotech.pro +++ b/qelectrotech.pro @@ -282,6 +282,3 @@ macx { unix { QMAKE_COPY_DIR = 'cp -f -r --preserve=timestamps' } - -SUBDIRS += \ - sources/QwidgetAnimation/QWidgetAnimation.pro From a8a9ddc3d669d1dd3bfe4091801b53180148a2ea Mon Sep 17 00:00:00 2001 From: Claveau Joshua Date: Sat, 25 Apr 2020 15:52:06 +0200 Subject: [PATCH 5/7] Add view 'element_nomenclature_view' to projectDataBase Add a view for the nomenclature to reduce the size of the query and make it more understandable --- sources/dataBase/projectdatabase.cpp | 79 +++++++++++++------ sources/dataBase/projectdatabase.h | 3 +- sources/dataBase/ui/elementquerywidget.cpp | 33 ++++---- .../ViewItem/nomenclaturemodel.cpp | 2 +- 4 files changed, 73 insertions(+), 44 deletions(-) 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/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)); } From a95a8b7fb627b193de7469f4023888e309808722 Mon Sep 17 00:00:00 2001 From: Ole Carlsen Date: Mon, 27 Apr 2020 19:46:10 +0200 Subject: [PATCH 6/7] Update danish translation --- lang/qet_da.qm | Bin 228103 -> 235192 bytes lang/qet_da.ts | 148 ++++++++++++++++++++++++------------------------- 2 files changed, 74 insertions(+), 74 deletions(-) diff --git a/lang/qet_da.qm b/lang/qet_da.qm index 8560756a323ce7eae271223608804d8fce89cc3d..24628c88a54359c57816294d06ac652d53869247 100644 GIT binary patch delta 19702 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 z z;WBw^Z>f)iE3tYDq=?jhi2tvykRpCth9q;a)DJ->%{d|saEEPgP)~{xpiIrP70wBl z2Gw>XK`1Q6FT>Veb*(h=>Mm?>HJ3(JKSn%vvt;#iB$irH8dJ{+v0_7MY?JqB|BW=U zZ)0MUrb?6ECy-DjU7B1d0fCAjP3~kxRJyS+K7hZ}lBOE+P(=(Rt{K5dyabqki| zy+hJWZ>;ZOGZc<+mdS2UkY=Yq84VfI++JoRE+wS7lYfO9J|o%2JtfMjDb4$c$ja@Z z!pSS8`9_3rZ3;>Atw*6`r?*P;Z^2OH-j-65lTrS=D=iw>5+PV;g`XZui=9xLiWn&^ z9uMzj_)S_ez7p!0%cK<>p#xQ~D4bbECaZ8zp~nrGysNKFq4jlX)!|#nhRaE7YaBr( z`j%u(+jxd3?2{yOU;}CMiU}y|#YkJc;OEmbrLAXI6YG6L+QHuu8(mo1w-FXZ3&KAdWt@EX`b#jmReCC%W|6MNWus#UrQ7+dP!PQ-lNXpI-6;Txo;e}qKCA$PbXB^m zh3Q^gTH$Zj~((_QPVw;(!p(^Dodb4fjPAClDrr_{q-VaO7@sAd1(=NI*`d2Ylf z4Nwo;>_=3vlX`dvNBp02R6S|Q9pX-9)RW6WW6V(Qt2w?hXK z)pP9}Jzkysp(#NT1yVm*Bo zt_oLp;{|BULU1@qy{1kSvFSdxKv(DH8&1JKC(TfApFfdU{7CiA^RRA39;)|M4=3Ja zggT>Y9x7QoW%4c^)frRaYAY^K?;o9pB85(UK$njqL<3u@tGm@UO?@(^De=xr)u--2 zjfON-pXnNed^J`kpJq~DuKo&v^(cj&OJwrUN#Hjk&t(c{+ppvMfko=e{uZAuz8-@~8n9k{M^%VeaCLQV(L~Jd-e&6DD^QD_r`37YJ7NpCl1x5t zw8CF5D116yo!1kw#e{c-r-@yc99g4U|>?r;#I z_E#A4M&ay68t-owB9C$kXBF1enQFmq*%(cm^1~6VJ&?%?4wcEL_0+V%&MsYFs%hJO zEVfQ`ns(N_AmXK+G#y4E7fE=i>9p%M@eK<#L2;*vbv~jAI)V|+eW&oEAd^qY*Mx+h zh9mB)>DDij*ob>FdAGir9!VJa>`4kQ7&VqQIEAvjw5Fdo^4?-yH3N#)A?{sR6ZHb7 zX3rUo)&7C|Y}E`L)dH2cvYP03FeTkmG;uZI5R-E?iIblYZ~sLzBBLYmW!)5hbI^?L z>;xUJrWw6BmDrMAnlU%9!izA?*o{~lH4_!qZYPtqUn`RbX*J`nT9A}=*GvvyPD1&3 zt0qZ$3lH8|Go!#%qH1B9IgaSij@6pvYGrZUps8k|^Lk>RUTPL@xQXcPxn@yU1Yz5r zY8Fp|e)i$rQR&(A=$pa8y@VbAL9Jv2jnCd`?kK-cMK+!6RkjOv`1>!_%-=`U09q zmQ}=3MrmGPc`--5=5$N+n@@Ux`|^vx&G#((1;ca38)!t6#ew5yf_`;cf<^yWHnmb6`Hv{wrE@ z4;aSa=Guarpj_f)ZISveM6EMqa(%kCRO4dACs)>%N_7br*$=b^CHsYGK+A7*Sq9u9SD#18=wd#hp2DADgy?mhc zLPSr?T4{ZT;P_d=+uB;M!jUj1Yn!dx42#}S+e&*G$~RkK*ZneuR@=0J5nqWncF?x_ z>`&D1XKlxbHAIQWw85_;iC%QnhPWO@hCfK#eG(*~)o6PTc?q{=(T1jCz#UI$!)jJI zix_3EHVovQdw_R{rti~+p~^!)Im_e)PHV&Oqs~3)wl<>QN@A^d+cvqoSpA!5BljO5 zmb60K{~P+-r=NBJj^I&ma1z|(&d1v5P`l*ww27N1qA)N>I|@g|*r-R^@$uLgSQxII zknMrfcvZ9$Q>zjSE2y2CEF$7?(k6|AVZAj}JMCIBv9sm1)4gjUMw_6W{`oKor8jG5 z`UKgJ7d+L@x&>WL5M=UZzS`M7*c2L5RXh9LE>srUYZpB|iX!l0?V8+BIQ(F3Di)8> zHbT3u_c9V%irO?!yYKs^O)m`{ZL~-xpS@MP^V16$;w9SsW5b|Am$V0lLBJo^Yk!&v zS5=|7_E3*+R-!c@w3)#>@q(Ay%v;deI$gAxU$Tj*D`*e9b|JyHu{OIq>{v`mnY`8; zunE40$>gab` zgP1N%n|sTO8!LHqU*@^S3}?S~QmnBi3I$D7dzuXk&|E=|Th+*j?_3m91ShdNc94KApF z!r2;~*1CNjQD~A*UnCL1p^MH?_6c$>wayT;ov7g(oq0G`W2JCifhn+W?yd?a-_|)& zIO=L)xj`P%7R zt7a2lHA$u*R@aqD@+MmSNLOYKw&%B&PD(qmf>Oz%x=J2-DE?g1c`ipi z{igt3jZ_3q$%1WDMHg$Qc{=Z+a9PXU6@JUp)$&?~JpY`o{R%LR_a7xhv28`HJij#O_Q=>oqv;naY$uD!h;adw%m zeg1eLxoZBsx@H zH>L6;7^!l)>1!dckyUjw>cM)BXro(DIG(s)G2McIC8(1O&@COj9{%dkTipuZcR2l3 zLARpEKDbs7U20S$_OK4?((D@5!&#SB6C8a=w?VxVWlK-phT`yeWgqD_#9}QCXsX+g zhjgUgLS6cNEc$xyW%B8-b(=(cdxvzJt3gg47Tu1>Ozfer)$OT*`CYL~_fv_5ww0C3 zSRZ%R{d58%j6bEzEZ-l>o+gveI-|=xt|ETnzV7JM0Mz@!blFX?D2{sSjt%Wd)VH$k z*nZ4WCqLaO8)RgiqdU6}&o_A?lh5rTQz(_EJHG`=f9g;1PM*L~Y@gP0{nPyR?&1D@)oW{3)Yjnb=s7l|(z zsqkYNz2@6K)DfEKwZouX&dz$h9`VuR4|@IN{?OiSG6iY5zW8QDBd03sOAbc+E1mQu z$6$O@&*;mZvgY9!We>f3zeE%!dg(n2Vk>3naD9z@Z=$$UdY`sXn{m$iI!7_P7ghQ? zPZnX8lV$ShW%TumprPqTeWT1E;`#3SR%a5Cs(sbBp86KfshGZPm7YZF+v&S_L2{{` z^_JU@@c`)~vYJAB2I>1-J8dSmW0^kcdKqG4hATY2P9`t5Qa^C&NTg~%>tlW6NT@en zKdkoy+_zOfY6JAU=>q+zrJ#6|WEoHOljD&$ zZFSR68-(m+?@ImjtvF$87@)V#tQrEtu~R?mAPNoj_vvSAIO_aY_48`MM`T^qFN}wh zjX0uT+8ft3^YzR1SpVa%=$9v|P$qbzU$J}van%9+%4?TMX#7f_*0(h(pK z^wO`-YJ&<%j(%gwRGbz5UB7AFSL}%1*6+AC8t0$dTJ?LYp-1N>{Q*a;c+Y+MgF4J% zp#Yhz<|CPWdqtT-&>;Px2JoV*o9J^giXp~6r*P&Wea@jyP|oH0Q&vA%5C?^G3hOUu zFtuk!>2G;mCc%4-{{F^y(bcza>UTSQaMXInSJm_!KVQLtgm$z)>1R~W{f z%0h$f4AVsk85SV!+H`bk|D>s!h{r|gdqoqe`v%Y!`VgKvCsP6aIQ6?0f$+J zbAix-A=3=!%ZKCGgRkL&7NQQiX}H=lAI8ALaJ4U&Z zuE^x$ZyIvPU`^MnZ^*@wI{x~D;Ss7ttoaawRsPUwnS6mycx-swrv|DoR}|hGCX>5& zF+5)9M$~z`;px|1i181|`)$nPB6O_VP;e;6q&or0GOB6ADdeH~IHCy4ar82p5rs318 zamW?s$>hxv4WFYi!a`FGUt)V9eB*{M@vm^4BGvHKV-;NBXCuY#Bp!OiDD1_3I|QTj zxES%3)-?HpAj~wXkHT{_JtLDRmoOSiNk|v{jjqwliGRFeEIn;CiYOh7RlE5jV2d+) zF7`*ByVmGaAHI0$TVsPnq>HsG85?#+$LiNKHoRlQcB<9rH|ss>v9FCyL*5X(Y65?S zxrqT`$E{a8%O7~DC&s2-;h3Ddg92_`A(Oi{04034|E@t|>}(8ZdK)DLQaD3p46K3O zix#oQ_ETYhySvHcjqe-VA92FLv1P{KNciH($;R&Z+aM-vFm}(hAs5(X>=iu->p$|k zG4%3WxWKjw@5dPXB%m<1!`~Rjh9lW{EK}fq#_)$O#JV^d`#OeU-?o*ppFJ|0xYHQf z+JaLJ!xdg!Zj4TLN1|N87(4JRl9PGHL0+9u)yY+OEz%fY>?_e?2V9Z%hqb*=l=i|n+<-c5=_ST-NJhBtOyexINNmno}d7UA4LnY?R)Od+s{ zF}H77yo2@xa}hLW0orX>}`Bf1c6|ON5&_OUc#=Zjjy^R zf~;D|_$KEPv0gP5ZhB|TpS2oi?oJxtRzy2xuPJQiXzNka#p*ND_;nsG #FLN5~= zjB(yyXyQr8_&?P(sk8`Ug0{=#JD8~u1j@!9GC5a(N@_w)rM77iqll)m-yoN`1XGod z6Nq}b5$v-cqIb*9Fn zzL8KZ!_;^dg7mB*rlwsmerdZY;Cem^g|ke7VQx6+=4fggJ08bCvrO$WFtc4>D2&jV zLil~+y&IeQ48w%f`DC(8+KU8zn#r=|4zX#qO)*8|aj@pODJFM0D)A#tgB*fT95Te1 z21UZz|9;LCHwPsH-3L>`)DFZ)^)(G`ieP4)r)lJr0OIB5nntZ(hHabY3V&a0O2QdJ zRy*A^O=^OS|Fvn(N=KwSBTe&Wz#baBP4i1YvO~|A7Pf+U$qh3t9(o)D)ti>u?=vKu zmOirvAs_5)S~YDKF|S>wb!m`9dmq#KvCW7byJFg@Yl9B_WZDTY&mBb5UY{J~WkXH- z@`pnLqfHs#yM5VmbFo!)l{&d9&It z_Nf}1?zPEB;`YY$cuZ}K&{yG}FQ&&|Adv?5O|ORvh`=qT{HUJzL#j5W_m2w_>%YbH z{&Om^61~kD6bR|}(`Kt~>pbKLE6t`;POxKr%tad5@Q0Np&Bgn|oQ$okFelbrA^=uk zcRO>b+_p&6>YH7E#fyIRFqc`5?5o@gbGZ@O#2-8|S1h?25qCMW$3+<6+QrN@^l&{7 zmYKcm%qwK}db5yNse5K`7F4hZs&2!5jw<)kdCQq89 zaBe}FLTj6OZuh=8PU0q$uM9EIyYLz9H8n37B0`4;nHQYNL-FRac~K+G=!9T}XG}7A z@r&j~N8t*$o;EK|zYnVbiAZ(EBQ9No{nqd$r`>pPlv{PY#}wxW5D&X@R> z+U7l_-Ec7HwmEy~ZJc`oYI&FS%#)4y|kIYYe@uvswJIznlKo_r{FhBW>qs2*r`Q-$R zyjhyUfC@7CgevBjX+hXC9c_O5@;btv+U5_B;UYa!6waD%{!*+MdOGBS`Rh&?IMq$_ zH~V*=zL6w!iP-VEUcls(!fD*WwluVcql15xWuPTGp?#tyZdm8Y@CZwS?M`T=A6|Fv z)6w`Z_uEFcD{t!?=J3P2r-XGZ{x5ecturiWDntP`?Zx7*8o!w6gh;$zjf+3H+4d|f z(E5Yxaw7)vr#Nz@1d5@7*hfT~fqxqR_ypI%k>QrVY4VTvE00D|Bt@W!fn=fZ?@bu& zO=PW)2#s>hTA>d7ao6N_Ow1ZHYe-h%PQhQ|L_vAO)E zsecHt;Xg~z@gHr;aKKypBVoKfLZ672xpK zA*Xmu;+1TfQTiV~b2G~Ihu8H3>;3D{cGS+wj86GApSik}Y#tXH+b=RKzEfzQC`-Gz zm{?037J0mXcw|CMT#9owp=33Exl*gPZsqI$J68%3sXRE)lob^8s=ns3=3|43ubk=ST|LFdA zZ7tL^Ykh1~Xcz|Y|J-REHE03*I{04O`60?1T3jfP6 zU8o}l8I7UZ&9>c?**`^7e|-LD^INEOWJI(j9!AGCv~SNLwU#-whS(XO; zO?oJri?BESU4~*{Xk5hqFkZQdM)Wg!6^=#}bNk1HpudVF<0u}cI1Vr9D^FQ}N+jFU zHHDdnjinarVR5zmAz!0`Py(=GuSz zqJDqs%b)8f%c!0$MR2#k=j2k`0s1epMh`reva zc3b~u)vfZyfA?kbVlRdmFa`=|U(SkA`aU_|+jRV+P1o4Cto318>%;#DdH;tlx>6gv zb$Bq>!TP5e`A3}T^n-T)tEKx>uqDv(j}WN6({^k1FShD?*Uf*vBEC;zF-)k`31lJ7hkgHZFRQPJ0m zDQq{Zl=3o2Fs8)x5VU(1?_v!Ku_m^&&x&-hJ4q!+v3DvKx*8)p%>lCev3D*3oeYIr z`p0xt^&c7=6KC%hqMkmX@v^N9M^CcWTU;X%z{EvcQrg{Q<@Q|5VZOIh3j4AG&VQ(!|$VW zXz3$l=}L9+&mQo6zxG|r^z9;}2e{UCwIk)QC^*eG2@WZ*3_=Ze2kP)okIPMce@xrK z5{{?v|CG`Op~#-HMxhI@;y}%@`0UQb{=x|R=kHILL+rvIf`^n3^2_#&Fbn5;+b%^` zGRMZn^tXg1G!0D%Z35|~xLA2Z*MGk%TaXe^93?mFmGWj3D^VgoG&;T)9F%>j{QDDo Kn#Br-b^jk2hmw8( delta 15357 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 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 From 418e45552d411195ad3d64a48d087050bff8bb9e Mon Sep 17 00:00:00 2001 From: Laurent Trinques Date: Tue, 28 Apr 2020 17:47:52 +0200 Subject: [PATCH 7/7] macOS : add more explanation in Message Box about install plugin --- sources/qetdiagrameditor.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources/qetdiagrameditor.cpp b/sources/qetdiagrameditor.cpp index d9278db8f..7261f8612 100644 --- a/sources/qetdiagrameditor.cpp +++ b/sources/qetdiagrameditor.cpp @@ -2325,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 :" "
"