mirror of
https://github.com/qelectrotech/qelectrotech-source-mirror.git
synced 2026-08-03 10:34:14 +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.
94 lines
3.1 KiB
C++
94 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 ASSIGNVARIABLES_H
|
|
#define ASSIGNVARIABLES_H
|
|
#include "../diagramcontext.h"
|
|
#include "numerotationcontext.h"
|
|
|
|
#include <QPointF>
|
|
#include <QString>
|
|
#include <QStringList>
|
|
|
|
class Conductor;
|
|
class Diagram;
|
|
class Element;
|
|
class ElementsLocation;
|
|
|
|
namespace autonum
|
|
{
|
|
class sequentialNumbers
|
|
{
|
|
public:
|
|
sequentialNumbers();
|
|
sequentialNumbers(const sequentialNumbers &other);
|
|
~sequentialNumbers();
|
|
|
|
sequentialNumbers &operator= (const sequentialNumbers &other);
|
|
bool operator== (const sequentialNumbers &other) const;
|
|
bool operator!= (const sequentialNumbers &other) const;
|
|
|
|
QDomElement toXml(QDomDocument &document, const QString& tag_name = QString("sequentialNumbers")) const;
|
|
void fromXml(const QDomElement &element);
|
|
void clear();
|
|
|
|
QStringList unit;
|
|
QStringList unit_folio;
|
|
QStringList ten;
|
|
QStringList ten_folio;
|
|
QStringList hundred;
|
|
QStringList hundred_folio;
|
|
QStringList alpha;
|
|
};
|
|
|
|
/**
|
|
@brief The AssignVariables class
|
|
This class assign variable of a formula string.
|
|
Return the final string used to be displayed from a formula string.
|
|
*/
|
|
class AssignVariables
|
|
{
|
|
public:
|
|
static QString formulaToLabel (QString formula, sequentialNumbers &seqStruct, Diagram *diagram, const Element *elmt = nullptr, const Conductor *cndr = nullptr);
|
|
static QString replaceVariable (const QString &formula, const DiagramContext &dc);
|
|
static QString genericXref (const Element *element);
|
|
|
|
private:
|
|
AssignVariables(const QString& formula, const sequentialNumbers& seqStruct , Diagram *diagram, const Element *elmt = nullptr, const Conductor *cndr = nullptr);
|
|
void assignTitleBlockVar();
|
|
void assignProjectVar();
|
|
void assignSequence();
|
|
|
|
Diagram *m_diagram = nullptr;
|
|
QString m_arg_formula;
|
|
QString m_assigned_label;
|
|
sequentialNumbers m_seq_struct;
|
|
const Element *m_element = nullptr;
|
|
const Conductor *m_conductor = nullptr;
|
|
};
|
|
|
|
void setSequentialToList(QStringList &list, NumerotationContext &nc, const QString& type);
|
|
void setFolioSequentialToHash(QStringList &list, QHash<QString, QStringList> &hash, const QString& autoNumName);
|
|
void setSequential(const QString& label, autonum::sequentialNumbers &seqStruct, NumerotationContext &context, Diagram *diagram, const QString& hashKey);
|
|
QString numerotationContextToFormula(const NumerotationContext &nc);
|
|
QString elementPrefixForLocation(const ElementsLocation &location);
|
|
}
|
|
|
|
Q_DECLARE_METATYPE(autonum::sequentialNumbers)
|
|
|
|
#endif // ASSIGNVARIABLES_H
|