mirror of
https://github.com/qelectrotech/qelectrotech-source-mirror.git
synced 2026-08-03 18:44:13 +02:00
ispyisail
f7a79e75af
Adds a real base-26 incrementing part type to the autonumbering engine, alongside the 14 existing NumStrategy leaves. Unlike StringNum (a fixed, non-incrementing text segment), AlphaNum::next()/previous() carry/borrow entirely within the part's own value -- the composition loop in NumerotationContextCommands doesn't need to change, since (unlike #578's wrap-and-carry) nothing here needs to signal an adjacent part. - incrementAlpha()/decrementAlpha() implement the spreadsheet-column-name algorithm: increment carries right-to-left on 'z'/'Z' overflow, prepending a new leading letter if the whole value overflows (z -> aa, az -> ba). decrement is the exact inverse, including the symmetric shrink case (aa -> z) once every position has borrowed. A single letter already at "a"/"A" has no representable predecessor and is clamped rather than turned into "z" -- caught via manual testing, since the initial implementation mutated the string in the borrow loop before checking whether to clamp, silently discarding the original value. - Registered in NumerotationContext::validRegExpNum() but deliberately not in validRegExpNumber(), so addValue() doesn't force alphabetic values through int conversion. - New "Cyclique"-adjacent "Alphabétique" entry in numparteditorw's type dropdown, with its own letters-only QRegularExpressionValidator; the increase spinbox is disabled since the step is always exactly one letter, not a configurable amount. Also wires the new part type through to actual element/conductor labels, which turned out to be required for the feature to do anything visible beyond folio numbering (which applies a NumerotationContext's represented string directly). Element and conductor numbering instead go through a separate formula-substitution layer (autonum::sequentialNumbers + %sequ_/%seqt_/%seqh_-style placeholders in AssignVariables::assignSequence()) that numerotationContextToFormula() auto-populates. Without a matching placeholder, an "alpha" part would silently vanish from the generated formula and never reach the label, even though the underlying counter was advancing correctly: - sequentialNumbers gained an `alpha` QStringList member (copy ctor, operator=, operator==, toXml/fromXml, clear()). - numerotationContextToFormula() emits a new %seqa_N placeholder for alpha parts, the same way %sequ_N is emitted for unit parts. - setSequential()/setSequentialToList() populate seqStruct.alpha, passing the raw string through as-is rather than the .toInt()-based formatting used for the numeric part types. - AssignVariables::assignSequence() substitutes %seqa_N from seqStruct.alpha, mirroring the existing %sequ_N/%seqt_N/%seqh_N substitutions. No "alphafolio" variant was added, matching the discussion's scope (only unit/ten/hundred have folio-anchored variants). Verified against production code via the numbering config dialog's own Suivant/Précédent buttons: from "a", 25 clicks reached "z"; one more produced "aa"; 25 more reached "az"; one more produced "ba" (carry). Reversed: "ba"->"az"->(25 clicks)->"aa"->"z" (shrink)->(25 clicks)->"a". One more "previous" at "a" correctly stayed at "a" after the clamp fix. Also confirmed the Formule field auto-updates to "%seqa_1" the instant the type is switched to "Alphabétique", confirming the formula-generation wiring works live in the UI, not just at the engine level.
85 lines
2.1 KiB
C++
85 lines
2.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 NUMPARTEDITORW_H
|
|
#define NUMPARTEDITORW_H
|
|
|
|
#include "../numerotationcontext.h"
|
|
|
|
#include <QValidator>
|
|
#include <QWidget>
|
|
|
|
namespace Ui {
|
|
class NumPartEditorW;
|
|
}
|
|
|
|
/**
|
|
@brief The NumPartEditorW class
|
|
This class represent a single part num widget.
|
|
By this widget, we can define and edit how the num auto must work.
|
|
This widget is called by selectautonumw.
|
|
*/
|
|
class NumPartEditorW : public QWidget
|
|
{
|
|
Q_OBJECT
|
|
|
|
//METHODS
|
|
public:
|
|
explicit NumPartEditorW(int type, QWidget *parent = nullptr);
|
|
NumPartEditorW (NumerotationContext &,
|
|
int,
|
|
int type,
|
|
QWidget *parent=nullptr);
|
|
~NumPartEditorW() override;
|
|
|
|
enum type {unit,unitfolio,ten,tenfolio, hundred, hundredfolio,
|
|
alpha,
|
|
string,idfolio,folio,plant,locmach,
|
|
elementline,elementcolumn,elementprefix,
|
|
wrap,
|
|
};
|
|
NumerotationContext toNumContext();
|
|
bool isValid ();
|
|
type type_;
|
|
|
|
private:
|
|
void setVisibleItems();
|
|
void disableItem(int index);
|
|
void setCurrentIndex(NumPartEditorW::type);
|
|
|
|
private slots:
|
|
void on_type_cb_activated(int);
|
|
void on_value_field_textEdited();
|
|
void on_increase_spinBox_valueChanged(int);
|
|
void on_modulus_spinBox_valueChanged(int);
|
|
void setType (NumPartEditorW::type t, bool=false);
|
|
|
|
signals:
|
|
void changed ();
|
|
|
|
private:
|
|
Ui::NumPartEditorW *ui;
|
|
QValidator *intValidator;
|
|
QValidator *alphaValidator;
|
|
int m_edited_type = -1; ///<0 == element : 1 == conductor : 2 == folio
|
|
|
|
|
|
|
|
};
|
|
|
|
#endif // NUMPARTEDITORW_H
|