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

Fix a .qetz that cannot be opened after only a folio's title changed

Browse Source 
With a .qetz and lazy folios (both the default), changing only the
title, author, date or revision of a folio holding a picture, while that
folio was not displayed, then saving, gave a .qetz that refused to open:
'picture "images/<sha>.png" is missing'.

Such a folio is saved from its items as read, with its new header
(Diagram::deferredXmlWithHeader()). Read from a .qetz, its <image> names
its picture's file (qetz-file) instead of holding the picture, and
QetContainer::split() takes out only pictures held inline: the file was
never written, while the folio still named it. The folio now gets its
pictures written in, from the bytes the project keeps
(QETProject::containerPicture()), as a built folio writes them.

On master, a picture on folio 2 of grafcet, iso_sfc_example, 741,
tremie_vibrante or Projet_vierge is lost this way; found on three forum
projects by comparing lazy saves with saves of every folio built. Saving
as .qet was not affected.

New tst_qetzheaderpictures (grafcet.qet: picture on folio 2, saved as
.qetz; its title changed with folios built when needed; reopened with
its picture and title): fails without this change ("picture ... is
missing"). ctest 107/107.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
ispyisail
2026-10-16 09:32:13 +13:00
parent 973417a694
commit b4bbd17933
5 changed files with 123 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sources/diagram.cpp
+11
View File
@@ -881,6 +881,17 @@ QDomElement Diagram::deferredXmlWithHeader(QDomDocument &document)
for (QDomElement child = items.firstChildElement() ; !child.isNull() ; child = child.nextSiblingElement())
if (!header_children.contains(child.tagName()))
folio.appendChild(document.importNode(child, true));
//Its pictures written in, as building it writes them. A folio read
//from a .qetz names its pictures' files instead, which the next
//.qetz written from this document would leave out: that project
//then refused to open, "picture ... is missing" (F118).
for (QDomElement image : QET::findInDomElement(folio, QStringLiteral("images"), QStringLiteral("image"))) {
const QString file = QetContainer::pictureFile(image);
if (file.isEmpty() || !m_project) continue;
const QByteArray bytes = m_project->containerPicture(file);
if (!bytes.isEmpty())
QetContainer::inlinePicture(image, bytes);
}
return folio;
}