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

Fix reading tool notes.

Browse Source 
Some tools missed reading notes attribute.
This commit is contained in:
Roman Telezhynskyi 2021-03-26 16:53:37 +02:00
parent 638d3182f4
commit 1be20e0b46
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/app/valentina/xml/vpattern.cpp
View File

@ -1367,7 +1367,7 @@ void VPattern::ParseLineElement(VMainGraphicsScene *scene, const QDomElement &do
try try
{ {
VToolLineInitData initData; VToolLineInitData initData;
ToolsCommonAttributes(domElement, initData.id); DrawToolsCommonAttributes(domElement, initData.id, initData.notes);
initData.firstPoint = GetParametrUInt(domElement, AttrFirstPoint, NULL_ID_STR); initData.firstPoint = GetParametrUInt(domElement, AttrFirstPoint, NULL_ID_STR);
initData.secondPoint = GetParametrUInt(domElement, AttrSecondPoint, NULL_ID_STR); initData.secondPoint = GetParametrUInt(domElement, AttrSecondPoint, NULL_ID_STR);
initData.typeLine = GetParametrString(domElement, AttrTypeLine, TypeLineLine); initData.typeLine = GetParametrString(domElement, AttrTypeLine, TypeLineLine);
@ -2490,7 +2490,7 @@ void VPattern::ParseToolTrueDarts(VMainGraphicsScene *scene, const QDomElement &
initData.parse = parse; initData.parse = parse;
initData.typeCreation = Source::FromFile; initData.typeCreation = Source::FromFile;
ToolsCommonAttributes(domElement, initData.id); DrawToolsCommonAttributes(domElement, initData.id, initData.notes);
initData.p1id = GetParametrUInt(domElement, AttrPoint1, NULL_ID_STR); initData.p1id = GetParametrUInt(domElement, AttrPoint1, NULL_ID_STR);
initData.p2id = GetParametrUInt(domElement, AttrPoint2, NULL_ID_STR); initData.p2id = GetParametrUInt(domElement, AttrPoint2, NULL_ID_STR);
@ -2541,7 +2541,7 @@ void VPattern::ParseOldToolSpline(VMainGraphicsScene *scene, QDomElement &domEle
initData.parse = parse; initData.parse = parse;
initData.typeCreation = Source::FromFile; initData.typeCreation = Source::FromFile;
ToolsCommonAttributes(domElement, initData.id); DrawToolsCommonAttributes(domElement, initData.id, initData.notes);
const quint32 point1 = GetParametrUInt(domElement, AttrPoint1, NULL_ID_STR); const quint32 point1 = GetParametrUInt(domElement, AttrPoint1, NULL_ID_STR);
const quint32 point4 = GetParametrUInt(domElement, AttrPoint4, NULL_ID_STR); const quint32 point4 = GetParametrUInt(domElement, AttrPoint4, NULL_ID_STR);
const qreal angle1 = GetParametrDouble(domElement, AttrAngle1, QStringLiteral("270.0")); const qreal angle1 = GetParametrDouble(domElement, AttrAngle1, QStringLiteral("270.0"));
@ -2590,7 +2590,7 @@ void VPattern::ParseToolSpline(VMainGraphicsScene *scene, QDomElement &domElemen
initData.parse = parse; initData.parse = parse;
initData.typeCreation = Source::FromFile; initData.typeCreation = Source::FromFile;
ToolsCommonAttributes(domElement, initData.id); DrawToolsCommonAttributes(domElement, initData.id, initData.notes);
initData.point1 = GetParametrUInt(domElement, AttrPoint1, NULL_ID_STR); initData.point1 = GetParametrUInt(domElement, AttrPoint1, NULL_ID_STR);
initData.point4 = GetParametrUInt(domElement, AttrPoint4, NULL_ID_STR); initData.point4 = GetParametrUInt(domElement, AttrPoint4, NULL_ID_STR);
@ -2662,7 +2662,7 @@ void VPattern::ParseToolCubicBezier(VMainGraphicsScene *scene, const QDomElement
initData.parse = parse; initData.parse = parse;
initData.typeCreation = Source::FromFile; initData.typeCreation = Source::FromFile;
ToolsCommonAttributes(domElement, initData.id); DrawToolsCommonAttributes(domElement, initData.id, initData.notes);
const quint32 point1 = GetParametrUInt(domElement, AttrPoint1, NULL_ID_STR); const quint32 point1 = GetParametrUInt(domElement, AttrPoint1, NULL_ID_STR);
const quint32 point2 = GetParametrUInt(domElement, AttrPoint2, NULL_ID_STR); const quint32 point2 = GetParametrUInt(domElement, AttrPoint2, NULL_ID_STR);
@ -2716,7 +2716,7 @@ void VPattern::ParseOldToolSplinePath(VMainGraphicsScene *scene, QDomElement &do
initData.parse = parse; initData.parse = parse;
initData.typeCreation = Source::FromFile; initData.typeCreation = Source::FromFile;
ToolsCommonAttributes(domElement, initData.id); DrawToolsCommonAttributes(domElement, initData.id, initData.notes);
const qreal kCurve = GetParametrDouble(domElement, AttrKCurve, QStringLiteral("1.0")); const qreal kCurve = GetParametrDouble(domElement, AttrKCurve, QStringLiteral("1.0"));
const QString color = GetParametrString(domElement, AttrColor, ColorBlack); const QString color = GetParametrString(domElement, AttrColor, ColorBlack);
const quint32 duplicate = GetParametrUInt(domElement, AttrDuplicate, QChar('0')); const quint32 duplicate = GetParametrUInt(domElement, AttrDuplicate, QChar('0'));
@ -2788,7 +2788,7 @@ void VPattern::ParseToolSplinePath(VMainGraphicsScene *scene, const QDomElement
initData.parse = parse; initData.parse = parse;
initData.typeCreation = Source::FromFile; initData.typeCreation = Source::FromFile;
ToolsCommonAttributes(domElement, initData.id); DrawToolsCommonAttributes(domElement, initData.id, initData.notes);
initData.color = GetParametrString(domElement, AttrColor, ColorBlack); initData.color = GetParametrString(domElement, AttrColor, ColorBlack);
initData.penStyle = GetParametrString(domElement, AttrPenStyle, TypeLineLine); initData.penStyle = GetParametrString(domElement, AttrPenStyle, TypeLineLine);
initData.duplicate = GetParametrUInt(domElement, AttrDuplicate, QChar('0')); initData.duplicate = GetParametrUInt(domElement, AttrDuplicate, QChar('0'));
@ -2882,7 +2882,7 @@ void VPattern::ParseToolCubicBezierPath(VMainGraphicsScene *scene, const QDomEle
initData.parse = parse; initData.parse = parse;
initData.typeCreation = Source::FromFile; initData.typeCreation = Source::FromFile;
ToolsCommonAttributes(domElement, initData.id); DrawToolsCommonAttributes(domElement, initData.id, initData.notes);
const QString color = GetParametrString(domElement, AttrColor, ColorBlack); const QString color = GetParametrString(domElement, AttrColor, ColorBlack);
const QString penStyle = GetParametrString(domElement, AttrPenStyle, TypeLineLine); const QString penStyle = GetParametrString(domElement, AttrPenStyle, TypeLineLine);
const quint32 duplicate = GetParametrUInt(domElement, AttrDuplicate, QChar('0')); const quint32 duplicate = GetParametrUInt(domElement, AttrDuplicate, QChar('0'));
@ -3042,7 +3042,7 @@ void VPattern::ParseToolArc(VMainGraphicsScene *scene, QDomElement &domElement,
initData.parse = parse; initData.parse = parse;
initData.typeCreation = Source::FromFile; initData.typeCreation = Source::FromFile;
ToolsCommonAttributes(domElement, initData.id); DrawToolsCommonAttributes(domElement, initData.id, initData.notes);
initData.center = GetParametrUInt(domElement, AttrCenter, NULL_ID_STR); initData.center = GetParametrUInt(domElement, AttrCenter, NULL_ID_STR);
initData.radius = GetParametrString(domElement, AttrRadius, QStringLiteral("10")); initData.radius = GetParametrString(domElement, AttrRadius, QStringLiteral("10"));
const QString r = initData.radius;//need for saving fixed formula; const QString r = initData.radius;//need for saving fixed formula;
@ -3095,7 +3095,7 @@ void VPattern::ParseToolEllipticalArc(VMainGraphicsScene *scene, QDomElement &do
initData.parse = parse; initData.parse = parse;
initData.typeCreation = Source::FromFile; initData.typeCreation = Source::FromFile;
ToolsCommonAttributes(domElement, initData.id); DrawToolsCommonAttributes(domElement, initData.id, initData.notes);
initData.center = GetParametrUInt(domElement, AttrCenter, NULL_ID_STR); initData.center = GetParametrUInt(domElement, AttrCenter, NULL_ID_STR);
initData.radius1 = GetParametrString(domElement, AttrRadius1, QStringLiteral("10")); initData.radius1 = GetParametrString(domElement, AttrRadius1, QStringLiteral("10"));
initData.radius2 = GetParametrString(domElement, AttrRadius2, QStringLiteral("10")); initData.radius2 = GetParametrString(domElement, AttrRadius2, QStringLiteral("10"));
@ -3233,7 +3233,7 @@ void VPattern::ParseToolArcWithLength(VMainGraphicsScene *scene, QDomElement &do
initData.parse = parse; initData.parse = parse;
initData.typeCreation = Source::FromFile; initData.typeCreation = Source::FromFile;
ToolsCommonAttributes(domElement, initData.id); DrawToolsCommonAttributes(domElement, initData.id, initData.notes);
initData.center = GetParametrUInt(domElement, AttrCenter, NULL_ID_STR); initData.center = GetParametrUInt(domElement, AttrCenter, NULL_ID_STR);
initData.radius = GetParametrString(domElement, AttrRadius, QStringLiteral("10")); initData.radius = GetParametrString(domElement, AttrRadius, QStringLiteral("10"));
const QString r = initData.radius;//need for saving fixed formula; const QString r = initData.radius;//need for saving fixed formula;
@ -3286,7 +3286,7 @@ void VPattern::ParseToolRotation(VMainGraphicsScene *scene, QDomElement &domElem
initData.parse = parse; initData.parse = parse;
initData.typeCreation = Source::FromFile; initData.typeCreation = Source::FromFile;
ToolsCommonAttributes(domElement, initData.id); DrawToolsCommonAttributes(domElement, initData.id, initData.notes);
initData.origin = GetParametrUInt(domElement, AttrCenter, NULL_ID_STR); initData.origin = GetParametrUInt(domElement, AttrCenter, NULL_ID_STR);
initData.angle = GetParametrString(domElement, AttrAngle, QStringLiteral("10")); initData.angle = GetParametrString(domElement, AttrAngle, QStringLiteral("10"));
const QString a = initData.angle;//need for saving fixed formula; const QString a = initData.angle;//need for saving fixed formula;
@ -3396,7 +3396,7 @@ void VPattern::ParseToolMove(VMainGraphicsScene *scene, QDomElement &domElement,
initData.parse = parse; initData.parse = parse;
initData.typeCreation = Source::FromFile; initData.typeCreation = Source::FromFile;
ToolsCommonAttributes(domElement, initData.id); DrawToolsCommonAttributes(domElement, initData.id, initData.notes);
initData.formulaAngle = GetParametrString(domElement, AttrAngle, QChar('0')); initData.formulaAngle = GetParametrString(domElement, AttrAngle, QChar('0'));
const QString a = initData.formulaAngle;//need for saving fixed formula; const QString a = initData.formulaAngle;//need for saving fixed formula;
initData.formulaRotationAngle = GetParametrString(domElement, AttrRotationAngle, QChar('0')); initData.formulaRotationAngle = GetParametrString(domElement, AttrRotationAngle, QChar('0'));