kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2026-10-03 01:04:13 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Write a PDF's cross-reference links in the same order in every run

Browse Source 
injectCrossRefLinks() drew each link as it found it: the contacts of a
cross-reference come from a QMultiMap keyed by Element pointer, and the
scene's items in stacking order. Both change from run to run, so the same
project exported twice gave two different PDFs whose only difference was
the order of the link annotations.

The links are now collected and drawn sorted by their rectangle on the
page (top, left, bottom, right), with the target as the tie-break. The
links themselves are unchanged. The print window's PDF export goes
through the same function.

tst_pdflinkorder exports examples/industrial.qet five times in separate
processes and requires the same links in the same order. It fails on
the old code (lists differ at index 2).

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
ispyisail
2026-10-03 07:24:46 +13:00
parent 25084a44da
commit 8e6dc1a849
3 changed files with 120 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sources/pdf_links.cpp
+27 -1
View File
@@ -35,6 +35,8 @@
#include <QUrl>
#include <QVector>
#include <algorithm>
namespace PdfLinks {
void injectCrossRefLinks(QPdfEngine *engine, Diagram *diagram,
@@ -83,6 +85,14 @@ void injectCrossRefLinks(QPdfEngine *engine, Diagram *diagram,
QPointF(qMax(a.x(), b.x()), qMax(a.y(), b.y())));
};
// The links are collected first and drawn sorted, not in the order the
// loop below finds them: a cross-reference's contacts are keyed by
// Element pointer and the scene's items come in stacking order, so that
// order changes from run to run and the same project gave a different
// PDF each time it was exported.
struct Link { QRectF rect; QUrl url; };
QList<Link> links;
auto injectLink = [&](const QRectF &sceneRect, Element *targetElmt) {
if (!targetElmt || !targetElmt->diagram()) return;
const int targetPage = pageMap.value(targetElmt->diagram(), -1);
@@ -99,7 +109,7 @@ void injectCrossRefLinks(QPdfEngine *engine, Diagram *diagram,
QUrl url = QUrl::fromLocalFile(outputFileName);
url.setFragment(frag);
engine->drawHyperlink(devRect, url);
links.append({devRect, url});
};
for (auto *item : diagram->items()) {
@@ -165,6 +175,22 @@ void injectCrossRefLinks(QPdfEngine *engine, Diagram *diagram,
continue;
}
}
// Top to bottom, then left to right; the target breaks a tie between
// two links on the same spot.
std::sort(links.begin(), links.end(), [](const Link &a, const Link &b) {
if (a.rect.top() != b.rect.top())
return a.rect.top() < b.rect.top();
if (a.rect.left() != b.rect.left())
return a.rect.left() < b.rect.left();
if (a.rect.bottom() != b.rect.bottom())
return a.rect.bottom() < b.rect.bottom();
if (a.rect.right() != b.rect.right())
return a.rect.right() < b.rect.right();
return a.url.fragment() < b.url.fragment();
});
for (const Link &link : std::as_const(links))
engine->drawHyperlink(link.rect, link.url);
}
void convertUriToGoTo(const QString &pdfPath)