mirror of
https://github.com/qelectrotech/qelectrotech-source-mirror.git
synced 2026-08-03 18:44:13 +02:00
ispyisail
52c8ef6b49
Follows @scorpio810's review on PR #626 and three defects found by finally running the thing rather than only building it. Replace the "?" button with an editable value field, as asked for. It shows the current value of the context's counter -- the last part that actually progresses, i.e. the least significant digit -- and typing a new value and committing it writes that value back. This is strictly more useful than the button it replaces: "?" is still reachable by typing it, and any other value is now reachable too, which was the point of the request. It also removes a destructive edge the button had: "reset to ?" rewrote *every* part, so a scheme built as "K" + counter became "?????" and the configured prefix was gone for good. There is no undo command for numbering contexts. Two bugs fixed in the reset path itself: - The project was never marked modified. addConductorAutoNum() and friends are a plain insert into a QMap; they emit nothing and set no dirty flag, and the properties dialog that this code was modelled on calls setModified(true) separately afterwards. Without it the user resets a counter, closes the project, is not asked to save, and the reset is lost. Verified before the fix: projectWasModified() stayed false across a click. - A wrap part was reset to "1". A modulo part cycles over [0, modulus) -- the PLC addressing that motivated the feature runs %IX0.0..%IX0.31 -- so its starting value is 0, not 1. An empty value field is treated as "no change" rather than as an empty value, so clearing the box by accident cannot wipe a counter, and the field is refreshed from the context after every write and whenever the selected context changes.
102 lines
3.1 KiB
C++
102 lines
3.1 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 AUTONUMBERINGDOCKWIDGET_H
|
|
#define AUTONUMBERINGDOCKWIDGET_H
|
|
|
|
#include "../../projectview.h"
|
|
#include "../../qetproject.h"
|
|
|
|
#include <QDockWidget>
|
|
|
|
class QComboBox;
|
|
class QLineEdit;
|
|
|
|
namespace Ui {
|
|
class AutoNumberingDockWidget;
|
|
}
|
|
|
|
class AutoNumberingDockWidget : public QDockWidget
|
|
{
|
|
Q_OBJECT
|
|
|
|
public:
|
|
explicit AutoNumberingDockWidget(QWidget *parent = nullptr);
|
|
~AutoNumberingDockWidget() override;
|
|
|
|
void setContext();
|
|
void setProject(QETProject*, ProjectView*);
|
|
|
|
public slots:
|
|
void setActive();
|
|
void setConductorActive(DiagramView*);
|
|
|
|
private slots:
|
|
void on_m_conductor_cb_activated(int);
|
|
void on_m_element_cb_activated(int);
|
|
void on_m_folio_cb_activated(int);
|
|
void conductorAutoNumChanged();
|
|
void elementAutoNumChanged();
|
|
void folioAutoNumChanged();
|
|
void clear();
|
|
void projectClosed();
|
|
|
|
void on_m_configure_pb_clicked();
|
|
|
|
void on_m_conductor_reset_start_pb_clicked();
|
|
void on_m_element_reset_start_pb_clicked();
|
|
void on_m_folio_reset_start_pb_clicked();
|
|
|
|
void on_m_conductor_value_le_editingFinished();
|
|
void on_m_element_value_le_editingFinished();
|
|
void on_m_folio_value_le_editingFinished();
|
|
|
|
signals:
|
|
void folioAutoNumChanged(QString);
|
|
|
|
private:
|
|
enum class AutoNumCategory { Conductor, Element, Folio };
|
|
|
|
/**
|
|
@brief resetAutoNum
|
|
Reset the numerotation context currently selected in combo_box
|
|
(for the given category) to a per-type starting value. Does
|
|
nothing if no context is selected.
|
|
*/
|
|
void resetAutoNum(QComboBox *combo_box, AutoNumCategory category);
|
|
|
|
/// Read/write the numerotation context named in combo_box.
|
|
NumerotationContext contextFor(QComboBox *combo_box, AutoNumCategory category) const;
|
|
void storeContext(QComboBox *combo_box, AutoNumCategory category, const NumerotationContext &context);
|
|
|
|
/// Index of the counter the value field shows and edits: the last
|
|
/// part that actually progresses. Returns -1 when the context has
|
|
/// no such part (e.g. it is only fixed text).
|
|
static int counterIndex(const NumerotationContext &context);
|
|
|
|
/// Refresh a value field from its context, and apply a typed value.
|
|
void refreshValueField(QComboBox *combo_box, QLineEdit *line_edit, AutoNumCategory category);
|
|
void applyValueField(QComboBox *combo_box, QLineEdit *line_edit, AutoNumCategory category);
|
|
|
|
Ui::AutoNumberingDockWidget *ui;
|
|
QETProject* m_project = nullptr;
|
|
ProjectView* m_project_view = nullptr;
|
|
|
|
};
|
|
|
|
#endif // AUTONUMBERINGDOCKWIDGET_H
|