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

Element : variable assignement of label is now managed by an external class instead of the element itself

Browse Source 
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4772 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
blacksun
2016-11-09 16:06:04 +00:00
parent 2b952f4189
commit bb2fff7e5f
14 changed files with 315 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sources/ui/elementselectorwidget.cpp
View File

@@ -24,6 +24,7 @@
#include "terminal.h"
#include "conductor.h"
#include "qet.h"
#include "assignvariables.h"
/**
* @brief ElementSelectorWidget::ElementSelectorWidget
@@ -134,13 +135,13 @@ void ElementSelectorWidget::buildInterface() {
DiagramContext dc = elmt -> elementInformations();
if (!dc["label"].toString().isEmpty())
button_text = elmt->assignVariables(dc["label"].toString(), elmt) + " ";
button_text = autonum::AssignVariables::formulaToLabel(dc["label"].toString(), elmt->rSequenceStruct(), elmt->diagram(), elmt) + " ";
if (!dc["comment"].toString().isEmpty())
button_text += elmt->assignVariables(dc["comment"].toString(), elmt);
button_text = autonum::AssignVariables::formulaToLabel(dc["comment"].toString(), elmt->rSequenceStruct(), elmt->diagram(), elmt);
if (!dc["location"].toString().isEmpty())
button_text += elmt->assignVariables(dc["location"].toString(), elmt);
button_text = autonum::AssignVariables::formulaToLabel(dc["location"].toString(), elmt->rSequenceStruct(), elmt->diagram(), elmt);
if (!button_text.isEmpty())
button_text += "\n";