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

Work out formula labels and wire texts from the file, with the folios' code

Browse Source 
The first fill from the document stored the label and wire text saved in
the file. QElectroTech saves what it last worked out, not what the formula
gives now: K%total-%id saved as K1-1 on a 3-folio project is K3-1 on the
folios, and the same for a wire's formula. So the document fill disagreed
with the folio fill on any file whose folios had been added or moved.

AssignVariables now works from a FormulaContext: the folio's number,
index, total, plant, location, title-block and project variables, and the
element's grid cell and prefix or the wire's four properties. The Diagram
overload fills one from a built folio, the database fills one from the
file, and both call the same evaluation.

Also brought in line with Diagram::fromXml(): an element Element::valideXml()
rejects is skipped with its wires; a folio where two elements number their
terminals alike (Element::fromXml() refuses one, by geometry), a frozen
formula wire text, and the older sequential-number attributes are left to
the folios. Each folio's border now starts from the defaults a new Diagram
has, not the previous folio's values.

tst_databasefromdocument: formulasAreWorkedOut (every variable kind, stale
saved values), unbuiltElementIsLeftOut, clashingTerminalIdsFallBack. Each
fails with its fix removed.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
This commit is contained in:
ispyisail
2026-09-29 16:08:45 +13:00
parent a0d5c4fa9c
commit b1abab1241
5 changed files with 405 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sources/autoNum/assignvariables.h
+34 -4
View File
@@ -18,6 +18,7 @@
#ifndef ASSIGNVARIABLES_H
#define ASSIGNVARIABLES_H
#include "../diagramcontext.h"
#include "../diagramposition.h"
#include "numerotationcontext.h"
#include <QPointF>
@@ -57,6 +58,36 @@ namespace autonum
QStringList alpha;
};
/**
@brief The FormulaContext struct
Everything a formula's variables are read from: the folio it is on
and, for an element's or a conductor's formula, that item.
AssignVariables::formulaToLabel() fills one from a built folio; the
project database fills one from the project's file.
*/
struct FormulaContext
{
/// border_and_titleblock.folio(), folioIndex(), folioTotal()...
QString folio;
int folio_index = 0;
int folio_total = 0;
QString plant;
QString locmach;
/// the title block's additional fields and the project's properties
DiagramContext title_block_fields;
DiagramContext project_properties;
/// an element's grid cell (%c, %l) and prefix
bool has_element = false;
DiagramPosition element_position;
QString element_prefix;
/// a conductor's %wf, %wv, %wc and %ws
bool has_conductor = false;
QString wire_function;
QString wire_tension_protocol;
QString wire_color;
QString wire_section;
};
/**
@brief The AssignVariables class
This class assign variable of a formula string.
@@ -66,21 +97,20 @@ namespace autonum
{
public:
static QString formulaToLabel (QString formula, sequentialNumbers &seqStruct, Diagram *diagram, const Element *elmt = nullptr, const Conductor *cndr = nullptr);
static QString formulaToLabel (QString formula, sequentialNumbers &seqStruct, const FormulaContext &context);
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);
AssignVariables(const QString& formula, const sequentialNumbers& seqStruct, const FormulaContext &context);
void assignTitleBlockVar();
void assignProjectVar();
void assignSequence();
Diagram *m_diagram = nullptr;
const FormulaContext &m_context;
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);