kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2026-10-22 14:24:13 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Keep the project's numbering in the project database too

Browse Source 
QETZ-DB-FIRST stage 2b-1. The numbering schemes of wires, symbols,
folios and cables, and the settings saved with them (the scheme in use
of each kind, freezing new labels, auto-break, the cable axis and
question), get three tables of the project database: numbering_scheme,
numbering_part (one row per part, in order) and numbering_setting.
QETProject writes them when it reads its file and after each change of
its numbering, from every setter; nothing reads them yet.

The save writes the numbering through writeNumberingXml(), the code it
had moved out of writeDefaultPropertiesXml(), so the same writer can
take the rows once the save moves to them (2b-2).
QET_CHECK_NUMBERING_ROWS=1 writes the numbering from the project and
from the rows at each save and says whether the two differ.
tst_elementautonumids::numberingRowsFollowEveryChange checks it after
each of 23 changes; with one setter not writing the rows, one save
differs and it fails.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
ispyisail
2026-10-19 21:33:49 +13:00
parent 992058348b
commit d05cc654ad
5 changed files with 376 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sources/dataBase/projectdatabase.cpp
+133
View File
@@ -2695,6 +2695,25 @@ bool projectDataBase::createDataBase()
qDebug() << " link_table query : " << query_.lastError();
}
//The numbering tables (QETZ-DB-FIRST stage 2b): the project's
//schemes, one row per part of each in its order, and the settings
//saved with them. Not filled from the folios: QETProject writes
//them when it reads its file and whenever its numbering changes.
for (const char *table : {
"CREATE TABLE numbering_scheme ("
"kind VARCHAR(20) NOT NULL, title TEXT NOT NULL, uuid VARCHAR(50), "
"PRIMARY KEY (kind, title))",
"CREATE TABLE numbering_part ("
"kind VARCHAR(20) NOT NULL, title TEXT NOT NULL, ord INTEGER NOT NULL, "
"type TEXT, value TEXT, increase TEXT, initialvalue TEXT, modulus TEXT, format TEXT, "
"PRIMARY KEY (kind, title, ord), "
"FOREIGN KEY (kind, title) REFERENCES numbering_scheme (kind, title))",
"CREATE TABLE numbering_setting (name VARCHAR(50) PRIMARY KEY NOT NULL, value TEXT)"}) {
if (!query_.exec(QLatin1String(table))) {
qDebug() << " numbering table query : " << query_.lastError();
}
}
//Create the terminal table.
//Terminal::uuid() is the terminal-position id baked into the catalog
//.elmt definition (e.g. "the top terminal") -- identical across every
@@ -4091,6 +4110,120 @@ QStringList projectDataBase::linkRowMismatches()
return mismatches;
}
/**
@brief projectDataBase::setNumbering
The numbering tables hold @p numbering from now on, and nothing else
(QETZ-DB-FIRST stage 2b-1: QETProject writes them after reading its
file and after each change of its numbering)
*/
void projectDataBase::setNumbering(const Numbering &numbering)
{
QSqlQuery query(m_data_base);
bool ok = true;
for (const char *table : {"numbering_part", "numbering_scheme", "numbering_setting"})
ok = ok && query.exec(QStringLiteral("DELETE FROM %1").arg(QLatin1String(table)));
QSqlQuery scheme(m_data_base);
scheme.prepare(QStringLiteral("INSERT INTO numbering_scheme (kind, title, uuid) "
"VALUES (:kind, :title, :uuid)"));
QSqlQuery part(m_data_base);
part.prepare(QStringLiteral("INSERT INTO numbering_part (kind, title, ord, type, value, "
"increase, initialvalue, modulus, format) VALUES (:kind, :title, "
":ord, :type, :value, :increase, :initialvalue, :modulus, :format)"));
for (const NumberingScheme &item : numbering.schemes)
{
scheme.bindValue(QStringLiteral(":kind"), item.kind);
scheme.bindValue(QStringLiteral(":title"), item.title);
scheme.bindValue(QStringLiteral(":uuid"), item.uuid.isNull() ? QVariant()
: QVariant(item.uuid.toString()));
ok = ok && scheme.exec();
for (int i = 0 ; i < item.context.size() ; ++i)
{
const QStringList fields = item.context.itemAt(i);
part.bindValue(QStringLiteral(":kind"), item.kind);
part.bindValue(QStringLiteral(":title"), item.title);
part.bindValue(QStringLiteral(":ord"), i);
int field = 0;
for (const char *name : {":type", ":value", ":increase", ":initialvalue", ":modulus", ":format"}) {
part.bindValue(QLatin1String(name), field < fields.size() ? QVariant(fields.at(field))
: QVariant());
++field;
}
ok = ok && part.exec();
}
}
QSqlQuery setting(m_data_base);
setting.prepare(QStringLiteral("INSERT INTO numbering_setting (name, value) VALUES (:name, :value)"));
auto set = [&setting, &ok](const QString &name, const QString &value) {
setting.bindValue(QStringLiteral(":name"), name);
setting.bindValue(QStringLiteral(":value"), value);
ok = ok && setting.exec();
};
auto flag = [](bool value) { return value ? QStringLiteral("true") : QStringLiteral("false"); };
set(QStringLiteral("conductor_current"), numbering.current_conductor);
set(QStringLiteral("element_current"), numbering.current_element);
set(QStringLiteral("cable_current"), numbering.current_cable);
set(QStringLiteral("freeze_new_conductors"), flag(numbering.freeze_new_conductors));
set(QStringLiteral("freeze_new_elements"), flag(numbering.freeze_new_elements));
set(QStringLiteral("auto_break_conductors"), flag(numbering.auto_break_conductors));
set(QStringLiteral("cable_x_axis_first"), flag(numbering.cable_x_axis_first));
set(QStringLiteral("cable_ask_numbering"), flag(numbering.cable_ask_numbering));
if (!ok) {
qDebug() << "projectDataBase::setNumbering error : " << query.lastError()
<< scheme.lastError() << part.lastError() << setting.lastError();
}
}
/**
@brief projectDataBase::numbering
@return the numbering the numbering tables hold (setNumbering()); the
schemes in no particular order
*/
projectDataBase::Numbering projectDataBase::numbering() const
{
Numbering numbering;
QSqlQuery query(m_data_base);
query.exec(QStringLiteral("SELECT kind, title, uuid FROM numbering_scheme"));
QHash<std::pair<QString, QString>, int> index;
while (query.next()) {
NumberingScheme scheme;
scheme.kind = query.value(0).toString();
scheme.title = query.value(1).toString();
scheme.uuid = QUuid(query.value(2).toString());
index.insert({scheme.kind, scheme.title}, numbering.schemes.size());
numbering.schemes << scheme;
}
query.exec(QStringLiteral("SELECT kind, title, type, value, increase, initialvalue, modulus, "
"format FROM numbering_part ORDER BY kind, title, ord"));
while (query.next()) {
const int at = index.value({query.value(0).toString(), query.value(1).toString()}, -1);
if (at < 0) {
continue;
}
numbering.schemes[at].context.addValue(query.value(2).toString(), query.value(3).toString(),
query.value(4).toInt(), query.value(5).toInt(),
query.value(6).toInt(), query.value(7).toString());
}
query.exec(QStringLiteral("SELECT name, value FROM numbering_setting"));
while (query.next())
{
const QString name = query.value(0).toString();
const QString value = query.value(1).toString();
const bool flag = value == QLatin1String("true");
if (name == QLatin1String("conductor_current")) numbering.current_conductor = value;
else if (name == QLatin1String("element_current")) numbering.current_element = value;
else if (name == QLatin1String("cable_current")) numbering.current_cable = value;
else if (name == QLatin1String("freeze_new_conductors")) numbering.freeze_new_conductors = flag;
else if (name == QLatin1String("freeze_new_elements")) numbering.freeze_new_elements = flag;
else if (name == QLatin1String("auto_break_conductors")) numbering.auto_break_conductors = flag;
else if (name == QLatin1String("cable_x_axis_first")) numbering.cable_x_axis_first = flag;
else if (name == QLatin1String("cable_ask_numbering")) numbering.cable_ask_numbering = flag;
}
return numbering;
}
/**
@brief projectDataBase::savedLinks
The links @p element saves, read from its link rows, in their order