kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-12-17 20:50:34 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Minor

Browse Source 
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4915 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
blacksun
2017-02-15 16:10:07 +00:00
parent f4c2f375d7
commit 07be603a1f
1 changed files with 31 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
sources/ui/linksingleelementwidget.cpp
View File

@@ -209,9 +209,11 @@ void LinkSingleElementWidget::buildTree()
setUpHeaderLabels(); setUpHeaderLabels();
QSettings settings; QSettings settings;
const QList <Element *> elmt_list = availableElements();
if (m_element->linkType() == Element::Slave) if (m_element->linkType() == Element::Slave)
{ {
foreach(Element *elmt, availableElements())
for(Element *elmt : elmt_list)
{ {
QStringList search_list; QStringList search_list;
QStringList str_list; QStringList str_list;
@@ -225,21 +227,22 @@ void LinkSingleElementWidget::buildTree()
if (Diagram *diag = elmt->diagram()) if (Diagram *diag = elmt->diagram())
{ {
if (settings.value("genericpanel/folio", false).toBool()){ if (settings.value("genericpanel/folio", false).toBool())
str_list << QString::number(diag->folioIndex() + 1);
}
else
{ {
autonum::sequentialNumbers seq; autonum::sequentialNumbers seq;
QString F =autonum::AssignVariables::formulaToLabel(diag->border_and_titleblock.folio(), seq, diag, elmt); QString F =autonum::AssignVariables::formulaToLabel(diag->border_and_titleblock.folio(), seq, diag, elmt);
str_list << F; str_list << F;
} }
else
{
str_list << QString::number(diag->folioIndex() + 1);
}
str_list << diag->convertPosition(elmt->scenePos()).toString(); str_list << diag->convertPosition(elmt->scenePos()).toString();
str_list << diag->title(); str_list << diag->title();
} }
else else
{ {
qDebug() << "In method void LinkSingleElementWidget::updateUi(), provied element must have be in a diagram"; qDebug() << "In method void LinkSingleElementWidget::updateUi(), provided element must be in a diagram";
} }
QTreeWidgetItem *qtwi = new QTreeWidgetItem(ui->m_tree_widget, str_list); QTreeWidgetItem *qtwi = new QTreeWidgetItem(ui->m_tree_widget, str_list);
@@ -255,7 +258,7 @@ void LinkSingleElementWidget::buildTree()
else if (m_element->linkType() & Element::AllReport) else if (m_element->linkType() & Element::AllReport)
{ {
foreach(Element *elmt, availableElements()) for(Element *elmt : elmt_list)
{ {
QStringList search_list; QStringList search_list;
QStringList str_list; QStringList str_list;
@@ -278,21 +281,22 @@ void LinkSingleElementWidget::buildTree()
if (Diagram *diag = elmt->diagram()) if (Diagram *diag = elmt->diagram())
{ {
if (settings.value("genericpanel/folio", false).toBool()){ if (settings.value("genericpanel/folio", false).toBool())
str_list << QString::number(diag->folioIndex() + 1);
}
else
{ {
autonum::sequentialNumbers seq; autonum::sequentialNumbers seq;
QString F =autonum::AssignVariables::formulaToLabel(diag->border_and_titleblock.folio(), seq, diag, elmt); QString F =autonum::AssignVariables::formulaToLabel(diag->border_and_titleblock.folio(), seq, diag, elmt);
str_list << F; str_list << F;
} }
else
{
str_list << QString::number(diag->folioIndex() + 1);
}
str_list << diag->convertPosition(elmt->scenePos()).toString(); str_list << diag->convertPosition(elmt->scenePos()).toString();
str_list << diag->title(); str_list << diag->title();
} }
else else
{ {
qDebug() << "In method void LinkSingleElementWidget::updateUi(), provied element must have be in a diagram"; qDebug() << "In method void LinkSingleElementWidget::updateUi(), provided element must be in a diagram";
} }
QTreeWidgetItem *qtwi = new QTreeWidgetItem(ui->m_tree_widget, str_list); QTreeWidgetItem *qtwi = new QTreeWidgetItem(ui->m_tree_widget, str_list);
@@ -396,23 +400,28 @@ void LinkSingleElementWidget::setUpHeaderLabels()
{ {
QStringList list; QStringList list;
QSettings settings; QSettings settings;
if (m_element->linkType() == Element::Slave){
if (settings.value("genericpanel/folio", false).toBool()){ if (m_element->linkType() == Element::Slave)
list << tr("Label") << tr("Commentaire") << tr("N° de folio") << tr("Position") << tr("Titre de folio"); {
} if (settings.value("genericpanel/folio", false).toBool())
else
{ {
list << tr("Label") << tr("Commentaire") << tr("Label de folio") << tr("Position") << tr("Titre de folio"); list << tr("Label") << tr("Commentaire") << tr("Label de folio") << tr("Position") << tr("Titre de folio");
} }
else
{
list << tr("Label") << tr("Commentaire") << tr("N° de folio") << tr("Position") << tr("Titre de folio");
}
} }
if (m_element->linkType() & Element::AllReport){ if (m_element->linkType() & Element::AllReport)
if (settings.value("genericpanel/folio", false).toBool()){ {
list << tr("N° de fil") << tr("Fonction") << tr("Tension / Protocole") << tr("N° de folio") << tr("Position") << tr("Titre de folio"); if (settings.value("genericpanel/folio", false).toBool())
{
list << tr("N° de fil") << tr("Fonction") << tr("Tension / Protocole") << tr("Label de folio") << tr("Position") << tr("Titre de folio");
} }
else else
{ {
list << tr("N° de fil") << tr("Fonction") << tr("Tension / Protocole") << tr("Label de folio") << tr("Position") << tr("Titre de folio"); list << tr("N° de fil") << tr("Fonction") << tr("Tension / Protocole") << tr("N° de folio") << tr("Position") << tr("Titre de folio");
} }
} }