From 3ce8e6e5a73d1bb96a4c21a454377c64dc10997f Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Tue, 16 May 2023 17:37:53 +0300 Subject: [PATCH] Refactoring. Fix method name. --- src/libs/vlayout/vtextmanager.cpp | 4 ++-- src/libs/vpatterndb/floatItemData/vpiecelabeldata.cpp | 4 ++-- src/libs/vpatterndb/floatItemData/vpiecelabeldata.h | 6 +++--- src/libs/vpatterndb/vpiece.cpp | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/libs/vlayout/vtextmanager.cpp b/src/libs/vlayout/vtextmanager.cpp index d150c7796..df7c02369 100644 --- a/src/libs/vlayout/vtextmanager.cpp +++ b/src/libs/vlayout/vtextmanager.cpp @@ -355,7 +355,7 @@ void InitPiecePlaceholders(QMap &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 &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); } diff --git a/src/libs/vpatterndb/floatItemData/vpiecelabeldata.cpp b/src/libs/vpatterndb/floatItemData/vpiecelabeldata.cpp index 55c178170..065a0bf0a 100644 --- a/src/libs/vpatterndb/floatItemData/vpiecelabeldata.cpp +++ b/src/libs/vpatterndb/floatItemData/vpiecelabeldata.cpp @@ -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; } diff --git a/src/libs/vpatterndb/floatItemData/vpiecelabeldata.h b/src/libs/vpatterndb/floatItemData/vpiecelabeldata.h index 2b33a0a23..5789aac9e 100644 --- a/src/libs/vpatterndb/floatItemData/vpiecelabeldata.h +++ b/src/libs/vpatterndb/floatItemData/vpiecelabeldata.h @@ -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; void SetLabelTemplate(const QVector &lines); diff --git a/src/libs/vpatterndb/vpiece.cpp b/src/libs/vpatterndb/vpiece.cpp index 106a40804..f97c59039 100644 --- a/src/libs/vpatterndb/vpiece.cpp +++ b/src/libs/vpatterndb/vpiece.cpp @@ -573,7 +573,7 @@ auto VPiece::MissingPlaceLabels(const VPiece &det) const -> QVector void VPiece::SetPieceLabelData(const VPieceLabelData &data) { d->m_ppData = data; - d->m_ppData.SetAreaShartName(VPieceArea::PieceShortName(*this)); + d->m_ppData.SetAreaShortName(VPieceArea::PieceShortName(*this)); } //---------------------------------------------------------------------------------------------------------------------