mirror of
https://github.com/qelectrotech/qelectrotech-source-mirror.git
synced 2026-09-28 13:24:14 +02:00
53a0f07ca3
Fix multiple issues introduced by commit 55c2c0df9 (interactive paste):
Paste placement (diagrameventaddpaste):
- Items now load at their original XML coordinates instead of being
snapped to the cursor position, preventing jumps on initial placement
- Use delta-based movement: record the actual grid-snapped cursor
position on first mouseMoveEvent as baseline, then compute
grid-snapped deltas from there
- Bypass Diagram::snapToGrid() in moveTo() to avoid Ctrl modifier
causing pixel-snapping instead of grid-snapping
- Remove moveTo() from mouseReleaseEvent to prevent a final jump
on click
- Warp cursor to group bounding rect origin for visual feedback
Paste command (diagramcommands):
- Always clear PLC slave data (type, address, function, comment,
cross-ref, label, TC, T1-T4) on paste regardless of the
erase-label-on-copy user preference
- Block alignment (m_block_alignment / blockAlignmentUpdate) before
setElementInformations() for both slaves and non-slaves, preventing
finishAlignment() from shifting right/center-aligned text items
- Clear non-UserText items directly after setElementInformations()
for slaves as a safety net
302 lines
8.6 KiB
C++
302 lines
8.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/>.
|
|
*/
|
|
#include "diagrameventaddpaste.h"
|
|
|
|
#include "../diagram.h"
|
|
#include "../diagramcommands.h"
|
|
#include "../qetapp.h"
|
|
#include "../qetdiagrameditor.h"
|
|
#include "../qetgraphicsitem/conductor.h"
|
|
|
|
#include <QSettings>
|
|
|
|
#include <QApplication>
|
|
#include <QClipboard>
|
|
#include <QGraphicsSceneMouseEvent>
|
|
#include <QKeyEvent>
|
|
#include <QStatusBar>
|
|
|
|
/**
|
|
@brief DiagramEventAddPaste::DiagramEventAddPaste
|
|
@param diagram : diagram to paste into
|
|
@param start_pos : where the pasted items first appear, in scene
|
|
coordinates -- normally the cursor
|
|
*/
|
|
DiagramEventAddPaste::DiagramEventAddPaste(Diagram *diagram, const QPointF &start_pos) :
|
|
DiagramEventInterface(diagram)
|
|
{
|
|
//DiagramEventInterface::init() is called by Diagram::setEventInterface
|
|
//only when it is replacing an earlier interface, so call it here as
|
|
//DiagramEventAddMacro does.
|
|
init();
|
|
|
|
const QString clipboard_text = QApplication::clipboard()->text();
|
|
if (clipboard_text.isEmpty()) return;
|
|
|
|
QDomDocument document_xml;
|
|
if (!document_xml.setContent(clipboard_text)) return;
|
|
|
|
//Load items at their original XML coordinates.
|
|
m_diagram->fromXml(document_xml, QPointF(), false, &m_content);
|
|
if (!m_content.count()) return;
|
|
|
|
const QList<QGraphicsItem *> movable = m_content.items(MovableItems);
|
|
if (movable.isEmpty()) return;
|
|
|
|
//Compute the bounding rect centre — this is where the cursor
|
|
//will start. Items stay at their original XML positions;
|
|
//moveTo() handles grid-snapped movement via deltas.
|
|
QRectF group_rect;
|
|
for (auto *item : movable) {
|
|
group_rect = group_rect.united(item->mapToScene(item->boundingRect()).boundingRect());
|
|
}
|
|
|
|
QSettings settings;
|
|
const int xGrid = settings.value(QStringLiteral("diagrameditor/Xgrid"),
|
|
Diagram::xGrid).toInt();
|
|
const int yGrid = settings.value(QStringLiteral("diagrameditor/Ygrid"),
|
|
Diagram::yGrid).toInt();
|
|
const QPointF grid_origin(
|
|
qRound(group_rect.topLeft().x() / xGrid) * xGrid,
|
|
qRound(group_rect.topLeft().y() / yGrid) * yGrid);
|
|
|
|
//Store each item's position. moveTo() applies a grid-snapped
|
|
//delta from the baseline, so items preserve their layout and
|
|
//move in whole grid steps.
|
|
for (auto *item : movable) {
|
|
m_relative_pos.insert(item, item->pos());
|
|
}
|
|
m_group_origin = grid_origin;
|
|
|
|
m_diagram->clearSelection();
|
|
for (auto *item : movable) {
|
|
item->setSelected(true);
|
|
}
|
|
|
|
if (!m_diagram->views().isEmpty()) {
|
|
if (auto *view = m_diagram->views().at(0)) {
|
|
if (const auto qde = QETApp::diagramEditorAncestorOf(view)) {
|
|
m_status_bar = qde->statusBar();
|
|
}
|
|
//Warp the cursor close to the group origin so the
|
|
//first mouseMoveEvent captures the correct baseline.
|
|
const QPoint view_pos = view->mapFromScene(m_group_origin);
|
|
const QPoint global_pos = view->viewport()->mapToGlobal(view_pos);
|
|
QCursor::setPos(global_pos);
|
|
}
|
|
}
|
|
showHint();
|
|
|
|
m_running = true;
|
|
}
|
|
|
|
/**
|
|
@brief DiagramEventAddPaste::~DiagramEventAddPaste
|
|
If the placement never finished -- the editor closed, or another tool took
|
|
over -- the items are still on the folio with nothing on the undo stack to
|
|
account for them, so take them away.
|
|
*/
|
|
DiagramEventAddPaste::~DiagramEventAddPaste()
|
|
{
|
|
if (!m_finished && m_diagram) {
|
|
removeItems();
|
|
m_finished = true;
|
|
m_running = false;
|
|
}
|
|
if (m_status_bar) {
|
|
m_status_bar->clearMessage();
|
|
}
|
|
}
|
|
|
|
/**
|
|
@brief DiagramEventAddPaste::clipboardHasDiagram
|
|
@return true if the clipboard holds a diagram fragment
|
|
*/
|
|
bool DiagramEventAddPaste::clipboardHasDiagram()
|
|
{
|
|
return Diagram::clipboardMayContainDiagram();
|
|
}
|
|
|
|
/**
|
|
@brief DiagramEventAddPaste::init
|
|
Suppress the context menu while placing, so a right click can cancel
|
|
instead of opening a menu over the items being positioned.
|
|
*/
|
|
void DiagramEventAddPaste::init()
|
|
{
|
|
if (!m_diagram) return;
|
|
const auto views = m_diagram->views();
|
|
for (auto *view : views) {
|
|
view->setContextMenuPolicy(Qt::NoContextMenu);
|
|
}
|
|
}
|
|
|
|
void DiagramEventAddPaste::showHint()
|
|
{
|
|
if (m_status_bar) {
|
|
m_status_bar->showMessage(
|
|
tr("Cliquez pour poser le collage, Échap ou clic droit pour annuler",
|
|
"status bar tip while positioning a paste"));
|
|
}
|
|
}
|
|
|
|
/**
|
|
@brief DiagramEventAddPaste::moveTo
|
|
Compute a grid-snapped delta from the initial cursor position and
|
|
apply it to every item's grid-shifted position. This keeps all
|
|
items exactly on grid points regardless of modifier keys or
|
|
sub-pixel cursor-warp rounding.
|
|
*/
|
|
void DiagramEventAddPaste::moveTo(const QPointF &scene_pos)
|
|
{
|
|
QSettings settings;
|
|
const int xGrid = settings.value(QStringLiteral("diagrameditor/Xgrid"),
|
|
Diagram::xGrid).toInt();
|
|
const int yGrid = settings.value(QStringLiteral("diagrameditor/Ygrid"),
|
|
Diagram::yGrid).toInt();
|
|
|
|
const auto snapGrid = [xGrid, yGrid](const QPointF &p) -> QPointF {
|
|
return QPointF(
|
|
qRound(p.x() / xGrid) * xGrid,
|
|
qRound(p.y() / yGrid) * yGrid);
|
|
};
|
|
|
|
//On the very first call, record the actual grid-snapped
|
|
//cursor position as baseline. The cursor warp in the
|
|
//constructor goes through integer rounding (mapFromScene →
|
|
//QPoint) so the real position may differ slightly from
|
|
//m_initial_cursor. Using the actual scene position avoids
|
|
//a one-grid-unit jump on the first mouse movement.
|
|
if (m_initial_cursor.isNull()) {
|
|
m_initial_cursor = snapGrid(scene_pos);
|
|
return;
|
|
}
|
|
|
|
const QPointF delta = snapGrid(scene_pos) - m_initial_cursor;
|
|
|
|
for (auto it = m_relative_pos.constBegin() ; it != m_relative_pos.constEnd() ; ++it) {
|
|
if (it.key()) {
|
|
it.key()->setPos(it.value() + delta);
|
|
}
|
|
}
|
|
|
|
//Update conductor paths so they follow the moved terminals.
|
|
const QList<Conductor *> conductors = m_content.conductors(DiagramContent::AnyConductor);
|
|
for (auto *conductor : conductors) {
|
|
conductor->updatePath();
|
|
}
|
|
}
|
|
|
|
void DiagramEventAddPaste::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
|
|
{
|
|
if (!m_running) return;
|
|
moveTo(event->scenePos());
|
|
event->setAccepted(true);
|
|
}
|
|
|
|
void DiagramEventAddPaste::mousePressEvent(QGraphicsSceneMouseEvent *event)
|
|
{
|
|
if (!m_running) return;
|
|
//Swallowed so the press cannot start a rubber band or drag an item
|
|
//out of the group; the release is what decides.
|
|
event->setAccepted(true);
|
|
}
|
|
|
|
void DiagramEventAddPaste::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
|
|
{
|
|
if (!m_running) return;
|
|
|
|
event->setAccepted(true);
|
|
if (event->button() == Qt::LeftButton) {
|
|
commit();
|
|
} else if (event->button() == Qt::RightButton) {
|
|
cancel();
|
|
}
|
|
}
|
|
|
|
void DiagramEventAddPaste::keyPressEvent(QKeyEvent *event)
|
|
{
|
|
if (!m_running) return;
|
|
|
|
switch (event->key()) {
|
|
case Qt::Key_Escape:
|
|
event->setAccepted(true);
|
|
cancel();
|
|
break;
|
|
//Return and Enter drop the paste where it stands, so the whole
|
|
//operation can be completed without a mouse.
|
|
case Qt::Key_Return:
|
|
case Qt::Key_Enter:
|
|
event->setAccepted(true);
|
|
commit();
|
|
break;
|
|
default:
|
|
break;
|
|
}
|
|
}
|
|
|
|
/**
|
|
@brief DiagramEventAddPaste::commit
|
|
Hand the items to the undo stack where they stand.
|
|
|
|
PasteDiagramCommand's first redo() does not add the items to the scene --
|
|
it assumes they are already there, which is what Diagram::fromXml did when
|
|
this started. So pushing it here adopts them rather than duplicating them.
|
|
*/
|
|
void DiagramEventAddPaste::commit()
|
|
{
|
|
if (m_finished || !m_diagram) return;
|
|
m_finished = true;
|
|
m_running = false;
|
|
|
|
m_diagram->undoStack().push(new PasteDiagramCommand(m_diagram, m_content));
|
|
emit finish();
|
|
}
|
|
|
|
/**
|
|
@brief DiagramEventAddPaste::cancel
|
|
Take the items back off the folio. Nothing was pushed to the undo stack,
|
|
so there is nothing to undo afterwards.
|
|
*/
|
|
void DiagramEventAddPaste::cancel()
|
|
{
|
|
if (m_finished || !m_diagram) return;
|
|
removeItems();
|
|
m_finished = true;
|
|
m_running = false;
|
|
emit finish(); // only the user-driven path signals
|
|
}
|
|
|
|
void DiagramEventAddPaste::removeItems()
|
|
{
|
|
const QList<Conductor *> conductors = m_content.conductors(DiagramContent::AnyConductor);
|
|
for (auto *conductor : conductors) {
|
|
m_diagram->removeItem(conductor);
|
|
delete conductor;
|
|
}
|
|
|
|
const QList<QGraphicsItem *> rest = m_content.items(MovableItems);
|
|
for (auto *item : rest) {
|
|
m_diagram->removeItem(item);
|
|
delete item;
|
|
}
|
|
|
|
m_content.clear();
|
|
m_relative_pos.clear();
|
|
}
|