aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactoring.

Browse Source 
Fix method name.
This commit is contained in:
Roman Telezhynskyi 2023-05-16 17:37:53 +03:00
parent 7b2707a528
commit 3ce8e6e5a7
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libs/vlayout/vtextmanager.cpp
View File

@ -355,7 +355,7 @@ void InitPiecePlaceholders(QMap<QString, QString> &placeholders, const QString &
try try
{ {
const QString formula = pieceArea_ + data.GetAreaShartName(); const QString formula = pieceArea_ + data.GetAreaShortName();
const qreal result = cal->EvalFormula(completeData.DataVariables(), formula); const qreal result = cal->EvalFormula(completeData.DataVariables(), formula);
placeholders[pl_currentArea] = QString::number(result); placeholders[pl_currentArea] = QString::number(result);
} }
@ -368,7 +368,7 @@ void InitPiecePlaceholders(QMap<QString, QString> &placeholders, const QString &
try try
{ {
const QString formula = pieceSeamLineArea_ + data.GetAreaShartName(); const QString formula = pieceSeamLineArea_ + data.GetAreaShortName();
const qreal result = cal->EvalFormula(completeData.DataVariables(), formula); const qreal result = cal->EvalFormula(completeData.DataVariables(), formula);
placeholders[pl_currentSeamLineArea] = QString::number(result); placeholders[pl_currentSeamLineArea] = QString::number(result);
} }

4
src/libs/vpatterndb/floatItemData/vpiecelabeldata.cpp
View File

@ -178,13 +178,13 @@ void VPieceLabelData::SetOnFold(bool onFold)
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
auto VPieceLabelData::GetAreaShartName() const -> QString auto VPieceLabelData::GetAreaShortName() const -> QString
{ {
return d->m_areaShortName; return d->m_areaShortName;
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
void VPieceLabelData::SetAreaShartName(const QString &val) void VPieceLabelData::SetAreaShortName(const QString &val)
{ {
d->m_areaShortName = val; d->m_areaShortName = val;
} }

6
src/libs/vpatterndb/floatItemData/vpiecelabeldata.h
View File

@ -80,9 +80,9 @@ public:
auto IsOnFold() const -> bool; auto IsOnFold() const -> bool;
void SetOnFold(bool onFold); void SetOnFold(bool onFold);
auto GetAreaShartName() const -> QString; auto GetAreaShortName() const -> QString;
void SetAreaShartName(const QString &val); void SetAreaShortName(const QString &val);
auto GetLabelTemplate() const -> QVector<VLabelTemplateLine>; auto GetLabelTemplate() const -> QVector<VLabelTemplateLine>;
void SetLabelTemplate(const QVector<VLabelTemplateLine> &lines); void SetLabelTemplate(const QVector<VLabelTemplateLine> &lines);

2
src/libs/vpatterndb/vpiece.cpp
View File

@ -573,7 +573,7 @@ auto VPiece::MissingPlaceLabels(const VPiece &det) const -> QVector<quint32>
void VPiece::SetPieceLabelData(const VPieceLabelData &data) void VPiece::SetPieceLabelData(const VPieceLabelData &data)
{ {
d->m_ppData = data; d->m_ppData = data;
d->m_ppData.SetAreaShartName(VPieceArea::PieceShortName(*this)); d->m_ppData.SetAreaShortName(VPieceArea::PieceShortName(*this));
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------