From 49b9d598dbdb7b02a50842cea26a252e3672d7b0 Mon Sep 17 00:00:00 2001 From: blacksun Date: Thu, 19 Jan 2017 12:43:40 +0000 Subject: [PATCH] Fix : in nomenclature .csv file, the variables of the value in column "label of folio" isn't assigned. git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4857 bfdf4180-ca20-0410-9c96-a3a8aa849046 --- sources/nomenclature.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sources/nomenclature.cpp b/sources/nomenclature.cpp index 3ec852318..13df0282f 100644 --- a/sources/nomenclature.cpp +++ b/sources/nomenclature.cpp @@ -20,6 +20,7 @@ #include "nomenclature.h" #include "elementprovider.h" #include "assignvariables.h" + #define PR(x) qDebug() << #x " = " << x; /** @@ -137,10 +138,11 @@ QString nomenclature::getElementInfo(Element *elmt) { Diagram *diagram = elmt -> diagram(); DiagramContext elmt_info = elmt -> elementInformations(); + autonum::sequentialNumbers empty_seq; info += QString::number(diagram -> folioIndex()+1) + ";"; info += diagram -> title() + ";"; - info += diagram -> border_and_titleblock.folio() + ";"; + info += autonum::AssignVariables::formulaToLabel(diagram->border_and_titleblock.folio(), empty_seq, diagram) + ";"; info += elmt -> name() + ";"; info += elmt-> diagram()-> convertPosition(elmt -> scenePos()).toString() + ";"; info += autonum::AssignVariables::formulaToLabel(elmt_info["label"].toString(), elmt->rSequenceStruct(), elmt->diagram(), elmt) + ";";