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

Fix issue with elliptical arc. It should read but ignore attribute 'aScale'.

Browse Source 
ref #768.

--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2017-11-18 13:48:03 +02:00
parent 604baa61d3
commit 8dbcfb4874
3 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2871,6 +2871,7 @@ void VPattern::ParseToolEllipticalArc(VMainGraphicsScene *scene, QDomElement &do
const QString frotationFix = initData.rotationAngle;//need for saving fixed formula;
initData.color = GetParametrString(domElement, AttrColor, ColorBlack);
initData.penStyle = GetParametrString(domElement, AttrPenStyle, TypeLineLine);
initData.approximationScale = GetParametrDouble(domElement, AttrAScale, "0");
VToolEllipticalArc::Create(initData);
//Rewrite attribute formula. Need for situation when we have wrong formula.

1
src/libs/ifc/schema/pattern/v0.7.3.xsd
View File

@ -311,6 +311,7 @@
<xs:attribute name="color" type="colors"/>
<xs:attribute name="penStyle" type="curvePenStyle"/>
<xs:attribute name="length" type="xs:string"/>
<xs:attribute name="aScale" type="ApproximationScaleType"/>
</xs:complexType>
</xs:element>
<xs:element name="spline" minOccurs="0" maxOccurs="unbounded">

2
src/libs/vtools/tools/drawTools/toolcurve/vtoolellipticalarc.cpp
View File

@ -123,6 +123,7 @@ VToolEllipticalArc* VToolEllipticalArc::Create(QSharedPointer<DialogTool> dialog
initData.data = data;
initData.parse = Document::FullParse;
initData.typeCreation = Source::FromGui;
//initData.approximationScale = dialogTool->GetApproximationScale(); // For future use
VToolEllipticalArc* point = Create(initData);
if (point != nullptr)
@ -155,6 +156,7 @@ VToolEllipticalArc* VToolEllipticalArc::Create(VToolEllipticalArcInitData &initD
initData.rotationAngle);
elArc->SetColor(initData.color);
elArc->SetPenStyle(initData.penStyle);
elArc->SetApproximationScale(initData.approximationScale);
if (initData.typeCreation == Source::FromGui)
{