kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2026-01-06 22:00:52 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

When we link two reports together, if the text is the same for every conductors, we don't ask to user what to do, even if the function or the tension/protocol are not identical.

Browse Source 
Now we check : text, function and tension/protocol, if one of these three values is not identical, we ask to user what to do.


git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@5032 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
blacksun
2017-08-27 11:27:41 +00:00
parent 48778d901c
commit 31775871a4
4 changed files with 40 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
sources/ui/potentialselectordialog.cpp
View File

@@ -215,8 +215,27 @@ PotentialSelectorDialog::~PotentialSelectorDialog()
*/
void PotentialSelectorDialog::buildWidget()
{
QRadioButton *rb1 = new QRadioButton(tr("Le potentiel avec numero de fil %1 est présent %2 fois").arg(m_potential_selector->m_properties_list_1.first().text).arg(m_potential_selector->m_conductor_number_1), this);
QRadioButton *rb2 = new QRadioButton(tr("Le potentiel avec numero de fil %1 est présent %2 fois").arg(m_potential_selector->m_properties_list_2.first().text).arg(m_potential_selector->m_conductor_number_2), this);
QString text1(tr("%n conducteurs composent potentiel suivant :", "", m_potential_selector->m_conductor_number_1));
ConductorProperties cp1 = m_potential_selector->m_properties_list_1.first();
if(!cp1.text.isEmpty())
text1.append(tr("\nNumero : %1").arg(cp1.text));
if(!cp1.m_function.isEmpty())
text1.append(tr("\nFonction : %1").arg(cp1.m_function));
if(!cp1.m_tension_protocol.isEmpty())
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();
if(!cp2.text.isEmpty())
text2.append(tr("\nNumero : %1").arg(cp2.text));
if(!cp2.m_function.isEmpty())
text2.append(tr("\nFonction : %1").arg(cp2.m_function));
if(!cp2.m_tension_protocol.isEmpty())
text2.append(tr("\nTension/protocole : %1").arg(cp2.m_tension_protocol));
QRadioButton *rb1 = new QRadioButton(text1, this);
QRadioButton *rb2 = new QRadioButton(text2, this);
connect(rb1, &QRadioButton::toggled, [this](bool t)
{
@@ -252,7 +271,6 @@ void PotentialSelectorDialog::buildWidget()
rb2->setChecked(true);
}
}
#include <QDebug>
/**
* @brief PotentialSelectorDialog::on_buttonBox_accepted