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

Fix a crash opening a project whose folio report arrow has no terminal

Browse Source 
A folio report arrow's text looks for a wire to show: on the arrow
itself, else on the arrow it is linked to, through that arrow's first
terminal. Some report symbols have no terminal -- ref_voyant_2_h.elmt in
the collection, and older collections' arrows -- so a project linking an
arrow with no wire to one of them crashed QElectroTech as it opened.
The other arrow's terminals are now checked first, as the arrow's own
already were.

Found on a project attached to the forum (saved by 0.70), which crashed
on opening.

Test: tst_resaveunchanged::reportArrowWithoutTerminalOpens builds the
case from Projet_vierge.qet's own symbols; it crashes without the fix.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_019Wga9B92BNurDEtxxtCDxf
This commit is contained in:
ispyisail
2026-10-10 19:58:01 +13:00
parent d4352b72c1
commit 44b2129d5a
2 changed files with 58 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sources/qetgraphicsitem/dynamicelementtextitem.cpp
+3 -1
View File
@@ -1469,7 +1469,9 @@ void DynamicElementTextItem::setPotentialConductor()
m_watched_conductor = c_list.first();
connect(m_watched_conductor.data(), &Conductor::propertiesChange, this, &DynamicElementTextItem::conductorPropertiesChanged);
}
else if(m_watched_conductor.isNull() && m_other_report)
else if(m_watched_conductor.isNull() && m_other_report
//A report symbol can have no terminal (some older collections')
&& !m_other_report.data()->terminals().isEmpty())
{
if (!m_other_report.data()->terminals().first()->conductors().isEmpty())
{
tests/qttest/tst_resaveunchanged.cpp
+55
View File
@@ -160,6 +160,61 @@ private slots:
QVERIFY2(sb < sa, "the coil's contacts were saved in another order than the file's");
}
// A folio report arrow linked to one that has no terminal -- such as
// ref_voyant_2_h.elmt from the collection -- crashed QElectroTech on
// opening: the arrow's text looked for a wire on the other arrow's
// first terminal. Projet_vierge.qet with a previous-folio arrow (one
// terminal, a label text) on folio 1 linked to a ref_voyant_2_h on
// folio 2.
void reportArrowWithoutTerminalOpens()
{
QByteArray xml = read(QStringLiteral(QET_EXAMPLES_DIR "/Projet_vierge.qet"));
const QByteArray a = "{0a000000-0000-4000-8000-00000000000a}",
b = "{0b000000-0000-4000-8000-00000000000b}";
const QByteArray arrow =
"<element type=\"embed://import/10_electric/10_allpole/100_sheet_referencing/01previous_folio.elmt\""
" x=\"200\" y=\"200\" z=\"10\" orientation=\"0\" prefix=\"\" freezeLabel=\"false\" uuid=\"" + a + "\">"
"<terminals/><inputs/><links_uuids><link_uuid uuid=\"" + b + "\"/></links_uuids>"
"<dynamic_texts><dynamic_elmt_text text_from=\"ElementInfo\" x=\"5\" y=\"-10\""
" uuid=\"{0c000000-0000-4000-8000-00000000000c}\" rotation=\"0\" frame=\"false\" text_width=\"-1\">"
"<text>x</text><info_name>label</info_name></dynamic_elmt_text></dynamic_texts>"
"<texts_groups/></element>";
const QByteArray no_terminal =
"<element type=\"embed://import/10_electric/98_graphics/01_auxiliary_symbols/01_cross_ref_symbols/"
"01_with_linking_function/01_parents/ref_voyant_2_h.elmt\""
" x=\"300\" y=\"200\" z=\"10\" orientation=\"0\" prefix=\"\" freezeLabel=\"false\" uuid=\"" + b + "\">"
"<terminals/><inputs/><links_uuids><link_uuid uuid=\"" + a + "\"/></links_uuids>"
"<dynamic_texts/><texts_groups/></element>";
QVERIFY(xml.contains("ref_voyant_2_h.elmt") && xml.contains("01previous_folio.elmt"));
// put @p element first in the elements of folio @p n
auto put = [&xml](int n, const QByteArray &element) {
int at = -1;
for (int i = 0 ; i <= n ; ++i) {
at = xml.indexOf("<diagram ", at + 1);
if (at < 0) return false;
}
const int empty = xml.indexOf("<elements/>", at), open = xml.indexOf("<elements>", at),
end = xml.indexOf("</diagram>", at);
if (empty >= 0 && empty < end && (open < 0 || empty < open))
xml.replace(empty, int(qstrlen("<elements/>")), "<elements>" + element + "</elements>");
else if (open >= 0 && open < end)
xml.insert(open + int(qstrlen("<elements>")), element);
else
return false;
return true;
};
QVERIFY(put(0, arrow));
QVERIFY(put(1, no_terminal));
const QString in = m_dir.filePath(QStringLiteral("report_without_terminal.qet"));
QFile f(in);
QVERIFY(f.open(QIODevice::WriteOnly));
f.write(xml);
f.close();
const QString saved = resave(in);
QVERIFY2(!saved.isEmpty(), "--resave failed: QElectroTech crashed opening the project");
QVERIFY2(read(saved).contains(b), "the arrow without a terminal was not kept");
}
// A title-block value that is a single space is kept through two saves
// (#973), and a value with accents comes back as it went in.
void singleSpaceValueKept()