From a72c5beed14ea9c6b9f93f3b272670d3dee050a9 Mon Sep 17 00:00:00 2001 From: dfochi Date: Sat, 21 May 2016 20:28:25 +0000 Subject: [PATCH] View mode works with Slave Element git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4494 bfdf4180-ca20-0410-9c96-a3a8aa849046 --- sources/qetgraphicsitem/slaveelement.cpp | 11 +++++++++-- sources/qetgraphicsitem/slaveelement.h | 2 ++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/sources/qetgraphicsitem/slaveelement.cpp b/sources/qetgraphicsitem/slaveelement.cpp index 76d7f3792..e2517dc22 100644 --- a/sources/qetgraphicsitem/slaveelement.cpp +++ b/sources/qetgraphicsitem/slaveelement.cpp @@ -129,9 +129,16 @@ void SlaveElement::updateLabel() { no_editable = true; Element *elmt = linkedElements().first(); label = elmt -> elementInformations()["label"].toString(); - + XRefProperties m_properties = elmt->diagram()->defaultXRefProperties(elmt->kindInformations()["type"].toString()); Xreflabel = "("; - Xreflabel += QString::number(elmt->diagram()->folioIndex()+1); + XRefProperties::ViewMode vw = m_properties.viewMode(); + if (vw == XRefProperties::Index) + { + Xreflabel += QString::number(elmt->diagram()->folioIndex()+1); + } + else if (vw == XRefProperties::FolioLabel){ + Xreflabel += elmt->diagram()->border_and_titleblock.folio(); + } Xreflabel += "-"; Xreflabel += elmt->diagram() -> convertPosition(elmt -> scenePos()).toString(); Xreflabel += ")"; diff --git a/sources/qetgraphicsitem/slaveelement.h b/sources/qetgraphicsitem/slaveelement.h index ae2569796..836359904 100644 --- a/sources/qetgraphicsitem/slaveelement.h +++ b/sources/qetgraphicsitem/slaveelement.h @@ -19,6 +19,7 @@ #define SLAVEELEMENT_H #include "customelement.h" +#include"properties/xrefproperties.h" class SlaveElement : public CustomElement { @@ -37,6 +38,7 @@ class SlaveElement : public CustomElement private: QGraphicsTextItem *Xref_item; + //XRefProperties m_properties; };