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

Refactoring.

Browse Source 
--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2018-05-18 13:51:58 +03:00
parent f67af27c06
commit f194057b26
2 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/libs/vpatterndb/variables/vmeasurement.cpp
View File

@ -97,7 +97,7 @@ VMeasurement::~VMeasurement()
{} {}
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
QStringList VMeasurement::ListHeights(QMap<GHeights, bool> heights, Unit patternUnit) QStringList VMeasurement::ListHeights(const QMap<GHeights, bool> &heights, Unit patternUnit)
{ {
QStringList list; QStringList list;
if (patternUnit == Unit::Inch) if (patternUnit == Unit::Inch)
@ -111,7 +111,7 @@ QStringList VMeasurement::ListHeights(QMap<GHeights, bool> heights, Unit pattern
{ {
if (i.value() && i.key() != GHeights::ALL) if (i.value() && i.key() != GHeights::ALL)
{ {
ListValue(list, static_cast<int>(i.key()), patternUnit); list.append(QString::number(UnitConvertor(static_cast<int>(i.key()), Unit::Cm, patternUnit)));
} }
++i; ++i;
} }
@ -124,7 +124,7 @@ QStringList VMeasurement::ListHeights(QMap<GHeights, bool> heights, Unit pattern
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
QStringList VMeasurement::ListSizes(QMap<GSizes, bool> sizes, Unit patternUnit) QStringList VMeasurement::ListSizes(const QMap<GSizes, bool> &sizes, Unit patternUnit)
{ {
QStringList list; QStringList list;
if (patternUnit == Unit::Inch) if (patternUnit == Unit::Inch)
@ -138,7 +138,7 @@ QStringList VMeasurement::ListSizes(QMap<GSizes, bool> sizes, Unit patternUnit)
{ {
if (i.value() && i.key() != GSizes::ALL) if (i.value() && i.key() != GSizes::ALL)
{ {
ListValue(list, static_cast<int>(i.key()), patternUnit); list.append(QString::number(UnitConvertor(static_cast<int>(i.key()), Unit::Cm, patternUnit)));
} }
++i; ++i;
} }
@ -160,9 +160,10 @@ QStringList VMeasurement::WholeListHeights(Unit patternUnit)
return list; return list;
} }
list.reserve((static_cast<int>(GHeights::H200) - static_cast<int>(GHeights::H50))/heightStep);
for (int i = static_cast<int>(GHeights::H50); i<= static_cast<int>(GHeights::H200); i = i+heightStep) for (int i = static_cast<int>(GHeights::H50); i<= static_cast<int>(GHeights::H200); i = i+heightStep)
{ {
ListValue(list, i, patternUnit); list.append(QString::number(UnitConvertor(i, Unit::Cm, patternUnit)));
} }
return list; return list;
@ -178,9 +179,10 @@ QStringList VMeasurement::WholeListSizes(Unit patternUnit)
return list; return list;
} }
list.reserve((static_cast<int>(GSizes::S72) - static_cast<int>(GSizes::S22))/sizeStep);
for (int i = static_cast<int>(GSizes::S22); i<= static_cast<int>(GSizes::S72); i = i+sizeStep) for (int i = static_cast<int>(GSizes::S22); i<= static_cast<int>(GSizes::S72); i = i+sizeStep)
{ {
ListValue(list, i, patternUnit); list.append(QString::number(UnitConvertor(i, Unit::Cm, patternUnit)));
} }
return list; return list;
@ -237,14 +239,6 @@ qreal VMeasurement::CalcValue() const
return d->base + k_size * d->ksize + k_height * d->kheight; return d->base + k_size * d->ksize + k_height * d->kheight;
} }
//---------------------------------------------------------------------------------------------------------------------
void VMeasurement::ListValue(QStringList &list, qreal value, Unit patternUnit)
{
const qreal val = UnitConvertor(value, Unit::Cm, patternUnit);
const QString strVal = QString("%1").arg(val);
list.append(strVal);
}
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
/** /**
* @brief GetGuiText measurement name for tooltip * @brief GetGuiText measurement name for tooltip

6
src/libs/vpatterndb/variables/vmeasurement.h
View File

@ -100,8 +100,8 @@ public:
qreal GetKheight() const; qreal GetKheight() const;
void SetKheight(const qreal &value); void SetKheight(const qreal &value);
static QStringList ListHeights(QMap<GHeights, bool> heights, Unit patternUnit); static QStringList ListHeights(const QMap<GHeights, bool> &heights, Unit patternUnit);
static QStringList ListSizes(QMap<GSizes, bool> sizes, Unit patternUnit); static QStringList ListSizes(const QMap<GSizes, bool> &sizes, Unit patternUnit);
static QStringList WholeListHeights(Unit patternUnit); static QStringList WholeListHeights(Unit patternUnit);
static QStringList WholeListSizes(Unit patternUnit); static QStringList WholeListSizes(Unit patternUnit);
static bool IsGradationSizeValid(const QString &size); static bool IsGradationSizeValid(const QString &size);
@ -110,8 +110,6 @@ private:
QSharedDataPointer<VMeasurementData> d; QSharedDataPointer<VMeasurementData> d;
qreal CalcValue() const; qreal CalcValue() const;
static void ListValue(QStringList &list, qreal value, Unit patternUnit);
}; };
Q_DECLARE_TYPEINFO(VMeasurement, Q_MOVABLE_TYPE); Q_DECLARE_TYPEINFO(VMeasurement, Q_MOVABLE_TYPE);