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

Fixed issue #966. Unable to control Approximation scale for arc with length.

Browse Source 
(grafted from 758fe0d016a641b390f431447cff60d7c93961c8)

--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2019-04-19 13:05:35 +03:00
parent 35a0fd74e1
commit 527d45daba
3 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog.txt
View File

@ -38,6 +38,7 @@
- [#962] Failed to load LibEGL. - [#962] Failed to load LibEGL.
- [#963] Bug in tool Point intersect curve and axis. - [#963] Bug in tool Point intersect curve and axis.
- [#964] Assign operator crashes math parser. - [#964] Assign operator crashes math parser.
- [#966] Unable to control Approximation scale for arc with length.
# Version 0.6.1 October 23, 2018 # Version 0.6.1 October 23, 2018
- [#885] Regression. Broken support for multi size measurements. - [#885] Regression. Broken support for multi size measurements.

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

@ -3164,6 +3164,7 @@ void VPattern::ParseToolArcWithLength(VMainGraphicsScene *scene, QDomElement &do
const QString lengthFix = initData.length;//need for saving fixed length; const QString lengthFix = initData.length;//need for saving fixed length;
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.approximationScale = GetParametrDouble(domElement, AttrAScale, QChar('0'));
VToolArcWithLength::Create(initData); VToolArcWithLength::Create(initData);
//Rewrite attribute formula. Need for situation when we have wrong formula. //Rewrite attribute formula. Need for situation when we have wrong formula.

1
src/libs/vtools/tools/drawTools/toolcurve/vtoolarcwithlength.cpp
View File

@ -128,6 +128,7 @@ VToolArcWithLength *VToolArcWithLength::Create(VToolArcWithLengthInitData &initD
VArc *arc = new VArc(calcLength, initData.length, c, calcRadius, initData.radius, calcF1, initData.f1); VArc *arc = new VArc(calcLength, initData.length, c, calcRadius, initData.radius, calcF1, initData.f1);
arc->SetColor(initData.color); arc->SetColor(initData.color);
arc->SetPenStyle(initData.penStyle); arc->SetPenStyle(initData.penStyle);
arc->SetApproximationScale(initData.approximationScale);
if (initData.typeCreation == Source::FromGui) if (initData.typeCreation == Source::FromGui)
{ {