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

Fix label conversion.

Browse Source 
--HG--
branch : feature
This commit is contained in:
Roman Telezhynskyi 2017-08-18 14:56:18 +03:00
parent f07fd426dd
commit 5961f52a73
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2204,6 +2204,8 @@ void VPatternConverter::PortPieceLabelstoV0_6_0()
for (int i = 0; i < nodeList.size(); ++i) for (int i = 0; i < nodeList.size(); ++i)
{ {
QDomElement dataTag = nodeList.at(i).toElement(); QDomElement dataTag = nodeList.at(i).toElement();
QDomNodeList nodeListMCP = dataTag.childNodes();
const int count = nodeListMCP.count();
try try
{ {
if (not GetParametrString(dataTag, strLetter, "").isEmpty()) if (not GetParametrString(dataTag, strLetter, "").isEmpty())
@ -2216,14 +2218,13 @@ void VPatternConverter::PortPieceLabelstoV0_6_0()
AddLabelTemplateLineV0_6_0(dataTag, "%pName%", true, false, Qt::AlignHCenter, 2); AddLabelTemplateLineV0_6_0(dataTag, "%pName%", true, false, Qt::AlignHCenter, 2);
QDomNodeList nodeListMCP = dataTag.childNodes(); for (int iMCP = 0; iMCP < count; ++iMCP)
for (int iMCP = 0; iMCP < nodeListMCP.count(); ++iMCP)
{ {
QDomElement domMCP = nodeListMCP.at(iMCP).toElement(); QDomElement domMCP = nodeListMCP.at(iMCP).toElement();
QString line; QString line;
const int material = GetParametrUInt(domMCP, strMaterial, 0); const int material = GetParametrUInt(domMCP, strMaterial, "0");
switch(material) switch(material)
{ {
case 0: case 0:
@ -2245,7 +2246,7 @@ void VPatternConverter::PortPieceLabelstoV0_6_0()
} }
line.append(", %wCut% %pQuantity%"); line.append(", %wCut% %pQuantity%");
if (GetParametrUInt(domMCP, strPlacement, 0) == 1) if (GetParametrUInt(domMCP, strPlacement, "0") == 1)
{ {
line.append(" %wOnFold%"); line.append(" %wOnFold%");
} }