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

Move a folio's border dimensions into the project database

Browse Source 
Adds a folio_border table and wires BorderTitleBlock's column/row
grid (counts, widths, header sizes, display flags) through it, the
same way folio_titleblock already covers the title block itself.
Closes the one gap DB-ACCESSORS 4.6 found still living only in the
folio's own XML.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
ispyisail
2026-10-22 22:55:34 +13:00
parent b98193dbe2
commit 489676b155
4 changed files with 151 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sources/dataBase/projectdatabase.cpp
+79 -3
View File
@@ -2666,6 +2666,24 @@ bool projectDataBase::createDataBase()
qDebug() << " folio_titleblock_table query : " << query_.lastError();
}
//Create the folio_border table: the border/grid dimensions of
//every folio (the column/row reference grid, e.g. "A1", "B2"), the
//store each folio's border is written through
//(storeFolioBorder()). One row per folio.
if (!query_.exec(QStringLiteral(
"CREATE TABLE folio_border ("
"diagram_uuid VARCHAR(50) PRIMARY KEY NOT NULL, "
"columns_count INTEGER NOT NULL, "
"columns_width REAL NOT NULL, "
"columns_header_height REAL NOT NULL, "
"display_columns INTEGER NOT NULL, "
"rows_count INTEGER NOT NULL, "
"rows_height REAL NOT NULL, "
"rows_header_width REAL NOT NULL, "
"display_rows INTEGER NOT NULL)"))) {
qDebug() << " folio_border_table query : " << query_.lastError();
}
//Create the conductor_properties table: the properties of every
//wire placed in the project, as the attributes a saved wire carries,
//the store wires write through (storeConductorProperties()).
@@ -3579,33 +3597,91 @@ void projectDataBase::storeFolioTitleBlock(const QUuid &folio, const TitleBlockP
}
}
/**
@brief projectDataBase::storedFolioBorder
@return the stored border properties of the folio @p folio, or nullptr;
valid until the store next changes
*/
const BorderProperties *projectDataBase::storedFolioBorder(const QUuid &folio) const
{
auto it = m_folio_borders.constFind(folio);
return it == m_folio_borders.constEnd() ? nullptr : &it.value();
}
/**
@brief projectDataBase::storeFolioBorder
Store @p properties as the border of the folio @p folio, in the
folio_border table and the cache in front of it.
*/
void projectDataBase::storeFolioBorder(const QUuid &folio, const BorderProperties &properties)
{
if (folio.isNull()) return;
auto known = m_folio_borders.find(folio);
if (known != m_folio_borders.end() && *known == properties) return;
m_folio_borders.insert(folio, properties);
const QString uuid = folio.toString();
QSqlQuery remove(m_data_base);
remove.prepare(QStringLiteral("DELETE FROM folio_border WHERE diagram_uuid = :uuid"));
remove.bindValue(QStringLiteral(":uuid"), uuid);
if (!remove.exec()) {
qDebug() << "projectDataBase::storeFolioBorder remove error : " << remove.lastError();
}
QSqlQuery insert(m_data_base);
insert.prepare(QStringLiteral(
"INSERT INTO folio_border (diagram_uuid, columns_count, columns_width, "
"columns_header_height, display_columns, rows_count, rows_height, "
"rows_header_width, display_rows) VALUES (:uuid, :cc, :cw, :chh, :dc, "
":rc, :rh, :rhw, :dr)"));
insert.bindValue(QStringLiteral(":uuid"), uuid);
insert.bindValue(QStringLiteral(":cc"), properties.columns_count);
insert.bindValue(QStringLiteral(":cw"), properties.columns_width);
insert.bindValue(QStringLiteral(":chh"), properties.columns_header_height);
insert.bindValue(QStringLiteral(":dc"), properties.display_columns ? 1 : 0);
insert.bindValue(QStringLiteral(":rc"), properties.rows_count);
insert.bindValue(QStringLiteral(":rh"), properties.rows_height);
insert.bindValue(QStringLiteral(":rhw"), properties.rows_header_width);
insert.bindValue(QStringLiteral(":dr"), properties.display_rows ? 1 : 0);
if (!insert.exec()) {
qDebug() << "projectDataBase::storeFolioBorder insert error : " << insert.lastError();
}
}
/**
@brief projectDataBase::placeFolio
@p folio is now a folio of the project: its title block is stored under
its uuid.
@p folio is now a folio of the project: its title block and border are
stored under its uuid.
*/
void projectDataBase::placeFolio(Diagram *folio)
{
m_placed_folios.insert(folio->uuid(), folio);
storeFolioTitleBlock(folio->uuid(), folio->border_and_titleblock.localTitleBlock());
storeFolioBorder(folio->uuid(), folio->border_and_titleblock.exportBorder());
}
/**
@brief projectDataBase::unplaceFolio
@p folio no longer holds @p uuid (it was removed, or its uuid changed):
the title block stored under it goes.
the title block and border stored under it go.
*/
void projectDataBase::unplaceFolio(Diagram *folio, const QUuid &uuid)
{
if (m_placed_folios.value(uuid) != folio) return;
m_placed_folios.remove(uuid);
m_folio_titleblocks.remove(uuid);
m_folio_borders.remove(uuid);
QSqlQuery remove(m_data_base);
remove.prepare(QStringLiteral("DELETE FROM folio_titleblock WHERE diagram_uuid = :uuid"));
remove.bindValue(QStringLiteral(":uuid"), uuid.toString());
if (!remove.exec()) {
qDebug() << "projectDataBase::unplaceFolio error : " << remove.lastError();
}
QSqlQuery remove_border(m_data_base);
remove_border.prepare(QStringLiteral("DELETE FROM folio_border WHERE diagram_uuid = :uuid"));
remove_border.bindValue(QStringLiteral(":uuid"), uuid.toString());
if (!remove_border.exec()) {
qDebug() << "projectDataBase::unplaceFolio border error : " << remove_border.lastError();
}
}
/**
sources/dataBase/projectdatabase.h
+8
View File
@@ -34,6 +34,7 @@
#include "../diagramcontext.h"
#include "../titleblockproperties.h"
#include "../borderproperties.h"
#include "../conductorproperties.h"
#include "../autoNum/assignvariables.h"
#include "../autoNum/numerotationcontext.h"
@@ -147,6 +148,12 @@ class projectDataBase : public QObject
void folioUuidChanged(Diagram *folio, const QUuid &old_uuid);
QStringList folioTitleBlockMismatches() const;
//The border properties of every folio of the project, by folio
//uuid: the store each folio's border is written through. A
//folio not in a project keeps its own.
const BorderProperties *storedFolioBorder(const QUuid &folio) const;
void storeFolioBorder(const QUuid &folio, const BorderProperties &properties);
//The properties of every wire placed in the project, by wire
//uuid: the store each wire's properties are written through
//A wire not placed keeps its own.
@@ -422,6 +429,7 @@ class projectDataBase : public QObject
struct UnbuiltWireEdit { ConductorProperties properties; QUuid folio; };
QHash<QUuid, UnbuiltWireEdit> m_unbuilt_wire_edits;
QHash<QUuid, TitleBlockProperties> m_folio_titleblocks;
QHash<QUuid, BorderProperties> m_folio_borders;
QHash<QUuid, QPointer<Diagram>> m_placed_folios;
QHash<QUuid, ConductorProperties> m_conductor_properties;
//The rows of conductor_properties, to write only what changes