kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-12-17 12:40:35 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix : new conductor have text without variable replaced

Browse Source 
For a new conductor with the text set from the default conductor text
defined in the folio properties, and this text contain variables, in
this case the variables are not replaced.
This commit fix it.
This commit is contained in:
joshua
2023-10-19 21:59:05 +02:00
parent 083b1d8500
commit fbcab7c770
2 changed files with 27 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
sources/conductorautonumerotation.cpp
View File

@@ -23,7 +23,6 @@
#include "diagram.h" #include "diagram.h"
#include "qet.h" #include "qet.h"
#include "qetdiagrameditor.h" #include "qetdiagrameditor.h"
#include "qetgraphicsitem/conductor.h"
#include "ui/potentialselectordialog.h" #include "ui/potentialselectordialog.h"
/** /**
@@ -221,32 +220,36 @@ void ConductorAutoNumerotation::numeratePotential()
*/ */
void ConductorAutoNumerotation::numerateNewConductor() void ConductorAutoNumerotation::numerateNewConductor()
{ {
if (!m_conductor || m_diagram->conductorsAutonumName().isEmpty()) if (m_conductor) {
return; return;
}
NumerotationContext context = m_diagram->project()->conductorAutoNum( if (!m_diagram->conductorsAutonumName().isEmpty())
m_diagram -> conductorsAutonumName()); {
if (context.isEmpty()) NumerotationContext context = m_diagram->project()->conductorAutoNum(
return; m_diagram -> conductorsAutonumName());
if (context.isEmpty())
return;
QString autoNum_name = m_diagram->project()->conductorCurrentAutoNum(); QString autoNum_name = m_diagram->project()->conductorCurrentAutoNum();
QString formula = autonum::numerotationContextToFormula(context); QString formula = autonum::numerotationContextToFormula(context);
ConductorProperties cp = m_conductor -> properties(); ConductorProperties cp = m_conductor -> properties();
cp.m_formula = formula; cp.m_formula = formula;
m_conductor->setProperties(cp); m_conductor->setProperties(cp);
autonum::setSequential(formula, autonum::setSequential(formula,
m_conductor->rSequenceNum(), m_conductor->rSequenceNum(),
context, context,
m_diagram, m_diagram,
autoNum_name); autoNum_name);
NumerotationContextCommands ncc (context, m_diagram); NumerotationContextCommands ncc (context, m_diagram);
m_diagram->project()->addConductorAutoNum(autoNum_name, ncc.next()); m_diagram->project()->addConductorAutoNum(autoNum_name, ncc.next());
}
applyText(autonum::AssignVariables::formulaToLabel( applyText(autonum::AssignVariables::formulaToLabel(
formula, m_conductor->properties().m_formula,
m_conductor->rSequenceNum(), m_conductor->rSequenceNum(),
m_diagram)); m_diagram));
} }

5
sources/conductorautonumerotation.h
View File

@@ -19,11 +19,12 @@
#define CONDUCTORAUTONUMEROTATION_H #define CONDUCTORAUTONUMEROTATION_H
#include "autoNum/assignvariables.h" #include "autoNum/assignvariables.h"
#include "qetgraphicsitem/conductor.h"
#include <QList> #include <QList>
#include <QPointer>
class Diagram; class Diagram;
class Conductor;
class QUndoCommand; class QUndoCommand;
class ConductorProperties; class ConductorProperties;
@@ -52,7 +53,7 @@ class ConductorAutoNumerotation
//attributes //attributes
Diagram *m_diagram; Diagram *m_diagram;
Conductor *m_conductor; QPointer<Conductor> m_conductor;
QList <Conductor *> conductor_list; QList <Conductor *> conductor_list;
QUndoCommand *m_parent_undo; QUndoCommand *m_parent_undo;
}; };