mirror of
https://github.com/qelectrotech/qelectrotech-source-mirror.git
synced 2026-10-11 06:34:14 +02:00
955dfb3a73
Conflicts resolved in 24 files. Notable decisions: - ico/icon-themes.qrc: upstream's icon folder restructure kept; the 36 cable icon entries re-added under the new qet/qet-dark path scheme (XML valid, every referenced file exists). - Toolbar system: upstream's DiagramToolbarSettings now owns the toolbar filling. The cable tool is registered as diagrameditor.add_cable (generic group loop) and listed on the "diagram" toolbar right after the auto-break conductor action, separated by a divider, exactly like before the merge. - Paste: the cable lines of a copy are handed to PasteNumberingImport::push() as extra commands, so paste + cable lines + the numbering question stay ONE undo step on both paste paths (DiagramView::paste and DiagramEventAddPaste::commit). - PDF links: upstream's deterministic link sorting kept together with the cable cross-reference injector (injectLinkTo -> links list). - Element renumbering: upstream's ElementAutoNumSchemeCommand::renumber replaces the old formula-based body of QETProject::renumberElementsBySchemeTitle; the cable numbering rule API (cableAutoNum, axis priority, rule name) is kept in full. - Auto-numbering pages: upstream's scheme management kept, the Câbles tab added as index 4 (changeToCableTab), both entry points changeToCable() and changeToElement() kept side by side. - SelectAutonumW: dirty tracking and the contextEdited signal moved into upstream's insertPartRow() row API, so single-rule mode, the rule-removable button and "confirm without change leaves the project alone" keep working. - xrefpropertieswidget: upstream's offset clamping kept; the cable branch (Texte field, Police button, hidden display options) kept; the stack-overlapping checkbox is hidden for cables. Verified after the merge: build green (515/515, no errors), ctest 85/86 (only the pre-existing headless tst_menubarkeyboard failure), offscreen smoke exit 124.
494 lines
17 KiB
C++
494 lines
17 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 "../autoNum/ui/pastenumberingimport.h"
|
|
|
|
#include "../cable/addcablecommand.h"
|
|
#include "../cable/cablecopy.h"
|
|
#include "../cable/cablepart.h"
|
|
#include "../cable/editcablecommand.h"
|
|
#include "../diagram.h"
|
|
#include "../foliogrid.h"
|
|
#include "../diagramcommands.h"
|
|
#include "../qetapp.h"
|
|
#include "../qetdiagrameditor.h"
|
|
#include "../qetgraphicsitem/conductor.h"
|
|
#include "../qetproject.h"
|
|
|
|
#include <QSettings>
|
|
|
|
#include <QApplication>
|
|
#include <QClipboard>
|
|
#include <QCoreApplication>
|
|
#include <QCursor>
|
|
#include <QGraphicsSceneMouseEvent>
|
|
#include <QGraphicsView>
|
|
#include <QKeyEvent>
|
|
#include <QStatusBar>
|
|
|
|
#include <utility>
|
|
|
|
/**
|
|
@brief DiagramEventAddPaste::DiagramEventAddPaste
|
|
@param diagram : diagram to paste into
|
|
@param start_pos : where the pasted items first appear, in scene
|
|
coordinates -- normally the cursor. Only used for UnderCursor; an
|
|
AtOrigin paste stays at the coordinates it was copied from.
|
|
@param placement : UnderCursor moves the group under the cursor
|
|
(default), AtOrigin leaves it at its original XML position and warps
|
|
the OS cursor to the group's origin so baseline and screen match.
|
|
*/
|
|
DiagramEventAddPaste::DiagramEventAddPaste(Diagram *diagram, const QPointF &start_pos,
|
|
PastePlacement placement) :
|
|
DiagramEventInterface(diagram)
|
|
{
|
|
m_placement = placement;
|
|
|
|
//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. A cable line
|
|
//comes back through its own list rather than through the
|
|
//content: the cable owns it, so it is not one of the folio's
|
|
//items -- and it travels as a whole, colour labels and all,
|
|
//whether or not the place it is going to holds a wire.
|
|
m_diagram->fromXml(document_xml, QPointF(), false, &m_content, &m_cables);
|
|
m_copied_schemes = PasteNumberingImport::copiedBy(document_xml);
|
|
|
|
if (db) {
|
|
db->blockSignals(false);
|
|
db->setUpdateBlocked(false);
|
|
db->updateDB();
|
|
}
|
|
if (!m_content.count() && m_cables.isEmpty()) return;
|
|
|
|
QList<QGraphicsItem *> movable = m_content.items(MovableItems);
|
|
for (CablePart *part : std::as_const(m_cables)) {
|
|
if (part) {
|
|
movable << part;
|
|
m_cable_items.insert(part);
|
|
}
|
|
}
|
|
if (movable.isEmpty()) return;
|
|
|
|
//Compute the top-left of all items' actual on-screen bounding
|
|
//boxes (not their raw pos()) and snap to grid: this is the point
|
|
//that gets placed under the cursor, and the baseline moveTo()
|
|
//measures from. mapToScene(boundingRect()) matters here, not
|
|
//pos() alone: pos() is the scene location of an item's local
|
|
//origin, but for anything with a pivot-centered transform (a
|
|
//scaled or rotated image, in particular) that origin can sit far
|
|
//from where the item is actually drawn -- pivot + scale*(0 -
|
|
//pivot) is nowhere near (0, 0) once scale is well under 1. Using
|
|
//pos() here silently pasted content at the right *delta* from a
|
|
//point that wasn't actually where the content visually was,
|
|
//producing a constant, scale-dependent offset between the cursor
|
|
//and the pasted picture. Diagram::fromXml()'s own position
|
|
//parameter already gets this right the same way, for the same
|
|
//reason.
|
|
QRectF items_rect;
|
|
for (auto *item : movable) {
|
|
items_rect = items_rect.united(item->mapToScene(item->boundingRect()).boundingRect());
|
|
}
|
|
const QPointF top_left = items_rect.topLeft();
|
|
QSettings settings;
|
|
const int xGrid = FolioGrid::step(settings.value(FolioGrid::x_key), Diagram::xGrid);
|
|
const int yGrid = FolioGrid::step(settings.value(FolioGrid::y_key), Diagram::yGrid);
|
|
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 = (m_placement == AtOrigin)
|
|
? snapGrid(top_left)
|
|
: snapGrid(start_pos);
|
|
|
|
if (m_placement == UnderCursor) {
|
|
//Land the pasted content under the cursor immediately, rather than
|
|
//leaving it at the copied source's own coordinates: fromXml() above
|
|
//loads items at their original position purely because it doesn't
|
|
//know the target yet, not because that is where a paste should end
|
|
//up. The previous approach instead left items there and warped the
|
|
//OS cursor to match -- QCursor::setPos() is silently ignored by
|
|
//many window managers and compositors (Wayland in particular), so
|
|
//on any of those the warp simply never happened and the paste was
|
|
//left wherever it had originally been copied from, which could be
|
|
//anywhere on the folio -- exactly the "far from the cursor" bug.
|
|
const QPointF initial_delta = grid_origin - snapGrid(top_left);
|
|
for (auto *item : movable) {
|
|
item->setPos(item->pos() + initial_delta);
|
|
}
|
|
} else {
|
|
//AtOrigin: the items keep the coordinates they were copied from,
|
|
//so the copy stands exactly where the original stands. No delta is
|
|
//applied; what has to move is the cursor -- it is warped to the
|
|
//group's grid-snapped origin below, once m_group_origin is set,
|
|
//so the baseline and the physical cursor position agree.
|
|
}
|
|
|
|
//Store each item's now-placed 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. For UnderCursor
|
|
//the group was just put there, so the baseline is known outright.
|
|
//For AtOrigin the group stayed where it was copied from and the
|
|
//OS cursor is warped to match instead -- but only a warp that
|
|
//verifiably landed may be trusted as the baseline: QCursor::setPos()
|
|
//needs pointer focus inside the target window (on Wayland it goes
|
|
//through wp_pointer_warp_v1, and is a silent no-op without it), and
|
|
//a baseline that assumes a warp which did not happen would move the
|
|
//whole group by the warp-sized delta on the first mouse move. So
|
|
//when the warp cannot be confirmed, leave m_baseline_captured
|
|
//false: moveTo() re-baselines from the first real mouse position
|
|
//instead, which costs at most the first movement but never flings
|
|
//the group across the folio.
|
|
if (m_placement == AtOrigin && !m_diagram->views().isEmpty()) {
|
|
if (auto *view = m_diagram->views().at(0)) {
|
|
//An origin outside the visible area cannot be warped to
|
|
//(the compositor rejects targets outside the window) and
|
|
//would leave the paste invisible, so scroll it into view
|
|
//first.
|
|
if (!view->viewport()->rect().contains(view->mapFromScene(m_group_origin))) {
|
|
view->ensureVisible(items_rect, 50, 50);
|
|
}
|
|
const QPoint view_pos = view->mapFromScene(m_group_origin);
|
|
const QPoint global_pos = view->viewport()->mapToGlobal(view_pos);
|
|
QCursor::setPos(global_pos);
|
|
if ((QCursor::pos() - global_pos).manhattanLength() <= 4) {
|
|
m_initial_cursor = m_group_origin;
|
|
m_baseline_captured = true;
|
|
}
|
|
}
|
|
}
|
|
if (m_placement == UnderCursor) {
|
|
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();
|
|
}
|
|
}
|
|
}
|
|
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 = FolioGrid::step(settings.value(FolioGrid::x_key), Diagram::xGrid);
|
|
const int yGrid = FolioGrid::step(settings.value(FolioGrid::y_key), Diagram::yGrid);
|
|
|
|
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;
|
|
|
|
//A cable line is handed a step rather than a place to stand: it
|
|
//folds a translation into its own geometry and into the colour
|
|
//labels it carries and keeps its own pos() at (0, 0)
|
|
//(CablePart::itemChange), so the position stored above -- always
|
|
//(0, 0) for it -- would be an addition again on every mouse move
|
|
//and the line would run away from the group it was pasted with.
|
|
//The difference to the last step keeps the translation the same
|
|
//one the rest of the paste gets, expressed their way: a place.
|
|
const QPointF cable_step = delta - m_cable_delta;
|
|
for (auto it = m_relative_pos.constBegin() ; it != m_relative_pos.constEnd() ; ++it) {
|
|
if (!it.key()) continue;
|
|
if (m_cable_items.contains(it.key())) {
|
|
it.key()->setPos(cable_step);
|
|
} else {
|
|
it.key()->setPos(it.value() + delta);
|
|
}
|
|
}
|
|
m_cable_delta = 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.
|
|
|
|
The cable lines are wired just before that, which is the first moment
|
|
the place they will occupy is final: each colour label takes the wire
|
|
it happens to stand on, and a line the user refuses to let take wires
|
|
away from another cable goes away again on its own.
|
|
*/
|
|
void DiagramEventAddPaste::commit()
|
|
{
|
|
if (m_finished || !m_diagram) return;
|
|
m_finished = true;
|
|
m_running = false;
|
|
|
|
const QList<CableCopy::Wired> wired = CableCopy::wire(
|
|
m_diagram, m_cables,
|
|
m_content.conductors(DiagramContent::AnyConductor));
|
|
m_cables.clear();
|
|
|
|
//The cable lines the copy brings are not part of the paste
|
|
//itself: they are handed to the paste so that one Ctrl+Z takes
|
|
//the whole of it back in one go.
|
|
QList<QUndoCommand *> cable_commands;
|
|
for (const CableCopy::Wired &line : std::as_const(wired))
|
|
{
|
|
if (!line.part) continue;
|
|
|
|
auto *added = new AddCableCommand(line.part->cable(), line.part.data(),
|
|
m_diagram, true, line.taken);
|
|
added->setText(QCoreApplication::translate("CableCopy", "Coller un câble"));
|
|
cable_commands << added;
|
|
}
|
|
|
|
//Asks whether to import the numberings the copy brings, if the
|
|
//project has not got them; the paste itself and the cable lines
|
|
//travel inside the same step of the undo stack.
|
|
PasteNumberingImport::push(m_diagram->views().isEmpty() ? nullptr : m_diagram->views().first(),
|
|
m_diagram, m_content, m_copied_schemes, cable_commands);
|
|
|
|
//The undo stack has just run its first redo, which may have
|
|
//renewed the identity of a pasted conductor: the cores are
|
|
//pointed at the wires again so their cable field survives it.
|
|
CableCopy::repoint(wired);
|
|
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;
|
|
}
|
|
|
|
//The cable lines never reached the undo stack either, so they
|
|
//are taken back the way they were built: off the folio, out of
|
|
//the project and deleted, leaving no trace of having been
|
|
//there -- not even a project asking to be saved for nothing.
|
|
for (CablePart *part : std::as_const(m_cables)) {
|
|
CableCopy::discard(m_diagram, part);
|
|
}
|
|
m_cables.clear();
|
|
|
|
m_content.clear();
|
|
m_relative_pos.clear();
|
|
}
|