mirror of
https://github.com/qelectrotech/qelectrotech-source-mirror.git
synced 2026-09-29 05:44:14 +02:00
fa213d90d9
Split from #913's second suggestion. There was no shortcut for the common "duplicate with offset" convention; the nearest existing feature, "Collage multiple", is a different workflow (a dialog for repeating a paste in a grid pattern, not a one-shot duplicate). Ctrl+D copies the selection and places it immediately, offset by a configured spacing and direction -- no interactive follow-the-cursor step, unlike Ctrl+V. The first press (or after the setting is explicitly reopened) shows DuplicateOffsetDialog: spacing in grid steps, direction up/down/left/right. Every later press reuses whatever was confirmed then, silently, so a row of copies is one key held down and tapped, not a dialog every time -- unattended, repeatable stamping is the actual point of a duplicate shortcut, which a dialog or an interactive placement step on every press would defeat. A separate "Configurer la duplication..." entry reopens the dialog on demand to change the setting later. Cancel leaves the diagram untouched -- verified, not assumed: qet_diff against the saved file shows 0 added. Chaining ("keep tapping to lay out a row") needs no special handling: QET already reselects whatever a paste just added (PasteDiagramCommand::redo()), so the next Ctrl+D naturally continues from the copy just placed rather than the original. The offset is applied by hand rather than by asking paste()/fromXml() to place the copy at a target position. Both of those feed the position through Diagram::snapToGrid(), which reads QApplication::keyboardModifiers() and rounds to the nearest PIXEL instead of the grid whenever Ctrl is held -- and Ctrl is always held here, this action's own shortcut being Ctrl+D. Measured before settling on this: routing the offset through paste() first produced copies off-grid on both axes, by an amount that tracked the selection's own bounding-box geometry rather than being a fixed error -- caught by qet-mcp's qet_elements against the saved file, not by eye. fromXml() is instead called with no position argument at all (leaves every item at its source coordinates, landing the copy on top of the originals -- (0,0) is not a position, this is "keep the source coordinates"), and the offset is added directly with setPos(). A plain addition cannot be off by a rounding rule that never runs. Conductors are not in the hand-translated set: fromXml() itself does not reposition them either -- they load after elements are already in their final place and take their geometry from their terminals, which have already moved with the elements that own them. Verified this holds: drew a conductor by hand between two elements (drag, not click-click), selected both, Ctrl+D, and the new conductor correctly joins the two new elements via qet_conductors -- not the originals, not a mix. Verified end-to-end on a built binary via qet-mcp, not by eye: before L2 (303,207) L9 (512,196) -- deliberately off-grid spacing=2, down (303,227) (512,216) -- +0,+20 exactly same again, 2nd (303,247) (512,236) -- +0,+20 again, chained Both elements land exactly the configured offset from their immediate source regardless of the selection's own alignment. Qt 6.10.2, ctest 11/11. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
281 lines
11 KiB
C++
281 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/>.
|
|
*/
|
|
#ifndef QET_DIAGRAM_EDITOR_H
|
|
#define QET_DIAGRAM_EDITOR_H
|
|
|
|
#include "SearchAndReplace/ui/searchandreplacewidget.h"
|
|
#include "qetmainwindow.h"
|
|
|
|
#include <QActionGroup>
|
|
#include <QCloseEvent>
|
|
#include <QDir>
|
|
#include <QMdiArea>
|
|
#include <QSignalMapper>
|
|
#include <QUndoGroup>
|
|
|
|
class QMdiSubWindow;
|
|
class QETProject;
|
|
class QETResult;
|
|
class ProjectView;
|
|
class ConductorColorToolButton;
|
|
class CustomElement;
|
|
class DiagramBgColorToolButton;
|
|
class Diagram;
|
|
class DiagramView;
|
|
class Element;
|
|
class ElementsPanelWidget;
|
|
class ElementsLocation;
|
|
class RecentFiles;
|
|
class DiagramPropertiesEditorDockWidget;
|
|
class ElementsCollectionWidget;
|
|
class AutoNumberingDockWidget;
|
|
class TerminalNumberingDialog;
|
|
|
|
class KAutoSaveFile;
|
|
/**
|
|
This class represents the main window of the QElectroTech diagram editor and,
|
|
ipso facto, the most important part of the QElectroTech user interface.
|
|
*/
|
|
class QETDiagramEditor : public QETMainWindow
|
|
{
|
|
Q_OBJECT
|
|
|
|
friend class TerminalStripEditorWindow;
|
|
|
|
public:
|
|
QETDiagramEditor(
|
|
const QStringList & = QStringList(),
|
|
QWidget * = nullptr);
|
|
~QETDiagramEditor() override;
|
|
void closeEvent (QCloseEvent *) override;
|
|
QList<ProjectView *> openedProjects () const;
|
|
void addProjectView (ProjectView *);
|
|
bool openAndAddProject (const QString &, bool = true);
|
|
QList<QString> editedFiles () const;
|
|
ProjectView *viewForFile (const QString &) const;
|
|
ProjectView *currentProjectView() const;
|
|
QETProject *currentProject() const;
|
|
bool drawGrid() const;
|
|
void openBackupFiles (QList<KAutoSaveFile *> backup_files);
|
|
|
|
protected:
|
|
bool event(QEvent *) override;
|
|
private:
|
|
// Declared first so it is initialised before any member whose
|
|
// constructor may dispatch a Qt event calling event() (e.g. the
|
|
// QActionGroup members below trigger QObject::setParent events).
|
|
bool m_first_show = true;
|
|
|
|
QETDiagramEditor(const QETDiagramEditor &);
|
|
void setUpElementsPanel ();
|
|
void setUpElementsCollectionWidget();
|
|
void setUpUndoStack ();
|
|
void setUpSelectionPropertiesEditor();
|
|
void setUpAutonumberingWidget();
|
|
void setUpActions ();
|
|
void setUpToolBar ();
|
|
void setUpMenu ();
|
|
|
|
bool addProject(QETProject *, bool = true);
|
|
DiagramView *currentDiagramView() const;
|
|
Element *currentElement() const;
|
|
ProjectView *findProject(DiagramView *) const;
|
|
ProjectView *findProject(Diagram *) const;
|
|
ProjectView *findProject(QETProject *) const;
|
|
ProjectView *findProject(const QString &) const;
|
|
QMdiSubWindow *subWindowForWidget(QWidget *) const;
|
|
void updateUsageTrackersActiveState();
|
|
void updateWindowModifiedState();
|
|
|
|
signals:
|
|
void syncElementsPanel();
|
|
|
|
public slots:
|
|
void save();
|
|
void saveAs();
|
|
bool newProject();
|
|
bool openProject();
|
|
bool openRecentFile(const QString &);
|
|
bool closeProject(ProjectView *);
|
|
bool closeProject(QETProject *);
|
|
void zoomGroupTriggered (QAction *action);
|
|
void selectGroupTriggered (QAction *action);
|
|
void addItemGroupTriggered (QAction *action);
|
|
void selectionGroupTriggered (QAction *action);
|
|
void rowColumnGroupTriggered (QAction *action);
|
|
void slot_updateActions();
|
|
void slot_updateUndoStack();
|
|
void slot_updateModeActions();
|
|
void slot_updateComplexActions();
|
|
void slot_updatePasteAction();
|
|
void slot_updateWindowsMenu();
|
|
void slot_updateAutoNumDock();
|
|
void generateTerminalBlock();
|
|
void setWindowedMode();
|
|
void setTabbedMode();
|
|
void readSettings();
|
|
void readSettingsState();
|
|
void writeSettings();
|
|
void activateProject(QETProject *);
|
|
void activateProject(ProjectView *);
|
|
void activateWidget(QWidget *);
|
|
void projectWasClosed(ProjectView *);
|
|
void editProjectProperties(ProjectView *);
|
|
void editProjectProperties(QETProject *);
|
|
void slot_terminalNumbering();
|
|
void slot_reloadElementDrawings();
|
|
#ifdef QET_HAS_SCRIPTING
|
|
void slot_runScript();
|
|
#endif
|
|
void editDiagramProperties(DiagramView *);
|
|
void editDiagramProperties(Diagram *);
|
|
void addDiagramToProject(QETProject *);
|
|
void addDiagramToProjectAt(QETProject *, int);
|
|
void removeDiagram(Diagram *);
|
|
void removeDiagrams(const QList<Diagram *> &diagrams);
|
|
void removeDiagramFromProject();
|
|
void moveDiagramUp(const QList<Diagram *> &diagrams);
|
|
void moveDiagramDown(const QList<Diagram *> &diagrams);
|
|
void moveDiagramUpTop(const QList<Diagram *> &diagrams);
|
|
void moveDiagramUpx10(const QList<Diagram *> &diagrams);
|
|
void moveDiagramDownx10(const QList<Diagram *> &diagrams);
|
|
void moveDiagramUpx100(const QList<Diagram *> &diagrams);
|
|
void moveDiagramDownx100(const QList<Diagram *> &diagrams);
|
|
void reloadOldElementPanel();
|
|
void diagramWasAdded(DiagramView *);
|
|
void findElementInPanel(const ElementsLocation &);
|
|
void showError(const QETResult &);
|
|
void showError(const QString &);
|
|
void subWindowActivated(QMdiSubWindow *subWindows);
|
|
|
|
private slots:
|
|
void selectionChanged();
|
|
|
|
public:
|
|
QAction
|
|
*m_edit_diagram_properties, ///< Show a dialog to edit diagram properties
|
|
*m_conductor_reset, ///< Reset paths of selected conductors
|
|
*m_cut, ///< Cut selection to clipboard
|
|
*m_copy; ///< Copy selection to clipboard
|
|
|
|
QActionGroup
|
|
m_row_column_actions_group, /// Action related to add/remove rows/column in diagram
|
|
m_selection_actions_group, ///Action related to edit a selected item
|
|
*m_depth_action_group = nullptr;
|
|
|
|
private:
|
|
QActionGroup
|
|
*grp_visu_sel, ///< Action group for visualisation vs edition mode
|
|
*m_group_view_mode, ///< Action group for project
|
|
m_add_item_actions_group, ///Action related to adding (add text image shape...)
|
|
m_zoom_actions_group, ///Action related to zoom for diagram
|
|
m_select_actions_group, ///Action related to global selections
|
|
m_file_actions_group; ///Actions related to file (open, close, save...)
|
|
|
|
QAction
|
|
*m_tabbed_view_mode, ///< Display projects as tabs
|
|
*m_windowed_view_mode, ///< Display projects as windows
|
|
*m_mode_selection, ///< Set edition mode
|
|
*m_mode_visualise, ///< Set visualisation mode
|
|
*m_export_to_images, ///< Export diagrams of the current project as imagess
|
|
*m_export_to_pdf = nullptr, ///< Export project to pdf.
|
|
*m_print, ///< Print diagrams of the current project
|
|
*m_quit_editor, ///< Quit the diagram editor
|
|
*undo, ///< Cancel the latest action
|
|
*redo, ///< Redo the latest cancelled operation
|
|
*m_paste, ///< Paste clipboard content on the current diagram
|
|
*m_duplicate, ///< Copy selection, offset by the configured step (#991)
|
|
*m_configure_duplicate, ///< Reopen the duplicate offset/direction dialog (#991)
|
|
*m_auto_conductor, ///< Enable/Disable the use of auto conductor
|
|
*m_auto_break_conductor, ///< Enable/Disable the use of auto break conductor
|
|
*m_draw_grid, ///< Switch the background grid display or not
|
|
*m_draw_guides = nullptr, ///< Switch the custom guides display or not
|
|
*m_project_edit_properties, ///< Edit the properties of the current project.
|
|
*m_project_add_diagram, ///< Add a diagram to the current project.
|
|
*m_remove_diagram_from_project, ///< Delete a diagram from the current project
|
|
*m_clean_project, ///< Clean the content of the current project by removing useless items
|
|
*m_csv_export, ///< generate nomenclature
|
|
*m_add_nomenclature, ///< Add nomenclature graphics item;
|
|
*m_add_summary, ///<Add summary graphics item
|
|
*m_terminal_strip_dialog = nullptr, ///<Launch terminal strip dialog
|
|
*m_project_terminalBloc, ///< generate terminal block
|
|
*m_project_export_conductor_num,///<Export the wire num to csv
|
|
*m_project_export_wiring_list, ///< Action to export the wiring list
|
|
*m_project_wiring_list_view, ///< Action to show the wiring list read from the project database
|
|
*m_terminal_numbering, ///< Action to launch terminal numbering
|
|
*m_reload_element_drawings, ///< Action to redraw every placed element from its current definition
|
|
#ifdef QET_HAS_SCRIPTING
|
|
*m_run_script, ///< Action to run a JavaScript macro against the current project
|
|
#endif
|
|
*m_export_project_db, ///Export to file the internal database of the current project
|
|
*m_tile_window, ///< Show MDI subwindows as tile
|
|
*m_cascade_window, ///< Show MDI subwindows as cascade
|
|
*m_previous_window, ///< Switch to the previous document
|
|
*m_next_window, ///< Switch to the next document
|
|
*m_edit_selection, ///< To edit selected item
|
|
*m_delete_selection, ///< Delete selection
|
|
*m_rotate_selection, ///< Rotate selected elements and text items by 90 degrees
|
|
*m_rotate_group_selection = nullptr, ///< Rotate the selection as a whole around its shared center, instead of each item in place
|
|
*m_rotate_texts, ///< Direct selected text items to a specific angle
|
|
*m_find_element, ///< Find the selected element in the panel
|
|
*m_group_selected_texts = nullptr,
|
|
*m_close_file, ///< Close current project file
|
|
*m_save_file, ///< Save current project
|
|
*m_save_file_as, ///< Save current project as a specific file
|
|
*m_find = nullptr,
|
|
*m_jump_to_element = nullptr; ///< Open the "jump to element" quick-open popup
|
|
|
|
///< One-click conductor colour, in the "Schéma" toolbar
|
|
ConductorColorToolButton *m_conductor_color_button = nullptr;
|
|
///< Diagram background color picker, in the "Affichage" toolbar
|
|
DiagramBgColorToolButton *m_background_color_button = nullptr;
|
|
|
|
QList <QAction *> m_zoom_action_toolBar; ///Only zoom action must displayed in the toolbar
|
|
|
|
void removeDiagramSilent(Diagram *diagram);
|
|
|
|
QMdiArea m_workspace;
|
|
QSignalMapper windowMapper;
|
|
QDir open_dialog_dir; /// Directory to use for file dialogs such as File > save
|
|
|
|
QDockWidget
|
|
*qdw_pa, /// Dock for the elements panel
|
|
*m_qdw_elmt_collection,
|
|
*qdw_undo; /// Dock for the undo list
|
|
|
|
ElementsCollectionWidget *m_element_collection_widget;
|
|
|
|
DiagramPropertiesEditorDockWidget *m_selection_properties_editor;
|
|
/// Elements panel
|
|
ElementsPanelWidget *pa;
|
|
QMenu *windows_menu;
|
|
|
|
QToolBar
|
|
*main_tool_bar = nullptr,
|
|
*view_tool_bar = nullptr,
|
|
*diagram_tool_bar = nullptr,
|
|
*m_add_item_tool_bar = nullptr,
|
|
*m_depth_tool_bar = nullptr;
|
|
|
|
QUndoGroup undo_group;
|
|
AutoNumberingDockWidget *m_autonumbering_dock;
|
|
int activeSubWindowIndex;
|
|
SearchAndReplaceWidget m_search_and_replace_widget;
|
|
};
|
|
#endif
|