diff --git a/sources/qetgraphicsitem/diagramtextitem.cpp b/sources/qetgraphicsitem/diagramtextitem.cpp index c94695926..cc44c6b0c 100644 --- a/sources/qetgraphicsitem/diagramtextitem.cpp +++ b/sources/qetgraphicsitem/diagramtextitem.cpp @@ -269,7 +269,9 @@ void DiagramTextItem::setHtml(const QString &text) block = block.next(); } - if (m_non_left_alignment) { + //Room for centred or right-aligned lines, unless the user has + //given this text a width of its own + if (m_non_left_alignment && !hasUserTextWidth()) { document()->setTextWidth(document()->idealWidth() + 40.0); } } diff --git a/sources/qetgraphicsitem/diagramtextitem.h b/sources/qetgraphicsitem/diagramtextitem.h index e0c807cca..323c0db56 100644 --- a/sources/qetgraphicsitem/diagramtextitem.h +++ b/sources/qetgraphicsitem/diagramtextitem.h @@ -110,6 +110,8 @@ class DiagramTextItem : public QGraphicsTextItem void prepareAlignment(); void finishAlignment(); + virtual bool hasUserTextWidth() const {return false;} + protected: bool diff --git a/sources/qetgraphicsitem/independenttextitem.cpp b/sources/qetgraphicsitem/independenttextitem.cpp index bb7af5fa8..208906463 100644 --- a/sources/qetgraphicsitem/independenttextitem.cpp +++ b/sources/qetgraphicsitem/independenttextitem.cpp @@ -26,7 +26,9 @@ #include "../utils/qetutils.h" #include +#include #include +#include /** Constructeur @@ -36,6 +38,7 @@ IndependentTextItem::IndependentTextItem() : DiagramTextItem(nullptr) { ShownKinds::tag(this, ShownKinds::FreeTexts); + wrapAtWords(); //Start from the font last applied to a text item this session, //falling back to the app-wide Preferences default otherwise. setFont(LastUsedStyle::hasTextFont() ? LastUsedStyle::textFont() @@ -53,6 +56,19 @@ IndependentTextItem::IndependentTextItem(const QString &text) : DiagramTextItem(text, nullptr) { ShownKinds::tag(this, ShownKinds::FreeTexts); + wrapAtWords(); +} + +/** + @brief IndependentTextItem::wrapAtWords + A text with a width wraps between words only: a word longer than the + width goes past it rather than being cut, as for the texts of symbols. +*/ +void IndependentTextItem::wrapAtWords() +{ + QTextOption option = document()->defaultTextOption(); + option.setWrapMode(QTextOption::WordWrap); + document()->setDefaultTextOption(option); } /// Destructeur @@ -78,6 +94,10 @@ void IndependentTextItem::fromXml(const QDomElement &e) { QETUtils::fontFromString(font, e.attribute("font")); setFont(font); } + //Optional: absent for a text with the automatic width, the only + //kind older versions know (they show such a text unwrapped). + //Read after the text, setHtml() sets a width of its own. + setTextWidth(e.attribute(QStringLiteral("text_width"), QStringLiteral("-1")).toDouble()); } /** @@ -93,10 +113,39 @@ QDomElement IndependentTextItem::toXml(QDomDocument &document) const result.setAttribute("text", toHtml()); result.setAttribute("rotation", QString::number(QET::correctAngle(rotation()))); result.setAttribute("font", QETUtils::fontToString(font())); + //Only when set, so a text with the automatic width is saved as before + if (m_text_width > 0) + result.setAttribute("text_width", QString::number(m_text_width)); return(result); } +/** + @brief IndependentTextItem::setTextWidth + Set the width of this text (-1 = automatic width): the text wraps to + it, its top-left corner stays in place. + @param width +*/ +void IndependentTextItem::setTextWidth(qreal width) +{ + if (!qIsFinite(width) || width <= 0) + width = -1; + + qreal document_width = width; + //The automatic width of a text with centred or right-aligned + //lines, as setHtml() gives it + if (width < 0 && m_non_left_alignment) + { + QScopedPointer natural(document()->clone()); + natural->setTextWidth(-1); + document_width = natural->idealWidth() + 40.0; + } + + document()->setTextWidth(document_width); + m_text_width = width; + emit textWidthChanged(width); +} + void IndependentTextItem::focusOutEvent(QFocusEvent *event) { DiagramTextItem::focusOutEvent(event); diff --git a/sources/qetgraphicsitem/independenttextitem.h b/sources/qetgraphicsitem/independenttextitem.h index 85b51ffd7..3ff526c5d 100644 --- a/sources/qetgraphicsitem/independenttextitem.h +++ b/sources/qetgraphicsitem/independenttextitem.h @@ -29,10 +29,13 @@ class IndependentTextItem : public DiagramTextItem { Q_OBJECT + + Q_PROPERTY(qreal textWidth READ textWidth WRITE setTextWidth NOTIFY textWidthChanged) // constructors, destructor signals: void uuidChanged(); + void textWidthChanged(qreal width); public: IndependentTextItem(); @@ -49,11 +52,18 @@ class IndependentTextItem : public DiagramTextItem QUuid uuid() const {return m_uuid;} void setUuid(const QUuid &uuid) {m_uuid = uuid; emit uuidChanged();} void newUuid() {setUuid(QUuid::createUuid());} //create new uuid for this item + + qreal textWidth() const {return m_text_width;} + void setTextWidth(qreal width); protected: void focusOutEvent(QFocusEvent *event) override; + bool hasUserTextWidth() const override {return m_text_width > 0;} private: + void wrapAtWords(); + QUuid m_uuid = QUuid::createUuid(); + qreal m_text_width = -1; }; #endif diff --git a/tests/qttest/CMakeLists.txt b/tests/qttest/CMakeLists.txt index 3b7e8c2b5..33134d0da 100644 --- a/tests/qttest/CMakeLists.txt +++ b/tests/qttest/CMakeLists.txt @@ -389,6 +389,18 @@ target_link_libraries(tst_conductorselfretrace PRIVATE Qt::Test) target_compile_definitions(tst_conductorselfretrace PRIVATE "QET_TEST_BINARY_PATH=\"$\"") +# A free text with a width keeps it when the project is saved again (the +# attribute is written only when set) and is drawn wrapped to it. +add_executable( + tst_freetextwidth + tst_freetextwidth.cpp) +add_test(NAME tst_freetextwidth COMMAND tst_freetextwidth) +set_tests_properties(tst_freetextwidth PROPERTIES ENVIRONMENT "QT_QPA_PLATFORM=offscreen") +add_dependencies(tst_freetextwidth qelectrotech) +target_link_libraries(tst_freetextwidth PRIVATE Qt::Test Qt::Gui Qt::Xml) +target_compile_definitions(tst_freetextwidth PRIVATE + "QET_TEST_BINARY_PATH=\"$\"") + # The wiring list export (--export-cables) keeps every wire drawn to a folio # report when a report has several, joins only one-to-one report pairs, and # prints the folio number rather than its template. fixtures/wiring_list_arrows.qet diff --git a/tests/qttest/fixtures/free_text_width.qet b/tests/qttest/fixtures/free_text_width.qet new file mode 100644 index 000000000..f2f9f019b --- /dev/null +++ b/tests/qttest/fixtures/free_text_width.qet @@ -0,0 +1,42 @@ + + + 10/2/26 + 02-10-2026 + 2026-10-02 + skeleton + /tmp/qet-mcp-new-k41dmnyo/skeleton.qet + 18:39 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Imported elements + + + + diff --git a/tests/qttest/tst_freetextwidth.cpp b/tests/qttest/tst_freetextwidth.cpp new file mode 100644 index 000000000..5d6c3e801 --- /dev/null +++ b/tests/qttest/tst_freetextwidth.cpp @@ -0,0 +1,113 @@ +/* + Copyright 2006-2026 The QElectroTech Team + This file is part of QElectroTech. + + QElectroTech is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + QElectroTech is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with QElectroTech. If not, see . +*/ +#include +#include +#include +#include +#include +#include + +/// Run the qelectrotech binary with arguments, without a display. +static bool runQet(const QStringList &arguments) +{ + QProcessEnvironment env = QProcessEnvironment::systemEnvironment(); + env.insert(QStringLiteral("QT_QPA_PLATFORM"), QStringLiteral("offscreen")); + QProcess proc; + proc.setProcessEnvironment(env); + proc.start(QStringLiteral(QET_TEST_BINARY_PATH), arguments); + return proc.waitForFinished(60000) + && proc.exitStatus() == QProcess::NormalExit + && proc.exitCode() == 0; +} + +/// The number of lines the words starting with prefix are drawn on. +static int drawnLines(const QString &svg, const QString &prefix) +{ + const QRegularExpression text_re( + QStringLiteral("]*\\by=\"([^\"]+)\"[^>]*>\\s*%1").arg(prefix)); + QSet lines; + auto it = text_re.globalMatch(svg); + while (it.hasNext()) + lines.insert(it.next().captured(1)); + return lines.size(); +} + +/** + A free text with a width (text_width on its ) keeps it when the + project is saved again, and wraps to it. A text without a width is saved + without the attribute, as before, so older versions read it unchanged. +*/ +class tst_freetextwidth : public QObject +{ + Q_OBJECT + +private slots: + void initTestCase() + { + QVERIFY2(QFile::exists(QStringLiteral(QET_TEST_BINARY_PATH)), "qelectrotech binary not found"); + m_fixture = QFINDTESTDATA("fixtures/free_text_width.qet"); + QVERIFY2(!m_fixture.isEmpty(), "fixture project not found"); + QVERIFY(m_dir.isValid()); + } + + void widthIsSavedOnlyWhenSet() + { + const QString out = m_dir.filePath(QStringLiteral("resaved.qet")); + QVERIFY2(runQet({QStringLiteral("--resave"), m_fixture, out}), "--resave failed"); + + QFile file(out); + QVERIFY(file.open(QIODevice::ReadOnly)); + QDomDocument document; + QVERIFY(document.setContent(&file)); + + QMap widths; // first word -> text_width + const QDomNodeList inputs = document.elementsByTagName(QStringLiteral("input")); + for (int i = 0 ; i < inputs.size() ; ++i) { + const QDomElement input = inputs.at(i).toElement(); + QTextDocument text; + text.setHtml(input.attribute(QStringLiteral("text"))); + const QString first_word = text.toPlainText().section(QLatin1Char(' '), 0, 0); + widths.insert(first_word, input.hasAttribute(QStringLiteral("text_width")) + ? input.attribute(QStringLiteral("text_width")) + : QStringLiteral("none")); + } + + QCOMPARE(widths.value(QStringLiteral("FreeAlpha")), QStringLiteral("70")); + QCOMPARE(widths.value(QStringLiteral("OpenAlpha")), QStringLiteral("none")); + //Centred lines: the width of the user, not the one setHtml() gives + QCOMPARE(widths.value(QStringLiteral("CentAlpha")), QStringLiteral("120")); + } + + void textWrapsToItsWidth() + { + QVERIFY2(runQet({QStringLiteral("--export-svg"), m_fixture, m_dir.path()}), "--export-svg failed"); + QFile file(m_dir.filePath(QStringLiteral("01_diagram.svg"))); + QVERIFY(file.open(QIODevice::ReadOnly | QIODevice::Text)); + const QString svg = QString::fromUtf8(file.readAll()); + + QVERIFY(drawnLines(svg, QStringLiteral("Free")) > 1); + QCOMPARE(drawnLines(svg, QStringLiteral("Open")), 1); + } + +private: + QString m_fixture; + QTemporaryDir m_dir; +}; + +QTEST_MAIN(tst_freetextwidth) +#include "tst_freetextwidth.moc"