mirror of
https://github.com/qelectrotech/qelectrotech-source-mirror.git
synced 2026-09-30 14:54:13 +02:00
ispyisail
8ab4e24b61
RotateTextsCommand called QDialog::exec() from inside its constructor, so the command could not be built without a human answering a dialog. That made it untestable headlessly, undrivable from any script or test harness, and it is why bugtracker #312 (PR #707) shipped with its save/reload round-trip unverified -- the symptom could not be reproduced without a GUI. The command now takes the angle as a parameter and does no asking. Two statics carry the interactive half: hasSelectedTexts(diagram) -- is there anything to rotate askRotation(rotation) -- open the dialog, false if cancelled The single call site in QETDiagramEditor asks first, then builds the command, so the user-visible behaviour is unchanged: same dialog, same title, same no-dialog-on-empty-selection. Keeping askRotation() in this class also keeps the QObject tr() context, so existing translations of "Orienter les textes sélectionnés" are not invalidated. Also guards undo()/redo() against a null m_anim_group. When nothing is selected the constructor calls setObsolete(true) without ever creating the animation group, and QUndoStack::push() calls redo() before discarding an obsolete command -- a latent null dereference on that path. Verified headlessly, which was the point: driving the command through a scratch --test-ops op on examples/741.qet (67 conductors), rotation attributes written on save go 0 -> 67 with the #707 fix present and stay at 0 with it reverted, while the reverted build instead writes userx on all 67. That is bugtracker #312 reproduced and fixed under test for the first time.
73 lines
2.5 KiB
C++
73 lines
2.5 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 ROTATETEXTSCOMMAND_H
|
|
#define ROTATETEXTSCOMMAND_H
|
|
|
|
#include <QUndoCommand>
|
|
#include <QPointer>
|
|
#include <QHash>
|
|
|
|
class ConductorTextItem;
|
|
class Diagram;
|
|
class QParallelAnimationGroup;
|
|
|
|
/**
|
|
@brief The RotateTextsCommand class
|
|
Apply @p rotation to the currently selected texts and texts group of a
|
|
diagram. Just instantiate this undo command and push it in a QUndoStack.
|
|
|
|
This command does not ask the user for anything: obtaining the angle is the
|
|
caller's job, via the askRotation() helper below. Keeping the dialog out of
|
|
the constructor is what makes the command usable outside an interactive
|
|
session — from a test harness, a regression sweep, or a script — and stops
|
|
a headless caller from blocking forever on a modal nobody can answer.
|
|
|
|
Typical interactive use:
|
|
@code
|
|
if (RotateTextsCommand::hasSelectedTexts(diagram)) {
|
|
qreal rotation = 0;
|
|
if (RotateTextsCommand::askRotation(rotation))
|
|
diagram->undoStack().push(new RotateTextsCommand(diagram, rotation));
|
|
}
|
|
@endcode
|
|
*/
|
|
class RotateTextsCommand : public QUndoCommand
|
|
{
|
|
public:
|
|
RotateTextsCommand(Diagram *diagram, qreal rotation, QUndoCommand *parent=nullptr);
|
|
|
|
/// @return true if @p diagram has at least one selected text or text group to rotate.
|
|
static bool hasSelectedTexts(Diagram *diagram);
|
|
/// Open the orientation dialog. @return true and set @p rotation if accepted, false if cancelled.
|
|
static bool askRotation(qreal &rotation);
|
|
|
|
void undo() override;
|
|
void redo() override;
|
|
|
|
private:
|
|
void setupAnimation(QObject *target, const QByteArray &propertyName, const QVariant& start, const QVariant& end);
|
|
|
|
private:
|
|
QPointer<Diagram> m_diagram;
|
|
QHash<ConductorTextItem *, bool> m_cond_texts;
|
|
qreal m_rotation=0;
|
|
QParallelAnimationGroup *m_anim_group = nullptr;
|
|
};
|
|
|
|
#endif // ROTATETEXTSCOMMAND_H
|