diff --git a/examples/Habitat-Unifilaire.qet b/examples/Habitat-Unifilaire.qet index 0a6a3109e..683239b0f 100644 --- a/examples/Habitat-Unifilaire.qet +++ b/examples/Habitat-Unifilaire.qet @@ -1,351 +1,582 @@ - + - - - + + + + + + + + + + + + - - + + - + - - + + - - + + + EDF +Type S + + + + 500mA + + + - + - - - - - - - - - - - + + + - + - - + + - + + + 40A Type AC + + + + 30mA + + + - + - - + + - + + + 20A + + + - + - - + + - + + + 16A + + + - + - - + + - + + + 20A + + + - + - - + + - + + + 2A + + + - + - - + + - + + + 10A + + + - + - + + + + + + + + 10A + + + + + + + + + - + - + + + + + + + + + + + + + + + + - + - - - - - - - - - + + + - + - + + + - + - + + + - + - + - + + + + + + - + - + + + - + - + + + - + - - + + - - + + + 40A Type AC + + + + 30mA + + + - + - - + + - + + + 10A + + + - + - - + + - + + + 10A + + + - + - - + + - + + + 20A + + + - + - - + + - + + + 20A + + + - + - + - + + + + + + - + - + - + + + + + + - + - - + + - - + + + 40A Type A + + + + 30mA + + + - + - - + + - + + + 16A + + + - + - - + + - + + + 20A + + + - + - - + + - + + + 32A + + + - + - - + + - + + + 20A + + + - + - - + + - + + + 16A + + + - + - + + + - + - - + + - + + + Info EDF + + + - + - - + + - + + + + + + - + - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + @@ -384,7 +615,7 @@ Spotřebiče - + مطبخ كهربائي Ηλεκτρικό μαγειρείο @@ -397,18 +628,18 @@ Author: The QElectroTech team License: see http://qelectrotech.org/wiki/doc/elements_license - - - - - - - + + + + + + + - + مشعاع Radiator @@ -419,17 +650,17 @@ License: see http://qelectrotech.org/wiki/doc/elements_license - - - - - - + + + + + + - + غسّالة أواني Πλυντήριο πιάτων @@ -442,25 +673,25 @@ License: see http://qelectrotech.org/wiki/doc/elements_license Author: The QElectroTech team License: see http://qelectrotech.org/wiki/doc/elements_license - - - - - - - - - - - - - - + + + + + + + + + + + + + + - + ثلاّجة بجزء للتجميد Ψυγειοκαταψύκτης @@ -473,31 +704,31 @@ License: see http://qelectrotech.org/wiki/doc/elements_license Author: The QElectroTech team License: see http://qelectrotech.org/wiki/doc/elements_license - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - + غسّالة ملابس Waschmaschine @@ -514,23 +745,23 @@ License: see http://qelectrotech.org/wiki/doc/elements_license Author: The QElectroTech team License: see http://qelectrotech.org/wiki/doc/elements_license - - - - - - - - - - - - + + + + + + + + + + + + - + مُشعّ كهربائي Radiator @@ -547,17 +778,17 @@ License: see http://qelectrotech.org/wiki/doc/elements_license Author: The QElectroTech team License: see http://qelectrotech.org/wiki/doc/elements_license - - - - - - + + + + + + - + مُجفّف ملابس Στεγνωτήριο @@ -570,19 +801,19 @@ License: see http://qelectrotech.org/wiki/doc/elements_license Author: The QElectroTech team License: see http://qelectrotech.org/wiki/doc/elements_license - - - - - - - - + + + + + + + + - + شفّاط بمرشّح Cooker Hood filter @@ -594,22 +825,22 @@ License: see http://qelectrotech.org/wiki/doc/elements_license Author: The QElectroTech team License: see http://qelectrotech.org/wiki/doc/elements_license - - - - - - - - - - - + + + + + + + + + + + - + سخّان ماء Θερμοσίφωνας @@ -622,14 +853,14 @@ License: see http://qelectrotech.org/wiki/doc/elements_license Author: The QElectroTech team License: see http://qelectrotech.org/wiki/doc/elements_license - - - - - - - - + + + + + + + + @@ -664,7 +895,7 @@ License: see http://qelectrotech.org/wiki/doc/elements_license Světla - + مصباح Leuchte @@ -680,17 +911,17 @@ License: see http://qelectrotech.org/wiki/doc/elements_license Author: The QElectroTech team License: see http://qelectrotech.org/wiki/doc/elements_license - - - - - - + + + + + + - + مُؤشّر وميضي Flashing light @@ -701,15 +932,15 @@ License: see http://qelectrotech.org/wiki/doc/elements_license - - - - - - - - - + + + + + + + + + @@ -729,7 +960,7 @@ License: see http://qelectrotech.org/wiki/doc/elements_license Různé - + مقبس أحادي الوجه لخزانة socket Monopolaire cabinet @@ -740,22 +971,22 @@ License: see http://qelectrotech.org/wiki/doc/elements_license - - - - - - - - - - - + + + + + + + + + + + - + مقبس Steckdose @@ -771,12 +1002,12 @@ License: see http://qelectrotech.org/wiki/doc/elements_license Author: The QElectroTech team License: see http://qelectrotech.org/wiki/doc/elements_license - - - - - - + + + + + + @@ -810,7 +1041,7 @@ License: see http://qelectrotech.org/wiki/doc/elements_license Rozdílové spínače - + مفتاح تفاضلي Differenz Schalter @@ -826,17 +1057,17 @@ License: see http://qelectrotech.org/wiki/doc/elements_license Author: The QElectroTech team License: see http://qelectrotech.org/wiki/doc/elements_license - - - - - - - - - - - + + + + + + + + + + + @@ -855,7 +1086,7 @@ License: see http://qelectrotech.org/wiki/doc/elements_license Rozdílové jističe - + قاطع تفاضلي مغناطيسي - حراري Magneto-thermal differential switch @@ -867,22 +1098,22 @@ License: see http://qelectrotech.org/wiki/doc/elements_license Author: The QElectroTech team License: see http://qelectrotech.org/wiki/doc/elements_license - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -901,7 +1132,7 @@ License: see http://qelectrotech.org/wiki/doc/elements_license Jističe - + قاطع أحدي القطب Circuit-breaker @@ -913,19 +1144,19 @@ License: see http://qelectrotech.org/wiki/doc/elements_license Author: The QElectroTech team License: see http://qelectrotech.org/wiki/doc/elements_license - - - - - - - - - - - - - + + + + + + + + + + + + + @@ -960,7 +1191,7 @@ License: see http://qelectrotech.org/wiki/doc/elements_license Spínače - + مفتاح Schalter @@ -976,12 +1207,12 @@ License: see http://qelectrotech.org/wiki/doc/elements_license Author: The QElectroTech team License: see http://qelectrotech.org/wiki/doc/elements_license - - - - - - + + + + + + @@ -1014,7 +1245,7 @@ License: see http://qelectrotech.org/wiki/doc/elements_license Obvykle otevřené - + مُلامس قدرة - كونتكتور (NO) Leistungs Kontakt @@ -1030,12 +1261,12 @@ License: see http://qelectrotech.org/wiki/doc/elements_license Author: The QElectroTech team License: see http://qelectrotech.org/wiki/doc/elements_license - - - - - - + + + + + + diff --git a/sources/ui/potentialselectordialog.cpp b/sources/ui/potentialselectordialog.cpp index ae4580bc5..91ec6024e 100644 --- a/sources/ui/potentialselectordialog.cpp +++ b/sources/ui/potentialselectordialog.cpp @@ -216,7 +216,10 @@ PotentialSelectorDialog::~PotentialSelectorDialog() void PotentialSelectorDialog::buildWidget() { QString text1(tr("%n conducteurs composent le potentiel suivant :", "", m_potential_selector->m_conductor_number_1)); - ConductorProperties cp1 = m_potential_selector->m_properties_list_1.first(); + + ConductorProperties cp1; + if(!m_potential_selector->m_properties_list_1.isEmpty()) + cp1 = m_potential_selector->m_properties_list_1.first();; if(!cp1.text.isEmpty()) text1.append(tr("\nNuméro : %1").arg(cp1.text)); @@ -226,7 +229,10 @@ void PotentialSelectorDialog::buildWidget() text1.append(tr("\nTension/protocole : %1").arg(cp1.m_tension_protocol)); QString text2(tr("%n conducteurs composent le potentiel suivant :", "", m_potential_selector->m_conductor_number_2)); - ConductorProperties cp2 = m_potential_selector->m_properties_list_2.first(); + ConductorProperties cp2; + if(!m_potential_selector->m_properties_list_2.isEmpty()) + cp2 = m_potential_selector->m_properties_list_2.first(); + if(!cp2.text.isEmpty()) text2.append(tr("\nNuméro : %1").arg(cp2.text)); if(!cp2.m_function.isEmpty())