From 01a1d13c418a944754e1bcd017b9a8f1ddebc905 Mon Sep 17 00:00:00 2001 From: blacksun Date: Tue, 13 Sep 2016 16:32:02 +0000 Subject: [PATCH] Minor : minor change about Xref offset git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4704 bfdf4180-ca20-0410-9c96-a3a8aa849046 --- sources/qetgraphicsitem/crossrefitem.cpp | 4 ++-- sources/qetgraphicsitem/qgraphicsitemutility.cpp | 8 +++----- sources/qetgraphicsitem/qgraphicsitemutility.h | 2 +- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/sources/qetgraphicsitem/crossrefitem.cpp b/sources/qetgraphicsitem/crossrefitem.cpp index a01a6f239..01f753d7a 100644 --- a/sources/qetgraphicsitem/crossrefitem.cpp +++ b/sources/qetgraphicsitem/crossrefitem.cpp @@ -217,9 +217,9 @@ void CrossRefItem::updateLabel() { * Calculate and set position automaticaly. */ void CrossRefItem::autoPos() { - //We calcul the position according to the @snapTo of the xrefproperties + //We calcul the position according to the @snapTo of the xrefproperties if (m_properties.snapTo() == XRefProperties::Bottom) - centerToBottomDiagram(this, m_element, m_properties.offset()); + centerToBottomDiagram(this, m_element, m_properties.offset() <= 40 ? 5 : m_properties.offset()); else centerToParentBottom(this); } diff --git a/sources/qetgraphicsitem/qgraphicsitemutility.cpp b/sources/qetgraphicsitem/qgraphicsitemutility.cpp index a2fbe64a9..d1df8683c 100644 --- a/sources/qetgraphicsitem/qgraphicsitemutility.cpp +++ b/sources/qetgraphicsitem/qgraphicsitemutility.cpp @@ -43,9 +43,10 @@ bool centerToParentBottom(QGraphicsItem *item) { /** * @brief centerToBottomDiagram - * Set item pos to the bottom of diagram and centered vertically to element_to_follow + * Set item pos to the bottom of diagram and centered vertically to element_to_follow, and add offset. * @param item_to_center * @param element_to_follow + * @param offset * @return true if element is centered else false (element_to_follow have not diagram) */ bool centerToBottomDiagram (QGraphicsItem *item_to_center, Element *element_to_follow, int offset) { @@ -57,10 +58,7 @@ bool centerToBottomDiagram (QGraphicsItem *item_to_center, Element *element_to_f QRectF border = element_to_follow -> diagram() -> border_and_titleblock.insideBorderRect(); QPointF point = element_to_follow -> sceneBoundingRect().center(); - if (offset >= 40) //applies offset - point.setY(border.bottom() - offset ); - else //applies default - point.setY(border.bottom() - item_to_center -> boundingRect().height() - 5); + point.setY(border.bottom() - item_to_center -> boundingRect().height() - offset ); point.rx() -= (item_to_center -> boundingRect().width()/2 + item_to_center -> boundingRect().left()); //< we add boundingrect.left because this value can be négative diff --git a/sources/qetgraphicsitem/qgraphicsitemutility.h b/sources/qetgraphicsitem/qgraphicsitemutility.h index c700d9225..5c4731701 100644 --- a/sources/qetgraphicsitem/qgraphicsitemutility.h +++ b/sources/qetgraphicsitem/qgraphicsitemutility.h @@ -22,6 +22,6 @@ class QGraphicsItem; class Element; bool centerToParentBottom (QGraphicsItem *item); -bool centerToBottomDiagram (QGraphicsItem *item_to_center, Element *element_to_follow, int offset ); +bool centerToBottomDiagram (QGraphicsItem *item_to_center, Element *element_to_follow, int offset = 0 ); #endif // QGRAPHICSITEMUTILITY_H