Master element : bug fix

git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@3630 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
blacksun 2015-01-26 22:32:55 +00:00
parent f2f52a3f41
commit 5e58524cac
2 changed files with 16 additions and 1 deletions

View File

@ -1,4 +1,5 @@
Type = UserType + ??? Type = UserType + ???
###DIAGRAM EDITOR###
Element + 1000 Element + 1000
Conductor + 1001 Conductor + 1001
Terminal + 1002 Terminal + 1002
@ -10,3 +11,13 @@ DiagramImageItem + 1007
QetShapItem + 1008 QetShapItem + 1008
crossRefItem + 1009 crossRefItem + 1009
ElementPrimitiveDecorator + 2200 ElementPrimitiveDecorator + 2200
###ELEMENT EDITOR###
part arc + 1101
part ellipse + 1103
part Line + 1104
part polygon + 1105
part terminal + 1106
part text + 1107
part text field + 1108
part rectangle + 1109

View File

@ -149,10 +149,14 @@ void MasterElement::updateLabel(DiagramContext old_info, DiagramContext new_info
* Check if Xref item must be displayed, if not, delete it. * Check if Xref item must be displayed, if not, delete it.
* If Xref item is deleted or already not used (nullptr) return true; * If Xref item is deleted or already not used (nullptr) return true;
* Else return false if Xref item is used * Else return false if Xref item is used
* NOTICE : Xref can display nothing but not be deleted so far.
* For exemple, if Xref is display has cross, only power contact are linked and
* option show power contact is disable, the cross isn't draw.
* @return * @return
*/ */
bool MasterElement::aboutDeleteXref() { bool MasterElement::aboutDeleteXref() {
if(!cri_) return true; if(!cri_) return true;
if(!linkedElements().isEmpty()) return false;
if (cri_ -> boundingRect().isNull()) { if (cri_ -> boundingRect().isNull()) {
delete cri_; delete cri_;