diff --git a/dev_doc/enum_type_of_QGraphicsItem b/dev_doc/enum_type_of_QGraphicsItem index 383f4e3a4..67853f9e9 100644 --- a/dev_doc/enum_type_of_QGraphicsItem +++ b/dev_doc/enum_type_of_QGraphicsItem @@ -1,4 +1,5 @@ Type = UserType + ??? +###DIAGRAM EDITOR### Element + 1000 Conductor + 1001 Terminal + 1002 @@ -10,3 +11,13 @@ DiagramImageItem + 1007 QetShapItem + 1008 crossRefItem + 1009 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 diff --git a/sources/qetgraphicsitem/masterelement.cpp b/sources/qetgraphicsitem/masterelement.cpp index 1d3401f97..05061284f 100644 --- a/sources/qetgraphicsitem/masterelement.cpp +++ b/sources/qetgraphicsitem/masterelement.cpp @@ -90,7 +90,7 @@ void MasterElement::unlinkElement(Element *elmt) elmt -> unlinkElement (this); elmt -> setHighlighted (false); - //update the graphics cross ref + //update the graphics cross ref disconnect(elmt, SIGNAL(xChanged()), cri_, SLOT(updateLabel())); disconnect(elmt, SIGNAL(yChanged()), cri_, SLOT(updateLabel())); @@ -149,10 +149,14 @@ void MasterElement::updateLabel(DiagramContext old_info, DiagramContext new_info * Check if Xref item must be displayed, if not, delete it. * If Xref item is deleted or already not used (nullptr) return true; * 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 */ bool MasterElement::aboutDeleteXref() { if(!cri_) return true; + if(!linkedElements().isEmpty()) return false; if (cri_ -> boundingRect().isNull()) { delete cri_;