mirror of
https://github.com/qelectrotech/qelectrotech-source-mirror.git
synced 2026-08-06 21:34:13 +02:00
68c260342e
Adds a configurable wrap-at-N counter type to the autonumbering engine (NumerotationContext + NumerotationContextCommands), covering PLC/rack-style addressing conventions like "e0.0...e0.7, e1.0...e1.7" (8 channels per card) generally, rather than hardcoding octal specifically. - New "wrap" part type (WrapNum, alongside the existing UnitNum/TenNum/ HundredNum strategies) stores a modulus in addition to the existing value/increase/initialvalue fields. Its own next()/previous() only wraps its own value modulo the configured modulus -- carrying into (or borrowing from) the adjacent part requires visibility across parts, which only the composition loop has. - NumerotationContextCommands::next()/previous() gained carry()/borrow() helpers: when a wrap part's own next() would reach/exceed its modulus (or go below 0 on previous()), the nearest preceding numeric part is bumped by exactly one unit, skipping non-numeric parts (e.g. a "." string separator). Wrap parts chain correctly if adjacent (e.g. seconds wrapping into minutes wrapping into hours). - For the leading part of a wrap-and-carry pair to stay fixed except when carried into (i.e. actually produce "e0.0...e0.7, e1.0..." rather than advancing on every step under its own strategy), its own increase must be 0. The increase spinbox's minimum was 1, which made this configuration impossible through the UI -- lowered to 0 and documented with a tooltip, since this wasn't obvious from the UI alone. - NumerotationContext gained a 5th pipe-separated field (modulus) in its serialized string form, defaulting to 0 (non-wrapping) for every existing part type; toXml()/fromXml() persist it as a "modulus" XML attribute the same way "initialvalue" is already persisted for unitfolio/tenfolio/hundredfolio. - New "Cyclique (modulo)" entry in the part-type dropdown (numparteditorw), available for element, conductor, and folio autonumbering alike, since all three already go through NumerotationContextCommands. Verified in the running app via the numbering config dialog's own Suivant/Précédent buttons (which call the production NumerotationContextCommands::next()/previous() directly): a two-part context (unit, increase=0 + wrap mod 8) produced exactly e0.0→...→e0.7→e1.0→...→e1.7 on repeated "next", and the exact reverse (with correct borrowing) on repeated "previous".
211 lines
5.5 KiB
C++
211 lines
5.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/>.
|
|
*/
|
|
#include "numerotationcontext.h"
|
|
|
|
#include "../qet.h"
|
|
|
|
#include <QRegularExpression>
|
|
#include <utility>
|
|
|
|
/**
|
|
Constructor
|
|
*/
|
|
NumerotationContext::NumerotationContext()
|
|
{
|
|
}
|
|
|
|
/**
|
|
Constructor from xml
|
|
*/
|
|
NumerotationContext::NumerotationContext(QDomElement &e) {
|
|
fromXml(e);
|
|
}
|
|
|
|
/**
|
|
@brief NumerotationContext::clear, clear the content
|
|
*/
|
|
void NumerotationContext::clear ()
|
|
{
|
|
content_.clear();
|
|
}
|
|
|
|
/**
|
|
@brief NumerotationContext::addValue
|
|
add a new value on the contexte
|
|
@param type the type of value
|
|
@param value the value itself
|
|
@param increase the increase number of value
|
|
@param initialvalue
|
|
@param modulus wrap-and-carry modulus (0 means "not a wrapping part")
|
|
@return true if value is append
|
|
*/
|
|
bool NumerotationContext::addValue(const QString &type,
|
|
const QVariant &value,
|
|
const int increase,
|
|
const int initialvalue,
|
|
const int modulus) {
|
|
if (!keyIsAcceptable(type) && !value.canConvert<QString>())
|
|
return false;
|
|
if (keyIsNumber(type) && !value.canConvert<int>())
|
|
return false;
|
|
|
|
QString valuestr = value.toString();
|
|
valuestr.remove("|");
|
|
content_ << type
|
|
+ "|"
|
|
+ valuestr
|
|
+ "|"
|
|
+ QString::number(increase)
|
|
+ "|"
|
|
+ QString::number(initialvalue)
|
|
+ "|"
|
|
+ QString::number(modulus);
|
|
return true;
|
|
}
|
|
|
|
/**
|
|
@brief NumerotationContext::operator []
|
|
@param i
|
|
@return the string at position i
|
|
*/
|
|
QString NumerotationContext::operator [] (const int &i) const
|
|
{
|
|
return (content_.at(i));
|
|
}
|
|
|
|
/**
|
|
@brief NumerotationContext::operator << , append other
|
|
*/
|
|
void NumerotationContext::operator << (const NumerotationContext &other) {
|
|
for (int i=0; i<other.size(); ++i) content_.append(other[i]);
|
|
}
|
|
|
|
/**
|
|
@brief NumerotationContext::size
|
|
@return size of context
|
|
*/
|
|
int NumerotationContext::size() const
|
|
{
|
|
return (content_.size());
|
|
}
|
|
|
|
/**
|
|
@brief NumerotationContext::isEmpty
|
|
@return true if numerotation content is empty
|
|
*/
|
|
bool NumerotationContext::isEmpty() const
|
|
{
|
|
if (content_.size() > 0) return false;
|
|
return true;
|
|
}
|
|
/**
|
|
@brief NumerotationContext::itemAt
|
|
@param i
|
|
@return the content at position i 1:type 2:value 3:increase
|
|
*/
|
|
QStringList NumerotationContext::itemAt(const int i) const
|
|
{
|
|
return (content_.at(i).split("|"));
|
|
}
|
|
|
|
/**
|
|
@brief validRegExpNum
|
|
@return all type use to numerotation
|
|
*/
|
|
QString NumerotationContext::validRegExpNum () const
|
|
{
|
|
return ("unit|unitfolio|ten|tenfolio|hundred|hundredfolio|wrap|string|idfolio|folio|plant|locmach|elementline|elementcolumn|elementprefix");
|
|
}
|
|
|
|
/**
|
|
@brief NumerotationContext::validRegExpNumber
|
|
@return all type represents a number
|
|
*/
|
|
QString NumerotationContext::validRegExpNumber() const
|
|
{
|
|
return ("unit|unitfolio|ten|tenfolio|hundred|hundredfolio|wrap");
|
|
}
|
|
|
|
/**
|
|
@brief NumerotationContext::keyIsAcceptable
|
|
@return true if type is acceptable
|
|
*/
|
|
bool NumerotationContext::keyIsAcceptable(const QString &type) const
|
|
{
|
|
return (type.contains(QRegularExpression(validRegExpNum())));
|
|
}
|
|
|
|
/**
|
|
@brief NumerotationContext::keyIsNumber
|
|
@return true if type represents a number
|
|
*/
|
|
bool NumerotationContext::keyIsNumber(const QString &type) const
|
|
{
|
|
return (type.contains(QRegularExpression(validRegExpNumber())));
|
|
}
|
|
|
|
/**
|
|
@brief NumerotationContext::toXml
|
|
Save the numerotation context in a QDomElement under the element name str
|
|
*/
|
|
QDomElement NumerotationContext::toXml(QDomDocument &d, const QString& str) {
|
|
QDomElement num_auto = d.createElement(str);
|
|
for (int i=0; i<content_.size(); ++i) {
|
|
QStringList strl = itemAt(i);
|
|
QDomElement part = d.createElement("part");
|
|
part.setAttribute("type", strl.at(0));
|
|
part.setAttribute("value", strl.at(1));
|
|
part.setAttribute("increase", strl.at(2));
|
|
if (strl.at(0) == ("unitfolio") ||
|
|
strl.at(0) == ("tenfolio") ||
|
|
strl.at(0) == ("hundredfolio")) {
|
|
part.setAttribute("initialvalue", strl.at(3));
|
|
}
|
|
if (strl.at(0) == ("wrap") && strl.size() > 4) {
|
|
part.setAttribute("modulus", strl.at(4));
|
|
}
|
|
num_auto.appendChild(part);
|
|
}
|
|
return num_auto;
|
|
}
|
|
|
|
/**
|
|
@brief NumerotationContext::fromXml
|
|
load numerotation context from e
|
|
*/
|
|
void NumerotationContext::fromXml(QDomElement &e) {
|
|
clear();
|
|
foreach(QDomElement qde, QET::findInDomElement(e, "part")) addValue(qde.attribute("type"), qde.attribute("value"), qde.attribute("increase").toInt(), qde.attribute("initialvalue").toInt(), qde.attribute("modulus").toInt());
|
|
}
|
|
|
|
/**
|
|
@brief NumerotationContext::replaceValue
|
|
This class replaces the current NC field value with content
|
|
@param index of NC Item
|
|
@param content to replace current value
|
|
*/
|
|
void NumerotationContext::replaceValue(int index, QString content) {
|
|
QStringList strl = content_[index].split("|");
|
|
QString type = strl.at(0);
|
|
const QString& value = std::move(content);
|
|
QString increase = strl.at(2);
|
|
QString initvalue = strl.at(3);
|
|
QString modulus = strl.size() > 4 ? strl.at(4) : QStringLiteral("0");
|
|
content_[index] = type + "|" + value + "|" + increase + "|" + initvalue + "|" + modulus;
|
|
}
|