From a0c55ea4ad16cc3dab89790bf40c5434d533282b Mon Sep 17 00:00:00 2001 From: scorpio810 Date: Wed, 17 Aug 2016 06:04:37 +0000 Subject: [PATCH] Add variable for properties %machine and %locmach can now be called in the xref propertie widget (run now for slave and master) git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4632 bfdf4180-ca20-0410-9c96-a3a8aa849046 --- sources/qetgraphicsitem/crossrefitem.cpp | 2 ++ sources/ui/xrefpropertieswidget.ui | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sources/qetgraphicsitem/crossrefitem.cpp b/sources/qetgraphicsitem/crossrefitem.cpp index 2c59a500d..8422b3d31 100644 --- a/sources/qetgraphicsitem/crossrefitem.cpp +++ b/sources/qetgraphicsitem/crossrefitem.cpp @@ -95,6 +95,8 @@ QString CrossRefItem::elementPositionText(const Element *elmt, const bool &add_p txt = xrp.masterLabel(); txt.replace("%f", QString::number(elmt->diagram()->folioIndex()+1)); txt.replace("%F", elmt->diagram() -> border_and_titleblock.folio()); + txt.replace("%M", elmt->diagram() -> border_and_titleblock.machine()); + txt.replace("%LM", elmt->diagram() -> border_and_titleblock.locmach()); txt.replace("%c", QString::number(elmt->diagram() -> convertPosition(elmt -> scenePos()).number())); txt.replace("%l", elmt->diagram() -> convertPosition(elmt -> scenePos()).letter()); diff --git a/sources/ui/xrefpropertieswidget.ui b/sources/ui/xrefpropertieswidget.ui index b24150345..cfa51fb89 100644 --- a/sources/ui/xrefpropertieswidget.ui +++ b/sources/ui/xrefpropertieswidget.ui @@ -200,8 +200,8 @@ %F: le label de folio %l : le numéro de ligne %c : le numéro de colonne -%M: Installation (esclave seulement) -%LM: localisation (esclave seulement) +%M: Installation +%LM: Localisation