kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2026-04-20 08:49:58 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Copy/Paste now works with Element Label Variables

Browse Source 
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4599 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
dfochi
2016-07-31 01:30:42 +00:00
parent bb992f3868
commit 6355611947
5 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sources/qetgraphicsitem/customelement.cpp
View File

@@ -336,10 +336,13 @@ void CustomElement::parseLabels() {
rxml.readNext();
}
}
//apply formula to specific label
//apply formula to specific label - This condition specify elements which have different labels e.g KM
//that are already specified in the element label (inside .elmt file). This method is not called if elements
//are being loaded at first time or being pasted
else if ((this->taggedText("label")!= NULL) && (location().projectId()!=-1) &&
(!location().project()->elementAutoNumFormula().isEmpty()) &&
(this->linkType()!=Element::Slave) && (this->linkType()!=Element::Terminale)) {
(this->linkType()!=Element::Slave) && (this->linkType()!=Element::Terminale) &&
!this->diagram()->item_paste) {
QString formula = location().project()->elementAutoNumFormula();
DiagramContext &dc = this->rElementInformations();
QString prefix = this->taggedText("label")->toPlainText();

2
sources/qetgraphicsitem/element.cpp
View File

@@ -759,8 +759,6 @@ QString Element::assignVariables(QString label, Element *elmt){
label.replace("%id", QString::number(elmt->diagram()->folioIndex()+1));
label.replace("%total", QString::number(elmt->diagram()->border_and_titleblock.folioTotal()));
label.replace("%prefix", elmt->getPrefix());
if (label.contains("%prefix"))
label.replace("%prefix",this->getPrefix());
label = assignSeq(label);
return label;
}