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

Minor : added for Autonum formula, terminal element located alsoin user

Browse Source 
collection


git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4696 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
scorpio810
2016-09-08 01:55:44 +00:00
parent 31b89d4994
commit 9ecc97a2e4
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sources/qetgraphicsitem/customelement.cpp
View File

@@ -337,7 +337,7 @@ void CustomElement::parseLabels() {
} }
if (prefix == "") { if (prefix == "") {
if (!(location().project()->elementAutoNumCurrentFormula().isEmpty()) && (location().project()->elementAutoNumCurrentFormula() != "") && if (!(location().project()->elementAutoNumCurrentFormula().isEmpty()) && (location().project()->elementAutoNumCurrentFormula() != "") &&
(this->linkType()!=Element::Slave) && (this->linkType()!=Element::Terminale)) { (this->linkType()!=Element::Slave)) {
QString formula = location().project()->elementAutoNumCurrentFormula(); QString formula = location().project()->elementAutoNumCurrentFormula();
this->setPrefix(prefix); this->setPrefix(prefix);
DiagramContext &dc = this->rElementInformations(); DiagramContext &dc = this->rElementInformations();
@@ -351,8 +351,7 @@ void CustomElement::parseLabels() {
//are being loaded at first time or being pasted //are being loaded at first time or being pasted
else if ((this->taggedText("label")!= NULL) && (location().projectId()!=-1) && else if ((this->taggedText("label")!= NULL) && (location().projectId()!=-1) &&
(!location().project()->elementAutoNumCurrentFormula().isEmpty()) && (!location().project()->elementAutoNumCurrentFormula().isEmpty()) &&
(this->linkType()!=Element::Slave) && (this->linkType()!=Element::Terminale) && (this->linkType()!=Element::Slave) && !this->diagram()->item_paste) {
!this->diagram()->item_paste) {
QString formula = location().project()->elementAutoNumCurrentFormula(); QString formula = location().project()->elementAutoNumCurrentFormula();
DiagramContext &dc = this->rElementInformations(); DiagramContext &dc = this->rElementInformations();
QString prefix = this->taggedText("label")->toPlainText(); QString prefix = this->taggedText("label")->toPlainText();