mirror of
https://github.com/qelectrotech/qelectrotech-source-mirror.git
synced 2026-09-24 18:54:20 +02:00
8ee3f90047
Two issues on the interactive paste path: 1. Stall: DiagramEventAddPaste's constructor called Diagram::fromXml() with no database batching, so every addItem() emitted dataBaseUpdated() and each connected table model re-ran its full SQL query. A typical paste (~40 elements + ~40 conductors) triggered ~77 rebuilds of the table models -- measured at ~2.1 s of pure fromXml time on a large project. Project loading already batches this via setUpdateBlocked()/blockSignals() (QETProject::readProjectXml); the paste path now does the same: block during fromXml, one updateDB() after. Measured fromXml: 2114 ms -> 143 ms. 2. Cursor jump: m_initial_cursor was set to the group origin but the physical cursor stayed at the Ctrl+V press location, so the first mouseMoveEvent computed a large delta and the items jumped on first touch. Warp the cursor to the group origin after placement so the baseline and the actual cursor position match.
362 lines
11 KiB
C++
362 lines
11 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 "../qetproject.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)
|
|
{
|
|
Q_UNUSED(start_pos); // items stay at their original XML position
|
|
//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;
|
|
|
|
//Batch the database work the same way project loading does
|
|
//(QETProject::readProjectXml): without this, every addItem()
|
|
//below emits dataBaseUpdated(), which makes each connected
|
|
//table model re-run its full SQL query -- ~77 queries for a
|
|
//typical paste, i.e. the multi-second stall on Ctrl+V.
|
|
auto *db = m_diagram->project() ? m_diagram->project()->dataBase() : nullptr;
|
|
if (db) {
|
|
db->blockSignals(true);
|
|
db->setUpdateBlocked(true);
|
|
}
|
|
|
|
//Load items at their original XML coordinates.
|
|
m_diagram->fromXml(document_xml, QPointF(), false, &m_content);
|
|
|
|
if (db) {
|
|
db->blockSignals(false);
|
|
db->setUpdateBlocked(false);
|
|
db->updateDB();
|
|
}
|
|
if (!m_content.count()) return;
|
|
|
|
const QList<QGraphicsItem *> movable = m_content.items(MovableItems);
|
|
if (movable.isEmpty()) return;
|
|
|
|
//Compute the top-left of all items' positions (not bounding
|
|
//rects) and snap to grid: this is the point that gets placed
|
|
//under the cursor, and the baseline moveTo() measures from.
|
|
QPointF top_left;
|
|
bool first = true;
|
|
for (auto *item : movable) {
|
|
const QPointF p = item->pos();
|
|
if (first) {
|
|
top_left = p;
|
|
first = false;
|
|
} else {
|
|
if (p.x() < top_left.x()) top_left.setX(p.x());
|
|
if (p.y() < top_left.y()) top_left.setY(p.y());
|
|
}
|
|
}
|
|
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);
|
|
};
|
|
const QPointF grid_origin = snapGrid(top_left);
|
|
|
|
//Store each item's original position. moveTo() applies a
|
|
//grid-snapped delta from the baseline to these, 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;
|
|
|
|
//The conductors were laid out against the original terminal
|
|
//positions, so re-route them before anything is drawn.
|
|
const QList<Conductor *> conductors = m_content.conductors(DiagramContent::AnyConductor);
|
|
for (auto *conductor : conductors) {
|
|
conductor->updatePath();
|
|
}
|
|
|
|
//The baseline is the group's grid-snapped origin, so moveTo()
|
|
//does not have to capture one from the first mouse movement.
|
|
m_initial_cursor = m_group_origin;
|
|
m_baseline_captured = true;
|
|
|
|
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 to the group's grid-snapped origin so
|
|
//the actual cursor position matches m_initial_cursor.
|
|
//Without this the first mouseMoveEvent computes a large
|
|
//delta (cursor is still at the Ctrl+V press location)
|
|
//and the items jump on first touch.
|
|
const QPoint view_pos = view->mapFromScene(m_initial_cursor);
|
|
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();
|
|
}
|
|
|
|
//Give the context menu back. init() turned it off so a right
|
|
//click would cancel the placement instead of opening a menu over
|
|
//it, and nothing turned it on again: one Ctrl+V left the folio's
|
|
//right-click menu dead for the rest of the session, taking
|
|
//"Coller ici", "Collage multiple" and the folio properties with
|
|
//it. Every other DiagramEvent* class restores it here; this one
|
|
//did not.
|
|
if (m_diagram) {
|
|
const auto views = m_diagram->views();
|
|
for (auto *view : views) {
|
|
view->setContextMenuPolicy(Qt::DefaultContextMenu);
|
|
}
|
|
}
|
|
}
|
|
|
|
/**
|
|
@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 stored position. Working from a delta
|
|
against a fixed baseline, rather than from the previous position,
|
|
keeps all items exactly on grid points regardless of modifier keys
|
|
and stops rounding accumulating over a long drag.
|
|
*/
|
|
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);
|
|
};
|
|
|
|
//The constructor normally sets the baseline, having just put the
|
|
//group there. This covers the case where it could not -- no view
|
|
//to map through -- by taking the first cursor position instead.
|
|
//Tested with m_baseline_captured rather than
|
|
//m_initial_cursor.isNull(), which silently re-baselines when the
|
|
//baseline is legitimately scene (0,0).
|
|
if (!m_baseline_captured) {
|
|
m_initial_cursor = snapGrid(scene_pos);
|
|
m_baseline_captured = true;
|
|
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();
|
|
}
|