kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2026-10-20 05:14:16 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

%T last: a folio title keeps the variables it contains

Browse Source 
The folio title was put into the formula before %c, %l, %prefix, the
wire variables, the title block and project variables and the
sequences, so a title such as "Schema %c" had them replaced inside it.
It is replaced after all of them now.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
DaTweety
2026-10-18 22:52:06 +02:00
parent ff65b85357
commit ba64fd5164
2 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sources/autoNum/assignvariables.cpp
+6 -3
View File
@@ -414,9 +414,6 @@ namespace autonum
QString::number(m_context.folio_total));
m_assigned_label.replace("%M", m_context.plant);
m_assigned_label.replace("%LM", m_context.locmach);
//%T on its own only, not the start of a longer word
static const QRegularExpression folio_title(QStringLiteral("%T(?![A-Za-z0-9_])"));
m_assigned_label.replace(folio_title, m_context.folio_title);
QSettings settings;
if (m_context.has_element)
@@ -441,6 +438,12 @@ namespace autonum
assignTitleBlockVar();
assignProjectVar();
assignSequence();
//The folio title last: it is free text, and a title such as
//"Schema %c" must stay as typed, not have the variables in it
//replaced. %T on its own only, not the start of a longer word.
static const QRegularExpression folio_title(QStringLiteral("%T(?![A-Za-z0-9_])"));
m_assigned_label.replace(folio_title, m_context.folio_title);
}
void AssignVariables::assignTitleBlockVar()