mirror of
https://github.com/qelectrotech/qelectrotech-source-mirror.git
synced 2026-08-15 19:14:12 +02:00
d988054aca
Follow-up to #740, which fixed the slave-side "(n-Xn)" cross-reference label. The master-side item - the small table/cross drawn next to a report or master element, listing where each of its slaves is used - was still missing from DXF export. Measured against examples/ industrial.qet with the PDF export as an oracle (renders the whole scene, so it shows what should be there): before after PDF slave xrefs "(n-Xn)" 41 41 41 (already fixed, #740) folio/position strings 358 403 403 DXF now matches the PDF exactly. ## Why this needed a different approach than #740 The slave label is a plain QGraphicsTextItem - one string, trivial to walk and re-emit as a single DXF TEXT entity, which is what #740 did. The master-side item (CrossRefItem) is not: it paints itself with ~600 lines of hand-written QPainter calls across three modes (drawAsCross/drawAsContacts/drawAsPlcTable), including a header table, contact symbols, and rules. Hand-porting that logic to emit DXF primitives directly would mean maintaining two divergent implementations of the same drawing that have to be kept in sync by hand forever. ## Approach: a QPaintEngine that intercepts CrossRefItem's own paint() DxfPaintEngine/DxfPaintDevice (sources/dxfpaintdevice.{h,cpp}) is a QPaintEngine/QPaintDevice pair - the same mechanism QPrinter and QSvgGenerator use to redirect QPainter output elsewhere. Constructing a QPainter on a DxfPaintDevice and calling item->paint() on it produces DXF entities instead of pixels, using the exact same drawing code that already renders correctly on screen. CrossRefItem::paint() is unmodified. Scope is deliberately narrow - only the QPainter calls CrossRefItem's paint() is observed to make: drawLines -> LINE, drawRects/drawPath's fill case -> outline-only LWPOLYLINE (no HATCH support in v1 - DXF's fill primitive is a separate, more involved entity type; documented as a known limitation rather than attempted here), drawEllipse -> CIRCLE or a flattened polygon for rotated ellipses, drawPath's arc case (from drawArc/drawPie) -> chord-flattened LINE segments, drawPolygon -> LWPOLYLINE, drawTextItem -> TEXT. drawPixmap is intentionally unimplemented (qWarning + skip) since CrossRefItem never calls it - this is not a general-purpose DXF paint engine, and isn't meant to be in this PR. CrossRefItem::paint() is protected, per the normal QGraphicsItem contract - added a small paintForExport() wrapper rather than making paint() itself public, or reaching around access control. ## Explicitly out of scope QetShapeItem::toDXF() and QetGraphicsTableItem::toDXF() (both already implemented and working) are untouched. Rewriting working exporters onto this engine to prove an architectural point would be a large, unrelated diff with no user-visible benefit - if that consolidation is wanted later, it's a separate proposal once this engine has shipped and proven out on the one item that currently has no DXF export at all. ## Testing Built clean on Qt5/Linux. Verified via the GUI export dialog (Fichier > Exporter > DXF) against examples/industrial.qet, 50 folios: export completes without error or crash, all 50 .dxf files are structurally well-formed (balanced SECTION/ENDSEC, single EOF each), and grepping the folio-position pattern gives the before/after/PDF numbers above. Spot-checked several real label strings (e.g. "18-B18", "20-A2") present as TEXT entity values in the output, not just an artifact of the count matching.
188 lines
6.6 KiB
C++
188 lines
6.6 KiB
C++
/*
|
|
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 <http://www.gnu.org/licenses/>.
|
|
*/
|
|
#ifndef DYNAMICELEMENTTEXTITEM_H
|
|
#define DYNAMICELEMENTTEXTITEM_H
|
|
|
|
#include "../properties/xrefproperties.h"
|
|
#include "diagramtextitem.h"
|
|
#include "element.h"
|
|
|
|
#include <QPointer>
|
|
#include <QUuid>
|
|
|
|
class Element;
|
|
class Conductor;
|
|
class ElementTextItemGroup;
|
|
class CrossRefItem;
|
|
|
|
/**
|
|
@brief The DynamicElementTextItem class
|
|
This class provide a simple text field of element who can be added or removed directly from the diagram editor.
|
|
This text is created to compensate a big lack of the ElementTextItem : ElementTextItem can't be added or removed directly in the diagram editor
|
|
|
|
*/
|
|
class DynamicElementTextItem : public DiagramTextItem
|
|
{
|
|
friend class DynamicTextItemDelegate;
|
|
friend class CompositeTextEditDialog;
|
|
friend class Element;
|
|
|
|
Q_OBJECT
|
|
|
|
Q_PROPERTY(QString text READ text WRITE setText NOTIFY textChanged)
|
|
Q_PROPERTY(TextFrom textFrom READ textFrom WRITE setTextFrom NOTIFY textFromChanged)
|
|
Q_PROPERTY(QString infoName READ infoName WRITE setInfoName NOTIFY infoNameChanged)
|
|
Q_PROPERTY(QString compositeText READ compositeText WRITE setCompositeText NOTIFY compositeTextChanged)
|
|
Q_PROPERTY(bool frame READ frame WRITE setFrame NOTIFY frameChanged)
|
|
Q_PROPERTY(qreal textWidth READ textWidth WRITE setTextWidth NOTIFY textWidthChanged)
|
|
Q_PROPERTY(bool keepVisualRotation READ keepVisualRotation WRITE setKeepVisualRotation NOTIFY keepVisualRotationChanged)
|
|
Q_PROPERTY(bool rotationPointCenter READ rotationPointCenter WRITE setRotationPointCenter NOTIFY rotationPointCenterChanged)
|
|
public:
|
|
|
|
enum TextFrom {
|
|
UserText,
|
|
ElementInfo,
|
|
CompositeText
|
|
};
|
|
Q_ENUM (TextFrom)
|
|
enum {Type = UserType + 1010};
|
|
int type() const override {return Type;}
|
|
|
|
signals:
|
|
void textChanged(QString text);
|
|
void textFromChanged(DynamicElementTextItem::TextFrom text_from);
|
|
void infoNameChanged(QString info);
|
|
void compositeTextChanged(QString text);
|
|
void frameChanged(bool frame);
|
|
void plainTextChanged();
|
|
void textWidthChanged(qreal width);
|
|
void keepVisualRotationChanged(bool keep);
|
|
void rotationPointCenterChanged(bool center);
|
|
|
|
public:
|
|
DynamicElementTextItem(Element *parent_element);
|
|
~DynamicElementTextItem() override;
|
|
static QMetaEnum textFromMetaEnum();
|
|
private:
|
|
DynamicElementTextItem ();
|
|
DynamicElementTextItem(const DynamicElementTextItem &);
|
|
|
|
public:
|
|
QDomElement toXml(QDomDocument &dom_doc) const override;
|
|
void fromXml(const QDomElement &dom_elmt) override;
|
|
|
|
Element *parentElement() const;
|
|
/// PDF export: slave cross-reference text item ("(folio-pos)") and its master target.
|
|
QGraphicsTextItem *slaveXrefItem() const { return m_slave_Xref_item; }
|
|
/// DXF export: the master-side cross-reference item (the table/cross
|
|
/// drawn next to a report/master element), if this text item has one.
|
|
CrossRefItem *masterXrefItem() const { return m_Xref_item; }
|
|
Element *masterElement() const { return m_master_element.data(); }
|
|
ElementTextItemGroup *parentGroup() const;
|
|
Element *elementUseForInfo() const;
|
|
void refreshLabelConnection();
|
|
|
|
DynamicElementTextItem::TextFrom textFrom() const;
|
|
void setTextFrom (DynamicElementTextItem::TextFrom text_from);
|
|
QString text() const;
|
|
void setText(const QString &text);
|
|
static QString xmlTagName() {return QString("dynamic_elmt_text");}
|
|
void setInfoName(const QString &info_name);
|
|
QString infoName() const;
|
|
void setCompositeText(const QString &text);
|
|
QString compositeText() const;
|
|
void setFrame(const bool frame);
|
|
bool frame() const;
|
|
QUuid uuid() const;
|
|
void updateXref();
|
|
void setPlainText(const QString &text);
|
|
void setTextWidth(qreal width);
|
|
void setXref_item(Qt::AlignmentFlag m_exHrefPos);
|
|
|
|
void setKeepVisualRotation(bool set);
|
|
bool keepVisualRotation() const;
|
|
|
|
void setRotationPointCenter(bool set);
|
|
bool rotationPointCenter() const;
|
|
|
|
protected:
|
|
void mousePressEvent(QGraphicsSceneMouseEvent *event) override;
|
|
void mouseMoveEvent(QGraphicsSceneMouseEvent *event) override;
|
|
void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override;
|
|
void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) override;
|
|
void hoverEnterEvent(QGraphicsSceneHoverEvent *event) override;
|
|
void hoverLeaveEvent(QGraphicsSceneHoverEvent *event) override;
|
|
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
|
|
QVariant itemChange(GraphicsItemChange change, const QVariant &value) override;
|
|
bool sceneEventFilter(QGraphicsItem *watched, QEvent *event) override;
|
|
|
|
private:
|
|
void elementInfoChanged();
|
|
void masterChanged();
|
|
void reportChanged();
|
|
void reportFormulaChanged();
|
|
void setConnectionForReportFormula(const QString &formula);
|
|
void removeConnectionForReportFormula(const QString &formula);
|
|
void setupFormulaConnection();
|
|
void clearFormulaConnection();
|
|
void updateReportFormulaConnection();
|
|
void updateReportText();
|
|
void updateLabel();
|
|
void conductorWasAdded(Conductor *conductor);
|
|
void conductorWasRemoved(Conductor *conductor);
|
|
void setPotentialConductor();
|
|
void conductorPropertiesChanged();
|
|
QString reportReplacedCompositeText() const;
|
|
void zoomToLinkedElement();
|
|
void parentElementRotationChanged();
|
|
void thisRotationChanged();
|
|
|
|
private:
|
|
QPointer <Element>
|
|
m_parent_element,
|
|
m_master_element,
|
|
m_other_report;
|
|
QPointer <Conductor> m_watched_conductor;
|
|
QString
|
|
m_text,
|
|
m_info_name,
|
|
m_composite_text,
|
|
m_report_formula,
|
|
m_F_str;
|
|
DynamicElementTextItem::TextFrom m_text_from = UserText;
|
|
QUuid m_uuid;
|
|
QMetaObject::Connection m_report_formula_con;
|
|
QList<QMetaObject::Connection>
|
|
m_formula_connection,
|
|
m_update_slave_Xref_connection;
|
|
QColor m_user_color;
|
|
bool
|
|
m_frame = false,
|
|
m_first_scene_change = true;
|
|
CrossRefItem *m_Xref_item = nullptr;
|
|
QGraphicsTextItem *m_slave_Xref_item = nullptr;
|
|
qreal m_text_width = -1;
|
|
QPointF m_initial_position;
|
|
bool m_keep_visual_rotation = true;
|
|
bool m_rotation_point_center = false;
|
|
qreal m_visual_rotation_ref = 0;
|
|
bool m_move_parent = true;
|
|
};
|
|
|
|
#endif // DYNAMICELEMENTTEXTITEM_H
|