Refactoring.
Fix method name.
This commit is contained in:
parent
7b2707a528
commit
3ce8e6e5a7
|
@ -355,7 +355,7 @@ void InitPiecePlaceholders(QMap<QString, QString> &placeholders, const QString &
|
|||
|
||||
try
|
||||
{
|
||||
const QString formula = pieceArea_ + data.GetAreaShartName();
|
||||
const QString formula = pieceArea_ + data.GetAreaShortName();
|
||||
const qreal result = cal->EvalFormula(completeData.DataVariables(), formula);
|
||||
placeholders[pl_currentArea] = QString::number(result);
|
||||
}
|
||||
|
@ -368,7 +368,7 @@ void InitPiecePlaceholders(QMap<QString, QString> &placeholders, const QString &
|
|||
|
||||
try
|
||||
{
|
||||
const QString formula = pieceSeamLineArea_ + data.GetAreaShartName();
|
||||
const QString formula = pieceSeamLineArea_ + data.GetAreaShortName();
|
||||
const qreal result = cal->EvalFormula(completeData.DataVariables(), formula);
|
||||
placeholders[pl_currentSeamLineArea] = QString::number(result);
|
||||
}
|
||||
|
|
|
@ -178,13 +178,13 @@ void VPieceLabelData::SetOnFold(bool onFold)
|
|||
}
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
auto VPieceLabelData::GetAreaShartName() const -> QString
|
||||
auto VPieceLabelData::GetAreaShortName() const -> QString
|
||||
{
|
||||
return d->m_areaShortName;
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
void VPieceLabelData::SetAreaShartName(const QString &val)
|
||||
void VPieceLabelData::SetAreaShortName(const QString &val)
|
||||
{
|
||||
d->m_areaShortName = val;
|
||||
}
|
||||
|
|
|
@ -80,9 +80,9 @@ public:
|
|||
|
||||
auto IsOnFold() const -> bool;
|
||||
void SetOnFold(bool onFold);
|
||||
|
||||
auto GetAreaShartName() const -> QString;
|
||||
void SetAreaShartName(const QString &val);
|
||||
|
||||
auto GetAreaShortName() const -> QString;
|
||||
void SetAreaShortName(const QString &val);
|
||||
|
||||
auto GetLabelTemplate() const -> QVector<VLabelTemplateLine>;
|
||||
void SetLabelTemplate(const QVector<VLabelTemplateLine> &lines);
|
||||
|
|
|
@ -573,7 +573,7 @@ auto VPiece::MissingPlaceLabels(const VPiece &det) const -> QVector<quint32>
|
|||
void VPiece::SetPieceLabelData(const VPieceLabelData &data)
|
||||
{
|
||||
d->m_ppData = data;
|
||||
d->m_ppData.SetAreaShartName(VPieceArea::PieceShortName(*this));
|
||||
d->m_ppData.SetAreaShortName(VPieceArea::PieceShortName(*this));
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
|
|
Loading…
Reference in New Issue
Block a user