[qet] [4696] Minor : added for Autonum formula, terminal element located alsoin user |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/qet Archives
]
Revision: 4696
Author: scorpio810
Date: 2016-09-08 03:55:44 +0200 (Thu, 08 Sep 2016)
Log Message:
-----------
Minor : added for Autonum formula, terminal element located alsoin user
collection
Modified Paths:
--------------
trunk/sources/qetgraphicsitem/customelement.cpp
Modified: trunk/sources/qetgraphicsitem/customelement.cpp
===================================================================
--- trunk/sources/qetgraphicsitem/customelement.cpp 2016-09-07 21:45:02 UTC (rev 4695)
+++ trunk/sources/qetgraphicsitem/customelement.cpp 2016-09-08 01:55:44 UTC (rev 4696)
@@ -337,7 +337,7 @@
}
if (prefix == "") {
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();
this->setPrefix(prefix);
DiagramContext &dc = this->rElementInformations();
@@ -351,8 +351,7 @@
//are being loaded at first time or being pasted
else if ((this->taggedText("label")!= NULL) && (location().projectId()!=-1) &&
(!location().project()->elementAutoNumCurrentFormula().isEmpty()) &&
- (this->linkType()!=Element::Slave) && (this->linkType()!=Element::Terminale) &&
- !this->diagram()->item_paste) {
+ (this->linkType()!=Element::Slave) && !this->diagram()->item_paste) {
QString formula = location().project()->elementAutoNumCurrentFormula();
DiagramContext &dc = this->rElementInformations();
QString prefix = this->taggedText("label")->toPlainText();