From 2be0af2f4384e49c3adf92e11476f9cd7ff5a3eb Mon Sep 17 00:00:00 2001 From: blacksun Date: Thu, 21 Jun 2018 15:36:03 +0000 Subject: [PATCH] minor fix : slave link dialog doesn't display the good label, when the label of master element is build from formula. git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@5405 bfdf4180-ca20-0410-9c96-a3a8aa849046 --- sources/ui/linksingleelementwidget.cpp | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/sources/ui/linksingleelementwidget.cpp b/sources/ui/linksingleelementwidget.cpp index 670e0f9fe..2eb8651b0 100644 --- a/sources/ui/linksingleelementwidget.cpp +++ b/sources/ui/linksingleelementwidget.cpp @@ -219,9 +219,19 @@ void LinkSingleElementWidget::buildTree() { QStringList search_list; QStringList str_list; - str_list << elmt->elementInformations()["label"].toString(); - if (!str_list.last().isEmpty()) + + QString formula = elmt->elementInformations()["formula"].toString(); + if(!formula.isEmpty()) + { + str_list << autonum::AssignVariables::formulaToLabel(formula, elmt->rSequenceStruct(), elmt->diagram(), elmt); search_list << str_list.last(); + } + else + { + str_list << elmt->elementInformations()["label"].toString(); + if(!str_list.last().isEmpty()) + search_list << str_list.last(); + } str_list << elmt->elementInformations()["comment"].toString(); if (!str_list.last().isEmpty())