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

Convert label width and height to pattern units.

Browse Source 
--HG--
branch : feature
This commit is contained in:
Roman Telezhynskyi 2017-03-14 13:54:15 +02:00
parent f48325cc52
commit 4f38a31f25
2 changed files with 57 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/libs/ifc/xml/vpatternconverter.cpp
View File

@ -119,6 +119,7 @@ static const QString strDetail = QStringLiteral("detail");
static const QString strSupplement = QStringLiteral("supplement");
static const QString strClosed = QStringLiteral("closed");
static const QString strWidth = QStringLiteral("width");
static const QString strHeight = QStringLiteral("height");
static const QString strNode = QStringLiteral("node");
static const QString strNodes = QStringLiteral("nodes");
static const QString strData = QStringLiteral("data");
@ -669,6 +670,8 @@ void VPatternConverter::ToV0_4_4()
"Time to refactor the code.");
SetVersion(QStringLiteral("0.4.4"));
LabelTagToV0_4_4(strData);
LabelTagToV0_4_4(strPatternInfo);
Save();
}
@ -1944,6 +1947,58 @@ QDomElement VPatternConverter::GetUnionChildrenNodesV0_4_0(const QDomElement &de
return tagNodes;
}
//---------------------------------------------------------------------------------------------------------------------
void VPatternConverter::LabelTagToV0_4_4(const QString &tagName)
{
// TODO. Delete if minimal supported version is 0.4.4
Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < CONVERTER_VERSION_CHECK(0, 4, 4),
"Time to refactor the code.");
Unit unit = Unit::Cm;
const QStringList units = QStringList() << "mm" << "cm" << "inch";
switch (units.indexOf(UniqueTagText(strUnit)))
{
case 0:// mm
unit = Unit::Mm;
break;
case 1:// cm
unit = Unit::Cm;
break;
case 2:// in
unit = Unit::Inch;
break;
default:
break;
}
auto ConvertData = [unit](QDomElement &dom, const QString &attribute)
{
if (dom.hasAttribute(attribute))
{
QString valStr = dom.attribute(attribute, "1");
bool ok = false;
qreal val = valStr.toDouble(&ok);
if (not ok)
{
val = 1;
}
dom.setAttribute(attribute, QString().setNum(FromPixel(val, unit)));
}
};
const QDomNodeList list = elementsByTagName(tagName);
for (int i=0; i < list.size(); ++i)
{
QDomElement dom = list.at(i).toElement();
if (not dom.isNull())
{
ConvertData(dom, strWidth);
ConvertData(dom, strHeight);
}
}
}
//---------------------------------------------------------------------------------------------------------------------
void VPatternConverter::TagUnionDetailsToV0_4_0()
{

2
src/libs/ifc/xml/vpatternconverter.h
View File

@ -146,6 +146,8 @@ private:
void TagUnionDetailsToV0_4_0();
QDomElement GetUnionDetailNodesV0_4_0(const QDomElement &detail);
QDomElement GetUnionChildrenNodesV0_4_0(const QDomElement &detail);
void LabelTagToV0_4_4(const QString &tagName);
};
//---------------------------------------------------------------------------------------------------------------------